From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 13 Jan 2006 01:12:48 +0000 (+0000)
Subject: checks for relations that override columns and raises an error if override_columns_ok... 
X-Git-Tag: rel_0_1_0~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5076c97d324238d7f816ae7ab141993dc09730;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

checks for relations that override columns and raises an error if override_columns_ok not set
---

diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py
index ff0f1fc878..d334094549 100644
--- a/lib/sqlalchemy/mapping/mapper.py
+++ b/lib/sqlalchemy/mapping/mapper.py
@@ -30,6 +30,7 @@ class Mapper(object):
                 inherit_condition = None, 
                 extension = None,
                 order_by = False,
+                allow_column_override = False,
                 **kwargs):
 
         self.copyargs = {
@@ -153,8 +154,10 @@ class Mapper(object):
             elif isinstance(prop, ColumnProperty):
                 prop.columns.append(column)
             else:
-                #print "WARNING: column %s not being added due to property %s" % (column.key, repr(prop))
-                continue
+                if not allow_column_override:
+                    raise ValueError("WARNING: column '%s' not being added due to property '%s'.  Specify 'allow_column_override=True' to mapper() to ignore this condition." % (column.key, repr(prop)))
+                else:
+                    continue
         
             # its a ColumnProperty - match the ultimate table columns
             # back to the property