moer updates

apache · Dec 4, 2024 · 14e50a1 · 14e50a1
1 parent 0249eee
commit 14e50a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs
@@ -594,6 +594,8 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
             | SQLDataType::TinyText
             | SQLDataType::MediumText
             | SQLDataType::LongText
+            | SQLDataType::Bit(_)
+            |SQLDataType::BitVarying(_)
             => not_impl_err!(
                 "Unsupported SQL type {sql_type:?}"
             ),

diff --git a/datafusion/sql/src/statement.rs b/datafusion/sql/src/statement.rs
@@ -54,7 +54,9 @@ use datafusion_expr::{
     TransactionConclusion, TransactionEnd, TransactionIsolationLevel, TransactionStart,
     Volatility, WriteOp,
 };
-use sqlparser::ast::{self, ShowStatementIn, ShowStatementOptions, SqliteOnConflict};
+use sqlparser::ast::{
+    self, NullsDistinctOption, ShowStatementIn, ShowStatementOptions, SqliteOnConflict,
+};
 use sqlparser::ast::{
     Assignment, AssignmentTarget, ColumnDef, CreateIndex, CreateTable,
     CreateTableOptions, Delete, DescribeAlias, Expr as SQLExpr, FromTable, Ident, Insert,
@@ -107,6 +109,7 @@ fn calc_inline_constraints_from_columns(columns: &[ColumnDef]) -> Vec<TableConst
                     index_type_display: ast::KeyOrIndexDisplay::None,
                     index_type: None,
                     index_options: vec![],
+                    nulls_distinct: NullsDistinctOption::None,
                 }),
                 ast::ColumnOption::Unique {
                     is_primary: true,
@@ -894,12 +897,18 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
                 modes,
                 begin: false,
                 modifier,
+                transaction,
             } => {
                 if let Some(modifier) = modifier {
                     return not_impl_err!(
                         "Transaction modifier not supported: {modifier}"
                     );
                 }
+                if let Some(transaction) = transaction {
+                    return not_impl_err!(
+                        "Transaction kind not supported: {transaction}"
+                    );
+                }
                 let isolation_level: ast::TransactionIsolationLevel = modes
                     .iter()
                     .filter_map(|m: &TransactionMode| match m {
@@ -963,7 +972,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
                 });
                 Ok(LogicalPlan::Statement(statement))
             }
-            Statement::CreateFunction {
+            Statement::CreateFunction(ast::CreateFunction {
                 or_replace,
                 temporary,
                 name,
@@ -973,7 +982,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
                 behavior,
                 language,
                 ..
-            } => {
+            }) => {
                 let return_type = match return_type {
                     Some(t) => Some(self.convert_data_type(&t)?),
                     None => None,