Fix

apache · Mar 28, 2017 · 50769c9 · 50769c9
1 parent 1af2ca6
commit 50769c9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
@@ -104,10 +104,15 @@ def handle_error(msg):
         handle_error(msg)
 
     query.executed_sql = executed_sql
-    logging.info("Running query: \n{}".format(executed_sql))
+    query.status = QueryStatus.RUNNING
+    query.start_running_time = utils.now_as_float()
+    session.merge(query)
+    session.flush()
+
     engine = database.get_sqla_engine(schema=query.schema)
     conn = engine.raw_connection()
     cursor = conn.cursor()
+    logging.info("Running query: \n{}".format(executed_sql))
     try:
         logging.info(query.executed_sql)
         cursor.execute(
@@ -117,10 +122,6 @@ def handle_error(msg):
         conn.close()
         handle_error(db_engine_spec.extract_error_message(e))
 
-    query.status = QueryStatus.RUNNING
-    query.start_running_time = utils.now_as_float()
-    session.merge(query)
-    session.commit()
     try:
         logging.info("Handling cursor")
         db_engine_spec.handle_cursor(cursor, query, session)