summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/strategies.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-04-10 17:52:47 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-04-10 17:52:47 +0000
commit1ff644d2f16a7517df7f175e1291ddaa501646dd (patch)
treea8f6e624e1500f3b77e43a22eaeb0e7b8ff20100 /lib/sqlalchemy/orm/strategies.py
parentfe591913030a244a9ccfdd47b371609f1f1b44af (diff)
parenta9b068ae564e5e775e312373088545b75aeaa1b0 (diff)
downloadsqlalchemy-1ff644d2f16a7517df7f175e1291ddaa501646dd.tar.gz
Merge "Remove code deprecated before version 1.1"
Diffstat (limited to 'lib/sqlalchemy/orm/strategies.py')
-rw-r--r--lib/sqlalchemy/orm/strategies.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 696741216..bb08d31ea 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -1228,9 +1228,6 @@ class SubqueryLoader(PostLoader):
q._distinct = True
break
- if q._order_by is False:
- q._order_by = leftmost_mapper.order_by
-
# don't need ORDER BY if no limit/offset
if q._limit is None and q._offset is None:
q._order_by = None