Merge pull request #212 from cipherstash/rh/bump-sqltk

feat: Upgrades to sqltk v0.6.0

Author: damncabbage

Cargo.lock

@@ -35,8 +35,7 @@ strip = "none"
 debug = true
 
 [workspace.dependencies]
-sqltk = { version = "0.5.0" }
-sqltk-parser = { version = "0.52.0" }
+sqltk = { version = "0.6.0" }
 thiserror = "2.0.9"
 tokio = { version = "1.44", features = ["full"] }
 tracing = "0.1"

Cargo.toml

@@ -41,7 +41,6 @@ serde = "1.0"
 serde_json = "1.0"
 socket2 = "0.5.7"
 sqltk = { workspace = true }
-sqltk-parser = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-postgres = { version = "0.7", features = [

packages/cipherstash-proxy/Cargo.toml

@@ -4,7 +4,7 @@ use crate::error::Error;
 use crate::{connect, log::SCHEMA};
 use arc_swap::ArcSwap;
 use eql_mapper::{Column, Schema, Table};
-use sqltk_parser::ast::Ident;
+use sqltk::parser::ast::Ident;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::{task::JoinHandle, time};

packages/cipherstash-proxy/src/encrypt/schema/manager.rs

@@ -3,7 +3,7 @@ use cipherstash_client::{
     zerokms::{encrypted_record, EncryptedRecord},
 };
 use serde::{Deserialize, Serialize};
-use sqltk_parser::ast::Ident;
+use sqltk::parser::ast::Ident;
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Plaintext {

packages/cipherstash-proxy/src/eql/mod.rs

@@ -324,8 +324,8 @@ impl From<serde_json::Error> for Error {
     }
 }
 
-impl From<sqltk_parser::parser::ParserError> for Error {
-    fn from(e: sqltk_parser::parser::ParserError) -> Self {
+impl From<sqltk::parser::parser::ParserError> for Error {
+    fn from(e: sqltk::parser::parser::ParserError) -> Self {
         Error::Mapping(MappingError::InvalidSqlStatement(e.to_string()))
     }
 }

packages/cipherstash-proxy/src/error.rs

@@ -11,7 +11,7 @@ use cipherstash_config::ColumnType;
 use postgres_types::FromSql;
 use postgres_types::Type;
 use rust_decimal::Decimal;
-use sqltk_parser::ast::Value;
+use sqltk::parser::ast::Value;
 use std::str::FromStr;
 use tracing::debug;
 

packages/cipherstash-proxy/src/postgresql/data/from_sql.rs

@@ -30,10 +30,10 @@ use eql_mapper::{self, EqlMapperError, EqlValue, TableColumn, TypeCheckedStateme
 use metrics::{counter, histogram};
 use pg_escape::quote_literal;
 use serde::Serialize;
+use sqltk::parser::ast::{self, Value};
+use sqltk::parser::dialect::PostgreSqlDialect;
+use sqltk::parser::parser::Parser;
 use sqltk::NodeKey;
-use sqltk_parser::ast::{self, Value};
-use sqltk_parser::dialect::PostgreSqlDialect;
-use sqltk_parser::parser::Parser;
 use std::collections::HashMap;
 use std::time::Instant;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};

packages/cipherstash-proxy/src/postgresql/frontend.rs

@@ -16,7 +16,6 @@ derive_more = { version = "^1.0", features = ["display", "constructor"] }
 impl-trait-for-tuples = "0.2.3"
 itertools = "^0.13"
 sqltk = { workspace = true }
-sqltk-parser = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }

packages/eql-mapper/Cargo.toml

@@ -3,10 +3,10 @@ use std::{
     fmt::{Debug, Display},
 };
 
-use sqltk::NodeKey;
-use sqltk_parser::ast::{
+use sqltk::parser::ast::{
     Delete, Expr, Function, Insert, Query, Select, SelectItem, SetExpr, Statement, Value, Values,
 };
+use sqltk::NodeKey;
 
 use crate::{EqlValue, Param, Type};
 
@@ -108,7 +108,7 @@ impl Display for Fmt<&Vec<(Param, crate::Value)>> {
     }
 }
 
-impl Display for Fmt<&Vec<(EqlValue, &sqltk_parser::ast::Value)>> {
+impl Display for Fmt<&Vec<(EqlValue, &sqltk::parser::ast::Value)>> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let formatted = self
             .0