diff options
| author | Malaclypse The Younger <pat-androidsrc@flyingcarsandstuff.com> | 2017-03-30 10:54:14 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-03-30 12:33:33 -0400 |
| commit | 74f6c21747d07a8cf9902900df9280a84aadc2bb (patch) | |
| tree | ed015e93b69651ac81ca55d4b2162b4589418634 | |
| parent | a4c17c1397c68d109bcf0603644f3200ab2e82f5 (diff) | |
| download | sqlalchemy-74f6c21747d07a8cf9902900df9280a84aadc2bb.tar.gz | |
Add bindparams support for baked Result count() method
Added support for bound parameters, e.g. those normally set up
via :meth:`.Query.params`, to the :meth:`.baked.Result.count`
method. Previously, support for parameters were omitted. Pull request
courtesy Pat Deegan.
Change-Id: I8c33548cf2a483699767e459731694c8cadebff6
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/350
| -rw-r--r-- | doc/build/changelog/changelog_11.rst | 9 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/baked.py | 2 | ||||
| -rw-r--r-- | test/ext/test_baked.py | 28 |
3 files changed, 38 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 3c1d609f0..ce704d7b7 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -22,6 +22,15 @@ :version: 1.1.8 .. change:: + :tags: bug, ext + :versions: 1.2.0b1 + + Added support for bound parameters, e.g. those normally set up + via :meth:`.Query.params`, to the :meth:`.baked.Result.count` + method. Previously, support for parameters were omitted. Pull request + courtesy Pat Deegan. + + .. change:: :tags: bug, postgresql :versions: 1.2.0b1 diff --git a/lib/sqlalchemy/ext/baked.py b/lib/sqlalchemy/ext/baked.py index 090466618..68bd468b9 100644 --- a/lib/sqlalchemy/ext/baked.py +++ b/lib/sqlalchemy/ext/baked.py @@ -268,7 +268,7 @@ class Result(object): col = func.count(literal_column('*')) bq = self.bq.with_criteria(lambda q: q.from_self(col)) - return bq.for_session(self.session).scalar() + return bq.for_session(self.session).params(self._params).scalar() def scalar(self): """Return the first element of the first result or None diff --git a/test/ext/test_baked.py b/test/ext/test_baked.py index 4a1f086a5..a5eb31495 100644 --- a/test/ext/test_baked.py +++ b/test/ext/test_baked.py @@ -288,6 +288,34 @@ class LikeQueryTest(BakedTest): set([(8, 'ed'), (9, 'fred')]) ) + def test_count_with_bindparams(self): + User = self.classes.User + + bq = self.bakery(lambda s: s.query(User)) + + sess = Session() + + eq_( + bq(sess).count(), + 4 + ) + + bq += lambda q: q.filter(User.name == bindparam("uname")) + # calling with *args + eq_( + bq(sess).params(uname='fred').count(), 1 + ) + # with multiple params, the **kwargs will be used + bq += lambda q: q.filter(User.id == bindparam("anid")) + eq_( + bq(sess).params(uname='fred', anid=9).count(), 1 + ) + eq_( + # wrong id, so 0 results: + bq(sess).params(uname='fred', anid=8).count(), 0 + ) + + def test_get_pk_w_null(self): """test the re-implementation of logic to do get with IS NULL.""" |