SQLExecX 2.2.7__tar.gz → 2.2.8__tar.gz

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.7
+Version: 2.2.8
 Summary: A easy, fast sql executor for Python. Supported MySQL, PostgreSQL, SQLite etc.
 Home-page: https://gitee.com/summry/sqlexecx
 Author: summy
@@ -9,7 +9,7 @@ Keywords: SQL,MySQL,PostgreSQL,SQLite,Database,Python,RDB
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sqlexecutorx>=1.9.2
+Requires-Dist: sqlexecutorx>=1.9.5
 
 Usage Sample
 ''''''''''''

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/SQLExecX.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.7
+Version: 2.2.8
 Summary: A easy, fast sql executor for Python. Supported MySQL, PostgreSQL, SQLite etc.
 Home-page: https://gitee.com/summry/sqlexecx
 Author: summy
@@ -9,7 +9,7 @@ Keywords: SQL,MySQL,PostgreSQL,SQLite,Database,Python,RDB
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sqlexecutorx>=1.9.2
+Requires-Dist: sqlexecutorx>=1.9.5
 
 Usage Sample
 ''''''''''''

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

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

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/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.7',
+    version='2.2.8',
     install_requires=[
-        'sqlexecutorx>=1.9.2',
+        'sqlexecutorx>=1.9.5',
     ],
     url='https://gitee.com/summry/sqlexecx',
     author='summy',

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/sqlexecx/__init__.py

@@ -26,7 +26,6 @@ export LRU_CACHE_SIZE=128
 windows:
 set LRU_CACHE_SIZE=128
 """
-from typing import Optional
 from sqlexecutorx import (
     conn,
     trans,
@@ -86,7 +85,63 @@ from .dialect import Dialect
 from .table_exec import table
 
 
-def init(*args, **kwargs) -> Optional[Engine]:
+__all__ = [
+    'init',
+    'sql',
+    'page',
+    'Dialect',
+    'table',
+    'conn',
+    'trans',
+    'get_connection',
+    'close',
+    'Driver',
+    'Engine',
+    'InitArgs',
+    'execute',
+    'insert',
+    'save',
+    'save_sql',
+    'save_select_key',
+    'save_sql_select_key',
+    'batch_insert',
+    'batch_execute',
+    'get',
+    'select',
+    'select_one',
+    'select_first',
+    'query',
+    'query_one',
+    'query_first',
+    'ravel_list',
+    'select_page',
+    'query_page',
+    'load',
+    'do_execute',
+    'do_save_sql',
+    'do_save_sql_select_key',
+    'do_get',
+    'do_select',
+    'do_select_one',
+    'do_select_first',
+    'do_query',
+    'do_query_one',
+    'do_query_first',
+    'do_ravel_list',
+    'do_select_page',
+    'do_query_page',
+    'do_load',
+    'insert_from_df',
+    'insert_from_pl',
+    'insert_from_csv',
+    'insert_from_json',
+    'truncate_table',
+    'drop_table',
+    'show_tables',
+]
+
+
+def init(*args, **kwargs) -> Engine:
     """
     Compliant with the Python DB API 2.0 (PEP-249).
 
@@ -109,8 +164,5 @@ def init(*args, **kwargs) -> Optional[Engine]:
     """
 
     engine = _init(*args, **kwargs)
-    if engine is None:
-        return None
-
     Dialect.init(engine)
     return engine

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/sqlexecx/loader.py

@@ -18,7 +18,7 @@ class Loader:
         """
         try:
             import pandas as pd
-        except:
+        except ModuleNotFoundError:
             raise ModuleNotFoundError("No module named 'pandas', please install it use 'pip install pandas'")
         if self.description:
             description = [x[0] for x in self.description]
@@ -34,7 +34,7 @@ class Loader:
         """
         try:
             import polars as pl
-        except:
+        except ModuleNotFoundError:
             raise ModuleNotFoundError("No module named 'polars', please install it use 'pip install polars'")
         if self.description:
             description = [x[0] for x in self.description]

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/sqlexecx/log_support.py

@@ -1,4 +1,4 @@
-from sqlexecutorx.log_support import logger, do_sql_log, do_save_log, batch_sql_log, db_ctx_log
+from sqlexecutorx.log_support import logger, do_sql_log as _do_sql_log, do_save_log, batch_sql_log, db_ctx_log
 from .constant import MODULE
 
 
@@ -11,11 +11,11 @@ def save_log(function: str, select_key: str, table: str, **kwargs):
 
 
 def sql_log(function: str, sql: str, *args, **kwargs):
-    logger.debug(f"Exec func '{function}' \n\tsql: {sql.strip()} \n\targs: {args} \n\tkwargs: {kwargs}")
+    logger.debug(f"Exec func '{MODULE}.{function}' \n\tsql: {sql.strip()} \n\targs: {args} \n\tkwargs: {kwargs}")
 
 
 def do_sql_log(function: str, sql: str, *args):
-    logger.debug(f"Exec func '{function}' \n\t sql: {sql.strip()} \n\t args: {args}")
+    _do_sql_log(MODULE, function, sql, *args)
 
 #
 # def db_ctx_log(action, connection):

{SQLExecX-2.2.7 → SQLExecX-2.2.8}/sqlexecx/table_exec.py

@@ -421,7 +421,7 @@ class WhereExec(WhereBase):
 
 class ColumnExec:
 
-    def __init__(self, table_exec: Table, *columns):
+    def __init__(self, table_exec: TableExec, *columns):
         self.table_exec = table_exec
         self.columns = columns
 
@@ -639,7 +639,7 @@ class ColumnExec:
             self.table_exec.page(page_num, page_size, return_total), *self.columns
         )
 
-    def limit(self, limit: Union[int, Tuple[int], List[int]] = 10) -> ColumnLimitExec:
+    def limit(self, limit: Union[int, Tuple[int, int], List[int]] = 10) -> ColumnLimitExec:
         """
         Get a ColumnLimitExec instance
 
@@ -664,7 +664,7 @@ class ColumnExec:
         return ColumnOrderByExec(self.table_exec.order_by(order_by), *self.columns)
 
 
-class Table:
+class TableExec:
 
     def __init__(self, _exec, table_name):
         self.exec = _exec
@@ -1046,7 +1046,7 @@ class Table:
 
 
 @lru_cache(maxsize=CACHE_SIZE)
-def table(table_name: str) -> Table:
+def table(table_name: str) -> TableExec:
     """
     Get a Table instance
 
@@ -1054,8 +1054,8 @@ def table(table_name: str) -> Table:
     --------
     >>> import sqlexecx as db
     >>> db.table('person')
-    Table()
+    TableExec()
     """
     table_name = table_name.strip()
     assert table_name, "Parameter 'table' must not be none"
-    return Table(exec, table_name)
+    return TableExec(exec, table_name)

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

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