From: Michael Trier <mtrier@gmail.com>
Date: Sat, 18 Apr 2009 01:21:38 +0000 (+0000)
Subject: Removed allow_column_override documentation. Fixes #1381.
X-Git-Tag: rel_0_5_4~21
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=33b3360e68a1f5395d09858001fdd4295461663b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Removed allow_column_override documentation. Fixes #1381.
---

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 7e64bda7ab..7b840a50da 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -614,11 +614,6 @@ def mapper(class_, local_table=None, *args, **params):
         alternative, see the method `populate_existing()` on
         :class:`~sqlalchemy.orm.query.Query`.
 
-      allow_column_override
-        If True, allows the usage of a ``relation()`` which has the
-        same name as a column in the mapped table.  The table column
-        will no longer be mapped.
-
       allow_null_pks
         Indicates that composite primary keys where one or more (but not all)
         columns contain NULL is a valid primary key.  Primary keys which