From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 22 Oct 2007 15:20:15 +0000 (+0000)
Subject: exception message, [ticket:826]
X-Git-Tag: rel_0_4_1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3af574650d19fb2b010ef5b42e0a3e68ed8cf61;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

exception message, [ticket:826]
---

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 8b92e8b4e6..9ef2ff8f78 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -662,7 +662,7 @@ class Mapper(object):
             return
 
         if not self.non_primary and (self.class_key in mapper_registry):
-             raise exceptions.ArgumentError("Class '%s' already has a primary mapper defined with entity name '%s'.  Use non_primary=True to create a non primary Mapper, or to create a new primary mapper, remove this mapper first via sqlalchemy.orm.clear_mapper(mapper), or preferably sqlalchemy.orm.clear_mappers() to clear all mappers." % (self.class_, self.entity_name))
+             raise exceptions.ArgumentError("Class '%s' already has a primary mapper defined with entity name '%s'.  Use non_primary=True to create a non primary Mapper.  clear_mappers() will remove *all* current mappers from all classes." % (self.class_, self.entity_name))
 
         def extra_init(class_, oldinit, instance, args, kwargs):
             self.compile()