fix(clients): add newlines around subquery when retrieving columns to…

… avoid a syntax error (#262)
ClickHouse · Apr 8, 2024 · 08cee87 · 08cee87
1 parent ef350a4
commit 08cee87
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/dbt/adapters/clickhouse/httpclient.py b/dbt/adapters/clickhouse/httpclient.py
@@ -25,7 +25,12 @@ def command(self, sql, **kwargs):
 
     def columns_in_query(self, sql: str, **kwargs) -> List[ClickHouseColumn]:
         try:
-            query_result = self._client.query(f"SELECT * FROM ({sql}) LIMIT 0", **kwargs)
+            query_result = self._client.query(
+                f"SELECT * FROM ( \n"
+                f"{sql} \n"
+                f") LIMIT 0",
+                **kwargs,
+            )
             return [
                 ClickHouseColumn.create(name, ch_type.name)
                 for name, ch_type in zip(query_result.column_names, query_result.column_types)

diff --git a/dbt/adapters/clickhouse/nativeclient.py b/dbt/adapters/clickhouse/nativeclient.py
@@ -35,7 +35,10 @@ def command(self, sql, **kwargs):
     def columns_in_query(self, sql: str, **kwargs) -> List[ClickHouseColumn]:
         try:
             _, columns = self._client.execute(
-                f"SELECT * FROM ({sql}) LIMIT 0", with_column_types=True
+                f"SELECT * FROM ( \n"
+                f"{sql} \n"
+                f") LIMIT 0",
+                with_column_types=True,
             )
             return [ClickHouseColumn.create(column[0], column[1]) for column in columns]
         except clickhouse_driver.errors.Error as ex: