Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 25 additions & 7 deletions src/codegen/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,19 @@ pub(crate) fn dynamic_sql_setup(
});
}

tokens.push(quote! {
let mut next_placeholder = 1usize;
});

for param in ordered_params(params) {
let ordered = ordered_params(params);
if ordered.len() > 1 {
tokens.push(quote! {
let mut next_placeholder = 1usize;
});
} else if ordered.len() == 1 {
tokens.push(quote! {
let next_placeholder = 1usize;
});
}
let last_idx = ordered.len().saturating_sub(1);
for (idx, param) in ordered.iter().enumerate() {
let is_last = idx == last_idx;
let placeholder_ident = format_ident!("placeholder_{}", param.number as usize);
tokens.push(quote! {
let #placeholder_ident = next_placeholder;
Expand All @@ -208,6 +216,11 @@ pub(crate) fn dynamic_sql_setup(
let marker = format!("/*SLICE:{}*/?", param.source_name);
let numbered_marker = format!("/*SLICE:{}*/${}", param.source_name, param.number);
let bare_placeholder = format!("${}", param.number);
let advance = if is_last {
quote! {}
} else {
quote! { next_placeholder += slice_len; }
};
tokens.push(quote! {
let slice_len = (#value_expr).len();
let replacement = if slice_len == 0 {
Expand All @@ -227,13 +240,18 @@ pub(crate) fn dynamic_sql_setup(
sql = sql.replace(#bare_placeholder, &replacement);
}
}
next_placeholder += slice_len;
#advance
});
} else {
let temporary = format!("__SQLC_PARAM_{}__", param.number);
let advance = if is_last {
quote! {}
} else {
quote! { next_placeholder += 1; }
};
tokens.push(quote! {
sql = sql.replace(#temporary, &format!("${}", #placeholder_ident));
next_placeholder += 1;
#advance
});
}
}
Expand Down
3 changes: 1 addition & 2 deletions tests/snapshots/codegen__batch_dynamic_slice_param.snap
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl<E: AsExecutor> Queries<E> {
};
let ids = item;
let mut sql = BATCH_LIST_AUTHORS_BY_DYNAMIC_IDS.to_string();
let mut next_placeholder = 1usize;
let next_placeholder = 1usize;
let placeholder_1 = next_placeholder;
let slice_len = (ids).len();
let replacement = if slice_len == 0 {
Expand All @@ -99,7 +99,6 @@ impl<E: AsExecutor> Queries<E> {
sql = sql.replace("$1", &replacement);
}
}
next_placeholder += slice_len;
let mut query = sqlx::query_as::<
_,
BatchListAuthorsByDynamicIdsRow,
Expand Down
3 changes: 1 addition & 2 deletions tests/snapshots/codegen__dynamic_slice_param.snap
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl<E: AsExecutor> Queries<E> {
ids: Vec<i64>,
) -> Result<Vec<ListAuthorsByDynamicIdsRow>, sqlx::Error> {
let mut sql = LIST_AUTHORS_BY_DYNAMIC_IDS.to_string();
let mut next_placeholder = 1usize;
let next_placeholder = 1usize;
let placeholder_1 = next_placeholder;
let slice_len = (ids).len();
let replacement = if slice_len == 0 {
Expand All @@ -85,7 +85,6 @@ impl<E: AsExecutor> Queries<E> {
sql = sql.replace("$1", &replacement);
}
}
next_placeholder += slice_len;
let mut query = sqlx::query_as::<_, ListAuthorsByDynamicIdsRow>(&sql);
for value in ids {
query = query.bind(value);
Expand Down
Loading