⬆️ UPGRADE: sqlalchemy v1.4 (v1 API)

.github/workflows/ci-code.yml

@@ -109,6 +109,7 @@ jobs:
     - name: Run test suite
       env:
         AIIDA_TEST_BACKEND: ${{ matrix.backend }}
+        SQLALCHEMY_WARN_20: 1
       run:
         .github/workflows/tests.sh
 

aiida/backends/sqlalchemy/manager.py

@@ -11,6 +11,7 @@
 import os
 import contextlib
 
+import sqlalchemy
 from sqlalchemy.orm.exc import NoResultFound
 
 from aiida.backends.sqlalchemy import get_scoped_session
@@ -149,8 +150,7 @@ def validate_table_existence(self):
 
         :raises: `~aiida.common.exceptions.NotExistent` if the settings table does not exist
         """
-        from sqlalchemy.engine import reflection
-        inspector = reflection.Inspector.from_engine(get_scoped_session().bind)
+        inspector = sqlalchemy.inspect(get_scoped_session().bind)
         if self.table_name not in inspector.get_table_names():
             raise NotExistent('the settings table does not exist')
 

aiida/backends/sqlalchemy/migrations/versions/59edaf8a8b79_adding_indexes_and_constraints_to_the_.py

@@ -16,7 +16,7 @@
 
 """
 from alembic import op
-from sqlalchemy.engine.reflection import Inspector
+import sqlalchemy
 
 # revision identifiers, used by Alembic.
 revision = '59edaf8a8b79'
@@ -29,7 +29,7 @@ def upgrade():
     """Migrations for the upgrade."""
     # Check if constraint uix_dbnode_id_dbgroup_id of migration 7a6587e16f4c
     # is there and if yes, drop it
-    insp = Inspector.from_engine(op.get_bind())
+    insp = sqlalchemy.inspect(op.get_bind())
     for constr in insp.get_unique_constraints('db_dbgroup_dbnodes'):
         if constr['name'] == 'uix_dbnode_id_dbgroup_id':
             op.drop_constraint('uix_dbnode_id_dbgroup_id', 'db_dbgroup_dbnodes')

aiida/backends/utils.py

@@ -38,7 +38,7 @@ def create_sqlalchemy_engine(profile, **kwargs):
         name=profile.database_name
     )
     return create_engine(
-        engine_url, json_serializer=json.dumps, json_deserializer=json.loads, encoding='utf-8', **kwargs
+        engine_url, json_serializer=json.dumps, json_deserializer=json.loads, future=False, encoding='utf-8', **kwargs
     )
 
 

aiida/orm/implementation/django/querybuilder.py

@@ -8,8 +8,6 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 """Django query builder implementation"""
-from aldjemy import core
-
 from aiida.backends.djsite.db import models
 from aiida.orm.implementation.sqlalchemy.querybuilder import SqlaQueryBuilder
 
@@ -58,7 +56,7 @@ def Log(self):
 
     @property
     def table_groups_nodes(self):
-        return core.Cache.meta.tables['db_dbgroup_dbnodes']
+        return models.DbGroup.sa.table.metadata.tables['db_dbgroup_dbnodes']  # pylint: disable=no-member
 
     def modify_expansions(self, alias, expansions):
         """

aiida/orm/implementation/querybuilder.py

@@ -105,16 +105,6 @@ def __init__(self, backend: 'Backend'):
         type_check(backend, backends.Backend)
         self._backend = backend
 
-    @abc.abstractmethod
-    def yield_per(self, data: QueryDictType, batch_size: int):
-        """
-        :param int batch_size: Number of rows to yield per step
-
-        Yields *count* rows at a time
-
-        :returns: a generator
-        """
-
     @abc.abstractmethod
     def count(self, data: QueryDictType) -> int:
         """Return the number of results of the query"""

aiida/orm/implementation/sqlalchemy/querybuilder/joiner.py

@@ -190,7 +190,7 @@ def _join_descendants_recursive(
         selection_walk_list = [
             link1.input_id.label('ancestor_id'),
             link1.output_id.label('descendant_id'),
-            type_cast(0, Integer).label('depth'),
+            type_cast(0, Integer).label('depth'),  # type: ignore[type-var]
         ]
         if expand_path:
             selection_walk_list.append(array((link1.input_id, link1.output_id)).label('path'))
@@ -207,7 +207,7 @@ def _join_descendants_recursive(
         selection_union_list = [
             aliased_walk.c.ancestor_id.label('ancestor_id'),
             link2.output_id.label('descendant_id'),
-            (aliased_walk.c.depth + type_cast(1, Integer)).label('current_depth')
+            (aliased_walk.c.depth + type_cast(1, Integer)).label('current_depth')  # type: ignore[type-var]
         ]
         if expand_path:
             selection_union_list.append((aliased_walk.c.path + array((link2.output_id,))).label('path'))
@@ -254,7 +254,7 @@ def _join_ancestors_recursive(
         selection_walk_list = [
             link1.input_id.label('ancestor_id'),
             link1.output_id.label('descendant_id'),
-            type_cast(0, Integer).label('depth'),
+            type_cast(0, Integer).label('depth'),  # type: ignore[type-var]
         ]
         if expand_path:
             selection_walk_list.append(array((link1.output_id, link1.input_id)).label('path'))
@@ -268,7 +268,7 @@ def _join_ancestors_recursive(
         selection_union_list = [
             link2.input_id.label('ancestor_id'),
             aliased_walk.c.descendant_id.label('descendant_id'),
-            (aliased_walk.c.depth + type_cast(1, Integer)).label('current_depth'),
+            (aliased_walk.c.depth + type_cast(1, Integer)).label('current_depth'),  # type: ignore[type-var]
         ]
         if expand_path:
             selection_union_list.append((aliased_walk.c.path + array((link2.input_id,))).label('path'))