Prohibit the user from changing the temporary storage medium (pragma temp_store)...

FossilOrigin-Name: 92e0cf9a08a8b337a8f239afb048a0e045485771

diff --git a/manifest b/manifest
index 849ef596da3488a9c6c4cd4b614e25132555a1cd..20e3821d7159e744e23a4510abfda568957b4529 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C change\sto\suse\ssqlite_uint64\sfor\sMSVC\scompile;\s(CVS\s5361)
-D 2008-07-08T03:04:59
+C Prohibit\sthe\suser\sfrom\schanging\sthe\stemporary\sstorage\smedium\s(pragma\stemp_store)\swhile\sthere\sis\sa\sread\stransaction\sopen\son\sthe\stemporary\sdatabase.\sAdd\stests\sto\sshared.test\sto\scover\sa\sfew\smore\slines\sin\sbtree.c.\s(CVS\s5362)
+D 2008-07-08T07:35:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -136,7 +136,7 @@ F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
 F src/pager.c 2cd554d474cfa0228ece30645fe7bb7d1f6824c7
 F src/pager.h 6aa3050a3c684475a5a9dbad5ff1cebad612acba
 F src/parse.y 8c2c3145eebe1964eb279cb3c4e502eae28bb0fa
-F src/pragma.c 9a95f5b3708f6d3ddd987eab5f369a19ffcb6795
+F src/pragma.c 6fad83fbcc7ec6e76d91fe2805fe972ff3af6a0c
 F src/prepare.c aba51dad52308e3d9d2074d8ff4e612e7f1cab51
 F src/printf.c 8b063da9dcde26b7c500a01444b718d86f21bc6e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
@@ -426,7 +426,7 @@ F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 6df72c441db0a037b7ec6990d16311c24fbea77b
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
 F test/permutations.test af83024a469d1cade2a6ca9ce33e61bcdd7c2672
-F test/pragma.test 44bc52afa72cabfeae82641e0033ca24919f3ce8
+F test/pragma.test e1984ed47f699a4a817008dab4111be31ee8b935
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test b04797fc069ffad3ec2e45980bbfa1671dd66550
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
@@ -453,7 +453,7 @@ F test/select9.test b4007b15396cb7ba2615cab31e1973b572e43210
 F test/selectA.test e4501789a1d0fe9d00db15187623fb5b7031357b
 F test/selectB.test 811a852ad6567f3d6f786619511f9c4b2ed1defd
 F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
-F test/shared.test c6769531e0cb751d46a9838c0532d3786606c0f6
+F test/shared.test f1066281aa19517ab8dbe76328afadff76516f67
 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4
 F test/shared3.test 987316be601e2349e6a340a6d5f8ed981e507931
 F test/shared_err.test 776ab7196ecda8b07a075e115b0725806991e151
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 6f2629c78327bb6cbb15d1f9900a1ef58f2d37dd
-R 18a26bc89f174a9c318cb7d42425a4b2
-U shane
-Z 6593495d35209a42e3237ec7dfb5e511
+P 369118ca2e9da55f44b946559ad38a14efe723e5
+R 64f2b20fec791858c79e62a22bfbc726
+U danielk1977
+Z 21ef773aee8047e84e0c419b111a78b2

