SQLExecX 2.2.4__tar.gz → 2.2.6__tar.gz

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.4
+Version: 2.2.6
 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.8.9
+Requires-Dist: sqlexecutorx>=1.9.1
 
 Usage Sample
 ''''''''''''

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/SQLExecX.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLExecX
-Version: 2.2.4
+Version: 2.2.6
 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.8.9
+Requires-Dist: sqlexecutorx>=1.9.1
 
 Usage Sample
 ''''''''''''

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

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

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/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.4',
+    version='2.2.6',
     install_requires=[
-        'sqlexecutorx>=1.8.9',
+        'sqlexecutorx>=1.9.1',
     ],
     url='https://gitee.com/summry/sqlexecx',
     author='summy',

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/__init__.py

@@ -26,7 +26,7 @@ export LRU_CACHE_SIZE=128
 windows:
 set LRU_CACHE_SIZE=128
 """
-
+from typing import Optional
 from sqlexecutorx import (
     conn,
     trans,
@@ -86,7 +86,7 @@ from .dialect import Dialect
 from .table_exec import table
 
 
-def init(*args, **kwargs) -> Engine:
+def init(*args, **kwargs) -> Optional[Engine]:
     """
     Compliant with the Python DB API 2.0 (PEP-249).
 
@@ -109,5 +109,8 @@ def init(*args, **kwargs) -> Engine:
     """
 
     engine = _init(*args, **kwargs)
+    if engine is None:
+        return None
+
     Dialect.init(engine)
     return engine

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/dialect.py

@@ -3,7 +3,8 @@
 
 import re
 from functools import lru_cache
-from typing import Sequence, Collection, Union, Optional
+from reprlib import aRepr
+from typing import Sequence, Collection, Union, Optional, List
 from sqlexecutorx.sql_support import require_limit
 from sqlexecutorx import execute, get, query, select, DBError, Engine
 from sqlexecutorx.conf import lru_cache_size
@@ -30,7 +31,7 @@ class BaseDialect:
         self.engine = engine
 
     @staticmethod
-    def create_insert_sql(table_name: str, cols: Collection[str], placeholder: str = '%s') -> str:
+    def create_insert_sql(table_name: str, cols: Sequence[str], placeholder: str = '%s') -> str:
         columns, placeholders = zip(*[('{}'.format(col), placeholder) for col in cols])
         return f"INSERT INTO {table_name}({', '.join(columns)}) VALUES({','.join(placeholders)})"
 
@@ -53,6 +54,7 @@ class BaseDialect:
         return f'{sql} LIMIT ? OFFSET ?'
 
     @staticmethod
+    @lru_cache(maxsize=lru_cache_size)
     def get_table_columns(table_name: str) -> str:
         return '*'
 
@@ -63,16 +65,20 @@ class BaseDialect:
     @staticmethod
     @lru_cache(maxsize=lru_cache_size)
     def get_dialect_str(src: Union[str, int, Collection[str]]) -> str:
-        assert isinstance(src, str), 'source must be a string.'
-        return src.strip() if isinstance(src, str) else ','.join([s.strip() for s in src])
+        assert src, 'src is required.'
+        if isinstance(src, str):
+            return src.strip()
+        elif isinstance(src, int):
+            return str(src)
+        return ','.join([s.strip() for s in src])
 
     @staticmethod
     def get_select_key(*args, **kwargs):
         raise NotImplementedError("Not implement method 'get_select_key', you can use sqlormx snowflake for primary key.")
 
     @staticmethod
-    def show_tables(schema: Optional[str]):
-        return NotImplementedError
+    def show_tables(schema: Optional[str] = None) -> List[str]:
+        raise NotImplementedError
 
 
 class MySQLDialect(BaseDialect):
@@ -107,12 +113,12 @@ class MySQLDialect(BaseDialect):
     @lru_cache(maxsize=lru_cache_size)
     def get_dialect_str(src: Union[str, int, Collection[str]]) -> str:
         assert src, 'src is required.'
-        if isinstance(src, str):
+        if isinstance(src, (str, int)):
             return _dialect_str(src)
         return ','.join([_dialect_str(arg) for arg in src])
 
     @staticmethod
-    def show_tables(schema: Optional[str]):
+    def show_tables(schema: Optional[str] = None) -> List[str]:
         if schema:
             execute(f'use {schema}')
         return [table[0] for table in select('show tables')]
@@ -126,36 +132,40 @@ class PostgresDialect(BaseDialect):
         return get(POSTGRES_COLUMN_SQL, table_name, LIMIT_1)
 
     @staticmethod
-    def get_select_key(key_seq: str = None, table_name: str = None, key: str =None, sql: str = None) -> str:
+    def get_select_key(key_seq: Optional[str] = None, table_name: Optional[str] = None, key: Optional[str] = None, sql: Optional[str] = None) -> str:
         if not key_seq:
             if table_name:
                 key_seq = PostgresDialect.build_key_seq(table_name, key)
-            else:
-                if sql:
-                    key_seq = PostgresDialect._get_key_seq_from_sql(sql)
-                else:
-                    raise DBError("Get PostgreSQL select key fail, all of 'key_seq', 'table', 'sql' are None")
+            elif sql:
+                key_seq = PostgresDialect._get_key_seq_from_sql(sql)
+
+        if not key_seq:
+            raise DBError("Get PostgreSQL select key fail, all of 'key_seq', 'table', 'sql' are None")
+
         return f"SELECT currval('{key_seq}')"
 
     @staticmethod
-    def build_key_seq(table_name: str, key: str = None) -> str:
+    def build_key_seq(table_name: str, key: Optional[str] = None) -> str:
         if not key:
             key = DEFAULT_KEY_FIELD
         return f'{table_name}_{key}_seq'
 
     @staticmethod
     @lru_cache(maxsize=lru_cache_size)
-    def _get_key_seq_from_sql(sql: str) -> str:
+    def _get_key_seq_from_sql(sql: str) -> Optional[str]:
         table_name = re.search('(?<=into )\w+', sql, re.I)
+        if not table_name:
+            return None
+
         key_seq = PostgresDialect.build_key_seq(table_name.group())
         logger.warning("'key_seq' is None, will use default '{}' from sql.".format(key_seq))
         return key_seq
 
     @staticmethod
-    def show_tables(schema: Optional[str]):
+    def show_tables(schema: Optional[str] = None) -> List[str]:
         sql = '''
-        SELECT tablename FROM pg_catalog.pg_tables  
-         WHERE schemaname != 'pg_catalog'  
+        SELECT tablename FROM pg_catalog.pg_tables
+         WHERE schemaname != 'pg_catalog'
            AND schemaname != 'information_schema'
        '''
         if schema:
@@ -182,7 +192,7 @@ class OracleDialect(BaseDialect):
 
 
 class SQLiteDialect(MySQLDialect):
-    
+
     @staticmethod
     def create_insert_sql(table_name: str, cols: Sequence[str], placeholder: str = '?') -> str:
         return MySQLDialect.create_insert_sql(table_name, cols, placeholder)
@@ -208,7 +218,7 @@ class SQLiteDialect(MySQLDialect):
         return execute(f'DELETE FROM `{table_name}`')
 
     @staticmethod
-    def show_tables(schema: Optional[str]):
+    def show_tables(schema: Optional[str] = None) -> List[str]:
         return [table[0] for table in select("SELECT name FROM sqlite_master WHERE type='table'")]
 
 
@@ -234,49 +244,59 @@ class Dialect:
 
     @staticmethod
     @lru_cache(maxsize=lru_cache_size)
-    def create_insert_sql(table_name: str, cols: Collection[str]) -> str:
+    def create_insert_sql(table_name: str, cols: Sequence[str]) -> str:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.create_insert_sql(table_name, cols)
 
     @staticmethod
     @lru_cache(maxsize=lru_cache_size)
     def before_execute(sql: str) -> str:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.before_execute(sql)
 
     @staticmethod
     def get_page_sql_args(sql: str, page_num: int, page_size: int, *args):
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.get_page_sql_args(sql, page_num, page_size, *args)
-    
+
     @staticmethod
     def limit_offset_sql(sql: str):
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.limit_offset_sql(sql)
 
     @staticmethod
     def get_table_columns(table_name: str) -> str:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.get_table_columns(table_name)
 
     @staticmethod
     def truncate_table(table_name: str) -> int:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.truncate_table(table_name)
 
     @staticmethod
     def get_select_key(*args, **kwargs) -> str:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.get_select_key(*args, **kwargs)
 
     @staticmethod
     def get_dialect_str(src: Union[str, int, Collection[str]]) -> str:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.get_dialect_str(src)
 
     @staticmethod
     def curr_engine() -> Engine:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.engine
 
     @staticmethod
-    def show_tables(schema: Optional[str]):
+    def show_tables(schema: Optional[str] = None) -> List[str]:
+        assert _DIALECT, 'Dialect not initialized.'
         return _DIALECT.show_tables(schema)
 
 
-def _dialect_str(src: Union[str, int]):
-    assert isinstance(src, str) or isinstance(src, int), 'source must be a string or int.'
+def _dialect_str(src: Union[str, int]) -> str:
+    assert isinstance(src, (str, int)), 'source must be a string or int.'
     if isinstance(src, int):
         return str(src)
     elif '(' in src or ' as ' in src.lower():

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/exec.py

@@ -1,4 +1,4 @@
-from typing import Collection, Iterable, List, Tuple, Mapping, Any
+from typing import Collection, Iterable, List, Tuple, Mapping, Any, Optional
 from .loader import Loader
 from .dialect import Dialect
 from . import sql_support
@@ -62,7 +62,7 @@ def save(table_name: str, **kwargs) -> Any:
     try:
         select_key = Dialect.get_select_key(table_name=table_name)
     except NotImplementedError:
-        raise DBError(f"Expect 'select_key' but not. you may should use 'save_select_key' func with 'select_key'.")
+        raise DBError("Expect 'select_key' but not. you may should use 'save_select_key' func with 'select_key'.")
     return save_select_key(select_key, table_name, **kwargs)
 
 
@@ -84,7 +84,7 @@ def save_sql(sql: str, *args, **kwargs) -> Any:
     try:
         select_key = Dialect.get_select_key(sql=sql)
     except NotImplementedError:
-        raise DBError(f"Expect 'select_key' but not. you may should use 'save_sql_select_key' func with 'select_key'.")
+        raise DBError("Expect 'select_key' but not. you may should use 'save_sql_select_key' func with 'select_key'.")
     return save_sql_select_key(select_key, sql, *args, **kwargs)
 
 
@@ -174,7 +174,7 @@ def select(sql: str, *args, **kwargs) -> List[Tuple]:
     return do_select(sql, *args)
 
 
-def select_one(sql: str, *args, **kwargs) -> Tuple:
+def select_one(sql: str, *args, **kwargs) -> Optional[Tuple[Any, ...]]:
     """
     Execute select SQL and return unique result(tuple), SQL contain 'limit'.
 
