Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/datafusion_integration/hooks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,11 @@ impl QueryHook for ShowDatabasesHook {
#[cfg(test)]
mod tests {
use super::*;
use datafusion::sql::sqlparser::dialect::GenericDialect;
use datafusion::sql::sqlparser::dialect::PostgreSqlDialect;
use datafusion::sql::sqlparser::parser::Parser;

fn parse_statement(sql: &str) -> Statement {
let dialect = GenericDialect {};
let dialect = PostgreSqlDialect {};
Parser::parse_sql(&dialect, sql).unwrap().pop().unwrap()
}

Expand Down
4 changes: 2 additions & 2 deletions src/datafusion_integration/json_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
//! ensuring JSON paths inside string literals are not converted.

use crate::kubernetes::discovery::DEFAULT_JSON_OBJECT_COLUMNS;
use datafusion::sql::sqlparser::dialect::GenericDialect;
use datafusion::sql::sqlparser::dialect::PostgreSqlDialect;
use datafusion::sql::sqlparser::tokenizer::{Token, Tokenizer};
use std::collections::HashSet;

Expand Down Expand Up @@ -371,7 +371,7 @@ pub fn preprocess_json_paths(sql: &str, json_columns: Option<&HashSet<String>>)
let default_columns = build_json_columns_set(&[]);
let json_columns = json_columns.unwrap_or(&default_columns);

let dialect = GenericDialect {};
let dialect = PostgreSqlDialect {};
let mut tokenizer = Tokenizer::new(&dialect, sql);

let tokens = match tokenizer.tokenize() {
Expand Down
8 changes: 4 additions & 4 deletions src/datafusion_integration/preprocess.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
use super::{json_path, prql};
use anyhow::Result;
use datafusion::sql::sqlparser::ast::Statement;
use datafusion::sql::sqlparser::dialect::GenericDialect;
use datafusion::sql::sqlparser::dialect::PostgreSqlDialect;
use datafusion::sql::sqlparser::parser::Parser;
use regex::Regex;
use std::sync::LazyLock;
Expand Down Expand Up @@ -179,7 +179,7 @@ pub fn preprocess_sql(sql: &str) -> Result<String> {
/// This function rejects any DDL (CREATE, DROP, ALTER) or DML (INSERT, UPDATE, DELETE)
/// statements with a clear error message.
pub fn validate_read_only(sql: &str) -> anyhow::Result<()> {
let dialect = GenericDialect {};
let dialect = PostgreSqlDialect {};
let statements =
Parser::parse_sql(&dialect, sql).map_err(|e| anyhow::anyhow!("SQL parse error: {}", e))?;

Expand Down Expand Up @@ -505,10 +505,10 @@ mod tests {
#[test]
fn test_parser_supports_chained_arrows() {
// Test if DataFusion's SQL parser natively supports chained arrow operators
use datafusion::sql::sqlparser::dialect::GenericDialect;
use datafusion::sql::sqlparser::dialect::PostgreSqlDialect;
use datafusion::sql::sqlparser::parser::Parser;

let dialect = GenericDialect {};
let dialect = PostgreSqlDialect {};

// Test chained arrows WITHOUT preprocessing
let sql = "SELECT spec->'selector'->>'app' FROM pods";
Expand Down