sqlalchemy-boltons 2.0.0__tar.gz → 2.0.1__tar.gz

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/CHANGELOG.md

@@ -4,6 +4,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [2.0.1] - 2025-06-28
+
+### Added
+
+- `orm`: Add self-referential tables to test cases.
+
+## [2.0.0] - 2025-06-28
+
+### Added
+
+- `orm`: Add module for elegantly extracting the filter condition out of an ORM relationship.
+
 ## [1.1.0] - 2025-03-11
 
 ### Changed

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy_boltons
-Version: 2.0.0
+Version: 2.0.1
 Summary: Utilities that should've been inside SQLAlchemy but aren't
 Author-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
 Maintainer-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
@@ -103,4 +103,4 @@ select(Parent1).where(
 )  #                                  ^^^^            ^
 ```
 
-Hope is restored.
+Hope is restored. This even works on self-referential tables!

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/README.md

@@ -89,4 +89,4 @@ select(Parent1).where(
 )  #                                  ^^^^            ^
 ```
 
-Hope is restored.
+Hope is restored. This even works on self-referential tables!

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 120
 
 [project]
 name = "sqlalchemy_boltons"
-version = "2.0.0"
+version = "2.0.1"
 description = "Utilities that should've been inside SQLAlchemy but aren't"
 readme = "README.md"
 license = { text = "MIT" }

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/src/sqlalchemy_boltons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-boltons
-Version: 2.0.0
+Version: 2.0.1
 Summary: Utilities that should've been inside SQLAlchemy but aren't
 Author-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
 Maintainer-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
@@ -103,4 +103,4 @@ select(Parent1).where(
 )  #                                  ^^^^            ^
 ```
 
-Hope is restored.
+Hope is restored. This even works on self-referential tables!

{sqlalchemy_boltons-2.0.0 → sqlalchemy_boltons-2.0.1}/tests/test_orm.py

@@ -21,6 +21,18 @@ def _make_rel_2(p=None, c=None):
     return (p.ix == c.parent_ix) & (p.iy == c.parent_iy)
 
 
+def _make_rel_3(p=None, c=None):
+    p = p or Parent3
+    c = c or Parent3
+    return p.id == c.parent_id
+
+
+def _make_rel_4(p=None, c=None):
+    p = p or Parent4
+    c = c or Parent4
+    return (p.ix == c.parent_ix) & (p.iy == c.parent_iy)
+
+
 class Parent1(Base):
     __tablename__ = "parent1"
 
@@ -57,22 +69,53 @@ class Child2(Base):
     parent = sao.relationship("Parent2", primaryjoin=_make_rel_2)
 
 
-_cases = {"1": (Parent1, Child1, _make_rel_1), "2": (Parent2, Child2, _make_rel_2)}
+class Parent3(Base):
+    __tablename__ = "parent3"
+
+    id = sa.Column(sa.Integer, primary_key=True)
+    parent_id = sa.Column(sa.ForeignKey("parent3.id"), index=True, nullable=True)
+
+    parent = sao.relationship("Parent3", primaryjoin=_make_rel_3, foreign_keys=parent_id, remote_side=id)
+
+
+class Parent4(Base):
+    __tablename__ = "parent4"
+
+    ix = sa.Column(sa.Integer, primary_key=True)
+    iy = sa.Column(sa.String, primary_key=True)
+
+    parent_ix = sa.Column(sa.ForeignKey("parent4.ix"), index=True, nullable=True)
+    parent_iy = sa.Column(sa.ForeignKey("parent4.iy"), index=True, nullable=True)
+
+    parent = sao.relationship(
+        "Parent4", primaryjoin=_make_rel_4, foreign_keys=[parent_ix, parent_iy], remote_side=[ix, iy]
+    )
+
+
+_cases = {
+    "simple": (Parent1, Child1, _make_rel_1),
+    "simple_multikey": (Parent2, Child2, _make_rel_2),
+    "selfref": (Parent3, Parent3, _make_rel_3),
+    "selfref_multikey": (Parent4, Parent4, _make_rel_4),
+}
 
 
 def assert_same_sql(x, y):
     assert str(x) == str(y), "expected equivalent SQL"
 
 
-@pytest.mark.parametrize("case", _cases.keys())
 @pytest.mark.parametrize("alias_parent", [False, True])
 @pytest.mark.parametrize("alias_child", [False, True])
+@pytest.mark.parametrize("case", _cases.keys())
 def test_join_expr(case, alias_parent, alias_child):
     Parent, Child, make_rel = _cases[case]
 
     P = sao.aliased(Parent) if alias_parent else Parent
     C = sao.aliased(Child) if alias_child else Child
 
+    if (Parent is Child) and not (alias_child and alias_child):
+        pytest.skip(reason="doesn't make sense for a self-referential relationship")
+
     assert_same_sql(_orm.join_expr(P, C.parent), make_rel(P, C))
 
     Rel = _orm.RelationshipComparator