lesscode-database 0.0.8__tar.gz → 0.0.9__tar.gz

{lesscode_database-0.0.8 → lesscode_database-0.0.9}/PKG-INFO

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

{lesscode_database-0.0.8 → lesscode_database-0.0.9}/lesscode_database/connect_pool.py

@@ -657,13 +657,22 @@ class Pool:
     @staticmethod
     def sync_create_clickhouse_pool(conn_info: ConnectionInfo):
         try:
-            clickhouse_driver_dbapi = importlib.import_module("clickhouse_driver.dbapi")
+            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 ImportError(f"clickhouse-driver is not exist,run:pip install clickhouse-driver")
-        con = clickhouse_driver_dbapi.connect(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 con
+            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)
+        return pool
 
     @staticmethod
     def create_sqlalchemy_pool(conn_info: ConnectionInfo):
@@ -781,6 +790,56 @@ class Pool:
                                                                              True) if conn_info.params else True)
         return engine
 
+    @staticmethod
+    def sync_create_dbutils_pool(conn_info: ConnectionInfo):
+        params = conn_info.params
+        if not isinstance(params, dict):
+            params = dict()
+        creator = params.pop("creator")
+        try:
+            generic = importlib.import_module(creator)
+        except ImportError:
+            raise Exception(f"{creator} is not exist,run:pip install {creator}")
+        try:
+            pooled_db = importlib.import_module("dbutils.pooled_db")
+            steady_db = importlib.import_module("dbutils.steady_db")
+            simple_pooled_db = importlib.import_module("dbutils.simple_pooled_db")
+            persistent_db = importlib.import_module("dbutils.persistent_db")
+        except ImportError:
+            raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
+        pool_type = params.pop("pool_type", "PooledDB")
+        if pool_type not in ["SimplePooledDB", "SteadyDBConnection", "PersistentDB", "PooledDB"]:
+            pool_type = "PooledDB"
+
+        mincached = params.pop("mincached", conn_info.min_size)
+        maxusage = params.pop("maxusage", conn_info.min_size)
+        maxshared = params.pop("maxshared", conn_info.max_size)
+        maxcached = params.pop("maxcached", conn_info.max_size)
+        blocking = params.pop("blocking", True)
+        reset = params.pop("reset", True)
+        setsession = params.pop("setsession", None)
+        failures = params.pop("failures", None)
+        ping = params.pop("ping", 1)
+        threadlocal = params.pop("threadlocal", None)
+        closeable = params.pop("closeable", True)
+        maxconnections = params.pop("maxconnections", None)
+        if pool_type == "SimplePooledDB":
+            pool = simple_pooled_db.PooledDB(dbapi=creator, maxconnections=maxconnections, **params)
+        elif pool_type == "SteadyDBConnection":
+            pool = steady_db.SteadyDBConnection(creator=creator, maxusage=maxusage, setsession=setsession,
+                                                failures=failures,
+                                                ping=ping, closeable=closeable, **params)
+        elif pool_type == "PersistentDB":
+            pool = persistent_db.PersistentDB(creator=creator, maxusage=maxusage, setsession=setsession,
+                                              failures=failures, ping=ping,
+                                              closeable=closeable, threadlocal=threadlocal, **params)
+        else:
+            pool = pooled_db.PooledDB(creator=generic, mincached=mincached, maxcached=maxcached,
+                                      maxshared=maxshared, maxconnections=conn_info.max_size, blocking=blocking,
+                                      maxusage=maxusage, setsession=setsession, reset=reset,
+                                      failures=failures, ping=ping, **params)
+        return pool
+
 
 def run_sync(func_instance):
     if iscoroutine(func_instance):
@@ -886,5 +945,11 @@ def get_pool(conn_info: ConnectionInfo):
         else:
             return run_sync(Pool.sync_create_sqlalchemy_pool(conn_info)), conn_info
 
+    elif conn_info.dialect == "dbutils":
+        if conn_info.async_enable:
+            return run_sync(Pool.sync_create_dbutils_pool(conn_info)), conn_info
+        else:
+            return run_sync(Pool.sync_create_dbutils_pool(conn_info)), conn_info
+
     else:
         raise Exception(f"conn_info.dialect={conn_info.dialect} is not supported")

lesscode_database-0.0.9/lesscode_database/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.9"

{lesscode_database-0.0.8 → lesscode_database-0.0.9}/lesscode_database.egg-info/PKG-INFO

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

lesscode_database-0.0.8/lesscode_database/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.8"