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 231e531e43643e1e91346bc25820764d4575998c..8a95cbf94c68d0e6936b606bb1c88e5673ad024e 100644 (file)
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -247,7 +247,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 8946b6908d032fbd50517e8ccac263231f6d5b5c..f13720ef38d010138b5e2d0f4e852a8adc221d83 100644 (file)
--- a/test/orm/test_composites.py
+++ b/test/orm/test_composites.py
@@ -751,7 +751,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