- Removed unused `load()` method from ShardedQuery.

[ticket:1606]

diff --git a/CHANGES b/CHANGES
index c7738ec42144c3a7672e6fc5d675faa3ed7138ce..00bf8913477a62f83151182654e47ce1ca3ea077 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -83,6 +83,9 @@ CHANGES
       Comparing equivalence of columns in the ORM is best 
       accomplished using col1.shares_lineage(col2).
       [ticket:1491]
+    
+    - Removed unused `load()` method from ShardedQuery.
+      [ticket:1606]
       
 0.5.6
 =====

diff --git a/lib/sqlalchemy/orm/shard.py b/lib/sqlalchemy/orm/shard.py
index b59d284c2b67cd04128c173b21963d4577835ff2..b6026bbc354bc686739b199539ae5b02b8bfe2ba 100644 (file)
--- a/lib/sqlalchemy/orm/shard.py
+++ b/lib/sqlalchemy/orm/shard.py
@@ -115,13 +115,3 @@ class ShardedQuery(Query):
             else:
                 return None
     
-    def load(self, ident, **kwargs):
-        if self._shard_id is not None:
-            return super(ShardedQuery, self).load(ident)
-        else:
-            for shard_id in self.id_chooser(self, ident):
-                o = self.set_shard(shard_id).load(ident, raiseerr=False, **kwargs)
-                if o is not None:
-                    return o
-            else:
-                raise sa_exc.InvalidRequestError("No instance found for identity %s" % repr(ident))