From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 5 Aug 2007 17:58:57 +0000 (+0000)
Subject: - fixed small exception throw bug in Session.merge()
X-Git-Tag: rel_0_3_11~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758c833facd7f485c1ab4b0d751282be53d5c6cb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

diff --git a/CHANGES b/CHANGES
index 43b8213dba..3e4d174a6e 100644
--- 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 4e7453d84e..ead8d2cf1d 100644
--- 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