add compatibility sqla1.4 (is_already_joined) + add CompoundSelect to…

… qfilter

src/utils_flask_sqla/models.py

@@ -1,6 +1,6 @@
 from sqlalchemy.sql.expression import BooleanClauseList, BinaryExpression
 from flask_sqlalchemy.model import DefaultMeta
-from sqlalchemy.sql import select, Select
+from sqlalchemy.sql import select, Select, CompoundSelect
 
 AUTHORIZED_WHERECLAUSE_TYPES = [bool, BooleanClauseList, BinaryExpression]
 
@@ -86,7 +86,7 @@ def _(*args, **kwargs):
                 kwargs["query"] = query
             result = method(*args, **kwargs)
 
-            if is_query and not isinstance(result, Select):
+            if is_query and not (isinstance(result, Select) or isinstance(result, CompoundSelect)):
                 raise ValueError("Your method must return a SQLAlchemy Select object ")
 
             if not is_query and not is_whereclause_compatible(result):

src/utils_flask_sqla/utils.py

@@ -43,7 +43,7 @@ def is_already_joined(my_class, query):
     query: SQLAlchemy query
     return boolean
     """
-    for visitor in visitors.iterate(query.statement):
+    for visitor in visitors.iterate(query):
         # Checking for `.join(Parent.child)` clauses
         if visitor.__visit_name__ == "binary":
             for vis in visitors.iterate(visitor):