lesscode-database 0.0.12__py3-none-any.whl → 0.0.13__py3-none-any.whl

lesscode_database/ds_helper.py

@@ -136,11 +136,13 @@ class DsHelper:
                     raise e
         return res
 
-
-    def exec_(self,sql_type:str,sql):
+    def exec_(self, sql_type: str, sql):
         if sql_type not in ["all", "first", "delete", "update", "insert"]:
             raise Exception(f"sql_type must be all,first,delete,update,insert")
-        if self.connect_info.db_type  in ["mysql","doris","ocean_base","tidb"]:
+        connect_params = self.connect_info.params or {}
+        creator_type = connect_params.get("creator_type") or "clickhouse_driver"
+        if self.connect_info.db_type in ["mysql", "doris", "ocean_base", "tidb", "sqlite3", "dm"] or (
+                self.connect_info.db_type == "clickhouse" and creator_type == "clickhouse_driver"):
             if sql_type == "all":
                 with self.pool.dedicated_connection() as conn:
                     conn.ping(reconnect=True)
@@ -171,23 +173,92 @@ class DsHelper:
                 with self.pool.dedicated_connection() as conn:
                     conn.ping(reconnect=True)
                     with conn.cursor() as cursor:
-                        rs= cursor.execute(sql)
+                        rs = cursor.execute(sql)
                         return rs
 
 
-        elif self.connect_info.db_type == "neo4j":
-            return self.make_neo4j_session()
-        elif self.connect_info.db_type == "esapi":
-            return self.esapi
-        elif self.connect_info.db_type == "es":
-            return self.esapi
+        elif self.connect_info.db_type in ["mssql", "oracle"]:
+            if sql_type == "all":
+                cursor = self.pool.cursor()
+                cursor.execute(sql)
+                rs = cursor.fetchall()
+                return rs
+            elif sql_type == "first":
+                cursor = self.pool.cursor()
+                cursor.execute(sql)
+                rs = cursor.fetchone()
+                return rs
+            elif sql_type == "delete":
+                cursor = self.pool.cursor()
+                rs = cursor.execute(sql)
+                return rs
+            elif sql_type == "update":
+                cursor = self.pool.cursor()
+                rs = cursor.execute(sql)
+                return rs
+            else:
+                cursor = self.pool.cursor()
+                rs = cursor.execute(sql)
+                return rs
+        elif self.connect_info.db_type in ["postgresql"]:
+            if sql_type == "all":
+                with self.pool.connection() as conn:
+                    with conn.cursor() as cursor:
+                        cursor.execute(sql)
+                        rs = cursor.fetchall()
+                        return rs
+            elif sql_type == "first":
+                with self.pool.connection() as conn:
+                    with conn.cursor() as cursor:
+                        cursor.execute(sql)
+                        rs = cursor.fetchone()
+                        return rs
+            elif sql_type == "delete":
+                with self.pool.connection() as conn:
+                    with conn.cursor() as cursor:
+                        rs = cursor.execute(sql)
+                        return rs
+            elif sql_type == "update":
+                with self.pool.connection() as conn:
+                    with conn.cursor() as cursor:
+                        rs = cursor.execute(sql)
+                        return rs
+            else:
+                with self.pool.connection() as conn:
+                    with conn.cursor() as cursor:
+                        rs = cursor.execute(sql)
+                        return rs
+        elif self.connect_info.db_type == "clickhouse" and creator_type == "clickhouse_connect":
+            if sql_type == "all":
+                result = self.pool.query(sql).result_rows
+                columns = result.column_names
+                rows = result.result_rows
+                return [dict(zip(columns, row)) for row in rows]
+            elif sql_type == "first":
+                if "limit" not in sql:
+                    sql += " limit 1"
+                result = self.pool.query(sql).result_rows
+                columns = result.column_names
+                rows = result.result_rows
+                return [dict(zip(columns, row)) for row in rows]
+            elif sql_type == "delete":
+                rs = self.pool.command(sql)
+                return rs
+            elif sql_type == "update":
+                rs = self.pool.command(sql)
+                return rs
+            else:
+                rs = self.pool.command(sql)
+                return rs
         else:
-            return self.pool
+            raise Exception(f"暂不支持数据库类型：{self.connect_info.db_type}")
 
-    async def async_exec_(self,sql_type:str,sql):
+    async def async_exec_(self, sql_type: str, sql):
         if sql_type not in ["all", "first", "delete", "update", "insert"]:
             raise Exception(f"sql_type must be all,first,delete,update,insert")
