diff options
| author | drh <drh@noemail.net> | 2020-08-10 21:01:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-08-10 21:01:32 +0000 |
| commit | 47eb561c4066be1b92f54dde5aaeae87ab630b04 (patch) | |
| tree | 67d6c12ed39f615d9bd03c96ec89b4613894d781 /src | |
| parent | 9f567eb9f5f561e8251160e365de7d65b968d32c (diff) | |
| download | sqlite-47eb561c4066be1b92f54dde5aaeae87ab630b04.tar.gz sqlite-47eb561c4066be1b92f54dde5aaeae87ab630b04.zip | |
Simplify #ifdefs associated with Parse.eParseMode. Fix an #ifdef error
associated with SQLITE_OMIT_AUTOVACUUM.
FossilOrigin-Name: 5bbd4bddd3b9fa64d134ed62bce3eb4a09456bf24dec2474b5d764a3a3775964
Diffstat (limited to 'src')
| -rw-r--r-- | src/btree.c | 2 | ||||
| -rw-r--r-- | src/build.c | 4 | ||||
| -rw-r--r-- | src/sqliteInt.h | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/btree.c b/src/btree.c index 8bf5b7a3a..919d3b87c 100644 --- a/src/btree.c +++ b/src/btree.c @@ -10262,8 +10262,8 @@ char *sqlite3BtreeIntegrityCheck( (PTRMAP_PAGENO(pBt, i)==i && pBt->autoVacuum) ){ checkAppendMsg(&sCheck, "Pointer map page %d is referenced", i); } - } #endif + } } /* Clean up and report errors. diff --git a/src/build.c b/src/build.c index 97e9909e0..1b1dc6986 100644 --- a/src/build.c +++ b/src/build.c @@ -2703,10 +2703,8 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ assert( pTable->pSelect ); pSel = sqlite3SelectDup(db, pTable->pSelect, 0); if( pSel ){ -#ifndef SQLITE_OMIT_ALTERTABLE u8 eParseMode = pParse->eParseMode; pParse->eParseMode = PARSE_MODE_NORMAL; -#endif n = pParse->nTab; sqlite3SrcListAssignCursors(pParse, pSel->pSrc); pTable->nCol = -1; @@ -2754,9 +2752,7 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ sqlite3DeleteTable(db, pSelTab); sqlite3SelectDelete(db, pSel); EnableLookaside; -#ifndef SQLITE_OMIT_ALTERTABLE pParse->eParseMode = eParseMode; -#endif } else { nErr++; } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 0dc21617d..b4c5325ac 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3395,9 +3395,7 @@ struct Parse { ynVar nVar; /* Number of '?' variables seen in the SQL so far */ u8 iPkSortOrder; /* ASC or DESC for INTEGER PRIMARY KEY */ u8 explain; /* True if the EXPLAIN flag is found on the query */ -#if !(defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_OMIT_ALTERTABLE)) u8 eParseMode; /* PARSE_MODE_XXX constant */ -#endif #ifndef SQLITE_OMIT_VIRTUALTABLE int nVtabLock; /* Number of virtual tables to lock */ #endif |