polyglot-sql 0.3.6__tar.gz → 0.3.7__tar.gz

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/Cargo.lock

@@ -605,7 +605,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "criterion",
  "once_cell",
@@ -621,7 +621,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-ffi"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "cbindgen",
  "polyglot-sql",
@@ -631,11 +631,11 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-function-catalogs"
-version = "0.3.6"
+version = "0.3.7"
 
 [[package]]
 name = "polyglot-sql-python"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "polyglot-sql",
  "pyo3",
@@ -646,7 +646,7 @@ dependencies = [
 
 [[package]]
 name = "polyglot-sql-wasm"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/Cargo.toml

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

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/PKG-INFO

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

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/Cargo.toml

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

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/builder.rs

@@ -294,6 +294,8 @@ pub fn alias(expr: Expr, name: &str) -> Expr {
         this: expr.0,
         alias: builder_identifier(name),
         column_aliases: Vec::new(),
+        alias_explicit_as: false,
+        alias_keyword: None,
         pre_alias_comments: Vec::new(),
         trailing_comments: Vec::new(),
         inferred_type: None,
@@ -1955,6 +1957,8 @@ pub fn subquery_expr(expr: Expression, alias_name: &str) -> Expr {
         this: expr,
         alias: Some(builder_identifier(alias_name)),
         column_aliases: Vec::new(),
+        alias_explicit_as: false,
+        alias_keyword: None,
         order_by: None,
         limit: None,
         offset: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/bigquery.rs

@@ -683,6 +683,8 @@ impl DialectImpl for BigQueryDialect {
                     this: unnest,
                     alias: Identifier::new("_col"),
                     column_aliases: Vec::new(),
+                    alias_explicit_as: false,
+                    alias_keyword: None,
                     pre_alias_comments: Vec::new(),
                     trailing_comments: Vec::new(),
                     inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/clickhouse.rs

@@ -42,6 +42,10 @@ impl DialectImpl for ClickHouseDialect {
         config.hex_string_is_integer_type = true;
         // ClickHouse allows underscores as digit separators in numeric literals
         config.numbers_can_be_underscore_separated = true;
+        // SQLGlot tokenizes malformed SHOW LIKE probes such as `'a\' or 1=1`.
+        config.recover_terminal_backslash_quote = true;
+        // The ClickHouse corpus includes partial string probes extracted from shell tests.
+        config.recover_unterminated_string = true;
         config
     }
 
@@ -249,6 +253,12 @@ impl DialectImpl for ClickHouseDialect {
             // IF(cond, true, false) -> CASE WHEN cond THEN true ELSE false END
             Expression::IfFunc(f) => {
                 let f = *f;
+                let has_aliased_arg = matches!(f.condition, Expression::Alias(_))
+                    || matches!(f.true_value, Expression::Alias(_))
+                    || matches!(f.false_value.as_ref(), Some(Expression::Alias(_)));
+                if has_aliased_arg {
+                    return Ok(Expression::IfFunc(Box::new(f)));
+                }
                 Ok(Expression::Case(Box::new(Case {
                     operand: None,
                     whens: vec![(f.condition, f.true_value)],

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/databricks.rs

@@ -225,6 +225,8 @@ impl DatabricksDialect {
                                     this: pair[1].clone(),
                                     alias: crate::expressions::Identifier::new(field_name),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     pre_alias_comments: Vec::new(),
                                     trailing_comments: Vec::new(),
                                     inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/duckdb.rs

@@ -1212,6 +1212,8 @@ impl DialectImpl for DuckDBDialect {
                                         this: value,
                                         alias,
                                         column_aliases: Vec::new(),
+                                        alias_explicit_as: false,
+                                        alias_keyword: None,
                                         pre_alias_comments: Vec::new(),
                                         trailing_comments: Vec::new(),
                                         inferred_type: None,
@@ -1418,6 +1420,8 @@ impl DuckDBDialect {
                             this: stmt,
                             alias: None,
                             column_aliases: Vec::new(),
+                            alias_explicit_as: false,
+                            alias_keyword: None,
                             order_by: None,
                             limit: None,
                             offset: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/mod.rs

@@ -4605,6 +4605,8 @@ impl Dialect {
                     Identifier::new(&alias_name),
                     Identifier::new("this"),
                 ],
+                alias_explicit_as: false,
+                alias_keyword: None,
                 pre_alias_comments: vec![],
                 trailing_comments: vec![],
                 inferred_type: None,
@@ -4695,6 +4697,8 @@ impl Dialect {
                     this: dateadd.clone(),
                     alias: Identifier::new(alias_name),
                     column_aliases: vec![],
+                    alias_explicit_as: false,
+                    alias_keyword: None,
                     pre_alias_comments: vec![],
                     trailing_comments: vec![],
                     inferred_type: None,
@@ -4707,6 +4711,8 @@ impl Dialect {
                     this: new_this,
                     alias: a.alias.clone(),
                     column_aliases: a.column_aliases.clone(),
+                    alias_explicit_as: false,
+                    alias_keyword: None,
                     pre_alias_comments: a.pre_alias_comments.clone(),
                     trailing_comments: a.trailing_comments.clone(),
                     inferred_type: None,
@@ -4916,6 +4922,8 @@ impl Dialect {
                 Identifier::new(&col_name),
                 Identifier::new("this"),
             ],
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: vec![],
             trailing_comments: vec![],
             inferred_type: None,
@@ -4960,6 +4968,8 @@ impl Dialect {
             this: dateadd_expr,
             alias: Identifier::new(&col_name),
             column_aliases: vec![],
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: vec![],
             trailing_comments: vec![],
             inferred_type: None,
@@ -4977,6 +4987,8 @@ impl Dialect {
             this: inner_select_expr,
             alias: None,
             column_aliases: vec![],
+            alias_explicit_as: false,
+            alias_keyword: None,
             order_by: None,
             limit: None,
             offset: None,
@@ -4995,6 +5007,8 @@ impl Dialect {
                 this: subquery,
                 alias: Identifier::new(&alias_name),
                 column_aliases: col_aliases,
+                alias_explicit_as: false,
+                alias_keyword: None,
                 pre_alias_comments: vec![],
                 trailing_comments: vec![],
                 inferred_type: None,
@@ -5080,6 +5094,8 @@ impl Dialect {
                 Identifier::new(col_name),
                 Identifier::new("this"),
             ],
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: vec![],
             trailing_comments: vec![],
             inferred_type: None,
@@ -5122,6 +5138,8 @@ impl Dialect {
             this: dateadd_expr,
             alias: Identifier::new(col_name),
             column_aliases: vec![],
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: vec![],
             trailing_comments: vec![],
             inferred_type: None,
@@ -5139,6 +5157,8 @@ impl Dialect {
             this: Expression::Select(Box::new(inner_select)),
             alias: None,
             column_aliases: vec![],
+            alias_explicit_as: false,
+            alias_keyword: None,
             order_by: None,
             limit: None,
             offset: None,
@@ -5183,6 +5203,8 @@ impl Dialect {
             this: Expression::Select(Box::new(outer_select)),
             alias: None,
             column_aliases: vec![],
+            alias_explicit_as: false,
+            alias_keyword: None,
             order_by: None,
             limit: None,
             offset: None,
@@ -5776,6 +5798,8 @@ impl Dialect {
                                     this: Expression::Values(vals.clone()),
                                     alias: Some(Identifier::new("_values".to_string())),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     order_by: None,
                                     limit: None,
                                     offset: None,
@@ -6398,6 +6422,8 @@ impl Dialect {
                                     this: Expression::Select(Box::new(inner_select)),
                                     alias: Some(a.alias.clone()),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     order_by: None,
                                     limit: None,
                                     offset: None,
@@ -6505,6 +6531,8 @@ impl Dialect {
                                                                 this: unnest_expr,
                                                                 alias: Identifier::new("_t0"),
                                                                 column_aliases: vec![alias.clone()],
+                                                                alias_explicit_as: false,
+                                                                alias_keyword: None,
                                                                 pre_alias_comments: vec![],
                                                                 trailing_comments: vec![],
                                                                 inferred_type: None,
@@ -6517,6 +6545,8 @@ impl Dialect {
                                                                 this: unnest_expr,
                                                                 alias: alias.clone(),
                                                                 column_aliases: vec![],
+                                                                alias_explicit_as: false,
+                                                                alias_keyword: None,
                                                                 pre_alias_comments: vec![],
                                                                 trailing_comments: vec![],
                                                                 inferred_type: None,
@@ -9756,6 +9786,8 @@ impl Dialect {
                                     this: Expression::Select(Box::new(new_select)),
                                     alias: None,
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     order_by: None,
                                     limit: None,
                                     offset: None,
@@ -21143,6 +21175,8 @@ impl Dialect {
                                                 this: unnest_expr,
                                                 alias: u_id.clone(),
                                                 column_aliases: Vec::new(),
+                                                alias_explicit_as: false,
+                                                alias_keyword: None,
                                                 pre_alias_comments: Vec::new(),
                                                 trailing_comments: Vec::new(),
                                                 inferred_type: None,
@@ -28077,6 +28111,8 @@ impl Dialect {
                                             )),
                                             alias: Identifier::new("_t0"),
                                             column_aliases: vec![Identifier::new(&param_name)],
+                                            alias_explicit_as: false,
+                                            alias_keyword: None,
                                             pre_alias_comments: Vec::new(),
                                             trailing_comments: Vec::new(),
                                             inferred_type: None,
@@ -30368,6 +30404,8 @@ impl Dialect {
                                         this: unnest_expr,
                                         alias: u_id.clone(),
                                         column_aliases: Vec::new(),
+                                        alias_explicit_as: false,
+                                        alias_keyword: None,
                                         pre_alias_comments: Vec::new(),
                                         trailing_comments: Vec::new(),
                                         inferred_type: None,
@@ -31026,6 +31064,8 @@ impl Dialect {
                 this: series_unnest_expr,
                 alias: Identifier::new(series_source_alias.clone()),
                 column_aliases: col_aliases,
+                alias_explicit_as: false,
+                alias_keyword: None,
                 pre_alias_comments: Vec::new(),
                 trailing_comments: Vec::new(),
                 inferred_type: None,
@@ -31069,6 +31109,8 @@ impl Dialect {
                             Identifier::new(actual_col_name.clone()),
                             Identifier::new(info.pos_alias.clone()),
                         ],
+                        alias_explicit_as: false,
+                        alias_keyword: None,
                         pre_alias_comments: Vec::new(),
                         trailing_comments: Vec::new(),
                         inferred_type: None,
@@ -31100,6 +31142,8 @@ impl Dialect {
                             Identifier::new(actual_col_name.clone()),
                             Identifier::new("this".to_string()),
                         ],
+                        alias_explicit_as: false,
+                        alias_keyword: None,
                         pre_alias_comments: Vec::new(),
                         trailing_comments: Vec::new(),
                         inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/snowflake.rs

@@ -117,6 +117,8 @@ impl DialectImpl for SnowflakeDialect {
                     this: inner,
                     alias: None,
                     column_aliases: Vec::new(),
+                    alias_explicit_as: false,
+                    alias_keyword: None,
                     order_by: None,
                     limit: None,
                     offset: None,
@@ -394,6 +396,8 @@ impl DialectImpl for SnowflakeDialect {
                         crate::expressions::Identifier::new("value"),
                         crate::expressions::Identifier::new("this"),
                     ],
+                    alias_explicit_as: false,
+                    alias_keyword: None,
                     pre_alias_comments: vec![],
                     trailing_comments: vec![],
                     inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/spark.rs

@@ -628,6 +628,8 @@ impl SparkDialect {
                                     this: arg,
                                     alias: crate::expressions::Identifier::new(&name),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     pre_alias_comments: Vec::new(),
                                     trailing_comments: Vec::new(),
                                     inferred_type: None,
@@ -640,6 +642,8 @@ impl SparkDialect {
                                     this: arg,
                                     alias: crate::expressions::Identifier::new(&name),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     pre_alias_comments: Vec::new(),
                                     trailing_comments: Vec::new(),
                                     inferred_type: None,
@@ -673,6 +677,8 @@ impl SparkDialect {
                                     this: pair[1].clone(),
                                     alias: crate::expressions::Identifier::new(field_name),
                                     column_aliases: Vec::new(),
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     pre_alias_comments: Vec::new(),
                                     trailing_comments: Vec::new(),
                                     inferred_type: None,
@@ -855,6 +861,8 @@ impl SparkDialect {
                                     this: pair[1].clone(),
                                     alias: crate::expressions::Identifier::new(key.clone()),
                                     column_aliases: vec![],
+                                    alias_explicit_as: false,
+                                    alias_keyword: None,
                                     pre_alias_comments: vec![],
                                     trailing_comments: vec![],
                                     inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/dialects/tsql.rs

@@ -126,6 +126,8 @@ impl DialectImpl for TSQLDialect {
                                             this: op.right,
                                             alias: col.name.clone(),
                                             column_aliases: Vec::new(),
+                                            alias_explicit_as: false,
+                                            alias_keyword: None,
                                             pre_alias_comments: Vec::new(),
                                             trailing_comments: Vec::new(),
                                             inferred_type: None,
@@ -138,6 +140,8 @@ impl DialectImpl for TSQLDialect {
                                             this: op.right,
                                             alias: ident.clone(),
                                             column_aliases: Vec::new(),
+                                            alias_explicit_as: false,
+                                            alias_keyword: None,
                                             pre_alias_comments: Vec::new(),
                                             trailing_comments: Vec::new(),
                                             inferred_type: None,
@@ -1217,6 +1221,8 @@ impl TSQLDialect {
                             span: None,
                         },
                         column_aliases: Vec::new(),
+                        alias_explicit_as: false,
+                        alias_keyword: None,
                         pre_alias_comments: Vec::new(),
                         trailing_comments: Vec::new(),
                         inferred_type: None,

{polyglot_sql-0.3.6 → polyglot_sql-0.3.7}/crates/polyglot-sql/src/expressions.rs

@@ -4011,6 +4011,12 @@ pub struct Subquery {
     pub alias: Option<Identifier>,
     /// Optional column aliases: AS t(c1, c2)
     pub column_aliases: Vec<Identifier>,
+    /// Whether AS keyword was explicitly used for the alias.
+    #[serde(default)]
+    pub alias_explicit_as: bool,
+    /// Original alias keyword spelling, e.g. `AS` vs `as`.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub alias_keyword: Option<String>,
     /// ORDER BY clause (for parenthesized queries)
     pub order_by: Option<OrderBy>,
     /// LIMIT clause
@@ -4493,6 +4499,12 @@ pub struct Alias {
     /// Optional column aliases for table-valued functions: AS t(col1, col2) or AS (col1, col2)
     #[serde(default)]
     pub column_aliases: Vec<Identifier>,
+    /// Whether AS keyword was explicitly used for the alias.
+    #[serde(default)]
+    pub alias_explicit_as: bool,
+    /// Original alias keyword spelling, e.g. `AS` vs `as`.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub alias_keyword: Option<String>,
     /// Comments that appeared between the expression and AS keyword
     #[serde(default)]
     pub pre_alias_comments: Vec<String>,
@@ -4511,6 +4523,8 @@ impl Alias {
             this,
             alias,
             column_aliases: Vec::new(),
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: Vec::new(),
             trailing_comments: Vec::new(),
             inferred_type: None,
@@ -4523,6 +4537,8 @@ impl Alias {
             this,
             alias: Identifier::empty(),
             column_aliases,
+            alias_explicit_as: false,
+            alias_keyword: None,
             pre_alias_comments: Vec::new(),
             trailing_comments: Vec::new(),
             inferred_type: None,
@@ -8436,6 +8452,9 @@ pub struct CreateView {
     /// Redshift: AUTO REFRESH YES|NO for materialized views
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub auto_refresh: Option<bool>,
+    /// ClickHouse: POPULATE / EMPTY before AS in materialized views
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub clickhouse_population: Option<String>,
     /// ClickHouse: ON CLUSTER clause
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub on_cluster: Option<OnCluster>,
@@ -8478,6 +8497,7 @@ impl CreateView {
             unique_key: None,
             no_schema_binding: false,
             auto_refresh: None,
+            clickhouse_population: None,
             on_cluster: None,
             to_table: None,
             table_properties: Vec::new(),