Skip to content

Implement generator for impl Default #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Implement generator for impl Default #142

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5943f44
[src/code.rs] Implement generator for `impl Default` ; [src/{global.r…
SamuelMarks Nov 27, 2024
25161ca
[src/code.rs] `None` as default when column is optional ; add `Partia…
SamuelMarks Nov 28, 2024
797b323
[src/code.rs] Generate `impl Default for` CRUD structs. BUG: column n…
SamuelMarks Nov 28, 2024
867c512
[src/code.rs] Optimise string allocations ; avoid `impl Default` on u…
SamuelMarks Nov 28, 2024
9874dd5
[src/code.rs] Ignore generated_columns in `impl Default` blocks
SamuelMarks Nov 30, 2024
0038da7
Merge branch 'main' into default-impl
SamuelMarks Sep 6, 2025
5e19ba6
[src/code.rs] Use multiline raw string syntax
SamuelMarks Sep 6, 2025
ba8b38d
[src/code.rs] Apply changed from PR comments
SamuelMarks Sep 6, 2025
ed6b6c1
Merge branch 'main' into default-impl
SamuelMarks Sep 6, 2025
176fb65
[src/code.rs] In `generate_for_table` use `create_struct.fields()` e…
SamuelMarks Sep 6, 2025
4d31663
[src/code.rs] Use `.filter(not_generated)` on `create_struct` (`.fiel…
SamuelMarks Sep 6, 2025
763c527
[src/code.rs] Add `impl Default for Update`
SamuelMarks Sep 7, 2025
b1be2b8
[src/code.rs] Comment out `impl Default for Update`
SamuelMarks Sep 7, 2025
668266d
refactor(code): move "default_impl" code to "Struct::render"
hasezoey Sep 7, 2025
532fa29
[src/code.rs] `build_default_impl_fn` now makes `None` the default fo…
SamuelMarks Sep 8, 2025
e617290
[src/code.rs] Add test for `build_default_impl_fn`
SamuelMarks Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 9 additions & 26 deletions src/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,8 +764,8 @@ fn build_imports(table: &ParsedTableMacro, config: &GenerationConfig) -> String
}

/// Get default for type
fn default_for_type(typ: String) -> &'static str {
match typ.as_str() {
fn default_for_type(typ: &str) -> &'static str {
match typ {
"i8" | "u8" | "i16" | "u16" | "i32" | "u32" | "i64" | "u64" | "i128" | "u128" | "isize"
| "usize" => "0",
"f32" | "f64" => "0.0",
Expand All @@ -779,19 +779,12 @@ fn default_for_type(typ: String) -> &'static str {

/// 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 mut buffer = String::with_capacity(struct_name.len() + columns.len() * 4);
buffer.push_str(&format!(
"impl Default for {struct_name} {{\n fn default() -> Self {{\n",
struct_name = struct_name
));
let column_name_type_nullable: Map<
Iter<ParsedColumnMacro>,
fn(&ParsedColumnMacro) -> (String, String, bool),
fn(&ParsedColumnMacro) -> (String, &str, bool),
> = columns
.iter()
.map(|col| (col.name.to_string(), col.ty.to_string(), col.is_nullable));

buffer.push_str(" Self {\n");
.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!(
Expand All @@ -806,9 +799,10 @@ fn build_default_impl_fn(struct_name: &str, columns: &Vec<ParsedColumnMacro>) ->
})
.collect::<Vec<String>>()
.join(",\n");
buffer.push_str(fields_to_defaults.as_str());
buffer.push_str("\n }\n }\n}");
buffer
format!(
"impl Default for {struct_name} {{\n fn default() -> Self {{\n Self {{\n{f2d}\n }}\n }}\n}}",
struct_name = struct_name, f2d=fields_to_defaults.as_str()
)
}

/// Generate a full file for a given diesel table
Expand All @@ -835,7 +829,7 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
ret_buffer.push('\n');
ret_buffer.push_str(
build_default_impl_fn(
&format!("Create{struct_name}"),
&StructType::format(&StructType::Create, &struct_name),
&create_struct.table.columns,
)
.as_str(),
Expand All @@ -849,17 +843,6 @@ pub fn generate_for_table(table: &ParsedTableMacro, config: &GenerationConfig) -
if update_struct.has_code() {
ret_buffer.push('\n');
ret_buffer.push_str(update_struct.code());
if config.options.default_impl {
ret_buffer.push('\n');
ret_buffer.push_str(
build_default_impl_fn(
&format!("Update{struct_name}"),
&update_struct.table.columns,
)
.as_str(),
);
}
ret_buffer.push('\n');
}

// third, push functions - if enabled
Expand Down
Loading