-        if self.connect_info.db_type in ["mysql","doris","ocean_base","tidb"]:
+        connect_params = self.connect_info.params or {}
+        creator_type = connect_params.get("creator_type") or "clickhouse_driver"
+        if self.connect_info.db_type in ["mysql", "doris", "ocean_base", "tidb", "postgresql"]:
             if sql_type == "all":
                 async with self.pool.acquire() as conn:
                     async with conn.cursor() as cursor:
@@ -213,9 +284,52 @@ class DsHelper:
             else:
                 async with self.pool.acquire() as conn:
                     async with conn.cursor() as cursor:
-                        rs= await cursor.execute(sql)
+                        rs = await cursor.execute(sql)
                         return rs
-        elif self.connect_info.db_type == "neo4j":
-            return self.async_make_neo4
+        elif self.connect_info.db_type in ["sqlite3"]:
+            if sql_type == "all":
+                cur = await self.pool.cursor()
+                await cur.execute(sql)
+                rs = await cur.fetchall()
+                return rs
+            elif sql_type == "first":
+                cur = await self.pool.cursor()
+                await cur.execute(sql)
+                rs = await cur.fetchone()
+                return rs
+            elif sql_type == "delete":
+                cur = await self.pool.cursor()
+                rs = await cur.execute(sql)
+                return rs
+            elif sql_type == "update":
+                cur = await self.pool.cursor()
+                rs = await cur.execute(sql)
+                return rs
+            else:
+                cur = await self.pool.cursor()
+                rs = await cur.execute(sql)
+                return rs
+        elif self.connect_info.db_type == "clickhouse" and creator_type == "clickhouse_connect":
+            if sql_type == "all":
+                result = await self.pool.query(sql).result_rows
+                columns = result.column_names
+                rows = result.result_rows
+                return [dict(zip(columns, row)) for row in rows]
+            elif sql_type == "first":
+                if "limit" not in sql:
+                    sql += " limit 1"
+                result = await self.pool.query(sql).result_rows
+                columns = result.column_names
+                rows = result.result_rows
+                return [dict(zip(columns, row)) for row in rows]
+            elif sql_type == "delete":
+                rs = await self.pool.command(sql)
+                return rs
+            elif sql_type == "update":
+                rs = await self.pool.command(sql)
+                return rs
+            else:
+                rs = await self.pool.command(sql)
+                return rs
         else:
-            return self.pool
+            raise Exception(f"暂不支持数据库类型：{self.connect_info.db_type}")

lesscode_database/orm/orm_exec.py

@@ -246,40 +246,66 @@ class Exec:
         self.__connect_name__ = connect_name or self.__connect_name__
         self._sql = ""
         self._result = None
-        self.sql_type =""
+        self._sql_type = ""
 
-    def execute(self, sql_object: Union[Select, Update, Delete, Insert]):
-        if not self.__connect_name__:
-            self.__connect_name__ = sql_object._connect_name
-        self._sql = sql_object._sql()
-        if isinstance(sql_object, Select):
+    def execute(self, statement: Union[Select, Update, Delete, Insert, str]):
+        if not self.__connect_name__ and not isinstance(statement, str):
+            self.__connect_name__ = statement._connect_name
+        if isinstance(statement, str):
+            self._sql = statement
             return self
         else:
+            self._sql = statement._sql()
             return self
 
     def all(self):
-        self.sql_type = "all"
-        self._result = DsHelper(self.__connect_name__).exec_(self.sql_type, self._sql)
+        self._sql_type = "all"
+        self._result = DsHelper(self.__connect_name__).exec_(self._sql_type, self._sql)
+        return self._result
+
+    async def async_all(self):
+        self._sql_type = "all"
+        self._result = await DsHelper(self.__connect_name__).async_exec_(self._sql_type, self._sql)
         return self._result
 
     def first(self):
-        self.sql_type = "first"
-        self._result = DsHelper(self.__connect_name__).exec_(self.sql_type, self._sql)
+        self._sql_type = "first"
+        self._result = DsHelper(self.__connect_name__).exec_(self._sql_type, self._sql)
+        return self._result
+
+    async def async_first(self):
+        self._sql_type = "first"
+        self._result = await DsHelper(self.__connect_name__).async_exec_(self._sql_type, self._sql)
         return self._result
 
     def update(self):
