From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 14 Jul 2008 19:52:59 +0000 (+0000)
Subject: - Removed erroneous 'self' reference when raising
X-Git-Tag: rel_0_4_7~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89a67563ea7009447d875071c7e06a96d42b16ad;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Removed erroneous 'self' reference when raising
UnmappedColumnError during flush() operation.
---

diff --git a/CHANGES b/CHANGES
index 173c712609..603aa57823 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,9 @@ CHANGES
       flag is always True with a "transactional" 
       (in 0.5 a non-"autocommit") Session.
 
+    - Removed erroneous 'self' reference when raising
+      UnmappedColumnError during flush() operation.
+
 - schema
     - create_all(), drop_all(), create(), drop() all raise
       an error if the table name or schema name contains
diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py
index 39a7b5044c..da4585540f 100644
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -24,7 +24,7 @@ def populate(source, source_mapper, dest, dest_mapper, synchronize_pairs):
         try:
             dest_mapper._set_state_attr_by_column(dest, r, value)
         except exceptions.UnmappedColumnError:
-            self._raise_col_to_prop(True, source_mapper, l, dest_mapper, r)
+            _raise_col_to_prop(True, source_mapper, l, dest_mapper, r)
 
 def clear(dest, dest_mapper, synchronize_pairs):
     for l, r in synchronize_pairs:
@@ -41,7 +41,7 @@ def update(source, source_mapper, dest, old_prefix, synchronize_pairs):
             oldvalue = source_mapper._get_committed_attr_by_column(source.obj(), l)
             value = source_mapper._get_state_attr_by_column(source, l)
         except exceptions.UnmappedColumnError:
-            self._raise_col_to_prop(False, source_mapper, l, None, r)
+            _raise_col_to_prop(False, source_mapper, l, None, r)
         dest[r.key] = value
         dest[old_prefix + r.key] = oldvalue