@@ -212,7 +212,7 @@ def query(sql: str, *args, **kwargs) -> List[dict]:
     return do_query(sql, *args)
 
 
-def query_one(sql: str, *args, **kwargs) -> dict:
+def query_one(sql: str, *args, **kwargs) -> Optional[dict]:
     """
     Execute select SQL and return unique result(dict), SQL contain 'limit'.
 
@@ -266,7 +266,7 @@ def query_first(sql: str, *args, **kwargs) -> dict:
     return do_query_first(sql, *args)
 
 
-def ravel_list(sql: str, *args, position: int = 0, **kwargs) -> List:
+def ravel_list(sql: str, *args, position: int = 0, **kwargs) -> List[Any]:
     """
     Execute select SQL and return list.
 
@@ -322,7 +322,7 @@ def do_save_sql(sql: str, *args) -> Any:
     try:
         select_key = Dialect.get_select_key(sql=sql)
     except NotImplementedError:
-        raise DBError(f"Expect 'select_key' but not. you may should use 'save_sql_select_key' func with 'select_key'.")
+        raise DBError("Expect 'select_key' but not. you may should use 'save_sql_select_key' func with 'select_key'.")
     return do_save_sql_select_key(select_key, sql, *args)
 
 
@@ -385,7 +385,7 @@ def do_select(sql: str, *args) -> List[Tuple[Any, ...]]:
     return _select(sql)
 
 
