[src/code.rs] Ignore generated_columns in impl Default blocks

Author: SamuelMarks

src/code.rs

@@ -1,10 +1,8 @@
-use crate::parser::{ParsedColumnMacro, ParsedTableMacro, FILE_SIGNATURE};
-use crate::{get_table_module_name, GenerationConfig, TableOptions};
 use heck::ToPascalCase;
 use indoc::formatdoc;
-use std::borrow::Cow;
-use std::iter::Map;
-use std::slice::Iter;
+
+use crate::parser::{ParsedColumnMacro, ParsedTableMacro, FILE_SIGNATURE};
+use crate::{get_table_module_name, GenerationConfig, TableOptions};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum StructType {
@@ -87,7 +85,7 @@ pub struct StructField {
 
 impl StructField {
     /// Assemble the current options into a rust type, like `base_type: String, is_optional: true` to `Option<String>`
-    pub fn to_rust_type(&self) -> Cow<str> {
+    pub fn to_rust_type(&self) -> std::borrow::Cow<str> {
         let mut rust_type = self.base_type.clone();
 
         // order matters!
@@ -773,18 +771,24 @@ fn default_for_type(typ: &str) -> &'static str {
         "bool" => "false",
         "String" => "String::new()",
         "&str" | "&'static str" => "\"\"",
-        _ => "Default::default()",
+        "Cow<str>" => "Cow::Owned(String::new())",
+        _ => {
+            if typ.starts_with("Option<") {
+                "None"
+            } else {
+                "Default::default()"
+            }
+        }
     }
 }
 
 /// Generate default (insides of the `impl Default for StructName { fn default() -> Self {} }`)
-fn build_default_impl_fn(struct_name: &str, columns: &Vec<ParsedColumnMacro>) -> String {
-    let column_name_type_nullable: Map<
-        Iter<ParsedColumnMacro>,
-        fn(&ParsedColumnMacro) -> (String, &str, bool),
-    > = columns
-        .iter()
-        .map(|col| (col.name.to_string(), col.ty.as_str(), col.is_nullable));
+fn build_default_impl_fn<'a>(
+    struct_name: &str,
+    columns: impl Iterator<Item = &'a ParsedColumnMacro>,
+) -> 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)| {
             format!(
@@ -810,6 +814,7 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
     // early to ensure the table options are set for the current table
     let struct_name = table.struct_name.to_string();
     let table_options = config.table(&table.name.to_string());
+    let generated_columns = table_options.get_autogenerated_columns();
 
     let mut ret_buffer = format!("{FILE_SIGNATURE}\n\n");
 
@@ -822,6 +827,10 @@ 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());
@@ -830,7 +839,7 @@ 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,
+                    create_struct.table.columns.iter().filter(not_generated),
                 )
                 .as_str(),
             );
@@ -853,7 +862,10 @@ 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).as_str());
+        ret_buffer.push_str(
+            build_default_impl_fn(&struct_name, table.columns.iter().filter(not_generated))
+                .as_str(),
+        );
         ret_buffer.push('\n');
     }