👌 IMPROVE: QueryBuilder reprs (incl/ queryhelp -> as_dict)

aiida/orm/implementation/django/querybuilder.py

@@ -7,13 +7,14 @@
 # For further information on the license, see the LICENSE.txt file        #
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
-"""Django query builder"""
+"""Django query builder implementation"""
 from aldjemy import core
 # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
 # pylint: disable=no-name-in-module, import-error
 from sqlalchemy import and_, or_, not_, case
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.ext.compiler import compiles
+from sqlalchemy.sql.compiler import TypeCompiler
 from sqlalchemy.sql.expression import FunctionElement
 from sqlalchemy.types import Float, Boolean
 
@@ -26,45 +27,42 @@ class jsonb_array_length(FunctionElement):  # pylint: disable=invalid-name
 
 
 @compiles(jsonb_array_length)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined, redefined-builtin
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined, redefined-builtin
     """
     Get length of array defined in a JSONB column
     """
-    return f'jsonb_array_length({compiler.process(element.clauses)})'
+    return f'jsonb_array_length({compiler.process(element.clauses, **_kw)})'
 
 
 class array_length(FunctionElement):  # pylint: disable=invalid-name
     name = 'array_len'
 
 
 @compiles(array_length)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined
     """
     Get length of array defined in a JSONB column
     """
-    return f'array_length({compiler.process(element.clauses)})'
+    return f'array_length({compiler.process(element.clauses, **_kw)})'
 
 
 class jsonb_typeof(FunctionElement):  # pylint: disable=invalid-name
     name = 'jsonb_typeof'
 
 
 @compiles(jsonb_typeof)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined
     """
     Get length of array defined in a JSONB column
     """
-    return f'jsonb_typeof({compiler.process(element.clauses)})'
+    return f'jsonb_typeof({compiler.process(element.clauses, **_kw)})'
 
 
 class DjangoQueryBuilder(BackendQueryBuilder):
     """Django query builder"""
 
     # pylint: disable=too-many-public-methods,no-member
 
-    def __init__(self, backend):
-        BackendQueryBuilder.__init__(self, backend)
-
     @property
     def Node(self):
         return models.DbNode.sa

aiida/orm/implementation/sqlalchemy/querybuilder.py

@@ -13,6 +13,7 @@
 from sqlalchemy.types import Float, Boolean
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql.expression import case, FunctionElement
+from sqlalchemy.sql.compiler import TypeCompiler
 from sqlalchemy.ext.compiler import compiles
 
 from aiida.common.exceptions import NotExistent
@@ -24,35 +25,35 @@ class jsonb_array_length(FunctionElement):  # pylint: disable=invalid-name
 
 
 @compiles(jsonb_array_length)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined, redefined-builtin
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined, redefined-builtin
     """
     Get length of array defined in a JSONB column
     """
-    return f'jsonb_array_length({compiler.process(element.clauses)})'
+    return f'jsonb_array_length({compiler.process(element.clauses, **_kw)})'
 
 
 class array_length(FunctionElement):  # pylint: disable=invalid-name
     name = 'array_len'
 
 
 @compiles(array_length)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined
     """
     Get length of array defined in a JSONB column
     """
-    return f'array_length({compiler.process(element.clauses)})'
+    return f'array_length({compiler.process(element.clauses, **_kw)})'
 
 
 class jsonb_typeof(FunctionElement):  # pylint: disable=invalid-name
     name = 'jsonb_typeof'
 
 
 @compiles(jsonb_typeof)
-def compile(element, compiler, **_kw):  # pylint: disable=function-redefined
+def compile(element, compiler: TypeCompiler, **_kw):  # pylint: disable=function-redefined
     """
     Get length of array defined in a JSONB column
     """
-    return f'jsonb_typeof({compiler.process(element.clauses)})'
+    return f'jsonb_typeof({compiler.process(element.clauses, **_kw)})'
 
 
 class SqlaQueryBuilder(BackendQueryBuilder):
@@ -64,7 +65,7 @@ class SqlaQueryBuilder(BackendQueryBuilder):
     # pylint: disable=redefined-outer-name,too-many-public-methods
 
     def __init__(self, backend):
-        BackendQueryBuilder.__init__(self, backend)
+        super().__init__(backend)
 
         self.outer_to_inner_schema['db_dbcomputer'] = {'metadata': '_metadata'}
         self.outer_to_inner_schema['db_dblog'] = {'metadata': '_metadata'}