summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-06-05 20:40:41 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-06-05 20:40:41 +0000
commit6e538cf64adfef7f604e3b0d976405a27b8e3d27 (patch)
treee147e056f50e353887429fa67fda79928e06c437 /lib/sqlalchemy/ext
parent1508aed47261fe17180aa12fb312aebb0dd3c615 (diff)
parent466ed5b53a3af83f337c93be95715e4b3ab1255e (diff)
downloadsqlalchemy-6e538cf64adfef7f604e3b0d976405a27b8e3d27.tar.gz
Merge "Generalize RETURNING and suppor for MariaDB / SQLite" into main
Diffstat (limited to 'lib/sqlalchemy/ext')
-rw-r--r--lib/sqlalchemy/ext/horizontal_shard.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/horizontal_shard.py b/lib/sqlalchemy/ext/horizontal_shard.py
index 5588fd587..7afe2343d 100644
--- a/lib/sqlalchemy/ext/horizontal_shard.py
+++ b/lib/sqlalchemy/ext/horizontal_shard.py
@@ -253,5 +253,4 @@ def execute_and_instances(orm_context):
for shard_id in session.execute_chooser(orm_context):
result_ = iter_for_shard(shard_id, load_options, update_options)
partial.append(result_)
-
return partial[0].merge(*partial[1:])