polyglot-sql 0.3.0__tar.gz → 0.3.1__tar.gz

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/Cargo.lock

@@ -587,7 +587,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "criterion",
  "once_cell",
@@ -602,7 +602,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-ffi"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "cbindgen",
  "polyglot-sql",
@@ -612,11 +612,11 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-function-catalogs"
-version = "0.3.0"
+version = "0.3.1"
 
 [[package]]
 name = "polyglot-sql-python"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "polyglot-sql",
  "pyo3",
@@ -627,7 +627,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-wasm"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/Cargo.toml

@@ -6,7 +6,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 license = "MIT"
 authors = ["polyglot contributors"]

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyglot-sql
-Version: 0.3.0
+Version: 0.3.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/crates/polyglot-sql/Cargo.toml

@@ -78,7 +78,7 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 unicode-segmentation = { workspace = true }
 ts-rs = { version = "12.0", features = ["serde-compat"], optional = true }
-polyglot-sql-function-catalogs = { path = "../polyglot-sql-function-catalogs", version = "0.3.0", optional = true, default-features = false }
+polyglot-sql-function-catalogs = { path = "../polyglot-sql-function-catalogs", version = "0.3.1", optional = true, default-features = false }
 
 [dev-dependencies]
 pretty_assertions = "1.4"

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/crates/polyglot-sql/src/builder.rs

@@ -1618,6 +1618,8 @@ impl SelectBuilder {
             using_template: None,
             rollup: None,
             uuid: None,
+            with_partition_columns: vec![],
+            with_connection: None,
         }))
     }
 

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/crates/polyglot-sql/src/dialects/mod.rs

