- 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]

2 files changed, 6 insertions, 6 deletions

diff --git a/examples/association/basic_association.py b/examples/association/basic_association.py
index a56d2383e..83f53e000 100644
--- a/examples/association/basic_association.py
+++ b/examples/association/basic_association.py
@@ -14,7 +14,7 @@ from datetime import datetime
 
 from sqlalchemy import (create_engine, MetaData, Table, Column, Integer,
     String, DateTime, Numeric, ForeignKey, and_)
-from sqlalchemy.orm import mapper, relation, create_session
+from sqlalchemy.orm import mapper, relationship, create_session
 
 # Uncomment these to watch database activity.
 #import logging
@@ -62,12 +62,12 @@ class OrderItem(object):
         self.price = price or item.price
         
 mapper(Order, orders, properties={
-    'order_items': relation(OrderItem, cascade="all, delete-orphan",
+    'order_items': relationship(OrderItem, cascade="all, delete-orphan",
                             backref='order')
 })
 mapper(Item, items)
 mapper(OrderItem, orderitems, properties={
-    'item': relation(Item, lazy=False)
+    'item': relationship(Item, lazy=False)
 })
 
 session = create_session()
diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py
index 3a78e3adf..68f8450a5 100644
--- a/examples/association/proxied_association.py
+++ b/examples/association/proxied_association.py
@@ -4,7 +4,7 @@ the usage of the associationproxy extension."""
 from datetime import datetime
 from sqlalchemy import (create_engine, MetaData, Table, Column, Integer,
     String, DateTime, Float, ForeignKey, and_)
-from sqlalchemy.orm import mapper, relation, create_session
+from sqlalchemy.orm import mapper, relationship, create_session
 from sqlalchemy.ext.associationproxy import AssociationProxy
 
 engine = create_engine('sqlite://')
@@ -48,11 +48,11 @@ class Item(object):
 
 
 mapper(Order, orders, properties={
-    'itemassociations':relation(OrderItem, cascade="all, delete-orphan", lazy=False)
+    'itemassociations':relationship(OrderItem, cascade="all, delete-orphan", lazy=False)
 })
 mapper(Item, items)
 mapper(OrderItem, orderitems, properties={
-    'item':relation(Item, lazy=False)
+    'item':relationship(Item, lazy=False)
 })
 
 session = create_session()