From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 20 Jan 2007 20:40:39 +0000 (+0000)
Subject: - added "validate=False" argument to assign_mapper, if True will insure that only... 
X-Git-Tag: rel_0_3_4~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7838cb175913cc19ad3701a9de16ab16cdf0809f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- added "validate=False" argument to assign_mapper, if True will insure that only mapped
attributes are named [ticket:426]
---

diff --git a/CHANGES b/CHANGES
index 67b0e4f181..d4be09ac06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -79,7 +79,9 @@ with new instance
   [ticket:413]
   - added an error message if you actually try to modify primary key values on an entity
   and then flush it [ticket:412]
-
+- extensions
+  - added "validate=False" argument to assign_mapper, if True will insure that only mapped
+  attributes are named [ticket:426]
 0.3.3
 - string-based FROM clauses fixed, i.e. select(..., from_obj=["sometext"])
 - fixes to passive_deletes flag, lazy=None (noload) flag
diff --git a/lib/sqlalchemy/ext/assignmapper.py b/lib/sqlalchemy/ext/assignmapper.py
index 8c78e70242..dddb25bdca 100644
--- a/lib/sqlalchemy/ext/assignmapper.py
+++ b/lib/sqlalchemy/ext/assignmapper.py
@@ -1,4 +1,4 @@
-from sqlalchemy import mapper, util, Query
+from sqlalchemy import mapper, util, Query, exceptions
 import types
 
 def monkeypatch_query_method(ctx, class_, name):
@@ -17,9 +17,13 @@ def monkeypatch_objectstore_method(ctx, class_, name):
     setattr(class_, name, do)
     
 def assign_mapper(ctx, class_, *args, **kwargs):
+    validate = kwargs.pop('validate', False)
     if not isinstance(getattr(class_, '__init__'), types.MethodType):
         def __init__(self, **kwargs):
              for key, value in kwargs.items():
+                 if validate:
+                     if not key in self.mapper.props:
+                         raise exceptions.ArgumentError("Invalid __init__ argument: '%s'" % key)
                  setattr(self, key, value)
         class_.__init__ = __init__
     extension = kwargs.pop('extension', None)