(no commit message)

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index ead1821432b7652ecda564c9dc2506cd37ad63a2..7bdaf1e69fade9489eb354c799c78d06a51c3bd7 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -231,6 +231,8 @@ class PropHistory(object):
         self.added = None
         self.current = current
         self.deleted = None
+    def setattr_clean(self, value):
+        self.current = value
     def setattr(self, value):
         self.deleted = self.current
         self.current = None

diff --git a/test/mapper.py b/test/mapper.py
index 673884573b227cd2bc41b837071273596b83c9cc..555dc334c13169583f28cb19ace8bc11fe29efbf 100644 (file)
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -2,7 +2,8 @@ from testbase import PersistTest
 import unittest, sys, os
 from sqlalchemy.mapper import *
 
-ECHO = True
+#ECHO = True
+ECHO = False
 execfile("test/tables.py")
 
 class User(object):
@@ -392,7 +393,7 @@ class SaveTest(AssertMixin):
 
         m = mapper(Item, items, properties = dict(
                 keywords = relation(Keyword, keywords, itemkeywords, lazy = False),
-            ))
+            ), echo = True)
 
         keywordmapper = mapper(Keyword, keywords)