Changes for SQLAlchemy 1.4.

ThePalaceProject · Jun 30, 2023 · 7b0d380 · 7b0d380
1 parent ae54a62
commit 7b0d380
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/model.py b/model.py
@@ -678,7 +678,6 @@ def relevant(cls, _db, target, language, audiences=None, production=True):
                 )
             )
             .select_from(libraries_audiences.join(Audience))
-            .lateral("public_audiences")
         )
 
         # Check if each library has a non-public audience from
@@ -694,7 +693,6 @@ def relevant(cls, _db, target, language, audiences=None, production=True):
                 )
             )
             .select_from(libraries_audiences.join(Audience))
-            .lateral("non_public_audiences")
         )
 
         # Increase the score if there was an audience match other than

diff --git a/opds.py b/opds.py
@@ -1,6 +1,7 @@
 import json
 
 import flask
+from sqlalchemy.engine.row import Row
 from sqlalchemy.orm import Query
 
 from authentication_document import AuthenticationDocument
@@ -78,7 +79,7 @@ def __init__(
             _db, Configuration.WEB_CLIENT_URL
         ).value
         for library in libraries:
-            if not isinstance(library, tuple):
+            if not isinstance(library, Row):
                 library = (library,)
             self.catalog["catalogs"].append(
                 self.library_catalog(