From: Dobes Vandermeer <dvandermeer@roovy.com>
Date: Thu, 24 Apr 2014 22:33:53 +0000 (-0700)
Subject: Expand test to also test whether offset accepts a bindparam.
X-Git-Tag: rel_1_0_0b1~434^2~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=624924d5e75705fb2a7390d36a766cd771b354bd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Expand test to also test whether offset accepts a bindparam.
---

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 4b5e860e3b..d5931d37ac 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -1275,16 +1275,20 @@ class FilterTest(QueryTest, AssertsCompiledSQL):
         assert [] == sess.query(User).order_by(User.id)[3:3]
         assert [] == sess.query(User).order_by(User.id)[0:0]
 
-    def test_select_with_bindparam_limit(self):
+    def test_select_with_bindparam_offset_limit(self):
         """Does a query allow bindparam for the limit?"""
+        User = self.classes.User
         sess = create_session()
         users = []
 
-        q1 = sess.query(self.classes.User).order_by(self.classes.User.id).limit(sa.bindparam('n'))
+        q1 = sess.query(self.classes.User).order_by(self.classes.User.id).limit(bindparam('n'))
         for n in xrange(1,4):
             users[:] = q1.params(n=n).all()
             assert len(users) == n
 
+        assert [User(id=8), User(id=9)] == sess.query(User).order_by(User.id).limit(bindparam('limit')).offset(bindparam('offset')).params(limit=2, offset=1).all()
+        assert [User(id=8), User(id=9)] == list(sess.query(User).params(a=1, b=3).order_by(User.id)[bindparam('a'):bindparam('b')])
+
     @testing.requires.boolean_col_expressions
     def test_exists(self):
         User = self.classes.User