Chore!: bump sqlglot to 28.6.0 (#5680)

Author: treysp

.circleci/test_migration.sh

@@ -24,13 +24,14 @@ TEST_DIR="$TMP_DIR/$EXAMPLE_NAME"
 
 echo "Running migration test for '$EXAMPLE_NAME' in '$TEST_DIR' for example project '$EXAMPLE_DIR' using options '$SQLMESH_OPTS'"
 
+# Copy the example project from the *current* checkout so it's stable across old/new SQLMesh versions
+cp -r "$EXAMPLE_DIR" "$TEST_DIR"
+
 git checkout $LAST_TAG
 
 # Install dependencies from the previous release.
 make install-dev
 
-cp -r $EXAMPLE_DIR $TEST_DIR
-
 # this is only needed temporarily until the released tag for $LAST_TAG includes this config
 if [ "$EXAMPLE_NAME" == "sushi_dbt" ]; then
     echo 'migration_test_config = sqlmesh_config(Path(__file__).parent, dbt_target_name="duckdb")' >> $TEST_DIR/config.py
@@ -53,4 +54,4 @@ make install-dev
 pushd $TEST_DIR
 sqlmesh $SQLMESH_OPTS migrate
 sqlmesh $SQLMESH_OPTS diff prod
-popd
+popd

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)
 
         select_exprs: t.List[exp.Expression] = [
             exp.column(c, quoted=True) for c in target_columns_to_types
@@ -2877,7 +2877,7 @@ def _order_projections_and_filter(
             query = query.where(where, copy=False)
 
         if with_:
-            query.set("with", with_)
+            query.set("with_", 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,7 @@ 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)
+        base = select.args["from_"].this.find(exp.Table)
         base_alias = base.alias_or_name
         base_name = exp.table_name(base)
 

sqlmesh/core/model/definition.py

@@ -753,7 +753,7 @@ 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"):
+            if isinstance(select_or_set_op, exp.Select) and select_or_set_op.args.get("from_"):
                 select_or_set_op.where(exp.false(), copy=False)
 
         if self.managed_columns: