Merge branch 'master' into dependabot/cargo/rusqlite-0.34

Author: Colonial-Dev

CHANGELOG.md

@@ -1,3 +1,10 @@
+### v0.33.0
+- (Routine Maintenance) Updated `rusqlite` from `0.33` to `0.34`.
+  - This is a *breaking change,* requiring you to upgrade your `rusqlite` to match - trying to link against two different copies of `libsqlite3` will cause a compile fail.
+- Fixed issue with macros failing if Rusqlite is not linked to the current crate.
+- Replaced unmaintained dependency `proc_macro_error`.
+
+
 ### v0.33.0
 - (Routine Maintenance) Updated `rusqlite` from `0.32` to `0.33`.
   - This is a *breaking change,* requiring you to upgrade your `rusqlite` to match - trying to link against two different copies of `libsqlite3` will cause a compile fail.

Cargo.toml

@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.33.0"
+version = "0.34.0"
 authors = ["Colonial"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

exemplar/Cargo.toml

@@ -15,7 +15,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-exemplar_proc_macro = { version = "0.7.1" }
+exemplar_proc_macro = { version = "0.34.0" }
 rusqlite = "0.34"
 
 [dev-dependencies]

exemplar/src/lib.rs

@@ -96,6 +96,11 @@ use rusqlite::types::{
     FromSqlResult
 };
 
+// We re-export rusqlite to maximize macro compatibility.
+// (See https://github.com/Colonial-Dev/exemplar/issues/5)
+#[doc(hidden)]
+pub use rusqlite;
+
 pub use crate::macros::*;
 
 /// Type alias for the outcome of converting a value to an SQL-friendly representation.

exemplar/src/macros.rs

@@ -214,17 +214,17 @@ macro_rules! record {
         }
 
         impl $name {
-            fn from_row(row: &::rusqlite::Row) -> ::rusqlite::Result<Self> {
+            fn from_row(row: &::exemplar::rusqlite::Row) -> ::exemplar::rusqlite::Result<Self> {
                 Ok(Self {
                     $($fname : row.get(stringify!($fname))?),*
                 })
             }
         }
 
-        impl<'a> ::std::convert::TryFrom<&'a ::rusqlite::Row<'_>> for $name {
-            type Error = ::rusqlite::Error;
+        impl<'a> ::std::convert::TryFrom<&'a ::exemplar::rusqlite::Row<'_>> for $name {
+            type Error = ::exemplar::rusqlite::Error;
 
-            fn try_from(value: &'a ::rusqlite::Row) -> Result<Self, Self::Error> {
+            fn try_from(value: &'a ::exemplar::rusqlite::Row) -> Result<Self, Self::Error> {
                 Self::from_row(value)
             }
         }
@@ -313,28 +313,28 @@ macro_rules! sql_enum {
         }
 
         #[automatically_derived]
-        impl ::rusqlite::ToSql for $name {
-            fn to_sql(&self) -> ::rusqlite::Result<::rusqlite::types::ToSqlOutput<'_>> {
-                let value = ::rusqlite::types::Value::Integer(*self as i64);
-                let value = ::rusqlite::types::ToSqlOutput::Owned(value);
+        impl ::exemplar::rusqlite::ToSql for $name {
+            fn to_sql(&self) -> ::exemplar::rusqlite::Result<::exemplar::rusqlite::types::ToSqlOutput<'_>> {
+                let value = ::exemplar::rusqlite::types::Value::Integer(*self as i64);
+                let value = ::exemplar::rusqlite::types::ToSqlOutput::Owned(value);
                 Ok(value)
             }
         }
 
         #[automatically_derived]
-        impl ::rusqlite::types::FromSql for $name {
-            fn column_result(value: ::rusqlite::types::ValueRef<'_>) -> ::rusqlite::types::FromSqlResult<Self> {
+        impl ::exemplar::rusqlite::types::FromSql for $name {
+            fn column_result(value: ::exemplar::rusqlite::types::ValueRef<'_>) -> ::exemplar::rusqlite::types::FromSqlResult<Self> {
                 value.as_i64()
                     .map(<$name>::try_from)?
                     .map_err(|err| {
-                        ::rusqlite::types::FromSqlError::Other(Box::new(err))
+                        ::exemplar::rusqlite::types::FromSqlError::Other(Box::new(err))
                     })
             }
         }
 
         #[automatically_derived]
         impl ::std::convert::TryFrom<i64> for $name {
-            type Error = ::rusqlite::types::FromSqlError;
+            type Error = ::exemplar::rusqlite::types::FromSqlError;
 
             fn try_from(value: i64) -> Result<Self, Self::Error> {
                 match value {
@@ -345,7 +345,7 @@ macro_rules! sql_enum {
                             stringify!($name)
                         );
 
-                        Err(::rusqlite::types::FromSqlError::Other(
+                        Err(::exemplar::rusqlite::types::FromSqlError::Other(
                             msg.into()
                         ))
                     }
@@ -356,57 +356,4 @@ macro_rules! sql_enum {
     ($(#[$enum_doc:meta])* Name => $name:ident, $($(#[$variant_doc:meta])* $vname:ident),* $(,)?) => {
         sql_enum!($(#[$enum_doc])* Name => $name, Type => i64, $($(#[$variant_doc])* $vname),*);
     }
-}
-
-#[cfg(test)]
-mod tests {
-
-    sql_enum! {
-        Name => Color,
-        Type => u8,
-        Red,
-        Green,
-        Blue
-    }
-
-    #[test]
-    fn conversion() {
-        assert_eq!(0, Color::Red as i64);
-        assert_eq!(1, Color::Green as i64);
-        assert_eq!(2, Color::Blue as i64);
-
-        assert_eq!(
-            Color::Red,
-            Color::try_from(0).unwrap()
-        );
-
-        assert_eq!(
-            Color::Green,
-            Color::try_from(1).unwrap()
-        );
-
-        assert_eq!(
-            Color::Blue,
-            Color::try_from(2).unwrap()
-        );
-    }
-
-    #[test]
-    fn safety() {
-        assert!(
-            Color::try_from(-1).is_err()
-        );
-
-        assert!(
-            Color::try_from(i64::MIN).is_err()
-        );
-
-        assert!(
-            Color::try_from(i64::MAX).is_err()
-        );
-
-        assert!(
-            Color::try_from(3).is_err()
-        );
-    }
 }

exemplar/tests/macros.rs

@@ -0,0 +1,50 @@
+use exemplar::*;
+
+sql_enum! {
+    Name => Color,
+    Type => u8,
+    Red,
+    Green,
+    Blue
+}
+
+#[test]
+fn conversion() {
+    assert_eq!(0, Color::Red as i64);
+    assert_eq!(1, Color::Green as i64);
+    assert_eq!(2, Color::Blue as i64);
+
+    assert_eq!(
+        Color::Red,
+        Color::try_from(0).unwrap()
+    );
+
+    assert_eq!(
+        Color::Green,
+        Color::try_from(1).unwrap()
+    );
+
+    assert_eq!(
+        Color::Blue,
+        Color::try_from(2).unwrap()
+    );
+}
+
+#[test]
+fn safety() {
+    assert!(
+        Color::try_from(-1).is_err()
+    );
+
+    assert!(
+        Color::try_from(i64::MIN).is_err()
+    );
+
+    assert!(
+        Color::try_from(i64::MAX).is_err()
+    );
+
+    assert!(
+        Color::try_from(3).is_err()
+    );
+}

exemplar_proc_macro/Cargo.toml

@@ -13,7 +13,7 @@ keywords.workspace = true
 proc-macro = true
 
 [dependencies]
-proc-macro-error = "1.0.4"
-proc-macro2 = "1.0.68"
-quote = "1.0.33"
-syn = { version = "2.0.38" }
+proc-macro-error2 = "2.0.1"
+proc-macro2       = "1.0.94"
+quote             = "1.0.39"
+syn               = "2.0.100"

exemplar_proc_macro/src/codegen.rs

@@ -22,7 +22,7 @@ pub fn from_row(derivee: &Derivee) -> QuoteStream {
 
     quote! {
         #[inline]
-        fn from_row(row: &::rusqlite::Row) -> ::rusqlite::Result<Self> 
+        fn from_row(row: &::exemplar::rusqlite::Row) -> ::exemplar::rusqlite::Result<Self> 
         where
             Self: ::std::marker::Sized,
         {
@@ -64,15 +64,15 @@ pub fn inserts(derivee: &Derivee) -> QuoteStream {
 
     quote! {
         #[inline]
-        fn insert(&self, conn: &::rusqlite::Connection) -> ::rusqlite::Result<()> {
+        fn insert(&self, conn: &::exemplar::rusqlite::Connection) -> ::exemplar::rusqlite::Result<()> {
             self.insert_or(conn, ::exemplar::OnConflict::Abort)
         }
 
         #[inline]
-        fn insert_or(&self, conn: &::rusqlite::Connection, strategy: ::exemplar::OnConflict) -> ::rusqlite::Result<()> {
+        fn insert_or(&self, conn: &::exemplar::rusqlite::Connection, strategy: ::exemplar::OnConflict) -> ::exemplar::rusqlite::Result<()> {
             use ::exemplar::OnConflict::*;
 
-            let exec = |sql: &str| -> ::rusqlite::Result<()> {
+            let exec = |sql: &str| -> ::exemplar::rusqlite::Result<()> {
                 let mut stmt = conn.prepare_cached(sql)?;
 
                 stmt.execute(rusqlite::named_params! {
@@ -92,7 +92,7 @@ pub fn inserts(derivee: &Derivee) -> QuoteStream {
         }
 
         #[inline]
-        fn insert_with(&self, stmt: &mut::rusqlite::Statement) -> ::rusqlite::Result<()> {
+        fn insert_with(&self, stmt: &mut::exemplar::rusqlite::Statement) -> ::exemplar::rusqlite::Result<()> {
             stmt.execute(rusqlite::named_params! {
                 #(#col_names: #field_idents),*
             })?;
@@ -116,17 +116,17 @@ pub fn to_params(derivee: &Derivee) -> QuoteStream {
         .map(|(ident, field)| {
             if let Some(bind) = util::get_bind_path(field) {
                 // If the field has a #[bind] attribute, then we execute it now and box the result.
-                quote! { Boxed(Box::new(#bind(&self.#ident)?) as Box<dyn ::rusqlite::ToSql>) }
+                quote! { Boxed(Box::new(#bind(&self.#ident)?) as Box<dyn ::exemplar::rusqlite::ToSql>) }
             }
             else {
                 // Otherwise, we're good to just borrow directly from self and cast to a dyn ToSql.
-                quote! { Borrowed(&self.#ident as &dyn ::rusqlite::ToSql) }
+                quote! { Borrowed(&self.#ident as &dyn ::exemplar::rusqlite::ToSql) }
             }
         });
 
     quote! {
         #[inline]
-        fn to_params(&self) -> ::rusqlite::Result<::exemplar::Parameters> {
+        fn to_params(&self) -> ::exemplar::rusqlite::Result<::exemplar::Parameters> {
             use ::std::boxed::Box;
             use ::exemplar::Parameter::*;
 
@@ -206,7 +206,7 @@ pub fn check_test(derivee: &Derivee) -> QuoteStream {
         #[test]
         fn #func() {
             use ::std::collections::HashSet;
-            use ::rusqlite::Connection;
+            use ::exemplar::rusqlite::Connection;
 
             let schema = include_str!(#path);
 

exemplar_proc_macro/src/lib.rs

@@ -2,7 +2,7 @@ mod codegen;
 mod util;
 
 use proc_macro::TokenStream;
-use proc_macro_error::*;
+use proc_macro_error2::*;
 
 use proc_macro2::Ident;
 use proc_macro2::Literal;
@@ -59,7 +59,7 @@ pub fn derive_model(input: TokenStream) -> TokenStream {
         )
     }
 
-    let table = util::get_table_name(&ast);
+    let table  = util::get_table_name(&ast);
     let schema = util::get_check_path(&ast);
 
     let derivee = Derivee {
@@ -69,11 +69,11 @@ pub fn derive_model(input: TokenStream) -> TokenStream {
         schema
     };
 
-    let from_row            = codegen::from_row(&derivee);
-    let inserts             = codegen::inserts(&derivee);
-    let to_params           = codegen::to_params(&derivee);
-    let metadata            = codegen::metadata(&derivee);
-    let check_test          = codegen::check_test(&derivee);
+    let from_row   = codegen::from_row(&derivee);
+    let inserts    = codegen::inserts(&derivee);
+    let to_params  = codegen::to_params(&derivee);
+    let metadata   = codegen::metadata(&derivee);
+    let check_test = codegen::check_test(&derivee);
 
     quote! {
         #[automatically_derived]
@@ -85,10 +85,10 @@ pub fn derive_model(input: TokenStream) -> TokenStream {
         }
 
         #[automatically_derived]
-        impl<'a> ::std::convert::TryFrom<&'a ::rusqlite::Row<'_>> for #name {
-            type Error = ::rusqlite::Error;
+        impl<'a> ::std::convert::TryFrom<&'a ::exemplar::rusqlite::Row<'_>> for #name {
+            type Error = ::exemplar::rusqlite::Error;
 
-            fn try_from(value: &'a ::rusqlite::Row) -> Result<Self, Self::Error> {
+            fn try_from(value: &'a ::exemplar::rusqlite::Row) -> Result<Self, Self::Error> {
                 Self::from_row(value)
             }
         }