1 files changed, 65 insertions, 9 deletions
diff --git a/chromium/third_party/sqlite/patched/ext/rtree/rtree1.test b/chromium/third_party/sqlite/patched/ext/rtree/rtree1.test
index ddc5f182f09..1870d33067b 100644
--- a/chromium/third_party/sqlite/patched/ext/rtree/rtree1.test
+++ b/chromium/third_party/sqlite/patched/ext/rtree/rtree1.test
@@ -112,6 +112,9 @@ for {set nCol 1} {$nCol<[llength $cols]} {incr nCol} {
 
   catchsql { DROP TABLE t1 }
 }
+do_catchsql_test rtree-1.3.1000 {
+  CREATE VIRTUAL TABLE t1000 USING rtree;
+} {1 {Too few columns for an rtree table}}
 
 # Like execsql except display output as integer where that can be
 # done without loss of information.
@@ -374,13 +377,43 @@ do_test rtree-8.1.1 {
     INSERT INTO t6 VALUES(2, 4, 6);
   }
 } {}
-do_test rtree-8.1.2 { execsql { SELECT ii FROM t6 WHERE x1>2 } } {1 2}
-do_test rtree-8.1.3 { execsql { SELECT ii FROM t6 WHERE x1>3 } } {2}
-do_test rtree-8.1.4 { execsql { SELECT ii FROM t6 WHERE x1>4 } } {}
-do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } } {}
-do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1<3 } } {}
-do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1<4 } } {1}
-do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1<5 } } {1 2}
+do_test rtree-8.1.2 { execsql { SELECT ii FROM t6 WHERE x1>2 } }   {1 2}
+do_test rtree-8.1.3 { execsql { SELECT ii FROM t6 WHERE x1>3 } }   {2}
+do_test rtree-8.1.4 { execsql { SELECT ii FROM t6 WHERE x1>4 } }   {}
+do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } }   {}
+do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1>''} }   {}
+do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1>null}}  {}
+do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1>'2'} }   {1 2}
+do_test rtree-8.1.9 { execsql { SELECT ii FROM t6 WHERE x1>'3'} }   {2}
+do_test rtree-8.2.2 { execsql { SELECT ii FROM t6 WHERE x1>=2 } }  {1 2}
+do_test rtree-8.2.3 { execsql { SELECT ii FROM t6 WHERE x1>=3 } }  {1 2}
+do_test rtree-8.2.4 { execsql { SELECT ii FROM t6 WHERE x1>=4 } }  {2}
+do_test rtree-8.2.5 { execsql { SELECT ii FROM t6 WHERE x1>=5 } }  {}
+do_test rtree-8.2.6 { execsql { SELECT ii FROM t6 WHERE x1>=''} }  {}
+do_test rtree-8.2.7 { execsql { SELECT ii FROM t6 WHERE x1>=null}} {}
+do_test rtree-8.2.8 { execsql { SELECT ii FROM t6 WHERE x1>='4'} } {2}
+do_test rtree-8.2.9 { execsql { SELECT ii FROM t6 WHERE x1>='5'} } {}
+do_test rtree-8.3.2 { execsql { SELECT ii FROM t6 WHERE x1<2 } }   {}
+do_test rtree-8.3.3 { execsql { SELECT ii FROM t6 WHERE x1<3 } }   {}
+do_test rtree-8.3.4 { execsql { SELECT ii FROM t6 WHERE x1<4 } }   {1}
+do_test rtree-8.3.5 { execsql { SELECT ii FROM t6 WHERE x1<5 } }   {1 2}
+do_test rtree-8.3.6 { execsql { SELECT ii FROM t6 WHERE x1<''} }   {1 2}
+do_test rtree-8.3.7 { execsql { SELECT ii FROM t6 WHERE x1<null}}  {}
+do_test rtree-8.3.8 { execsql { SELECT ii FROM t6 WHERE x1<'3'} }  {}
+do_test rtree-8.3.9 { execsql { SELECT ii FROM t6 WHERE x1<'4'} }  {1}
+do_test rtree-8.4.2 { execsql { SELECT ii FROM t6 WHERE x1<=2 } }  {}
+do_test rtree-8.4.3 { execsql { SELECT ii FROM t6 WHERE x1<=3 } }  {1}
+do_test rtree-8.4.4 { execsql { SELECT ii FROM t6 WHERE x1<=4 } }  {1 2}
+do_test rtree-8.4.5 { execsql { SELECT ii FROM t6 WHERE x1<=5 } }  {1 2}
+do_test rtree-8.4.6 { execsql { SELECT ii FROM t6 WHERE x1<=''} }  {1 2}
+do_test rtree-8.4.7 { execsql { SELECT ii FROM t6 WHERE x1<=null}} {}
+do_test rtree-8.5.2 { execsql { SELECT ii FROM t6 WHERE x1=2 } }   {}
+do_test rtree-8.5.3 { execsql { SELECT ii FROM t6 WHERE x1=3 } }   {1}
+do_test rtree-8.5.4 { execsql { SELECT ii FROM t6 WHERE x1=4 } }   {2}
+do_test rtree-8.5.5 { execsql { SELECT ii FROM t6 WHERE x1=5 } }   {}
+do_test rtree-8.5.6 { execsql { SELECT ii FROM t6 WHERE x1=''} }   {}
+do_test rtree-8.5.7 { execsql { SELECT ii FROM t6 WHERE x1=null}}  {}
+
 
 #----------------------------------------------------------------------------
 # Test cases rtree-9.*
@@ -578,15 +611,29 @@ do_execsql_test 14.5 {
   1 0.0 0.0
   2 52.0 81.0
 }
+do_execsql_test 14.6 {
+  INSERT INTO t10 VALUES(0,10,20);
+  SELECT * FROM t10 WHERE ii=NULL;
+} {}
+do_execsql_test 14.7 {
+  SELECT * FROM t10 WHERE ii='xyz';
+} {}
+do_execsql_test 14.8 {
+  SELECT * FROM t10 WHERE ii='0.0';
+} {0 10.0 20.0}
+do_execsql_test 14.9 {
+  SELECT * FROM t10 WHERE ii=0.0;
+} {0 10.0 20.0}
 
-do_execsql_test 14.4 {
+
+do_execsql_test 14.104 {
   DROP TABLE t10;
   CREATE VIRTUAL TABLE t10 USING rtree_i32(ii, x1, x2);
   INSERT INTO t10 VALUES(1, 'one', 'two');
   INSERT INTO t10 VALUES(2, '52xyz', '81...');
   INSERT INTO t10 VALUES(3, 42.3, 49.9);
 }
-do_execsql_test 14.5 {
+do_execsql_test 14.105 {
   SELECT * FROM t10;
 } {
   1 0 0
@@ -661,5 +708,14 @@ do_execsql_test 17.2 {
   REINDEX;
 } {}
 
+reset_db
+do_execsql_test 18.0 {
+  CREATE VIRTUAL TABLE rt0 USING rtree(c0, c1, c2);
+  INSERT INTO rt0(c0,c1,c2) VALUES(9,2,3);
+  SELECT c0 FROM rt0 WHERE rt0.c1 > '-1';
+  SELECT rt0.c1 > '-1' FROM rt0;
+} {9 1}
+
+
 expand_all_sql db
 finish_test