compiles

Author: alamb

datafusion/common/src/utils/mod.rs

@@ -726,10 +726,10 @@ pub fn combine_limit(
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use crate::ScalarValue::Null;
     use arrow::array::Float64Array;
     use sqlparser::tokenizer::Span;
-    use super::*;
 
     #[test]
     fn test_bisect_linear_left_and_right() -> Result<()> {

datafusion/sql/src/statement.rs

@@ -694,11 +694,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                 // SHOW TABLES IN/FROM are equivalent, this field specifies which the user
                 // specified, but it doesn't affect the plan so ignore the field
                 //clause: _,
-            } =>
-                {
-                    todo!("Update show tables/ fix for new syntax");
-                    // self.show_tables_to_plan(extended, full, db_name, filter)
-                },
+            } => {
+                todo!("Update show tables/ fix for new syntax");
+                // self.show_tables_to_plan(extended, full, db_name, filter)
+            }
 
             Statement::ShowColumns {
                 extended,
@@ -709,7 +708,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
             } => {
                 todo!("Update show columns / fix for new syntax");
                 //self.show_columns_to_plan(extended, full, table_name, filter)
-            },
+            }
 
             Statement::Insert(Insert {
                 or,

datafusion/sql/src/unparser/dialect.rs

@@ -18,15 +18,15 @@
 use std::sync::Arc;
 
 use arrow_schema::TimeUnit;
+use datafusion_common::Result;
 use datafusion_expr::Expr;
 use regex::Regex;
+use sqlparser::tokenizer::Span;
 use sqlparser::{
     ast::{self, Function, Ident, ObjectName, TimezoneInfo},
     keywords::ALL_KEYWORDS,
 };
 
-use datafusion_common::Result;
-
 use super::{utils::character_length_to_sql, utils::date_part_to_sql, Unparser};
 
 /// `Dialect` to use for Unparsing

datafusion/sql/src/unparser/expr.rs

@@ -35,8 +35,6 @@ use arrow_array::types::{
 };
 use arrow_array::{Date32Array, Date64Array, PrimitiveArray};
 use arrow_schema::DataType;
-use sqlparser::ast::helpers::attached_token::AttachedToken;
-use sqlparser::tokenizer::Span;
 use datafusion_common::{
     internal_datafusion_err, internal_err, not_impl_err, plan_err, Column, Result,
     ScalarValue,
@@ -45,6 +43,8 @@ use datafusion_expr::{
     expr::{Alias, Exists, InList, ScalarFunction, Sort, WindowFunction},
     Between, BinaryExpr, Case, Cast, Expr, GroupingSet, Like, Operator, TryCast,
 };
+use sqlparser::ast::helpers::attached_token::AttachedToken;
+use sqlparser::tokenizer::Span;
 
 /// Convert a DataFusion [`Expr`] to [`ast::Expr`]
 ///
@@ -412,7 +412,10 @@ impl Unparser<'_> {
                 if let Some(qualifier) = qualifier {
                     let idents: Vec<Ident> =
                         qualifier.to_vec().into_iter().map(Ident::new).collect();
-                    Ok(ast::Expr::QualifiedWildcard(ObjectName(idents), attached_token))
+                    Ok(ast::Expr::QualifiedWildcard(
+                        ObjectName(idents),
+                        attached_token,
+                    ))
                 } else {
                     Ok(ast::Expr::Wildcard(attached_token))
                 }
@@ -1490,7 +1493,6 @@ impl Unparser<'_> {
                 value: "UNNEST".to_string(),
                 quote_style: None,
                 span: Span::empty(),
-
             }]),
             args: ast::FunctionArguments::List(ast::FunctionArgumentList {
                 duplicate_treatment: None,

datafusion/sql/src/unparser/plan.rs

@@ -42,7 +42,7 @@ use datafusion_expr::{
     expr::Alias, BinaryExpr, Distinct, Expr, JoinConstraint, JoinType, LogicalPlan,
     LogicalPlanBuilder, Operator, Projection, SortExpr, TableScan,
 };
-use sqlparser::ast::{self, Ident, SetExpr};
+use sqlparser::ast::{self, Ident, SetExpr, TableAliasColumnDef};
 use std::sync::Arc;
 
 /// Convert a DataFusion [`LogicalPlan`] to [`ast::Statement`]
@@ -1006,6 +1006,13 @@ impl Unparser<'_> {
     }
 
     fn new_table_alias(&self, alias: String, columns: Vec<Ident>) -> ast::TableAlias {
+        let columns = columns
+            .into_iter()
+            .map(|ident| TableAliasColumnDef {
+                name: ident,
+                data_type: None,
+            })
+            .collect();
         ast::TableAlias {
             name: self.new_ident_quoted_if_needs(alias),
             columns,

datafusion/sql/src/unparser/utils.rs

@@ -17,6 +17,10 @@
 
 use std::{cmp::Ordering, sync::Arc, vec};
 
+use super::{
+    dialect::CharacterLengthStyle, dialect::DateFieldExtractStyle,
+    rewrite::TableAliasRewriter, Unparser,
+};
 use datafusion_common::{
     internal_err,
     tree_node::{Transformed, TransformedResult, TreeNode},
@@ -28,10 +32,6 @@ use datafusion_expr::{
 };
 use sqlparser::ast;
 use sqlparser::tokenizer::Span;
-use super::{
-    dialect::CharacterLengthStyle, dialect::DateFieldExtractStyle,
-    rewrite::TableAliasRewriter, Unparser,
-};
 
 /// Recursively searches children of [LogicalPlan] to find an Aggregate node if exists
 /// prior to encountering a Join, TableScan, or a nested subquery (derived table factor).