diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-12 13:36:25 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-12 13:36:58 -0500 |
| commit | 752359936645a6308beb52e77dbdbfad9929a301 (patch) | |
| tree | cdda19d9b542073e5a5dbcd6b3f2f32a24ea28be | |
| parent | f244287f46476f3b111a2495ce4207530f4b51d8 (diff) | |
| download | sqlalchemy-752359936645a6308beb52e77dbdbfad9929a301.tar.gz | |
make the error message for [ticket:2889] more accurate, as we support
composites to many-to-ones now also
| -rw-r--r-- | lib/sqlalchemy/orm/descriptor_props.py | 2 | ||||
| -rw-r--r-- | test/orm/test_composites.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index 231e531e4..8a95cbf94 100644 --- 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 8946b6908..f13720ef3 100644 --- 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 |