1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00

Updated LIMIT support for DELETE/UPDATE. Omit option changed to SQLITE_ENABLE_UPDATE_DELETE_LIMIT. (CVS 5788)

FossilOrigin-Name: c10e8a3c7ab7f21c95f24d0aba590f5b18a4b028
This commit is contained in:
shane
2008-10-10 04:34:16 +00:00
parent 510f96590b
commit 273f619b58
7 changed files with 74 additions and 37 deletions

View File

@ -14,7 +14,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
** $Id: resolve.c,v 1.7 2008/10/06 15:18:02 drh Exp $
** $Id: resolve.c,v 1.8 2008/10/10 04:34:16 shane Exp $
*/
#include "sqliteInt.h"
#include <stdlib.h>
@ -419,7 +419,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
#endif
switch( pExpr->op ){
#ifndef SQLITE_OMIT_UPDATE_DELETE_LIMIT
#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.
@ -436,7 +436,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
pExpr->affinity = SQLITE_AFF_INTEGER;
break;
}
#endif /* SQLITE_OMIT_UPDATE_DELETE_LIMIT */
#endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY) */
/* A lone identifier is the name of a column.
*/