From: aplatkouski <5857672+aplatkouski@users.noreply.github.com>
Date: Sun, 7 Jun 2020 13:05:05 +0000 (+0300)
Subject: Fix broken example with @declared_attr.cascading
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9fe0554f4cfacaeed241949e30e963f4afb1669;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix broken example with @declared_attr.cascading

Signed-off-by: aplatkouski <5857672+aplatkouski@users.noreply.github.com>
---

diff --git a/doc/build/changelog/migration_10.rst b/doc/build/changelog/migration_10.rst
index e31b621fe6..b784036c6f 100644
--- a/doc/build/changelog/migration_10.rst
+++ b/doc/build/changelog/migration_10.rst
@@ -167,7 +167,7 @@ applied::
         @declared_attr.cascading
         def id(cls):
             if has_inherited_table(cls):
-                return Column(ForeignKey('myclass.id'), primary_key=True)
+                return Column('some_id', ForeignKey('myclass.id'))
             else:
                 return Column(Integer, primary_key=True)
 
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index 65d100bc75..2d2155abc5 100644
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -229,8 +229,7 @@ class declared_attr(interfaces._MappedAttribute, property):
                 @declared_attr.cascading
                 def id(cls):
                     if has_inherited_table(cls):
-                        return Column(
-                            ForeignKey('myclass.id'), primary_key=True)
+                        return Column('some_id', ForeignKey('myclass.id'))
                     else:
                         return Column(Integer, primary_key=True)