|
@@ -209,13 +209,17 @@ class SQLHandler:
|
|
|
transaction = connection.begin()
|
|
|
|
|
|
errors = []
|
|
|
+ results = []
|
|
|
|
|
|
|
|
|
for sub_query in sqlparse.split(query):
|
|
|
if len(sub_query) > 0:
|
|
|
try:
|
|
|
- connection.execute(sub_query, multi=True)
|
|
|
-
|
|
|
+ result = connection.execute(sub_query)
|
|
|
+ if result.rowcount > 0:
|
|
|
+ data = pd.DataFrame(result.fetchall())
|
|
|
+ data.columns = result.keys()
|
|
|
+ results.append(data)
|
|
|
except Exception as e:
|
|
|
errors.append(str(e))
|
|
|
|
|
@@ -229,6 +233,7 @@ class SQLHandler:
|
|
|
|
|
|
transaction.commit()
|
|
|
connection.close()
|
|
|
+ return results
|
|
|
|
|
|
def execute_query_from_file(self, filename: str):
|
|
|
'''
|
|
@@ -439,7 +444,7 @@ class SQLHandler:
|
|
|
tablename)
|
|
|
|
|
|
data = self.execute(query)
|
|
|
- colnames = data.columns.tolist()
|
|
|
+ colnames = data[0].columns.tolist()
|
|
|
|
|
|
return colnames
|
|
|
|