diff options
author | shane <shane@noemail.net> | 2008-10-10 04:34:16 +0000 |
---|---|---|
committer | shane <shane@noemail.net> | 2008-10-10 04:34:16 +0000 |
commit | 273f619b584b195729116bdf26aaf4de3fc22fb2 (patch) | |
tree | bc9ac83f9e465f694167ba4d371bcd5e4f27c48d /src/resolve.c | |
parent | 510f96590b593183a7da48314f0e39dd74209eeb (diff) | |
download | sqlite-273f619b584b195729116bdf26aaf4de3fc22fb2.tar.gz sqlite-273f619b584b195729116bdf26aaf4de3fc22fb2.zip |
Updated LIMIT support for DELETE/UPDATE. Omit option changed to SQLITE_ENABLE_UPDATE_DELETE_LIMIT. (CVS 5788)
FossilOrigin-Name: c10e8a3c7ab7f21c95f24d0aba590f5b18a4b028
Diffstat (limited to 'src/resolve.c')
-rw-r--r-- | src/resolve.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve.c b/src/resolve.c index 013a3ec77..10bbf481a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -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. */ |