aboutsummaryrefslogtreecommitdiff
path: root/src/insert.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2018-01-04 19:54:55 +0000
committerdrh <drh@noemail.net>2018-01-04 19:54:55 +0000
commitc76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2 (patch)
tree111c4a7f9be0604bb90f3fba54f2a71faded8a4b /src/insert.c
parent0cde0c62b1e53c01d72a9a9227010e6afc4032dc (diff)
parent35100fb194cfbaf75b31b504e7bf7d4480900c26 (diff)
downloadsqlite-c76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2.tar.gz
sqlite-c76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2.zip
Merge in all recent trunk enhancements.
FossilOrigin-Name: 406f79183736b6ad360169b837172afef2c82a4312f5787db08c54167a44b15e
Diffstat (limited to 'src/insert.c')
-rw-r--r--src/insert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/insert.c b/src/insert.c
index f0af0fbd1..e1514692c 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1571,6 +1571,7 @@ void sqlite3GenerateConstraintChecks(
}
/* Check to see if the new index entry will be unique */
+ sqlite3ExprCachePush(pParse);
sqlite3VdbeAddOp4Int(v, OP_NoConflict, iThisCur, addrUniqueOk,
regIdx, pIdx->nKeyCol); VdbeCoverage(v);
@@ -1659,6 +1660,7 @@ void sqlite3GenerateConstraintChecks(
}
}
sqlite3VdbeResolveLabel(v, addrUniqueOk);
+ sqlite3ExprCachePop(pParse);
if( regR!=regIdx ) sqlite3ReleaseTempRange(pParse, regR, nPkField);
}
if( ipkTop ){