Fix #361

mymarilyn · Mar 12, 2023 · 920969a · 920969a
1 parent 70f1b19
commit 920969a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/clickhouse_driver/client.py b/clickhouse_driver/client.py
@@ -469,8 +469,9 @@ def query_dataframe(
             settings=settings
         )
 
+        columns = [name for name, type_ in columns]
         if replace_nonwords:
-            columns = [re.sub(r'\W', '_', name) for name, type_ in columns]
+            columns = [re.sub(r'\W', '_', x) for x in columns]
 
         return pd.DataFrame(
             {col: d for d, col in zip(data, columns)}, columns=columns

diff --git a/tests/columns/test_columns_names.py → tests/numpy/test_columns_names.py b/tests/columns/test_columns_names.py → tests/numpy/test_columns_names.py
@@ -1,14 +1,14 @@
-from tests.testcase import BaseTestCase
+from tests.numpy.testcase import NumpyBaseTestCase
 
 
-class ColumnsNamesTestCase(BaseTestCase):
+class ColumnsNamesTestCase(NumpyBaseTestCase):
 
     def test_columns_names_replace_nonwords(self):
         columns = (
             'regular Int64, '
             'CamelCase Int64, '
             'With_Underscores Int64, '
-            'Any%different.Column? Int64'
+            '`Any%different.Column?` Int64'
         )
 
         expected_columns = [
@@ -19,4 +19,4 @@ def test_columns_names_replace_nonwords(self):
             df = self.client.query_dataframe(
                 'SELECT * FROM test', replace_nonwords=False
             )
-            self.assertTrue(expected_columns.equals(list(df.columns)))
+            self.assertEqual(expected_columns, list(df.columns))