diff options
| author | drh <drh@noemail.net> | 2018-12-31 18:30:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-12-31 18:30:41 +0000 |
| commit | 0de6efe59ee54518f2590d7d5eb8f55a374b9811 (patch) | |
| tree | a720aa0e01fc709c840a8ddfcebc500bb67d15c2 /src/insert.c | |
| parent | 01e92df41ef05b7ec1807beccc697fd521abc584 (diff) | |
| parent | d0fb7960cea5d26a40a0a7ca00c4274545e96efe (diff) | |
| download | sqlite-0de6efe59ee54518f2590d7d5eb8f55a374b9811.tar.gz sqlite-0de6efe59ee54518f2590d7d5eb8f55a374b9811.zip | |
Merge enhancements and bug fixes from trunk.
FossilOrigin-Name: 9fb646f29c05bca5f677a2c7c4f45c36bfe0a0c6a88cb7968b4a0459bdd63bb2
Diffstat (limited to 'src/insert.c')
| -rw-r--r-- | src/insert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/insert.c b/src/insert.c index 59049dbc3..46b60e49e 100644 --- a/src/insert.c +++ b/src/insert.c @@ -866,7 +866,7 @@ void sqlite3Insert( /* Run the BEFORE and INSTEAD OF triggers, if there are any */ - endOfLoop = sqlite3VdbeMakeLabel(v); + endOfLoop = sqlite3VdbeMakeLabel(pParse); if( tmask & TRIGGER_BEFORE ){ int regCols = sqlite3GetTempRange(pParse, pTab->nCol+1); @@ -1356,7 +1356,7 @@ void sqlite3GenerateConstraintChecks( switch( onError ){ case OE_Replace: { assert( onError==OE_Replace ); - addr1 = sqlite3VdbeMakeLabel(v); + addr1 = sqlite3VdbeMakeLabel(pParse); sqlite3VdbeAddOp2(v, OP_NotNull, regNewData+1+i, addr1); VdbeCoverage(v); sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, regNewData+1+i); @@ -1407,7 +1407,7 @@ void sqlite3GenerateConstraintChecks( ** updated so there is no point it verifying the check constraint */ continue; } - allOk = sqlite3VdbeMakeLabel(v); + allOk = sqlite3VdbeMakeLabel(pParse); sqlite3VdbeVerifyAbortable(v, onError); sqlite3ExprIfTrue(pParse, pExpr, allOk, SQLITE_JUMPIFNULL); if( onError==OE_Ignore ){ @@ -1474,7 +1474,7 @@ void sqlite3GenerateConstraintChecks( ** exist in the table. */ if( pkChng && pPk==0 ){ - int addrRowidOk = sqlite3VdbeMakeLabel(v); + int addrRowidOk = sqlite3VdbeMakeLabel(pParse); /* Figure out what action to take in case of a rowid collision */ onError = pTab->keyConf; @@ -1624,7 +1624,7 @@ void sqlite3GenerateConstraintChecks( VdbeComment((v, "Skip upsert subroutine")); sqlite3VdbeJumpHere(v, upsertJump); }else{ - addrUniqueOk = sqlite3VdbeMakeLabel(v); + addrUniqueOk = sqlite3VdbeMakeLabel(pParse); } if( bAffinityDone==0 && (pUpIdx==0 || pUpIdx==pIdx) ){ sqlite3TableAffinity(v, pTab, regNewData+1); |