lesscode-database 0.0.12__tar.gz → 0.0.13__tar.gz

{lesscode_database-0.0.12 → lesscode_database-0.0.13}/.idea/workspace.xml

@@ -4,10 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5ce6a727-6187-4970-b4b5-e0571f06d609" name="Changes" comment="feat(database): 增加对 MySQL 数据库的增删查改功能&#10;&#10;- 在 DsHelper 类中添加 exec_ 和 async_exec_ 方法，用于执行不同类型的 SQL 查询&#10;- 在 OrmExec 类中实现 all、first、update、delete 和 insert 方法，支持 ORM 方式的数据库操作&#10;- 优化数据库连接池配置，增加 DictCursor 支持">
-      <change beforePath="$PROJECT_DIR$/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lesscode_database/version.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" />
+    <list default="true" id="5ce6a727-6187-4970-b4b5-e0571f06d609" name="Changes" comment="feat(database): 支持 PostgreSQL 和 Oracle 数据库&#10;&#10;- 增加了对 PostgreSQL 数据库的支持- 增加了对 Oracle 数据库的支持&#10;- 优化了 ClickHouse 数据库的连接和查询逻辑&#10;- 修复了一些数据库连接和查询的兼容性问题">
+      <change beforePath="$PROJECT_DIR$/lesscode_database/ds_helper.py" beforeDir="false" afterPath="$PROJECT_DIR$/lesscode_database/ds_helper.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -167,7 +165,7 @@
       <workItem from="1745845007941" duration="1773000" />
       <workItem from="1745986151014" duration="194000" />
       <workItem from="1745986369694" duration="6717000" />
-      <workItem from="1745993614636" duration="4389000" />
+      <workItem from="1745993614636" duration="10401000" />
     </task>
     <task id="LOCAL-00001" summary="add dm">
       <option name="closed" value="true" />
@@ -297,7 +295,71 @@
       <option name="project" value="LOCAL" />
       <updated>1745992956905</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="feat(database): 增加对 MySQL 数据库的增删查改功能&#10;&#10;- 在 DsHelper 类中添加 exec_ 和 async_exec_ 方法，用于执行不同类型的 SQL 查询&#10;- 在 OrmExec 类中实现 all、first、update、delete 和 insert 方法，支持 ORM 方式的数据库操作&#10;- 优化数据库连接池配置，增加 DictCursor 支持">
+      <option name="closed" value="true" />
+      <created>1745998519478</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1745998519478</updated>
+    </task>
+    <task id="LOCAL-00018" summary="feat(orm_exec): 扩展 execute 方法以支持字符串 SQL&#10;&#10;- 修改 execute 方法，使其可以接受字符串类型的 SQL 查询&#10;- 增加对字符串 SQL 的处理逻辑- 优化了代码格式，调整了缩进和空格">
+      <option name="closed" value="true" />
+      <created>1745998886644</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1745998886644</updated>
+    </task>
+    <task id="LOCAL-00019" summary="refactor(orm): 重构 execute 方法&#10;&#10;- 将 sql_object 参数重命名为 statement，提高代码可读性&#10;- 优化 execute 方法的逻辑，支持字符串和 ORM 语句的执行&#10;- 调整代码格式，提高代码整洁度">
+      <option name="closed" value="true" />
+      <created>1745999022915</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1745999022915</updated>
+    </task>
+    <task id="LOCAL-00020" summary="refactor(orm): 修改 sql_type 属性为私有属性&#10;&#10;- 将 sql_type 属性从公有改为私有，使用 _sql_type 替代&#10;- 在 ORMExecute 类中更新了相关方法，使用新的私有属性&#10;-此修改提高了代码的封装性，防止外部直接访问和修改 sql_type">
+      <option name="closed" value="true" />
+      <created>1745999184999</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1745999184999</updated>
+    </task>
+    <task id="LOCAL-00021" summary="build(uv.lock): 更新 lesscode-database 包的来源类型- 将 lesscode-database包的来源从 virtual 修改为 editable&#10;- 此更改提高了项目构建的灵活性和可维护性">
+      <option name="closed" value="true" />
+      <created>1745999627273</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1745999627273</updated>
+    </task>
+    <task id="LOCAL-00022" summary="feat(database): 支持 SQLite3 数据库&#10;&#10;- 在 exec_ 和 async_exec_ 方法中添加了对 SQLite3 数据库的支持&#10;-优化了代码结构，提高了可读性和可维护性&#10;- 保留了原有的功能和逻辑，确保其他数据库类型不受影响">
+      <option name="closed" value="true" />
+      <created>1746000396808</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1746000396808</updated>
+    </task>
+    <task id="LOCAL-00023" summary="feat(database): 添加对 MSSQL 数据库的支持&#10;&#10;- 在 exec_ 和 async_exec_ 方法中增加了对 MSSQL 数据库的操作逻辑&#10;-支持 MSSQL 数据库的查询、删除、更新等操作&#10;- 优化了数据库类型不支持时的错误处理">
+      <option name="closed" value="true" />
+      <created>1746001294684</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1746001294684</updated>
+    </task>
+    <task id="LOCAL-00024" summary="feat(database): 支持 PostgreSQL 和 Oracle 数据库&#10;&#10;- 增加了对 PostgreSQL 数据库的支持- 增加了对 Oracle 数据库的支持&#10;- 优化了 ClickHouse 数据库的连接和查询逻辑&#10;- 修复了一些数据库连接和查询的兼容性问题">
+      <option name="closed" value="true" />
+      <created>1746003902878</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1746003902878</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -320,7 +382,25 @@
     <MESSAGE value="feat(orm_typing): 为字段类型添加别名属性&#10;&#10;- 在 BaseColumnType 类中添加 alias 参数，用于指定字段的别名- 如果未提供别名，则使用字段名称作为默认别名&#10;- 这个改动可以增强 ORM 的灵活性，特别是在处理与数据库字段名称不一致的情况时" />
     <MESSAGE value="refactor(orm): 修改列别名处理逻辑&#10;&#10;- 在 BaseColumnType 类中的 alias 方法中添加对别名的赋值操作&#10;- 删除了原本返回 BaseColumnTypeAlias 实例的逻辑" />
     <MESSAGE value="feat(database): 增加对 MySQL 数据库的增删查改功能&#10;&#10;- 在 DsHelper 类中添加 exec_ 和 async_exec_ 方法，用于执行不同类型的 SQL 查询&#10;- 在 OrmExec 类中实现 all、first、update、delete 和 insert 方法，支持 ORM 方式的数据库操作&#10;- 优化数据库连接池配置，增加 DictCursor 支持" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat(database): 增加对 MySQL 数据库的增删查改功能&#10;&#10;- 在 DsHelper 类中添加 exec_ 和 async_exec_ 方法，用于执行不同类型的 SQL 查询&#10;- 在 OrmExec 类中实现 all、first、update、delete 和 insert 方法，支持 ORM 方式的数据库操作&#10;- 优化数据库连接池配置，增加 DictCursor 支持" />
