aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2008-03-20 16:30:17 +0000
committerdrh <drh@noemail.net>2008-03-20 16:30:17 +0000
commitb1a6c3c1cc41f16693c0b0855c27e5429e6867a2 (patch)
tree36c78d4910bf0bc7b43d595b69dade6d77b21a5a /src/expr.c
parent81a392f7d79f17c411027c27b899ed6c8d72c519 (diff)
downloadsqlite-b1a6c3c1cc41f16693c0b0855c27e5429e6867a2.tar.gz
sqlite-b1a6c3c1cc41f16693c0b0855c27e5429e6867a2.zip
Reinstate test cases for the limit tests. The sqlite3_limit() API is now
tested and working. (CVS 4899) FossilOrigin-Name: 4c4be4c3c8aae97f1d85442b25afba9f0b02c8b3
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c
index 47f10fc3b..7ee47a4e7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
-** $Id: expr.c,v 1.355 2008/03/20 14:03:29 drh Exp $
+** $Id: expr.c,v 1.356 2008/03/20 16:30:18 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -696,10 +696,10 @@ no_mem:
void sqlite3ExprListCheckLength(
Parse *pParse,
ExprList *pEList,
- int iLimit,
const char *zObject
){
- if( pEList && pEList->nExpr>iLimit ){
+ int mx = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
+ if( pEList && pEList->nExpr>mx ){
sqlite3ErrorMsg(pParse, "too many columns in %s", zObject);
}
}