summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--lib/sqlalchemy/orm/shard.py10
2 files changed, 3 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 9e09763d7..04d62f105 100644
--- a/CHANGES
+++ b/CHANGES
@@ -766,6 +766,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 b59d284c2..b6026bbc3 100644
--- 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))