Double pluralization of names (#262)

* prevent relationship names to be double pluralized

* Add test for double pluralized relationship

* Add test for singular table name

* Makes sure that a singular table name with a one-to-many relationship does not end up with a relationship name of 'False' because of self.inflect_engine.singular_noun(preferred_name) returns False with a singular preferred_name in generate_relationship_name().

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Shorten long line

* Delete test_generators.py

* Re-added double_pluralization tests

* Updated change log

* Update src/sqlacodegen/generators.py

Co-authored-by: Alex Grönholm <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alex Grönholm <[email protected]>
Co-authored-by: Idan Sheinberg <[email protected]>

Author: 4 people

CHANGES.rst

@@ -9,6 +9,7 @@ Version history
   (PR by @LajosCseppento)
 - Fixed incorrect package name used in ``importlib.metadata.version`` for
   ``sqlalchemy-citext``, resolving ``PackageNotFoundError`` (PR by @oaimtiaz)
+- Prevent double pluralization (PR by @dkratzert)
 
 **3.0.0**
 

src/sqlacodegen/generators.py

@@ -1076,9 +1076,8 @@ def generate_relationship_name(
                     RelationshipType.ONE_TO_MANY,
                     RelationshipType.MANY_TO_MANY,
                 ):
-                    inflected_name = self.inflect_engine.plural_noun(preferred_name)
-                    if inflected_name:
-                        preferred_name = inflected_name
+                    if not self.inflect_engine.singular_noun(preferred_name):
+                        preferred_name = self.inflect_engine.plural_noun(preferred_name)
                 else:
                     inflected_name = self.inflect_engine.singular_noun(preferred_name)
                     if inflected_name:

tests/test_generator_declarative.py

@@ -1003,6 +1003,66 @@ class SimpleItem(Base):
     )
 
 
+@pytest.mark.parametrize("generator", [["use_inflect"]], indirect=True)
+def test_use_inflect_plural_double_pluralize(generator: CodeGenerator) -> None:
+    Table(
+        "users",
+        generator.metadata,
+        Column("users_id", INTEGER),
+        Column("groups_id", INTEGER),
+        ForeignKeyConstraint(
+            ["groups_id"], ["groups.groups_id"], name="fk_users_groups_id"
+        ),
+        PrimaryKeyConstraint("users_id", name="users_pkey"),
+    )
+
+    Table(
+        "groups",
+        generator.metadata,
+        Column("groups_id", INTEGER),
+        Column("group_name", Text(50), nullable=False),
+        PrimaryKeyConstraint("groups_id", name="groups_pkey"),
+    )
+
+    validate_code(
+        generator.generate(),
+        """\
+from typing import Optional
+
+from sqlalchemy import ForeignKeyConstraint, Integer, PrimaryKeyConstraint, Text
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
+
+class Base(DeclarativeBase):
+    pass
+
+
+class Group(Base):
+    __tablename__ = 'groups'
+    __table_args__ = (
+        PrimaryKeyConstraint('groups_id', name='groups_pkey'),
+    )
+
+    groups_id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    group_name: Mapped[str] = mapped_column(Text(50))
+
+    users: Mapped[list['User']] = relationship('User', back_populates='group')
+
+
+class User(Base):
+    __tablename__ = 'users'
+    __table_args__ = (
+        ForeignKeyConstraint(['groups_id'], ['groups.groups_id'], name='fk_users_groups_id'),
+        PrimaryKeyConstraint('users_id', name='users_pkey')
+    )
+
+    users_id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    groups_id: Mapped[Optional[int]] = mapped_column(Integer)
+
+    group: Mapped[Optional['Group']] = relationship('Group', back_populates='users')
+    """,
+    )
+
+
 def test_table_kwargs(generator: CodeGenerator) -> None:
     Table(
         "simple_items",