- fixed small exception throw bug in Session.merge()

diff --git a/CHANGES b/CHANGES
index 43b8213dbae1524c815fbf8fbcffa43a1662a1f6..3e4d174a6ea757d706a0d5301be44c046543b5b3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
     - added a check for joining from A->B using join(), along two
       different m2m tables.  this raises an error in 0.3 but is 
       possible in 0.4 when aliases are used. [ticket:687]
+    - fixed small exception throw bug in Session.merge()
 - engine
     - fixed another occasional race condition which could occur
       when using pool with threadlocal setting

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 4e7453d84ed77eba61ce88d3947aa381317ecf3e..ead8d2cf1db79dd0ef9f51e008bc5aa5c55cc614 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -8,6 +8,7 @@ from sqlalchemy import util, exceptions, sql, engine
 from sqlalchemy.orm import unitofwork, query
 from sqlalchemy.orm.mapper import object_mapper as _object_mapper
 from sqlalchemy.orm.mapper import class_mapper as _class_mapper
+from sqlalchemy.orm import util as mapperutil
 import weakref
 import sqlalchemy