diff options
| author | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
| commit | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (patch) | |
| tree | e820c4a4276381c4c71f8cf891e75dc67302fa8b /src/fkey.c | |
| parent | e1ed0bb6077cc223fa54f58ae835f133d1c4aa59 (diff) | |
| parent | b8db549832d2acc2fc30327e6fb5c0474820f122 (diff) | |
| download | sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.tar.gz sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.zip | |
Merge all recent enhancements from trunk.
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
Diffstat (limited to 'src/fkey.c')
| -rw-r--r-- | src/fkey.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fkey.c b/src/fkey.c index 2abd06c69..7eb188924 100644 --- a/src/fkey.c +++ b/src/fkey.c @@ -1192,11 +1192,9 @@ static Trigger *fkActionTrigger( assert( iFromCol>=0 ); assert( pIdx!=0 || (pTab->iPKey>=0 && pTab->iPKey<pTab->nCol) ); assert( pIdx==0 || pIdx->aiColumn[i]>=0 ); - tToCol.z = pTab->aCol[pIdx ? pIdx->aiColumn[i] : pTab->iPKey].zName; - tFromCol.z = pFKey->pFrom->aCol[iFromCol].zName; - - tToCol.n = sqlite3Strlen30(tToCol.z); - tFromCol.n = sqlite3Strlen30(tFromCol.z); + sqlite3TokenInit(&tToCol, + pTab->aCol[pIdx ? pIdx->aiColumn[i] : pTab->iPKey].zName); + sqlite3TokenInit(&tFromCol, pFKey->pFrom->aCol[iFromCol].zName); /* Create the expression "OLD.zToCol = zFromCol". It is important ** that the "OLD.zToCol" term is on the LHS of the = operator, so |