MySQLX 2.2.4__tar.gz → 2.2.6__tar.gz

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.4
-Summary: A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions. It also provides ORM operations for single tables.
+Version: 2.2.6
+Summary: A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions.
 Home-page: https://gitee.com/summry/mysqlx
 Author: summy
 Author-email: xiazhongbiao@126.com
@@ -115,7 +115,24 @@ Usage Sample
         # (3, 'zhangsan', 15)
 
         # you can direct execute sql with db
-        effected_rowcount = db.insert(table='user', name='zhaoliu', age=66)
+        effected_rowcount = db.table('person').insert(name='zhangsan', age=15)
+        # 1
+
+        primary_key = db.table('person').save(name='lisi', age=26)
+        # 4
+
+        effected_rowcount = db.insert(table='user', name='wangwu', age=38)
+        # 1
+
+        users = db.table('user').columns('id, name, age').select()
+        # result:
+        # (3, 'zhangsan', 15)
+        # (4, 'lisi', 26)
+        # (5, 'wangwu', 38)
+
+        users = db.table('user').columns('id, name, age').where(name='zhangsan').query()
+        # result:
+        # [{'id': 3, 'name': 'zhangsan', 'age': 15}]
 
         users = db.select('select id, name, age from user')
         # result:
@@ -136,25 +153,25 @@ Transaction
 
 .. code:: python
 
-       from mysqlx import with_transaction, transaction
+       from mysqlx import trans
 
-       @with_transaction
+       @trans
        def test_transaction():
            insert_func(....)
            update_func(....)
 
 
        def test_transaction2():
-           with transaction():
+           with trans():
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlormx
+If you want to use ORM, may be you need SQLORMX: https://pypi.org/project/sqlormx
 
 If you want to operate PostgreSQL database, may be you need PgSqlx: https://pypi.org/project/pgsqlx
 
-If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
+If you just wanted a simple sql executor, may be you need SQLExecX: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need BatisX: https://pypi.org/project/batisx
 
 

{mysqlx-2.2.4 → mysqlx-2.2.6}/README.rst

@@ -101,7 +101,24 @@ Usage Sample
         # (3, 'zhangsan', 15)
 
         # you can direct execute sql with db
-        effected_rowcount = db.insert(table='user', name='zhaoliu', age=66)
+        effected_rowcount = db.table('person').insert(name='zhangsan', age=15)
+        # 1
+
+        primary_key = db.table('person').save(name='lisi', age=26)
+        # 4
+
+        effected_rowcount = db.insert(table='user', name='wangwu', age=38)
+        # 1
+
+        users = db.table('user').columns('id, name, age').select()
+        # result:
+        # (3, 'zhangsan', 15)
+        # (4, 'lisi', 26)
+        # (5, 'wangwu', 38)
+
+        users = db.table('user').columns('id, name, age').where(name='zhangsan').query()
+        # result:
+        # [{'id': 3, 'name': 'zhangsan', 'age': 15}]
 
         users = db.select('select id, name, age from user')
         # result:
@@ -122,23 +139,23 @@ Transaction
 
 .. code:: python
 
-       from mysqlx import with_transaction, transaction
+       from mysqlx import trans
 
-       @with_transaction
+       @trans
        def test_transaction():
            insert_func(....)
            update_func(....)
 
 
        def test_transaction2():
-           with transaction():
+           with trans():
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlormx
+If you want to use ORM, may be you need SQLORMX: https://pypi.org/project/sqlormx
 
 If you want to operate PostgreSQL database, may be you need PgSqlx: https://pypi.org/project/pgsqlx
 
-If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
+If you just wanted a simple sql executor, may be you need SQLExecX: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need BatisX: https://pypi.org/project/batisx

{mysqlx-2.2.4 → mysqlx-2.2.6}/mysqlx/__init__.py

