Add VerifyCookie instructions to "DROP XXX IF EXISTS" statements if the specified database object does not exist when the statement is prepared.

FossilOrigin-Name: a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd

6 files changed, 151 insertions, 14 deletions

diff --git a/manifest b/manifest
index 7b7d0cd93..e6ae39604 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sOP_VerifyCookie\sinstruction\sto\s"CREATE\sXXX\sIF\sNOT\sEXISTS"\scommands.\sThis\sway,\sif\sthe\sspecified\sdatabase\sobject\sexisted\swhen\sthe\sstatement\swas\scompiled\sbut\sremoved\sfrom\sthe\sdatabase\sbefore\ssqlite3_step()\swas\scalled,\sthe\sstatement\sstill\sworks\sas\sexpected\s(and\screates\sthe\sobject).
-D 2011-04-09T15:39:02.585
+C Add\sVerifyCookie\sinstructions\sto\s"DROP\sXXX\sIF\sEXISTS"\sstatements\sif\sthe\sspecified\sdatabase\sobject\sdoes\snot\sexist\swhen\sthe\sstatement\sis\sprepared.
+D 2011-04-09T17:32:58.132
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -124,7 +124,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 6a9164af8a2ef4612ee30b253635a9bd8e5e1b1b
 F src/btree.h 11753dd46597a20702bca8746cb4caa4486a82b5
 F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
-F src/build.c 84d4a8030d38c8f8cea6bbfa3b9a9e92932b0d03
+F src/build.c f09c46c66a1e7668c6ee25c9a2518aaa6842044c
 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
@@ -180,7 +180,7 @@ F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
 F src/shell.c 9c8389796764f65d4506bcd614ac8061f4160d5c
 F src/sqlite.h.in 4d28db70c37a1b17942820308eb59f211140da43
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
-F src/sqliteInt.h 9e53256aa7cb22ed2126c5350bc25e96bc7c4ed8
+F src/sqliteInt.h ac8f3f5846275c634f6649969304a9e97f6f9854
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -230,7 +230,7 @@ F src/test_vfstrace.c 2265c9895f350c8d3c39b079998fbe7481505cc1
 F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
-F src/trigger.c c31aeb3c33e8cef9029e83f5fd9111ef644ca6b9
+F src/trigger.c 144cc18bb701f3286484aae4292a9531f09278c8
 F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
 F src/util.c cd997077bad039efc0597eb027c929658f93c018
@@ -388,7 +388,7 @@ F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 F test/exclusive2.test 343d55130c12c67b8bf10407acec043a6c26c86b
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
-F test/exists.test 5e14325e4b2ea28709ff82d8d2605a129b5aec72
+F test/exists.test 81363f6982ea49dfd820a50845466390e60a4a0c
 F test/expr.test 19e8ac40313e2282a47b586d11c4892040990d3a
 F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
 F test/filectrl.test 97003734290887566e01dded09dc9e99cb937e9e
@@ -927,7 +927,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8a42e236701c8afd9ada7d4568712a21690ea087
-R 962a8a84c94502671291e1b24e5febe9
+P b9dbd9936191666c3fc9889e938344a82cc03aeb
+R 0b11aa72c3fba72615e4990e1f23fca6
 U dan
-Z a74ebc24c62ba84a876e128dc1be558a
+Z 1024ea561694dc92b045ac4bc887de85
diff --git a/manifest.uuid b/manifest.uuid
index 098921073..06d24001e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9dbd9936191666c3fc9889e938344a82cc03aeb
\ No newline at end of file
+a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 2d1d8dc6a..83a1db840 100644
--- a/src/build.c
+++ b/src/build.c
@@ -2003,6 +2003,7 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
   if( noErr ) db->suppressErr--;
 
   if( pTab==0 ){
+    if( noErr ) sqlite3CodeVerifyNamedSchema(pParse, pName->a[0].zDatabase);
     goto exit_drop_table;
   }
   iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
