fix!: fix macros with spaces to make them more consistent

this could break existing macro usage with variables that have spaces

Author: tobymao

sqlmesh/core/macros.py

@@ -240,8 +240,7 @@ def evaluate_macros(
                 text = self.template(node.this, {})
                 if node.this != text:
                     changed = True
-                    node.args["this"] = text
-                    return node
+                    return exp.to_identifier(text, quoted=node.quoted or None)
             if node.is_string:
                 text = node.this
                 if has_jinja(text):
@@ -1389,6 +1388,10 @@ def _convert_sql(v: t.Any, dialect: DialectType) -> t.Any:
             pass
 
     if isinstance(v, exp.Expression):
+        if (isinstance(v, exp.Column) and not v.table) or (
+            isinstance(v, exp.Identifier) or v.is_string
+        ):
+            return v.name
         v = v.sql(dialect=dialect)
     return v
 

tests/core/test_macros.py

@@ -1082,3 +1082,38 @@ def test_resolve_template_table():
         evaluator.transform(parsed_sql).sql(identify=True)
         == 'SELECT * FROM "test_catalog"."sqlmesh__test"."test__test_model__2517971505$partitions"'
     )
+
+
+def test_macro_with_spaces():
+    sql = parse_one(
+        """
+        SELECT
+          @x,
+          @{x},
+          a_@x,
+          a.@x,
+          @y,
+          @{y},
+          a_@y,
+          a.@y,
+        FROM a.@x, a."@{x}", foo(@'@x')
+        """
+    )
+    evaluator = MacroEvaluator()
+    evaluator.evaluate(d.parse_one(""" @DEF(x, "a b") """))
+    evaluator.evaluate(d.parse_one(""" @DEF(y, 'a b') """))
+    evaluator.evaluate(d.parse_one(""" @DEF(z, a."b c") """))
+
+    for sql, expected in (
+        ("@x", '"a b"'),
+        ("@{x}", '"a b"'),
+        ("a_@x", '"a_a b"'),
+        ("a.@x", 'a."a b"'),
+        ("@y", "'a b'"),
+        ("@{y}", '"a b"'),  # a little tricky here as it's not a string
+        ("a_@y", '"a_a b"'),
+        ("a.@{y}", 'a."a b"'),
+        ("@z", 'a."b c"'),
+        ("d.@z", 'd.a."b c"'),
+    ):
+        assert evaluator.transform(parse_one(sql)).sql() == expected