From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 20 Aug 2014 18:25:20 +0000 (-0400)
Subject: Merge branch 'master' into ticket_3100
X-Git-Tag: rel_1_0_0b1~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a29cb4432e9f1ea363a0cf834e706edbe6f4e6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into ticket_3100
---

22a29cb4432e9f1ea363a0cf834e706edbe6f4e6
diff --cc lib/sqlalchemy/orm/persistence.py
index a4e14d92d3,511a9cef0f..c2750eeb32
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@@ -337,10 -249,19 +331,19 @@@ def _organize_states_for_delete(base_ma
  
          mapper.dispatch.before_delete(mapper, connection, state)
  
-         yield state, dict_, mapper, bool(state.key), connection
+         if mapper.version_id_col is not None:
+             update_version_id = \
+                 mapper._get_committed_state_attr_by_column(
+                     state, dict_,
+                     mapper.version_id_col)
+         else:
+             update_version_id = None
+ 
+         yield (
+             state, dict_, mapper, connection, update_version_id)
  
  
 -def _collect_insert_commands(table, states_to_insert):
 +def _collect_insert_commands(table, states_to_insert, bulk=False):
      """Identify sets of values to use in INSERT statements for a
      list of states.