Removes sqlalchemy_utils dependency

CHANGES.rst

@@ -3,6 +3,12 @@ Changelog
 
 Here you can see the full list of changes between each SQLAlchemy-Continuum release.
 
+2.0.0 (Unreleased)
+^^^^^^^^^^^^^^^^^
+
+- Removed direct dependency on SQLAlchemy-Utils to improve initialization times
+
+
 1.3.14 (2023-01-04)
 ^^^^^^^^^^^^^^^^^^^
 

setup.py

@@ -61,7 +61,6 @@ def get_version():
     platforms='any',
     install_requires=[
         'SQLAlchemy>=1.4.0',
-        'SQLAlchemy-Utils>=0.41.2',
     ],
     extras_require=extras_require,
     classifiers=[

sqlalchemy_continuum/__init__.py

@@ -18,7 +18,7 @@
 )
 
 
-__version__ = '1.4.2'
+__version__ = '2.0.0'
 
 
 versioning_manager = VersioningManager()

sqlalchemy_continuum/builder.py

@@ -3,12 +3,12 @@
 from functools import wraps
 
 import sqlalchemy as sa
-from sqlalchemy_utils.functions import get_declarative_base
 from sqlalchemy.orm.descriptor_props import ConcreteInheritedProperty
 
 from .dialects.postgresql import create_versioning_trigger_listeners
 from .model_builder import ModelBuilder
 from .relationship_builder import RelationshipBuilder
+from .sa_utils import get_declarative_base
 from .table_builder import TableBuilder
 
 

sqlalchemy_continuum/dialects/postgresql.py

@@ -1,6 +1,6 @@
 import sqlalchemy as sa
 
-from sqlalchemy_continuum.plugins import PropertyModTrackerPlugin
+from ..plugins.property_mod_tracker import PropertyModTrackerPlugin
 
 
 trigger_sql = """

sqlalchemy_continuum/fetcher.py

@@ -1,13 +1,14 @@
 import operator
 import sqlalchemy as sa
-from sqlalchemy_utils import get_primary_keys, identity
+
+from .sa_utils import get_primary_key_columns, identity
 from .utils import tx_column_name, end_tx_column_name
 
 
 def parent_identity(obj_or_class):
     return tuple(
         getattr(obj_or_class, column_key)
-        for column_key in get_primary_keys(obj_or_class).keys()
+        for column_key in get_primary_key_columns(obj_or_class)
         if column_key != tx_column_name(obj_or_class)
     )
 
@@ -83,7 +84,7 @@ def _transaction_id_subquery(self, obj, next_or_prev='next', alias=None):
                     ),
                     *[
                         getattr(attrs, pk) == getattr(obj, pk)
-                        for pk in get_primary_keys(obj.__class__)
+                        for pk in get_primary_key_columns(obj.__class__)
                         if pk != tx_column_name(obj)
                     ]
                 )

sqlalchemy_continuum/manager.py

@@ -1,9 +1,7 @@
-import re
 from functools import wraps
 
 import sqlalchemy as sa
 from sqlalchemy.orm import object_session
-from sqlalchemy_utils import get_column_key
 
 from .builder import Builder
 from .fetcher import SubqueryFetcher, ValidityFetcher
@@ -14,6 +12,41 @@
 from .utils import is_modified, is_versioned, version_table
 
 
+def _get_column_key(model, column):
+    """
+    Return the key for given column in given model.
+
+    :param model: SQLAlchemy declarative model object
+
+    ::
+
+        class User(Base):
+            __tablename__ = 'user'
+            id = sa.Column(sa.Integer, primary_key=True)
+            name = sa.Column('_name', sa.String)
+
+
+        get_column_key(User, User.__table__.c._name)  # 'name'
+
+    .. versionadded: 0.26.5
+
+    .. versionchanged: 0.27.11
+        Throws UnmappedColumnError instead of ValueError when no property was
+        found for given column. This is consistent with how SQLAlchemy works.
+    """
+    mapper = sa.inspect(model)
+    try:
+        return mapper.get_property_by_column(column).key
+    except sa.orm.exc.UnmappedColumnError:
+        for key, c in mapper.columns.items():
+            if c.name == column.name and c.table is column.table:
+                return key
+    raise sa.orm.exc.UnmappedColumnError(
+        'No column %s is configured on mapper %s...' %
+        (column, mapper)
+    )
+
+
 def tracked_operation(func):
     @wraps(func)
     def wrapper(self, mapper, connection, target):
@@ -156,7 +189,7 @@ def create_transaction_model(self):
 
     def is_excluded_column(self, model, column):
         try:
-            key = get_column_key(model, column)
+            key = _get_column_key(model, column)
         except sa.orm.exc.UnmappedColumnError:
             return False
 
@@ -454,4 +487,3 @@ def track_association_operations(
                     'operation_type': op,
                 })
                 uow.pending_statements.append(stmt)
-

sqlalchemy_continuum/model_builder.py

@@ -2,8 +2,8 @@
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import column_property
-from sqlalchemy_utils.functions import get_declarative_base
 
+from .sa_utils import get_declarative_base
 from .utils import adapt_columns, option
 from .version import VersionClassBase
 

sqlalchemy_continuum/operation.py

@@ -2,7 +2,8 @@
 from collections import OrderedDict
 
 import sqlalchemy as sa
-from sqlalchemy_utils import identity
+
+from .sa_utils import identity
 
 
 class Operation(object):