diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-05-13 11:25:51 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2018-05-13 11:25:51 -0400 |
| commit | b2c4333d5b158f73bb3afaf979e0e379f828b3b5 (patch) | |
| tree | 793afe5745eb79f7c45c1f38d4d2747f4afd7194 /lib/sqlalchemy/ext | |
| parent | 97e828fa9b2faa02121e967ce0556870d7901c7c (diff) | |
| parent | a7eaa6afc818e495987f6ecb39d122ff32430c03 (diff) | |
| download | sqlalchemy-b2c4333d5b158f73bb3afaf979e0e379f828b3b5.tar.gz | |
Merge "Use identity_token for refresh(), unexpire, undefer" into rel_1_2
Diffstat (limited to 'lib/sqlalchemy/ext')
| -rw-r--r-- | lib/sqlalchemy/ext/horizontal_shard.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/horizontal_shard.py b/lib/sqlalchemy/ext/horizontal_shard.py index 266bd784e..6516950ed 100644 --- a/lib/sqlalchemy/ext/horizontal_shard.py +++ b/lib/sqlalchemy/ext/horizontal_shard.py @@ -51,7 +51,9 @@ class ShardedQuery(Query): self._params) return self.instances(result, context) - if self._shard_id is not None: + if context.identity_token is not None: + return iter_for_shard(context.identity_token) + elif self._shard_id is not None: return iter_for_shard(self._shard_id) else: partial = [] |