Fix: alias queries even if not optimized (#895)

Author: tobymao

sqlmesh/core/model/definition.py

@@ -599,7 +599,7 @@ def columns_to_types(self) -> t.Dict[str, exp.DataType]:
 
         if self._columns_to_types is None:
             self._columns_to_types = {
-                expression.alias_or_name: expression.type or exp.DataType.build("unknown")
+                expression.output_name: expression.type or exp.DataType.build("unknown")
                 for expression in self._query_renderer.render().expressions
             }
 
@@ -632,7 +632,7 @@ def validate_definition(self) -> None:
 
         name_counts: t.Dict[str, int] = {}
         for expression in projection_list:
-            alias = expression.alias_or_name
+            alias = expression.output_name
             if alias == "*":
                 continue
             if not alias:

sqlmesh/core/renderer.py

@@ -280,12 +280,16 @@ def update_cache(
     def _optimize_query(self, query: exp.Expression) -> exp.Expression:
         schema = ensure_schema(self.schema, dialect=self._dialect)
 
-        query = query.copy()
+        query = t.cast(exp.Subqueryable, query.copy())
         lower_identities(query)
         qualify_tables(query)
 
         try:
-            if not schema.empty:
+            if schema.empty:
+                for select in query.selects:
+                    if not isinstance(select, exp.Alias) and select.output_name not in ("*", ""):
+                        select.replace(exp.alias_(select, select.output_name))
+            else:
                 qualify_columns(query, schema=schema, infer_schema=False)
         except SqlglotError as ex:
             raise_config_error(

tests/core/test_audit.py

@@ -215,7 +215,7 @@ def test_number_of_rows_audit(model: Model):
     )
     assert (
         rendered_query.sql()
-        == """SELECT 1 FROM (SELECT * FROM db.test_model AS test_model WHERE ds <= '1970-01-01' AND ds >= '1970-01-01') AS _q_0 HAVING COUNT(*) <= 0 LIMIT 1"""
+        == """SELECT 1 AS "1" FROM (SELECT * FROM db.test_model AS test_model WHERE ds <= '1970-01-01' AND ds >= '1970-01-01') AS _q_0 HAVING COUNT(*) <= 0 LIMIT 1"""
     )
 
 

tests/core/test_model.py

@@ -85,15 +85,15 @@ def test_load(assert_exp_eq):
     ]
     assert model.depends_on == {"db.other_table"}
     assert_exp_eq(
-        model.query,
+        model.render_query(),
         """
     SELECT
         TRY_CAST(1 AS INT) AS a,
         TRY_CAST(2 AS DOUBLE) AS b,
-        TRY_CAST(c AS BOOL),
+        TRY_CAST(c AS BOOL) AS c,
         TRY_CAST(1 AS INT) AS d, -- d
         TRY_CAST(2 AS DOUBLE) AS e, -- e
-        TRY_CAST(f AS BOOL), -- f
+        TRY_CAST(f AS BOOL) AS f, -- f
     FROM
         db.other_table t1
         LEFT JOIN
@@ -576,7 +576,7 @@ def test_render_query(assert_exp_eq):
         model.render_query(start="2020-10-28", end="2020-10-28"),
         """
         SELECT
-          y
+          y AS y
         FROM x AS x
         WHERE
           y <= '2020-10-28'
@@ -594,7 +594,7 @@ def test_render_query(assert_exp_eq):
           *
         FROM (
           SELECT
-            y
+            y AS y
           FROM x AS x
           WHERE
             y <= '2020-10-28'
@@ -889,7 +889,7 @@ def test_parse(assert_exp_eq):
         """
       SELECT
         CAST(id AS INT) AS id,
-        ds
+        ds AS ds
       FROM x AS x
       WHERE
         ds <= '1970-01-01' AND ds >= '1970-01-01'

tests/core/test_snapshot.py

@@ -358,7 +358,7 @@ def test_fingerprint(model: Model, parent_model: Model):
     fingerprint = fingerprint_from_model(model, models={})
 
     original_fingerprint = SnapshotFingerprint(
-        data_hash="2044395723",
+        data_hash="1204843539",
         metadata_hash="382750147",
     )
 
@@ -440,7 +440,7 @@ def test_fingerprint_jinja_macros(model: Model):
     fingerprint = fingerprint_from_model(model, models={})
 
     original_fingerprint = SnapshotFingerprint(
-        data_hash="2646014410",
+        data_hash="3334558345",
         metadata_hash="382750147",
     )
 

tests/dbt/test_config.py

@@ -189,19 +189,19 @@ def test_variables(assert_exp_eq, sushi_test_project):
     # Case 2: using a defined variable without a default value
     defined_variables["foo"] = 6
     context.variables = defined_variables
-    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), "SELECT 6")
+    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), 'SELECT 6 AS "6"')
 
     # Case 3: using a defined variable with a default value
     model_config.sql = "SELECT {{ var('foo', 5) }}"
     model_config._sql_no_config = None
 
-    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), "SELECT 6")
+    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), 'SELECT 6 AS "6"')
 
     # Case 4: using an undefined variable with a default value
     del defined_variables["foo"]
     context.variables = defined_variables
 
-    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), "SELECT 5")
+    assert_exp_eq(model_config.to_sqlmesh(**kwargs).render_query(), 'SELECT 5 AS "5"')
 
     # Finally, check that variable scoping & overwriting (some_var) works as expected
     expected_sushi_variables = {