bump sqlglot to 28.6.0

Author: treysp

examples/sushi/models/customers.sql

@@ -42,4 +42,4 @@ LEFT JOIN (
   ON o.customer_id = m.customer_id
 LEFT JOIN raw.demographics AS d
   ON o.customer_id = d.customer_id
-WHERE sushi.orders.customer_id > 0
+WHERE o.customer_id > 0

pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "requests",
     "rich[jupyter]",
     "ruamel.yaml",
-    "sqlglot[rs]~=27.28.0",
+    "sqlglot[rs]~=28.6.0",
     "tenacity",
     "time-machine",
     "json-stream"

sqlmesh/core/config/connection.py

@@ -2334,7 +2334,7 @@ def init(cursor: t.Any) -> None:
     for tpe in subclasses(
         __name__,
         ConnectionConfig,
-        exclude=(ConnectionConfig, BaseDuckDBConnectionConfig),
+        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
     )
 }
 
@@ -2343,7 +2343,7 @@ def init(cursor: t.Any) -> None:
     for tpe in subclasses(
         __name__,
         ConnectionConfig,
-        exclude=(ConnectionConfig, BaseDuckDBConnectionConfig),
+        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
     )
 }
 
@@ -2355,7 +2355,7 @@ def init(cursor: t.Any) -> None:
     for tpe in subclasses(
         __name__,
         ConnectionConfig,
-        exclude=(ConnectionConfig, BaseDuckDBConnectionConfig),
+        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
     )
 }
 

sqlmesh/core/config/scheduler.py

@@ -146,7 +146,7 @@ def get_default_catalog_per_gateway(self, context: GenericContext) -> t.Dict[str
 
 SCHEDULER_CONFIG_TO_TYPE = {
     tpe.all_field_infos()["type_"].default: tpe
-    for tpe in subclasses(__name__, BaseConfig, exclude=(BaseConfig,))
+    for tpe in subclasses(__name__, BaseConfig, exclude={BaseConfig})
 }
 
 

sqlmesh/core/engine_adapter/base.py

@@ -2861,7 +2861,7 @@ def _order_projections_and_filter(
             return query
 
         query = t.cast(exp.Query, query.copy())
-        with_ = query.args.pop("with", None)
+        with_ = query.args.pop("with_", None) or query.args.pop("with", None)
 
         select_exprs: t.List[exp.Expression] = [
             exp.column(c, quoted=True) for c in target_columns_to_types
@@ -2877,7 +2877,8 @@ def _order_projections_and_filter(
             query = query.where(where, copy=False)
 
         if with_:
-            query.set("with", with_)
+            with_key = "with_" if "with_" in query.arg_types else "with"
+            query.set(with_key, with_)
 
         return query
 

sqlmesh/core/linter/rules/builtin.py

@@ -318,4 +318,4 @@ def check_model(self, model: Model) -> t.Optional[RuleViolation]:
         return None
 
 
-BUILTIN_RULES = RuleSet(subclasses(__name__, Rule, (Rule,)))
+BUILTIN_RULES = RuleSet(subclasses(__name__, Rule, exclude={Rule}))

sqlmesh/core/loader.py

@@ -840,7 +840,7 @@ def _load_linting_rules(self) -> RuleSet:
             if os.path.getsize(path):
                 self._track_file(path)
                 module = import_python_file(path, self.config_path)
-                module_rules = subclasses(module.__name__, Rule, (Rule,))
+                module_rules = subclasses(module.__name__, Rule, exclude={Rule})
                 for user_rule in module_rules:
                     user_rules[user_rule.name] = user_rule
 

sqlmesh/core/metric/rewriter.py

@@ -57,7 +57,8 @@ def _build_sources(self, projections: t.List[exp.Expression]) -> SourceAggsAndJo
         return sources
 
     def _expand(self, select: exp.Select) -> None:
-        base = select.args["from"].this.find(exp.Table)
+        from_clause = t.cast(exp.From, select.args.get("from") or select.args.get("from_"))
+        base = from_clause.this.find(exp.Table)
         base_alias = base.alias_or_name
         base_name = exp.table_name(base)
 

sqlmesh/core/model/definition.py

@@ -753,7 +753,8 @@ def ctas_query(self, **render_kwarg: t.Any) -> exp.Query:
         query = self.render_query_or_raise(**render_kwarg).limit(0)
 
         for select_or_set_op in query.find_all(exp.Select, exp.SetOperation):
-            if isinstance(select_or_set_op, exp.Select) and select_or_set_op.args.get("from"):
+            from_clause = select_or_set_op.args.get("from") or select_or_set_op.args.get("from_")
+            if isinstance(select_or_set_op, exp.Select) and from_clause:
                 select_or_set_op.where(exp.false(), copy=False)
 
         if self.managed_columns:

sqlmesh/core/test/definition.py

@@ -711,7 +711,7 @@ def runTest(self) -> None:
             query = self._render_model_query()
             sql = query.sql(self._test_adapter_dialect, pretty=self.engine_adapter._pretty_sql)
 
-        with_clause = query.args.get("with")
+        with_clause = query.args.get("with_") or query.args.get("with")
 
         if with_clause:
             self.test_ctes(
@@ -905,7 +905,7 @@ def generate_test(
     if isinstance(model, SqlModel):
         assert isinstance(test, SqlModelTest)
         model_query = test._render_model_query()
-        with_clause = model_query.args.get("with")
+        with_clause = model_query.args.get("with_") or model_query.args.get("with")
 
         if with_clause and include_ctes:
             ctes = {}