Fix a memory leak in triggers and update tests to show the latest error

message text. (CVS 886)

FossilOrigin-Name: b90d9de32d10a71fe81f5bfd0cf57faae8c5c3b4

diff --git a/manifest b/manifest
index a3ec3901f9a88e8ad31476c4098cf511b8c3139c..ac58958ed920b534055f2899634bca7147cd65af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Regression\stests\snow\swork\s-\sexcept\sfor\ssome\schanges\sin\serror\smessage\ntext.\s\sThe\slibrary\sis\snow\ssafe\sto\suse\sfor\sexperimental\swork.\s(CVS\s885)
-D 2003-03-27T13:50:00
+C Fix\sa\smemory\sleak\sin\striggers\sand\supdate\stests\sto\sshow\sthe\slatest\serror\nmessage\stext.\s(CVS\s886)
+D 2003-03-30T00:19:50
 F Makefile.in 6917c2149a586f11b47c428f2ba748eb1da04f69
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -22,7 +22,7 @@ F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/auth.c f37bfc9451b8c1fa52f34adff474560018892729
 F src/btree.c 327819bb858d534072f5004973f8bcdd50f133d6
 F src/btree.h 8209bfadf5845d4fdaa60f471bb360f894cd4095
-F src/build.c 0c14b18192a825a18c5c03df5c2db0e6f85ed44b
+F src/build.c afe256e29f62733d8d8816c220eb822a6317a444
 F src/delete.c 923497248e0ff9097a595c6333ec6d67fe6650b5
 F src/encode.c faf03741efe921755ec371cf4a6984536de00042
 F src/expr.c eae205a27ec45232f234f281f8827c3be58b303d
@@ -51,7 +51,7 @@ F src/test2.c 5014337d8576b731cce5b5a14bec4f0daf432700
 F src/test3.c c12ea7f1c3fbbd58904e81e6cb10ad424e6fc728
 F src/threadtest.c d641a5219e718e18a1a80a50eb9bb549f451f42e
 F src/tokenize.c 675b4718d17c69fe7609dc8e85e426ef002be811
-F src/trigger.c 64ad4be538e524b0dff0c377debf62fe54cc8c17
+F src/trigger.c b07dc1ff60f2b18a701a85b83577a967e193dee2
 F src/update.c ab8c48ce00747ccf8f449f7f51ae56e08b5428ba
 F src/util.c 73b668d1ed468df650dc00685a5e4ffa6887feb4
 F src/vdbe.c 7171dbe873760f403b2501e96fd3d1bd852b3ce8
@@ -74,7 +74,7 @@ F test/fkey1.test d65c824459916249bee501532d6154ddab0b5db7
 F test/format3.test 64ab6c4db132b28a645996d413530f7b2a462cc2
 F test/func.test 000515779001ac6899eec4b54e65c6e2501279d4
 F test/in.test 3171a2b3170a8223665c1a4f26be5f3eda36cc4b
-F test/index.test 2a5a1b654f50ca0768fb10ae44b72e6a776b1f18
+F test/index.test faeb1bcf776e3ff9ba1b4be1eadd1fece708aa7b
 F test/insert.test a122afb86911e77c181d912348866a5b1a61eeab
 F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
 F test/intpkey.test 39f49fd993350f7f3ab255e5cfbf9a09d8f8800e
@@ -107,10 +107,10 @@ F test/subselect.test f0fea8cf9f386d416d64d152e3c65f9116d0f50f
 F test/table.test 371a1fc1c470982b2f68f9732f903a5d96f949c4
 F test/tableapi.test 3c80421a889e1d106df16e5800fa787f0d2914a6
 F test/tclsqlite.test f650195b8124aca24bee175393a1ed2e5a544a38
-F test/temptable.test 03b7bdb7d6ce2c658ad20c94b037652c6cad34e0
+F test/temptable.test 6feff1960c707e924d5462356c5303943dac4a8e
 F test/tester.tcl d7a5835edaf118539241145d8188f0822b673488
 F test/trans.test 75e7a171b5d2d94ee56766459113e2ad0e5f809d
-F test/trigger1.test ec1da76e1a9f618deb96e505f459dcf8a23f2247
+F test/trigger1.test 6fa21c3996e5543b4b6ceb8def84472002ab25e7
 F test/trigger2.test ab4c743bb96cee96ab5a17c5edfd57a9134329d6
 F test/trigger3.test 870afef7997a5b86bf3ea893ce0c2e85d6356c72
 F test/trigger4.test 9a5c1406344d743020c2753ae8d6dfe6eb75f818
@@ -156,7 +156,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 7672914b196cd55744edda8e5d8f1b7b86f898f9
-R ef1de606572d96575e808b13bdc2a270
+P 8a593e9c2d57e758739a7ef54fa40ca6a0071a9a
+R 12ff781420cd36c65ce42f0a8d453f00
 U drh
-Z 5cf2b764f7e1375be431b06267e44f31
+Z cae0b1f447565e6a34dea07e18ae8c1a

diff --git a/manifest.uuid b/manifest.uuid
index 85379b11b953f7a9b5cf71838359d41941d1acc2..960a310cf0aa4182a7c9de2ddeb1948a08aa919b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a593e9c2d57e758739a7ef54fa40ca6a0071a9a
\ No newline at end of file
+b90d9de32d10a71fe81f5bfd0cf57faae8c5c3b4
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 12f54a59b441aa2be88ad4a1b297bb24950f5d6b..141d15f14b21e784a9c63d3e9758dab9ce4c1ebc 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -25,7 +25,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.135 2003/03/27 13:50:00 drh Exp $
+** $Id: build.c,v 1.136 2003/03/30 00:19:50 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1452,7 +1452,13 @@ void sqliteCreateIndex(
     pTab =  pParse->pNewTable;
   }
   if( pTab==0 || pParse->nErr ) goto exit_create_index;
