- CHANGES update

- added slightly more preemptive message for bad remote_side

diff --git a/CHANGES b/CHANGES
index 2be11ad2e5d3ce37f5b06352627ae912f61b67ce..323698b8e97c17a0754d354ef79823168a0e6d31 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -227,7 +227,11 @@ CHANGES
       at the class level, e.g. MyClass.aproxy.  Previously this
       evaluated to None.
 
-
+- declarative
+    - The full list of arguments accepted as string by backref() 
+      includes 'primaryjoin', 'secondaryjoin', 'secondary', 
+      'foreign_keys', 'remote_side', 'order_by'.
+      
 0.5.0rc4
 ========
 - features

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 084a539d182aa76d63a0d9e6227bec7bb58c846f..5bd3c0842cef49a77a011a833e1db67528fd6755 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -788,6 +788,10 @@ class RelationProperty(StrategizedProperty):
                     ]
                 else:
                     self.local_remote_pairs = criterion_as_pairs(self.primaryjoin, consider_as_foreign_keys=self.remote_side, any_operator=True)
+
+                if not self.local_remote_pairs:
+                    raise sa_exc.ArgumentError("Relation %s could not determine any local/remote column pairs from remote side argument %r" % (self, self.remote_side))
+
             else:
                 if self.viewonly:
                     eq_pairs = self.synchronize_pairs