Fix: Use expression for current catalog (#1775)

Author: izeigerman

sqlmesh/core/engine_adapter/databricks.py

@@ -31,7 +31,6 @@ class DatabricksEngineAdapter(SparkEngineAdapter):
         array_element_selector="element",
     )
     CATALOG_SUPPORT = CatalogSupport.FULL_SUPPORT
-    CURRENT_CATALOG_FUNCTION = "current_catalog"
     SUPPORTS_ROW_LEVEL_OP = True
 
     def __init__(self, *args: t.Any, **kwargs: t.Any):

sqlmesh/core/engine_adapter/duckdb.py

@@ -20,7 +20,6 @@ class DuckDBEngineAdapter(LogicalMergeMixin, GetCurrentCatalogFromFunctionMixin)
     DIALECT = "duckdb"
     SUPPORTS_TRANSACTIONS = False
     CATALOG_SUPPORT = CatalogSupport.FULL_SUPPORT
-    CURRENT_CATALOG_FUNCTION = "current_catalog"
 
     def set_current_catalog(self, catalog: str) -> None:
         """Sets the catalog name of the current connection."""

sqlmesh/core/engine_adapter/mixins.py

@@ -252,11 +252,11 @@ def _create_view_properties(
 
 
 class GetCurrentCatalogFromFunctionMixin(EngineAdapter):
-    CURRENT_CATALOG_FUNCTION = "current_catalog"
+    CURRENT_CATALOG_EXPRESSION: exp.Expression = exp.func("current_catalog")
 
     def get_current_catalog(self) -> t.Optional[str]:
         """Returns the catalog name of the current connection."""
-        result = self.fetchone(exp.select(exp.func(self.CURRENT_CATALOG_FUNCTION)))
+        result = self.fetchone(exp.select(self.CURRENT_CATALOG_EXPRESSION))
         if result:
             return result[0]
         return None

sqlmesh/core/engine_adapter/mssql.py

@@ -48,7 +48,7 @@ class MSSQLEngineAdapter(
     SUPPORTS_TUPLE_IN = False
     SUPPORTS_MATERIALIZED_VIEWS = False
     CATALOG_SUPPORT = CatalogSupport.REQUIRES_SET_CATALOG
-    CURRENT_CATALOG_FUNCTION = "DB_NAME"
+    CURRENT_CATALOG_EXPRESSION = exp.func("db_name")
 
     @set_catalog()
     def columns(

sqlmesh/core/engine_adapter/postgres.py

@@ -27,6 +27,7 @@ class PostgresEngineAdapter(
     DIALECT = "postgres"
     SUPPORTS_INDEXES = True
     HAS_VIEW_BINDING = True
+    CURRENT_CATALOG_EXPRESSION = exp.column("current_catalog")
 
     def _fetch_native_df(
         self, query: t.Union[exp.Expression, str], quote_identifiers: bool = False

sqlmesh/core/engine_adapter/redshift.py

@@ -28,7 +28,7 @@ class RedshiftEngineAdapter(
     DIALECT = "redshift"
     ESCAPE_JSON = True
     COLUMNS_TABLE = "SVV_COLUMNS"  # Includes late-binding views
-    CURRENT_CATALOG_FUNCTION = "current_database"
+    CURRENT_CATALOG_EXPRESSION = exp.func("current_database")
 
     @property
     def cursor(self) -> t.Any:

sqlmesh/core/engine_adapter/snowflake.py

@@ -23,7 +23,7 @@ class SnowflakeEngineAdapter(GetCurrentCatalogFromFunctionMixin):
     SUPPORTS_MATERIALIZED_VIEW_SCHEMA = True
     SUPPORTS_CLONING = True
     CATALOG_SUPPORT = CatalogSupport.FULL_SUPPORT
-    CURRENT_CATALOG_FUNCTION = "CURRENT_DATABASE"
+    CURRENT_CATALOG_EXPRESSION = exp.func("current_database")
 
     def _df_to_source_queries(
         self,

sqlmesh/core/engine_adapter/trino.py

@@ -43,6 +43,7 @@ class TrinoEngineAdapter(
     # connector and then figure out how to get insert/overwrite to work correctly without it.
     SUPPORTS_TRANSACTIONS = False
     SUPPORTS_ROW_LEVEL_OP = False
+    CURRENT_CATALOG_EXPRESSION = exp.column("current_catalog")
 
     @property
     def connection(self) -> TrinoConnection: