lesscode-flask 0.0.91__tar.gz → 0.0.92__tar.gz

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.91
+Version: 0.0.92
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.91'
+__version__ = '0.0.92'
 
 import functools
 import logging

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/lesscode_flask/db/executor.py

@@ -40,17 +40,9 @@ class QueryExecutor:
 
         annotated_query = self._annotate_query(self.query_runner)
 
-        try:
-            data, error = self.query_runner.run_query(annotated_query, self.user)
-        except Exception as e:
-            # if isinstance(e, JobTimeoutException):
-            #     error = TIMEOUT_MESSAGE
-            # else:
-            #     error = str(e)
-            print(f"发生异常: {e}")
-            data = None
-            # logger.warning("Unexpected error while running query:", exc_info=1)
-        run_time = time.time() - started_at
+        data, error = self.query_runner.run_query(annotated_query, self.user)
+        if error:
+            raise QueryExecutionError(error)
         return data
 
         #

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.91
+Version: 0.0.92
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/redash/query_runner/kingbase.py

@@ -1,5 +1,5 @@
 import logging
-import os
+
 import select
 
 try:
@@ -193,6 +193,7 @@ class KingBase(BaseSQLQueryRunner):
         return enabled
 
     def run_query(self, query, user):
+        logger.debug("KingBase is about to execute query: %s", query)
         connection = self._get_connection()
 
         cursor = connection.cursor()
@@ -207,6 +208,9 @@ class KingBase(BaseSQLQueryRunner):
 
                 data = {"columns": columns, "rows": rows}
                 error = None
+            elif isinstance(cursor.rowcount, int) and cursor.rowcount >= 0:
+                data = cursor.rowcount
+                error = None
             else:
                 error = "Query completed but it returned no data."
                 data = None

{lesscode-flask-0.0.91 → lesscode-flask-0.0.92}/redash/query_runner/pg.py

@@ -249,6 +249,7 @@ class PostgreSQL(BaseSQLQueryRunner):
         return connection
 
     def run_query(self, query, user):
+        logger.debug("PG is about to execute query: %s", query)
         connection = self._get_connection()
         cursor = connection.cursor()