Skip to content
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.

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

Scaffold v2 #1209

Merged
merged 34 commits into from
Jan 27, 2025
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
049f500
Add support for additional model field types and arrays
kaplanelad Jan 10, 2025
df2579f
clippy
kaplanelad Jan 10, 2025
5a6e946
Merge branch 'master' into add-support-additional-model-field-types-a…
kaplanelad Jan 10, 2025
d2a9b08
revert rust field
kaplanelad Jan 10, 2025
3c62174
Merge branch 'master' into add-support-additional-model-field-types-a…
kaplanelad Jan 12, 2025
331a005
adding rust types for array
kaplanelad Jan 13, 2025
6fc8133
scaffold ui
kaplanelad Jan 13, 2025
a21450e
clippy fixes
kaplanelad Jan 13, 2025
0044172
test
kaplanelad Jan 13, 2025
58bec24
test
kaplanelad Jan 13, 2025
201b17b
test
kaplanelad Jan 13, 2025
fe89071
test
kaplanelad Jan 14, 2025
14b717d
Merge branch 'master' into add-support-additional-model-field-types-a…
kaplanelad Jan 14, 2025
33157cd
Merge branch 'master' into add-support-additional-model-field-types-a…
kaplanelad Jan 19, 2025
9dad097
remove char and text
kaplanelad Jan 19, 2025
8954733
Merge branch 'master' into add-support-additional-model-field-types-a…
kaplanelad Jan 21, 2025
a017dd8
scaffold improvements
kaplanelad Jan 23, 2025
a9c260e
Merge branch 'master' into scaffold-v2
kaplanelad Jan 23, 2025
41a834a
scaffold improvements
kaplanelad Jan 23, 2025
3779387
more snap
kaplanelad Jan 23, 2025
77118f7
more snap
kaplanelad Jan 23, 2025
efe12b8
more changes
kaplanelad Jan 23, 2025
1532706
change file name
kaplanelad Jan 26, 2025
29523db
merge #1212
kaplanelad Jan 26, 2025
80a468c
mapping
kaplanelad Jan 26, 2025
9d7fc4c
docs
kaplanelad Jan 26, 2025
269404f
snap
kaplanelad Jan 26, 2025
e87cc1d
test html and htmx only when asset is provided
kaplanelad Jan 26, 2025
a074ed1
snap
kaplanelad Jan 26, 2025
25baedf
pg tests
kaplanelad Jan 26, 2025
861dd3f
unnecessary html classes
kaplanelad Jan 26, 2025
75513b6
Merge branch 'master' into scaffold-v2
kaplanelad Jan 26, 2025
b66ebc4
Merge branch 'master' into scaffold-v2
kaplanelad Jan 26, 2025
3f1122c
add db to loco-gen crate
kaplanelad Jan 27, 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
Prev Previous commit
Next Next commit
test
kaplanelad committed Jan 13, 2025
commit 58bec24c97c9b0c3ab2b1d54647ad8b5707f90dd
60 changes: 6 additions & 54 deletions loco-gen/src/lib.rs
Original file line number Diff line number Diff line change
@@ -581,15 +581,7 @@ mod tests {
0
);

assert_eq!(
mapping
.col_type_arity("unknown")
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.col_type_arity("unknown").is_err());
}

#[test]
@@ -601,15 +593,7 @@ mod tests {
"array_null"
);

assert_eq!(
mapping
.col_type_field("unknown")
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.col_type_field("unknown").is_err());
}

#[test]
@@ -621,15 +605,7 @@ mod tests {
"string_uniq"
);

assert_eq!(
mapping
.schema_field("unknown")
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.schema_field("unknown").is_err());
}

#[test]
@@ -651,15 +627,7 @@ mod tests {
"type `array` need params to get the rust field type".to_string()
);

assert_eq!(
mapping
.rust_field("unknown")
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.rust_field("unknown").is_err(),);
}

#[test]
@@ -668,15 +636,7 @@ mod tests {

assert!(mapping.rust_field_kind("string^").is_ok());

assert_eq!(
mapping
.rust_field_kind("unknown")
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.rust_field_kind("unknown").is_err(),);
}

#[test]
@@ -704,14 +664,6 @@ mod tests {
"type: `array` not found. try any of: `int,string,chat`"
);

assert_eq!(
mapping
.rust_field_with_params("unknown", &vec![])
.expect_err("expect error")
.to_string(),
mapping
.error_unrecognized_default_field("unknown")
.to_string()
);
assert!(mapping.rust_field_with_params("unknown", &vec![]).is_err());
}
}