61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
|
From 6b5d94da84452b125f6788f0e1472b94a43ffc16 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nils Philippsen <nils@tiptoe.de>
|
||
|
|
Date: Sat, 2 Nov 2019 17:36:50 -0400
|
||
|
|
Subject: [PATCH] Expect ordering NULLs to work and skip nested aggregate tests
|
||
|
|
on sqlite >= 3.30.
|
||
|
|
|
||
|
|
Fixed test failures which would occur with newer SQLite as of version 3.30
|
||
|
|
or greater, due to their addition of nulls ordering syntax as well as new
|
||
|
|
restrictions on aggregate functions. Pull request courtesy Nils Philippsen.
|
||
|
|
|
||
|
|
Fixes: #4920
|
||
|
|
Closes: #4921
|
||
|
|
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/4921
|
||
|
|
Pull-request-sha: e18534a9045786efdaf4963515222838c62e0300
|
||
|
|
|
||
|
|
Change-Id: Idb2fc96e23e7cc96cf96f586208c2db561518202
|
||
|
|
---
|
||
|
|
doc/build/changelog/unreleased_13/4920.rst | 9 +++++++++
|
||
|
|
test/requirements.py | 5 +++--
|
||
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
||
|
|
create mode 100644 doc/build/changelog/unreleased_13/4920.rst
|
||
|
|
|
||
|
|
diff --git a/doc/build/changelog/unreleased_13/4920.rst b/doc/build/changelog/unreleased_13/4920.rst
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000000..aabcc570b1
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/doc/build/changelog/unreleased_13/4920.rst
|
||
|
|
@@ -0,0 +1,9 @@
|
||
|
|
+.. change::
|
||
|
|
+ :tags: bug, tests
|
||
|
|
+ :tickets: 4920
|
||
|
|
+
|
||
|
|
+ Fixed test failures which would occur with newer SQLite as of version 3.30
|
||
|
|
+ or greater, due to their addition of nulls ordering syntax as well as new
|
||
|
|
+ restrictions on aggregate functions. Pull request courtesy Nils Philippsen.
|
||
|
|
+
|
||
|
|
+
|
||
|
|
diff --git a/test/requirements.py b/test/requirements.py
|
||
|
|
index bd6fc8133d..42a24c3a97 100644
|
||
|
|
--- a/test/requirements.py
|
||
|
|
+++ b/test/requirements.py
|
||
|
|
@@ -774,7 +774,8 @@ def dbapi_lastrowid(self):
|
||
|
|
@property
|
||
|
|
def nullsordering(self):
|
||
|
|
"""Target backends that support nulls ordering."""
|
||
|
|
- return fails_on_everything_except('postgresql', 'oracle', 'firebird')
|
||
|
|
+ return fails_on_everything_except("postgresql", "oracle", "firebird",
|
||
|
|
+ "sqlite >= 3.30.0")
|
||
|
|
|
||
|
|
@property
|
||
|
|
def reflects_pk_names(self):
|
||
|
|
@@ -789,7 +790,7 @@ def nested_aggregates(self):
|
||
|
|
"""target database can select an aggregate from a subquery that's
|
||
|
|
also using an aggregate"""
|
||
|
|
|
||
|
|
- return skip_if(["mssql"])
|
||
|
|
+ return skip_if(["mssql", "sqlite"])
|
||
|
|
|
||
|
|
@property
|
||
|
|
def array_type(self):
|