lesscode-flask 0.1.14__tar.gz → 0.1.16__tar.gz

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/PKG-INFO

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

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.14'
+__version__ = '0.1.16'
 
 import functools
 import logging

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/redash/query_runner/clickhouse.py

@@ -40,6 +40,18 @@ class ClickHouse(BaseSQLQueryRunner):
             "secret": ["password"],
         }
 
+    def create_options(self, configuration):
+        options = {
+            "url": f'http://{configuration.get("host")}:{configuration.get("port")}',
+            "user": configuration.get("username"),
+            "password": configuration.get("password"),
+            "dbname": configuration.get("dbname"),
+            "timeout": 30
+        }
+        if configuration.get("options"):
+            options.update(configuration.get("options"))
+        return options
+
     @classmethod
     def type(cls):
         return "clickhouse"

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/redash/query_runner/elasticsearch.py

@@ -52,6 +52,16 @@ class BaseElasticSearch(BaseQueryRunner):
             "required": ["server"],
         }
 
+    def create_options(self, configuration):
+        options = {
+            "server": f'http://{configuration.get("host")}:{configuration.get("port")}/{configuration.get("dbname")}',
+            "basic_auth_user": configuration.get("username"),
+            "basic_auth_password": configuration.get("password")
+        }
+        if configuration.get("options"):
+            options.update(configuration.get("options"))
+        return options
+
     @classmethod
     def enabled(cls):
         return False

{lesscode_flask-0.1.14 → lesscode_flask-0.1.16}/redash/query_runner/mysql.py

@@ -18,6 +18,7 @@ from redash.settings import parse_boolean
 
 try:
     import pymysql
+
     enabled = True
 except ImportError:
     # logging.error(traceback.format_exc())
@@ -118,6 +119,18 @@ class Mysql(BaseSQLQueryRunner):
 
         return schema
 
+    def create_options(self, configuration):
+        options = {
+            "host": configuration.get("host"),
+            "port": configuration.get("port"),
+            "user": configuration.get("username"),
+            "passwd": configuration.get("password"),
+            "db": configuration.get("dbname")
+        }
+        if configuration.get("options"):
+            options.update(configuration.get("options"))
+        return options
+
     @classmethod
     def name(cls):
         return "MySQL"