move the pg_enum macro to crate::sql, and add type in error message

Author: pietroalbini

src/lib.rs

@@ -48,11 +48,11 @@ pub mod metrics;
 pub mod middleware;
 mod rate_limiter;
 pub mod schema;
+#[macro_use]
 pub mod sql;
 pub mod ssh;
 pub mod swirl;
 mod test_util;
-#[macro_use]
 pub mod util;
 pub mod worker;
 

src/sql.rs

@@ -13,3 +13,38 @@ sql_function!(fn floor(x: Double) -> Integer);
 sql_function!(fn greatest<T: SingleValue>(x: T, y: T) -> T);
 sql_function!(fn least<T: SingleValue>(x: T, y: T) -> T);
 sql_function!(fn split_part(string: Text, delimiter: Text, n: Integer) -> Text);
+
+#[macro_export]
+macro_rules! pg_enum {
+    (
+        $vis:vis enum $name:ident {
+            $($item:ident = $int:expr,)*
+        }
+    ) => {
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, FromSqlRow, AsExpression)]
+        #[diesel(sql_type = diesel::sql_types::Integer)]
+        #[serde(rename_all = "snake_case")]
+        #[repr(i32)]
+        $vis enum $name {
+            $($item = $int,)*
+        }
+
+        impl diesel::deserialize::FromSql<diesel::sql_types::Integer, diesel::pg::Pg> for $name {
+            fn from_sql(bytes: diesel::pg::PgValue<'_>) -> diesel::deserialize::Result<Self> {
+                match <i32 as diesel::deserialize::FromSql<diesel::sql_types::Integer, diesel::pg::Pg>>::from_sql(bytes)? {
+                    $($int => Ok(Self::$item),)*
+                    n => Err(format!("unknown value for {}: {}", stringify!($name), n).into()),
+                }
+            }
+        }
+
+        impl diesel::serialize::ToSql<diesel::sql_types::Integer, diesel::pg::Pg> for $name {
+            fn to_sql(
+                &self,
+                out: &mut diesel::serialize::Output<'_, '_, diesel::pg::Pg>,
+            ) -> diesel::serialize::Result {
+                diesel::serialize::ToSql::<diesel::sql_types::Integer, diesel::pg::Pg>::to_sql(&(*self as i32), &mut out.reborrow())
+            }
+        }
+    }
+}

src/util.rs

@@ -32,38 +32,3 @@ impl Maximums {
         }
     }
 }
-
-#[macro_export]
-macro_rules! pg_enum {
-    (
-        $vis:vis enum $name:ident {
-            $($item:ident = $int:expr,)*
-        }
-    ) => {
-        #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, FromSqlRow, AsExpression)]
-        #[diesel(sql_type = diesel::sql_types::Integer)]
-        #[serde(rename_all = "snake_case")]
-        #[repr(i32)]
-        $vis enum $name {
-            $($item = $int,)*
-        }
-
-        impl diesel::deserialize::FromSql<diesel::sql_types::Integer, diesel::pg::Pg> for $name {
-            fn from_sql(bytes: diesel::pg::PgValue<'_>) -> diesel::deserialize::Result<Self> {
-                match <i32 as diesel::deserialize::FromSql<diesel::sql_types::Integer, diesel::pg::Pg>>::from_sql(bytes)? {
-                    $($int => Ok(Self::$item),)*
-                    n => Err(format!("unknown value: {}", n).into()),
-                }
-            }
-        }
-
-        impl diesel::serialize::ToSql<diesel::sql_types::Integer, diesel::pg::Pg> for $name {
-            fn to_sql(
-                &self,
-                out: &mut diesel::serialize::Output<'_, '_, diesel::pg::Pg>,
-            ) -> diesel::serialize::Result {
-                diesel::serialize::ToSql::<diesel::sql_types::Integer, diesel::pg::Pg>::to_sql(&(*self as i32), &mut out.reborrow())
-            }
-        }
-    }
-}