Improve coverage of expr.c and btree.c slightly. (CVS 2992)

FossilOrigin-Name: cc2e8e87cfd474b4dc6833ee0c38e2cd2dd3a494

test/shared.test

@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared.test,v 1.19 2006/01/19 08:43:32 danielk1977 Exp $
+# $Id: shared.test,v 1.20 2006/01/23 05:50:58 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -63,6 +63,7 @@ incr av
 # shared-8.*: Tests related to the text encoding of shared-cache databases.
 # shared-9.*: TEMP triggers and shared-cache databases.
 # shared-10.*: Tests of sqlite3_close().
+# shared-11.*: Test transaction locking.
 #
 
 do_test shared-$av.1.1 {
@@ -787,6 +788,64 @@ do_test shared-$av.10.11 {
   db3 close
 } {}
 
+do_test shared-$av.11.1 {
+  file delete -force test.db
+  sqlite3 db  test.db
+  sqlite3 db2 test.db
+  execsql {
+    CREATE TABLE abc(a, b, c);
+    CREATE TABLE abc2(a, b, c);
+    BEGIN;
+    INSERT INTO abc VALUES(1, 2, 3);
+  }
+} {}
+do_test shared-$av.11.2 {
+  catchsql {BEGIN;} db2
+  catchsql {SELECT * FROM abc;} db2
+} {1 {database table is locked: abc}}
+do_test shared-$av.11.3 {
+  catchsql {BEGIN} db2
+} {1 {cannot start a transaction within a transaction}}
+do_test shared-$av.11.4 {
+  catchsql {SELECT * FROM abc2;} db2
+} {0 {}}
+do_test shared-$av.11.5 {
+  catchsql {INSERT INTO abc2 VALUES(1, 2, 3);} db2
+} {1 {database is locked}}
+do_test shared-$av.11.6 {
+  catchsql {SELECT * FROM abc2}
+} {0 {}}
+do_test shared-$av.11.6 {
+  execsql {
+    ROLLBACK;
+    PRAGMA read_uncommitted = 1;
+  } db2
+} {}
+do_test shared-$av.11.7 {
+  execsql {
+    INSERT INTO abc2 VALUES(4, 5, 6);
+    INSERT INTO abc2 VALUES(7, 8, 9);
+  }
+} {}
+do_test shared-$av.11.8 {
+  set res [list]
+  breakpoint
+  db2 eval {
+    SELECT abc.a as I, abc2.a as II FROM abc, abc2;
+  } {
+    execsql {
+      DELETE FROM abc WHERE 1;
+    }
+    lappend res $I $II
+  }
+  set res
+} {1 4 {} 7}
+
+do_test shared-$av.11.11 {
+  db close
+  db2 close
+} {}
+
 }
 
 sqlite3_enable_shared_cache $::enable_shared_cache

test/shared_err.test

@@ -13,7 +13,7 @@
 # cache context. What happens to connection B if one connection A encounters
 # an IO-error whilst reading or writing the file-system?
 #
-# $Id: shared_err.test,v 1.3 2006/01/21 12:08:55 danielk1977 Exp $
+# $Id: shared_err.test,v 1.4 2006/01/23 05:50:58 danielk1977 Exp $
 
 proc skip {args} {}
 
@@ -310,6 +310,16 @@ do_malloc_test 4 -tclprep {
   db2 close
 }
 
+do_malloc_test 5 -tclbody {
+  sqlite3 dbX test.db
+  sqlite3 dbY test.db
+  dbX close
+  dbY close
+} -cleanup {
+  catch {dbX close}
+  catch {dbY close}
+}
+
 catch {db close}
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test