-        self.sql_type = "update"
-        self._result = DsHelper(self.__connect_name__).exec_(self.sql_type, self._sql)
+        self._sql_type = "update"
+        self._result = DsHelper(self.__connect_name__).exec_(self._sql_type, self._sql)
+        return self._result
+
+    async def async_update(self):
+        self._sql_type = "update"
+        self._result = await DsHelper(self.__connect_name__).async_exec_(self._sql_type, self._sql)
         return self._result
 
     def delete(self):
-        self.sql_type = "delete"
-        self._result = DsHelper(self.__connect_name__).exec_(self.sql_type, self._sql)
+        self._sql_type = "delete"
+        self._result = DsHelper(self.__connect_name__).exec_(self._sql_type, self._sql)
+        return self._result
+
+    async def async_delete(self):
+        self._sql_type = "delete"
+        self._result = await DsHelper(self.__connect_name__).async_exec_(self._sql_type, self._sql)
         return self._result
 
     def insert(self):
-        self.sql_type = "insert"
-        self._result = DsHelper(self.__connect_name__).exec_(self.sql_type, self._sql)
+        self._sql_type = "insert"
+        self._result = DsHelper(self.__connect_name__).exec_(self._sql_type, self._sql)
+        return self._result
+
+    async def async_insert(self):
+        self._sql_type = "insert"
+        self._result = await DsHelper(self.__connect_name__).async_exec_(self._sql_type, self._sql)
         return self._result
 
 

{lesscode_database-0.0.12.dist-info → lesscode_database-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-database
-Version: 0.0.12
+Version: 0.0.13
 Summary: lesscode_database是数据库连接工具包
 Author-email: navysummer <navysummer@yeah.net>
 License: MIT License

{lesscode_database-0.0.12.dist-info → lesscode_database-0.0.13.dist-info}/RECORD

@@ -3,15 +3,15 @@ lesscode_database/connect_pool.py,sha256=7mj3CRFvyGeE4ymPXRYJOzRX7otbknaRRhB74yJ
 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=XfXkcBfRgrv0rojl_EtdWrIHNeCdZYfoD75ZJOu6tQg,8568
+lesscode_database/ds_helper.py,sha256=17ArjRLH-Xz9qZcHbInDW9xDzV7YKWPB6Yu5na2qi7s,13719
 lesscode_database/dynamic_import_package.py,sha256=J8hgGRHe6KrprOgOq-xbKHVAYHSjUBcNyTaSPvBmvIk,164
 lesscode_database/mongo_base_model.py,sha256=cKHNmi5GJBGRxCtqsggEcrzIZK7__Z_4cVaIHxmqZsc,6406
 lesscode_database/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lesscode_database/orm/orm_exec.py,sha256=B4gwULU2kbXeIhwX3HTmAPw9_rO3Z7xMGj3xXV68xiM,10885
+lesscode_database/orm/orm_exec.py,sha256=EgpH6-lp_Q6s0dKLFZPXaNvb8z8iynQgN_h_sbAVgT4,11945
 lesscode_database/orm/orm_func.py,sha256=-ZKO8XQQM1mUz5el-j8FkApjhI50zomg-FNfQVzwc5U,1570
 lesscode_database/orm/orm_model.py,sha256=yMt9rE9e2gYqE8Fynzk-LeaPn6-TOzLoAWmgycSz1Ow,776
 lesscode_database/orm/orm_typing.py,sha256=3roHzs4omS2XXcQ3yat0pb5otJZWiY52B9fsPlz9DDg,18568
-lesscode_database-0.0.12.dist-info/METADATA,sha256=30YBdqfdqBxYZeavLimIzGtSLm82lqRPUeOlrQfxwsc,12213
-lesscode_database-0.0.12.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-lesscode_database-0.0.12.dist-info/licenses/LICENSE,sha256=ELM9gDFm8bfsS-M5bQfUC0jn272Riqpsso986u5PdBQ,77
-lesscode_database-0.0.12.dist-info/RECORD,,
+lesscode_database-0.0.13.dist-info/METADATA,sha256=nKFVz9VFI8SUcfeb8BfthuOAXzWaaAimXpJ6brZG-J0,12213
+lesscode_database-0.0.13.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
+lesscode_database-0.0.13.dist-info/licenses/LICENSE,sha256=ELM9gDFm8bfsS-M5bQfUC0jn272Riqpsso986u5PdBQ,77
+lesscode_database-0.0.13.dist-info/RECORD,,