Skip to content

Add custom names for fields in database #504

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
xelab04 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add custom names for fields in database #504

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3af077b
feat(orm): add support for raw (`r#`) model and field names
m4tx Feb 21, 2026
98c6f96
cleanup
m4tx Feb 26, 2026
404d462
Merge branch 'master' into raw-field-names
m4tx Feb 26, 2026
8f3d0f1
feat: add field_name to field opts
xelab04 Mar 9, 2026
cec3f11
add tests for custom field name
xelab04 Mar 9, 2026
815b716
Merge branch 'master' into raw-field-names
xelab04 Mar 13, 2026
cf54964
Merge branch 'master' into raw-field-names
seqre Mar 15, 2026
258ef77
fix test missing field_name
xelab04 Mar 15, 2026
3e96bba
fix mistaken addition of import
xelab04 Mar 15, 2026
ec62f17
Merge branch 'cot-rs:master' into raw-field-names
xelab04 May 6, 2026
bcab67e
ft: add example for using custom field_name
xelab04 May 6, 2026
fda4194
chore(pre-commit.ci): auto fixes from pre-commit hooks
pre-commit-ci[bot] May 6, 2026
6518a1e
fix: undo accidental deletion of test model
xelab04 May 6, 2026
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
6 changes: 0 additions & 6 deletions cot-cli/tests/migration_generator/keywords.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,3 @@ struct r#const {
r#abstract: String,
r#type: i32,
}

#[model(table_name = "use")]
struct TestModel {
#[model(primary_key)]
id: Auto<i32>,
}
28 changes: 23 additions & 5 deletions cot-codegen/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ pub struct FieldOpts {
pub ty: syn::Type,
pub primary_key: darling::util::Flag,
pub unique: darling::util::Flag,
pub field_name: Option<String>,
Comment thread
xelab04 marked this conversation as resolved.
}

impl FieldOpts {
Expand Down Expand Up @@ -205,11 +206,13 @@ impl FieldOpts {
symbol_resolver: &SymbolResolver,
self_reference: Option<&String>,
) -> Result<Field, syn::Error> {
let name = self
.ident
.clone()
.expect("Only named struct fields are supported");
let column_name = name.unraw().to_string();
let name = self.ident.clone().expect("Only structs are supported");

let column_name = if let Some(specified_field_name) = &self.field_name {
specified_field_name.clone()
} else {
name.unraw().to_string()
};

let (auto_value, foreign_key) = (
self.find_type("cot::db::Auto", symbol_resolver).is_some(),
Expand Down Expand Up @@ -492,6 +495,20 @@ mod tests {
assert_eq!(field.column_name, "abstract");
}

#[test]
fn field_opts_specified_field_name() {
let input: syn::Field = parse_quote! {
#[model(field_name="test_field")]
test: String
};
let field_opts = FieldOpts::from_field(&input).unwrap();
let field = field_opts
.as_field(&SymbolResolver::new(vec![]), Some(&"TestModel".to_string()))
.unwrap();
assert_eq!(field.name.to_string(), "test");
assert_eq!(field.column_name, "test_field");
}

#[test]
fn find_type_resolved() {
let input: syn::Type =
Expand All @@ -516,6 +533,7 @@ mod tests {
ty: parse_quote! { MyContainer<std::string::String> },
primary_key: darling::util::Flag::default(),
unique: darling::util::Flag::default(),
field_name: None,
};

assert!(opts.find_type("my_crate::MyContainer", &resolver).is_some());
Expand Down
Loading