Merge pull request #139 from TTWShell/upgrade/flask-sqlalchemy

Upgrade/flask sqlalchemy

Author: TTWShell

.circleci/config.yml

@@ -31,9 +31,9 @@ jobs:
             tox -- --cov-report=xml
             codecov
 
-  test-py36:
+  test-py310:
     docker:
-      - image: circleci/python:3.6.13
+      - image: circleci/python:3.10.0
         user: root
     working_directory: ~/repo
     steps:
@@ -44,7 +44,6 @@ jobs:
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
             pip install celery
-            pip install "MarkupSafe==2.0.1" blinker[flask]
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -77,7 +76,6 @@ jobs:
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
             pip install celery
-            pip install "MarkupSafe==2.0.1" blinker[flask]
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -113,7 +111,7 @@ workflows:
   test:
     jobs:
       - tox
-      - test-py36:
+      - test-py310:
           requires:
             - tox
       - test-py37:

Pipfile.lock

@@ -27,7 +27,7 @@ class BaseTest:
         exclude_tables = []
         models = {
             m.__tablename__: m
-            for m in db.Model._decl_class_registry.values()
+            for m in db.Model.registry._class_registry.values()
             if isinstance(m, model.DefaultMeta)
         }
         tables = db.metadata.sorted_tables

hobbit/static/bootstrap/rivendell/tests/__init__.py.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status_code == 200
+        assert resp.status == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status_code == 200
+        assert resp.status == 200
 

hobbit/static/bootstrap/rivendell/tests/test_tools.py.jinja2

@@ -27,7 +27,7 @@ class BaseTest:
         exclude_tables = []
         models = {
             m.__tablename__: m
-            for m in db.Model._decl_class_registry.values()
+            for m in db.Model.registry._class_registry.values()
             if isinstance(m, model.DefaultMeta)
         }
         tables = db.metadata.sorted_tables

hobbit/static/bootstrap/shire/tests/__init__.py.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status_code == 200
+        assert resp.status == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status_code == 200
+        assert resp.status == 200
 

hobbit/static/bootstrap/shire/tests/test_tools.py.jinja2

@@ -15,10 +15,6 @@
 
 class _BaseModel:
 
-    __mapper_args__ = {
-        'order_by': 'id',
-    }
-
     def __repr__(self) -> str:
         """You can set label property.
 
@@ -74,7 +70,7 @@ def __new__(cls, name, bases, attrs):
             DateTime, index=True, nullable=False, server_default=func.now(),
             onupdate=func.now())
 
-        if db.get_engine(bind=attrs.get('__bind_key__')).name == 'oracle':
+        if db.get_engine(bind_key=attrs.get('__bind_key__')).name == 'oracle':
             sequence_name = attrs.get('sequence_name') or \
                 f'{name}_{primary_key_name}_seq'
             if current_app.config['HOBBIT_UPPER_SEQUENCE_NAME']:

hobbit_core/db.py

@@ -35,7 +35,7 @@ def handler_werkzeug_exceptions(cls, e):
             status=e.code)
 
     @classmethod
-    def handler_sqlalchemy_orm_exc(cls, e):
+    def handler_sqlalchemy_exc(cls, e):
         code, message, detail = 500, RESP_MSGS[500], repr(e)
 
         if isinstance(e, orm_exc.NoResultFound):

hobbit_core/err_handler.py

@@ -79,7 +79,8 @@ def pagination(obj: 'model.DefaultMeta', page: int, page_size: int,
                 order_exp.append(getattr(obj, column))
         qexp = qexp.order_by(*order_exp)
 
-    items = qexp.paginate(page, page_size, error_out=False)
+    items = qexp.paginate(page=page, per_page=page_size, error_out=False)
+
     return {
         'items': items.items, 'page': page, 'page_size': page_size,
         'total': items.total,

hobbit_core/pagination.py

@@ -275,7 +275,7 @@ def bulk_create_or_update_on_duplicate(
             if column in item and item[column] is None:
                 item[column] = ''
 
-    engine = db.get_engine(bind=getattr(model_cls, '__bind_key__', None))
+    engine = db.get_engine(bind_key=getattr(model_cls, '__bind_key__', None))
     if engine.name == 'postgresql':
         sql_on_update = ', '.join([
             f' {field} = excluded.{field}'