work around new sqlalchemy limitations

This commit is contained in:
j 2024-06-08 12:45:21 +01:00
commit 60e17ab076
2 changed files with 14 additions and 8 deletions

View file

@ -5,7 +5,7 @@ import os
import unicodedata
from sqlalchemy.orm import load_only
from sqlalchemy.sql.expression import text
from sqlalchemy.sql.expression import text, column
from sqlalchemy import func
from oxtornado import actions
@ -58,8 +58,13 @@ def find(data):
qs = models.Find.query.filter_by(key=q['group'])
if items is None or items.first():
if items is not None:
qs = qs.filter(models.Find.item_id.in_(items))
values = list(qs.values('value', 'findvalue', 'sortvalue'))
ids = [i[0] for i in items.with_entities(column('id'))]
qs = qs.filter(models.Find.item_id.in_(ids))
values = list(qs.values(
column('value'),
column('findvalue'),
column('sortvalue'),
))
for f in values:
value = f[0]
findvalue = f[1]