Fix the rtreeG.test test case.

FossilOrigin-Name: 9589e9377118efc356c73ea1aab2d7e6c2f7fc36

diff --git a/ext/rtree/rtreeG.test b/ext/rtree/rtreeG.test
index 035822e4df4bbf89167e0f20b40b24e48b3e62b1..bffd17ecaacd4297dae973191fe2ee115ff064e7 100644 (file)
--- a/ext/rtree/rtreeG.test
+++ b/ext/rtree/rtreeG.test
@@ -26,9 +26,41 @@ sqlite3 db test.db
 
 
 set ::log {}
-do_test rtreeG-1.1 {
-  db eval {CREATE VIRTUAL TABLE t1 USING rtree(a,b,c);}
+do_execsql_test rtreeG-1.1 {
+  CREATE VIRTUAL TABLE t1 USING rtree(id,x0,x1,y0,y1);
+} {}
+do_test rtreeG-1.1log {
+  set ::log
+} {}
+
+do_execsql_test rtreeG-1.2 {
+  INSERT INTO t1 VALUES(1,10,15,5,23),(2,20,21,5,23),(3,10,15,20,30);
+  SELECT id from t1 WHERE x0>8 AND x1<16 AND y0>2 AND y1<25;
+} {1}
+do_test rtreeG-1.2log {
+  set ::log
+} {}
+
+db close
+sqlite3 db test.db
+do_execsql_test rtreeG-1.3 {
+  SELECT id from t1 WHERE x0>8 AND x1<16 AND y0>2 AND y1<25;
+} {1}
+do_test rtreeG-1.3log {
   set ::log
 } {}
 
+do_execsql_test rtreeG-1.4 {
+  DROP TABLE t1;
+} {}
+do_test rtreeG-1.4log {
+  set ::log
+} {}
+
+db close
+sqlite3_shutdown
+test_sqlite3_log
+sqlite3_initialize
+sqlite3 db test.db
+
 finish_test

diff --git a/manifest b/manifest
index 3d248c5ee4734f9f6d913feae0447bd658141da4..92ddb98a9db61faee71bc41cc51384b0d3694cc4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sRTREE\sso\sthat\sit\sdoes\snot\srun\squeries\sagainst\sthe\ssqlite_stat1\sif\sthat\ntable\sdoes\snot\sexist.
-D 2016-05-23T18:12:04.371
+C Fix\sthe\srtreeG.test\stest\scase.
+D 2016-05-23T18:27:07.523
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -270,7 +270,7 @@ F ext/rtree/rtreeC.test c0a9c67f2efa98b6fae12acb8a28348d231a481d
 F ext/rtree/rtreeD.test 636630357638f5983701550b37f0f5867130d2ca
 F ext/rtree/rtreeE.test 45a147a64a76306172819562309681d8e90f94bb
 F ext/rtree/rtreeF.test 66deb9fd1611c7ca2e374adba63debdc2dbb12b4
-F ext/rtree/rtreeG.test fad67b4ec080cbe41bafb68517361b74ac4632d5
+F ext/rtree/rtreeG.test 3b185719630795f38594f64cd7d1de86a33f91f1
 F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
 F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
@@ -1493,7 +1493,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 bfbb6dd84b5e1335e1eae857a03fa33a71fd67a5
-R 917b797124e2db7975ec6ce19d0d3f10
+P 48526a2fe5373e3d19e8b813cc8a342d6b7c9c3d
+R f2db7693c08d0e8ea5e5a43c2bcc91ff
 U drh
-Z 1720c00f1c890b6da656d7cb35d019e7
+Z 8e18f408557ba2afd41610ebc5947af3

diff --git a/manifest.uuid b/manifest.uuid
index 1a5b947ac2b8858cca01387f30260251c982287d..d9e8077dfc258f0e2bfd0e6fbeae5d9ab8c60816 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48526a2fe5373e3d19e8b813cc8a342d6b7c9c3d
\ No newline at end of file
+9589e9377118efc356c73ea1aab2d7e6c2f7fc36
\ No newline at end of file