From f4f3c56cd31a30e87f17148f3d4d17832c12b110 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 2 Feb 2013 20:48:53 -0500
Subject: [PATCH] Fixed the consideration of the ``between()`` operator so that
 it works correctly with the new relationship local/remote system.
 [ticket:1768]

---
 doc/build/changelog/changelog_08.rst |  8 ++++
 lib/sqlalchemy/sql/operators.py      |  2 +-
 test/orm/test_relationships.py       | 67 ++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 52414be6d6..95e1b44b5e 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,14 @@
 .. changelog::
     :version: 0.8.0
 
+    .. change::
+        :tags: bug, orm
+        :tickets: 1768
+
+      Fixed the consideration of the ``between()`` operator
+      so that it works correctly with the new relationship local/remote
+      system.
+
     .. change::
         :tags: bug, sql
         :tickets: 2660, 1768
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 10d01acd62..a7e6af1161 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -758,7 +758,7 @@ def nullslast_op(a):
 
 _commutative = set([eq, ne, add, mul])
 
-_comparison = set([eq, ne, lt, gt, ge, le])
+_comparison = set([eq, ne, lt, gt, ge, le, between_op])
 
 
 def is_comparison(op):
diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py
index 3ecd273aa6..fb3f4f8240 100644
--- a/test/orm/test_relationships.py
+++ b/test/orm/test_relationships.py
@@ -1952,6 +1952,73 @@ class ViewOnlyComplexJoin(_RelationshipErrors, fixtures.MappedTest):
         mapper(T3, t3)
         self._assert_raises_no_local_remote(configure_mappers, "T1.t3s")
 
+class RemoteForeignBetweenColsTest(fixtures.DeclarativeMappedTest):
+    """test a complex annotation using between().
+
+    Using declarative here as an integration test for the local()
+    and remote() annotations in conjunction with already annotated
+    instrumented attributes, etc.
+
+    """
+    @classmethod
+    def setup_classes(cls):
+        Base = cls.DeclarativeBasic
+
+        class Network(fixtures.ComparableEntity, Base):
+            __tablename__ = "network"
+
+            id = Column(sa.Integer, primary_key=True)
+            ip_net_addr = Column(Integer)
+            ip_broadcast_addr = Column(Integer)
+
+            addresses = relationship("Address",
+                    primaryjoin="remote(foreign(Address.ip_addr)).between("
+                                "Network.ip_net_addr,"
+                                "Network.ip_broadcast_addr)",
+                    viewonly=True
+        )
+
+        class Address(fixtures.ComparableEntity, Base):
+            __tablename__ = "address"
+
+            ip_addr = Column(Integer, primary_key=True)
+
+
+    @classmethod
+    def insert_data(cls):
+        Network, Address = cls.classes.Network, cls.classes.Address
+        s = Session(testing.db)
+
+        s.add_all([
+            Network(ip_net_addr=5, ip_broadcast_addr=10),
+            Network(ip_net_addr=15, ip_broadcast_addr=25),
+            Network(ip_net_addr=30, ip_broadcast_addr=35),
+            Address(ip_addr=17), Address(ip_addr=18), Address(ip_addr=9),
+            Address(ip_addr=27)
+        ])
+        s.commit()
+
+    def test_col_query(self):
+        Network, Address = self.classes.Network, self.classes.Address
+
+        session = Session(testing.db)
+        eq_(
+            session.query(Address.ip_addr).\
+                select_from(Network).\
+                join(Network.addresses).\
+                filter(Network.ip_net_addr == 15).\
+                all(),
+            [(17, ), (18, )]
+        )
+
+    def test_lazyload(self):
+        Network, Address = self.classes.Network, self.classes.Address
+
+        session = Session(testing.db)
+
+        n3 = session.query(Network).filter(Network.ip_net_addr == 5).one()
+        eq_([a.ip_addr for a in n3.addresses], [9])
+
 
 class ExplicitLocalRemoteTest(fixtures.MappedTest):
 
-- 
2.47.2