summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-12-12 13:36:25 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-12-12 13:36:25 -0500
commit9c41c2cdc61bcc1b1f7e3cb03c85eb3cbc9b2cea (patch)
treeb37cc70edd167c8afee4ea3b5eca36db1d32c3df /lib/sqlalchemy
parent730f585dc6878f4ab5575f847bac0d29f02686f2 (diff)
downloadsqlalchemy-9c41c2cdc61bcc1b1f7e3cb03c85eb3cbc9b2cea.tar.gz
make the error message for [ticket:2889] more accurate, as we support
composites to many-to-ones now also
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/descriptor_props.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index ea38182fb..2d901e8b1 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -192,7 +192,7 @@ class CompositeProperty(DescriptorProperty):
prop = attr.property
else:
raise sa_exc.ArgumentError(
- "Composite expects Column or Column-bound "
+ "Composite expects Column objects or mapped "
"attributes/attribute names as arguments, got: %r"
% (attr,))
props.append(prop)