Skip to content

Use line length of 100 #140

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

Merged
jayvdb merged 2 commits into from
Aug 1, 2023
Merged

Use line length of 100 #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52fd1f
Use line length of 100
jayvdb Jul 31, 2023
b313939
Add docs to make deepsource happy
jayvdb Aug 1, 2023
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
72 changes: 46 additions & 26 deletions butane_core/src/codegen/dbobj.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub struct Config {
pub table_name: Option<String>,
}

// implement the DataObject trait
/// Code generation to implement the DataObject trait for a model
pub fn impl_dbobject(ast_struct: &ItemStruct, config: &Config) -> TokenStream2 {
let tyname = &ast_struct.ident;
let tablelit = make_tablelit(config, tyname);
Expand All @@ -37,17 +37,24 @@ pub fn impl_dbobject(ast_struct: &ItemStruct, config: &Config) -> TokenStream2 {
post_insert.push(quote!(self.state.saved = true;));

let numdbfields = fields(ast_struct).filter(|f| is_row_field(f)).count();
let many_save: TokenStream2 = fields(ast_struct).filter(|f| is_many_to_many(f)).map(|f| {
let ident = f.ident.clone().expect("Fields must be named for butane");
let many_table_lit = many_table_lit(ast_struct, f, config);
let pksqltype =
quote!(<<Self as butane::DataObject>::PKType as butane::FieldType>::SQLTYPE);
// Save needs to ensure_initialized
quote!(
self.#ident.ensure_init(#many_table_lit, butane::ToSql::to_sql(self.pk()), #pksqltype);
self.#ident.save(conn)?;
)
}).collect();
let many_save: TokenStream2 = fields(ast_struct)
.filter(|f| is_many_to_many(f))
.map(|f| {
let ident = f.ident.clone().expect("Fields must be named for butane");
let many_table_lit = many_table_lit(ast_struct, f, config);
let pksqltype =
quote!(<<Self as butane::DataObject>::PKType as butane::FieldType>::SQLTYPE);
// Save needs to ensure_initialized
quote!(
self.#ident.ensure_init(
#many_table_lit,
butane::ToSql::to_sql(self.pk()),
#pksqltype,
);
self.#ident.save(conn)?;
)
})
.collect();

let values: Vec<TokenStream2> = push_values(ast_struct, |_| true);
let values_no_pk: Vec<TokenStream2> = push_values(ast_struct, |f: &Field| f != &pk_field);
Expand All @@ -74,16 +81,24 @@ pub fn impl_dbobject(ast_struct: &ItemStruct, config: &Config) -> TokenStream2 {
// Already exists in db, do an update
#(#values_no_pk)*
if values.len() > 0 {
conn.update(Self::TABLE,
pkcol,
butane::ToSql::to_sql_ref(self.pk()),
&[#save_cols], &values)?;
conn.update(
Self::TABLE,
pkcol,
butane::ToSql::to_sql_ref(self.pk()),
&[#save_cols],
&values,
)?;
}
} else if #auto_pk {
// Since we expect our pk field to be invalid and to be created by the insert,
// we do a pure insert, no upsert allowed.
#(#values)*
let pk = conn.insert_returning_pk(Self::TABLE, &[#insert_cols], &pkcol, &values)?;
let pk = conn.insert_returning_pk(
Self::TABLE,
&[#insert_cols],
&pkcol,
&values,
)?;
#(#post_insert)*
} else {
// Do an upsert
Expand Down Expand Up @@ -149,24 +164,29 @@ pub fn impl_dbobject(ast_struct: &ItemStruct, config: &Config) -> TokenStream2 {
)
}

/// Code generation to implement the DataResult trait for a model
pub fn impl_dataresult(ast_struct: &ItemStruct, dbo: &Ident, config: &Config) -> TokenStream2 {
let tyname = &ast_struct.ident;
let numdbfields = fields(ast_struct).filter(|f| is_row_field(f)).count();
let rows = rows_for_from(ast_struct);
let cols = columns(ast_struct, |_| true);

let many_init: TokenStream2 =
fields(ast_struct)
let many_init: TokenStream2 = fields(ast_struct)
.filter(|f| is_many_to_many(f))
.map(|f| {
let ident = f
.ident
.clone()
.expect("Fields must be named for butane");
let ident = f.ident.clone().expect("Fields must be named for butane");
let many_table_lit = many_table_lit(ast_struct, f, config);
let pksqltype = quote!(<<Self as butane::DataObject>::PKType as butane::FieldType>::SQLTYPE);
quote!(obj.#ident.ensure_init(#many_table_lit, butane::ToSql::to_sql(obj.pk()), #pksqltype);)
}).collect();
let pksqltype =
quote!(<<Self as butane::DataObject>::PKType as butane::FieldType>::SQLTYPE);
quote!(
obj.#ident.ensure_init(
#many_table_lit,
butane::ToSql::to_sql(obj.pk()),
#pksqltype,
);
)
})
.collect();

let dbo_is_self = dbo == tyname;
let ctor = if dbo_is_self {
Expand Down