From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 12 Dec 2013 18:36:25 +0000 (-0500)
Subject: make the error message for [ticket:2889] more accurate, as we support
X-Git-Tag: rel_0_8_5~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c41c2cdc61bcc1b1f7e3cb03c85eb3cbc9b2cea;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

make the error message for [ticket:2889] more accurate, as we support
composites to many-to-ones now also
---

diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index ea38182fb0..2d901e8b14 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)
diff --git a/test/orm/test_composites.py b/test/orm/test_composites.py
index 5c9dbbd175..295e629023 100644
--- a/test/orm/test_composites.py
+++ b/test/orm/test_composites.py
@@ -724,7 +724,7 @@ class ConfigurationTest(fixtures.MappedTest):
             # note that we also are checking that the tuple
             # renders here, so the "%" operator in the string needs to
             # apply the tuple also
-            r"Composite expects Column or Column-bound "
+            r"Composite expects Column objects or mapped "
             "attributes/attribute names as "
             "arguments, got: \(Column",
             configure_mappers