Skip to content

Fix: the fields output by Using are not determined by JoinType #401

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

Open
goransh-walia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: the fields output by Using are not determined by JoinType #401

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
39 changes: 14 additions & 25 deletions src/binder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ impl BoundSource<'_> {

#[derive(Clone)]
pub(crate) struct UsingColumn {
join_type: JoinType,
_join_type: JoinType,
left_column: ColumnRef,
left_position: usize,
right_column: ColumnRef,
Expand All @@ -203,7 +203,7 @@ impl UsingColumn {
right_position: usize,
) -> Self {
Self {
join_type,
_join_type: join_type,
left_column,
left_position,
right_column,
Expand All @@ -223,31 +223,20 @@ impl UsingColumn {
&self,
arena: &mut PlanArena,
) -> Result<ScalarExpression, DatabaseError> {
match self.join_type {
JoinType::RightOuter => Ok(self.right_expr()),
JoinType::Full => {
let left_expr = arena.alloc_expression(self.left_expr());
let right_expr = arena.alloc_expression(self.right_expr());
let left_ty = left_expr.return_type(arena);
let right_ty = right_expr.return_type(arena);
let ty = LogicalType::max_logical_type(&left_ty, &right_ty)?.into_owned();

Ok(ScalarExpression::Coalesce {
exprs: vec![left_expr, right_expr],
ty,
})
}
JoinType::Inner | JoinType::LeftOuter | JoinType::Cross => Ok(self.left_expr()),
}
let left_expr = arena.alloc_expression(self.left_expr());
let right_expr = arena.alloc_expression(self.right_expr());
let left_ty = left_expr.return_type(arena);
let right_ty = right_expr.return_type(arena);
let ty = LogicalType::max_logical_type(&left_ty, &right_ty)?.into_owned();

Ok(ScalarExpression::Coalesce {
exprs: vec![left_expr, right_expr],
ty,
})
}

pub(crate) fn hides_column(&self, column: &ColumnRef, arena: &PlanArena) -> bool {
let hidden_column = if self.join_type.is_right() {
&self.left_column
} else {
&self.right_column
};
arena.same_column(*hidden_column, *column)
arena.same_column(self.right_column, *column)
}
}

Expand Down Expand Up @@ -1048,4 +1037,4 @@ pub mod test {
assert!(!is_valid_identifier("____"));
}
}
// GRCOV_EXCL_STOP
// GRCOV_EXCL_STOP
Loading