Query accessible records: SQLAlchemy 2.0 syntax (#380)

* use the correct method to add options and columns if using sqlalchemy 2.0

* bugfix

* install specific filter and static ngix brotli modules from ppa to fix dependencies mismatch

.github/workflows/test.yaml

@@ -74,11 +74,13 @@ jobs:
           sudo apt install -y wget nodejs unzip firefox
 
           # if nginx is already installed, remove it
-          sudo apt remove -y nginx nginx-common nginx-core
+          sudo apt remove -y nginx nginx-common nginx-core nginx-full
+          sudo apt purge -y nginx nginx-common nginx-core nginx-full
 
-          sudo add-apt-repository ppa:ondrej/nginx-mainline -y
+          # add the PPA repository with brotli support for nginx
+          sudo add-apt-repository ppa:ondrej/nginx -y
           sudo apt update -y
-          sudo apt install -y nginx libnginx-mod-brotli
+          sudo apt install nginx libnginx-mod-http-brotli-static libnginx-mod-http-brotli-filter -y
 
 
           pip install --upgrade pip

app/models.py

@@ -14,7 +14,13 @@
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
-from sqlalchemy.orm import declarative_base, relationship, scoped_session, sessionmaker
+from sqlalchemy.orm import (
+    declarative_base,
+    load_only,
+    relationship,
+    scoped_session,
+    sessionmaker,
+)
 from sqlalchemy_utils import EmailType, PhoneNumberType
 
 from .custom_exceptions import AccessError
@@ -1218,12 +1224,15 @@ def query_accessible_rows(self, cls, user_or_token, columns=None):
 
         if self.query is not None:
             query = self.query
+            # retrieve specified columns if requested
+            if columns is not None:
+                query = query.with_entities(*columns)
         else:
             query = self.query_generator(cls, user_or_token)
-
-        # retrieve specified columns if requested
-        if columns is not None:
-            query = query.with_entities(*columns)
+            # here query is not of type sqlalchemy.Query, but sqlalchemy.Select
+            # so we use the appropriate method to retrieve the columns
+            if columns is not None:
+                query = query.options(load_only(*columns))
 
         return query
 
@@ -1423,9 +1432,12 @@ def query_records_accessible_by(
             )
 
         logic = getattr(cls, mode)
-        return logic.query_accessible_rows(cls, user_or_token, columns=columns).options(
-            options
+        accessible_rows = logic.query_accessible_rows(
+            cls, user_or_token, columns=columns
         )
+        if len(options) > 0:
+            return accessible_rows.options(*options)
+        return accessible_rows
 
     @classmethod
     def get(