New test cases in test/in4.test require rtree, so disable those tests on

builds that lack the rtree extension.

FossilOrigin-Name: b5900914f7f34caf1a97c87233781d55467329b0ac4366354df13c6fd72a99c7

diff --git a/manifest b/manifest
index 0f4f6bb572db4f834f3d019d2bbdf1e1292f2d8c..bad6a86b0cd28b6eeda45b1e2748508cba5d803c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swhere\sthe\sloop\sfor\sthe\sRHS\sof\sa\sLEFT\sJOIN\suses\svalues\sfrom\san\sIN()\sclause\sas\sthe\ssecond\sor\ssubsequent\sfield\sof\san\sindex.
-D 2020-01-04T16:55:57.635
+C New\stest\scases\sin\stest/in4.test\srequire\srtree,\sso\sdisable\sthose\stests\son\nbuilds\sthat\slack\sthe\srtree\sextension.
+D 2020-01-04T17:42:27.049
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1036,7 +1036,7 @@ F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
 F test/in.test 3e9bd58597a444123a40a9ac94cae0fec8897e17e9f519b02fc370bcf5ba5175
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
-F test/in4.test 0dbdbed68303443e769df42f1d0aa9411bd968254f44c77538e6a60547bc0268
+F test/in4.test 65460600d48933adba4283c6ebd089aae173d16136ab9d01f74c89089090c5a5
 F test/in5.test b32ce7f4a93f44c5dee94af16886d922cc16ebe33c8e1765c73d4049d0f4b40f
 F test/in6.test 62d943a02f722948f4410ee0b53c3cb39acd7c41afb083df8d7004238fe90a20
 F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
@@ -1853,7 +1853,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 9da48a5ca66dc67c8f7fb2d2471dac7ea696e35ecba5ddf65747d08d452436c1
-R e96127660ca8159860f3384d23839e06
-U dan
-Z 1ba10d632e5123673848baa09ec8907f
+P 95ef68966c50f311830cba8c9257a4085c93011d205e0e31867c2917fa62a48e
+R fcab88c144dc799dc447a7b169c3a584
+U drh
+Z f09a95387a590464d6b3dffd77efcbbf

diff --git a/manifest.uuid b/manifest.uuid
index d577ab803a3087052be79a246fe39b1b1caf17db..0a7f609316d10c11789b3bae8ddaef223d68f932 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95ef68966c50f311830cba8c9257a4085c93011d205e0e31867c2917fa62a48e
\ No newline at end of file
+b5900914f7f34caf1a97c87233781d55467329b0ac4366354df13c6fd72a99c7
\ No newline at end of file

diff --git a/test/in4.test b/test/in4.test
index ef87d8d3f0432b052fc2096fdf4322c626a6a2f4..37eafdebec983bab0565706d53605351f7bed0a6 100644 (file)
--- a/test/in4.test
+++ b/test/in4.test
@@ -352,15 +352,17 @@ do_execsql_test 7.1 {
   SELECT * FROM t2 LEFT JOIN t1 ON c = d AND b IN (10,10,10);
 } {{} 1 {} {} {}}
 
-reset_db
-do_execsql_test 7.2 {
-  CREATE VIRTUAL TABLE t1 USING rtree(a, b, c);
-  CREATE TABLE t2(d INTEGER, e INT);
-  INSERT INTO t2(e) VALUES(1);
-}
+ifcapable rtree {
+  reset_db
+  do_execsql_test 7.2 {
+    CREATE VIRTUAL TABLE t1 USING rtree(a, b, c);
+    CREATE TABLE t2(d INTEGER, e INT);
+    INSERT INTO t2(e) VALUES(1);
+  }
 
-do_execsql_test 7.3 {
-  SELECT * FROM t2 LEFT JOIN t1 ON c IN (d) AND b IN (10,10,10);
-} {{} 1 {} {} {}}
+  do_execsql_test 7.3 {
+    SELECT * FROM t2 LEFT JOIN t1 ON c IN (d) AND b IN (10,10,10);
+  } {{} 1 {} {} {}}
+}
 
 finish_test