Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch

third_party/sqlite/src/ext/rtree/rtree1.test

Index: third_party/sqlite/src/ext/rtree/rtree1.test
diff --git a/third_party/sqlite/src/ext/rtree/rtree1.test b/third_party/sqlite/src/ext/rtree/rtree1.test
index fe5fa0ae50ed2bfa1dbc861c299c37e6c0a80a34..0beb16cc9494468168c6c9b26c4ebbbc09a78770 100644
--- a/third_party/sqlite/src/ext/rtree/rtree1.test
+++ b/third_party/sqlite/src/ext/rtree/rtree1.test
@@ -17,6 +17,7 @@ if {![info exists testdir]} {
 }
 source [file join [file dirname [info script]] rtree_util.tcl]
 source $testdir/tester.tcl
+set testprefix rtree1
 
 # Test plan:
 #
@@ -31,6 +32,9 @@ source $testdir/tester.tcl
 #   rtree-7.*: Test renaming an r-tree table.
 #   rtree-8.*: Test constrained scans of r-tree data.
 #
+#   rtree-12.*: Test that on-conflict clauses are supported.
+#   rtree-13.*: Test that bug [d2889096e7bdeac6d] has been fixed.
+#
 
 ifcapable !rtree {
   finish_test
@@ -102,21 +106,34 @@ for {set nCol 1} {$nCol<[llength $cols]} {incr nCol} {
   catchsql { DROP TABLE t1 }
 }
 
+# Like execsql except display output as integer where that can be
+# done without loss of information.
+#
+proc execsql_intout {sql} {
+  set out {}
+  foreach term [execsql $sql] {
+    regsub {\.0$} $term {} term
+    lappend out $term
+  }
+  return $out
+}
+
 # Test that it is possible to open an existing database that contains
 # r-tree tables.
 #
-do_test rtree-1.4.1 {
-  execsql {
-    CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2);
-    INSERT INTO t1 VALUES(1, 5.0, 10.0);
-    INSERT INTO t1 VALUES(2, 15.0, 20.0);
-  }
+do_execsql_test rtree-1.4.1a {
+  CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2);
+  INSERT INTO t1 VALUES(1, 5.0, 10.0);
+  SELECT substr(hex(data),1,40) FROM t1_node;
+} {00000001000000000000000140A0000041200000}
+do_execsql_test rtree-1.4.1b {
+  INSERT INTO t1 VALUES(2, 15.0, 20.0);
 } {}
 do_test rtree-1.4.2 {
   db close
   sqlite3 db test.db
-  execsql { SELECT * FROM t1 ORDER BY ii }
-} {1 5.0 10.0 2 15.0 20.0}
+  execsql_intout { SELECT * FROM t1 ORDER BY ii }
+} {1 5 10 2 15 20}
 do_test rtree-1.4.3 {
   execsql { DROP TABLE t1 }
 } {}
