Skip to content

Have the SQLALCHEMY_RECORD_QUERIES setting take precedence over DEBUG #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
csdev wants to merge 2 commits into from
Closed

Have the SQLALCHEMY_RECORD_QUERIES setting take precedence over DEBUG #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8adcc
Have the SQLALCHEMY_RECORD_QUERIES setting take precedence over DEBUG
csdev Jun 16, 2015
74f8e1a
Update docs to reflect changes to SQLALCHEMY_RECORD_QUERIES
csdev Jun 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions docs/config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ A list of configuration keys currently understood by the extension:
be useful for debugging.
``SQLALCHEMY_RECORD_QUERIES`` Can be used to explicitly disable or
enable query recording. Query recording
automatically happens in debug or testing
mode. See :func:`get_debug_queries` for
more information.
is turned on by default in debug or
testing mode, but that behavior can be
overridden using this option. See
:func:`get_debug_queries` for more
information.
``SQLALCHEMY_NATIVE_UNICODE`` Can be used to explicitly disable native
unicode support. This is required for
some database adapters (like PostgreSQL
Expand Down
4 changes: 2 additions & 2 deletions flask_sqlalchemy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,11 +498,11 @@ def __get__(self, obj, type):


def _record_queries(app):
if app.debug:
return True
rq = app.config['SQLALCHEMY_RECORD_QUERIES']
if rq is not None:
return rq
if app.debug:
return True
return bool(app.config.get('TESTING'))


Expand Down