@@ -2917,6 +2918,8 @@ void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists){
   if( pIndex==0 ){
     if( !ifExists ){
       sqlite3ErrorMsg(pParse, "no such index: %S", pName, 0);
+    }else{
+      sqlite3CodeVerifyNamedSchema(pParse, pName->a[0].zDatabase);
     }
     pParse->checkSchema = 1;
     goto exit_drop_index;
@@ -3507,6 +3510,21 @@ void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
 }
 
 /*
+** If argument zDb is NULL, then call sqlite3CodeVerifySchema() for each 
+** attached database. Otherwise, invoke it for the database named zDb only.
+*/
+void sqlite3CodeVerifyNamedSchema(Parse *pParse, const char *zDb){
+  sqlite3 *db = pParse->db;
+  int i;
+  for(i=0; i<db->nDb; i++){
+    Db *pDb = &db->aDb[i];
+    if( pDb->pBt && (!zDb || 0==sqlite3StrICmp(zDb, pDb->zName)) ){
+      sqlite3CodeVerifySchema(pParse, i);
+    }
+  }
+}
+
+/*
 ** Generate VDBE code that prepares for doing an operation that
 ** might change the database.
 **
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d66374277..ea0925e41 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2768,6 +2768,7 @@ void sqlite3PrngRestoreState(void);
 void sqlite3PrngResetState(void);
 void sqlite3RollbackAll(sqlite3*);
 void sqlite3CodeVerifySchema(Parse*, int);
+void sqlite3CodeVerifyNamedSchema(Parse*, const char *zDb);
 void sqlite3BeginTransaction(Parse*, int);
 void sqlite3CommitTransaction(Parse*);
 void sqlite3RollbackTransaction(Parse*);
diff --git a/src/trigger.c b/src/trigger.c
index 8952ad59a..0f3f5bad3 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -502,6 +502,8 @@ void sqlite3DropTrigger(Parse *pParse, SrcList *pName, int noErr){
   if( !pTrigger ){
     if( !noErr ){
       sqlite3ErrorMsg(pParse, "no such trigger: %S", pName, 0);
+    }else{
+      sqlite3CodeVerifyNamedSchema(pParse, zDb);
     }
     pParse->checkSchema = 1;
     goto drop_trigger_cleanup;
diff --git a/test/exists.test b/test/exists.test
index 05914d3cc..db87afc78 100644
--- a/test/exists.test
+++ b/test/exists.test
@@ -19,11 +19,13 @@ source $testdir/lock_common.tcl
 
 set testprefix exists
 
+# This block of tests is targeted at CREATE XXX IF NOT EXISTS statements.
+#
 do_multiclient_test tn {
 
   # TABLE objects.
   #
-  do_test $tn.1.1 {
+  do_test 1.$tn.1.1 {
     sql2 { CREATE TABLE t1(x) }
     sql1 { CREATE TABLE IF NOT EXISTS t1(a, b) }
     sql2 { DROP TABLE t1 }
@@ -31,7 +33,7 @@ do_multiclient_test tn {
     sql2 { SELECT name FROM sqlite_master WHERE type = 'table' }
   } {t1}
 
-  do_test $tn.1.2 {
+  do_test 1.$tn.1.2 {
     sql2 { CREATE TABLE t2(x) }
     sql1 { CREATE TABLE IF NOT EXISTS t2 AS SELECT * FROM t1 }
     sql2 { DROP TABLE t2 }
@@ -42,7 +44,7 @@ do_multiclient_test tn {
 
   # INDEX objects.
   #
-  do_test $tn.2 {
+  do_test 1.$tn.2 {
     sql2 { CREATE INDEX i1 ON t1(a) }
     sql1 { CREATE INDEX IF NOT EXISTS i1 ON t1(a, b) }
     sql2 { DROP INDEX i1 }
@@ -52,7 +54,7 @@ do_multiclient_test tn {
 
   # VIEW objects.
   #
-  do_test $tn.3 {
+  do_test 1.$tn.3 {
     sql2 { CREATE VIEW v1 AS SELECT * FROM t1 }
     sql1 { CREATE VIEW IF NOT EXISTS v1 AS SELECT * FROM t1 }
     sql2 { DROP VIEW v1 }
@@ -69,7 +71,121 @@ sql1 { CREATE TRIGGER IF NOT EXISTS tr1 AFTER INSERT ON t1 BEGIN SELECT 1; END }
 sql1 { CREATE TRIGGER IF NOT EXISTS tr1 AFTER INSERT ON t1 BEGIN SELECT 1; END }
     sql2 { SELECT name FROM sqlite_master WHERE type = 'trigger' }
   } {tr1}
+}
+
+# This block of tests is targeted at DROP XXX IF EXISTS statements.
+#
+do_multiclient_test tn {
+
+  # TABLE objects.
+  #
+  do_test 2.$tn.1 {
+    sql1 { DROP TABLE IF EXISTS t1 }
+    sql2 { CREATE TABLE t1(x) }
+    sql1 { DROP TABLE IF EXISTS t1 }
+    sql2 { SELECT name FROM sqlite_master WHERE type = 'table' }
+  } {}
+
+  # INDEX objects.
+  #
+  do_test 2.$tn.2 {
+    sql1 { CREATE TABLE t2(x) }
+    sql1 { DROP INDEX IF EXISTS i2 }
+    sql2 { CREATE INDEX i2 ON t2(x) }
+    sql1 { DROP INDEX IF EXISTS i2 }
+    sql2 { SELECT name FROM sqlite_master WHERE type = 'index' }
+  } {}
+
+  # VIEW objects.
+  #
+  do_test 2.$tn.3 {
+    sql1 { DROP VIEW IF EXISTS v1 }
+    sql2 { CREATE VIEW v1 AS SELECT * FROM t2 }
+    sql1 { DROP VIEW IF EXISTS v1 }
+    sql2 { SELECT name FROM sqlite_master WHERE type = 'view' }
+  } {}
+  
+  # TRIGGER objects.
+  #
+  do_test 2.$tn.4 {
+    sql1 { DROP TRIGGER IF EXISTS tr1 }
+    sql2 { CREATE TRIGGER tr1 AFTER INSERT ON t2 BEGIN SELECT 1; END }
+    sql1 { DROP TRIGGER IF EXISTS tr1 }
+    sql2 { SELECT name FROM sqlite_master WHERE type = 'trigger' }
+  } {}
+}
+
+# This block of tests is targeted at DROP XXX IF EXISTS statements with
+# attached databases.
+#
+do_multiclient_test tn {
+
+  forcedelete test.db2
+  do_test 3.$tn.0 {
+    sql1 { ATTACH 'test.db2' AS aux }
+    sql2 { ATTACH 'test.db2' AS aux }
+  } {}
+
+  # TABLE objects.
+  #
+  do_test 3.$tn.1.1 {
+    sql1 { DROP TABLE IF EXISTS aux.t1 }
+    sql2 { CREATE TABLE aux.t1(x) }
+    sql1 { DROP TABLE IF EXISTS aux.t1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'table' }
+  } {}
+  do_test 3.$tn.1.2 {
+    sql1 { DROP TABLE IF EXISTS t1 }
+    sql2 { CREATE TABLE aux.t1(x) }
+    sql1 { DROP TABLE IF EXISTS t1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'table' }
+  } {}
+
+  # INDEX objects.
+  #
+  do_test 3.$tn.2.1 {
+    sql1 { CREATE TABLE aux.t2(x) }
+    sql1 { DROP INDEX IF EXISTS aux.i2 }
+    sql2 { CREATE INDEX aux.i2 ON t2(x) }
+    sql1 { DROP INDEX IF EXISTS aux.i2 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'index' }
+  } {}
+  do_test 3.$tn.2.2 {
+    sql1 { DROP INDEX IF EXISTS i2 }
+    sql2 { CREATE INDEX aux.i2 ON t2(x) }
+    sql1 { DROP INDEX IF EXISTS i2 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'index' }
+  } {}
 
+  # VIEW objects.
+  #
+  do_test 3.$tn.3.1 {
+    sql1 { DROP VIEW IF EXISTS aux.v1 }
+    sql2 { CREATE VIEW aux.v1 AS SELECT * FROM t2 }
+    sql1 { DROP VIEW IF EXISTS aux.v1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'view' }
+  } {}
+  do_test 3.$tn.3.2 {
+    sql1 { DROP VIEW IF EXISTS v1 }
+    sql2 { CREATE VIEW aux.v1 AS SELECT * FROM t2 }
+    sql1 { DROP VIEW IF EXISTS v1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'view' }
+  } {}
+  
+  # TRIGGER objects.
+  #
+  do_test 3.$tn.4.1 {
+    sql1 { DROP TRIGGER IF EXISTS aux.tr1 }
+    sql2 { CREATE TRIGGER aux.tr1 AFTER INSERT ON t2 BEGIN SELECT 1; END }
+    sql1 { DROP TRIGGER IF EXISTS aux.tr1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'trigger' }
+  } {}
+  do_test 3.$tn.4.2 {
+    sql1 { DROP TRIGGER IF EXISTS tr1 }
+    sql2 { CREATE TRIGGER aux.tr1 AFTER INSERT ON t2 BEGIN SELECT 1; END }
+    sql1 { DROP TRIGGER IF EXISTS tr1 }
+    sql2 { SELECT name FROM aux.sqlite_master WHERE type = 'trigger' }
+  } {}
 }