Skip to content

Commit

Permalink
[sqllab] fix: return pandas records in execute_sql_statements
Browse files Browse the repository at this point in the history
  • Loading branch information
nytai committed Feb 11, 2020
1 parent a005e45 commit 435ac95
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions superset/sql_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,9 @@ def execute_sql_statements(
)
query.end_time = now_as_float()

use_arrow_data = store_results and results_backend_use_msgpack
data, selected_columns, all_columns, expanded_columns = _serialize_and_expand_data(
result_set,
db_engine_spec,
store_results and results_backend_use_msgpack,
expand_data,
result_set, db_engine_spec, use_arrow_data, expand_data
)

# TODO: data should be saved separately from metadata (likely in Parquet)
Expand Down Expand Up @@ -430,6 +428,24 @@ def execute_sql_statements(
session.commit()

if return_results:
# since we're returning results we need to create non-arrow data
if use_arrow_data:
(
data,
selected_columns,
all_columns,
expanded_columns,
) = _serialize_and_expand_data(
result_set, db_engine_spec, False, expand_data
)
payload.update(
{
"data": data,
"columns": all_columns,
"selected_columns": selected_columns,
"expanded_columns": expanded_columns,
}
)
return payload

return None

0 comments on commit 435ac95

Please sign in to comment.