Upgrade sqlparser and DataFusion

returnString · Jul 4, 2023 · 7aa803e · 7aa803e
1 parent 359bd30
commit 7aa803e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/convergence-arrow/Cargo.toml b/convergence-arrow/Cargo.toml
@@ -9,9 +9,9 @@ repository = "https://github.com/returnString/convergence"
 
 [dependencies]
 tokio = { version = "1" }
-sqlparser = "0.33"
+sqlparser = "0.35"
 async-trait = "0.1"
-datafusion = "23"
+datafusion = "27"
 convergence = { path = "../convergence", version = "0.11.0" }
 chrono = "0.4"
 

diff --git a/convergence-arrow/examples/datafusion.rs b/convergence-arrow/examples/datafusion.rs
@@ -2,8 +2,8 @@ use convergence::server::{self, BindOptions};
 use convergence_arrow::datafusion::DataFusionEngine;
 use convergence_arrow::metadata::Catalog;
 use datafusion::arrow::datatypes::DataType;
-use datafusion::catalog::catalog::{CatalogProvider, MemoryCatalogProvider};
 use datafusion::catalog::schema::MemorySchemaProvider;
+use datafusion::catalog::{CatalogProvider, MemoryCatalogProvider};
 use datafusion::logical_expr::Volatility;
 use datafusion::physical_plan::ColumnarValue;
 use datafusion::prelude::*;

diff --git a/convergence-arrow/src/datafusion.rs b/convergence-arrow/src/datafusion.rs
@@ -27,12 +27,13 @@ fn dummy_query() -> Statement {
 			sort_by: vec![],
 			selection: None,
 			cluster_by: vec![],
-			distinct: false,
+			distinct: None,
 			distribute_by: vec![],
 			group_by: vec![],
 			from: vec![],
 			having: None,
 			lateral_views: vec![],
+			named_window: vec![],
 		}))),
 		locks: vec![],
 		limit: None,

diff --git a/convergence-arrow/src/metadata.rs b/convergence-arrow/src/metadata.rs
@@ -3,8 +3,8 @@
 use datafusion::arrow::array::{ArrayRef, Int32Builder, StringBuilder, UInt32Builder};
 use datafusion::arrow::datatypes::{Field, Schema};
 use datafusion::arrow::record_batch::RecordBatch;
-use datafusion::catalog::catalog::CatalogProvider;
 use datafusion::catalog::schema::{MemorySchemaProvider, SchemaProvider};
+use datafusion::catalog::CatalogProvider;
 use datafusion::datasource::{MemTable, TableProvider};
 use datafusion::error::DataFusionError;
 use std::convert::TryInto;

diff --git a/convergence/Cargo.toml b/convergence/Cargo.toml
@@ -13,7 +13,7 @@ tokio-util = { version = "0.7", features = [ "codec" ] }
 thiserror = "1"
 bytes = "1"
 futures = "0.3"
-sqlparser = "0.33"
+sqlparser = "0.35"
 async-trait = "0.1"
 chrono = "0.4"