From: Nils Philippsen <nils@tiptoe.de>
Date: Sat, 2 Nov 2019 21:36:50 +0000 (-0400)
Subject: Expect ordering NULLs to work and skip nested aggregate tests on sqlite >= 3.30.
X-Git-Tag: rel_1_3_11~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8654e96df8dc435bb775763cfb6bffe0d21d95cd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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
(cherry picked from commit 6b5d94da84452b125f6788f0e1472b94a43ffc16)
---

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 a7b906add5..ca0432ecdf 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -760,7 +760,8 @@ class DefaultRequirements(SuiteRequirements):
     @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):
@@ -775,7 +776,7 @@ class DefaultRequirements(SuiteRequirements):
         """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):