Address comments

Author: izeigerman

sqlmesh/core/engine_adapter/base.py

@@ -2126,14 +2126,30 @@ def execute(
                         else e
                     ),
                 )
-                contains_values = isinstance(e, exp.Insert) and e.find(exp.Values) is not None
-                self._log_sql(sql, contains_values=contains_values)
+                self._log_sql(
+                    sql,
+                    expression=e if isinstance(e, exp.Expression) else None,
+                    quote_identifiers=quote_identifiers,
+                )
                 self._execute(sql, **kwargs)
 
-    def _log_sql(self, sql: str, contains_values: bool = False) -> None:
-        if contains_values:
-            sql = "<Redacted because SQL contains values>"
-        logger.log(self._execute_log_level, "Executing SQL: %s", sql)
+    def _log_sql(
+        self,
+        sql: str,
+        expression: t.Optional[exp.Expression] = None,
+        quote_identifiers: bool = True,
+    ) -> None:
+        if not logger.isEnabledFor(self._execute_log_level):
+            return
+
+        sql_to_log = sql
+        if expression is not None and not isinstance(expression, exp.Query):
+            values = expression.find(exp.Values)
+            if values:
+                values.set("expressions", [exp.to_identifier("<REDACTED VALUES>")])
+                sql_to_log = self._to_sql(expression, quote=quote_identifiers)
+
+        logger.log(self._execute_log_level, "Executing SQL: %s", sql_to_log)
 
     def _execute(self, sql: str, **kwargs: t.Any) -> None:
         self.cursor.execute(sql, **kwargs)

tests/core/engine_adapter/test_base.py

@@ -3084,9 +3084,20 @@ def test_log_sql(make_mocked_engine_adapter: t.Callable, mocker: MockerFixture):
     adapter.execute(parse_one("INSERT INTO test SELECT * FROM source"))
     adapter.execute(parse_one("INSERT INTO test (id, value) VALUES (1, 'test')"))
     adapter.insert_append("test", df)
+    adapter.replace_query("test", df)
 
-    assert mock_logger.log.call_count == 4
+    assert mock_logger.log.call_count == 5
     assert mock_logger.log.call_args_list[0][0][2] == "SELECT 1"
     assert mock_logger.log.call_args_list[1][0][2] == 'INSERT INTO "test" SELECT * FROM "source"'
-    assert mock_logger.log.call_args_list[2][0][2] == "<Redacted because SQL contains values>"
-    assert mock_logger.log.call_args_list[3][0][2] == "<Redacted because SQL contains values>"
+    assert (
+        mock_logger.log.call_args_list[2][0][2]
+        == 'INSERT INTO "test" ("id", "value") VALUES "<REDACTED VALUES>"'
+    )
+    assert (
+        mock_logger.log.call_args_list[3][0][2]
+        == 'INSERT INTO "test" ("id", "value") SELECT CAST("id" AS BIGINT) AS "id", CAST("value" AS TEXT) AS "value" FROM (VALUES "<REDACTED VALUES>") AS "t"("id", "value")'
+    )
+    assert (
+        mock_logger.log.call_args_list[4][0][2]
+        == 'CREATE OR REPLACE TABLE "test" AS SELECT CAST("id" AS BIGINT) AS "id", CAST("value" AS TEXT) AS "value" FROM (SELECT CAST("id" AS BIGINT) AS "id", CAST("value" AS TEXT) AS "value" FROM (VALUES "<REDACTED VALUES>") AS "t"("id", "value")) AS "_subquery"'
+    )