use null override for custom types

NyxCode · Sep 8, 2024 · 74ac8f7 · 74ac8f7
1 parent 3771d9a
commit 74ac8f7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/example-postgres/migrations/20240908062042_schema.sql b/example-postgres/migrations/20240908062042_schema.sql
@@ -9,7 +9,7 @@ CREATE TABLE users
     last_name  VARCHAR(128) NOT NULL,
     email      VARCHAR(128) NOT NULL UNIQUE,
     role       user_role    NOT NULL,
-    type       account_type NOT NULL,
+    type       account_type,
     "group"    user_group   NOT NULL DEFAULT 'local',
     disabled   TEXT,
     last_login TIMESTAMP DEFAULT NULL

diff --git a/example-postgres/src/main.rs b/example-postgres/src/main.rs
@@ -17,15 +17,26 @@ async fn main() -> anyhow::Result<()> {
 
     let db = PgPool::connect(&dotenv::var("DATABASE_URL")?).await?;
 
-    log::info!("insert a new row into the database");
+    log::info!("insert a few new rows into the database");
     let mut new = InsertUser {
         user_id: 1,
         first_name: "Moritz".to_owned(),
         last_name: "Bischof".to_owned(),
         email: "moritz.bischof1@gmail.com".to_owned(),
         disabled: None,
         role: Role::User,
-        ty: AccountType::Normal,
+        ty: Some(AccountType::Normal),
+    }
+    .insert(&db)
+    .await?;
+    InsertUser {
+        user_id: 2,
+        first_name: "Dylan".to_owned(),
+        last_name: "Thomas".to_owned(),
+        email: "dylan.thomas@gmail.com".to_owned(),
+        disabled: Some("email not verified".to_owned()),
+        role: Role::Admin,
+        ty: None,
     }
     .insert(&db)
     .await?;
@@ -82,7 +93,7 @@ struct User {
     #[ormx(custom_type)]
     role: Role,
     #[ormx(column = "type", custom_type)]
-    ty: AccountType,
+    ty: Option<AccountType>,
     #[ormx(custom_type, default, set)]
     group: UserGroup,
     disabled: Option<String>,

diff --git a/ormx-macros/src/table/mod.rs b/ormx-macros/src/table/mod.rs
@@ -72,7 +72,7 @@ impl<B: Backend> TableField<B> {
 
         if self.custom_type {
             format!(
-                "{q}{}{q} AS {q}{}: {}{q}",
+                "{q}{}{q} AS {q}{}!: {}{q}",
                 self.column_name,
                 self.field.to_string(),
                 self.ty.to_token_stream()