Fix: update snowflake staged file code to match sqlglot (#1507)

* Fix: update snowflake staged file code to match sqlglot

* Bump sqlglot to v18.11.0

Author: georgesittas

setup.py

@@ -46,7 +46,7 @@
         "requests",
         "rich",
         "ruamel.yaml",
-        "sqlglot~=18.10.1",
+        "sqlglot~=18.11.0",
     ],
     extras_require={
         "bigquery": [

sqlmesh/core/dialect.py

@@ -336,7 +336,8 @@ def _parse_table_parts(self: Parser, schema: bool = False) -> exp.Table:
     table_arg = table.this
 
     if isinstance(table_arg, exp.Var) and table_arg.name.startswith(SQLMESH_MACRO_PREFIX):
-        return StagedFilePath(this=MacroVar(this=table_arg.name[1:]))
+        table_arg.replace(MacroVar(this=table_arg.name[1:]))
+        return StagedFilePath(**table.args)
 
     return table
 

tests/core/test_macros.py

@@ -5,7 +5,7 @@
 import pytest
 from sqlglot import exp, parse_one
 
-from sqlmesh.core.dialect import MacroVar, StagedFilePath
+from sqlmesh.core.dialect import StagedFilePath
 from sqlmesh.core.macros import MacroEvaluator, macro
 from sqlmesh.utils.errors import SQLMeshError
 from sqlmesh.utils.metaprogramming import Executable, ExecutableKind
@@ -94,7 +94,9 @@ def test_macro_var(macro_evaluator):
         assert "Macro variable 'y' is undefined." in str(ex.value)
 
     # Parsing a "parameter" like Snowflake's $1 should not produce a MacroVar expression
-    assert parse_one("select $1", read="snowflake").find(MacroVar) is None
+    e = parse_one("select $1 from @path (file_format => bla.foo)", read="snowflake")
+    assert e.find(exp.Parameter) is e.selects[0]
+    assert e.sql(dialect="snowflake") == "SELECT $1 FROM @path (FILE_FORMAT => bla.foo)"
 
 
 def test_macro_str_replace(macro_evaluator):