From 66f276709af22d5651753bade10d543893372704 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 18 Nov 2026 00:37:43 +0530 Subject: [PATCH 1/2] Rename a column named registry, like metadata already was --- CHANGES.rst | 3 +++ src/sqlacodegen/generators.py | 2 +- tests/test_generator_declarative.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 77d3f404..40e0b3cf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -16,6 +16,9 @@ Version history when the foreign key targets other columns (such as a ``UNIQUE`` constraint), which made mapper configuration fail with ``ArgumentError`` (`#484 `_; PR by @NixBiks) +- Fixed a column named ``registry`` being rendered as-is, which made SQLAlchemy warn + that the attribute should be left reserved for the declarative class registry; it is + now renamed to ``registry_`` the same way a ``metadata`` column already was **4.0.4** diff --git a/src/sqlacodegen/generators.py b/src/sqlacodegen/generators.py index d5bd042f..a9571572 100644 --- a/src/sqlacodegen/generators.py +++ b/src/sqlacodegen/generators.py @@ -846,7 +846,7 @@ def find_free_name( name = _re_invalid_identifier.sub("_", name) if name[0].isdigit(): name = "_" + name - elif iskeyword(name) or name == "metadata": + elif iskeyword(name) or name in ("metadata", "registry"): name += "_" original = name diff --git a/tests/test_generator_declarative.py b/tests/test_generator_declarative.py index 1c68eca3..a0a1d503 100644 --- a/tests/test_generator_declarative.py +++ b/tests/test_generator_declarative.py @@ -2129,6 +2129,35 @@ class Simple(Base): ) +def test_registry_column(generator: CodeGenerator) -> None: + Table( + "simple", + generator.metadata, + Column("id", INTEGER, primary_key=True), + Column("registry", VARCHAR), + ) + + validate_code( + generator.generate(), + """\ +from typing import Optional + +from sqlalchemy import Integer, String +from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column + +class Base(DeclarativeBase): + pass + + +class Simple(Base): + __tablename__ = 'simple' + + id: Mapped[int] = mapped_column(Integer, primary_key=True) + registry_: Mapped[Optional[str]] = mapped_column('registry', String) +""", + ) + + def test_metadata_column(generator: CodeGenerator) -> None: Table( "simple", From 63676c5bb75af943150066e7997d1ad54cc88914 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 18 Nov 2026 19:49:19 +0530 Subject: [PATCH 2/2] Require SQLAlchemy < 2.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1da5f146..009ba0d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - "SQLAlchemy >= 2.0.29", + "SQLAlchemy >= 2.0.29, < 2.1", "inflect >= 4.0.0", ] dynamic = ["version"]