From: Lele Gaifax <lele@metapensiero.it>
Date: Thu, 15 Dec 2022 09:27:03 +0000 (-0500)
Subject: Fix equality comparison between a PG Range and a different class instance
X-Git-Tag: rel_2_0_0rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f217a5c337ff8bf76edf96b3b38c91dceeebf67f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix equality comparison between a PG Range and a different class instance

This fixes issue #8984, making the method `Range.__eq__` return `NotImplemented` when the argument is an instance of a different class.

Closes: #8985
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/8985
Pull-request-sha: b8f601f038a2203af02a99ab190ebbc1c489549a

Change-Id: Iaf0b651a22a9f346c8f18b3a53e3339bf61bb33f
---

diff --git a/doc/build/changelog/unreleased_20/8984.rst b/doc/build/changelog/unreleased_20/8984.rst
new file mode 100644
index 0000000000..b78abb2606
--- /dev/null
+++ b/doc/build/changelog/unreleased_20/8984.rst
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, postgresql
+    :tickets: 8984
+
+    The :meth:`_postgresql.Range.__eq___` will now return ``NotImplemented``
+    when comparing with an instance of a different class, instead of raising
+    an :exc:`AttributeError` exception.
diff --git a/lib/sqlalchemy/dialects/postgresql/ranges.py b/lib/sqlalchemy/dialects/postgresql/ranges.py
index 9b5834ccd8..609af5eb62 100644
--- a/lib/sqlalchemy/dialects/postgresql/ranges.py
+++ b/lib/sqlalchemy/dialects/postgresql/ranges.py
@@ -146,7 +146,7 @@ class Range(Generic[_T]):
         return AbstractRange()
 
     def _contains_value(self, value: _T) -> bool:
-        """return True if this range contains the given value."""
+        """Return True if this range contains the given value."""
 
         if self.empty:
             return False
@@ -289,6 +289,9 @@ class Range(Generic[_T]):
         bounds inclusivity, returning ``True`` if they are equal.
         """
 
+        if not isinstance(other, Range):
+            return NotImplemented
+
         if self.empty and other.empty:
             return True
         elif self.empty != other.empty:
@@ -681,7 +684,7 @@ class AbstractRange(sqltypes.TypeEngine[Range[_T]]):
         cls: Type[Union[TypeEngine[Any], TypeEngineMixin]],
         **kw: Any,
     ) -> TypeEngine[Any]:
-        """dynamically adapt a range type to an abstract impl.
+        """Dynamically adapt a range type to an abstract impl.
 
         For example ``INT4RANGE().adapt(_Psycopg2NumericRange)`` should
         produce a type that will have ``_Psycopg2NumericRange`` behaviors
@@ -808,7 +811,7 @@ class AbstractRange(sqltypes.TypeEngine[Range[_T]]):
 
 
 class AbstractRangeImpl(AbstractRange[Range[_T]]):
-    """marker for AbstractRange that will apply a subclass-specific
+    """Marker for AbstractRange that will apply a subclass-specific
     adaptation"""
 
 
@@ -821,7 +824,7 @@ class AbstractMultiRange(AbstractRange[Range[_T]]):
 class AbstractMultiRangeImpl(
     AbstractRangeImpl[Range[_T]], AbstractMultiRange[Range[_T]]
 ):
-    """marker for AbstractRange that will apply a subclass-specific
+    """Marker for AbstractRange that will apply a subclass-specific
     adaptation"""
 
 
diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py
index dcde497b46..4832d81d9c 100644
--- a/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@ -3996,6 +3996,10 @@ class _RangeComparisonFixtures(_RangeTests):
 
         is_false(range_.contains(values["rh"]))
 
+        is_true(range_ == range_)
+        is_false(range_ != range_)
+        is_false(range_ == None)
+
     def test_compatibility_accessors(self):
         range_ = self._data_obj()