Skip to content

Commit aecd276

Browse files
committed
Upgrade sqlparser version, sync between main and arrow crates
1 parent afa8a71 commit aecd276

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

convergence-arrow/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ repository = "https://github.com/returnString/convergence"
99

1010
[dependencies]
1111
tokio = { version = "1" }
12-
sqlparser = "0.37"
1312
async-trait = "0.1"
1413
datafusion = "31"
1514
convergence = { path = "../convergence", version = "0.14.0" }

convergence-arrow/src/datafusion.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use async_trait::async_trait;
55
use convergence::engine::{Engine, Portal};
66
use convergence::protocol::{ErrorResponse, FieldDescription, SqlState};
77
use convergence::protocol_ext::DataRowBatch;
8+
use convergence::sqlparser::ast::{Expr, GroupByExpr, Query, Select, SelectItem, SetExpr, Statement, Value};
89
use datafusion::error::DataFusionError;
910
use datafusion::prelude::*;
10-
use sqlparser::ast::{Expr, Query, Select, SelectItem, SetExpr, Statement, Value};
1111

1212
fn df_err_to_sql(err: DataFusionError) -> ErrorResponse {
1313
ErrorResponse::error(SqlState::DataException, err.to_string())
@@ -29,7 +29,7 @@ fn dummy_query() -> Statement {
2929
cluster_by: vec![],
3030
distinct: None,
3131
distribute_by: vec![],
32-
group_by: vec![],
32+
group_by: GroupByExpr::Expressions(vec![]),
3333
from: vec![],
3434
having: None,
3535
lateral_views: vec![],

convergence-arrow/tests/test_arrow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use convergence::engine::{Engine, Portal};
44
use convergence::protocol::{ErrorResponse, FieldDescription};
55
use convergence::protocol_ext::DataRowBatch;
66
use convergence::server::{self, BindOptions};
7+
use convergence::sqlparser::ast::Statement;
78
use convergence_arrow::table::{record_batch_to_rows, schema_to_field_desc};
89
use datafusion::arrow::array::{ArrayRef, Date32Array, Float32Array, Int32Array, StringArray, TimestampSecondArray};
910
use datafusion::arrow::datatypes::{DataType, Field, Schema, TimeUnit};
1011
use datafusion::arrow::record_batch::RecordBatch;
11-
use sqlparser::ast::Statement;
1212
use std::sync::Arc;
1313
use tokio_postgres::{connect, NoTls};
1414

convergence/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tokio-util = { version = "0.7", features = [ "codec" ] }
1313
thiserror = "1"
1414
bytes = "1"
1515
futures = "0.3"
16-
sqlparser = "0.37"
16+
sqlparser = "0.38"
1717
async-trait = "0.1"
1818
chrono = "0.4"
1919

convergence/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ pub mod engine;
77
pub mod protocol;
88
pub mod protocol_ext;
99
pub mod server;
10+
11+
pub use sqlparser;

0 commit comments

Comments
 (0)