From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 23 Jun 2011 16:57:02 +0000 (-0400)
Subject: - rename EagerLoader to JoinedLoader
X-Git-Tag: rel_0_7_2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=508171762037f5cbfeb08fc7ee97027b1c6fba03;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- rename EagerLoader to JoinedLoader
---

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e3a6b5ed68..221e9730ed 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -906,14 +906,14 @@ class SubqueryLoader(AbstractRelationshipLoader):
 
 log.class_logger(SubqueryLoader)
 
-class EagerLoader(AbstractRelationshipLoader):
+class JoinedLoader(AbstractRelationshipLoader):
     """Provide loading behavior for a :class:`.RelationshipProperty`
     using joined eager loading.
     
     """
 
     def init(self):
-        super(EagerLoader, self).init()
+        super(JoinedLoader, self).init()
         self.join_depth = self.parent_property.join_depth
 
     def init_class_attribute(self, mapper):
@@ -1202,7 +1202,10 @@ class EagerLoader(AbstractRelationshipLoader):
                                             reduced_path,
                                             mapper, row, adapter)
 
-log.class_logger(EagerLoader)
+EagerLoader = JoinedLoader
+"""Deprecated, use JoinedLoader"""
+
+log.class_logger(JoinedLoader)
 
 class EagerLazyOption(StrategizedOption):
     def __init__(self, key, lazy=True, chained=False,
@@ -1219,7 +1222,7 @@ class EagerLazyOption(StrategizedOption):
 
 def factory(identifier):
     if identifier is False or identifier == 'joined':
-        return EagerLoader
+        return JoinedLoader
     elif identifier is None or identifier == 'noload':
         return NoLoader
     elif identifier is False or identifier == 'select':