[src/code.rs] Use .filter(not_generated) on create_struct (.fields was being weird)

Author: SamuelMarks

src/code.rs

@@ -796,7 +796,7 @@ fn build_default_impl_fn<'a>(
     let fields_to_defaults = column_name_type_nullable
         .map(|name_typ_nullable| {
             format!(
-                "            {name}: {typ_default}",
+                "        {name}: {typ_default}",
                 name = name_typ_nullable.name,
                 typ_default = if name_typ_nullable.nullable {
                     "None"
@@ -807,11 +807,11 @@ fn build_default_impl_fn<'a>(
         })
         .collect::<Vec<String>>()
         .join(",\n");
-    format!(
+    formatdoc!(
         r#"impl Default for {struct_name} {{
   fn default() -> Self {{
     Self {{
-      {fields_to_defaults}
+{fields_to_defaults}
     }}
   }}
 }}"#
@@ -824,6 +824,8 @@ 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();
+    println!("struct_name: {}", struct_name);
+    println!("&table.name: {}", &table.name);
     let not_generated = |col: &&ParsedColumnMacro| -> bool {
         !generated_columns.contains(&col.column_name.as_str())
     };
@@ -847,11 +849,16 @@ 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.fields().iter().map(|col| NameTypNullable {
-                        name: col.name.to_owned(),
-                        typ: col.base_type.as_str(),
-                        nullable: col.is_optional,
-                    }),
+                    create_struct
+                        .table
+                        .columns
+                        .iter()
+                        .filter(not_generated)
+                        .map(|col| NameTypNullable {
+                            name: col.column_name.to_string(),
+                            typ: col.ty.as_str(),
+                            nullable: col.is_nullable,
+                        }),
                 )
                 .as_str(),
             );
@@ -879,7 +886,7 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
                 table
                     .columns
                     .iter()
-                    .filter(not_generated)
+                    // .filter(not_generated)
                     .map(|col| NameTypNullable {
                         name: col.name.to_string().to_owned(),
                         typ: col.ty.as_str(),