-  if( !isTemp && (pTab->readOnly || pTab->iDb>=2) ){
+  if( pTab->readOnly ){
+    sqliteSetString(&pParse->zErrMsg, "table ", pTab->zName,
+      " may not be indexed", 0);
+    pParse->nErr++;
+    goto exit_create_index;
+  }
+  if( !isTemp && pTab->iDb>=2 ){
     sqliteSetString(&pParse->zErrMsg, "table ", pTab->zName, 
       " may not have non-temporary indices added", 0);
     pParse->nErr++;

diff --git a/src/trigger.c b/src/trigger.c
index 2b7d35a245caa7bd7e49865a1b0232d78ee1486c..7e48e4d5758a0626dbaf6fd1281dfb8927cc996c 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -171,6 +171,7 @@ void sqliteCreateTrigger(
     /* Attach it to the table object */
     nt->pNext = tab->pTrigger;
     tab->pTrigger = nt;
+    sqliteSrcListDelete(pTableName);
     return;
   }else{
     sqliteFree(nt->name);
@@ -380,7 +381,7 @@ void sqliteDropTrigger(Parse *pParse, SrcList *pName, int nested){
     if( pTable->iDb ) code = SQLITE_DROP_TEMP_TRIGGER;
     if( sqliteAuthCheck(pParse, code, pTrigger->name, pTable->zName) ||
       sqliteAuthCheck(pParse, SQLITE_DELETE, SCHEMA_TABLE(pTable->iDb),0) ){
-      return;
+      goto drop_trigger_cleanup;
     }
   }
 #endif

diff --git a/test/index.test b/test/index.test
index dc20dbd750064bda34d02a08d3d53af756cfb167..4101be4376c82c8d986d1c2b9e814553e01ef85f 100644 (file)
--- a/test/index.test
+++ b/test/index.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the CREATE INDEX statement.
 #
-# $Id: index.test,v 1.20 2002/08/13 23:02:58 drh Exp $
+# $Id: index.test,v 1.21 2003/03/30 00:19:50 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -160,7 +160,7 @@ do_test index-4.13 {
 do_test index-5.1 {
   set v [catch {execsql {CREATE INDEX index1 ON sqlite_master(name)}} msg]
   lappend v $msg
-} {1 {table sqlite_master may not have new indices added}}
+} {1 {table sqlite_master may not be indexed}}
 do_test index-5.2 {
   execsql {SELECT name FROM sqlite_master WHERE type!='meta'}
 } {}

diff --git a/test/temptable.test b/test/temptable.test
index 45061be8a42ed5b41081f858fdd4fa2979ff81ec..1c427a19ad8cadcdcae1c47ccd39e367592179fb 100644 (file)
--- a/test/temptable.test
+++ b/test/temptable.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for temporary tables and indices.
 #
-# $Id: temptable.test,v 1.8 2002/09/02 12:14:51 drh Exp $
+# $Id: temptable.test,v 1.9 2003/03/30 00:19:50 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -166,17 +166,28 @@ do_test temptable-4.3 {
     SELECT * FROM t2;
   } db2
 } {1 {database schema has changed}}
-do_test temptable-4.4 {
+do_test temptable-4.4.1 {
+  catchsql {
+    SELECT * FROM temp.t2;
+  } db2
+} {0 {10 20}}
+do_test temptable-4.4.2 {
+  catchsql {
+    SELECT * FROM main.t2;
+  } db2
+} {0 {9 8 7}}
+do_test temptable-4.4.3 {
+  # TEMP takes precedence over MAIN
   catchsql {
     SELECT * FROM t2;
   } db2
 } {0 {10 20}}
 do_test temptable-4.5 {
   catchsql {
-    DROP TABLE t2;
-    SELECT * FROM t2;
+    DROP TABLE t2;     -- should drop TEMP
+    SELECT * FROM t2;  -- data should be from MAIN
   } db2
-} {1 {no such table: t2}}
+} {0 {9 8 7}}
 do_test temptable-4.6 {
   db2 close
   sqlite db2 ./test.db
@@ -223,10 +234,10 @@ do_test temptable-4.12 {
 } {3 4}
 do_test temptable-4.13 {
   catchsql {
-    DROP TABLE t2;
-    SELECT * FROM t2;
+    DROP TABLE t2;     -- drops TEMP.T2
+    SELECT * FROM t2;  -- uses MAIN.T2
   } db2
-} {1 {no such table: t2}}
+} {0 {3 4}}
 do_test temptable-4.14 {
   execsql {
     SELECT * FROM t2;

diff --git a/test/trigger1.test b/test/trigger1.test
index b5815b370268f975f03b2180f07947638b7d372a..72d4620378e94a1f2f5831070ab1f1b848bad48d 100644 (file)
--- a/test/trigger1.test
+++ b/test/trigger1.test
@@ -114,7 +114,7 @@ do_test trigger1-1.9 {
        SELECT * FROM sqlite_master;
     END;
   }
-} {1 {cannot create trigger on system table: sqlite_master}}
+} {1 {cannot create trigger on system table}}
 
 # Check to make sure that a DELETE statement within the body of
 # a trigger does not mess up the DELETE that caused the trigger to