Proposed fix for the row-value TRIGGER UPDATE problem described in

ticket [8c9458e7].

FossilOrigin-Name: 61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0

diff --git a/manifest b/manifest
index 97114a6629bb36e2f3478313124d5c4ba65084f1..96cb82ef9a3168b1459be57c261b1c0360125372 100644 (file)
--- 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 d36e63c3209739207ae84178d2ed8c20e2442dc6..2e2ff06ae3b7f055265af40715b05a0969b0b16d 100644 (file)
--- 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 b23f17983b826d16ab454c3d9187925d2644c2bf..ebc9ca6b0c3bdcdee4705e9b2c5d2808f177b573 100644 (file)
--- 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; i<p->nExpr; 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;