diff options
| author | drh <drh@noemail.net> | 2020-01-02 23:50:50 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-01-02 23:50:50 +0000 |
| commit | 618ee336144091caace2d0a647f96883ba7580b9 (patch) | |
| tree | dd67e962eecacbee3aaedae2f67228c999e7d953 /src/insert.c | |
| parent | b945bcdaf178eabb320aa4609a31ec74233e3115 (diff) | |
| parent | 24d35e409c900adba4f5528e70c6c7e5e748cfd0 (diff) | |
| download | sqlite-618ee336144091caace2d0a647f96883ba7580b9.tar.gz sqlite-618ee336144091caace2d0a647f96883ba7580b9.zip | |
Merge enhancements from trunk.
FossilOrigin-Name: 091403a6705f5f1352c76eacbfdca75fe0bab12ab9b156842641de07c38d3f66
Diffstat (limited to 'src/insert.c')
| -rw-r--r-- | src/insert.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/insert.c b/src/insert.c index d778e4b45..e3035c8d0 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1020,7 +1020,7 @@ void sqlite3Insert( ** goto C ** D: ... */ - sqlite3VdbeReleaseRegisters(pParse, regData, pTab->nCol, 0); + sqlite3VdbeReleaseRegisters(pParse, regData, pTab->nCol, 0, 0); addrInsTop = addrCont = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm); VdbeCoverage(v); if( ipkColumn>=0 ){ @@ -1673,7 +1673,7 @@ void sqlite3GenerateConstraintChecks( if( onError==OE_Ignore ){ sqlite3VdbeGoto(v, ignoreDest); }else{ - char *zName = pCheck->a[i].zName; + char *zName = pCheck->a[i].zEName; if( zName==0 ) zName = pTab->zName; if( onError==OE_Replace ) onError = OE_Abort; /* IMP: R-26383-51744 */ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_CHECK, @@ -1976,6 +1976,7 @@ void sqlite3GenerateConstraintChecks( sqlite3SetMakeRecordP5(v, pIdx->pTable); } #endif + sqlite3VdbeReleaseRegisters(pParse, regIdx, pIdx->nColumn, 0, 0); /* In an UPDATE operation, if this index is the PRIMARY KEY index ** of a WITHOUT ROWID table and there has been no change the |