remove unnecessary support for older sqlglot versions

Author: treysp

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) or 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,8 +2877,7 @@ def _order_projections_and_filter(
             query = query.where(where, copy=False)
 
         if with_:
-            with_key = "with_" if "with_" in query.arg_types else "with"
-            query.set(with_key, with_)
+            query.set("with_", with_)
 
         return query
 

sqlmesh/core/metric/rewriter.py

@@ -57,8 +57,7 @@ def _build_sources(self, projections: t.List[exp.Expression]) -> SourceAggsAndJo
         return sources
 
     def _expand(self, select: exp.Select) -> None:
-        from_clause = t.cast(exp.From, select.args.get("from") or select.args.get("from_"))
-        base = from_clause.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,8 +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):
-            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:
+            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:

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_") or query.args.get("with")
+        with_clause = 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_") or model_query.args.get("with")
+        with_clause = model_query.args.get("with_")
 
         if with_clause and include_ctes:
             ctes = {}