Skip to content

Fix queries only containing run-time bound parameters #22

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
kyrias merged 1 commit into from
Jan 7, 2025
Merged

Fix queries only containing run-time bound parameters #22

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions core/src/lower.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ pub(crate) fn lower(analyzed: AnalyzedConditionalQueryAs) -> LoweredConditionalQ
// keep track of which match expressions belongs to which part of the match arm's expression.
let mut match_arms = Vec::new();
for binding in bindings.into_iter().multi_cartesian_product() {
// `multi_cartesian_product` returns one empty `Vec` if the iterator was empty.
if binding.is_empty() {
continue;
}

let mut guards = Vec::new();
let mut bindings = HashMap::new();
binding.into_iter().for_each(|(g, b)| {
Expand Down
27 changes: 3 additions & 24 deletions ...s/sqlx_conditional_queries_core__snapshot_tests__only_runtime_bound_parameters@MySql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ snapshot_kind: text
---
fn dummy() {
{
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0, F1> {
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0> {
Variant0(::sqlx::query::Map<'q, DB, F0, A>),
Variant1(::sqlx::query::Map<'q, DB, F1, A>),
}
impl<'q, DB, A, O, F0, F1> ConditionalMap<'q, DB, A, F0, F1>
impl<'q, DB, A, O, F0> ConditionalMap<'q, DB, A, F0>
where
DB: ::sqlx::Database,
A: 'q + ::sqlx::IntoArguments<'q, DB> + ::std::marker::Send,
O: ::std::marker::Unpin + ::std::marker::Send,
F0: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
F1: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
{
/// See [`sqlx::query::Map::fetch`]
pub fn fetch<'e, 'c: 'e, E>(
Expand All @@ -28,11 +26,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch(executor),
Self::Variant1(map) => map.fetch(executor),
}
}
/// See [`sqlx::query::Map::fetch_many`]
Expand All @@ -50,11 +46,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => #[allow(deprecated)] map.fetch_many(executor),
Self::Variant1(map) => #[allow(deprecated)] map.fetch_many(executor),
}
}
/// See [`sqlx::query::Map::fetch_all`]
Expand All @@ -68,11 +62,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_all(executor).await,
Self::Variant1(map) => map.fetch_all(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_one`]
Expand All @@ -83,11 +75,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_one(executor).await,
Self::Variant1(map) => map.fetch_one(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_optional`]
Expand All @@ -101,26 +91,15 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_optional(executor).await,
Self::Variant1(map) => map.fetch_optional(executor).await,
}
}
}
match ((),) {
() => {
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
+ "?" + "\n ", created_at
),
)
}
((),) => {
ConditionalMap::Variant1(
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
Expand Down
27 changes: 3 additions & 24 deletions ...x_conditional_queries_core__snapshot_tests__only_runtime_bound_parameters@PostgreSql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ snapshot_kind: text
---
fn dummy() {
{
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0, F1> {
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0> {
Variant0(::sqlx::query::Map<'q, DB, F0, A>),
Variant1(::sqlx::query::Map<'q, DB, F1, A>),
}
impl<'q, DB, A, O, F0, F1> ConditionalMap<'q, DB, A, F0, F1>
impl<'q, DB, A, O, F0> ConditionalMap<'q, DB, A, F0>
where
DB: ::sqlx::Database,
A: 'q + ::sqlx::IntoArguments<'q, DB> + ::std::marker::Send,
O: ::std::marker::Unpin + ::std::marker::Send,
F0: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
F1: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
{
/// See [`sqlx::query::Map::fetch`]
pub fn fetch<'e, 'c: 'e, E>(
Expand All @@ -28,11 +26,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch(executor),
Self::Variant1(map) => map.fetch(executor),
}
}
/// See [`sqlx::query::Map::fetch_many`]
Expand All @@ -50,11 +46,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => #[allow(deprecated)] map.fetch_many(executor),
Self::Variant1(map) => #[allow(deprecated)] map.fetch_many(executor),
}
}
/// See [`sqlx::query::Map::fetch_all`]
Expand All @@ -68,11 +62,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_all(executor).await,
Self::Variant1(map) => map.fetch_all(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_one`]
Expand All @@ -83,11 +75,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_one(executor).await,
Self::Variant1(map) => map.fetch_one(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_optional`]
Expand All @@ -101,26 +91,15 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_optional(executor).await,
Self::Variant1(map) => map.fetch_optional(executor).await,
}
}
}
match ((),) {
() => {
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
+ "$1" + "\n ", created_at
),
)
}
((),) => {
ConditionalMap::Variant1(
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
Expand Down
27 changes: 3 additions & 24 deletions .../sqlx_conditional_queries_core__snapshot_tests__only_runtime_bound_parameters@Sqlite.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ snapshot_kind: text
---
fn dummy() {
{
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0, F1> {
enum ConditionalMap<'q, DB: ::sqlx::Database, A, F0> {
Variant0(::sqlx::query::Map<'q, DB, F0, A>),
Variant1(::sqlx::query::Map<'q, DB, F1, A>),
}
impl<'q, DB, A, O, F0, F1> ConditionalMap<'q, DB, A, F0, F1>
impl<'q, DB, A, O, F0> ConditionalMap<'q, DB, A, F0>
where
DB: ::sqlx::Database,
A: 'q + ::sqlx::IntoArguments<'q, DB> + ::std::marker::Send,
O: ::std::marker::Unpin + ::std::marker::Send,
F0: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
F1: ::std::ops::FnMut(DB::Row) -> ::sqlx::Result<O> + ::std::marker::Send,
{
/// See [`sqlx::query::Map::fetch`]
pub fn fetch<'e, 'c: 'e, E>(
Expand All @@ -28,11 +26,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch(executor),
Self::Variant1(map) => map.fetch(executor),
}
}
/// See [`sqlx::query::Map::fetch_many`]
Expand All @@ -50,11 +46,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => #[allow(deprecated)] map.fetch_many(executor),
Self::Variant1(map) => #[allow(deprecated)] map.fetch_many(executor),
}
}
/// See [`sqlx::query::Map::fetch_all`]
Expand All @@ -68,11 +62,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_all(executor).await,
Self::Variant1(map) => map.fetch_all(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_one`]
Expand All @@ -83,11 +75,9 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_one(executor).await,
Self::Variant1(map) => map.fetch_one(executor).await,
}
}
/// See [`sqlx::query::Map::fetch_optional`]
Expand All @@ -101,26 +91,15 @@ fn dummy() {
DB: 'e,
O: 'e,
F0: 'e,
F1: 'e,
{
match self {
Self::Variant0(map) => map.fetch_optional(executor).await,
Self::Variant1(map) => map.fetch_optional(executor).await,
}
}
}
match ((),) {
() => {
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
+ "?" + "\n ", created_at
),
)
}
((),) => {
ConditionalMap::Variant1(
ConditionalMap::Variant0(
::sqlx::query_as!(
OutputType,
"\n SELECT column\n FROM table\n WHERE created_at > "
Expand Down
Loading