[Bug fix] Query Results fails to use query which has double quotes in…

… column names (getredash#3618)
pushpay · Nov 14, 2019 · dfa0052 · dfa0052
1 parent 62b286f
commit dfa0052
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/redash/query_runner/query_results.py b/redash/query_runner/query_results.py
@@ -73,7 +73,7 @@ def create_tables_from_query_ids(user, connection, query_ids, cached_query_ids=[
 
 
 def fix_column_name(name):
-    return u'"{}"'.format(name.replace(':', '_').replace('.', '_').replace(' ', '_'))
+    return u'"{}"'.format(re.sub('[:."\s]', '_', name, flags=re.UNICODE))
 
 
 def create_table(connection, table_name, query_results):

diff --git a/tests/query_runner/test_query_results.py b/tests/query_runner/test_query_results.py
@@ -34,6 +34,14 @@ def test_creates_table_with_colons_in_column_name(self):
         create_table(connection, table_name, results)
         connection.execute('SELECT 1 FROM query_123')
 
+    def test_creates_table_with_double_quotes_in_column_name(self):
+        connection = sqlite3.connect(':memory:')
+        results = {'columns': [{'name': 'ga:newUsers'}, {
+            'name': '"test2"'}], 'rows': [{'ga:newUsers': 123, '"test2"': 2}]}
+        table_name = 'query_123'
+        create_table(connection, table_name, results)
+        connection.execute('SELECT 1 FROM query_123')
+
     def test_creates_table(self):
         connection = sqlite3.connect(':memory:')
         results = {'columns': [{'name': 'test1'},