minimize a few conflicts with upstream

This commit is contained in:
Stephen Lombardo 2020-05-27 17:15:26 -04:00
parent c1510a2c5d
commit 9e2e049769
3 changed files with 4 additions and 11 deletions

View File

@ -2281,18 +2281,11 @@ void sqlite3Pragma(
}
#endif
/* END SQLCIPHER */
#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
#if defined(SQLITE_ENABLE_CEROD)
case PragTyp_ACTIVATE_EXTENSIONS: if( zRight ){
#ifdef SQLITE_HAS_CODEC
if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
sqlite3_activate_see(&zRight[4]);
}
#endif
#ifdef SQLITE_ENABLE_CEROD
if( sqlite3StrNICmp(zRight, "cerod-", 6)==0 ){
sqlite3_activate_cerod(&zRight[6]);
}
#endif
}
break;
#endif

View File

@ -134,7 +134,7 @@ typedef struct PragmaName {
u64 iArg; /* Extra argument */
} PragmaName;
static const PragmaName aPragmaName[] = {
#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
#if defined(SQLITE_ENABLE_CEROD)
{/* zName: */ "activate_extensions",
/* ePragTyp: */ PragTyp_ACTIVATE_EXTENSIONS,
/* ePragFlg: */ 0,

View File

@ -401,7 +401,7 @@ set pragma_def {
IF: defined(SQLITE_HAS_CODEC)
NAME: activate_extensions
IF: defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
IF: defined(SQLITE_ENABLE_CEROD)
NAME: soft_heap_limit
FLAG: Result0
@ -499,7 +499,7 @@ record_one
set allnames [lsort [array names allbyname]]
# Generate #defines for all pragma type names. Group the pragmas that are
# omit in default builds (defined(SQLITE_DEBUG) and defined(SQLITE_HAS_CODEC))
# omit in default builds (ex: defined(SQLITE_DEBUG))
# at the end.
#
puts $fd "\n/* The various pragma types */"