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

third_party/sqlite/src/test/savepoint.test

 # 2008 December 15
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
 #
 #    May you do good and not evil.
 #    May you find forgiveness for yourself and forgive others.
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
@@ skipping 285 matching lines @@
   
   do_test savepoint-5.2 {
     execsql  {RELEASE abc}
     catchsql {RELEASE abc}
   } {1 {no such savepoint: abc}}
   
   do_test savepoint-5.3.1 {
     execsql  {SAVEPOINT abc}
     catchsql {ROLLBACK TO def}
   } {1 {no such savepoint: def}}
-  do_test savepoint-5.3.2 {
+  do_test savepoint-5.3.2.1 {
     execsql  {SAVEPOINT def}
     set fd [db incrblob -readonly blobs x 1]
+    set rc [catch {seek $fd 0;read $fd} res]
+    lappend rc $res
+  } {0 {hellontyeight character blob}}
+  do_test savepoint-5.3.2.2 {
     catchsql {ROLLBACK TO def}
-  } {1 {cannot rollback savepoint - SQL statements in progress}}
+  } {0 {}}
+  do_test savepoint-5.3.2.3 {
+    set rc [catch {seek $fd 0; read $fd} res]
+    set rc
+  } {0}
   do_test savepoint-5.3.3 {
     catchsql  {RELEASE def}
   } {0 {}}
   do_test savepoint-5.3.4 {
     close $fd
     execsql  {savepoint def}
     set fd [db incrblob blobs x 1]
     catchsql {release def}
   } {1 {cannot release savepoint - SQL statements in progress}}
   do_test savepoint-5.3.5 {
@@ skipping 43 matching lines @@
   } {2}
 }
 wal_check_journal_mode savepoint-5.5
 
 #-------------------------------------------------------------------------
 # The following tests, savepoint-6.*, test an incr-vacuum inside of a
 # couple of nested savepoints.
 #
 ifcapable {autovacuum && pragma} {
   db close
-  file delete -force test.db
+  forcedelete test.db
   sqlite3 db test.db
 
   do_test savepoint-6.1 {
     execsql { PRAGMA auto_vacuum = incremental }
     wal_set_journal_mode
     execsql {
       CREATE TABLE t1(a, b, c);
       CREATE INDEX i1 ON t1(a, b);
       BEGIN;
       INSERT INTO t1 VALUES(randstr(10,400),randstr(10,400),randstr(10,400));
@@ skipping 27 matching lines @@
   integrity_check savepoint-6.4
 
   wal_check_journal_mode savepoint-6.5
 }
 
 #-------------------------------------------------------------------------
 # The following tests, savepoint-7.*, attempt to break the logic 
 # surrounding savepoints by growing and shrinking the database file.
 #
 db close
-file delete -force test.db
+forcedelete test.db
 sqlite3 db test.db
 
 do_test savepoint-7.1 {
   execsql { PRAGMA auto_vacuum = incremental }
   wal_set_journal_mode
   execsql {
     PRAGMA cache_size = 10;
     BEGIN;
     CREATE TABLE t1(a PRIMARY KEY, b);
       INSERT INTO t1(a) VALUES('alligator');
@@ skipping 50 matching lines @@
           INSERT INTO t2 SELECT a, b FROM t1;
         ROLLBACK TO two;
     COMMIT;
   }
   execsql { PRAGMA integrity_check }
 } {ok}
 wal_check_journal_mode savepoint-7.3.3
 
 do_test savepoint-7.4.1 {
   db close
-  file delete -force test.db
+  forcedelete test.db
   sqlite3 db test.db
   execsql { PRAGMA auto_vacuum = incremental }
   wal_set_journal_mode
   execsql {
     CREATE TABLE t1(a, b, PRIMARY KEY(a, b));
     INSERT INTO t1 VALUES(randstr(1000,1000), randstr(1000,1000));
     BEGIN;
       DELETE FROM t1;
       SAVEPOINT one;
       PRAGMA incremental_vacuum;
@@ skipping 42 matching lines @@
 } {}
 do_test savepoint-8-2 {
   execsql { SAVEPOINT "Including whitespace " }
   execsql { RELEASE "including Whitespace " }
 } {}
 
 # Test that the authorization callback works.
 #
 ifcapable auth {
   proc auth {args} {
-    eval lappend ::authdata $args
+    eval lappend ::authdata [lrange $args 0 4]
     return SQLITE_OK
   }
   db auth auth
 
   do_test savepoint-9.1 {
     set ::authdata [list]
     execsql { SAVEPOINT sp1 }
     set ::authdata
   } {SQLITE_SAVEPOINT BEGIN sp1 {} {}}
   do_test savepoint-9.2 {
     set ::authdata [list]
     execsql { ROLLBACK TO sp1 }
     set ::authdata
   } {SQLITE_SAVEPOINT ROLLBACK sp1 {} {}}
   do_test savepoint-9.3 {
     set ::authdata [list]
     execsql { RELEASE sp1 }
     set ::authdata
   } {SQLITE_SAVEPOINT RELEASE sp1 {} {}}
 
   proc auth {args} {
-    eval lappend ::authdata $args
+    eval lappend ::authdata [lrange $args 0 4]
     return SQLITE_DENY
   }
   db auth auth
 
   do_test savepoint-9.4 {
     set ::authdata [list]
     set res [catchsql { SAVEPOINT sp1 }]
     concat $::authdata $res
   } {SQLITE_SAVEPOINT BEGIN sp1 {} {} 1 {not authorized}}
   do_test savepoint-9.5 {
@@ skipping 44 matching lines @@
 
 # The lock state of the TEMP database can vary if SQLITE_TEMP_STORE=3
 # And the following set of tests is only really interested in the status
 # of the aux1 and aux2 locks.  So record the current lock status of
 # TEMP for use in the answers.
 set templockstate [lindex [db eval {PRAGMA lock_status}] 3]
 
 
 if {[wal_is_wal_mode]==0} {
   do_test savepoint-10.2.1 {
-    file delete -force test3.db
-    file delete -force test2.db
+    forcedelete test3.db
+    forcedelete test2.db
     execsql {
       ATTACH 'test2.db' AS aux1;
       ATTACH 'test3.db' AS aux2;
       DROP TABLE t1;
       CREATE TABLE main.t1(x, y);
       CREATE TABLE aux1.t2(x, y);
       CREATE TABLE aux2.t3(x, y);
-      SELECT name FROM sqlite_master 
-        UNION ALL
-      SELECT name FROM aux1.sqlite_master 
-        UNION ALL
+      SELECT name FROM sqlite_master;
+      SELECT name FROM aux1.sqlite_master;
       SELECT name FROM aux2.sqlite_master;
     }
   } {t1 t2 t3}
   do_test savepoint-10.2.2 {
     execsql { PRAGMA lock_status }
   } [list main unlocked temp $templockstate aux1 unlocked aux2 unlocked]
   
   do_test savepoint-10.2.3 {
     execsql {
       SAVEPOINT one;
@@ skipping 18 matching lines @@
     execsql { SELECT * FROM t2 }
   } {5 6}
   do_test savepoint-10.2.7 {
     execsql { ROLLBACK TO two }
     execsql { SELECT * FROM t2 }
   } {}
   do_test savepoint-10.2.8 {
     execsql { PRAGMA lock_status }
   } [list main reserved temp $templockstate aux1 reserved aux2 reserved]
   do_test savepoint-10.2.9 {
-    execsql { SELECT 'a', * FROM t1 UNION ALL SELECT 'b', * FROM t3 }
+    execsql { SELECT 'a', * FROM t1 ; SELECT 'b', * FROM t3 }
   } {a 1 2 b 3 4}
   do_test savepoint-10.2.9 {
     execsql {
       INSERT INTO t2 VALUES(5, 6);
       RELEASE one;
     }
     execsql { 
       SELECT * FROM t1;
       SELECT * FROM t2;
       SELECT * FROM t3;
@@ skipping 50 matching lines @@
   } [list main unlocked temp $templockstate aux1 unlocked aux2 unlocked]
 }
 
 #-------------------------------------------------------------------------
 # The following tests - savepoint-11.* - test the interaction of 
 # savepoints and creating or dropping tables and indexes in 
 # auto-vacuum mode.
 # 
 do_test savepoint-11.1 {
   db close
-  file delete -force test.db
+  forcedelete test.db
   sqlite3 db test.db
   execsql { PRAGMA auto_vacuum = full; }
   wal_set_journal_mode
   execsql {
     CREATE TABLE t1(a, b, UNIQUE(a, b));
     INSERT INTO t1 VALUES(1, randstr(1000,1000));
     INSERT INTO t1 VALUES(2, randstr(1000,1000));
   }
 } {}
 do_test savepoint-11.2 {
@@ skipping 69 matching lines @@
   # later on.
   # 
   catchsql {
     BEGIN;
       INSERT INTO t4 VALUES(2, 'two');
       SAVEPOINT sp1;
         INSERT INTO t4 VALUES(3, 'three');
         SAVEPOINT sp2;
           INSERT OR ROLLBACK INTO t4 VALUES(1, 'one');
   }
-} {1 {column a is not unique}}
+} {1 {UNIQUE constraint failed: t4.a}}
 do_test savepoint-12.3 {
   sqlite3_get_autocommit db
 } {1}
 do_test savepoint-12.4 {
   execsql { SAVEPOINT one }
 } {}
 wal_check_journal_mode savepoint-12.5
 
 #-------------------------------------------------------------------------
 # The following tests - savepoint-13.* - test the interaction of 
 # savepoints and "journal_mode = off".
 # 
 if {[wal_is_wal_mode]==0} {
   do_test savepoint-13.1 {
     db close
-    catch {file delete -force test.db}
+    catch {forcedelete test.db}
     sqlite3 db test.db
     execsql {
       BEGIN;
         CREATE TABLE t1(a PRIMARY KEY, b);
         INSERT INTO t1 VALUES(1, 2);
       COMMIT;
       PRAGMA journal_mode = off;
     }
   } {off}
   do_test savepoint-13.2 {
@@ skipping 20 matching lines @@
         SAVEPOINT s1;
           INSERT INTO t1 VALUES(15, 16);
         ROLLBACK TO s1;
       ROLLBACK;
       SELECT * FROM t1;
     }
   } {1 2 3 4 5 6 7 8 9 10 11 12}
 }
 
 db close
-file delete test.db
+delete_file test.db
 do_multiclient_test tn {
   do_test savepoint-14.$tn.1 {
     sql1 {
       CREATE TABLE foo(x);
       INSERT INTO foo VALUES(1);
       INSERT INTO foo VALUES(2);
     }
     sql2 {
       BEGIN;
         SELECT * FROM foo;
@@ skipping 113 matching lines @@
     ROLLBACK TO one;
     SELECT * FROM t6;
   ROLLBACK;
 } {1 2}
 
 do_execsql_test savepoint-17.2 {
   CREATE TABLE t6(a, b);
 } {}
 
 finish_test