lesscode-flask 0.1.74__tar.gz → 0.1.75__tar.gz

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/PKG-INFO

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

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.74'
+__version__ = '0.1.75'
 
 import functools
 import logging

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/lesscode_flask/db/__init__.py

@@ -34,6 +34,32 @@ def execute_query(
         raise e
 
 
+def execute(query_text, parameters, query_runner, should_apply_auto_limit=True):
+    """
+        执行原生sql操作
+        :param query_text: 待执行语句
+        :param parameters: 查询参数数
+        :param query_runner: 查询执行器
+        :param should_apply_auto_limit:
+        :return:
+        """
+    try:
+        query = ParameterizedQuery(query_text)
+        if parameters is None:
+            parameters = {}
+        query.apply(parameters)
+        query_text = query.query
+        # query_text = query_runner.apply_auto_limit(query.text, should_apply_auto_limit)
+        logging.info("query_text:{}".format(query_text))
+        return QueryExecutor(
+            query_text,
+            query_runner
+        ).exec()
+    except Exception as e:
+        # models.db.session.rollback()
+        raise e
+
+
 # from flask_sqlalchemy import SQLAlchemy
 try:
     flask_sqlalchemy = import_module("flask_sqlalchemy")

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/lesscode_flask/db/executor.py

@@ -45,6 +45,16 @@ class QueryExecutor:
             raise QueryExecutionError(error)
         return data
 
+    def exec(self):
+        self._log_progress("executing_query")
+
+        annotated_query = self._annotate_query(self.query_runner)
+
+        data, error = self.query_runner.exec(annotated_query, self.user)
+        if error:
+            raise QueryExecutionError(error)
+        return data
+
         #
         # logger.info(
         #     "job=execute_query query_hash=%s ds_id=%d data_length=%s error=[%s]",

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.1.74 → lesscode-flask-0.1.75}/redash/query_runner/clickhouse.py

@@ -122,10 +122,10 @@ class ClickHouse(BaseSQLQueryRunner):
             )
             if r.status_code != 200:
                 raise Exception(r.text)
-            # logging.warning(r.json())
-            if r.text == "":
+            try:
+                return r.json()
+            except requests.exceptions.JSONDecodeError as e:
                 return r.text
-            return r.json()
         except requests.RequestException as e:
             if e.response:
                 details = "({}, Status Code: {})".format(
@@ -219,5 +219,22 @@ class ClickHouse(BaseSQLQueryRunner):
             error = e
         return data, error
 
+    def exec(self, query, user):
+        logger.debug("Clickhouse is about to execute query: %s", query)
+        if query == "":
+            json_data = None
+            error = "Query is empty"
+            return json_data, error
+        try:
+
+            # data = json_dumps(q)
+            data = self._send_query(query)
+            error = None
+        except Exception as e:
+            data = None
+            logging.exception(e)
+            error = e
+        return data, error
+
 
 register(ClickHouse)