- The official name for the relation() function is now

relationship(), to eliminate confusion over the relational
algebra term.  relation() however will remain available
in equal capacity for the foreseeable future.  [ticket:1740]

7 files changed, 16 insertions, 16 deletions

diff --git a/test/perf/cascade_speed.py b/test/perf/cascade_speed.py
index dbf41a7f7..a8beab2b2 100644
--- a/test/perf/cascade_speed.py
+++ b/test/perf/cascade_speed.py
@@ -30,13 +30,13 @@ class Value(object): pass
 
 valueMapper = mapper(Value, values)
 attrMapper = mapper(Attribute, attributes, properties=dict(
-    values=relation(valueMapper, cascade="save-update", backref="attribute")
+    values=relationship(valueMapper, cascade="save-update", backref="attribute")
 ))
 itemMapper = mapper(Item, items, properties=dict(
-    attributes=relation(attrMapper, cascade="save-update", backref="item")
+    attributes=relationship(attrMapper, cascade="save-update", backref="item")
 ))
 orderMapper = mapper(Order, orders, properties=dict(
-    items=relation(itemMapper, cascade="save-update", backref="order")
+    items=relationship(itemMapper, cascade="save-update", backref="order")
 ))
 
 
diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index 83140643c..3d251c816 100644
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -17,7 +17,7 @@ subitems = Table('subitems', meta,
 
 class Item(object):pass
 class SubItem(object):pass
-mapper(Item, items, properties={'subs':relation(SubItem, lazy=False)})
+mapper(Item, items, properties={'subs':relationship(SubItem, lazy=False)})
 mapper(SubItem, subitems)
 
 def load():
diff --git a/test/perf/massload2.py b/test/perf/massload2.py
index a3deb932f..9182f1cd6 100644
--- a/test/perf/massload2.py
+++ b/test/perf/massload2.py
@@ -38,13 +38,13 @@ cascade = "all, delete-orphan"
 use_backref = True
 
 if use_backref:
-    class_mapper(T1).add_property( 't2s', relation(T2, backref=backref("t1", cascade=cascade), cascade=cascade))
-    class_mapper(T2).add_property ( 't3s', relation(T3, backref=backref("t2",cascade=cascade), cascade=cascade) )
-    class_mapper(T3).add_property( 't4s', relation(T4, backref=backref("t3", cascade=cascade), cascade=cascade) )
+    class_mapper(T1).add_property( 't2s', relationship(T2, backref=backref("t1", cascade=cascade), cascade=cascade))
+    class_mapper(T2).add_property ( 't3s', relationship(T3, backref=backref("t2",cascade=cascade), cascade=cascade) )
+    class_mapper(T3).add_property( 't4s', relationship(T4, backref=backref("t3", cascade=cascade), cascade=cascade) )
 else:
-    T1.mapper.add_property( 't2s', relation(T2, cascade=cascade))
-    T2.mapper.add_property ( 't3s', relation(T3, cascade=cascade) )
-    T3.mapper.add_property( 't4s', relation(T4, cascade=cascade) )
+    T1.mapper.add_property( 't2s', relationship(T2, cascade=cascade))
+    T2.mapper.add_property ( 't3s', relationship(T3, cascade=cascade) )
+    T3.mapper.add_property( 't4s', relationship(T4, cascade=cascade) )
 
 now = time.time()
 print "start"
diff --git a/test/perf/objupdatespeed.py b/test/perf/objupdatespeed.py
index 52224211a..f98873afd 100644
--- a/test/perf/objupdatespeed.py
+++ b/test/perf/objupdatespeed.py
@@ -27,7 +27,7 @@ class Email(object):
                                   getattr(self, 'address', None))
 
 mapper(Person, Person_table, properties={
-    'emails': relation(Email, backref='owner', lazy=False)
+    'emails': relationship(Email, backref='owner', lazy=False)
     })
 mapper(Email, Email_table)
 compile_mappers()
diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index f9f9dee8b..fc3e2e206 100644
--- a/test/perf/ormsession.py
+++ b/test/perf/ormsession.py
@@ -61,14 +61,14 @@ def define_tables():
 @profiled('mapper')
 def setup_mappers():
     mapper(Item, items, properties={
-            'subitems': relation(SubItem, backref='item', lazy=True)
+            'subitems': relationship(SubItem, backref='item', lazy=True)
             })
     mapper(SubItem, subitems)
     mapper(Customer, customers, properties={
-            'purchases': relation(Purchase, lazy=True, backref='customer')
+            'purchases': relationship(Purchase, lazy=True, backref='customer')
             })
     mapper(Purchase, purchases, properties={
-            'items': relation(Item, lazy=True, secondary=purchaseitems)
+            'items': relationship(Item, lazy=True, secondary=purchaseitems)
             })
 
 @profiled('inserts')
diff --git a/test/perf/sessions.py b/test/perf/sessions.py
index 0d4cc1f01..4210732d6 100644
--- a/test/perf/sessions.py
+++ b/test/perf/sessions.py
@@ -42,7 +42,7 @@ class SessionTest(TestBase, AssertsExecutionResults):
             pass
 
         mapper(T1, t1, properties={
-            't2s':relation(T2, backref='t1')
+            't2s':relationship(T2, backref='t1')
         })
         mapper(T2, t2)
     
diff --git a/test/perf/threaded_compile.py b/test/perf/threaded_compile.py
index e0252403a..0facf0ec2 100644
--- a/test/perf/threaded_compile.py
+++ b/test/perf/threaded_compile.py
@@ -62,7 +62,7 @@ def run3():
         foo()
         time.sleep(.05)
 
-mapper(T1, t1, properties={'t2':relation(T2, backref="t1")})
+mapper(T1, t1, properties={'t2':relationship(T2, backref="t1")})
 mapper(T2, t2)
 print "START"
 for j in range(0, 5):