]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Move pk on single-inh subclass check below conflict resolution check
authorTom Manderson <me@trm.io>
Tue, 30 Oct 2018 17:05:43 +0000 (13:05 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 30 Oct 2018 17:31:53 +0000 (13:31 -0400)
commit6ec2246d04e3608a024b1425207c80c73fa78218
tree8fc4b962afaf82b63311206a49660ff9c64e3f07
parent7a1c19833eac79ada3ef624cae656f6f5a76cfdd
Move pk on single-inh subclass check below conflict resolution check

The column conflict resolution technique discussed at
:ref:`declarative_column_conflicts` is now functional for a :class:`.Column`
that is also a primary key column.  Previously, a check for primary key
columns declared on a single-inheritance subclass would occur before the
column copy were allowed to pass.

Fixes: #4352
Change-Id: Id4c025da53c28e58db6b549fe398f25f8a90d355
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/483
(cherry picked from commit 3ed79a5c18c14d842280805d1dae8a9c99ec8f18)
doc/build/changelog/unreleased_12/4352.rst [new file with mode: 0644]
doc/build/orm/extensions/declarative/inheritance.rst
lib/sqlalchemy/ext/declarative/base.py
test/ext/declarative/test_inheritance.py