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 ea38182fb059ee1b385da72006985011da25353c..2d901e8b1479e5b421610bcb33eb9613d1e00b40 100644 (file)
--- 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 5c9dbbd1756708ed3752121fe03c9ad69e9ab307..295e629023cd42a0774ba3453478cdc4e2473770 100644 (file)
--- 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