Fix recent test cases in test/indexepxr2.test so that they work even without

SQLITE_ENABLE_STAT4 and SQLITE_ENABLE_JSON1.

FossilOrigin-Name: 03f3cc03aaf233ad663d32a0200bfafee24a6c81f6a0ad14094ff014f880f00f

diff --git a/manifest b/manifest
index 633c8bc7120f81e0b3df13b1d0f603bfa254255d..76aa15ba3f9784f627786ab8f8b48643e893c5ba 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\snew\ssqlite3PagerUnrefPageOne()\spager\smethod\sto\sdeal\swith\sthe\sspecial\ncase\sof\sunreferencing\spage1.
-D 2017-09-01T14:50:19.167
+C Fix\srecent\stest\scases\sin\stest/indexepxr2.test\sso\sthat\sthey\swork\seven\swithout\nSQLITE_ENABLE_STAT4\sand\sSQLITE_ENABLE_JSON1.
+D 2017-09-04T00:19:29.067
 F Makefile.in c644bbe8ebe4aae82ad6783eae6b6beea4c727b99ff97568b847ced5e2ac7afb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 25b154da7f0b3d4924f27378c1f8d006285b80811f1ccf3ed953dbebf6282136
@@ -943,7 +943,7 @@ F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
 F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
 F test/indexedby.test 9c4cd331224e57f79fbf411ae245e6272d415985
 F test/indexexpr1.test 84100e880154a4b645db9f4fc7642756d9a2b6011b68f73c8efda4d244816de9
-F test/indexexpr2.test 2237f1408efa921bd66d0a09ebf0208cb0c228c1bc3b3a18e9fb8fc87d6ed90b
+F test/indexexpr2.test fdccd5c13a57af59a8e392660953dbcaacc4699c433516372cfba52994aa503a
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test 38742b5e9601c8f8d76e9b7555f7270288c2d371
@@ -1651,7 +1651,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 c4e7e175eecfd79015f4fae99618dfce6baf97c21bf3c909ea535d4e12dcaaad
-R 6f9a52521f107a3c330b7cfcb23523cf
+P b2e2100cf766da1cb499aec0ca0a9969d7af5d93312ab8cf895fbf4a6ffb9b2f
+R 433d5cb6c81e4d88ac4aa41130f6c962
 U drh
-Z f39368718f6b0d67941da00fc11a34d5
+Z bece2044ea92becf4529a710cefa9f07

diff --git a/manifest.uuid b/manifest.uuid
index 1aa72acac969237b711e508827db105737ba8022..cfb4284505e6dddde2826badb7786764e65320b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2e2100cf766da1cb499aec0ca0a9969d7af5d93312ab8cf895fbf4a6ffb9b2f
\ No newline at end of file
+03f3cc03aaf233ad663d32a0200bfafee24a6c81f6a0ad14094ff014f880f00f
\ No newline at end of file

diff --git a/test/indexexpr2.test b/test/indexexpr2.test
index 7fa226cf8f6366208708e277ceb5de6e82bdd98d..d8b20934e745a0ed52ddaeef1590f12510e161e2 100644 (file)
--- a/test/indexexpr2.test
+++ b/test/indexexpr2.test
@@ -57,10 +57,7 @@ do_eqp_test 3.1.1 {
   SELECT b FROM t1 WHERE b IS NOT NULL AND a IS NULL 
   GROUP BY b COLLATE nocase
   ORDER BY b COLLATE nocase;
-} {
-  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=? AND b>?)}
-  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
-}
+} {/USE TEMP B-TREE FOR GROUP BY/}
 
 do_execsql_test 3.2.0 {
   CREATE TABLE t2(x);
@@ -88,28 +85,30 @@ do_execsql_test 3.3.0 {
   CREATE TABLE t3(x);
 }
 
-do_eqp_test 3.3.1 {
-  SELECT json_extract(x, '$.b') FROM t2 
-  WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
-  GROUP BY json_extract(x, '$.b') COLLATE nocase
-  ORDER BY json_extract(x, '$.b') COLLATE nocase;
-} {
-  0 0 0 {SCAN TABLE t2} 
-  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
-}
-
-do_execsql_test 3.3.2 {
-  CREATE INDEX i3 ON t3(json_extract(x, '$.a'), json_extract(x, '$.b'));
-} {}
-
-do_eqp_test 3.3.3 {
-  SELECT json_extract(x, '$.b') FROM t3 
-  WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
-  GROUP BY json_extract(x, '$.b') COLLATE nocase
-  ORDER BY json_extract(x, '$.b') COLLATE nocase;
-} {
-  0 0 0 {SEARCH TABLE t3 USING INDEX i3 (<expr>=?)} 
-  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+ifcapable json1 {
+  do_eqp_test 3.3.1 {
+    SELECT json_extract(x, '$.b') FROM t2 
+    WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
+    GROUP BY json_extract(x, '$.b') COLLATE nocase
+    ORDER BY json_extract(x, '$.b') COLLATE nocase;
+  } {
+    0 0 0 {SCAN TABLE t2} 
+    0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+  }
+  
+  do_execsql_test 3.3.2 {
+    CREATE INDEX i3 ON t3(json_extract(x, '$.a'), json_extract(x, '$.b'));
+  } {}
+  
+  do_eqp_test 3.3.3 {
+    SELECT json_extract(x, '$.b') FROM t3 
+    WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
+    GROUP BY json_extract(x, '$.b') COLLATE nocase
+    ORDER BY json_extract(x, '$.b') COLLATE nocase;
+  } {
+    0 0 0 {SEARCH TABLE t3 USING INDEX i3 (<expr>=?)} 
+    0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+  }
 }
 
 do_execsql_test 3.4.0 {