This is an automated email from the ASF dual-hosted git repository.
goldmedal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new ee77d5889a fix: unparse for subqueryalias (#15068)
ee77d5889a is described below
commit ee77d5889af81dbc31bf6da81615e959af652816
Author: Chen Chongchen <[email protected]>
AuthorDate: Tue Mar 11 19:02:58 2025 +0800
fix: unparse for subqueryalias (#15068)
* fix: unparse for subqueryalias
* update
* move test
---
datafusion/sql/src/unparser/plan.rs | 11 +++++-
datafusion/sql/tests/cases/plan_to_sql.rs | 66 ++++++++++++++++++++++++++++++-
2 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/datafusion/sql/src/unparser/plan.rs
b/datafusion/sql/src/unparser/plan.rs
index 0fa203c60b..b14fbdff23 100644
--- a/datafusion/sql/src/unparser/plan.rs
+++ b/datafusion/sql/src/unparser/plan.rs
@@ -984,11 +984,18 @@ impl Unparser<'_> {
Ok(Some(builder.build()?))
}
LogicalPlan::SubqueryAlias(subquery_alias) => {
- Self::unparse_table_scan_pushdown(
+ let ret = Self::unparse_table_scan_pushdown(
&subquery_alias.input,
Some(subquery_alias.alias.clone()),
already_projected,
- )
+ )?;
+ if let Some(alias) = alias {
+ if let Some(plan) = ret {
+ let plan =
LogicalPlanBuilder::new(plan).alias(alias)?.build()?;
+ return Ok(Some(plan));
+ }
+ }
+ Ok(ret)
}
// SubqueryAlias could be rewritten to a plan with a projection as
the top node by [rewrite::subquery_alias_inner_query_and_columns].
// The inner table scan could be a scan with pushdown operations.
diff --git a/datafusion/sql/tests/cases/plan_to_sql.rs
b/datafusion/sql/tests/cases/plan_to_sql.rs
index 5af93a01e6..fc0b7a26ba 100644
--- a/datafusion/sql/tests/cases/plan_to_sql.rs
+++ b/datafusion/sql/tests/cases/plan_to_sql.rs
@@ -21,7 +21,7 @@ use datafusion_expr::test::function_stub::{
count_udaf, max_udaf, min_udaf, sum, sum_udaf,
};
use datafusion_expr::{
- col, lit, table_scan, wildcard, EmptyRelation, Expr, Extension,
LogicalPlan,
+ cast, col, lit, table_scan, wildcard, EmptyRelation, Expr, Extension,
LogicalPlan,
LogicalPlanBuilder, Union, UserDefinedLogicalNode,
UserDefinedLogicalNodeCore,
};
use datafusion_functions::unicode;
@@ -37,6 +37,7 @@ use datafusion_sql::unparser::dialect::{
use datafusion_sql::unparser::{expr_to_sql, plan_to_sql, Unparser};
use sqlparser::ast::Statement;
use std::hash::Hash;
+use std::ops::Add;
use std::sync::Arc;
use std::{fmt, vec};
@@ -1687,3 +1688,66 @@ fn test_unparse_optimized_multi_union() -> Result<()> {
Ok(())
}
+
+/// Test unparse the optimized plan from the following SQL:
+/// ```
+/// SELECT
+/// customer_view.c_custkey,
+/// customer_view.c_name,
+/// customer_view.custkey_plus
+/// FROM
+/// (
+/// SELECT
+/// customer.c_custkey,
+/// customer.c_name,
+/// customer.custkey_plus
+/// FROM
+/// (
+/// SELECT
+/// customer.c_custkey,
+/// CAST(customer.c_custkey AS BIGINT) + 1 AS custkey_plus,
+/// customer.c_name
+/// FROM
+/// (
+/// SELECT
+/// customer.c_custkey AS c_custkey,
+/// customer.c_name AS c_name
+/// FROM
+/// customer
+/// ) AS customer
+/// ) AS customer
+/// ) AS customer_view
+/// ```
+#[test]
+fn test_unparse_subquery_alias_with_table_pushdown() -> Result<()> {
+ let schema = Schema::new(vec![
+ Field::new("c_custkey", DataType::Int32, false),
+ Field::new("c_name", DataType::Utf8, false),
+ ]);
+
+ let table_scan = table_scan(Some("customer"), &schema, Some(vec![0,
1]))?.build()?;
+
+ let plan = LogicalPlanBuilder::from(table_scan)
+ .alias("customer")?
+ .project(vec![
+ col("customer.c_custkey"),
+ cast(col("customer.c_custkey"), DataType::Int64)
+ .add(lit(1))
+ .alias("custkey_plus"),
+ col("customer.c_name"),
+ ])?
+ .alias("customer")?
+ .project(vec![
+ col("customer.c_custkey"),
+ col("customer.c_name"),
+ col("customer.custkey_plus"),
+ ])?
+ .alias("customer_view")?
+ .build()?;
+
+ let unparser = Unparser::default();
+ let sql = unparser.plan_to_sql(&plan)?;
+ let expected = "SELECT customer_view.c_custkey, customer_view.c_name,
customer_view.custkey_plus FROM (SELECT customer.c_custkey,
(CAST(customer.c_custkey AS BIGINT) + 1) AS custkey_plus, customer.c_name FROM
(SELECT customer.c_custkey, customer.c_name FROM customer AS customer) AS
customer) AS customer_view";
+ assert_eq!(sql.to_string(), expected);
+ Ok(())
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
