Feat: include column name in failed column registration warning (Tobi…

…koData#2989)
etonlels · Aug 7, 2024 · 8ec9db3 · 8ec9db3
1 parent b640363
commit 8ec9db3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/sqlmesh/core/engine_adapter/base.py b/sqlmesh/core/engine_adapter/base.py
@@ -2196,7 +2196,7 @@ def _create_column_comments(
                 self.execute(self._build_create_comment_column_exp(table, col, comment, table_kind))
             except Exception:
                 logger.warning(
-                    f"Column comments for table '{table.alias_or_name}' not registered - this may be due to limited permissions.",
+                    f"Column comments for column '{col}' in table '{table.alias_or_name}' not registered - this may be due to limited permissions.",
                     exc_info=True,
                 )
 

diff --git a/sqlmesh/core/engine_adapter/mysql.py b/sqlmesh/core/engine_adapter/mysql.py
@@ -133,31 +133,33 @@ def _create_column_comments(
         table = exp.to_table(table_name)
         table_sql = table.sql(dialect=self.dialect, identify=True)
 
-        try:
-            # MySQL ALTER TABLE MODIFY completely replaces the column (overwriting options and constraints).
-            # self.columns() only returns the column types so doesn't allow us to fully/correctly replace a column definition.
-            # To get the full column definition we retrieve and parse the table's CREATE TABLE statement.
-            create_table_exp = parse_one(
-                self.fetchone(f"SHOW CREATE TABLE {table_sql}")[1], dialect=self.dialect
-            )
-            col_def_exps = {
-                col_def.name: col_def.copy()
-                for col_def in create_table_exp.find(exp.Schema).find_all(exp.ColumnDef)  # type: ignore
-            }
-
-            for col in column_comments:
-                col_def = col_def_exps.get(col)
-                col_def.args["constraints"].extend(  # type: ignore
-                    self._build_col_comment_exp(col_def.alias_or_name, column_comments)  # type: ignore
-                )
-                self.execute(
-                    f"ALTER TABLE {table_sql} MODIFY {col_def.sql(dialect=self.dialect, identify=True)}",  # type: ignore
+        # MySQL ALTER TABLE MODIFY completely replaces the column (overwriting options and constraints).
+        # self.columns() only returns the column types so doesn't allow us to fully/correctly replace a column definition.
+        # To get the full column definition we retrieve and parse the table's CREATE TABLE statement.
+        create_table_exp = parse_one(
+            self.fetchone(f"SHOW CREATE TABLE {table_sql}")[1], dialect=self.dialect
+        )
+        col_def_exps = {
+            col_def.name: col_def.copy()
+            for col_def in create_table_exp.find(exp.Schema).find_all(exp.ColumnDef)  # type: ignore
+        }
+
+        for col in column_comments:
+            col_def = col_def_exps.get(col)
+            if col_def:
+                col_def.args["constraints"].extend(
+                    self._build_col_comment_exp(col_def.alias_or_name, column_comments)
                 )
-        except Exception:
-            logger.warning(
-                f"Column comments for table '{table.alias_or_name}' not registered - this may be due to limited permissions.",
-                exc_info=True,
-            )
+
+                try:
+                    self.execute(
+                        f"ALTER TABLE {table_sql} MODIFY {col_def.sql(dialect=self.dialect, identify=True)}",
+                    )
+                except Exception:
+                    logger.warning(
+                        f"Column comments for column '{col_def.alias_or_name}' in table '{table.alias_or_name}' not registered - this may be due to limited permissions.",
+                        exc_info=True,
+                    )
 
     def ping(self) -> None:
         self._connection_pool.get().ping(reconnect=False)