PublicArchive/sqlalchemy
2
0
Fork 0
mirror of https://github.com/sqlalchemy/sqlalchemy.git synced 2026-06-02 13:59:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ticket_3100

Browse Source 
Conflicts:
	lib/sqlalchemy/orm/persistence.py
This commit is contained in:
Mike Bayer
2014-11-06 17:43:01 -05:00
parent 0c19d765dc 9b1777288b
commit 68f1bcc9da
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sqlalchemy/orm/persistence.py
+4 -4
View File
@@ -494,12 +494,12 @@ def _collect_update_commands(
params[col.key] = history.added[0]
else:
pk_params[col._label] = history.unchanged[0]
if pk_params[col._label] is None:
raise orm_exc.FlushError(
"Can't update table %s using NULL for primary "
"key value on column %s" % (table, col))
if params or value_params:
if None in pk_params.values():
raise orm_exc.FlushError(
"Can't update table using NULL for primary "
"key value")
params.update(pk_params)
yield (
state, state_dict, params, mapper,
test/orm/test_unitofwork.py
+4 -2
View File
@@ -2479,7 +2479,8 @@ class PartialNullPKTest(fixtures.MappedTest):
t1.col2 = 5
assert_raises_message(
orm_exc.FlushError,
"Can't update table using NULL for primary key value",
"Can't update table t1 using NULL for primary "
"key value on column t1.col2",
s.commit
)
@@ -2492,7 +2493,8 @@ class PartialNullPKTest(fixtures.MappedTest):
t1.col3 = 'hi'
assert_raises_message(
orm_exc.FlushError,
"Can't update table using NULL for primary key value",
"Can't update table t1 using NULL for primary "
"key value on column t1.col2",
s.commit
)