diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-28 01:22:32 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-28 01:22:32 -0400 |
commit | 9fc6201f0c039631de436d38d7b162f56f9b08dd (patch) | |
tree | 3df57a8d2930c8e367325c39aa2f6af30405d212 | |
parent | 73404e36836a0f53be9ffe28006b8492be7b0190 (diff) | |
parent | 94096593ca92e105b8f716ff89b78856595d95c8 (diff) | |
download | sqlalchemy-9fc6201f0c039631de436d38d7b162f56f9b08dd.tar.gz |
Merge branch 'master' into rel_0_9
-rw-r--r-- | doc/build/changelog/changelog_08.rst | 7 | ||||
-rw-r--r-- | examples/dogpile_caching/caching_query.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index fbc79b108..bec8a3f05 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -7,6 +7,13 @@ :version: 0.8.2 .. change:: + :tags: bug, examples + + Fixed a small bug in the dogpile example where the generation + of SQL cache keys wasn't applying deduping labels to the + statement the same way :class:`.Query` normally does. + + .. change:: :tags: bug, engine, sybase :tickets: 2732 diff --git a/examples/dogpile_caching/caching_query.py b/examples/dogpile_caching/caching_query.py index 18eb2b908..7fe84bede 100644 --- a/examples/dogpile_caching/caching_query.py +++ b/examples/dogpile_caching/caching_query.py @@ -136,7 +136,7 @@ def _key_from_query(query, qualifier=None): """ - stmt = query.statement + stmt = query.with_labels().statement compiled = stmt.compile() params = compiled.params |