From 32071165353135c94112a399d94128d1891c2cbc Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Thu, 24 May 2018 14:59:34 -0700 Subject: [PATCH] Revert "[get_df] Adding support for multi-statement SQL" (#5078) --- superset/models/core.py | 8 ++------ tests/model_tests.py | 14 -------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/superset/models/core.py b/superset/models/core.py index e36c717299..8448c7ba54 100644 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -690,13 +690,9 @@ class Database(Model, AuditMixinNullable, ImportMixin): return self.get_dialect().identifier_preparer.quote def get_df(self, sql, schema): - sqls = [x.strip() for x in sql.strip().strip(';').split(';')] + sql = sql.strip().strip(';') eng = self.get_sqla_engine(schema=schema) - - for i in range(len(sqls) - 1): - eng.execute(sqls[i]) - - df = pd.read_sql_query(sqls[-1], eng) + df = pd.read_sql_query(sql, eng) def needs_conversion(df_series): if df_series.empty: diff --git a/tests/model_tests.py b/tests/model_tests.py index 45ee61edd6..8af104f57c 100644 --- a/tests/model_tests.py +++ b/tests/model_tests.py @@ -106,20 +106,6 @@ class DatabaseModelTestCase(SupersetTestCase): self.assertEquals(d.get('P1D').function, 'DATE({col})') self.assertEquals(d.get('Time Column').function, '{col}') - def test_single_statement(self): - main_db = self.get_main_database(db.session) - - if main_db.backend == 'mysql': - df = main_db.get_df('SELECT 1', None) - self.assertEquals(df.iat[0, 0], 1) - - def test_multi_statement(self): - main_db = self.get_main_database(db.session) - - if main_db.backend == 'mysql': - df = main_db.get_df('USE superset; SELECT 1', None) - self.assertEquals(df.iat[0, 0], 1) - class SqlaTableModelTestCase(SupersetTestCase):