Fix issues around % signs and Presto (#2755)

* Fix issues around % signs and Presto * Fix mysql
apache · May 12, 2017 · 38375be · 38375be
1 parent 91d951a
commit 38375be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -59,7 +59,7 @@ def get_git_sha():
         'pandas==0.19.2',
         'parsedatetime==2.0.0',
         'pydruid==0.3.1',
-        'PyHive>=0.2.1',
+        'PyHive>=0.3.0',
         'python-dateutil==2.6.0',
         'requests==2.13.0',
         'simplejson==3.10.0',

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -542,14 +542,12 @@ def get_sqla_query(  # sqla
 
     def query(self, query_obj):
         qry_start_dttm = datetime.now()
-        engine = self.database.get_sqla_engine()
-        qry = self.get_sqla_query(**query_obj)
         sql = self.get_query_str(query_obj)
         status = QueryStatus.SUCCESS
         error_message = None
         df = None
         try:
-            df = pd.read_sql_query(qry, con=engine)
+            df = self.database.get_df(sql, self.schema)
         except Exception as e:
             status = QueryStatus.FAILED
             logging.exception(e)

diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py
@@ -312,6 +312,7 @@ def get_table_names(cls, schema, inspector):
 
 class MySQLEngineSpec(BaseEngineSpec):
     engine = 'mysql'
+    cursor_execute_kwargs = {'args': {}}
     time_grains = (
         Grain('Time Column', _('Time Column'), '{col}'),
         Grain("second", _('second'), "DATE_ADD(DATE({col}), "
@@ -355,6 +356,7 @@ def epoch_to_dttm(cls):
 
 class PrestoEngineSpec(BaseEngineSpec):
     engine = 'presto'
+    cursor_execute_kwargs = {'parameters': None}
 
     time_grains = (
         Grain('Time Column', _('Time Column'), '{col}'),