From 20ae8c7726297f1bf105b6df18d9bec0cb961acf Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Tue, 6 Oct 2020 20:19:49 +0200 Subject: [PATCH] Address minor comments from previous changes Change how pypy is detected. From I0952e54ed9af2952ea340be1945311376ffc1ad2 Fix typos. From Ibb5871a457c0555f82b37e354e7787d15575f1f7 Change-Id: I9657e602267590f10a74df27a84e4292da94c30a --- doc/build/changelog/unreleased_14/5576.rst | 2 +- lib/sqlalchemy/sql/selectable.py | 2 +- lib/sqlalchemy/util/compat.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/build/changelog/unreleased_14/5576.rst b/doc/build/changelog/unreleased_14/5576.rst index 6a0e2aedb2..a4d56bdeff 100644 --- a/doc/build/changelog/unreleased_14/5576.rst +++ b/doc/build/changelog/unreleased_14/5576.rst @@ -2,6 +2,6 @@ :tags: usecase, sql :tickets: 5576 - Add support to ``FETCH {FIRST | NEXT} [ count ] + Add support to ``FETCH {FIRST | NEXT} [ count ] {ROW | ROWS} {ONLY | WITH TIES}`` in the select for the supported backends, currently PostgreSQL, Oracle and MSSQL. diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 9a41d18e4d..951f50ae1b 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -3044,7 +3044,7 @@ class GenerativeSelect(DeprecatedSelectBaseGenerations, SelectBase): This is a numeric value which usually renders as ``FETCH {FIRST | NEXT} [ count ] {ROW | ROWS} {ONLY | WITH TIES}`` expression in the resulting select. This functionality is - is currently implemented for Oracle, PostgreSQL, MSSSQL. + is currently implemented for Oracle, PostgreSQL, MSSQL. Use :meth:`_sql.GenerativeSelect.offset` to specify the offset. diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index d4da216644..d3fefa5265 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -20,7 +20,7 @@ py37 = sys.version_info >= (3, 7) py36 = sys.version_info >= (3, 6) py3k = sys.version_info >= (3, 0) py2k = sys.version_info < (3, 0) -pypy = hasattr(sys, "pypy_version_info") +pypy = platform.python_implementation() == "PyPy" cpython = platform.python_implementation() == "CPython" -- 2.47.3