summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Trier <mtrier@gmail.com>2009-04-18 01:21:38 +0000
committerMichael Trier <mtrier@gmail.com>2009-04-18 01:21:38 +0000
commit33b3360e68a1f5395d09858001fdd4295461663b (patch)
tree99b153b6f7ef64365cc79953929c3a6b7ed7703e /lib
parenta7e0fdd5fcd62ebb299364f845e496b61ead55a8 (diff)
downloadsqlalchemy-33b3360e68a1f5395d09858001fdd4295461663b.tar.gz
Removed allow_column_override documentation. Fixes #1381.
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/__init__.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 7e64bda7a..7b840a50d 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