From 54307159828637a4514ecf97507f6b4d6dbbf0b9 Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Fri, 26 Apr 2019 15:15:07 +0100 Subject: [PATCH 1/3] Fix error when building with `uuid` and `functions` features. --- src/functions.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/functions.rs b/src/functions.rs index a4773a0..54f9911 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -137,6 +137,10 @@ impl Context<'_> { FromSqlError::InvalidI128Size(_) => { Error::FromSqlConversionFailure(idx, value.data_type(), Box::new(err)) } + #[cfg(feature = "uuid")] + FromSqlError::InvalidUuidSize(_) => { + Error::FromSqlConversionFailure(idx, value.data_type(), Box::new(err)) + } }) } From 6c837a3f514250e2ae566f96092bb77c0330024c Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Fri, 26 Apr 2019 15:30:49 +0100 Subject: [PATCH 2/3] Fix other failing case --- src/vtab/mod.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vtab/mod.rs b/src/vtab/mod.rs index cf3bee5..4832434 100644 --- a/src/vtab/mod.rs +++ b/src/vtab/mod.rs @@ -473,6 +473,10 @@ impl Values<'_> { FromSqlError::OutOfRange(i) => Error::IntegralValueOutOfRange(idx, i), #[cfg(feature = "i128_blob")] FromSqlError::InvalidI128Size(_) => Error::InvalidColumnType(idx, value.data_type()), + #[cfg(feature = "uuid")] + FromSqlError::InvalidUuidSize(_) => { + Error::FromSqlConversionFailure(idx, value.data_type(), Box::new(err)) + } }) } From 0cdde751a647272c38c3dab766152b218c994528 Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Sat, 27 Apr 2019 09:50:28 +0100 Subject: [PATCH 3/3] Add uuid feature to some tests in travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae46a5e..1cc4963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ script: - cargo test --features uuid - cargo test --features "unlock_notify bundled" - cargo test --features "array bundled csvtab vtab" - - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url vtab" - - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url vtab buildtime_bindgen" - - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url vtab bundled" - - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url vtab bundled buildtime_bindgen" + - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url uuid vtab" + - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url uuid vtab buildtime_bindgen" + - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url uuid vtab bundled" + - cargo test --features "backup blob chrono csvtab functions hooks limits load_extension serde_json trace url uuid vtab bundled buildtime_bindgen"