- 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, 9 insertions, 9 deletions

diff --git a/examples/elementtree/adjacency_list.py b/examples/elementtree/adjacency_list.py
index b16dd780e..ad0f3f607 100644
--- a/examples/elementtree/adjacency_list.py
+++ b/examples/elementtree/adjacency_list.py
@@ -9,7 +9,7 @@ styles of persistence are identical, as is the structure of the main Document cl
 ################################# PART I - Imports/Coniguration ####################################
 from sqlalchemy import (MetaData, Table, Column, Integer, String, ForeignKey,
     Unicode, and_)
-from sqlalchemy.orm import mapper, relation, create_session, lazyload
+from sqlalchemy.orm import mapper, relationship, create_session, lazyload
 
 import sys, os, StringIO, re
 
@@ -79,13 +79,13 @@ class _Attribute(object):
 
 # setup mappers.  Document will eagerly load a list of _Node objects.
 mapper(Document, documents, properties={
-    '_root':relation(_Node, lazy=False, cascade="all")
+    '_root':relationship(_Node, lazy=False, cascade="all")
 })
 
 mapper(_Node, elements, properties={
-    'children':relation(_Node, cascade="all"),
+    'children':relationship(_Node, cascade="all"),
     # eagerly load attributes
-    'attributes':relation(_Attribute, lazy=False, cascade="all, delete-orphan"),
+    'attributes':relationship(_Attribute, lazy=False, cascade="all, delete-orphan"),
 })
 
 mapper(_Attribute, attributes)
diff --git a/examples/elementtree/optimized_al.py b/examples/elementtree/optimized_al.py
index dcc3c00ba..9cd2acc30 100644
--- a/examples/elementtree/optimized_al.py
+++ b/examples/elementtree/optimized_al.py
@@ -8,7 +8,7 @@ which joins on only three tables.
 ################################# PART I - Imports/Configuration ###########################################
 from sqlalchemy import (MetaData, Table, Column, Integer, String, ForeignKey,
     Unicode, and_)
-from sqlalchemy.orm import mapper, relation, create_session, lazyload
+from sqlalchemy.orm import mapper, relationship, create_session, lazyload
 
 import sys, os, StringIO, re
 
@@ -80,16 +80,16 @@ class _Attribute(object):
 # they will be ordered in primary key/insert order, so that we can reconstruct
 # an ElementTree structure from the list.
 mapper(Document, documents, properties={
-    '_nodes':relation(_Node, lazy=False, cascade="all, delete-orphan")
+    '_nodes':relationship(_Node, lazy=False, cascade="all, delete-orphan")
 })
 
 # the _Node objects change the way they load so that a list of _Nodes will organize
 # themselves hierarchically using the ElementTreeMarshal.  this depends on the ordering of
-# nodes being hierarchical as well; relation() always applies at least ROWID/primary key
+# nodes being hierarchical as well; relationship() always applies at least ROWID/primary key
 # ordering to rows which will suffice.
 mapper(_Node, elements, properties={
-    'children':relation(_Node, lazy=None),  # doesnt load; used only for the save relationship
-    'attributes':relation(_Attribute, lazy=False, cascade="all, delete-orphan"), # eagerly load attributes
+    'children':relationship(_Node, lazy=None),  # doesnt load; used only for the save relationship
+    'attributes':relationship(_Attribute, lazy=False, cascade="all, delete-orphan"), # eagerly load attributes
 })
 
 mapper(_Attribute, attributes)