SQLAlchemy-Utils 0.42.0__tar.gz → 0.43.0__tar.gz

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/CHANGES.rst

@@ -3,6 +3,26 @@ Changelog
 
 Here you can see the full list of changes between each SQLAlchemy-Utils release.
 
+0.43.0 (2026-10-09)
+^^^^^^^^^^^^^^^^^^^
+
+- Add support for SQLAlchemy 2.1.
+- Reimplement ``generic_relationship`` as a hybrid property built only on public SQLAlchemy APIs, instead of private attribute internals.
+
+  Assigning to a generic relationship now sets the discriminator and id attributes through regular attribute instrumentation, so re-assigning it on a persistent object is flushed to the database.
+- Support querying generic relationships through aliased models, including composite keys and renamed columns.
+- Drop support for sqlalchemy 1.4.
+- Drop support for Python 3.9.
+- Support Python 3.14.
+- Fix ``ChoiceType`` returning the raw scalar instead of a ``Choice`` for falsy codes such as ``0`` or the empty string. (#813)
+
+  NULL values continue to return ``None``.
+
+0.42.1 (2025-12-12)
+^^^^^^^^^^^^^^^^^^^
+
+- Fix ``AttributeError`` with Sequence defaults in ``instant_defaults_listener`` (#793)
+
 0.42.0 (2025-08-30)
 ^^^^^^^^^^^^^^^^^^^
 

{sqlalchemy_utils-0.42.0/SQLAlchemy_Utils.egg-info → sqlalchemy_utils-0.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SQLAlchemy-Utils
-Version: 0.42.0
+Version: 0.43.0
 Summary: Various utility functions for SQLAlchemy.
 Author: Ryan Leckey, Janne Vanhala, Vesa Uimonen
 Author-email: Konsta Vesterinen <konsta@fastmonkeys.com>
@@ -10,19 +10,19 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: SQLAlchemy>=1.4
+Requires-Dist: SQLAlchemy>=2.0
 Provides-Extra: test
-Requires-Dist: pytest==7.4.4; extra == "test"
+Requires-Dist: pytest<10,>=9.0; extra == "test"
 Requires-Dist: Pygments>=1.2; extra == "test"
 Requires-Dist: Jinja2>=2.3; extra == "test"
 Requires-Dist: docutils>=0.10; extra == "test"
@@ -34,8 +34,6 @@ Requires-Dist: pg8000>=1.12.4; extra == "test"
 Requires-Dist: pytz>=2014.2; extra == "test"
 Requires-Dist: python-dateutil>=2.6; extra == "test"
 Requires-Dist: pymysql; extra == "test"
-Requires-Dist: flake8>=2.4.0; extra == "test"
-Requires-Dist: isort>=4.2.2; extra == "test"
 Requires-Dist: pyodbc; extra == "test"
 Provides-Extra: babel
 Requires-Dist: Babel>=1.3; extra == "babel"
@@ -58,7 +56,7 @@ Requires-Dist: furl>=0.4.1; extra == "url"
 Provides-Extra: encrypted
 Requires-Dist: cryptography>=0.6; extra == "encrypted"
 Provides-Extra: test-all
-Requires-Dist: pytest==7.4.4; extra == "test-all"
+Requires-Dist: pytest<10,>=9.0; extra == "test-all"
 Requires-Dist: Pygments>=1.2; extra == "test-all"
 Requires-Dist: Jinja2>=2.3; extra == "test-all"
 Requires-Dist: docutils>=0.10; extra == "test-all"
@@ -70,8 +68,6 @@ Requires-Dist: pg8000>=1.12.4; extra == "test-all"
 Requires-Dist: pytz>=2014.2; extra == "test-all"
 Requires-Dist: python-dateutil>=2.6; extra == "test-all"
 Requires-Dist: pymysql; extra == "test-all"
-Requires-Dist: flake8>=2.4.0; extra == "test-all"
-Requires-Dist: isort>=4.2.2; extra == "test-all"
 Requires-Dist: pyodbc; extra == "test-all"
 Requires-Dist: Babel>=1.3; extra == "test-all"
 Requires-Dist: arrow>=0.3.4; extra == "test-all"
@@ -88,8 +84,6 @@ Dynamic: license-file
 SQLAlchemy-Utils
 ================
 
-|Build| |Version Status| |Downloads|
-
 Various utility functions, new data types and helpers for SQLAlchemy.
 
 
@@ -99,11 +93,3 @@ Resources
 - `Documentation <https://sqlalchemy-utils.readthedocs.io/>`_
 - `Issue Tracker <https://github.com/kvesteri/sqlalchemy-utils/issues>`_
 - `Code <https://github.com/kvesteri/sqlalchemy-utils/>`_
-
-.. |Build| image:: https://github.com/kvesteri/sqlalchemy-utils/actions/workflows/test.yaml/badge.svg?branch=master
-   :target: https://github.com/kvesteri/sqlalchemy-utils/actions/workflows/test.yaml
-   :alt: Tests
-.. |Version Status| image:: https://img.shields.io/pypi/v/SQLAlchemy-Utils.svg
-   :target: https://pypi.python.org/pypi/SQLAlchemy-Utils/
-.. |Downloads| image:: https://img.shields.io/pypi/dm/SQLAlchemy-Utils.svg
-   :target: https://pypi.python.org/pypi/SQLAlchemy-Utils/

sqlalchemy_utils-0.43.0/README.rst

@@ -0,0 +1,12 @@
+SQLAlchemy-Utils
+================
+
+Various utility functions, new data types and helpers for SQLAlchemy.
+
+
+Resources
+---------
+
+- `Documentation <https://sqlalchemy-utils.readthedocs.io/>`_
+- `Issue Tracker <https://github.com/kvesteri/sqlalchemy-utils/issues>`_
+- `Code <https://github.com/kvesteri/sqlalchemy-utils/>`_

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0/SQLAlchemy_Utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SQLAlchemy-Utils
-Version: 0.42.0
+Version: 0.43.0
 Summary: Various utility functions for SQLAlchemy.
 Author: Ryan Leckey, Janne Vanhala, Vesa Uimonen
 Author-email: Konsta Vesterinen <konsta@fastmonkeys.com>
@@ -10,19 +10,19 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: SQLAlchemy>=1.4
+Requires-Dist: SQLAlchemy>=2.0
 Provides-Extra: test
-Requires-Dist: pytest==7.4.4; extra == "test"
+Requires-Dist: pytest<10,>=9.0; extra == "test"
 Requires-Dist: Pygments>=1.2; extra == "test"
 Requires-Dist: Jinja2>=2.3; extra == "test"
 Requires-Dist: docutils>=0.10; extra == "test"
@@ -34,8 +34,6 @@ Requires-Dist: pg8000>=1.12.4; extra == "test"
 Requires-Dist: pytz>=2014.2; extra == "test"
 Requires-Dist: python-dateutil>=2.6; extra == "test"
 Requires-Dist: pymysql; extra == "test"
-Requires-Dist: flake8>=2.4.0; extra == "test"
-Requires-Dist: isort>=4.2.2; extra == "test"
 Requires-Dist: pyodbc; extra == "test"
 Provides-Extra: babel
 Requires-Dist: Babel>=1.3; extra == "babel"
@@ -58,7 +56,7 @@ Requires-Dist: furl>=0.4.1; extra == "url"
 Provides-Extra: encrypted
 Requires-Dist: cryptography>=0.6; extra == "encrypted"
 Provides-Extra: test-all
-Requires-Dist: pytest==7.4.4; extra == "test-all"
+Requires-Dist: pytest<10,>=9.0; extra == "test-all"
 Requires-Dist: Pygments>=1.2; extra == "test-all"
 Requires-Dist: Jinja2>=2.3; extra == "test-all"
 Requires-Dist: docutils>=0.10; extra == "test-all"
@@ -70,8 +68,6 @@ Requires-Dist: pg8000>=1.12.4; extra == "test-all"
 Requires-Dist: pytz>=2014.2; extra == "test-all"
 Requires-Dist: python-dateutil>=2.6; extra == "test-all"
 Requires-Dist: pymysql; extra == "test-all"
-Requires-Dist: flake8>=2.4.0; extra == "test-all"
-Requires-Dist: isort>=4.2.2; extra == "test-all"
 Requires-Dist: pyodbc; extra == "test-all"
 Requires-Dist: Babel>=1.3; extra == "test-all"
 Requires-Dist: arrow>=0.3.4; extra == "test-all"
@@ -88,8 +84,6 @@ Dynamic: license-file
 SQLAlchemy-Utils
 ================
 
-|Build| |Version Status| |Downloads|
-
 Various utility functions, new data types and helpers for SQLAlchemy.
 
 
@@ -99,11 +93,3 @@ Resources
 - `Documentation <https://sqlalchemy-utils.readthedocs.io/>`_
 - `Issue Tracker <https://github.com/kvesteri/sqlalchemy-utils/issues>`_
 - `Code <https://github.com/kvesteri/sqlalchemy-utils/>`_
-
-.. |Build| image:: https://github.com/kvesteri/sqlalchemy-utils/actions/workflows/test.yaml/badge.svg?branch=master
-   :target: https://github.com/kvesteri/sqlalchemy-utils/actions/workflows/test.yaml
-   :alt: Tests
-.. |Version Status| image:: https://img.shields.io/pypi/v/SQLAlchemy-Utils.svg
-   :target: https://pypi.python.org/pypi/SQLAlchemy-Utils/
-.. |Downloads| image:: https://img.shields.io/pypi/dm/SQLAlchemy-Utils.svg
-   :target: https://pypi.python.org/pypi/SQLAlchemy-Utils/

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/SQLAlchemy_Utils.egg-info/requires.txt

@@ -1,4 +1,4 @@
-SQLAlchemy>=1.4
+SQLAlchemy>=2.0
 
 [arrow]
 arrow>=0.3.4
@@ -25,7 +25,7 @@ pendulum>=2.0.5
 phonenumbers>=5.9.2
 
 [test]
-pytest==7.4.4
+pytest<10,>=9.0
 Pygments>=1.2
 Jinja2>=2.3
 docutils>=0.10
@@ -37,12 +37,10 @@ pg8000>=1.12.4
 pytz>=2014.2
 python-dateutil>=2.6
 pymysql
-flake8>=2.4.0
-isort>=4.2.2
 pyodbc
 
 [test_all]
-pytest==7.4.4
+pytest<10,>=9.0
 Pygments>=1.2
 Jinja2>=2.3
 docutils>=0.10
@@ -54,8 +52,6 @@ pg8000>=1.12.4
 pytz>=2014.2
 python-dateutil>=2.6
 pymysql
-flake8>=2.4.0
-isort>=4.2.2
 pyodbc
 Babel>=1.3
 arrow>=0.3.4

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/docs/installation.rst

@@ -6,12 +6,7 @@ This part of the documentation covers the installation of SQLAlchemy-Utils.
 Supported platforms
 -------------------
 
-SQLAlchemy-Utils is currently tested against the following Python platforms:
-
-- CPython 3.9
-- CPython 3.10
-- CPython 3.11
-- CPython 3.12
+SQLAlchemy-Utils is tested against supported CPython versions.
 
 
 Installing an official release

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "SQLAlchemy-Utils"
-version = "0.42.0"
+version = "0.43.0"
 description = "Various utility functions for SQLAlchemy."
 readme = "README.rst"
 license = "BSD-3-Clause"
@@ -14,22 +14,22 @@ authors = [
     {name = "Janne Vanhala"},
     {name = "Vesa Uimonen"}
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "SQLAlchemy>=1.4",
+    "SQLAlchemy>=2.0",
 ]
 
 [project.urls]
@@ -37,7 +37,7 @@ Homepage = "https://github.com/kvesteri/sqlalchemy-utils"
 
 [project.optional-dependencies]
 test = [
-    "pytest==7.4.4",
+    "pytest>=9.0,<10",
     "Pygments>=1.2",
     "Jinja2>=2.3",
     "docutils>=0.10",
@@ -49,8 +49,6 @@ test = [
     "pytz>=2014.2",
     "python-dateutil>=2.6",
     "pymysql",
-    "flake8>=2.4.0",
-    "isort>=4.2.2",
     "pyodbc",
 ]
 babel = ["Babel>=1.3"]
@@ -64,7 +62,7 @@ timezone = ["python-dateutil"]
 url = ["furl >= 0.4.1"]
 encrypted = ["cryptography>=0.6"]
 test_all = [
-    "pytest==7.4.4",
+    "pytest>=9.0,<10",
     "Pygments>=1.2",
     "Jinja2>=2.3",
     "docutils>=0.10",
@@ -76,8 +74,6 @@ test_all = [
     "pytz>=2014.2",
     "python-dateutil>=2.6",
     "pymysql",
-    "flake8>=2.4.0",
-    "isort>=4.2.2",
     "pyodbc",
     "Babel>=1.3",
     "arrow>=0.3.4",

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/__init__.py

@@ -101,4 +101,4 @@ from .view import (  # noqa
     refresh_materialized_view,
 )
 
-__version__ = '0.42.0'
+__version__ = '0.43.0'

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/functions/database.py

@@ -1,7 +1,6 @@
 import itertools
 import os
 from collections.abc import Mapping, Sequence
-from copy import copy
 
 import sqlalchemy as sa
 from sqlalchemy.engine.url import make_url
@@ -416,13 +415,8 @@ def _set_url_database(url: sa.engine.url.URL, database):
     :param database: New database to set.
 
     """
-    if hasattr(url, '_replace'):
-        # Cannot use URL.set() as database may need to be set to None.
-        ret = url._replace(database=database)
-    else:  # SQLAlchemy <1.4
-        url = copy(url)
-        url.database = database
-        ret = url
+    # Cannot use URL.set() as database may need to be set to None.
+    ret = url._replace(database=database)
     assert ret.database == database, ret
     return ret
 

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/functions/mock.py

@@ -47,10 +47,7 @@ def create_mock_engine(bind, stream=None):
         def dump(*args, **kw):
             return None
 
-    try:
-        engine = sa.create_mock_engine(bind_url, executor=dump)
-    except AttributeError:  # SQLAlchemy <1.4
-        engine = sa.create_engine(bind_url, strategy='mock', executor=dump)
+    engine = sa.create_mock_engine(bind_url, executor=dump)
     return engine
 
 

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/functions/orm.py

@@ -10,10 +10,7 @@ from sqlalchemy.orm import ColumnProperty, mapperlib, RelationshipProperty
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.orm.exc import UnmappedInstanceError
 
-try:
-    from sqlalchemy.orm.context import _ColumnEntity, _MapperEntity
-except ImportError:  # SQLAlchemy <1.4
-    from sqlalchemy.orm.query import _ColumnEntity, _MapperEntity
+from sqlalchemy.orm.context import _ColumnEntity, _MapperEntity
 
 from sqlalchemy.orm.session import object_session
 from sqlalchemy.orm.util import AliasedInsp
@@ -281,12 +278,9 @@ def get_mapper(mixed):
     if isinstance(mixed, sa.orm.attributes.InstrumentedAttribute):
         mixed = mixed.class_
     if isinstance(mixed, sa.Table):
-        if hasattr(mapperlib, '_all_registries'):
-            all_mappers = set()
-            for mapper_registry in mapperlib._all_registries():
-                all_mappers.update(mapper_registry.mappers)
-        else:  # SQLAlchemy <1.4
-            all_mappers = mapperlib._mapper_registry
+        all_mappers = set()
+        for mapper_registry in mapperlib._all_registries():
+            all_mappers.update(mapper_registry.mappers)
         mappers = [mapper for mapper in all_mappers if mixed in mapper.tables]
         if len(mappers) > 1:
             raise ValueError("Multiple mappers found for table '%s'." % mixed.name)
@@ -449,11 +443,10 @@ def get_columns(mixed):
         SA Table object, SA Mapper, SA declarative class, SA declarative class
         instance or an alias of any of these objects
     """
+    if isinstance(mixed, sa.SelectBase):
+        return mixed.subquery().c
     if isinstance(mixed, sa.sql.selectable.Selectable):
-        try:
-            return mixed.selected_columns
-        except AttributeError:  # SQLAlchemy <1.4
-            return mixed.c
+        return mixed.c
     if isinstance(mixed, sa.orm.util.AliasedClass):
         return sa.inspect(mixed).mapper.columns
     if isinstance(mixed, sa.orm.Mapper):
@@ -520,10 +513,7 @@ def quote(mixed, ident):
 
 
 def _get_query_compile_state(query):
-    if hasattr(query, '_compile_state'):
-        return query._compile_state()
-    else:  # SQLAlchemy <1.4
-        return query
+    return query._compile_state()
 
 
 def get_polymorphic_mappers(mixed):
@@ -878,7 +868,4 @@ def naturally_equivalent(obj, obj2):
 
 
 def _get_class_registry(class_):
-    try:
-        return class_.registry._class_registry
-    except AttributeError:  # SQLAlchemy <1.4
-        return class_._decl_class_registry
+    return class_.registry._class_registry

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/functions/sort_query.py

@@ -40,10 +40,7 @@ def make_order_by_deterministic(query):
     """
     order_by_func = sa.asc
 
-    try:
-        order_by_clauses = query._order_by_clauses
-    except AttributeError:  # SQLAlchemy <1.4
-        order_by_clauses = query._order_by
+    order_by_clauses = query._order_by_clauses
     if not order_by_clauses:
         column = None
     else:

sqlalchemy_utils-0.43.0/sqlalchemy_utils/generic.py

@@ -0,0 +1,146 @@
+import builtins
+from collections.abc import Iterable
+
+import sqlalchemy as sa
+from sqlalchemy.ext.hybrid import Comparator, hybrid_property
+from sqlalchemy.orm import object_session
+
+from .exceptions import ImproperlyConfigured
+from .functions import identity
+
+
+class GenericComparator(Comparator):
+    def __init__(self, relationship, cls):
+        self.relationship = relationship
+        self.cls = cls
+
+    def __clause_element__(self):
+        raise NotImplementedError(
+            'A generic relationship can only be compared against a model '
+            'instance or with is_type().'
+        )
+
+    def __eq__(self, other):
+        discriminator, ids = self.relationship._attributes(self.cls)
+        q = discriminator == type(other).__name__
+        for column, value in zip(ids, identity(other)):
+            q &= column == value
+        return q
+
+    def __ne__(self, other):
+        return ~(self == other)
+
+    def is_type(self, other):
+        discriminator, _ = self.relationship._attributes(self.cls)
+        class_names = [
+            mapper.class_.__name__ for mapper in sa.inspect(other).self_and_descendants
+        ]
+        return discriminator.in_(class_names)
+
+
+class GenericRelationship:
+    """A generic form of the relationship property.
+
+    Creates a 1 to many relationship between the parent model
+    and any other models using a discriminator (the class name).
+
+    Implemented as a hybrid property on top of the discriminator and id
+    attributes, so it only relies on public SQLAlchemy APIs.
+
+    :param discriminator:
+        Field to discriminate which model we are referring to.
+    :param id:
+        Field to point to the model we are referring to.
+    """
+
+    def __init__(self, discriminator, id):
+        self.discriminator = discriminator
+        if isinstance(id, Iterable) and not isinstance(id, str):
+            self.ids = list(id)
+        else:
+            self.ids = [id]
+        # Key for caching the assigned target object on the instance dict.
+        self.cache_key = f'_generic_relationship_{builtins.id(self)}'
+
+    def _key(self, cls, column):
+        if isinstance(column, str):
+            return column
+        if isinstance(column, hybrid_property):
+            return column.__name__
+        try:
+            return sa.inspect(cls).mapper.get_property_by_column(column).key
+        except sa.orm.exc.UnmappedColumnError:
+            raise ImproperlyConfigured(
+                f'Could not find generic relationship attribute for {column!r}.'
+            )
+
+    def _keys(self, cls):
+        return (
+            self._key(cls, self.discriminator),
+            [self._key(cls, column) for column in self.ids],
+        )
+
+    def _attributes(self, cls):
+        discriminator, ids = self._keys(cls)
+        return getattr(cls, discriminator), [getattr(cls, key) for key in ids]
+
+    def _target_class(self, cls, discriminator):
+        for mapper in sa.inspect(cls).registry.mappers:
+            if mapper.class_.__name__ == discriminator:
+                return mapper.class_
+
+    def get(self, obj):
+        discriminator_key, id_keys = self._keys(type(obj))
+        discriminator = getattr(obj, discriminator_key)
+        id = tuple(getattr(obj, key) for key in id_keys)
+
+        # Return the object assigned to this relationship as long as the
+        # discriminator and id still point to it.
+        cached = obj.__dict__.get(self.cache_key)
+        if (
+            cached is not None
+            and type(cached).__name__ == discriminator
+            and identity(cached) == id
+        ):
+            return cached
+
+        # Use the session the object is bound to in order to perform
+        # a lazy query for the target.
+        session = object_session(obj)
+        if session is None:
+            return None
+
+        target_class = self._target_class(type(obj), discriminator)
+        if target_class is None:
+            # Unknown discriminator; return nothing.
+            return None
+
+        return session.get(target_class, id)
+
+    def set(self, obj, value):
+        discriminator_key, id_keys = self._keys(type(obj))
+        obj.__dict__[self.cache_key] = value
+
+        if value is None:
+            # Nullify relationship args
+            for key in id_keys:
+                setattr(obj, key, None)
+            setattr(obj, discriminator_key, None)
+        else:
+            for key, pk in zip(id_keys, identity(value)):
+                setattr(obj, key, pk)
+            setattr(obj, discriminator_key, type(value).__name__)
+
+    def comparator(self, cls):
+        return GenericComparator(self, cls)
+
+
+def generic_relationship(discriminator, id, doc=None):
+    relationship = GenericRelationship(discriminator, id)
+    prop = hybrid_property(
+        relationship.get,
+        relationship.set,
+        custom_comparator=relationship.comparator,
+    )
+    prop.__doc__ = doc
+    return prop

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/listeners.py

@@ -24,7 +24,9 @@ def instant_defaults_listener(target, args, kwargs):
 
     for key, column in sa.inspect(target.__class__).columns.items():
         if hasattr(column, 'default') and column.default is not None:
-            if callable(column.default.arg):
+            if not hasattr(column.default, 'arg'):
+                continue
+            elif callable(column.default.arg):
                 kwargs[key] = column.default.arg(target)
             else:
                 kwargs[key] = column.default.arg

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/types/choice.py

@@ -183,9 +183,9 @@ class ChoiceTypeImpl:
         return value
 
     def process_result_value(self, value, dialect):
-        if value:
-            return Choice(value, self.choices_dict[value])
-        return value
+        if value is None:
+            return None
+        return Choice(value, self.choices_dict[value])
 
 
 class EnumTypeImpl:

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/types/password.py

@@ -42,8 +42,10 @@ class Password(Mutable):
 
     def __eq__(self, value):
         if self.hash is None or value is None:
-            # Ensure that we don't continue comparison if one of us is None.
-            return self.hash is value
+            # If either the hash or the value is None,
+            # equivalence depends on *all* values being None,
+            # including the secret.
+            return self.hash is None and self.secret is None and value is None
 
         if isinstance(value, Password):
             # Comparing 2 hashes isn't very useful; but this equality

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/sqlalchemy_utils/types/uuid.py

@@ -3,11 +3,8 @@ import uuid
 from sqlalchemy import types, util
 from sqlalchemy.dialects import mssql, postgresql
 
-from ..compat import get_sqlalchemy_version
 from .scalar_coercible import ScalarCoercible
 
-sqlalchemy_version = get_sqlalchemy_version()
-
 
 class UUIDType(ScalarCoercible, types.TypeDecorator):
     """
@@ -71,16 +68,8 @@ class UUIDType(ScalarCoercible, types.TypeDecorator):
 
         return value
 
-    # sqlalchemy >= 1.4.30 quotes UUID's automatically.
-    # It is only necessary to quote UUID's in sqlalchemy < 1.4.30.
-    if sqlalchemy_version < (1, 4, 30):
-
-        def process_literal_param(self, value, dialect):
-            return f"'{value}'" if value else value
-    else:
-
-        def process_literal_param(self, value, dialect):
-            return value
+    def process_literal_param(self, value, dialect):
+        return value
 
     def process_bind_param(self, value, dialect):
         if value is None:

{sqlalchemy_utils-0.42.0 → sqlalchemy_utils-0.43.0}/tests/conftest.py

@@ -64,7 +64,7 @@ def mysql_db_user():
 def postgresql_dsn(
     postgresql_db_user, postgresql_db_password, postgresql_db_host, db_name
 ):
-    return 'postgresql://{}:{}@{}/{}'.format(
+    return 'postgresql+psycopg2://{}:{}@{}/{}'.format(
         postgresql_db_user, postgresql_db_password, postgresql_db_host, db_name
     )