aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2017-10-21 13:29:26 +0000
committerdrh <drh@noemail.net>2017-10-21 13:29:26 +0000
commit316ab93e2c92526d0fd2b42f53b75be32e6a0428 (patch)
tree101823ada05a6c319eb2641909ead82439cc33c0 /src/resolve.c
parentf2f72a0f9fe7125285f233011bb10257fa5a6a88 (diff)
downloadsqlite-316ab93e2c92526d0fd2b42f53b75be32e6a0428.tar.gz
sqlite-316ab93e2c92526d0fd2b42f53b75be32e6a0428.zip
Remove unnecessary "#if SQLITE_MAX_COLUMN". SQLITE_MAX_COLUMN is always
defined. FossilOrigin-Name: 6ec82acde81a46a75ed5931fc7dd813f2523753106ad7b8f0b544b9da9824d5a
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 78f37512a..4a1e8284c 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -959,12 +959,10 @@ static int resolveCompoundOrderBy(
pOrderBy = pSelect->pOrderBy;
if( pOrderBy==0 ) return 0;
db = pParse->db;
-#if SQLITE_MAX_COLUMN
if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
sqlite3ErrorMsg(pParse, "too many terms in ORDER BY clause");
return 1;
}
-#endif
for(i=0; i<pOrderBy->nExpr; i++){
pOrderBy->a[i].done = 0;
}
@@ -1056,12 +1054,10 @@ int sqlite3ResolveOrderGroupBy(
struct ExprList_item *pItem;
if( pOrderBy==0 || pParse->db->mallocFailed ) return 0;
-#if SQLITE_MAX_COLUMN
if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType);
return 1;
}
-#endif
pEList = pSelect->pEList;
assert( pEList!=0 ); /* sqlite3SelectNew() guarantees this */
for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){