Unverified Commit 2fa37eef authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub

Merge pull request #1918 from 3DHubs/fix-textual-coersion

Fix the usage of the deprecated textual coercion in SqlAlchemy 1.3+
parents b6d32452 7a6b7753
from sqlalchemy import or_, and_, cast from sqlalchemy import or_, and_, cast, text
from sqlalchemy.types import String from sqlalchemy.types import String
from flask_admin._compat import as_unicode, string_types from flask_admin._compat import as_unicode, string_types
...@@ -73,7 +73,7 @@ class QueryAjaxModelLoader(AjaxModelLoader): ...@@ -73,7 +73,7 @@ class QueryAjaxModelLoader(AjaxModelLoader):
query = query.filter(or_(*filters)) query = query.filter(or_(*filters))
if self.filters: if self.filters:
filters = ["%s.%s" % (self.model.__tablename__.lower(), value) for value in self.filters] filters = [text("%s.%s" % (self.model.__tablename__.lower(), value)) for value in self.filters]
query = query.filter(and_(*filters)) query = query.filter(and_(*filters))
if self.order_by: if self.order_by:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment