summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-04-15 08:28:34 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-04-15 08:28:34 -0400
commit60e625212fe55869d2915bbf41a369eedae8b846 (patch)
tree2682bcebf417531f53026d31ac37bbd2d849343e /lib/sqlalchemy
parentea225c63f98dc3c250cee1b243762970b8e0932a (diff)
downloadsqlalchemy-60e625212fe55869d2915bbf41a369eedae8b846.tar.gz
test fixes from non-gerrit builds
- Fix savepoint test in test_memusage which hasn't been running, jenkins now has this enabled for more backends - fix SQL Server failure in test_assorted_eager - don't mention "from_self()" in the error message for Query Fixes: #6277 Change-Id: I0b351032604bd19604143f86f5f055eefd4d0c23
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/query.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 9348d7d48..7436696a8 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -306,9 +306,7 @@ class Query(
if self._limit_clause is not None or self._offset_clause is not None:
raise sa_exc.InvalidRequestError(
"Query.%s() being called on a Query which already has LIMIT "
- "or OFFSET applied. To modify the row-limited results of a "
- " Query, call from_self() first. "
- "Otherwise, call %s() before limit() or offset() "
+ "or OFFSET applied. Call %s() before limit() or offset() "
"are applied." % (meth, meth)
)