lesscode-database 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

lesscode_database/connect_pool.py

@@ -3,6 +3,7 @@ import asyncio
 import importlib
 import ssl
 from inspect import iscoroutine
+from xml.sax import parse
 
 from lesscode_database.connection_info import ConnectionInfo
 from lesscode_database.db_request import get_basic_auth
@@ -644,34 +645,63 @@ class Pool:
 
     @staticmethod
     async def create_clickhouse_pool(conn_info: ConnectionInfo):
-        try:
-            asynch = importlib.import_module("asynch")
-        except ImportError:
-            raise ImportError(f"asynch is not exist,run:pip install asynch")
-        pool = await asynch.create_pool(minsize=conn_info.min_size, maxsize=conn_info.max_size,
-                                        dsn=conn_info.dsn, host=conn_info.host,
-                                        user=conn_info.user, password=conn_info.password,
-                                        port=conn_info.port, database=conn_info.db_name)
+
+        params = conn_info.params if conn_info.params else {}
+        creator_type = params.pop("creator_type","asynch")
+        if creator_type == "clickhouse_connect":
+            try:
+                clickhouse_connect = importlib.import_module("clickhouse_connect")
+            except ImportError:
+                raise Exception(f"DBUtils is not exist,run:pip install clickhouse_connect==0.8.6")
+            pool = await clickhouse_connect.get_async_client(host=conn_info.host, port=conn_info.port,
+                                                              username=conn_info.user,
+                                                              password=conn_info.password, database=conn_info.db_name,
+                                                              **params)
+
+
+        else:
+            try:
+                asynch = importlib.import_module("asynch")
+            except ImportError:
+                raise ImportError(f"asynch is not exist,run:pip install asynch")
+            pool = await asynch.create_pool(minsize=conn_info.min_size, maxsize=conn_info.max_size,
+                                            dsn=conn_info.dsn, host=conn_info.host,
+                                            user=conn_info.user, password=conn_info.password,
+                                            port=conn_info.port, database=conn_info.db_name)
         return pool
 
     @staticmethod
     def sync_create_clickhouse_pool(conn_info: ConnectionInfo):
-        try:
-            pooled_db = importlib.import_module("dbutils.pooled_db")
-        except ImportError:
-            raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
-        try:
-            clickhouse_driver = importlib.import_module("clickhouse_driver")
-        except ImportError:
-            raise Exception(f"clickhouse_driver is not exist,run:pip install clickhouse_driver")
-        params = conn_info.params
-        if not isinstance(params, dict):
-            params = dict()
+        params = conn_info.params if conn_info.params else {}
+        creator_type = params.pop("creator_type", "clickhouse_driver")
+        if creator_type == "clickhouse_connect":
+            try:
+                clickhouse_connect = importlib.import_module("clickhouse_connect")
+            except ImportError:
+                raise Exception(f"DBUtils is not exist,run:pip install clickhouse_connect==0.6.23")
+            params = conn_info.params
+            if not params:
+                params = dict()
+            pool = clickhouse_connect.get_client(host=conn_info.host, port=conn_info.port, username=conn_info.user,
+                                                   password=conn_info.password, database=conn_info.db_name, **params)
+        else:
+            try:
+                pooled_db = importlib.import_module("dbutils.pooled_db")
+            except ImportError:
+                raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
+            try:
+                clickhouse_driver = importlib.import_module("clickhouse_driver")
+            except ImportError:
+                raise Exception(f"clickhouse_driver is not exist,run:pip install clickhouse_driver")
+            params = conn_info.params
+            if not isinstance(params, dict):
+                params = dict()
+
+            pool = pooled_db.PooledDB(creator=clickhouse_driver.connect, host=conn_info.host, port=conn_info.port,
+                                      user=conn_info.user,
+                                      password=conn_info.password, database=conn_info.db_name or "default",
+                                      **params)
 
-        pool = pooled_db.PooledDB(creator=clickhouse_driver.connect, host=conn_info.host, port=conn_info.port,
-                                  user=conn_info.user,
-                                  password=conn_info.password, database=conn_info.db_name or "default",
-                                  **params)
         return pool
 
     @staticmethod

lesscode_database/version.py

@@ -1 +1 @@
-__version__ = "0.0.10"
+__version__ = "0.0.11"

{lesscode_database-0.0.10.dist-info → lesscode_database-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-database
-Version: 0.0.10
+Version: 0.0.11
 Summary: lesscode_database是数据库连接工具包
 Author: navysummer
 Author-email: navysummer@yeah.net

{lesscode_database-0.0.10.dist-info → lesscode_database-0.0.11.dist-info}/RECORD

@@ -1,14 +1,14 @@
 lesscode_database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lesscode_database/connect_pool.py,sha256=6iFUU8w4sNs2HgGiH5M0PZI7wuEUnlNgzx-hT65USyo,46467
+lesscode_database/connect_pool.py,sha256=9uNqtUX_flObmhKkwoXPsN_t2Lhs-0o4CdBmmo68yeY,48144
 lesscode_database/connection_info.py,sha256=HMlA-hA0LE7jGUS8crZAgrBMB-o6B9mxrWYEywgqXHg,1307
 lesscode_database/db_options.py,sha256=Z8Iy3pqDYW5YVVfvoFSsAYecK9LfiwRasYc3fzqIBt8,1928
 lesscode_database/db_request.py,sha256=siZGXIdPuTlY4NwVLnU8098bVM_6jgQzSzeO4BzkDrA,4832
 lesscode_database/ds_helper.py,sha256=W3VrTe_l0mGX0uEbN7UI6NlQbruLpr2WXgO7AexzQ-k,4845
 lesscode_database/dynamic_import_package.py,sha256=J8hgGRHe6KrprOgOq-xbKHVAYHSjUBcNyTaSPvBmvIk,164
 lesscode_database/mongo_base_model.py,sha256=cKHNmi5GJBGRxCtqsggEcrzIZK7__Z_4cVaIHxmqZsc,6406
-lesscode_database/version.py,sha256=-nNlMKS9nph3FR78_ZG9RGKrbxseeNp2K6nMr0pVGaU,23
-lesscode_database-0.0.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lesscode_database-0.0.10.dist-info/METADATA,sha256=w3pRRvHPOi0bcIoGKVKlmNKtVIWpYFyrIXflWvEL5Ns,12066
-lesscode_database-0.0.10.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-lesscode_database-0.0.10.dist-info/top_level.txt,sha256=h6cg13be6kkDfNaX9nWeDcfducTb5bKG5iYRO2JPmAM,18
-lesscode_database-0.0.10.dist-info/RECORD,,
+lesscode_database/version.py,sha256=OaIl7v-6zEWEY90Jlh6yoBjO3zWX1oX7RsvqrK3o1TU,23
+lesscode_database-0.0.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lesscode_database-0.0.11.dist-info/METADATA,sha256=fFsDq8ciMIstY3xm8IWg88DtF4iQbpAEF3tEWiTc0aI,12066
+lesscode_database-0.0.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+lesscode_database-0.0.11.dist-info/top_level.txt,sha256=h6cg13be6kkDfNaX9nWeDcfducTb5bKG5iYRO2JPmAM,18
+lesscode_database-0.0.11.dist-info/RECORD,,

{lesscode_database-0.0.10.dist-info → lesscode_database-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any