UPDATE triggers on TEMP tables were broken. (CVS 693)

FossilOrigin-Name: c080ed01ea51628b86050762f097e702e3aeafdf

diff --git a/manifest b/manifest
index 8378f4d02687e84a8e6ebfc046606ddb3ab0331a..5ac10bda3bd8aafc0edfedf7c4704f8d67c4097b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.6.1\s(CVS\s691)
-D 2002-07-19T19:04:05
+C UPDATE\striggers\son\sTEMP\stables\swere\sbroken.\s(CVS\s693)
+D 2002-07-21T23:09:55
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -50,7 +50,7 @@ F src/test3.c fda085b4cdd5a2d7f65786ce679036e955f4bfa2
 F src/threadtest.c 72bce0a284647314847bbea44616ceb056bfb77f
 F src/tokenize.c b5500e193a82b5b9888fbf947efd90d3b4858178
 F src/trigger.c d88ab4d68d68955c217b38fb6717e090fbbf54a4
-F src/update.c ddba82d1b0d1cb34d862d8ad943012f88e2b8495
+F src/update.c f07e6ed2c517c92871e54d3f5886d1cf56121b11
 F src/util.c 7a99e754c44dd220e881122e30581c08b6d6adef
 F src/vdbe.c 7433a7811fbbb7cfec4f12c142913b4d8a02231e
 F src/vdbe.h a9292f2b5fcecef924fa255fb74609e9cbc776c2
@@ -102,7 +102,7 @@ F test/temptable.test 9ed7ec0288f887e132de66d90c428ad109105f67
 F test/tester.tcl 6f603d90881bd835ea27c568a7fecaa57dce91cc
 F test/trans.test 1fd1ecdece1eca22abe631674c3bd24046df4150
 F test/trigger1.test bb63749fa8a395a60541100607d86381604b7194
-F test/trigger2.test c12759a0d7ba6488d9d24c96a1352ddee995c1ab
+F test/trigger2.test f739876942a26c63d42387321a89b75ec93af48a
 F test/trigger3.test 7dfe798d7e72c13720394685fe353112e3f31adf
 F test/unique.test 572aa791327c1e8d797932263e9d67f176cfdb44
 F test/update.test 7ffb062d580a972e7870d0f51d5af3ab9bfeae08
@@ -142,7 +142,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 773d36c8d94bdcd0c78401282e48432ddd9b61d6
-R 1deda86b9741c56877d65abc3175eaed
-U drh
-Z e9cf4d591ee431d895666646a63675f5
+P 610b7bc70a12b271994255bd01a76b3525421535
+R 8d04659c9e44b4da98d3cabd50c7863c
+U danielk1977
+Z 554b81b4d4eac0c4e8ece2aa3bada3ab

diff --git a/manifest.uuid b/manifest.uuid
index 1a8d107ad85d5bc81d7ddd6a91944974073006b8..37fe3d166c3b4c76a4c94e9fb1283e6894942178 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-610b7bc70a12b271994255bd01a76b3525421535
\ No newline at end of file
+c080ed01ea51628b86050762f097e702e3aeafdf
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index dfc51f4d26c025689a073ea76dff18c2295b8811..5407544c36455ce760b50e1a559275381145608b 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.48 2002/07/16 17:22:51 drh Exp $
+** $Id: update.c,v 1.49 2002/07/21 23:09:55 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -218,7 +218,7 @@ void sqliteUpdate(
     sqliteVdbeAddOp(v, OP_Dup, 0, 0);
 
     sqliteVdbeAddOp(v, OP_Dup, 0, 0);
-    sqliteVdbeAddOp(v, OP_Open, base, pTab->tnum);
+    sqliteVdbeAddOp(v, (pTab->isTemp?OP_OpenAux:OP_Open), base, pTab->tnum);
     sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
 
     sqliteVdbeAddOp(v, OP_Integer, 13, 0);

diff --git a/test/trigger2.test b/test/trigger2.test
index 233a9252fe83c33d7153915ad1e1940efba57f8c..6f861cfef510104bd80d69f794c8e01f27174e97 100644 (file)
--- a/test/trigger2.test
+++ b/test/trigger2.test
@@ -54,6 +54,7 @@ source $testdir/tester.tcl
 set ii 0
 foreach tbl_defn [ list \
        {CREATE TABLE tbl (a, b);} \
+       {CREATE TEMP TABLE tbl (a, b);} \
        {CREATE TABLE tbl (a INTEGER PRIMARY KEY, b);} \
         {CREATE TABLE tbl (a, b PRIMARY KEY);} \
        {CREATE TABLE tbl (a, b); CREATE INDEX tbl_idx ON tbl(b);} ] {