]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Add Range.__contains__ 12094/head
authorFrazer McLean <frazer@frazermclean.co.uk>
Wed, 13 Nov 2024 22:06:56 +0000 (23:06 +0100)
committerFrazer McLean <frazer@frazermclean.co.uk>
Wed, 13 Nov 2024 22:06:56 +0000 (23:06 +0100)
lib/sqlalchemy/dialects/postgresql/ranges.py
test/dialect/postgresql/test_types.py

index b793ca49f1852afd1ad94afc3bdffdd031f5fd1d..fa0c0c5df81a979e77938361fed8b65614b02b38 100644 (file)
@@ -360,6 +360,8 @@ class Range(Generic[_T]):
         else:
             return self._contains_value(value)
 
+    __contains__ = contains
+
     def overlaps(self, other: Range[_T]) -> bool:
         "Determine whether this range overlaps with `other`."
 
index 25237656735762858999d3273c215a895cc5cc76..2c5bd98fde15aa8f7442da8dd95357a412d67003 100644 (file)
@@ -4377,12 +4377,14 @@ class _RangeComparisonFixtures(_RangeTests):
         )
 
         is_true(range_.contains(values["il"]))
+        is_true(values["il"] in range_)
 
         is_false(
             range_.contains(Range(lower=values["ll"], upper=values["ih"]))
         )
 
         is_false(range_.contains(values["rh"]))
+        is_false(values["rh"] in range_)
 
         is_true(range_ == range_)
         is_false(range_ != range_)
@@ -4430,6 +4432,7 @@ class _RangeComparisonFixtures(_RangeTests):
         )
         r, expected = connection.execute(q).first()
         eq_(r.contains(v), expected)
+        eq_(v in r, expected)
 
     _common_ranges_to_test = (
         lambda r, e: Range(empty=True),
@@ -4490,6 +4493,12 @@ class _RangeComparisonFixtures(_RangeTests):
             f"{r1}.contains({r2}): got {py_contains},"
             f" expected {pg_contains}",
         )
+        r2_in_r1 = r2 in r1
+        eq_(
+            r2_in_r1,
+            pg_contains,
+            f"{r2} in {r1}: got {r2_in_r1}, expected {pg_contains}",
+        )
         py_contained = r1.contained_by(r2)
         eq_(
             py_contained,
@@ -4503,6 +4512,12 @@ class _RangeComparisonFixtures(_RangeTests):
             f"{r2}.contains({r1}: got {r2.contains(r1)},"
             f" expected {pg_contained})",
         )
+        r1_in_r2 = r1 in r2
+        eq_(
+            r1_in_r2,
+            pg_contained,
+            f"{r1} in {r2}: got {r1_in_r2}, expected {pg_contained}",
+        )
 
     @testing.combinations(
         *_common_ranges_to_test,