fix(code): dont modify "base_type" with "Option" wrapping

because that is what the "is_optional" bool is for, also it would result in "Option<Option<TYPE>>" for "Update" structs
Wulf · Sep 30, 2023 · 8a68c01 · 8a68c01
1 parent 826f738
commit 8a68c01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/code.rs b/src/code.rs
@@ -181,12 +181,7 @@ impl<'a> Struct<'a> {
                 } else {
                     c.ty.clone()
                 };
-                let base_type = if c.is_nullable {
-                    format!("Option<{}>", base_type)
-                } else {
-                    base_type
-                };
-                let mut is_optional = false;
+                let mut is_optional = c.is_nullable;
 
                 let is_pk = self
                     .table

diff --git a/test/simple_table/models/todos/generated.rs b/test/simple_table/models/todos/generated.rs
@@ -35,7 +35,7 @@ pub struct CreateTodo {
 #[diesel(table_name=todos)]
 pub struct UpdateTodo {
     pub unsigned: Option<u32>,
-    pub unsigned_nullable: Option<Option<u32>>,
+    pub unsigned_nullable: Option<u32>,
     pub text: Option<String>,
     pub completed: Option<bool>,
     pub type_: Option<String>,

diff --git a/test/use_statements/models/fang_tasks/generated.rs b/test/use_statements/models/fang_tasks/generated.rs
@@ -42,10 +42,10 @@ pub struct CreateFangTask {
 #[diesel(table_name=fang_tasks)]
 pub struct UpdateFangTask {
     pub metadata: Option<serde_json::Value>,
-    pub error_message: Option<Option<String>>,
+    pub error_message: Option<String>,
     pub state: Option<crate::schema::sql_types::FangTaskState>,
     pub task_type: Option<String>,
-    pub uniq_hash: Option<Option<String>>,
+    pub uniq_hash: Option<String>,
     pub retries: Option<i32>,
     pub scheduled_at: Option<chrono::DateTime<chrono::Utc>>,
     pub created_at: Option<chrono::DateTime<chrono::Utc>>,