summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-06-23 12:57:02 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-06-23 12:57:02 -0400
commit508171762037f5cbfeb08fc7ee97027b1c6fba03 (patch)
treeadd7060c5727d69675f8faddfc3da0a677420650
parent8c4fc616115a4b47bbbfd8834fe758324cafe97f (diff)
downloadsqlalchemy-508171762037f5cbfeb08fc7ee97027b1c6fba03.tar.gz
- rename EagerLoader to JoinedLoader
-rw-r--r--lib/sqlalchemy/orm/strategies.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e3a6b5ed6..221e9730e 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':