-def do_select_one(sql: str, *args) -> Tuple[Any, ...]:
+def do_select_one(sql: str, *args) -> Optional[Tuple[Any, ...]]:
     """
     Execute select SQL and return unique result(tuple), SQL contain 'limit'.
 
@@ -419,7 +419,7 @@ def do_query(sql: str, *args) -> List[dict[str, Any]]:
     return _query(sql)
 
 
-def do_query_one(sql: str, *args) -> dict[str, Any]:
+def do_query_one(sql: str, *args) -> Optional[dict[str, Any]]:
     """
     Execute select SQL and return unique result(dict), SQL contain 'limit'.
 
@@ -470,7 +470,7 @@ def do_query_first(sql: str, *args) -> dict:
     return _query_first(sql, *args)
 
 
-def do_ravel_list(sql: str, *args, position: int = 0) -> List:
+def do_ravel_list(sql: str, *args, position: int = 0) -> List[Any]:
     """
     Execute select SQL and return list results(tuple).
 
@@ -608,7 +608,7 @@ def batch_insert(table_name: str, *args) -> int:
     >>> db.batch_execute('person', *args)
     2
     """
-    
+
     logger.debug("Exec func 'sqlexecx.%s' \n\t Table: '%s', args: %s" % ('batch_insert', table_name, args))
     assert args, "*args must not be empty."
     args = sql_support.get_batch_args(*args)