+    <MESSAGE value="feat(orm_exec): 扩展 execute 方法以支持字符串 SQL&#10;&#10;- 修改 execute 方法，使其可以接受字符串类型的 SQL 查询&#10;- 增加对字符串 SQL 的处理逻辑- 优化了代码格式，调整了缩进和空格" />
+    <MESSAGE value="refactor(orm): 重构 execute 方法&#10;&#10;- 将 sql_object 参数重命名为 statement，提高代码可读性&#10;- 优化 execute 方法的逻辑，支持字符串和 ORM 语句的执行&#10;- 调整代码格式，提高代码整洁度" />
+    <MESSAGE value="refactor(orm): 修改 sql_type 属性为私有属性&#10;&#10;- 将 sql_type 属性从公有改为私有，使用 _sql_type 替代&#10;- 在 ORMExecute 类中更新了相关方法，使用新的私有属性&#10;-此修改提高了代码的封装性，防止外部直接访问和修改 sql_type" />
+    <MESSAGE value="build(uv.lock): 更新 lesscode-database 包的来源类型- 将 lesscode-database包的来源从 virtual 修改为 editable&#10;- 此更改提高了项目构建的灵活性和可维护性" />
+    <MESSAGE value="feat(database): 支持 SQLite3 数据库&#10;&#10;- 在 exec_ 和 async_exec_ 方法中添加了对 SQLite3 数据库的支持&#10;-优化了代码结构，提高了可读性和可维护性&#10;- 保留了原有的功能和逻辑，确保其他数据库类型不受影响" />
+    <MESSAGE value="feat(database): 添加对 MSSQL 数据库的支持&#10;&#10;- 在 exec_ 和 async_exec_ 方法中增加了对 MSSQL 数据库的操作逻辑&#10;-支持 MSSQL 数据库的查询、删除、更新等操作&#10;- 优化了数据库类型不支持时的错误处理" />
+    <MESSAGE value="feat(database): 支持 PostgreSQL 和 Oracle 数据库&#10;&#10;- 增加了对 PostgreSQL 数据库的支持- 增加了对 Oracle 数据库的支持&#10;- 优化了 ClickHouse 数据库的连接和查询逻辑&#10;- 修复了一些数据库连接和查询的兼容性问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat(database): 支持 PostgreSQL 和 Oracle 数据库&#10;&#10;- 增加了对 PostgreSQL 数据库的支持- 增加了对 Oracle 数据库的支持&#10;- 优化了 ClickHouse 数据库的连接和查询逻辑&#10;- 修复了一些数据库连接和查询的兼容性问题" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/lesscode_database/ds_helper.py</url>
+          <line>288</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/lesscode_database$t.coverage" NAME="t Coverage Results" MODIFIED="1743923878274" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />

{lesscode_database-0.0.12 → lesscode_database-0.0.13}/PKG-INFO

@@ -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 → lesscode_database-0.0.13}/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-0.0.12 → lesscode_database-0.0.13}/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 → lesscode_database-0.0.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "lesscode-database"
-version = "0.0.12"
+version = "0.0.13"
 description = "lesscode_database是数据库连接工具包"
 readme = "README.md"
 requires-python = ">=3.7"
@@ -22,4 +22,8 @@ dependencies = []
 
 [tool.setuptools]
 packages = ["lesscode_database"]
-package-dir = {"" = "."}
+package-dir = {"" = "."}
+
+
+# 打包命令：uv build
+# 发布命令： uvx twine upload dist/*

{lesscode_database-0.0.12 → lesscode_database-0.0.13}/uv.lock

@@ -3,5 +3,5 @@ requires-python = ">=3.7"
 
 [[package]]
 name = "lesscode-database"
-version = "0.0.12"
-source = { virtual = "." }
+version = "0.0.13"
+source = { editable = "." }