diff options
| author | drh <> | 2024-08-09 18:22:20 +0000 |
|---|---|---|
| committer | drh <> | 2024-08-09 18:22:20 +0000 |
| commit | 8f924f0530d8aec93ed9620ee753d58cad5e7d16 (patch) | |
| tree | 69e77ba69fc62d8d528d1318e675199898427f86 /src/resolve.c | |
| parent | 8bc2647e0c66be6ef91071a3663bd1b7fa5d0943 (diff) | |
| parent | 610a5bafe24ed186a3741fec09d136d5fc3d5eac (diff) | |
| download | sqlite-8f924f0530d8aec93ed9620ee753d58cad5e7d16.tar.gz sqlite-8f924f0530d8aec93ed9620ee753d58cad5e7d16.zip | |
Merge the error code fix from trunk.
FossilOrigin-Name: 81dfb8cd5d59ecf974018b03175ddabd11366d2aca0211dc982f7e14ff314d4d
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/resolve.c b/src/resolve.c index d5c1515a7..dbb54198c 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -2154,6 +2154,9 @@ int sqlite3ResolveExprNames( ** Resolve all names for all expression in an expression list. This is ** just like sqlite3ResolveExprNames() except that it works for an expression ** list rather than a single expression. +** +** The return value is SQLITE_OK (0) for success or SQLITE_ERROR (1) for a +** failure. */ int sqlite3ResolveExprListNames( NameContext *pNC, /* Namespace to resolve expressions in. */ @@ -2162,7 +2165,7 @@ int sqlite3ResolveExprListNames( int i; int savedHasAgg = 0; Walker w; - if( pList==0 ) return WRC_Continue; + if( pList==0 ) return SQLITE_OK; w.pParse = pNC->pParse; w.xExprCallback = resolveExprStep; w.xSelectCallback = resolveSelectStep; @@ -2176,7 +2179,7 @@ int sqlite3ResolveExprListNames( #if SQLITE_MAX_EXPR_DEPTH>0 w.pParse->nHeight += pExpr->nHeight; if( sqlite3ExprCheckHeight(w.pParse, w.pParse->nHeight) ){ - return WRC_Abort; + return SQLITE_ERROR; } #endif sqlite3WalkExprNN(&w, pExpr); @@ -2193,10 +2196,10 @@ int sqlite3ResolveExprListNames( (NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg); pNC->ncFlags &= ~(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg); } - if( w.pParse->nErr>0 ) return WRC_Abort; + if( w.pParse->nErr>0 ) return SQLITE_ERROR; } pNC->ncFlags |= savedHasAgg; - return WRC_Continue; + return SQLITE_OK; } /* |