diff --git a/manifest.uuid b/manifest.uuid
index 7fdc0daedded618efdc12ed40ec66173086b7471..ef914a91e8f1e82abde318dd5676a8debda20389 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-369118ca2e9da55f44b946559ad38a14efe723e5
\ No newline at end of file
+92e0cf9a08a8b337a8f239afb048a0e045485771
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 79a9d89c3023dbfa349d86beca909e28624469c1..bac601c0c33e3849a481759dc87d10b57a02e228 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.181 2008/06/26 10:54:12 danielk1977 Exp $
+** $Id: pragma.c,v 1.182 2008/07/08 07:35:52 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -111,7 +111,7 @@ static int getTempStore(const char *z){
 static int invalidateTempStorage(Parse *pParse){
   sqlite3 *db = pParse->db;
   if( db->aDb[1].pBt!=0 ){
-    if( !db->autoCommit ){
+    if( !db->autoCommit || sqlite3BtreeIsInReadTrans(db->aDb[1].pBt) ){
       sqlite3ErrorMsg(pParse, "temporary storage cannot be changed "
         "from within a transaction");
       return SQLITE_ERROR;

diff --git a/test/pragma.test b/test/pragma.test
index a97d58a6730169f550f1f65248f03c4f06ab14d6..7ce972eb83d52b51ccb3c892b3ee16e2ec8f6374 100644 (file)
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.62 2008/06/23 16:53:47 danielk1977 Exp $
+# $Id: pragma.test,v 1.63 2008/07/08 07:35:52 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -977,6 +977,23 @@ do_test pragma-9.16 {
     COMMIT;
   }
 } {{valuable data}}
+
+do_test pragma-9.17 {
+  execsql {
+    INSERT INTO temp_table VALUES('valuable data II');
+    SELECT * FROM temp_table;
+  }
+} {{valuable data} {valuable data II}}
+
+do_test pragma-9.18 {
+  set rc [catch {
+    db eval {SELECT t FROM temp_table} {
+      execsql {pragma temp_store = 1}
+    }
+  } msg]
+  list $rc $msg
+} {1 {temporary storage cannot be changed from within a transaction}}
+
 } ;# ifcapable pager_pragmas
 
 ifcapable trigger {

diff --git a/test/shared.test b/test/shared.test
index 3ae59093446e7e005fd3f46b063db19644c5bc08..656ca501940ae0180125aea35e728e917bc2ed30 100644 (file)
--- a/test/shared.test
+++ b/test/shared.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared.test,v 1.32 2008/05/19 20:11:40 shane Exp $
+# $Id: shared.test,v 1.33 2008/07/08 07:35:52 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -938,6 +938,68 @@ do_test shared-$av.12.X {
   }
 } {}
 
+# Internally, locks are acquired on shared B-Tree structures in the order
+# that the structures appear in the virtual memory address space. This
+# test case attempts to cause the order of the structures in memory 
+# to be different from the order in which they are attached to a given
+# database handle. This covers an extra line or two.
+#
+do_test shared-$av.13.1 {
+  file delete -force test2.db test3.db test4.db test5.db
+  sqlite3 db :memory:
+  execsql {
+    ATTACH 'test2.db' AS aux2;
+    ATTACH 'test3.db' AS aux3;
+    ATTACH 'test4.db' AS aux4;
+    ATTACH 'test5.db' AS aux5;
+    DETACH aux2;
+    DETACH aux3;
+    DETACH aux4;
+    ATTACH 'test2.db' AS aux2;
+    ATTACH 'test3.db' AS aux3;
+    ATTACH 'test4.db' AS aux4;
+  }
+} {}
+do_test shared-$av.13.2 {
+  execsql {
+    CREATE TABLE t1(a, b, c);
+    CREATE TABLE aux2.t2(a, b, c);
+    CREATE TABLE aux3.t3(a, b, c);
+    CREATE TABLE aux4.t4(a, b, c);
+    CREATE TABLE aux5.t5(a, b, c);
+    SELECT count(*) FROM 
+      aux2.sqlite_master, 
+      aux3.sqlite_master, 
+      aux4.sqlite_master, 
+      aux5.sqlite_master
+  }
+} {1}
+do_test shared-$av.13.3 {
+  db close
+} {}
+
+# Test that nothing horrible happens if a connection to a shared B-Tree 
+# structure is closed while some other connection has an open cursor.
+#
+do_test shared-$av.14.1 {
+  sqlite3 db test.db
+  sqlite3 db2 test.db
+  execsql {SELECT name FROM sqlite_master}
+} {db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 db11 db12 db13 db14}
+do_test shared-$av.14.2 {
+  set res [list]
+  db eval {SELECT name FROM sqlite_master} {
+    if {$name eq "db7"} {
+      db2 close
+    }
+    lappend res $name
+  }
+  set res
+} {db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 db11 db12 db13 db14}
+do_test shared-$av.14.3 {
+  db close
+} {}
+
 }
 
 sqlite3_enable_shared_cache $::enable_shared_cache