MySQLX 2.2.1__tar.gz → 2.2.3__tar.gz

{mysqlx-2.2.1 → mysqlx-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.1
+Version: 2.2.3
 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

mysqlx-2.2.3/mysqlx/constant.py

@@ -0,0 +1,9 @@
+from sqlexecx.constant import CACHE_SIZE
+
+SQL_CACHE_SIZE = CACHE_SIZE << 1
+
+MODULE = 'MySQLX'
+
+MAPPER_PATH = 'mapper_path'
+
+DYNAMIC_REGEX = '{%|{{|}}|%}'

{mysqlx-2.2.1 → mysqlx-2.2.3}/mysqlx/db.py

@@ -11,7 +11,7 @@ def execute(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.execute', sql, *args, **kwargs)
     return do_execute(sql, *args)
 
 
@@ -23,7 +23,7 @@ def get(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.get', sql, *args, **kwargs)
     return do_get(sql, *args)
 
 
@@ -33,7 +33,7 @@ def query(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query', sql, *args, **kwargs)
     return do_query(sql, *args)
 
 
@@ -45,7 +45,7 @@ def query_one(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.query_one', sql, *args, **kwargs)
     return do_query_one(sql, *args)
 
 
@@ -55,7 +55,7 @@ def select(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select', sql, *args, **kwargs)
     return do_select(sql, *args)
 
 
@@ -67,7 +67,7 @@ def select_one(sql: str, *args, **kwargs):
     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)
+    sql, args = sql_support.try_dynamic_sql('MySQLX.db.select_one', sql, *args, **kwargs)
     return do_select_one(sql, *args)
 
 

{mysqlx-2.2.1 → mysqlx-2.2.3}/mysqlx/sql_support.py

@@ -2,11 +2,9 @@ import re
 from jinja2 import Template
 from functools import lru_cache
 from .log_support import page_log
-from .constant import DYNAMIC_REGEX, CACHE_SIZE
+from .constant import DYNAMIC_REGEX, SQL_CACHE_SIZE
 
-from sqlexecx.table_support import get_table_select_sql
-# Don't remove. Import for not repetitive implementation
-from sqlexecx.sql_support import get_batch_args, get_named_sql_args, is_mapping, get_mapping_sql_args, require_limit, try_mapping
+from sqlexecx.sql_support import get_named_sql_args, is_mapping, get_mapping_sql_args, try_mapping, get_batch_args
 
 
 def simple_sql(sql: str, *args, **kwargs):
@@ -25,12 +23,12 @@ def get_page_start(page_num: int, page_size: int):
     return (page_num - 1) * page_size
 
 
-@lru_cache(maxsize=2*CACHE_SIZE)
+@lru_cache(maxsize=SQL_CACHE_SIZE)
 def is_dynamic_sql(sql: str):
     return re.search(DYNAMIC_REGEX, sql) is not None
 
 
-@lru_cache(maxsize=2*CACHE_SIZE)
+@lru_cache(maxsize=SQL_CACHE_SIZE)
 def _get_sql_type(sql: str):
     """
     :return: 0: placeholder, 1: dynamic, 2: named mapping

{mysqlx-2.2.1 → mysqlx-2.2.3}/mysqlx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.2.1
+Version: 2.2.3
 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

{mysqlx-2.2.1 → mysqlx-2.2.3}/setup.py

@@ -21,7 +21,7 @@ setup(
         'Jinja2>=2.7.0',
         'sqlexecx>=2.1.1',
     ],
-    version='2.2.1',
+    version='2.2.3',
     url='https://gitee.com/summry/mysqlx',
     author='summy',
     author_email='xiazhongbiao@126.com',

mysqlx-2.2.1/mysqlx/constant.py

@@ -1,13 +0,0 @@
-from sqlexecx.constant import LIMIT_1
-
-MODULE = 'mysqlx'
-
-NO_LIMIT = 0
-
-CACHE_SIZE = 256
-
-MAPPER_PATH = 'mapper_path'
-
-
-DYNAMIC_REGEX = '{%|{{|}}|%}'
-