Expose BaseQuery as db.Query (fixes ticket #13).

docs/index.rst

@@ -211,6 +211,10 @@ Configuration
 .. autoclass:: SQLAlchemy
    :members:
 
+   .. attribute:: Query
+
+      The :class:`BaseQuery` class.
+
 Models
 ``````
 
@@ -231,7 +235,7 @@ Models
       newly resulting query.
 
    .. method:: limit(limit)
-      
+
       Apply a LIMIT  to the query and return the newly resulting query.
 
    .. method:: offset(offset)

flaskext/sqlalchemy.py

@@ -333,7 +333,8 @@ def iter_pages(self, left_edge=2, left_current=2,
 
 
 class BaseQuery(orm.Query):
-    """The default query object used for models.  This can be subclassed and
+    """The default query object used for models, and exposed as
+    :attr:`~SQLAlchemy.Query`. This can be subclassed and
     replaced for individual models by setting the :attr:`~Model.query_class`
     attribute.  This is a subclass of a standard SQLAlchemy
     :class:`~sqlalchemy.orm.query.Query` class and has all the methods of a
@@ -544,6 +545,7 @@ def __init__(self, app=None, use_native_unicode=True,
             self.app = None
 
         _include_sqlalchemy(self)
+        self.Query = BaseQuery
 
     @property
     def metadata(self):

test_sqlalchemy.py

@@ -210,5 +210,20 @@ class Child(db.Model):
         self.assert_(isinstance(c.parents, sqlalchemy.BaseQuery))
 
 
+class SQLAlchemyIncludesTestCase(unittest.TestCase):
+
+    def test(self):
+        """Various SQLAlchemy objects are exposed as attributes.
+        """
+        db = sqlalchemy.SQLAlchemy()
+
+        import sqlalchemy as sqlalchemy_lib
+        self.assertTrue(db.Column == sqlalchemy_lib.Column)
+
+        # The Query object we expose is actually our own subclass.
+        from flaskext.sqlalchemy import BaseQuery
+        self.assertTrue(db.Query == BaseQuery)
+
+
 if __name__ == '__main__':
     unittest.main()