add parameter usePredicateIndex to getRelations()

relation/registry.py

@@ -227,7 +227,8 @@ class IndexableRelationAdapter(object):
 
 # convenience functions:
 
-def getRelations(first=None, second=None, third=None, relationships=None):
+def getRelations(first=None, second=None, third=None, relationships=None,
+                 usePredicateIndex=False):
     """ Return a sequence of relations matching the query specified by the
         parameters.
 
@@ -241,19 +242,21 @@ def getRelations(first=None, second=None, third=None, relationships=None):
     if third is not None: query['third'] = third
     if not relationships:
         return registry.query(**query)
-    else:
+    if len(relationships) == 1 and usePredicateIndex:
-        predicates = []
+        query['relationship'] = relationships[0]
-        for r in relationships:
+        return registry.query(**query)
-            if hasattr(r, 'predicate'):
+    predicates = []
-                predicates.append(r.predicate)
+    for r in relationships:
-                r.predicate = None
+        if hasattr(r, 'predicate'):
-            else:
+            predicates.append(r.predicate)
-                predicates.append(r.getPredicateName())
+            r.predicate = None
-        result = registry.query(**query)
+        else:
-        if predicates:
+            predicates.append(r.getPredicateName())
-            return [r for r in result 
+    result = registry.query(**query)
-                        if r.ident in predicates or r.fallback in predicates]
+    if predicates:
-        return result
+        return [r for r in result 
+                    if r.ident in predicates or r.fallback in predicates]
+    return result
 
 
 def getRelationSingle(obj=None, relationship=None, forSecond=True):