Fix the windowB test module so that it works even if SQLite is built without

JSON support.

FossilOrigin-Name: 807975c76b36347f02aa0ce9661d608adbffe1f7e77c15f8da677e47e1187153

diff --git a/manifest b/manifest
index 100f9e321942a5caf0015a0b332b39de04b958a5..9aa66f4bda196be65a98b9cfdde86212ada76dd8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_SUBTYPE\sflag,\swhich\smay\sbe\spassed\sto\ssqlite3_create_window_function()\sto\sindicate\sthat\sthe\swindow\sfunction\suses\ssqlite3_value_subtype()\sto\scheck\sthe\ssub-type\sof\sits\sarguments.
-D 2019-09-13T18:27:17.192
+C Fix\sthe\swindowB\stest\smodule\sso\sthat\sit\sworks\seven\sif\sSQLite\sis\sbuilt\swithout\nJSON\ssupport.
+D 2019-09-13T18:59:04.975
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1719,7 +1719,7 @@ F test/window8.tcl f2711aa3571e4e6b0dad98db8d95fd6cb8d9db0c92bbdf535f153b07606a1
 F test/window8.test c4331b27a6f66d69fa8f8bab10cc731db1a81d293ae108a68f7c3487fa94e65b
 F test/window9.test 20a6b590be718b6bc98a5356d4396d6cdf19329c547da084fa225b92d68e1693
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
-F test/windowB.test 24daa26628291b6e584064efd34b1914aa69058280ece8a512b2e59ba71b6f02
+F test/windowB.test 3f0ae24a7860abaae9f092589f275a87787804b6d98ad6f23a0bc87fb4491d43
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test a90b397837209f15e54afa62e8be39b2759a0101fae04e05a08bcc50e243a452
@@ -1843,8 +1843,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 658a42d3633b31fda260f2c5a1a2c7dd8eb4eb0114d322369017c56faf5ecd42 af1bc20f502816db460d2b2d353f715da5cf660e59095de5214c829c1cb20981
-R 919177d10d46e9cfa222a1bf25a1d5fb
-T +closed af1bc20f502816db460d2b2d353f715da5cf660e59095de5214c829c1cb20981
-U dan
-Z 7f5ff2b3722751f14dcaaa30ef08814d
+P ba2ebc3a348decc5cedaf14960e30e7ae26a26824cfa198727f2499162142ef3
+R bae0d8d6f0a49acfd1c53d207a1b5d08
+U drh
+Z 2837255703db522fd15af08765e39ee9

diff --git a/manifest.uuid b/manifest.uuid
index bf7e581e98838701cd7b3a102ee93e804062a643..f1017be8a5524682424651366fa968d2256b45c0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba2ebc3a348decc5cedaf14960e30e7ae26a26824cfa198727f2499162142ef3
\ No newline at end of file
+807975c76b36347f02aa0ce9661d608adbffe1f7e77c15f8da677e47e1187153
\ No newline at end of file

diff --git a/test/windowB.test b/test/windowB.test
index 0c242acc70cc574be8e20ebf7c06989c4eafc622..0c3c56dec8574d26b8b4a7661cb1f83e90b58a2e 100644 (file)
--- a/test/windowB.test
+++ b/test/windowB.test
@@ -87,20 +87,19 @@ do_execsql_test 3.0 {
   INSERT INTO testjson VALUES(2, '{"b":2}');
 }
 
-do_execsql_test 3.1 {
-  SELECT json_group_array(json(j)) FROM testjson;
-} {
-  {[{"a":1},{"b":2}]}
-}
+ifcapable json1 {
+  do_execsql_test 3.1 {
+    SELECT json_group_array(json(j)) FROM testjson;
+  } {
+    {[{"a":1},{"b":2}]}
+  }
 
-breakpoint
-do_execsql_test 3.2 {
-  SELECT json_group_array(json(j)) OVER (ORDER BY id) FROM testjson;
-} {
-  {[{"a":1}]}
-  {[{"a":1},{"b":2}]}
+  do_execsql_test 3.2 {
+    SELECT json_group_array(json(j)) OVER (ORDER BY id) FROM testjson;
+  } {
+    {[{"a":1}]}
+    {[{"a":1},{"b":2}]}
+  }
 }
 
-
 finish_test
-