Skip to content

refine: remove dead branch and fix comment typos in intersect/except preprocess #6079

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
max-sixty merged 1 commit into from
Jul 14, 2026
Merged

refine: remove dead branch and fix comment typos in intersect/except preprocess #6079

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
11 changes: 4 additions & 7 deletions prqlc/prqlc/src/sql/pq/preprocess.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ pub(in crate::sql) fn except(

// determine DISTINCT
let mut distinct = false;
// EXCEPT ALL can become except EXCEPT DISTINCT, if top is DISTINCT.
// EXCEPT ALL can become EXCEPT DISTINCT, if top is DISTINCT.
// DISTINCT-ness of bottom has no effect on the output.
if res.len() >= 3 {
if let Distinct = &res[res.len() - 3] {
Expand Down Expand Up @@ -410,9 +410,6 @@ pub(in crate::sql) fn intersect(
while let Some(t) = pipeline.next() {
res.push(t);

if res.is_empty() {
continue;
}
let Join {
side: JoinSide::Inner,
filter: join_cond,
Expand Down Expand Up @@ -444,7 +441,7 @@ pub(in crate::sql) fn intersect(

// determine DISTINCT
let mut distinct = false;
// INTERSECT ALL can become except INTERSECT DISTINCT
// INTERSECT ALL can become INTERSECT DISTINCT
// - if top is DISTINCT or
// - if output is DISTINCT
if res.len() > 1 {
Expand All @@ -457,13 +454,13 @@ pub(in crate::sql) fn intersect(
}

if !distinct && !ctx.dialect.intersect_all() {
// INTERCEPT ALL is not supported
// INTERSECT ALL is not supported
// can we fall back to anti-join?
if ctx.anchor.contains_wildcard(&top) || ctx.anchor.contains_wildcard(&bottom) {
return Err(Error::new_simple(format!("The dialect {:?} does not support INTERSECT ALL", ctx.dialect))
.push_hint("providing more column information will allow the query to be translated to an anti-join."));
} else {
// Don't create Intercept, fallback to inner join.
// Don't create Intersect, fallback to inner join.
continue;
}
}
Expand Down
Loading