MySQLX 2.1.4__tar.gz → 2.2.0__tar.gz

{mysqlx-2.1.4 → mysqlx-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.1.4
+Version: 2.2.0
 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
@@ -10,7 +10,6 @@ Keywords: sql,MySQL,MyBatis,python
 Platform: UNKNOWN
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 Mapper file
 '''''''''''
@@ -149,12 +148,12 @@ Transaction
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlx-orm
+You can generate model class with mysqlx-generator: 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/sqlx-exec
+If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/sqlx-batis
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx
 
 

{mysqlx-2.1.4 → mysqlx-2.2.0}/README.rst

@@ -135,10 +135,10 @@ Transaction
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlx-orm
+You can generate model class with mysqlx-generator: 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/sqlx-exec
+If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/sqlx-batis
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/__init__.py

@@ -1,4 +1,4 @@
-from sqlexec import (
+from sqlexecx import (
     connection,
     transaction,
     with_connection,

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/constant.py

@@ -1,4 +1,4 @@
-from sqlexec.constant import LIMIT_1
+from sqlexecx.constant import LIMIT_1
 
 MODULE = 'mysqlx'
 

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/db.py

@@ -1,6 +1,6 @@
 from . import sql_support
 # Don't remove. Import for not repetitive implementation
-from sqlexec import insert, save, batch_insert, batch_execute, do_execute, do_save_sql, do_get, do_query,\
+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
 

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/log_support.py

@@ -1,5 +1,5 @@
 # Don't remove. Import for not repetitive implementation
-from sqlexec.log_support import logger
+from sqlexecx.log_support import logger
 from .constant import MODULE
 
 

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/sql_id_exec.py

@@ -1,6 +1,6 @@
 from . import dbx
-from sqlexec.sql_exec import SqlExec as _SqlExec
-from sqlexec.page_exec import PageExec
+from sqlexecx.sql_exec import SqlExec as _SqlExec
+from sqlexecx.page_exec import PageExec
 
 
 class SqlExec(_SqlExec):

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/sql_mapper.py

@@ -1,5 +1,5 @@
 import os
-import sqlexec
+import sqlexecx
 import functools
 from .log_support import logger
 from .support import SqlAction, DBError
@@ -79,26 +79,26 @@ def get_exec_func(func, action, batch):
     if action == SqlAction.SELECT.value:
         return get_select_func(func)
     elif batch:
-        return sqlexec.batch_execute
+        return sqlexecx.batch_execute
     else:
-        return sqlexec.do_execute
+        return sqlexecx.do_execute
 
 
 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:
-        return sqlexec.do_query
+        return sqlexecx.do_query
     elif 'Mapping' in names:
         return sqlexec.do_query_one
     elif len(names) == 1 and names[0] in ('int', 'float', 'Decimal', 'str', 'AnyStr', 'date', 'time', 'datetime'):
-        return sqlexec.do_get
+        return sqlexecx.do_get
     elif len(names) == 1 and names[0] in ('tuple', 'Tuple'):
-        return sqlexec.do_select_one
+        return sqlexecx.do_select_one
     elif is_list:
-        return sqlexec.do_select
+        return sqlexecx.do_select
     else:
-        return sqlexec.do_query
+        return sqlexecx.do_query
 
 
 def before(func, namespace, _id, *args, **kwargs):

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/sql_page_exec.py

@@ -1,6 +1,6 @@
 from . import db
-from sqlexec.sql_exec import SqlExec
-from sqlexec.page_exec import PageExec
+from sqlexecx.sql_exec import SqlExec
+from sqlexecx.page_exec import PageExec
 
 
 def sql(sql: str) :

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/sql_support.py

@@ -5,7 +5,7 @@ from .log_support import page_log
 from .constant import LIMIT_1, DYNAMIC_REGEX, CACHE_SIZE
 
 # Don't remove. Import for not repetitive implementation
-from sqlexec.sql_support import get_batch_args, get_named_sql_args, is_mapping, get_mapping_sql_args, require_limit, try_mapping, get_table_select_sql
+from sqlexecx.sql_support import get_batch_args, get_named_sql_args, is_mapping, get_mapping_sql_args, require_limit, try_mapping, get_table_select_sql
 
 
 def simple_sql(sql: str, *args, **kwargs):

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx/support.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 # Don't remove. Import for not repetitive implementation
-from executor import DBError
+from sqlexecutorx import DBError
 
 
 class MapperError(DBError):

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mysqlx
-Version: 2.1.4
+Version: 2.2.0
 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
@@ -10,7 +10,6 @@ Keywords: sql,MySQL,MyBatis,python
 Platform: UNKNOWN
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 Mapper file
 '''''''''''
@@ -149,12 +148,12 @@ Transaction
                insert_func(....)
                update_func(....)
 
-You can generate model class with mysqlx-generator: https://pypi.org/project/sqlx-orm
+You can generate model class with mysqlx-generator: 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/sqlx-exec
+If you just wanted a simple sql executor, may be you need sqlx-exec: https://pypi.org/project/sqlexecx
 
-If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/sqlx-batis
+If you wanted simultaneously support MySQL and PostgreSQL, may be you need sqlx-batis: https://pypi.org/project/batisx
 
 

{mysqlx-2.1.4 → mysqlx-2.2.0}/mysqlx.egg-info/SOURCES.txt

@@ -1,12 +1,9 @@
-LICENSE
 README.rst
 setup.py
 mysqlx/__init__.py
 mysqlx/constant.py
 mysqlx/db.py
 mysqlx/dbx.py
-mysqlx/generator.py
-mysqlx/generator.tpl
 mysqlx/log_support.py
 mysqlx/sql_holder.py
 mysqlx/sql_id_exec.py

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

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

{mysqlx-2.1.4 → mysqlx-2.2.0}/setup.py

@@ -19,9 +19,9 @@ setup(
     long_description_content_type='text/markdown',
     install_requires=[
         'Jinja2>=2.7.0',
-        'sqlx-exec>=2.3.6',
+        'sqlexecx>=0.0.2',
     ],
-    version='2.1.4',
+    version='2.2.0',
     url='https://gitee.com/summry/mysqlx',
     author='summy',
     author_email='xiazhongbiao@126.com',

mysqlx-2.1.4/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

mysqlx-2.1.4/mysqlx/generator.py

@@ -1,185 +0,0 @@
-import os
-from sqlexec import Dialect, Engine
-from sqlbatis import db, init_db
-from typing import Union, Iterable
-from jinja2 import FileSystemLoader, Environment
-from sqlbatis.constant import KEY, TABLE, UPDATE_BY, UPDATE_TIME, DEL_FLAG, KEY_STRATEGY
-
-COMMON_COLS = ['create_by', 'create_time']
-ATTRIBUTES = {KEY: 'id', UPDATE_BY: 'update_by', UPDATE_TIME: 'update_time', DEL_FLAG: 'del_flag'}
-
-
-class Generator:
-    comma1 = ','
-    comma2 = '，'
-    sql = '''
-    SELECT column_name, data_type, character_maximum_length, NUMERIC_precision, NUMERIC_scale, column_key FROM information_schema.columns
-     WHERE table_schema = (SELECT DATABASE()) AND table_name = ? 
-    '''
-
-    def __init__(self, *args, **kwargs):
-        """
-        Compliant with the Python DB API 2.0 (PEP-249).
-
-        from mysqlx.generator import Generator
-        coder = Generator("postgres://user:password@127.0.0.1:5432/testdb", driver='psycopg2')
-        or
-        coder = Generator(user='root', password='xxx', host='127.0.0.1', port=3306, database='testdb', driver='pymysql')
-
-        Addition parameters:
-        :param driver: str, import driver, 'import pymysql'
-        :param pool_size: int, size of connection pool
-        :param show_sql: bool, if True, print sql
-        :param debug: bool, if True, print debug context
-
-        Other parameters of connection pool refer to DBUtils: https://webwareforpython.github.io/DBUtils/main.html#pooleddb-pooled-db
-        """
-        Dialect.init(Engine.MYSQL)
-        init_db(*args, **kwargs)
-
-    def generate_with_schema(self, schema: str = None, path: str = None, *args, **kwargs):
-        """
-        coder = Generator(user='root', password='xxx', host='127.0.0.1', port=3306, database='testdb', driver='pymysql')
-        coder.generate_with_schema('testdb', 'models.py')
-        """
-
-        if schema:
-            db.execute('use %s' % schema)
-        tables = db.select('show tables')
-        tables = [table[0] for table in tables]
-        self.generate_with_tables(tables=tables, path=path, *args, **kwargs)
-
-    def generate_with_tables(self, tables: Union[str, Iterable[str]], path: str = None, *args, **kwargs):
-        """
-        coder = Generator(user='root', password='xxx', host='127.0.0.1', port=3306, database='testdb', driver='pymysql')
-        coder.generate_with_tables(['user', 'person'], 'models.py')
-        """
-
-        metas = None
-        only_one_table = False
-        if not args:
-            args = COMMON_COLS
-        if not kwargs:
-            kwargs = ATTRIBUTES
-
-        columns = [v for v in kwargs.values()]
-        if args:
-            args = list(args)
-            args.reverse()
-            for i in range(0, len(args)):
-                columns.insert(1, args[i])
-
-            # 去重
-            base_columns = list(set(columns))
-            # 保持原有顺序
-            base_columns.sort(key=columns.index)
-        else:
-            base_columns = columns
-
-        # 设置属性名
-        prefix = '__attribute_name'
-        for item in [KEY, TABLE, UPDATE_BY, UPDATE_TIME, DEL_FLAG, KEY_STRATEGY]:
-            kwargs[prefix + item] = item
-
-        if isinstance(tables, str):
-            if self.comma1 in tables:
-                tables = tables.split(self.comma1)
-            elif self.comma2 in tables:
-                tables = tables.split(self.comma2)
-            else:
-                only_one_table = True
-                metas = [self._get_table_meta(tables, base_columns)]
-
-        if not only_one_table:
-            if not isinstance(tables, set):
-                tables = set(tables)
-            metas = [self._get_table_meta(table.strip(), base_columns) for table in tables]
-
-        no_key_tables = [meta for meta in metas if isinstance(meta, str)]
-        if len(no_key_tables) > 0:
-            print("There isn't primary key in the tables %s, it will not generate model class." % no_key_tables)
-
-        metas = [meta for meta in metas if isinstance(meta, dict)]
-        if len(metas) > 0:
-            cols = [col for mata in metas for col in mata['super_columns']]
-            col_dict = {col['COLUMN_NAME']: col for col in cols}
-
-            def get_type(col):
-                if col in col_dict:
-                    return col_dict[col]['DATA_TYPE']
-                elif col == kwargs.get(KEY) or col == kwargs.get(UPDATE_BY) or col == kwargs.get(DEL_FLAG):
-                    return 'int'
-                elif col == kwargs.get('__update_time__'):
-                    return 'datetime'
-                elif col.endswith("_time"):
-                    return 'datetime'
-                elif col.endswith("_date"):
-                    return 'date'
-                else:
-                    return 'None'
-
-            kwargs['metas'] = metas
-            kwargs['base_columns'] = [{'COLUMN_NAME': col, 'DATA_TYPE': get_type(col)} for col in base_columns]
-            self._generate(kwargs, path)
-
-    def _get_table_meta(self, table: str, base_columns):
-        def convert_type(col_type):
-            if col_type in ('int', 'tinyint', 'bigint'):
-                return 'int'
-            elif col_type in ('float', 'double'):
-                return 'float'
-            elif col_type == 'decimal':
-                return 'Decimal'
-            elif col_type in ('char', 'varchar', 'text'):
-                return 'str'
-            elif col_type in ('date', 'datetime'):
-                return col_type
-            else:
-                return 'None'
-
-        key = None
-        super_columns = []
-        columns = db.do_query(self.sql, table)
-        for col in columns:
-            if col['COLUMN_KEY'] == 'PRI':
-                key = col['COLUMN_NAME']
-            if col['COLUMN_NAME'] in base_columns:
-                super_columns.append(col)
-            col['DATA_TYPE'] = convert_type(col['DATA_TYPE'])
-
-        if key is None:
-            return table
-
-        class_name = self._get_class_name(table)
-        return {
-            'key': key,
-            'table': table,
-            'class_name': class_name,
-            'columns': columns,
-            'self_columns': [col for col in columns if col['COLUMN_NAME'] not in base_columns],
-            'super_columns': super_columns
-        }
-
-    @staticmethod
-    def _generate(metas: dict, path: str):
-        loader = FileSystemLoader(searchpath=os.path.dirname(__file__))
-        environment = Environment(loader=loader)
-        tpl = environment.get_template('generator.tpl')
-        output = tpl.render(**metas)
-        if path:
-            suffix = '.py'
-            path = path if path.endswith(suffix) else path + suffix
-            with open(path, 'w', encoding='utf-8') as f:
-                f.write(output)
-            print('Model文件已生成：%s' % path)
-        else:
-            print(output)
-
-    @staticmethod
-    def _get_class_name(table):
-        if '_' not in table:
-            return table.capitalize()
-
-        names = table.split('_')
-        names = [name.capitalize() for name in names]
-        return ''.join(names)

mysqlx-2.1.4/mysqlx/generator.tpl

@@ -1,25 +0,0 @@
-from decimal import Decimal
-from datetime import date, datetime
-from mysqlx.orm import Model, KeyStrategy
-
-
-class BaseModel(Model):
-    {{__attribute_name__key__}} = '{{__key__}}'
-    {{__attribute_name__del_flag__}} = '{{__del_flag__}}'
-    {{__attribute_name__update_by__}} = '{{__update_by__}}'
-    {{__attribute_name__update_time__}} = '{{__update_time__}}'
-    {{__attribute_name__key_strategy__}} = KeyStrategy.DB_AUTO_INCREMENT
-
-    def __init__(self,{% for item in base_columns %}{% if loop.last %}{% if item.DATA_TYPE=='None' %} {{item.COLUMN_NAME}}=None{% else %} {{item.COLUMN_NAME}}: {{item.DATA_TYPE}} = None{% endif %}{% else %}{% if item.DATA_TYPE=='None' %} {{item.COLUMN_NAME}}=None{% else %} {{item.COLUMN_NAME}}: {{item.DATA_TYPE}} = None{% endif %},{% endif %}{% endfor %}): {% for item in base_columns %}
-        self.{{item.COLUMN_NAME}} = {{item.COLUMN_NAME}} {% endfor %}
-
-{% for meta in metas %}
-class {{meta.class_name}}(BaseModel):{% if meta.key != __key__ %}
-    {{__attribute_name__key__}} = '{{meta.key}}'{% endif %}
-    {{__attribute_name__table__}} = '{{meta.table}}'
-
-    def __init__(self,{% for item in meta.columns %}{% if loop.last %}{% if item.DATA_TYPE=='None' %} {{item.COLUMN_NAME}}=None{% else %} {{item.COLUMN_NAME}}: {{item.DATA_TYPE}} = None{% endif %}{% else %}{% if item.DATA_TYPE=='None' %} {{item.COLUMN_NAME}}=None{% else %} {{item.COLUMN_NAME}}: {{item.DATA_TYPE}} = None{% endif %},{% endif %}{% endfor %}):
-        super().__init__({% for item in meta.super_columns %}{% if loop.first %}{{item.COLUMN_NAME}}={{item.COLUMN_NAME}}{% else %}, {{item.COLUMN_NAME}}={{item.COLUMN_NAME}}{% endif %}{% endfor %}) {% for item in meta.self_columns %}
-        self.{{item.COLUMN_NAME}} = {{item.COLUMN_NAME}} {% endfor %}
-
-{% endfor %}

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

@@ -1,2 +0,0 @@
-Jinja2>=2.7.0
-sqlx-exec>=2.3.6