@@ -658,7 +658,7 @@ def do_load(sql: str, *args) -> Loader:
     return Loader(*_do_select(sql))
 
 
-def insert_from_df(df, table_name: str, columns: Collection[str] = None) -> int:
+def insert_from_df(df, table_name: str, columns: Optional[Collection[str]] = None) -> int:
     """
     Insert data into table from pandas DataFrame and return effected rowcount.
 
@@ -673,7 +673,7 @@ def insert_from_df(df, table_name: str, columns: Collection[str] = None) -> int:
     return batch_execute(sql, data)
 
 
-def insert_from_pl(df, table_name: str, columns: Collection[str] = None) -> int:
+def insert_from_pl(df, table_name: str, columns: Optional[Collection[str]] = None) -> int:
     """
     Insert data into table from polars DataFrame and return effected rowcount.
 
@@ -688,7 +688,8 @@ def insert_from_pl(df, table_name: str, columns: Collection[str] = None) -> int:
     return batch_execute(sql, data)
 
 
-def insert_from_csv(file_name: str, table_name: str, delimiter=',', header=True, columns: Collection[str] = None, encoding='utf-8') -> int:
+def insert_from_csv(file_name: str, table_name: str, delimiter=',', header=True,
+                    columns: Optional[Collection[str]] = None, encoding='utf-8') -> int:
     """
     Insert data into table from a csv file and return effected rowcount.
 
@@ -721,6 +722,7 @@ def insert_from_csv(file_name: str, table_name: str, delimiter=',', header=True,
             sql = sql_support.insert_sql(table_name.strip(), lines[0])
         lines = lines[1:]
 
+    assert sql, "No insert SQL generated"
     return batch_execute(sql, lines)
 
 
@@ -779,7 +781,7 @@ def drop_table(table_name: str) -> int:
     return _execute('DROP TABLE IF EXISTS %s' % Dialect.get_dialect_str(table_name))
 
 
-def show_tables(schema: str = None) -> List[str]:
+def show_tables(schema: Optional[str] = None) -> List[str]:
     """
     Show tables
 

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/loader.py

