From b9fe0554f4cfacaeed241949e30e963f4afb1669 Mon Sep 17 00:00:00 2001
From: aplatkouski <5857672+aplatkouski@users.noreply.github.com>
Date: Sun, 7 Jun 2020 16:05:05 +0300
Subject: [PATCH] Fix broken example with @declared_attr.cascading

Signed-off-by: aplatkouski <5857672+aplatkouski@users.noreply.github.com>
---
 doc/build/changelog/migration_10.rst  | 2 +-
 lib/sqlalchemy/ext/declarative/api.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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)
 
-- 
2.47.3