Vertica: prevent overwriting row data when duplicated column names exist

getredash · Sep 30, 2019 · 7175832 · bennywij · Oct 1, 2019 · 7175832
1 parent a8af968
commit 7175832
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/redash/query_runner/vertica.py b/redash/query_runner/vertica.py
@@ -128,12 +128,11 @@ def run_query(self, query, user):
 
             # TODO - very similar to pg.py
             if cursor.description is not None:
-                columns_data = [(i[0], i[1]) for i in cursor.description]
+                columns_data = [(i[0], types_map.get(i[1], None)) for i in cursor.description]
 
-                rows = [dict(zip((c[0] for c in columns_data), row)) for row in cursor.fetchall()]
-                columns = [{'name': col[0],
-                            'friendly_name': col[0],
-                            'type': types_map.get(col[1], None)} for col in columns_data]
+                columns = self.fetch_columns(column_data)
 def fetch_columns(self, columns): 
     column_names = [] 
     duplicates_counter = 1 
     new_columns = [] 
     for col in columns: 
         column_name = col[0] 
         if column_name in column_names: 
             column_name = "{}{}".format(column_name, duplicates_counter) 
             duplicates_counter += 1 
         column_names.append(column_name) 
         new_columns.append({'name': column_name, 
                             'friendly_name': column_name, 
                             'type': col[1]}) 
     return new_columns 
 def fetch_columns(self, columns): 
     column_names = [] 
     duplicates_counter = 1 
     new_columns = [] 
  
     for col in columns: 
         column_name = col[0] 
         if column_name in column_names: 
             column_name = "{}{}".format(column_name, duplicates_counter) 
             duplicates_counter += 1 
  
         column_names.append(column_name) 
         new_columns.append({'name': column_name, 
                             'friendly_name': column_name, 
                             'type': col[1]}) 
  
     return new_columns 
+                rows = [dict(zip(([c['name'] for c in columns]), r))
+                        for i, r in enumerate(cursor.fetchall())]
 
                 data = {'columns': columns, 'rows': rows}
                 json_data = json_dumps(data)