Fixed signature for orm's BETWEEN operator.

diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index b8aca3d26dda946489c26f21c8b11efa8a189c0f..c1d2ebc874890e760f7eb09bd424ce5e2b3a7a62 100644 (file)
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -29,8 +29,8 @@ def ilike_op(a, b):
 def notilike_op(a, b):
     raise NotImplementedError()
 
-def between_op(a, b):
-    return a.between(b)
+def between_op(a, b, c):
+    return a.between(b, c)
 
 def in_op(a, b):
     return a.in_(*b)

diff --git a/test/orm/query.py b/test/orm/query.py
index c7847b3211f311b9275e1feca7e3a4991b5187e3..b86c957c4deb97b649e6f92498e488d087ba2d9a 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -193,8 +193,13 @@ class OperatorTest(QueryTest):
                              fwd_sql + "'\n or\n'" + rev_sql + "'")
     
     def test_in(self):
-         self._test(User.id.in_('a', 'b'), "users.id IN (:users_id, :users_id_1)")
-    
+         self._test(User.id.in_('a', 'b'),
+                    "users.id IN (:users_id, :users_id_1)")
+
+    def test_between(self):
+        self._test(User.id.between('a', 'b'),
+                   "users.id BETWEEN :users_id AND :users_id_1")
+
     def test_clauses(self):
         for (expr, compare) in (
             (func.max(User.id), "max(users.id)"),