From: dan Date: Wed, 23 Mar 2011 10:52:23 +0000 (+0000) Subject: Fix a numbering issue in rtree6.test. Add a couple of extra tests. X-Git-Tag: version-3.7.6~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb1f98a1ac16fe252587dcef0c936ae5c2889f61;p=thirdparty%2Fsqlite.git Fix a numbering issue in rtree6.test. Add a couple of extra tests. FossilOrigin-Name: 0b7668a71ef8995ea0306c7d890f87761961426e --- diff --git a/ext/rtree/rtree6.test b/ext/rtree/rtree6.test index 7fe346b0c7..ba0e53c994 100644 --- a/ext/rtree/rtree6.test +++ b/ext/rtree/rtree6.test @@ -127,7 +127,7 @@ do_test rtree6.3.2 { x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 } } {EaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEa} -do_test rtree6.3.4 { +do_test rtree6.3.3 { rtree_strategy { SELECT * FROM t3 WHERE x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND @@ -139,5 +139,18 @@ do_test rtree6.3.4 { } } {EaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEa} +do_execsql_test rtree6-3.4 { + SELECT * FROM t3 WHERE x1>0.5 AND x1>0.8 AND x1>1.1 +} {} +do_execsql_test rtree6-3.5 { + SELECT * FROM t3 WHERE + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND + x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>0.5 AND x1>1.1 +} {} + finish_test diff --git a/manifest b/manifest index 52f3cbadbd..f013a88380 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\srtree\smodule\sto\ssupport\squeries\swith\smultiple\scomparison\soperators\s(i.e.\s>\sor\s<)\sof\sthe\ssame\stype\son\sa\ssingle\scolumn. -D 2011-03-23T10:38:50 +C Fix\sa\snumbering\sissue\sin\srtree6.test.\sAdd\sa\scouple\sof\sextra\stests. +D 2011-03-23T10:52:24 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -88,7 +88,7 @@ F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc F ext/rtree/rtree4.test 0061e6f464fd3dc6a79f82454c5a1c3dadbe42af F ext/rtree/rtree5.test ce3d7ccae2cfd9d2e1052b462424964c9bdcda12 -F ext/rtree/rtree6.test 1edf30467ec39b2282874c2175b81b7690d2c706 +F ext/rtree/rtree6.test 0b380bd9af93f3bc496eef42502a336f58949c1b F ext/rtree/rtree7.test bcb647b42920b3b5d025846689147778485cc318 F ext/rtree/rtree8.test 9772e16da71e17e02bdebf0a5188590f289ab37d F ext/rtree/rtree9.test df9843d1a9195249c8d3b4ea6aedda2d5c73e9c2 @@ -915,7 +915,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 09e167f9c14625924b17bbb1f292f89ac9ddc93a -R 52342b1b5ec5b2f1eb5941c495729364 +P 387b55aa9bb0f978641f9c2fa40f84fd98662047 +R 42f78a66f5fb996ecb166be6e5e2801d U dan -Z a3dc1db2deb58c4b0fccde75b160266c +Z 48e98177ee9f2d2bd6fc7fbe27e37892 diff --git a/manifest.uuid b/manifest.uuid index 1154a5fc3e..cb2b1b4819 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -387b55aa9bb0f978641f9c2fa40f84fd98662047 \ No newline at end of file +0b7668a71ef8995ea0306c7d890f87761961426e \ No newline at end of file