@@ -543,6 +543,33 @@ where
 {
     use crate::expressions::BinaryOp;
 
+    // Helper macro to recurse into AggFunc-based expressions (this, filter, order_by, having_max, limit).
+    macro_rules! recurse_agg {
+        ($variant:ident, $f:expr) => {{
+            let mut f = $f;
+            f.this = transform_recursive(f.this, transform_fn)?;
+            if let Some(filter) = f.filter.take() {
+                f.filter = Some(transform_recursive(filter, transform_fn)?);
+            }
+            for ord in &mut f.order_by {
+                ord.this = transform_recursive(
+                    std::mem::replace(&mut ord.this, Expression::Null(crate::expressions::Null)),
+                    transform_fn,
+                )?;
+            }
+            if let Some((ref mut expr, _)) = f.having_max {
+                *expr = Box::new(transform_recursive(
+                    std::mem::replace(expr.as_mut(), Expression::Null(crate::expressions::Null)),
+                    transform_fn,
+                )?);
+            }
+            if let Some(limit) = f.limit.take() {
+                f.limit = Some(Box::new(transform_recursive(*limit, transform_fn)?));
+            }
+            Expression::$variant(f)
+        }};
+    }
+
     // Helper macro to transform binary ops with Box<BinaryOp>
     macro_rules! transform_binary {
         ($variant:ident, $op:expr) => {{
@@ -954,14 +981,9 @@ where
             f.this = transform_recursive(f.this, transform_fn)?;
             Expression::Date(f)
         }
-        Expression::Stddev(mut f) => {
-            f.this = transform_recursive(f.this, transform_fn)?;
-            Expression::Stddev(f)
-        }
-        Expression::Variance(mut f) => {
-            f.this = transform_recursive(f.this, transform_fn)?;
-            Expression::Variance(f)
-        }
+        Expression::Stddev(f) => recurse_agg!(Stddev, f),
+        Expression::StddevSamp(f) => recurse_agg!(StddevSamp, f),
+        Expression::Variance(f) => recurse_agg!(Variance, f),
 
         // ===== BinaryFunc-based expressions =====
         Expression::ModFunc(mut f) => {
@@ -1586,19 +1608,45 @@ where
             Expression::Filter(f)
         }
 
-        // BitwiseOrAgg/BitwiseAndAgg/BitwiseXorAgg: recurse into the aggregate argument
-        Expression::BitwiseOrAgg(mut f) => {
-            f.this = transform_recursive(f.this, transform_fn)?;
-            Expression::BitwiseOrAgg(f)
-        }
-        Expression::BitwiseAndAgg(mut f) => {
-            f.this = transform_recursive(f.this, transform_fn)?;
-            Expression::BitwiseAndAgg(f)
-        }
-        Expression::BitwiseXorAgg(mut f) => {
-            f.this = transform_recursive(f.this, transform_fn)?;
-            Expression::BitwiseXorAgg(f)
+        // Aggregate functions (AggFunc-based): recurse into the aggregate argument,
+        // filter, order_by, having_max, and limit.
+        // Stddev, StddevSamp, Variance, and ArrayAgg are handled earlier in this match.
+        Expression::Sum(f) => recurse_agg!(Sum, f),
+        Expression::Avg(f) => recurse_agg!(Avg, f),
+        Expression::Min(f) => recurse_agg!(Min, f),
+        Expression::Max(f) => recurse_agg!(Max, f),
+        Expression::CountIf(f) => recurse_agg!(CountIf, f),
+        Expression::StddevPop(f) => recurse_agg!(StddevPop, f),
+        Expression::VarPop(f) => recurse_agg!(VarPop, f),
+        Expression::VarSamp(f) => recurse_agg!(VarSamp, f),
+        Expression::Median(f) => recurse_agg!(Median, f),
+        Expression::Mode(f) => recurse_agg!(Mode, f),
+        Expression::First(f) => recurse_agg!(First, f),
+        Expression::Last(f) => recurse_agg!(Last, f),
+        Expression::AnyValue(f) => recurse_agg!(AnyValue, f),
+        Expression::ApproxDistinct(f) => recurse_agg!(ApproxDistinct, f),
+        Expression::ApproxCountDistinct(f) => recurse_agg!(ApproxCountDistinct, f),
+        Expression::LogicalAnd(f) => recurse_agg!(LogicalAnd, f),
+        Expression::LogicalOr(f) => recurse_agg!(LogicalOr, f),
+        Expression::Skewness(f) => recurse_agg!(Skewness, f),
+        Expression::ArrayConcatAgg(f) => recurse_agg!(ArrayConcatAgg, f),
+        Expression::ArrayUniqueAgg(f) => recurse_agg!(ArrayUniqueAgg, f),
+        Expression::BoolXorAgg(f) => recurse_agg!(BoolXorAgg, f),
+        Expression::BitwiseOrAgg(f) => recurse_agg!(BitwiseOrAgg, f),
+        Expression::BitwiseAndAgg(f) => recurse_agg!(BitwiseAndAgg, f),
+        Expression::BitwiseXorAgg(f) => recurse_agg!(BitwiseXorAgg, f),
+
+        // Count has its own struct with an Option<Expression> `this` field
+        Expression::Count(mut c) => {
+            if let Some(this) = c.this.take() {
+                c.this = Some(transform_recursive(this, transform_fn)?);
+            }
+            if let Some(filter) = c.filter.take() {
+                c.filter = Some(transform_recursive(filter, transform_fn)?);
+            }
+            Expression::Count(c)
         }
+
         Expression::PipeOperator(mut pipe) => {
             pipe.this = transform_recursive(pipe.this, transform_fn)?;
             pipe.expression = transform_recursive(pipe.expression, transform_fn)?;
@@ -29880,6 +29928,8 @@ impl Dialect {
                             using_template: None,
                             rollup: None,
                             uuid: None,
+                            with_partition_columns: Vec::new(),
+                            with_connection: None,
                         };
                         return Expression::CreateTable(Box::new(ct));
                     }

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/crates/polyglot-sql/src/expressions.rs

@@ -7344,6 +7344,15 @@ pub struct CreateTable {
     /// ClickHouse: UUID 'xxx' clause after table name
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub uuid: Option<String>,
+    /// WITH PARTITION COLUMNS (col_name col_type, ...) — currently used by BigQuery
+    /// for hive-partitioned external tables. Not dialect-prefixed since the syntax
+    /// could appear in other engines.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub with_partition_columns: Vec<ColumnDef>,
+    /// WITH CONNECTION `project.region.connection` — currently used by BigQuery
+    /// for external tables that reference a Cloud Resource connection.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub with_connection: Option<TableRef>,
 }
 
 /// Teradata index specification for CREATE TABLE
@@ -7411,6 +7420,8 @@ impl CreateTable {
             using_template: None,
             rollup: None,
             uuid: None,
+            with_partition_columns: Vec::new(),
+            with_connection: None,
         }
     }
 }

{polyglot_sql-0.3.0 → polyglot_sql-0.3.1}/crates/polyglot-sql/src/generator.rs

@@ -7947,6 +7947,51 @@ impl Generator {
             self.generate_expression(&on_prop.this)?;
         }
 
+        // BigQuery: WITH PARTITION COLUMNS (col_name col_type, ...)
+        if !ct.with_partition_columns.is_empty() {
+            if self.config.pretty {
+                self.write_newline();
+            } else {
+                self.write_space();
+            }
+            self.write_keyword("WITH PARTITION COLUMNS");
+            self.write(" (");
+            if self.config.pretty {
+                self.write_newline();
+                self.indent_level += 1;
+                for (i, col) in ct.with_partition_columns.iter().enumerate() {
+                    if i > 0 {
+                        self.write(",");
+                        self.write_newline();
+                    }
+                    self.write_indent();
+                    self.generate_column_def(col)?;
+                }
+                self.indent_level -= 1;
+                self.write_newline();
+            } else {
+                for (i, col) in ct.with_partition_columns.iter().enumerate() {
+                    if i > 0 {
+                        self.write(", ");
+                    }
+                    self.generate_column_def(col)?;
+                }
+            }
+            self.write(")");
+        }
+
+        // BigQuery: WITH CONNECTION `project.region.connection`
+        if let Some(ref conn) = ct.with_connection {
+            if self.config.pretty {
+                self.write_newline();
+            } else {
+                self.write_space();
+            }
+            self.write_keyword("WITH CONNECTION");
+            self.write_space();
+            self.generate_table(conn)?;
+        }
+
         // Output SchemaCommentProperty BEFORE WITH properties (Presto/Hive/Spark style)
         // For ClickHouse, SchemaCommentProperty goes after AS SELECT, handled later
         if !is_clickhouse {