@@ -125,12 +142,12 @@ do_test rtree-1.4.3 {
 # column names.
 #
 do_test rtree-1.5.1 {
-  execsql {
+  execsql_intout {
     CREATE VIRTUAL TABLE t1 USING rtree("the key", "x dim.", "x2'dim");
     INSERT INTO t1 VALUES(1, 2, 3);
     SELECT "the key", "x dim.", "x2'dim" FROM t1;
   }
-} {1 2.0 3.0}
+} {1 2 3}
 do_test rtree-1.5.1 {
   execsql { DROP TABLE t1 }
 } {}
@@ -159,8 +176,8 @@ do_test rtree-2.1.1 {
 
 do_test rtree-2.1.2 {
   execsql { INSERT INTO t1 VALUES(NULL, 1, 3, 2, 4) }
-  execsql { SELECT * FROM t1 }
-} {1 1.0 3.0 2.0 4.0}
+  execsql_intout { SELECT * FROM t1 }
+} {1 1 3 2 4}
 do_test rtree-2.1.3 {
   execsql { INSERT INTO t1 VALUES(NULL, 1, 3, 2, 4) }
   execsql { SELECT rowid FROM t1 ORDER BY rowid }
@@ -199,17 +216,17 @@ do_test rtree-3.1.1 {
   }
 } {}
 do_test rtree-3.1.2 {
-  execsql { 
+  execsql_intout { 
     INSERT INTO t1 VALUES(5, 1, 3, 2, 4);
     SELECT * FROM t1;
   }
-} {5 1.0 3.0 2.0 4.0}
+} {5 1 3 2 4}
 do_test rtree-3.1.3 {
-  execsql {
+  execsql_intout {
     INSERT INTO t1 VALUES(6, 2, 6, 4, 8);
     SELECT * FROM t1;
   }
-} {5 1.0 3.0 2.0 4.0 6 2.0 6.0 4.0 8.0}
+} {5 1 3 2 4 6 2 6 4 8}
 
 # Test the constraint on the coordinates (c[i]<=c[i+1] where (i%2==0)):
 do_test rtree-3.2.1 {
@@ -226,25 +243,25 @@ do_test rtree-5.1.1 {
   execsql { CREATE VIRTUAL TABLE t2 USING rtree(ii, x1, x2) }
 } {}
 do_test rtree-5.1.2 {
-  execsql { 
+  execsql_intout { 
     INSERT INTO t2 VALUES(1, 10, 20);
     INSERT INTO t2 VALUES(2, 30, 40);
     INSERT INTO t2 VALUES(3, 50, 60);
     SELECT * FROM t2 ORDER BY ii;
   }
-} {1 10.0 20.0 2 30.0 40.0 3 50.0 60.0}
+} {1 10 20 2 30 40 3 50 60}
 do_test rtree-5.1.3 {
-  execsql { 
+  execsql_intout { 
     DELETE FROM t2 WHERE ii=2;
     SELECT * FROM t2 ORDER BY ii;
   }
-} {1 10.0 20.0 3 50.0 60.0}
+} {1 10 20 3 50 60}
 do_test rtree-5.1.4 {
-  execsql { 
+  execsql_intout { 
     DELETE FROM t2 WHERE ii=1;
     SELECT * FROM t2 ORDER BY ii;
   }
-} {3 50.0 60.0}
+} {3 50 60}
 do_test rtree-5.1.5 {
   execsql { 
     DELETE FROM t2 WHERE ii=3;
@@ -262,16 +279,16 @@ do_test rtree-6.1.1 {
   execsql { CREATE VIRTUAL TABLE t3 USING rtree(ii, x1, x2, y1, y2) }
 } {}
 do_test rtree-6.1.2 {
-  execsql {
+  execsql_intout {
     INSERT INTO t3 VALUES(1, 2, 3, 4, 5);
     UPDATE t3 SET x2=5;
     SELECT * FROM t3;
   }
-} {1 2.0 5.0 4.0 5.0}
+} {1 2 5 4 5}
 do_test rtree-6.1.3 {
   execsql { UPDATE t3 SET ii = 2 }
-  execsql { SELECT * FROM t3 }
-} {2 2.0 5.0 4.0 5.0}
+  execsql_intout { SELECT * FROM t3 }
+} {2 2 5 4 5}
 
 #----------------------------------------------------------------------------
 # Test cases rtree-7.* test rename operations.
@@ -284,29 +301,29 @@ do_test rtree-7.1.1 {
 } {}
 do_test rtree-7.1.2 {
   execsql { ALTER TABLE t4 RENAME TO t5 }
-  execsql { SELECT * FROM t5 }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM t5 }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.1.3 {
   db close
   sqlite3 db test.db
-  execsql { SELECT * FROM t5 }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM t5 }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.1.4 {
   execsql { ALTER TABLE t5 RENAME TO 'raisara "one"'''}
-  execsql { SELECT * FROM "raisara ""one""'" }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM "raisara ""one""'" }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.1.5 {
-  execsql { SELECT * FROM 'raisara "one"''' }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM 'raisara "one"''' }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.1.6 {
   execsql { ALTER TABLE "raisara ""one""'" RENAME TO "abc 123" }
-  execsql { SELECT * FROM "abc 123" }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM "abc 123" }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.1.7 {
   db close
   sqlite3 db test.db
-  execsql { SELECT * FROM "abc 123" }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM "abc 123" }
+} {1 2 3 4 5 6 7}
 
 # An error midway through a rename operation.
 do_test rtree-7.2.1 {
@@ -316,8 +333,8 @@ do_test rtree-7.2.1 {
   catchsql { ALTER TABLE "abc 123" RENAME TO t4 }
 } {1 {SQL logic error or missing database}}
 do_test rtree-7.2.2 {
-  execsql { SELECT * FROM "abc 123" }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM "abc 123" }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.2.3 {
   execsql { 
     DROP TABLE t4_node;
@@ -328,13 +345,13 @@ do_test rtree-7.2.3 {
 do_test rtree-7.2.4 {
   db close
   sqlite3 db test.db
-  execsql { SELECT * FROM "abc 123" }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM "abc 123" }
+} {1 2 3 4 5 6 7}
 do_test rtree-7.2.5 {
   execsql { DROP TABLE t4_rowid }
   execsql { ALTER TABLE "abc 123" RENAME TO t4 }
-  execsql { SELECT * FROM t4 }
-} {1 2.0 3.0 4.0 5.0 6.0 7.0}
+  execsql_intout { SELECT * FROM t4 }
+} {1 2 3 4 5 6 7}
 
 
 #----------------------------------------------------------------------------
@@ -416,4 +433,106 @@ do_test rtree-11.2 {
   }
 } {2}
 
+#-------------------------------------------------------------------------
+# Test on-conflict clause handling.
+#
+db_delete_and_reopen
+do_execsql_test 12.0.1 {
+  CREATE VIRTUAL TABLE t1 USING rtree_i32(idx, x1, x2, y1, y2);
+  INSERT INTO t1 VALUES(1,   1, 2, 3, 4);
+  SELECT substr(hex(data),1,56) FROM t1_node;
+} {00000001000000000000000100000001000000020000000300000004}
+do_execsql_test 12.0.2 {
+  INSERT INTO t1 VALUES(2,   2, 3, 4, 5);
+  INSERT INTO t1 VALUES(3,   3, 4, 5, 6);
+
+  CREATE TABLE source(idx, x1, x2, y1, y2);
+  INSERT INTO source VALUES(5, 8, 8, 8, 8);
+  INSERT INTO source VALUES(2, 7, 7, 7, 7);
+}
+db_save_and_close
+foreach {tn sql_template testdata} {
+  1    "INSERT %CONF% INTO t1 VALUES(2, 7, 7, 7, 7)" {
+    ROLLBACK 0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6}
+    ABORT    0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    IGNORE   0 0 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    FAIL     0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    REPLACE  0 0 {1 1 2 3 4   2 7 7 7 7   3 3 4 5 6   4 4 5 6 7}
+  }
+
+  2    "INSERT %CONF% INTO t1 SELECT * FROM source" {
+    ROLLBACK 1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6}
+    ABORT    1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    IGNORE   1 0 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7  5 8 8 8 8}
+    FAIL     1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7  5 8 8 8 8}
+    REPLACE  1 0 {1 1 2 3 4   2 7 7 7 7   3 3 4 5 6   4 4 5 6 7  5 8 8 8 8}
+  }
+
+  3    "UPDATE %CONF% t1 SET idx = 2 WHERE idx = 4" {
+    ROLLBACK 1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6}
+    ABORT    1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    IGNORE   1 0 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    FAIL     1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    REPLACE  1 0 {1 1 2 3 4   2 4 5 6 7   3 3 4 5 6}
+  }
+
+  3    "UPDATE %CONF% t1 SET idx = ((idx+1)%5)+1 WHERE idx > 2" {
+    ROLLBACK 1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6}
+    ABORT    1 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    IGNORE   1 0 {1 1 2 3 4   2 2 3 4 5               4 4 5 6 7   5 3 4 5 6}
+    FAIL     1 1 {1 1 2 3 4   2 2 3 4 5               4 4 5 6 7   5 3 4 5 6}
+    REPLACE  1 0 {1 4 5 6 7   2 2 3 4 5                           5 3 4 5 6}
+  }
+
+  4    "INSERT %CONF% INTO t1 VALUES(2, 7, 6, 7, 7)" {
+    ROLLBACK 0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6}
+    ABORT    0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    IGNORE   0 0 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    FAIL     0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+    REPLACE  0 1 {1 1 2 3 4   2 2 3 4 5   3 3 4 5 6   4 4 5 6 7}
+  }
+
+} {
+  foreach {mode uses error data} $testdata {
+    db_restore_and_reopen
+
+    set sql [string map [list %CONF% "OR $mode"] $sql_template]
+    set testname "12.$tn.[string tolower $mode]"
+
+    execsql {
+      BEGIN;
+        INSERT INTO t1 VALUES(4,   4, 5, 6, 7);
+    }
+
+    set res(0) {0 {}}
+    set res(1) {1 {constraint failed}}
+    do_catchsql_test $testname.1 $sql $res($error)
+    do_test $testname.2 [list sql_uses_stmt db $sql] $uses
+    do_execsql_test $testname.3 { SELECT * FROM t1 ORDER BY idx } $data
+
+    do_test $testname.4 { rtree_check db t1 } 0
+    db close
+  }
+}
+
+#-------------------------------------------------------------------------
+# Test that bug [d2889096e7bdeac6d] has been fixed.
+#
+reset_db
+do_execsql_test 13.1 {
+  CREATE VIRTUAL TABLE t9 USING rtree(id, xmin, xmax);
+  INSERT INTO t9 VALUES(1,0,0);            
+  INSERT INTO t9 VALUES(2,0,0);
+  SELECT * FROM t9 WHERE id IN (1, 2);
+} {1 0.0 0.0 2 0.0 0.0}
+
+do_execsql_test 13.2 {
+  WITH r(x) AS (
+    SELECT 1 UNION ALL
+    SELECT 2 UNION ALL
+    SELECT 3
+  )
+  SELECT * FROM r CROSS JOIN t9 WHERE id=x;
+} {1 1 0.0 0.0 2 2 0.0 0.0}
+
 finish_test