@@ -1,8 +1,6 @@
 from sqlexecx import (
-    connection,
-    transaction,
-    with_connection,
-    with_transaction,
+    conn,
+    trans,
     get_connection,
     close,
     Driver,

mysqlx-2.2.6/mysqlx/db.py

@@ -0,0 +1,159 @@
+from typing import List, Tuple
+from . import sql_support
+# Don't remove. Import for not repetitive implementation
+from sqlexecx import insert, save, batch_insert, batch_execute, do_execute, do_save_sql, do_get, do_query,\
+    do_query_one, do_select, do_select_one, do_select_page, do_query_page, do_select_page, do_query_page, \
+    load, do_load, insert_from_csv, insert_from_df, insert_from_json, truncate_table, drop_table, table
+
+
+def execute(sql: str, *args, **kwargs):
+    """
+    Execute sql return effect rowcount
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'INSERT INTO person(name, age) VALUES(?, ?)'
+    >>> db.execute(sql, '张三', 20)
+    1
+    >>> sql = 'INSERT INTO person(name, age) VALUES(:name, :age)'
+    >>> db.execute(sql, name='张三', age=20)
+    1
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.execute', sql, *args, **kwargs)
+    return do_execute(sql, *args)
+
+
+def get(sql: str, *args, **kwargs):
+    """
+    Execute select SQL and expected one int and only one int result, SQL contain 'limit'.
+
+    MultiColumnsError: Expect only one column.
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT count(1) FROM person WHERE name=? and age=? LIMIT 1'
+    >>> db.get(sql, '张三', 20)
+    1
+    >>> sql = 'SELECT count(1) FROM person WHERE name=:name and age=:age LIMIT 1'
+    >>> db.get(sql, name='张三', age=20)
+    1
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.get', sql, *args, **kwargs)
+    return do_get(sql, *args)
+
+
+def query(sql: str, *args, **kwargs) -> List[dict]:
+    """
+    Execute select SQL and return list results(dict).
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=?'
+    >>> db.query(sql, '张三', 20)
+    [{'id': 3, 'name': '张三', 'age': 20}]
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age '
+    >>> db.query(sql, name='张三', age=20)
+    [{'id': 3, 'name': '张三', 'age': 20}]
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query', sql, *args, **kwargs)
+    return do_query(sql, *args)
+
+
+def query_one(sql: str, *args, **kwargs) -> dict:
+    """
+    Execute select SQL and return unique result(dict), SQL contain 'limit'.
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=? LIMIT 1'
+    >>> db.query_one(sql, '张三', 20)
+    {'id': 3, 'name': '张三', 'age': 20}
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age LIMIT 1'
+    >>> db.query_one(sql, name='张三', age=20)
+    {'id': 3, 'name': '张三', 'age': 20}
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query_one', sql, *args, **kwargs)
+    return do_query_one(sql, *args)
+
+
+def select(sql: str, *args, **kwargs) -> List[Tuple]:
+    """
+    Execute select SQL and return list results(tuple).
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=?'
+    >>> db.select(sql, '张三', 20)
+    [(3, '张三', 20)]
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age '
+    >>> db.get(sql, name='张三', age=20)
+    [(3, '张三', 20)]
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select', sql, *args, **kwargs)
+    return do_select(sql, *args)
+
+
+def select_one(sql: str, *args, **kwargs) -> Tuple:
+    """
+    Execute select SQL and return unique result(tuple), SQL contain 'limit'.
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=? LIMIT 1'
+    >>> db.select_one(sql, '张三', 20)
+    (3, '张三', 20)
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age LIMIT 1'
+    >>> db.select_one(sql, name='张三', age=20)
+    (3, '张三', 20)
+    """
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select_one', sql, *args, **kwargs)
+    return do_select_one(sql, *args)
+
+
+def query_page(sql: str, page_num=1, page_size=10, *args, **kwargs) -> List[dict]:
+    """
+    Execute select SQL and return list or empty list if no result.
+
+    Automatically add 'limit ?,?' after sql statement if not.
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=?'
+    >>> db.query_page(sql, 1, 10, '张三', 20)
+    [{'id': 3, 'name': '张三', 'age': 20}]
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age '
+    >>> db.query_page(sql, 1, 10, name='张三', age=20)
+    [{'id': 3, 'name': '张三', 'age': 20}]
+    """
+    sql, args = sql_support.try_page_mapping('query_page', sql, page_num, page_size, *args, **kwargs)
+    return do_query_page(sql, page_num, page_size, *args)
+
+
+def select_page(sql: str, page_num=1, page_size=10, *args, **kwargs) -> List[Tuple]:
+    """
+    Execute select SQL and return list(tuple) or empty list if no result.
+
+    Automatically add 'limit ?,?' after sql statement if not.
+
+    Examples
+    --------
+    >>> from mysqlx import db
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=? and age=?'
+    >>> db.select_page(sql, 1, 10, '张三', 20)
+    [(3, '张三', 20)]
+    >>> sql = 'SELECT id, name, age FROM person WHERE name=:name and age=:age '
+    >>> db.select_page(sql, 1, 10, name='张三', age=20)
+    [(3, '张三', 20)]
+    """
+    sql, args = sql_support.try_page_mapping('select_page', sql, page_num, page_size, *args, **kwargs)
+    return do_select_page(sql, page_num, page_size, *args)
+
+
+from .sql_page_exec import sql, page

{mysqlx-2.2.4 → mysqlx-2.2.6}/mysqlx/sql_holder.py

@@ -46,13 +46,13 @@ def do_get_sql(sql_model, batch, param_names, *args, **kwargs):
     :return:
     """
     if sql_model.dynamic:
-        if not kwargs:
-            raise MapperError("Parameter 'kwargs' must not be empty when named mapping sql.")
         sql = sql_model.sql.render(**kwargs)
-        logger.debug("Original sql: {}".format(sql))
+        # 去掉空行
+        sql = '\n\t'.join([line for line in sql.rstrip().split('\n\t') if line.strip()])
+        logger.debug(f"Original sql: {sql}")
         return get_named_sql_args(sql, **kwargs)
     else:
-        logger.debug("Original sql: {}".format(sql_model.sql))
+        logger.debug(f"Original sql: {sql_model.sql}")
         if sql_model.mapping and kwargs:
             return get_named_sql_args(sql_model.sql, **kwargs)
         elif sql_model.placeholder and kwargs:
@@ -65,7 +65,7 @@ def do_get_sql(sql_model, batch, param_names, *args, **kwargs):
 
 
 def build_sql_id(namespace, _id):
-    return namespace + "." + _id
+    return f'{namespace}.{_id}'
 
 
 def get_sql_model(sql_id: str):
@@ -179,4 +179,6 @@ def _load_sql(namespace, child, file):
 
 
 def _valid_sql(sql_id, sql, tag):
+    if tag in (SqlAction.SQL.value, SqlAction.CALL.value):
+        return
     assert tag in _valid_sql_actions and tag in sql.lower(), "Sql id: '{}' has not '{}' key word in {} sql.".format(sql_id, tag, tag)

{mysqlx-2.2.4 → mysqlx-2.2.6}/mysqlx/sql_mapper.py

@@ -87,16 +87,20 @@ def get_exec_func(func, action, batch):
 def get_select_func(func):
     names = func.__code__.co_names
     is_list = 'list' in names or 'List' in names
-    if 'Mapping' in names and is_list:
+    is_dict = 'dict' in names or 'Mapping' in names
+    is_tuple = 'tuple' in names or 'Tuple' in names
+    if is_dict and is_list:
         return sqlexecx.do_query
-    elif 'Mapping' in names:
+    elif is_tuple and is_list:
+        return sqlexecx.do_select
+    elif is_dict in names:
         return sqlexecx.do_query_one
     elif len(names) == 1 and names[0] in ('int', 'float', 'Decimal', 'str', 'AnyStr', 'date', 'time', 'datetime'):
         return sqlexecx.do_get
     elif len(names) == 1 and names[0] in ('tuple', 'Tuple'):
         return sqlexecx.do_select_one
-    elif is_list:
-        return sqlexecx.do_select
+    elif is_list and len(names) == 2:
+        return sqlexecx.do_ravel_list
     else:
         return sqlexecx.do_query
 

{mysqlx-2.2.4 → mysqlx-2.2.6}/mysqlx/support.py

@@ -11,6 +11,7 @@ class NotFoundError(DBError):
 
 
 class SqlAction(Enum):
+    SQL = 'sql'
     CALL = 'call'
     INSERT = 'insert'
     UPDATE = 'update'

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.4
-Summary: A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions. It also provides ORM operations for single tables.
+Version: 2.2.6
+Summary: A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions.
 Home-page: https://gitee.com/summry/mysqlx
 Author: summy
 Author-email: xiazhongbiao@126.com
@@ -115,7 +115,24 @@ Usage Sample
         # (3, 'zhangsan', 15)
 
         # you can direct execute sql with db
-        effected_rowcount = db.insert(table='user', name='zhaoliu', age=66)
+        effected_rowcount = db.table('person').insert(name='zhangsan', age=15)
+        # 1
+
+        primary_key = db.table('person').save(name='lisi', age=26)
+        # 4
+
+        effected_rowcount = db.insert(table='user', name='wangwu', age=38)
+        # 1
+
+        users = db.table('user').columns('id, name, age').select()
+        # result:
+        # (3, 'zhangsan', 15)
+        # (4, 'lisi', 26)
+        # (5, 'wangwu', 38)
+
+        users = db.table('user').columns('id, name, age').where(name='zhangsan').query()
+        # result:
+        # [{'id': 3, 'name': 'zhangsan', 'age': 15}]
 
         users = db.select('select id, name, age from user')
         # result:
@@ -136,25 +153,25 @@ Transaction
 
 .. code:: python
 
-       from mysqlx import with_transaction, transaction
+       from mysqlx import trans
 
-       @with_transaction
+       @trans
        def test_transaction():
            insert_func(....)
            update_func(....)
 
 
        def test_transaction2():
-           with transaction():
+           with trans():
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlormx
+If you want to use ORM, may be you need SQLORMX: https://pypi.org/project/sqlormx
 
 If you want to operate PostgreSQL database, may be you need PgSqlx: https://pypi.org/project/pgsqlx
 
-If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
+If you just wanted a simple sql executor, may be you need SQLExecX: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need BatisX: https://pypi.org/project/batisx
 
 

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

@@ -0,0 +1,2 @@
+Jinja2>=2.7.0
+sqlexecx>=2.1.4

{mysqlx-2.2.4 → mysqlx-2.2.6}/setup.py

@@ -14,14 +14,14 @@ long_description = read("README.rst")
 setup(
     name='mysqlx',
     packages=['mysqlx'],
-    description="A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions. It also provides ORM operations for single tables.",
+    description="A thread safe sql executor for MySQL like MyBatis with connection pool. It helps you automatically manage database connections and transactions.",
     long_description=long_description,
     long_description_content_type='text/markdown',
     install_requires=[
         'Jinja2>=2.7.0',
-        'sqlexecx>=2.1.3',
+        'sqlexecx>=2.1.4',
     ],
-    version='2.2.4',
+    version='2.2.6',
     url='https://gitee.com/summry/mysqlx',
     author='summy',
     author_email='xiazhongbiao@126.com',

mysqlx-2.2.4/mysqlx/db.py

@@ -1,95 +0,0 @@
-from . import sql_support
-# Don't remove. Import for not repetitive implementation
-from sqlexecx import insert, save, batch_insert, batch_execute, do_execute, do_save_sql, do_get, do_query,\
-    do_query_one, do_select,do_select_one, do_select_page, do_query_page, do_select_page, do_query_page, load, do_load, insert_from_csv,\
-    insert_from_df, insert_from_json, truncate_table, drop_table, table
-
-
-def execute(sql: str, *args, **kwargs):
-    """
-    Execute SQL.
-    sql: INSERT INTO user(name, age) VALUES(?, ?)  -->  args: ('张三', 20)
-         INSERT INTO user(name, age) VALUES(:name,:age)  -->  kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.execute', sql, *args, **kwargs)
-    return do_execute(sql, *args)
-
-
-# ----------------------------------------------------------Query function------------------------------------------------------------------
-def get(sql: str, *args, **kwargs):
-    """
-    Execute select SQL and expected one int and only one int result. Automatically add 'limit ?' after sql statement if not.
-    MultiColumnsError: Expect only one column.
-    sql: SELECT count(1) FROM user WHERE name=? and age=? limit 1  -->  args: ('张三', 20)
-         SELECT count(1) FROM user WHERE name=:name and age=:age limit 1  -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.get', sql, *args, **kwargs)
-    return do_get(sql, *args)
-
-
-def query(sql: str, *args, **kwargs):
-    """
-    Execute select SQL and return list or empty list if no result.
-    sql: SELECT * FROM user WHERE name=? and age=?  -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age  -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query', sql, *args, **kwargs)
-    return do_query(sql, *args)
-
-
-def query_one(sql: str, *args, **kwargs):
-    """
-    Execute select SQL and expected one row result(dict). Automatically add 'limit ?' after sql statement if not.
-    If no result found, return None.
-    If multiple results found, the first one returned.
-    sql: SELECT * FROM user WHERE name=? and age=? limit 1 -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age limit 1  -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query_one', sql, *args, **kwargs)
-    return do_query_one(sql, *args)
-
-
-def select(sql: str, *args, **kwargs):
-    """
-    Execute select SQL and return list(tuple) or empty list if no result.
-    sql: SELECT * FROM user WHERE name=? and age=?  -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age   -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select', sql, *args, **kwargs)
-    return do_select(sql, *args)
-
-
-def select_one(sql: str, *args, **kwargs):
-    """
-    Execute select SQL and expected one row result(tuple). Automatically add 'limit ?' after sql statement if not.
-    If no result found, return None.
-    If multiple results found, the first one returned.
-    sql: SELECT * FROM user WHERE name=? and age=? limit 1  -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age limit 1  -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select_one', sql, *args, **kwargs)
-    return do_select_one(sql, *args)
-
-
-# ----------------------------------------------------------Page function------------------------------------------------------------------
-def query_page(sql: str, page_num=1, page_size=10, *args, **kwargs):
-    """
-    Execute select SQL and return list or empty list if no result. Automatically add 'limit ?,?' after sql statement if not.
-    sql: SELECT * FROM user WHERE name=? and age=?  -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age  -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_page_mapping('query_page', sql, page_num, page_size, *args, **kwargs)
-    return do_query_page(sql, page_num, page_size, *args)
-
-
-def select_page(sql: str, page_num=1, page_size=10, *args, **kwargs):
-    """
-    Execute select SQL and return list(tuple) or empty list if no result. Automatically add 'limit ?,?' after sql statement if not.
-    sql: SELECT * FROM user WHERE name=? and age=?  -->  args: ('张三', 20)
-         SELECT * FROM user WHERE name=:name and age=:age   -->  kwargs: ('张三', 20) --> kwargs: {'name': '张三', 'age': 20}
-    """
-    sql, args = sql_support.try_page_mapping('select_page', sql, page_num, page_size, *args, **kwargs)
-    return do_select_page(sql, page_num, page_size, *args)
-
-
-from .sql_page_exec import sql, page

mysqlx-2.2.4/mysqlx.egg-info/requires.txt

@@ -1,2 +0,0 @@
-Jinja2>=2.7.0
-sqlexecx>=2.1.3