SQLExecX 2.2.0__tar.gz → 2.2.2__tar.gz

{SQLExecX-2.2.0 → SQLExecX-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.0
+Version: 2.2.2
 Summary: A easy, fast sql executor for Python. Supported MySQL, PostgreSQL, SQLite etc.
 Home-page: https://gitee.com/summry/sqlexecx
 Author: summy

{SQLExecX-2.2.0 → SQLExecX-2.2.2}/SQLExecX.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.0
+Version: 2.2.2
 Summary: A easy, fast sql executor for Python. Supported MySQL, PostgreSQL, SQLite etc.
 Home-page: https://gitee.com/summry/sqlexecx
 Author: summy

SQLExecX-2.2.2/SQLExecX.egg-info/requires.txt

@@ -0,0 +1 @@
+sqlexecutorx>=1.8.7

{SQLExecX-2.2.0 → SQLExecX-2.2.2}/setup.py

@@ -17,9 +17,9 @@ setup(
     description="A easy, fast sql executor for Python. Supported MySQL, PostgreSQL, SQLite etc.",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    version='2.2.0',
+    version='2.2.2',
     install_requires=[
-        'sqlexecutorx>=1.8.6',
+        'sqlexecutorx>=1.8.7',
     ],
     url='https://gitee.com/summry/sqlexecx',
     author='summy',

{SQLExecX-2.2.0 → SQLExecX-2.2.2}/sqlexecx/exec.py

@@ -296,8 +296,11 @@ def do_execute(sql: str, *args) -> int:
     >>> db.do_execute(sql, '张三', 20)
     1
     """
-    sql = Dialect.before_execute(sql)
-    return _execute(sql, *args)
+    # 判断*args是否为空，如果为空，则不传递*args给_execute函数
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _execute(sql, *args)
+    return _execute(sql)
 
 
 def do_save_sql(sql: str, *args) -> Any:
@@ -340,9 +343,10 @@ def do_save_sql_select_key(select_key: str, sql: str, *args) -> Any:
     >>> db.do_save_sql_select_key(select_key, sql, '张三', 20)
     3
     """
-
-    sql = Dialect.before_execute(sql)
-    return _save(select_key, sql, *args)
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _save(select_key, sql, *args)
+    return _save(select_key, sql)
 
 
 def do_get(sql: str, *args) -> Any:
@@ -375,9 +379,10 @@ def do_select(sql: str, *args) -> List[Tuple[Any, ...]]:
     >>> db.do_select(sql, '张三', 20)
     [(3, '张三', 20)]
     """
-
-    sql = Dialect.before_execute(sql)
-    return _select(sql, *args)
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _select(sql, *args)
+    return _select(sql)
 
 
 def do_select_one(sql: str, *args) -> Tuple[Any, ...]:
@@ -392,10 +397,8 @@ def do_select_one(sql: str, *args) -> Tuple[Any, ...]:
     (3, '张三', 20)
     """
 
-    print('do_select_one 1: ========',sql, args)
     sql, args = sql_support.limit_sql_args(sql, LIMIT_1, *args)
     sql = Dialect.before_execute(sql)
-    print('do_select_one: ========',sql, args)
     return _select_one(sql, *args)
 
 
@@ -410,9 +413,10 @@ def do_query(sql: str, *args) -> List[dict[str, Any]]:
     >>> db.do_query(sql, '张三', 20)
     [{'id': 3, 'name': '张三', 'age': 20}]
     """
-
-    sql = Dialect.before_execute(sql)
-    return _query(sql, *args)
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _query(sql, *args)
+    return _query(sql)
 
 
 def do_query_one(sql: str, *args) -> dict[str, Any]:
@@ -477,9 +481,10 @@ def do_ravel_list(sql: str, *args, position: int = 0) -> List:
     >>> db.do_ravel_list(sql, 20)
     ['张三', '李四', '王五']
     """
-
-    sql = Dialect.before_execute(sql)
-    return _ravel_list(sql, *args, position=position)
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _ravel_list(sql, *args, position=position)
+    return _ravel_list(sql, position=position)
 
 
 def select_page(sql: str, page_num=1, page_size=10, *args, **kwargs) -> List[Tuple]:
@@ -557,7 +562,7 @@ def do_query_page(sql: str, page_num=1, page_size=10, *args) -> List[dict]:
 
 def batch_execute(sql: str, *args) -> int:
     """
-    Batch execute
+    Execute SQL with batch data
 
     :param sql: SQL to execute
     :param args: All number must have same size.
@@ -647,8 +652,10 @@ def do_load(sql: str, *args) -> Loader:
     >>> db.do_load(sql, '张三', 20)
     Lodder()
     """
-    sql = Dialect.before_execute(sql)
-    return Loader(*_do_select(sql, *args))
+    if args:
+        sql = Dialect.before_execute(sql)
+        return Loader(*_do_select(sql, *args))
+    return Loader(*_do_select(sql))
 
 
 def insert_from_df(df, table_name: str, columns: Collection[str] = None) -> int:

{SQLExecX-2.2.0 → SQLExecX-2.2.2}/sqlexecx/table_exec.py

@@ -721,7 +721,7 @@ class Table:
         (3, '张三', 20)
         """
         sql = get_table_select_sql(self.table, None, None, 0, *columns)
-        return self.exec.select_first(sql)
+        return self.exec.do_select_first(sql)
 
     def query(self, *columns) -> List[dict]:
         """
@@ -760,7 +760,7 @@ class Table:
         {'id': 3, 'name': '张三', 'age': 20}
         """
         sql = get_table_select_sql(self.table, None, None, 0, *columns)
-        return self.exec.query_first(sql)
+        return self.exec.do_query_first(sql)
 
     def ravel_list(self, column: str) -> List:
         """
@@ -801,6 +801,7 @@ class Table:
         20
         """
         return self.exec.insert_from_df(df, self.table, columns)
+    
     def insert_from_pl(self, df, columns: Tuple[str] = None):
         """
         从polars DataFrame插入数据到表中并返回影响的行数。

SQLExecX-2.2.0/SQLExecX.egg-info/requires.txt

@@ -1 +0,0 @@
-sqlexecutorx>=1.8.6