From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 6 Nov 2014 22:15:30 +0000 (-0500)
Subject: Merge branch 'master' into ticket_3100
X-Git-Tag: rel_1_0_0b1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=590498bf844e7dcdcf41d3ac786b4cccbebd2d43;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into ticket_3100
---

590498bf844e7dcdcf41d3ac786b4cccbebd2d43
diff --cc lib/sqlalchemy/orm/persistence.py
index 1288c910f9,28254cc103..c4a9402fbc
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@@ -15,10 -15,10 +15,10 @@@ in unitofwork.py
  """
  
  import operator
 -from itertools import groupby
 +from itertools import groupby, chain
  from .. import sql, util, exc as sa_exc, schema
  from . import attributes, sync, exc as orm_exc, evaluator
- from .base import state_str, _attr_as_key
+ from .base import state_str, _attr_as_key, _entity_descriptor
  from ..sql import expression
  from . import loading
  
@@@ -560,12 -441,12 +560,12 @@@ def _collect_delete_commands(base_mappe
                      state, state_dict, col)
              if value is None:
                  raise orm_exc.FlushError(
-                     "Can't delete from table "
+                     "Can't delete from table %s "
                      "using NULL for primary "
-                     "key value")
+                     "key value on column %s" % (table, col))
  
          if update_version_id is not None and \
 -                table.c.contains_column(mapper.version_id_col):
 +                mapper.version_id_col in mapper._cols_by_table[table]:
              params[mapper.version_id_col.key] = update_version_id
          yield params, connection