MySQLX 2.2.4__tar.gz → 2.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.4
+Version: 2.2.5
 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.
 Home-page: https://gitee.com/summry/mysqlx
 Author: summy
@@ -136,16 +136,16 @@ 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(....)
 

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

@@ -122,16 +122,16 @@ 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(....)
 

{mysqlx-2.2.4 → mysqlx-2.2.5}/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.4 → mysqlx-2.2.5}/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.5}/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.5}/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.5}/mysqlx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.4
+Version: 2.2.5
 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.
 Home-page: https://gitee.com/summry/mysqlx
 Author: summy
@@ -136,16 +136,16 @@ 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(....)
 

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

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

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

@@ -19,9 +19,9 @@ setup(
     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.5',
     url='https://gitee.com/summry/mysqlx',
     author='summy',
     author_email='xiazhongbiao@126.com',

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

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