]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Check for column object in eval_none, not propkey
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 18 Jul 2017 15:41:12 +0000 (11:41 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 18 Jul 2017 19:04:55 +0000 (15:04 -0400)
commitdb3c58f9ee937754ccc52df531d8506dfaa7fa2b
tree3c311e26764dacd2e8f3993e28f1f1dfb120adee
parentd7dd0e1e02b460b92a86db03be8a3ce5511c8880
Check for column object in eval_none, not propkey

Fixed bug involving JSON NULL evaluation logic added in 1.1 as part
of :ticket:`3514` where the logic would not accommodate ORM
mapped attributes named differently from the :class:`.Column`
that was mapped.

Change-Id: I1848afcfb63ad7f074f315d8d3097666069b42be
Fixes: #4031
(cherry picked from commit e2ede596adff3ce584f8c43ba024cafabc509a06)
doc/build/changelog/changelog_11.rst
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/persistence.py
test/orm/test_unitofworkv2.py