Changes and attribution for model_class and query_class changes

immunda · immunda · commit cea9679963a3 · 2015-12-04T15:43:31.000Z
diff --git a/AUTHORS b/AUTHORS
@@ -47,3 +47,4 @@ Patches and Suggestions
 - Ignacy Sokołowski
 - Steven Harms
 - David Lord @davidism
+- Alec Nikolas Reiter @justanr
diff --git a/CHANGES b/CHANGES
@@ -9,6 +9,8 @@ Version 3.0
 
 In development, codename Dubnium
 
+- Added support for custom ``query_class`` and ``model_class`` as args
+  to the ``SQLAlchemy`` constructor.
 - Fix minimum SQLAlchemy version requirement (0.9.2 or above), introduced
   by custom MetaData support in 2.1.
 
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -709,6 +709,16 @@ class User(db.Model):
     .. versionadded:: 2.1
        The `metadata` parameter was added. This allows for setting custom
        naming conventions among other, non-trivial things.
+
+    .. versionadded:: 3.0
+       The `query_class` parameter was added, to allow customisation
+       of the query class, in place of the default of :class:`BaseQuery`.
+
+       The `model_class` parameter was added, which allows a custom model
+       class to be used in place of :class:`Model`.
+
+    .. versionchanged:: 3.0
+       Utilise the same query class across `session`, `Model.query` and `Query`.
     """
 
     #: Default query class used by :attr:`Model.query` and other queries.
