diff --git a/query-pull/src/errors.rs b/query-pull/src/errors.rs index 628a1170..4ec4f221 100644 --- a/query-pull/src/errors.rs +++ b/query-pull/src/errors.rs @@ -10,15 +10,15 @@ use std; // To refer to std::result::Result. +use mentat_db::{ + DbError, +}; + use mentat_core::{ Entid, }; -use failure::{ - Error, -}; - -pub type Result = std::result::Result; +pub type Result = std::result::Result; #[derive(Debug, Fail)] pub enum PullError { @@ -27,4 +27,13 @@ pub enum PullError { #[fail(display = ":db/id repeated")] RepeatedDbId, + + #[fail(display = "{}", _0)] + DbError(#[cause] DbError), +} + +impl From for PullError { + fn from(error: DbError) -> PullError { + PullError::DbError(error) + } } diff --git a/query-pull/src/lib.rs b/query-pull/src/lib.rs index 22b48de6..39b6e903 100644 --- a/query-pull/src/lib.rs +++ b/query-pull/src/lib.rs @@ -102,7 +102,7 @@ use mentat_query::{ pub mod errors; -use errors::{ +pub use errors::{ PullError, Result, };