SQLExecX 2.2.1__tar.gz → 2.2.2__tar.gz

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

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.1
+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
 Author-email: fkfkfk2024@2925.com
+License: UNKNOWN
 Keywords: SQL,MySQL,PostgreSQL,SQLite,Database,Python,RDB
+Platform: UNKNOWN
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sqlexecutorx>=1.8.7
 
 Usage Sample
 ''''''''''''
@@ -196,3 +197,5 @@ If you want to operate MySQL database like Mybatis, may be you need MySQLX: http
 If you want to operate PostgreSQL databaselike Mybatis, may be you need PgSQLX: https://pypi.org/project/pgsqlx
 
 If you wanted simultaneously support MySQL and PostgreSQL, may be you need BatisX: https://pypi.org/project/batisx
+
+

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

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.1
+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
 Author-email: fkfkfk2024@2925.com
+License: UNKNOWN
 Keywords: SQL,MySQL,PostgreSQL,SQLite,Database,Python,RDB
+Platform: UNKNOWN
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sqlexecutorx>=1.8.7
 
 Usage Sample
 ''''''''''''
@@ -196,3 +197,5 @@ If you want to operate MySQL database like Mybatis, may be you need MySQLX: http
 If you want to operate PostgreSQL databaselike Mybatis, may be you need PgSQLX: https://pypi.org/project/pgsqlx
 
 If you wanted simultaneously support MySQL and PostgreSQL, may be you need BatisX: https://pypi.org/project/batisx
+
+

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

@@ -17,7 +17,7 @@ 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.1',
+    version='2.2.2',
     install_requires=[
         'sqlexecutorx>=1.8.7',
     ],

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

@@ -297,10 +297,10 @@ def do_execute(sql: str, *args) -> int:
     1
     """
     # 判断*args是否为空，如果为空，则不传递*args给_execute函数
-    if not args:
-        return _execute(sql)
-    sql = Dialect.before_execute(sql)
-    return _execute(sql, *args)
+    if args:
+        sql = Dialect.before_execute(sql)
+        return _execute(sql, *args)
+    return _execute(sql)
 
 
 def do_save_sql(sql: str, *args) -> Any:
@@ -343,10 +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
     """
-    if not args:
-        return _save(select_key, sql)
-    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:
@@ -379,10 +379,10 @@ def do_select(sql: str, *args) -> List[Tuple[Any, ...]]:
     >>> db.do_select(sql, '张三', 20)
     [(3, '张三', 20)]
     """
-    if not args:
-        return _select(sql)
-    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, ...]:
@@ -413,10 +413,10 @@ def do_query(sql: str, *args) -> List[dict[str, Any]]:
     >>> db.do_query(sql, '张三', 20)
     [{'id': 3, 'name': '张三', 'age': 20}]
     """
-    if not args:
-        return _query(sql)
-    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]:
@@ -481,10 +481,10 @@ def do_ravel_list(sql: str, *args, position: int = 0) -> List:
     >>> db.do_ravel_list(sql, 20)
     ['张三', '李四', '王五']
     """
-    if not args:
-        return _ravel_list(sql, position=position)
-    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]:
@@ -652,10 +652,10 @@ def do_load(sql: str, *args) -> Loader:
     >>> db.do_load(sql, '张三', 20)
     Lodder()
     """
-    if not args:
-        return Loader(*_do_select(sql))
-    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.1 → 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插入数据到表中并返回影响的行数。