diff options
| author | dan <dan@noemail.net> | 2020-07-13 20:10:29 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2020-07-13 20:10:29 +0000 |
| commit | be952c11dc730f70f4e462a83f745b4ec7ede313 (patch) | |
| tree | cbaddec4ac1f85c8b9d0d7f572d45d0fcd5d012f /src/resolve.c | |
| parent | a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0 (diff) | |
| download | sqlite-be952c11dc730f70f4e462a83f745b4ec7ede313.tar.gz sqlite-be952c11dc730f70f4e462a83f745b4ec7ede313.zip | |
Add test cases and fixes for UPDATE...FROM statements that modify primary key columns.
FossilOrigin-Name: 47c87af3e52bce10fbcc2cbe832d659b0c204bfb3368d9314fa1b01120129254
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/resolve.c b/src/resolve.c index 2b2a3fa12..8e06344c7 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -756,10 +756,10 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ #endif switch( pExpr->op ){ -#if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY) /* The special operator TK_ROW means use the rowid for the first ** column in the FROM clause. This is used by the LIMIT and ORDER BY - ** clause processing on UPDATE and DELETE statements. + ** clause processing on UPDATE and DELETE statements, and by + ** UPDATE ... FROM statement processing. */ case TK_ROW: { SrcList *pSrcList = pNC->pSrcList; @@ -774,8 +774,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ pExpr->affExpr = SQLITE_AFF_INTEGER; break; } -#endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) - && !defined(SQLITE_OMIT_SUBQUERY) */ /* A column name: ID ** Or table name and column name: ID.ID |