From: dan <dan@noemail.net>
Date: Fri, 8 Apr 2011 18:47:24 +0000 (+0000)
Subject: Add some rtree tests to the backcompat.test script.
X-Git-Tag: version-3.7.6~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c152101cae48fa2d5f9cc979d1642a7ddde78e8;p=thirdparty%2Fsqlite.git

Add some rtree tests to the backcompat.test script.

FossilOrigin-Name: 8ea3601cd11088ae4d62bd4a05d1675301b26ace
---

diff --git a/manifest b/manifest
index 65186f2ae7..e366f2d986 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sincrvacuum2.test\sso\sthat\sit\sworks\swith\sthe\sinmemory_journal\spermutation.
-D 2011-04-08T17:22:30.300
+C Add\ssome\srtree\stests\sto\sthe\sbackcompat.test\sscript.
+D 2011-04-08T18:47:24.227
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -281,7 +281,7 @@ F test/autoindex1.test 860fc83f4fefb0c68ad062afc3ff43faa1534fc4
 F test/autovacuum.test bb7c0885e6f8f1d633045de48f2b66082162766d
 F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
-F test/backcompat.test 541314d69ec9db3e03630b7616696ddc5048efb1
+F test/backcompat.test 0f23ff8d516acdf42f3d866a66d85306de2d02bc
 F test/backup.test 004d3b78bffd990741ab50133ed4347c25c172b1
 F test/backup2.test b7c69f937c912e85ac8a5dbd1e1cf290302b2d49
 F test/backup_ioerr.test 1f012e692f42c0442ae652443258f70e9f20fa38
@@ -927,7 +927,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5bbfa17d4d6db18f8077f758d70c1bc253b58e2e
-R 2679548d57f4894ca8b9b15361fa4466
+P 7b8e176143bb8b55e34fd70cbfa639b1097b2c34
+R 721738e1b7737b5721b6d7302a3c4ca3
 U dan
-Z eb5d19ab4e4ff1806dfa7f05c67aa6f7
+Z 88b5a8ea4fcbb765bca47e95e089b60f
diff --git a/manifest.uuid b/manifest.uuid
index e58dc16e39..704f01b16d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b8e176143bb8b55e34fd70cbfa639b1097b2c34
\ No newline at end of file
+8ea3601cd11088ae4d62bd4a05d1675301b26ace
\ No newline at end of file
diff --git a/test/backcompat.test b/test/backcompat.test
index 3b11607274..fa643f9b76 100644
--- a/test/backcompat.test
+++ b/test/backcompat.test
@@ -369,4 +369,77 @@ do_allbackcompat_test {
   }
 }
 
+#-------------------------------------------------------------------------
+# Test that Rtree tables may be read/written by different versions of 
+# SQLite. 
+#
+set contents {
+  CREATE VIRTUAL TABLE t1 USING rtree(id, x1, x2, y1, y2);
+}
+foreach {id x1 x2 y1 y2} {
+  1    -47.64 43.87    33.86 34.42        2    -21.51 17.32    2.05 31.04
+  3    -43.67 -38.33    -19.79 3.43       4    32.41 35.16    9.12 19.82
+  5    33.28 34.87    14.78 28.26         6    49.31 116.59    -9.87 75.09
+  7    -14.93 34.51    -17.64 64.09       8    -43.05 23.43    -1.19 69.44
+  9    44.79 133.56    28.09 80.30        10    -2.66 81.47    -41.38 -10.46
+  11    -42.89 -3.54    15.76 71.63       12    -3.50 84.96    -11.64 64.95
+  13    -45.69 26.25    11.14 55.06       14    -44.09 11.23    17.52 44.45
+  15    36.23 133.49    -19.38 53.67      16    -17.89 81.54    14.64 50.61
+  17    -41.97 -24.04    -39.43 28.95     18    -5.85 7.76    -6.38 47.02
+  19    18.82 27.10    42.82 100.09       20    39.17 113.45    26.14 73.47
+  21    22.31 103.17    49.92 106.05      22    -43.06 40.38    -1.75 76.08
+  23    2.43 57.27    -14.19 -3.83        24    -47.57 -4.35    8.93 100.06
+  25    -37.47 49.14    -29.11 8.81       26    -7.86 75.72    49.34 107.42
+  27    1.53 45.49    20.36 49.74         28    -48.48 32.54    28.81 54.45
+  29    2.67 39.77    -4.05 13.67         30    4.11 62.88    -47.44 -5.72
+  31    -21.47 51.75    37.25 116.09      32    45.59 111.37    -6.43 43.64
+  33    35.23 48.29    23.54 113.33       34    16.61 68.35    -14.69 65.97
+  35    13.98 16.60    48.66 102.87       36    19.74 23.84    31.15 77.27
+  37    -27.61 24.43    7.96 94.91        38    -34.77 12.05    -22.60 -6.29
+  39    -25.83 8.71    -13.48 -12.53      40    -17.11 -1.01    18.06 67.89
+  41    14.13 71.72    -3.78 39.25        42    23.75 76.00    -16.30 8.23
+  43    -39.15 28.63    38.12 125.88      44    48.62 86.09    36.49 102.95
+  45    -31.39 -21.98    2.52 89.78       46    5.65 56.04    15.94 89.10
+  47    18.28 95.81    46.46 143.08       48    30.93 102.82    -20.08 37.36
+  49    -20.78 -3.48    -5.58 35.46       50    49.85 90.58    -24.48 46.29
+} {
+if {$x1 >= $x2 || $y1 >= $y2} { error "$x1 $x2 $y1 $y2" }
+  append contents "INSERT INTO t1 VALUES($id, $x1, $x2, $y1, $y2);"
+}
+set queries {
+  1    "SELECT id FROM t1 WHERE x1>10 AND x2<44"
+  2    "SELECT id FROM t1 WHERE y1<100"
+  3    "SELECT id FROM t1 WHERE y1<100 AND x1>0"
+  4    "SELECT id FROM t1 WHERE y1>10 AND x1>0 AND x2<50 AND y2<550"
+}
+do_allbackcompat_test {
+  if {[code1 {set ::sqlite_options(fts3)}]
+   && [code2 {set ::sqlite_options(fts3)}]
+  } {
+
+    do_test backcompat-4.1 { sql1 $contents } {}
+
+    foreach {n q} $::queries {
+      do_test backcompat-4.2.$n [list sql1 $q] [sql2 $q]
+    }
+
+    do_test backcompat-4.3 { sql1 {
+      INSERT INTO t1 SELECT id+100, x1+10.0, x2+10.0, y1-10.0, y2-10.0 FROM t1;
+    } } {}
+
+    foreach {n q} $::queries {
+      do_test backcompat-4.4.$n [list sql1 $q] [sql2 $q]
+    }
+
+    do_test backcompat-4.5 { sql2 {
+      INSERT INTO t1 SELECT id+200, x1+20.0, x2+20.0, y1-20.0, y2-20.0 FROM t1;
+    } } {}
+
+    foreach {n q} $::queries {
+      do_test backcompat-4.6.$n [list sql1 $q] [sql2 $q]
+    }
+
+  }
+}
+
 finish_test