Skip to content

fix: subquery column with same name fix #33

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
merged 1 commit into from
May 26, 2022
Merged

fix: subquery column with same name fix #33

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
17 changes: 8 additions & 9 deletions datafusion/core/src/physical_plan/subquery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

use arrow::compute::concat;
use std::any::Any;
use std::collections::HashMap;
use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
Expand Down Expand Up @@ -61,16 +62,14 @@ impl SubqueryExec {
input: Arc<dyn ExecutionPlan>,
cursor: Arc<OuterQueryCursor>,
) -> Result<Self> {
let input_schema = (*input.schema()).clone();
let input_schema = input.schema();

let merged_schema = Schema::try_merge(
vec![input_schema].into_iter().chain(
subqueries
.iter()
.map(|s| (*s.schema()).clone())
.collect::<Vec<_>>(),
),
)?;
let mut total_fields = input_schema.fields().clone();
for q in subqueries.iter() {
total_fields.append(&mut q.schema().fields().clone());
}

let merged_schema = Schema::new_with_metadata(total_fields, HashMap::new());

if merged_schema.fields().len()
!= input.schema().fields().len() + subqueries.len()
Expand Down
4 changes: 3 additions & 1 deletion datafusion/core/src/sql/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2060,7 +2060,9 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {

SQLExpr::Subquery(q) => {
let with_outer_query_context = self.with_context(|c| c.outer_query_context_schema.push(Arc::new(schema.clone())));
let plan = with_outer_query_context.query_to_plan(*q)?;
let alias_name = format!("subquery-{}", self.context.subqueries_plans().unwrap_or_default().unwrap_or_default().len());
let plan = with_outer_query_context.query_to_plan_with_alias(*q, Some(alias_name), &mut HashMap::new())?;

let fields = plan.schema().fields();
if fields.len() != 1 {
return Err(DataFusionError::Plan(format!("Correlated sub query requires only one column in result set but found: {:?}", fields)));
Expand Down