Skip to content
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

minor: fix duplicate column bug in subquery support #2362

Merged
merged 2 commits into from
Apr 28, 2022
Merged

minor: fix duplicate column bug in subquery support #2362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c8c01
add test
andygrove Apr 27, 2022
5312c28
fix
andygrove Apr 27, 2022
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
34 changes: 31 additions & 3 deletions datafusion/core/src/sql/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,11 +778,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
fields.extend_from_slice(plan.schema().fields());
metadata.extend(plan.schema().metadata().clone());
}
let mut join_schema = DFSchema::new_with_metadata(fields, metadata)?;
if let Some(outer) = outer_query_schema {
fields.extend_from_slice(outer.fields());
metadata.extend(outer.metadata().clone());
join_schema.merge(outer);
}
let join_schema = DFSchema::new_with_metadata(fields, metadata)?;

let filter_expr = self.sql_to_rex(predicate_expr, &join_schema)?;

Expand Down Expand Up @@ -4306,6 +4305,35 @@ mod tests {
quick_test(sql, &expected);
}

#[test]
fn exists_subquery_schema_outer_schema_overlap() {
// both the outer query and the schema select from unaliased "person"
let sql = "SELECT person.id FROM person, person p \
WHERE person.id = p.id AND EXISTS \
(SELECT person.first_name FROM person, person p2 \
WHERE person.id = p2.id \
AND person.last_name = p.last_name \
AND person.state = p.state)";

let subquery_expected = "Subquery: Projection: #person.first_name\
\n Filter: #person.last_name = #p.last_name AND #person.state = #p.state\
\n Inner Join: #person.id = #p2.id\
\n TableScan: person projection=None\
\n SubqueryAlias: p2\
\n TableScan: person projection=None";

let expected = format!(
"Projection: #person.id\
\n Filter: EXISTS ({})\
\n Inner Join: #person.id = #p.id\
\n TableScan: person projection=None\
\n SubqueryAlias: p\
\n TableScan: person projection=None",
subquery_expected
);
quick_test(sql, &expected);
}

#[test]
fn exists_subquery_wildcard() {
let sql = "SELECT id FROM person p WHERE EXISTS \
Expand Down