From 47073f62bf607208b00d19cd9059f2acb275778e Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 2 Jan 2017 22:36:32 +0000 Subject: [PATCH 1/4] Proposed fix for the row-value TRIGGER UPDATE problem described in ticket [8c9458e7]. FossilOrigin-Name: 61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- src/expr.c | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 97114a6629..96cb82ef9a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sthe\sversion\snumber\sto\s3.17.0\sfor\sthe\snext\srelease\scycle. -D 2017-01-02T19:10:14.396 +C Proposed\sfix\sfor\sthe\srow-value\sTRIGGER\sUPDATE\sproblem\sdescribed\sin\s\nticket\s[8c9458e7]. +D 2017-01-02T22:36:32.292 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -341,7 +341,7 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5 -F src/expr.c 3b662f58b50ba12c004b2d9bd8d3ff5fddbbae7f +F src/expr.c d438df533ef4dc803260527cee353d3d7df89ba3 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae F src/func.c d8582ee91975975645f206db332c38f534b783ad @@ -1541,7 +1541,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 584da48f9e818f25134e0a62fb7e84f07019511f -R d97b559f497d0a265e23fba942228550 +P 16415b5aad445c9e4e849018b48538d74eec8944 +R 0fc45eecde9c7ee8bfeff4a5566dee47 +T *branch * rowvalue-update-trigger +T *sym-rowvalue-update-trigger * +T -sym-trunk * U drh -Z 24a7fb491cd5a499becb9d53b759e62e +Z 681d88dc64ba5dba1f04ffca46eb2b75 diff --git a/manifest.uuid b/manifest.uuid index d36e63c320..2e2ff06ae3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -16415b5aad445c9e4e849018b48538d74eec8944 \ No newline at end of file +61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index b23f17983b..ebc9ca6b0c 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1088,7 +1088,7 @@ static int dupedExprStructSize(Expr *p, int flags){ assert( flags==EXPRDUP_REDUCE || flags==0 ); /* Only one flag value allowed */ assert( EXPR_FULLSIZE<=0xfff ); assert( (0xfff & (EP_Reduced|EP_TokenOnly))==0 ); - if( 0==flags ){ + if( 0==flags || p->op==TK_SELECT_COLUMN ){ nSize = EXPR_FULLSIZE; }else{ assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) ); @@ -1231,6 +1231,8 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int dupFlags, u8 **pzBuffer){ if( !ExprHasProperty(p, EP_TokenOnly|EP_Leaf) ){ if( pNew->op==TK_SELECT_COLUMN ){ pNew->pLeft = p->pLeft; + assert( p->iColumn==0 || p->pRight==0 ); + assert( p->pRight==0 || p->pRight==p->pLeft ); }else{ pNew->pLeft = sqlite3ExprDup(db, p->pLeft, 0); } @@ -1307,7 +1309,20 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ pOldItem = p->a; for(i=0; inExpr; i++, pItem++, pOldItem++){ Expr *pOldExpr = pOldItem->pExpr; + Expr *pNewExpr; pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags); + if( pOldExpr + && pOldExpr->op==TK_SELECT_COLUMN + && (pNewExpr = pItem->pExpr)!=0 + ){ + assert( pNewExpr->iColumn==0 || i>0 ); + if( pNewExpr->iColumn==0 ){ + assert( pOldExpr->pLeft==pOldExpr->pRight ); + pNewExpr->pLeft = pNewExpr->pRight; + }else if( pItem[-1].pExpr!=0 ){ + pNewExpr->pLeft = pItem[-1].pExpr->pLeft; + } + } pItem->zName = sqlite3DbStrDup(db, pOldItem->zName); pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan); pItem->sortOrder = pOldItem->sortOrder; From 3f50bb84f55e33df406bc69d2369a4bec223ef4e Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 2 Jan 2017 23:18:35 +0000 Subject: [PATCH 2/4] Put an ALWAYS() on an unreachable branch in the sqlite3ExprListDup() routine. FossilOrigin-Name: 2caaaab5e07f6b76d66fbe4e93a4b956937427d8 --- manifest | 15 ++++++--------- manifest.uuid | 2 +- src/expr.c | 3 ++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 96cb82ef9a..4e23e69744 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Proposed\sfix\sfor\sthe\srow-value\sTRIGGER\sUPDATE\sproblem\sdescribed\sin\s\nticket\s[8c9458e7]. -D 2017-01-02T22:36:32.292 +C Put\san\sALWAYS()\son\san\sunreachable\sbranch\sin\sthe\ssqlite3ExprListDup()\sroutine. +D 2017-01-02T23:18:35.959 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -341,7 +341,7 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5 -F src/expr.c d438df533ef4dc803260527cee353d3d7df89ba3 +F src/expr.c c2be1c1ae369dc14ba9e76831466b3a494986872 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae F src/func.c d8582ee91975975645f206db332c38f534b783ad @@ -1541,10 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 16415b5aad445c9e4e849018b48538d74eec8944 -R 0fc45eecde9c7ee8bfeff4a5566dee47 -T *branch * rowvalue-update-trigger -T *sym-rowvalue-update-trigger * -T -sym-trunk * +P 61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0 +R 979198fba9d353741bbbde77f8690ab1 U drh -Z 681d88dc64ba5dba1f04ffca46eb2b75 +Z 3d9af2cb6ce914fdb21ee160bd6a1c90 diff --git a/manifest.uuid b/manifest.uuid index 2e2ff06ae3..d239c8fce4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0 \ No newline at end of file +2caaaab5e07f6b76d66fbe4e93a4b956937427d8 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index ebc9ca6b0c..072c420780 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1311,6 +1311,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ Expr *pOldExpr = pOldItem->pExpr; Expr *pNewExpr; pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags); + assert( pItem->pExpr==0 || db->mallocFailed==0 ); if( pOldExpr && pOldExpr->op==TK_SELECT_COLUMN && (pNewExpr = pItem->pExpr)!=0 @@ -1319,7 +1320,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ if( pNewExpr->iColumn==0 ){ assert( pOldExpr->pLeft==pOldExpr->pRight ); pNewExpr->pLeft = pNewExpr->pRight; - }else if( pItem[-1].pExpr!=0 ){ + }else if( ALWAYS(pItem[-1].pExpr!=0) ){ pNewExpr->pLeft = pItem[-1].pExpr->pLeft; } } From 90a7eae84c2d6d67a5983e07cc84e0c7de7ec830 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 2 Jan 2017 23:43:03 +0000 Subject: [PATCH 3/4] Test cases for the row-value UPDATE TRIGGER fix. FossilOrigin-Name: b9b964373c89a491649f366ad7d70ae4d69b891d --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/rowvalue.test | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 4e23e69744..b47ade3365 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Put\san\sALWAYS()\son\san\sunreachable\sbranch\sin\sthe\ssqlite3ExprListDup()\sroutine. -D 2017-01-02T23:18:35.959 +C Test\scases\sfor\sthe\srow-value\sUPDATE\sTRIGGER\sfix. +D 2017-01-02T23:43:03.976 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -1035,7 +1035,7 @@ F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81 F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d -F test/rowvalue.test 1701fb786188e9fb7934a7c155bd9cc587d9b677 +F test/rowvalue.test f4a60835c949ec4b8ddc15d78d8a9b412b805875 F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256 F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea @@ -1541,7 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0 -R 979198fba9d353741bbbde77f8690ab1 +P 2caaaab5e07f6b76d66fbe4e93a4b956937427d8 +R 1083f74702d2e1110eb1d37d8553d935 U drh -Z 3d9af2cb6ce914fdb21ee160bd6a1c90 +Z d43bfd5db806552d45260c4ffdcc3bd0 diff --git a/manifest.uuid b/manifest.uuid index d239c8fce4..1c1f56c2bc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2caaaab5e07f6b76d66fbe4e93a4b956937427d8 \ No newline at end of file +b9b964373c89a491649f366ad7d70ae4d69b891d \ No newline at end of file diff --git a/test/rowvalue.test b/test/rowvalue.test index affc455406..eacfd37ba2 100644 --- a/test/rowvalue.test +++ b/test/rowvalue.test @@ -334,4 +334,25 @@ do_catchsql_test 15.5 { INSERT INTO x1(a,b) VALUES(1,(SELECT * FROM (SELECT 1,2))<3); } {1 {row value misused}} +#------------------------------------------------------------------------- +# Row-values used in UPDATE statements within TRIGGERs +# +# Ticket https://www.sqlite.org/src/info/8c9458e703666e1a +# +do_execsql_test 16.1 { + CREATE TABLE t16a(a,b,c); + INSERT INTO t16a VALUES(1,2,3); + CREATE TABLE t16b(x); + INSERT INTO t16b(x) VALUES(1); + CREATE TRIGGER t16r AFTER UPDATE ON t16b BEGIN + UPDATE t16a SET (a,b,c)=(SELECT new.x,new.x+1,new.x+2); + END; + UPDATE t16b SET x=7; + SELECT * FROM t16a; +} {7 8 9} +do_execsql_test 16.2 { + UPDATE t16b SET x=97; + SELECT * FROM t16a; +} {97 98 99} + finish_test From b163748e885af01e6eede23fff4e7aa7e8ee3620 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Jan 2017 00:27:16 +0000 Subject: [PATCH 4/4] Improved assert()s on the sqlite3ExprListDup() logic for TK_SELECT_COLUMN. FossilOrigin-Name: 14da99d41f7968bf816203b4ae11c1f0d1ee0b5d --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/expr.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index b47ade3365..d80ba5db3d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Test\scases\sfor\sthe\srow-value\sUPDATE\sTRIGGER\sfix. -D 2017-01-02T23:43:03.976 +C Improved\sassert()s\son\sthe\ssqlite3ExprListDup()\slogic\sfor\sTK_SELECT_COLUMN. +D 2017-01-03T00:27:16.468 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -341,7 +341,7 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5 -F src/expr.c c2be1c1ae369dc14ba9e76831466b3a494986872 +F src/expr.c e115097aa866a462051ac8430757638dc1d73f1c F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae F src/func.c d8582ee91975975645f206db332c38f534b783ad @@ -1541,7 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 2caaaab5e07f6b76d66fbe4e93a4b956937427d8 -R 1083f74702d2e1110eb1d37d8553d935 +P b9b964373c89a491649f366ad7d70ae4d69b891d +R b890811ca8348b8ceda7efec0ae53743 U drh -Z d43bfd5db806552d45260c4ffdcc3bd0 +Z f487608154c66bed79f05de2b11f93c4 diff --git a/manifest.uuid b/manifest.uuid index 1c1f56c2bc..313a7e2928 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b9b964373c89a491649f366ad7d70ae4d69b891d \ No newline at end of file +14da99d41f7968bf816203b4ae11c1f0d1ee0b5d \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 072c420780..6d4b48fae3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1295,6 +1295,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ ExprList *pNew; struct ExprList_item *pItem, *pOldItem; int i; + Expr *pPriorSelectCol = 0; assert( db!=0 ); if( p==0 ) return 0; pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); @@ -1311,7 +1312,6 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ Expr *pOldExpr = pOldItem->pExpr; Expr *pNewExpr; pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags); - assert( pItem->pExpr==0 || db->mallocFailed==0 ); if( pOldExpr && pOldExpr->op==TK_SELECT_COLUMN && (pNewExpr = pItem->pExpr)!=0 @@ -1319,9 +1319,13 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){ assert( pNewExpr->iColumn==0 || i>0 ); if( pNewExpr->iColumn==0 ){ assert( pOldExpr->pLeft==pOldExpr->pRight ); - pNewExpr->pLeft = pNewExpr->pRight; - }else if( ALWAYS(pItem[-1].pExpr!=0) ){ - pNewExpr->pLeft = pItem[-1].pExpr->pLeft; + pPriorSelectCol = pNewExpr->pLeft = pNewExpr->pRight; + }else{ + assert( i>0 ); + assert( pItem[-1].pExpr!=0 ); + assert( pNewExpr->iColumn==pItem[-1].pExpr->iColumn+1 ); + assert( pPriorSelectCol==pItem[-1].pExpr->pLeft ); + pNewExpr->pLeft = pPriorSelectCol; } } pItem->zName = sqlite3DbStrDup(db, pOldItem->zName);