@@ -2,6 +2,7 @@
 # -*- coding:utf-8 -*-
 
 from datetime import datetime, date
+import re
 
 
 class Loader:

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/sql_exec.py

@@ -262,7 +262,7 @@ class Param:
         """
         return self.sql_exec.query_first(*self.args, **self.kwargs)
 
-    def ravel_list(self, position: int = 0) -> List:
+    def ravel_list(self, position: int = 0) -> List[Any]:
         """
         Execute select SQL and return list.
 
@@ -274,7 +274,7 @@ class Param:
         >>> db.sql('SELECT name FROM person WHERE age=:age').param(age=20).ravel_list()
         ['张三', '李四', '王五']
         """
-        return self.sql_exec.ravel_list(*self.args, position=position **self.kwargs)
+        return self.sql_exec.ravel_list(*self.args, position=position, **self.kwargs)
 
     def to_df(self):
         """
@@ -490,7 +490,7 @@ class SqlExec:
         """
         return self.exec.query_first(self.sql, *args, **kwargs)
 
-    def ravel_list(self, *args, position: int = 0, **kwargs) -> List:
+    def ravel_list(self, *args, position: int = 0, **kwargs) -> List[Any]:
         """
         Execute select SQL and return list.
 

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/sql_support.py

@@ -7,7 +7,7 @@ from sqlexecutorx.conf import lru_cache_size
 
 from .dialect import Dialect
 from .log_support import sql_log
-from .constant import NAMED_REGEX, LIMIT_1
+from .constant import NAMED_REGEX
 
 PATTERN = re.compile(NAMED_REGEX)
 
@@ -84,7 +84,7 @@ def get_mapping_sql_args(sql: str, *args, **kwargs):
         if args:
             return sql, args
         raise DBError("Placeholder sql expected '*args' but empty.")
-    
+
     if is_mapping(sql):
         assert kwargs, "Named mapping SQL expected '**kwargs' empty."
         return get_named_sql_args(sql, **kwargs)

{SQLExecX-2.2.4 → SQLExecX-2.2.6}/sqlexecx/table_exec.py

@@ -2,7 +2,7 @@
 # -*- coding:utf-8 -*-
 
 from functools import lru_cache
-from typing import Tuple, List, Union, Any
+from typing import Tuple, List, Union, Any, Optional
 from sqlexecutorx import batch_execute as _batch_execute
 from .loader import Loader
 from . import exec, sql_support
@@ -101,7 +101,7 @@ class ColumnWhereExec:
         """
         return self._where_exec.query_first(*self.columns)
 
-    def ravel_list(self) -> List:
+    def ravel_list(self) -> List[Any]:
         """
         Select data from table and return list.
 
@@ -179,7 +179,7 @@ class ColumnWhereExec:
         ColumnWhereLimitExec()
         """
         return ColumnWhereLimitExec(self._where_exec.limit(limit), *self.columns)
-    
+
     def order_by(self, order_by: str) -> ColumnWhereOrderByExec:
         """
         Get a ColumnWhereOrderByExec instance
@@ -195,10 +195,10 @@ class ColumnWhereExec:
 
 class WhereExec(WhereBase):
 
-    def __init__(self, _exec, table_name: str, order_by: str, **kwargs):
+    def __init__(self, _exec, table_name: str, order_by: Optional[str], **kwargs):
         super().__init__(_exec, table_name, order_by, **kwargs)
 
-    def get(self, column: str) -> Any:
+    def get(self, column: Union[str, int]) -> Any:
         """
         Select data from table and expected one int and only one int result, SQL contain 'limit'.
 
@@ -346,7 +346,7 @@ class WhereExec(WhereBase):
         """
         return WherePageExec(self, page_num, page_size, return_total)
 
-    def limit(self, limit: Union[int, Tuple[int], List[int]] = 10) -> WhereLimitExec:
+    def limit(self, limit: Union[int, Tuple[int, int], List[int]] = 10) -> WhereLimitExec:
         """
         Get a WhereLimitExec instance
 
@@ -357,7 +357,7 @@ class WhereExec(WhereBase):
         WhereLimitExec()
         """
         return WhereLimitExec(self.exec, self.table, None, limit, **self.where_condition)
