summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-01-21 00:09:25 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-01-21 00:09:25 +0000
commit99924c8645be5cdaef35c26fabafb6605ca4482b (patch)
tree84fba64d4c366ef0310fe729ddaa9f256ef02dd6 /lib/sqlalchemy/orm
parentc95faa5e8d171160e0786c7e5b8064eb4fd524bb (diff)
downloadsqlalchemy-99924c8645be5cdaef35c26fabafb6605ca4482b.tar.gz
docs: [ticket:345], [ticket:356], [ticket:48], [ticket:403], [ticket:394],
cleanup/completion of keyword arg documentation for create_engine(), mapper(), and relation()
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/mapper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 1974fdac7..c8c14873f 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -87,8 +87,8 @@ class Mapper(object):
order_by - a single Column or list of Columns for which selection operations should use as the default
ordering for entities. Defaults to the OID/ROWID of the table if any, or the first primary key column of the table.
- allow_column_override - if True, allows association relationships to be set up which override the usage of
- a column that is on the table (based on key/attribute name).
+ 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.
entity_name - a name to be associated with the class, to allow alternate mappings for a single class.