[src/code.rs] In generate_for_table use create_struct.fields() else table.columns as before

Author: SamuelMarks

src/code.rs

@@ -782,22 +782,26 @@ fn default_for_type(typ: &str) -> &'static str {
     }
 }
 
+struct NameTypNullable<'a> {
+    name: String,
+    typ: &'a str,
+    nullable: bool,
+}
+
 /// Generate default (insides of the `impl Default for StructName { fn default() -> Self {} }`)
 fn build_default_impl_fn<'a>(
     struct_name: &str,
-    columns: impl Iterator<Item = &'a ParsedColumnMacro>,
+    column_name_type_nullable: impl Iterator<Item = NameTypNullable<'a>>,
 ) -> String {
-    let column_name_type_nullable =
-        columns.map(|col| (col.name.to_string(), col.ty.as_str(), col.is_nullable));
     let fields_to_defaults = column_name_type_nullable
-        .map(|(name, typ, nullable)| {
+        .map(|name_typ_nullable| {
             format!(
                 "            {name}: {typ_default}",
-                name = name,
-                typ_default = if nullable {
+                name = name_typ_nullable.name,
+                typ_default = if name_typ_nullable.nullable {
                     "None"
                 } else {
-                    default_for_type(typ)
+                    default_for_type(name_typ_nullable.typ)
                 }
             )
         })
@@ -820,6 +824,9 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
     let struct_name = &table.struct_name;
     let table_options = config.table(&table.name.to_string());
     let generated_columns = table_options.get_autogenerated_columns();
+    let not_generated = |col: &&ParsedColumnMacro| -> bool {
+        !generated_columns.contains(&col.column_name.as_str())
+    };
 
     let mut ret_buffer = format!("{FILE_SIGNATURE}\n\n");
 
@@ -832,10 +839,6 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
 
     let create_struct = Struct::new(StructType::Create, table, config);
 
-    let not_generated = |col: &&ParsedColumnMacro| -> bool {
-        !generated_columns.contains(&col.column_name.as_str())
-    };
-
     if create_struct.has_code() {
         ret_buffer.push('\n');
         ret_buffer.push_str(create_struct.code());
@@ -844,7 +847,11 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
             ret_buffer.push_str(
                 build_default_impl_fn(
                     &StructType::format(&StructType::Create, &struct_name),
-                    create_struct.table.columns.iter().filter(not_generated),
+                    create_struct.fields().iter().map(|col| NameTypNullable {
+                        name: col.name.to_owned(),
+                        typ: col.base_type.as_str(),
+                        nullable: col.is_optional,
+                    }),
                 )
                 .as_str(),
             );
@@ -867,8 +874,19 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
     if config.options.default_impl {
         ret_buffer.push('\n');
         ret_buffer.push_str(
-            build_default_impl_fn(&struct_name, table.columns.iter().filter(not_generated))
-                .as_str(),
+            build_default_impl_fn(
+                &struct_name,
+                table
+                    .columns
+                    .iter()
+                    .filter(not_generated)
+                    .map(|col| NameTypNullable {
+                        name: col.name.to_string().to_owned(),
+                        typ: col.ty.as_str(),
+                        nullable: col.is_nullable,
+                    }),
+            )
+            .as_str(),
         );
     }