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

lesscode_database-0.0.9/README.md → lesscode_database-0.0.11/PKG-INFO

@@ -1,3 +1,16 @@
+Metadata-Version: 2.1
+Name: lesscode_database
+Version: 0.0.11
+Summary: lesscode_database是数据库连接工具包
+Author: navysummer
+Author-email: navysummer@yeah.net
+Platform: python
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
 # lesscode_database
 
 数据库连接工具包
@@ -44,13 +57,15 @@ db_options.conn_list = [
     ConnectionInfo(dialect="redis", name="redis", host="127.0.0.1", port=6379, user=None,
                    password=None, db_name=1, enable=False, async_enable=True),
     # sqlalchemy 异步支持mysql，postgresql，tidb，ocean_base，doris;
-    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle
+    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle,dm
     ConnectionInfo(dialect="sqlalchemy", name="sqlalchemy", host="127.0.0.1", port=3306, user="root",
                    password="root", db_name="test", enable=False, async_enable=False, params={"db_type": "mysql"}),
     ConnectionInfo(dialect="neo4j", name="neo4j", host="127.0.0.1", port=7687, user="neo4j",
                    password="neo4j", db_name=None, enable=False, async_enable=True),
     ConnectionInfo(dialect="clickhouse", name="clickhouse", dsn="clickhouse://localhost", host="127.0.0.1", port=9000,
                    user="default", password="", db_name='', enable=True, async_enable=False),
+    ConnectionInfo(dialect="dm", name="dm", dsn=None, host="127.0.0.1", port=5236,
+                   user="default", password="", db_name='', enable=True, async_enable=False),
 
 ]
 
@@ -345,4 +360,12 @@ async def async_esapi_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_esapi_test())
 
+
+# 达梦数据库 同步测试
+with DsHelper("dm").pool.dedicated_connection() as conn:
+    with conn.cursor() as cursor:
+        cursor.execute('SELECT 1')
+        print(cursor.fetchall())
+
+
 ```

lesscode_database-0.0.9/PKG-INFO → lesscode_database-0.0.11/README.md

@@ -1,16 +1,3 @@
-Metadata-Version: 2.1
-Name: lesscode_database
-Version: 0.0.9
-Summary: lesscode_database是数据库连接工具包
-Author: navysummer
-Author-email: navysummer@yeah.net
-Platform: python
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 # lesscode_database
 
 数据库连接工具包
@@ -57,13 +44,15 @@ db_options.conn_list = [
     ConnectionInfo(dialect="redis", name="redis", host="127.0.0.1", port=6379, user=None,
                    password=None, db_name=1, enable=False, async_enable=True),
     # sqlalchemy 异步支持mysql，postgresql，tidb，ocean_base，doris;
-    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle
+    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle,dm
     ConnectionInfo(dialect="sqlalchemy", name="sqlalchemy", host="127.0.0.1", port=3306, user="root",
                    password="root", db_name="test", enable=False, async_enable=False, params={"db_type": "mysql"}),
     ConnectionInfo(dialect="neo4j", name="neo4j", host="127.0.0.1", port=7687, user="neo4j",
                    password="neo4j", db_name=None, enable=False, async_enable=True),
     ConnectionInfo(dialect="clickhouse", name="clickhouse", dsn="clickhouse://localhost", host="127.0.0.1", port=9000,
                    user="default", password="", db_name='', enable=True, async_enable=False),
+    ConnectionInfo(dialect="dm", name="dm", dsn=None, host="127.0.0.1", port=5236,
+                   user="default", password="", db_name='', enable=True, async_enable=False),
 
 ]
 
@@ -358,4 +347,12 @@ async def async_esapi_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_esapi_test())
 
+
+# 达梦数据库 同步测试
+with DsHelper("dm").pool.dedicated_connection() as conn:
+    with conn.cursor() as cursor:
+        cursor.execute('SELECT 1')
+        print(cursor.fetchall())
+
+
 ```

{lesscode_database-0.0.9 → lesscode_database-0.0.11}/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,33 +645,92 @@ 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):
+        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)
+
+        return pool
+
+    @staticmethod
+    def sync_create_dm_pool(conn_info: ConnectionInfo):
         try:
-            pooled_db = importlib.import_module("dbutils.pooled_db")
+            dmPython = importlib.import_module("dmPython")
         except ImportError:
-            raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
+            raise Exception(f"dmPython is not exist,run:pip install dmPython")
         try:
-            clickhouse_driver = importlib.import_module("clickhouse_driver")
+            pooled_db = importlib.import_module("dbutils.pooled_db")
         except ImportError:
-            raise Exception(f"clickhouse_driver is not exist,run:pip install clickhouse_driver")
+            raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
         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,
+        blocking = params.pop("blocking", True)
+        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)
+        ping = params.pop("ping", 1)
+        autocommit = params.pop("autocommit", True)
+        pool = pooled_db.PooledDB(creator=dmPython, host=conn_info.host, port=conn_info.port,
                                   user=conn_info.user,
-                                  password=conn_info.password, database=conn_info.db_name or "default",
+                                  password=conn_info.password, schema=conn_info.db_name,
+                                  mincached=mincached, blocking=blocking, maxusage=maxusage,
+                                  maxshared=maxshared, maxcached=maxcached,
+                                  ping=ping, maxconnections=conn_info.max_size,
+                                  autoCommit=autocommit,
                                   **params)
         return pool
 
