PR Feedback 1

Author: VaggelisD

sqlmesh/core/engine_adapter/base.py

@@ -2140,7 +2140,7 @@ def execute(
         with self.transaction():
             for e in ensure_list(expressions):
                 if isinstance(e, exp.Expression):
-                    self._check_identifier_length(e, check_only_ddl=True)
+                    self._check_identifier_length(e)
                     sql = self._to_sql(e, quote=quote_identifiers, **to_sql_kwargs)
                 else:
                     sql = t.cast(str, e)
@@ -2515,20 +2515,16 @@ def ping(self) -> None:
     def _select_columns(cls, columns: t.Iterable[str]) -> exp.Select:
         return exp.select(*(exp.column(c, quoted=True) for c in columns))
 
-    def _check_identifier_length(
-        self, expression: exp.Expression, check_only_ddl: bool = True
-    ) -> None:
-        if self.MAX_IDENTIFIER_LENGTH is None or (
-            check_only_ddl and not isinstance(expression, exp.DDL)
-        ):
+    def _check_identifier_length(self, expression: exp.Expression) -> None:
+        if self.MAX_IDENTIFIER_LENGTH is None or not isinstance(expression, exp.DDL):
             return
 
         for identifier in expression.find_all(exp.Identifier):
             name = identifier.name
             name_length = len(name)
             if name_length > self.MAX_IDENTIFIER_LENGTH:
                 raise SQLMeshError(
-                    f"Identifier name {name} (length {name_length}) exceeds {self.dialect.capitalize()}'s max identifier limit of {self.MAX_IDENTIFIER_LENGTH} characters"
+                    f"Identifier name '{name}' (length {name_length}) exceeds {self.dialect.capitalize()}'s max identifier limit of {self.MAX_IDENTIFIER_LENGTH} characters"
                 )
 
 

sqlmesh/core/engine_adapter/risingwave.py

@@ -30,6 +30,7 @@ class RisingwaveEngineAdapter(PostgresEngineAdapter):
     COMMENT_CREATION_VIEW = CommentCreationView.UNSUPPORTED
     SUPPORTS_MATERIALIZED_VIEWS = True
     SUPPORTS_TRANSACTIONS = False
+    MAX_IDENTIFIER_LENGTH = None
 
     def _truncate_table(self, table_name: TableName) -> None:
         return self.execute(exp.Delete(this=exp.to_table(table_name)))

tests/core/engine_adapter/integration/test_integration.py

@@ -3,6 +3,7 @@
 
 import os
 import pathlib
+import re
 import sys
 import typing as t
 import shutil
@@ -1571,7 +1572,6 @@ def test_init_project(ctx: TestContext, tmp_path_factory: pytest.TempPathFactory
 
     # normalize object names for snowflake
     if ctx.dialect == "snowflake":
-        import re
 
         def _normalize_snowflake(name: str, prefix_regex: str = "(sqlmesh__)(.*)"):
             match = re.search(prefix_regex, name)
@@ -1789,7 +1789,6 @@ def test_to_time_column(
         # Clickhouse does not have natively timezone-aware types and does not accept timestrings
         #   with UTC offset "+XX:XX". Therefore, we remove the timezone offset and set a timezone-
         #   specific data type to validate what is returned.
-        import re
 
         time_column = re.match(r"^(.*?)\+", time_column).group(1)
         time_column_type = exp.DataType.build("TIMESTAMP('UTC')", dialect="clickhouse")
@@ -2661,8 +2660,9 @@ def test_identifier_length_limit(ctx: TestContext):
 
     long_table_name = "a" * (adapter.MAX_IDENTIFIER_LENGTH + 1)
 
+    match = f"Identifier name '{long_table_name}' (length {len(long_table_name)}) exceeds {adapter.dialect.capitalize()}'s max identifier limit of {adapter.MAX_IDENTIFIER_LENGTH} characters"
     with pytest.raises(
         SQLMeshError,
-        match=f"Identifier name {long_table_name} (length {len(long_table_name)}) exceeds {adapter.dialect.capitalize()}'s max identifier limit of {adapter.MAX_IDENTIFIER_LENGTH} characters",
+        match=re.escape(match),
     ):
         adapter.create_table(long_table_name, {"col": exp.DataType.build("int")})