Skip to content

Commit

Permalink
Ensure insert projections are of correct type (#5049)
Browse files Browse the repository at this point in the history
* Ensure insert projections are of correct type
  • Loading branch information
avantgardnerio authored Jan 24, 2023
1 parent 13dfdd6 commit c313601
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
21 changes: 13 additions & 8 deletions datafusion/sql/src/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ use datafusion_expr::utils::expr_to_columns;
use datafusion_expr::{
cast, col, CreateCatalog, CreateCatalogSchema,
CreateExternalTable as PlanCreateExternalTable, CreateMemoryTable, CreateView,
DescribeTable, DmlStatement, DropTable, DropView, Explain, Filter, LogicalPlan,
LogicalPlanBuilder, PlanType, SetVariable, ToStringifiedPlan, WriteOp,
DescribeTable, DmlStatement, DropTable, DropView, Explain, ExprSchemable, Filter,
LogicalPlan, LogicalPlanBuilder, PlanType, SetVariable, ToStringifiedPlan, WriteOp,
};
use sqlparser::ast;
use sqlparser::ast::{
Expand Down Expand Up @@ -753,7 +753,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
.schema_provider
.get_table_provider((&table_name).into())?;
let arrow_schema = (*provider.schema()).clone();
let table_schema = Arc::new(DFSchema::try_from(arrow_schema)?);
let table_schema = DFSchema::try_from(arrow_schema)?;

// infer types for Values clause... other types should be resolvable the regular way
let mut prepare_param_data_types = BTreeMap::new();
Expand Down Expand Up @@ -792,19 +792,24 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
"Column count doesn't match insert query!".to_owned(),
))?;
}
let exprs: Vec<_> = columns
let values_schema = source.schema();
let exprs = columns
.iter()
.zip(source.schema().fields().iter())
.map(|(c, f)| {
datafusion_expr::Expr::Column(Column::from(f.name().clone()))
.alias(c.value.clone())
let col_name = c.value.clone();
let col = table_schema.field_with_name(None, col_name.as_str())?;
let expr = datafusion_expr::Expr::Column(Column::from(f.name().clone()))
.alias(col_name)
.cast_to(col.data_type(), values_schema)?;
Ok(expr)
})
.collect();
.collect::<Result<Vec<datafusion_expr::Expr>>>()?;
let source = project(source, exprs)?;

let plan = LogicalPlan::Dml(DmlStatement {
table_name,
table_schema,
table_schema: Arc::new(table_schema),
op: WriteOp::Insert,
input: Arc::new(source),
});
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sql/tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn plan_insert() {
"insert into person (id, first_name, last_name) values (1, 'Alan', 'Turing')";
let plan = r#"
Dml: op=[Insert] table=[person]
Projection: column1 AS id, column2 AS first_name, column3 AS last_name
Projection: CAST(column1 AS id AS UInt32), column2 AS first_name, column3 AS last_name
Values: (Int64(1), Utf8("Alan"), Utf8("Turing"))
"#
.trim();
Expand Down

0 comments on commit c313601

Please sign in to comment.