@@ -734,10 +794,10 @@ class Pool:
         :param conn_info: 连接信息
         :return:
         """
+        db_type = "mysql"
         if conn_info.dsn:
             url = conn_info.dsn
         else:
-            db_type = "mysql"
             if conn_info.params:
                 if conn_info.params.get("db_type"):
                     db_type = conn_info.params.pop("db_type")
@@ -771,23 +831,35 @@ class Pool:
                 url = "oracle+cx_oracle://{}:{}@{}:{}/{}?charset=utf8mb4".format(
                     conn_info.user, conn_info.password, conn_info.host, conn_info.port,
                     conn_info.db_name)
+            elif db_type == "dm":
+                url = 'dm+dmPython://{}:{}@{}:{}'.format(
+                    conn_info.user, conn_info.password, conn_info.host, conn_info.port)
             else:
                 raise ImportError("UNSUPPORTED DB TYPE")
         try:
             sqlalchemy = importlib.import_module("sqlalchemy")
         except ImportError:
             raise ImportError(f"sqlalchemy is not exist,run:pip install sqlalchemy")
-        engine = sqlalchemy.create_engine(url, echo=conn_info.params.get("echo",
-                                                                         True) if conn_info.params else True,
+        params = conn_info.params
+        if not params:
+            params = dict()
+        echo = params.pop("echo", True)
+        pool_recycle = params.pop("pool_recycle", 3600)
+        max_overflow = params.pop("max_overflow", 0)
+        pool_timeout = params.pop("pool_timeout", 10)
+        pool_pre_ping = params.pop("pool_pre_ping", False)
+        if conn_info.db_name and db_type=="dm":
+            if "connect_args" not in params:
+                params["connect_args"] = {"schema": conn_info.db_name}
+            else:
+                params["connect_args"]["schema"] = conn_info.db_name
+
+        engine = sqlalchemy.create_engine(url, echo=echo,
                                           pool_size=conn_info.min_size,
-                                          pool_recycle=conn_info.params.get("pool_recycle",
-                                                                            3600) if conn_info.params else 3600,
-                                          max_overflow=conn_info.params.get("max_overflow",
-                                                                            0) if conn_info.params else 0,
-                                          pool_timeout=conn_info.params.get("pool_timeout",
-                                                                            10) if conn_info.params else 10,
-                                          pool_pre_ping=conn_info.params.get("pool_pre_ping",
-                                                                             True) if conn_info.params else True)
+                                          pool_recycle=pool_recycle,
+                                          max_overflow=max_overflow,
+                                          pool_timeout=pool_timeout,
+                                          pool_pre_ping=pool_pre_ping)
         return engine
 
     @staticmethod
@@ -939,6 +1011,12 @@ def get_pool(conn_info: ConnectionInfo):
         else:
             return run_sync(Pool.sync_create_clickhouse_pool(conn_info)), conn_info
 
+    elif conn_info.dialect == "dm":
+        if conn_info.async_enable:
+            return run_sync(Pool.sync_create_dm_pool(conn_info)), conn_info
+        else:
+            return run_sync(Pool.sync_create_dm_pool(conn_info)), conn_info
+
     elif conn_info.dialect == "sqlalchemy":
         if conn_info.async_enable:
             return run_sync(Pool.create_sqlalchemy_pool(conn_info)), conn_info

lesscode_database-0.0.11/lesscode_database/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-database
-Version: 0.0.9
+Version: 0.0.11
 Summary: lesscode_database是数据库连接工具包
 Author: navysummer
 Author-email: navysummer@yeah.net
@@ -57,13 +57,15 @@ db_options.conn_list = [
     ConnectionInfo(dialect="redis", name="redis", host="127.0.0.1", port=6379, user=None,
                    password=None, db_name=1, enable=False, async_enable=True),
     # sqlalchemy 异步支持mysql，postgresql，tidb，ocean_base，doris;
-    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle
+    # 同步支持mysql，postgresql，tidb，ocean_base，doris，sqlite3，mssql，oracle,dm
     ConnectionInfo(dialect="sqlalchemy", name="sqlalchemy", host="127.0.0.1", port=3306, user="root",
                    password="root", db_name="test", enable=False, async_enable=False, params={"db_type": "mysql"}),
     ConnectionInfo(dialect="neo4j", name="neo4j", host="127.0.0.1", port=7687, user="neo4j",
                    password="neo4j", db_name=None, enable=False, async_enable=True),
     ConnectionInfo(dialect="clickhouse", name="clickhouse", dsn="clickhouse://localhost", host="127.0.0.1", port=9000,
                    user="default", password="", db_name='', enable=True, async_enable=False),
+    ConnectionInfo(dialect="dm", name="dm", dsn=None, host="127.0.0.1", port=5236,
+                   user="default", password="", db_name='', enable=True, async_enable=False),
 
 ]
 
@@ -358,4 +360,12 @@ async def async_esapi_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_esapi_test())
 
+
+# 达梦数据库 同步测试
+with DsHelper("dm").pool.dedicated_connection() as conn:
+    with conn.cursor() as cursor:
+        cursor.execute('SELECT 1')
+        print(cursor.fetchall())
+
+
 ```

lesscode_database-0.0.9/lesscode_database/version.py

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