Skip to content

Make positional args DbType specific #12

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
zoranzaric wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make positional args DbType specific #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 47 additions & 14 deletions sqlx-crud-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ fn build_sql_queries(config: &Config) -> TokenStream2 {
config.named.iter().count() - 1
};
let insert_sql_binds = (0..insert_bind_cnt)
.map(|_| "?")
.enumerate()
.map(|(i, _)| config.db_ty.positional_arg_placeholder(i))
.collect::<Vec<_>>()
.join(", ");

Expand All @@ -82,7 +83,14 @@ fn build_sql_queries(config: &Config) -> TokenStream2 {
.iter()
.flat_map(|f| &f.ident)
.filter(|i| *i != &config.id_column_ident)
.map(|i| format!("{} = ?", config.quote_ident(&i.to_string())))
.enumerate()
.map(|(i, ident)| {
format!(
"{} = {}",
config.quote_ident(&ident.to_string()),
config.db_ty.positional_arg_placeholder(i)
)
})
.collect::<Vec<_>>()
.join(", ");

Expand All @@ -104,18 +112,30 @@ fn build_sql_queries(config: &Config) -> TokenStream2 {

let select_sql = format!("SELECT {} FROM {}", column_list, table_name);
let select_by_id_sql = format!(
"SELECT {} FROM {} WHERE {} = ? LIMIT 1",
column_list, table_name, id_column
"SELECT {} FROM {} WHERE {} = {} LIMIT 1",
column_list,
table_name,
id_column,
config.db_ty.positional_arg_placeholder(0)
);
let insert_sql = format!(
"INSERT INTO {} ({}) VALUES ({}) RETURNING {}",
table_name, insert_column_list, insert_sql_binds, column_list
);
let update_by_id_sql = format!(
"UPDATE {} SET {} WHERE {} = ? RETURNING {}",
table_name, update_sql_binds, id_column, column_list
"UPDATE {} SET {} WHERE {} = {} RETURNING {}",
table_name,
update_sql_binds,
id_column,
config.db_ty.positional_arg_placeholder(0),
column_list
);
let delete_by_id_sql = format!(
"DELETE FROM {} WHERE {} = {}",
table_name,
id_column,
config.db_ty.positional_arg_placeholder(0)
);
let delete_by_id_sql = format!("DELETE FROM {} WHERE {} = ?", table_name, id_column);

quote! {
select_sql: #select_sql,
Expand Down Expand Up @@ -322,14 +342,17 @@ impl From<&str> for DbType {
impl DbType {
fn new(attrs: &[Attribute]) -> Self {
let mut db_type = DbType::Sqlite;
attrs.iter()
attrs
.iter()
.find(|a| a.path().is_ident("database"))
.map(|a| a.parse_nested_meta(|m| {
if let Some(path) = m.path.get_ident() {
db_type = DbType::from(path.to_string().as_str());
}
Ok(())
}));
.map(|a| {
a.parse_nested_meta(|m| {
if let Some(path) = m.path.get_ident() {
db_type = DbType::from(path.to_string().as_str());
}
Ok(())
})
});

db_type
}
Expand All @@ -353,4 +376,14 @@ impl DbType {
Self::Sqlite => format!(r#""{}""#, &ident),
}
}

fn positional_arg_placeholder(&self, index: usize) -> String {
match self {
DbType::Any => "?".to_string(),
DbType::Mssql => "?".to_string(),
DbType::MySql => "?".to_string(),
DbType::Postgres => format!("${}", index + 1),
DbType::Sqlite => "?".to_string(),
}
}
}