-    
+
     def order_by(self, order_by: str) -> WhereOrderByExec:
         """
         Get a WhereOrderByExec instance
@@ -369,8 +369,8 @@ class WhereExec(WhereBase):
         WhereOrderByExec()
         """
         return WhereOrderByExec(self.exec, self.table, order_by, **self.where_condition)
-    
-  
+
+
 class ColumnExec:
 
     def __init__(self, table_exec, *columns):
@@ -493,7 +493,7 @@ class ColumnExec:
         """
         return self.table_exec.query_first(*self.columns)
 
-    def ravel_list(self) -> List:
+    def ravel_list(self) -> List[Any]:
         """
         Select data from table and return list.
 
@@ -515,7 +515,7 @@ class ColumnExec:
         >>> db.table('person').columns('id', 'name', 'age').to_df()
         """
         return self.table_exec.load(*self.columns).to_df()
-    
+
     def to_pl(self):
         """
         Select from table and return polars DataFrame instance.
@@ -584,7 +584,7 @@ class ColumnExec:
         ColumnLimitExec()
         """
         return ColumnLimitExec(self.table_exec.limit(limit), *self.columns)
-    
+
     def order_by(self, order_by: str) -> ColumnOrderByExec:
         """
         Get a ColumnOrderByExec instance
@@ -659,7 +659,7 @@ class Table:
         """
         return self.exec.batch_insert(self.table, *args)
 
-    def get(self, column: str) -> Any:
+    def get(self, column: Union[str, int]) -> Any:
         """
         Select data from table and expected one int and only one int result, SQL contain 'limit'.
 
@@ -762,7 +762,7 @@ class Table:
         sql = get_table_select_sql(self.table, None, None, 0, *columns)
         return self.exec.do_query_first(sql)
 
-    def ravel_list(self, column: str) -> List:
+    def ravel_list(self, column: str) -> List[Any]:
         """
         Select data from table and return list.
 
@@ -790,7 +790,7 @@ class Table:
         sql = get_table_select_sql(self.table, None, None, 0, *columns)
         return self.exec.do_load(sql)
 
-    def insert_from_df(self, df, columns: Tuple[str] = None):
+    def insert_from_df(self, df, columns: Optional[Tuple[str]] = None):
         """
         Insert data into table from pandas DataFrame and return effected rowcount.
 
@@ -801,8 +801,8 @@ class Table:
         20
         """
         return self.exec.insert_from_df(df, self.table, columns)
-    
-    def insert_from_pl(self, df, columns: Tuple[str] = None):
+
+    def insert_from_pl(self, df, columns: Optional[Tuple[str]] = None):
         """
         从polars DataFrame插入数据到表中并返回影响的行数。
 
@@ -814,7 +814,8 @@ class Table:
         """
         return self.exec.insert_from_pl(df, self.table, columns)
 
-    def insert_from_csv(self, file_name: str, delimiter=',', header=True, columns: Tuple[str] = None, encoding='utf-8'):
+    def insert_from_csv(self, file_name: str, delimiter=',', header=True,
+                        columns: Optional[Tuple[str]] = None, encoding='utf-8'):
         """
         Insert data into table from a csv file and return effected rowcount.
 
@@ -898,7 +899,7 @@ class Table:
         """
         return TablePageExec(self, page_num, page_size, return_total)
 
-    def limit(self, limit: Union[int, Tuple[int], List[int]] = 10) -> LimitExec:
+    def limit(self, limit: Union[int, Tuple[int, int], List[int]] = 10) -> LimitExec:
         """
         Get a LimitExec instance
 
@@ -909,7 +910,7 @@ class Table:
         LimitExec()
         """
         return LimitExec(self.exec, self.table, None, limit)
-    
+
     def order_by(self, order_by: str) -> OrderByExec:
         """
         Get a OrderByExec instance