From 916fd9212de553b0f809f9666930c23b9ecd5adc Mon Sep 17 00:00:00 2001
From: Eir Nym <eirnym@gmail.com>
Date: Sun, 6 Jul 2014 16:04:30 +0400
Subject: [PATCH] If model has query, but it has no attribute filter, use
 session

Query is None for models with latest Flask-SQLAlchemy.
https://github.com/mitsuhiko/flask-sqlalchemy/blob/master/flask_sqlalchemy/__init__.py#L567
---
 flask_restless/helpers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/flask_restless/helpers.py b/flask_restless/helpers.py
index e91a730f..b3c2bfed 100644
--- a/flask_restless/helpers.py
+++ b/flask_restless/helpers.py
@@ -76,8 +76,11 @@ def session_query(session, model):
     """
     if hasattr(model, 'query'):
         if callable(model.query):
-            return model.query()
-        return model.query
+            query = model.query()
+        else:
+            query = model.query
+        if hasattr(query, 'filter'):
+            return query
     return session.query(model)