Index: third_party/sqlite/src/src/ctime.c |
diff --git a/third_party/sqlite/src/src/ctime.c b/third_party/sqlite/src/src/ctime.c |
index 82a2f352044804e44384fec0ddb932cf5190d433..f1bb69c16a3bbe8697993a7aad79a4977e0e09dc 100644 |
--- a/third_party/sqlite/src/src/ctime.c |
+++ b/third_party/sqlite/src/src/ctime.c |
@@ -33,88 +33,103 @@ static const char * const azCompileOpt[] = { |
#define CTIMEOPT_VAL_(opt) #opt |
#define CTIMEOPT_VAL(opt) CTIMEOPT_VAL_(opt) |
-#ifdef SQLITE_32BIT_ROWID |
+#if SQLITE_32BIT_ROWID |
"32BIT_ROWID", |
#endif |
-#ifdef SQLITE_4_BYTE_ALIGNED_MALLOC |
+#if SQLITE_4_BYTE_ALIGNED_MALLOC |
"4_BYTE_ALIGNED_MALLOC", |
#endif |
-#ifdef SQLITE_CASE_SENSITIVE_LIKE |
+#if SQLITE_CASE_SENSITIVE_LIKE |
"CASE_SENSITIVE_LIKE", |
#endif |
-#ifdef SQLITE_CHECK_PAGES |
+#if SQLITE_CHECK_PAGES |
"CHECK_PAGES", |
#endif |
-#ifdef SQLITE_COVERAGE_TEST |
+#if SQLITE_COVERAGE_TEST |
"COVERAGE_TEST", |
#endif |
-#ifdef SQLITE_DEBUG |
+#if SQLITE_DEBUG |
"DEBUG", |
#endif |
-#ifdef SQLITE_DEFAULT_LOCKING_MODE |
+#if SQLITE_DEFAULT_LOCKING_MODE |
"DEFAULT_LOCKING_MODE=" CTIMEOPT_VAL(SQLITE_DEFAULT_LOCKING_MODE), |
#endif |
#if defined(SQLITE_DEFAULT_MMAP_SIZE) && !defined(SQLITE_DEFAULT_MMAP_SIZE_xc) |
"DEFAULT_MMAP_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_MMAP_SIZE), |
#endif |
-#ifdef SQLITE_DISABLE_DIRSYNC |
+#if SQLITE_DISABLE_DIRSYNC |
"DISABLE_DIRSYNC", |
#endif |
-#ifdef SQLITE_DISABLE_LFS |
+#if SQLITE_DISABLE_LFS |
"DISABLE_LFS", |
#endif |
-#ifdef SQLITE_ENABLE_ATOMIC_WRITE |
+#if SQLITE_ENABLE_8_3_NAMES |
+ "ENABLE_8_3_NAMES", |
+#endif |
+#if SQLITE_ENABLE_API_ARMOR |
+ "ENABLE_API_ARMOR", |
+#endif |
+#if SQLITE_ENABLE_ATOMIC_WRITE |
"ENABLE_ATOMIC_WRITE", |
#endif |
-#ifdef SQLITE_ENABLE_CEROD |
+#if SQLITE_ENABLE_CEROD |
"ENABLE_CEROD", |
#endif |
-#ifdef SQLITE_ENABLE_COLUMN_METADATA |
+#if SQLITE_ENABLE_COLUMN_METADATA |
"ENABLE_COLUMN_METADATA", |
#endif |
-#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT |
+#if SQLITE_ENABLE_DBSTAT_VTAB |
+ "ENABLE_DBSTAT_VTAB", |
+#endif |
+#if SQLITE_ENABLE_EXPENSIVE_ASSERT |
"ENABLE_EXPENSIVE_ASSERT", |
#endif |
-#ifdef SQLITE_ENABLE_FTS1 |
+#if SQLITE_ENABLE_FTS1 |
"ENABLE_FTS1", |
#endif |
-#ifdef SQLITE_ENABLE_FTS2 |
+#if SQLITE_ENABLE_FTS2 |
"ENABLE_FTS2", |
#endif |
-#ifdef SQLITE_ENABLE_FTS3 |
+#if SQLITE_ENABLE_FTS3 |
"ENABLE_FTS3", |
#endif |
-#ifdef SQLITE_ENABLE_FTS3_PARENTHESIS |
+#if SQLITE_ENABLE_FTS3_PARENTHESIS |
"ENABLE_FTS3_PARENTHESIS", |
#endif |
-#ifdef SQLITE_ENABLE_FTS4 |
+#if SQLITE_ENABLE_FTS4 |
"ENABLE_FTS4", |
#endif |
-#ifdef SQLITE_ENABLE_ICU |
+#if SQLITE_ENABLE_FTS5 |
+ "ENABLE_FTS5", |
+#endif |
+#if SQLITE_ENABLE_ICU |
"ENABLE_ICU", |
#endif |
-#ifdef SQLITE_ENABLE_IOTRACE |
+#if SQLITE_ENABLE_IOTRACE |
"ENABLE_IOTRACE", |
#endif |
-#ifdef SQLITE_ENABLE_LOAD_EXTENSION |
+#if SQLITE_ENABLE_JSON1 |
+ "ENABLE_JSON1", |
+#endif |
+#if SQLITE_ENABLE_LOAD_EXTENSION |
"ENABLE_LOAD_EXTENSION", |
#endif |
-#ifdef SQLITE_ENABLE_LOCKING_STYLE |
+#if SQLITE_ENABLE_LOCKING_STYLE |
"ENABLE_LOCKING_STYLE=" CTIMEOPT_VAL(SQLITE_ENABLE_LOCKING_STYLE), |
#endif |
-#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT |
+#if SQLITE_ENABLE_MEMORY_MANAGEMENT |
"ENABLE_MEMORY_MANAGEMENT", |
#endif |
-#ifdef SQLITE_ENABLE_MEMSYS3 |
+#if SQLITE_ENABLE_MEMSYS3 |
"ENABLE_MEMSYS3", |
#endif |
-#ifdef SQLITE_ENABLE_MEMSYS5 |
+#if SQLITE_ENABLE_MEMSYS5 |
"ENABLE_MEMSYS5", |
#endif |
-#ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK |
+#if SQLITE_ENABLE_OVERSIZE_CELL_CHECK |
"ENABLE_OVERSIZE_CELL_CHECK", |
#endif |
-#ifdef SQLITE_ENABLE_RTREE |
+#if SQLITE_ENABLE_RTREE |
"ENABLE_RTREE", |
#endif |
#if defined(SQLITE_ENABLE_STAT4) |
@@ -122,31 +137,34 @@ static const char * const azCompileOpt[] = { |
#elif defined(SQLITE_ENABLE_STAT3) |
"ENABLE_STAT3", |
#endif |
-#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY |
+#if SQLITE_ENABLE_UNLOCK_NOTIFY |
"ENABLE_UNLOCK_NOTIFY", |
#endif |
-#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT |
+#if SQLITE_ENABLE_UPDATE_DELETE_LIMIT |
"ENABLE_UPDATE_DELETE_LIMIT", |
#endif |
-#ifdef SQLITE_HAS_CODEC |
+#if SQLITE_HAS_CODEC |
"HAS_CODEC", |
#endif |
-#ifdef SQLITE_HAVE_ISNAN |
+#if HAVE_ISNAN || SQLITE_HAVE_ISNAN |
"HAVE_ISNAN", |
#endif |
-#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX |
+#if SQLITE_HOMEGROWN_RECURSIVE_MUTEX |
"HOMEGROWN_RECURSIVE_MUTEX", |
#endif |
-#ifdef SQLITE_IGNORE_AFP_LOCK_ERRORS |
+#if SQLITE_IGNORE_AFP_LOCK_ERRORS |
"IGNORE_AFP_LOCK_ERRORS", |
#endif |
-#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS |
+#if SQLITE_IGNORE_FLOCK_LOCK_ERRORS |
"IGNORE_FLOCK_LOCK_ERRORS", |
#endif |
#ifdef SQLITE_INT64_TYPE |
"INT64_TYPE", |
#endif |
-#ifdef SQLITE_LOCK_TRACE |
+#ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS |
+ "LIKE_DOESNT_MATCH_BLOBS", |
+#endif |
+#if SQLITE_LOCK_TRACE |
"LOCK_TRACE", |
#endif |
#if defined(SQLITE_MAX_MMAP_SIZE) && !defined(SQLITE_MAX_MMAP_SIZE_xc) |
@@ -155,226 +173,226 @@ static const char * const azCompileOpt[] = { |
#ifdef SQLITE_MAX_SCHEMA_RETRY |
"MAX_SCHEMA_RETRY=" CTIMEOPT_VAL(SQLITE_MAX_SCHEMA_RETRY), |
#endif |
-#ifdef SQLITE_MEMDEBUG |
+#if SQLITE_MEMDEBUG |
"MEMDEBUG", |
#endif |
-#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT |
+#if SQLITE_MIXED_ENDIAN_64BIT_FLOAT |
"MIXED_ENDIAN_64BIT_FLOAT", |
#endif |
-#ifdef SQLITE_NO_SYNC |
+#if SQLITE_NO_SYNC |
"NO_SYNC", |
#endif |
-#ifdef SQLITE_OMIT_ALTERTABLE |
+#if SQLITE_OMIT_ALTERTABLE |
"OMIT_ALTERTABLE", |
#endif |
-#ifdef SQLITE_OMIT_ANALYZE |
+#if SQLITE_OMIT_ANALYZE |
"OMIT_ANALYZE", |
#endif |
-#ifdef SQLITE_OMIT_ATTACH |
+#if SQLITE_OMIT_ATTACH |
"OMIT_ATTACH", |
#endif |
-#ifdef SQLITE_OMIT_AUTHORIZATION |
+#if SQLITE_OMIT_AUTHORIZATION |
"OMIT_AUTHORIZATION", |
#endif |
-#ifdef SQLITE_OMIT_AUTOINCREMENT |
+#if SQLITE_OMIT_AUTOINCREMENT |
"OMIT_AUTOINCREMENT", |
#endif |
-#ifdef SQLITE_OMIT_AUTOINIT |
+#if SQLITE_OMIT_AUTOINIT |
"OMIT_AUTOINIT", |
#endif |
-#ifdef SQLITE_OMIT_AUTOMATIC_INDEX |
+#if SQLITE_OMIT_AUTOMATIC_INDEX |
"OMIT_AUTOMATIC_INDEX", |
#endif |
-#ifdef SQLITE_OMIT_AUTORESET |
+#if SQLITE_OMIT_AUTORESET |
"OMIT_AUTORESET", |
#endif |
-#ifdef SQLITE_OMIT_AUTOVACUUM |
+#if SQLITE_OMIT_AUTOVACUUM |
"OMIT_AUTOVACUUM", |
#endif |
-#ifdef SQLITE_OMIT_BETWEEN_OPTIMIZATION |
+#if SQLITE_OMIT_BETWEEN_OPTIMIZATION |
"OMIT_BETWEEN_OPTIMIZATION", |
#endif |
-#ifdef SQLITE_OMIT_BLOB_LITERAL |
+#if SQLITE_OMIT_BLOB_LITERAL |
"OMIT_BLOB_LITERAL", |
#endif |
-#ifdef SQLITE_OMIT_BTREECOUNT |
+#if SQLITE_OMIT_BTREECOUNT |
"OMIT_BTREECOUNT", |
#endif |
-#ifdef SQLITE_OMIT_BUILTIN_TEST |
+#if SQLITE_OMIT_BUILTIN_TEST |
"OMIT_BUILTIN_TEST", |
#endif |
-#ifdef SQLITE_OMIT_CAST |
+#if SQLITE_OMIT_CAST |
"OMIT_CAST", |
#endif |
-#ifdef SQLITE_OMIT_CHECK |
+#if SQLITE_OMIT_CHECK |
"OMIT_CHECK", |
#endif |
-#ifdef SQLITE_OMIT_COMPLETE |
+#if SQLITE_OMIT_COMPLETE |
"OMIT_COMPLETE", |
#endif |
-#ifdef SQLITE_OMIT_COMPOUND_SELECT |
+#if SQLITE_OMIT_COMPOUND_SELECT |
"OMIT_COMPOUND_SELECT", |
#endif |
-#ifdef SQLITE_OMIT_CTE |
+#if SQLITE_OMIT_CTE |
"OMIT_CTE", |
#endif |
-#ifdef SQLITE_OMIT_DATETIME_FUNCS |
+#if SQLITE_OMIT_DATETIME_FUNCS |
"OMIT_DATETIME_FUNCS", |
#endif |
-#ifdef SQLITE_OMIT_DECLTYPE |
+#if SQLITE_OMIT_DECLTYPE |
"OMIT_DECLTYPE", |
#endif |
-#ifdef SQLITE_OMIT_DEPRECATED |
+#if SQLITE_OMIT_DEPRECATED |
"OMIT_DEPRECATED", |
#endif |
-#ifdef SQLITE_OMIT_DISKIO |
+#if SQLITE_OMIT_DISKIO |
"OMIT_DISKIO", |
#endif |
-#ifdef SQLITE_OMIT_EXPLAIN |
+#if SQLITE_OMIT_EXPLAIN |
"OMIT_EXPLAIN", |
#endif |
-#ifdef SQLITE_OMIT_FLAG_PRAGMAS |
+#if SQLITE_OMIT_FLAG_PRAGMAS |
"OMIT_FLAG_PRAGMAS", |
#endif |
-#ifdef SQLITE_OMIT_FLOATING_POINT |
+#if SQLITE_OMIT_FLOATING_POINT |
"OMIT_FLOATING_POINT", |
#endif |
-#ifdef SQLITE_OMIT_FOREIGN_KEY |
+#if SQLITE_OMIT_FOREIGN_KEY |
"OMIT_FOREIGN_KEY", |
#endif |
-#ifdef SQLITE_OMIT_GET_TABLE |
+#if SQLITE_OMIT_GET_TABLE |
"OMIT_GET_TABLE", |
#endif |
-#ifdef SQLITE_OMIT_INCRBLOB |
+#if SQLITE_OMIT_INCRBLOB |
"OMIT_INCRBLOB", |
#endif |
-#ifdef SQLITE_OMIT_INTEGRITY_CHECK |
+#if SQLITE_OMIT_INTEGRITY_CHECK |
"OMIT_INTEGRITY_CHECK", |
#endif |
-#ifdef SQLITE_OMIT_LIKE_OPTIMIZATION |
+#if SQLITE_OMIT_LIKE_OPTIMIZATION |
"OMIT_LIKE_OPTIMIZATION", |
#endif |
-#ifdef SQLITE_OMIT_LOAD_EXTENSION |
+#if SQLITE_OMIT_LOAD_EXTENSION |
"OMIT_LOAD_EXTENSION", |
#endif |
-#ifdef SQLITE_OMIT_LOCALTIME |
+#if SQLITE_OMIT_LOCALTIME |
"OMIT_LOCALTIME", |
#endif |
-#ifdef SQLITE_OMIT_LOOKASIDE |
+#if SQLITE_OMIT_LOOKASIDE |
"OMIT_LOOKASIDE", |
#endif |
-#ifdef SQLITE_OMIT_MEMORYDB |
+#if SQLITE_OMIT_MEMORYDB |
"OMIT_MEMORYDB", |
#endif |
-#ifdef SQLITE_OMIT_OR_OPTIMIZATION |
+#if SQLITE_OMIT_OR_OPTIMIZATION |
"OMIT_OR_OPTIMIZATION", |
#endif |
-#ifdef SQLITE_OMIT_PAGER_PRAGMAS |
+#if SQLITE_OMIT_PAGER_PRAGMAS |
"OMIT_PAGER_PRAGMAS", |
#endif |
-#ifdef SQLITE_OMIT_PRAGMA |
+#if SQLITE_OMIT_PRAGMA |
"OMIT_PRAGMA", |
#endif |
-#ifdef SQLITE_OMIT_PROGRESS_CALLBACK |
+#if SQLITE_OMIT_PROGRESS_CALLBACK |
"OMIT_PROGRESS_CALLBACK", |
#endif |
-#ifdef SQLITE_OMIT_QUICKBALANCE |
+#if SQLITE_OMIT_QUICKBALANCE |
"OMIT_QUICKBALANCE", |
#endif |
-#ifdef SQLITE_OMIT_REINDEX |
+#if SQLITE_OMIT_REINDEX |
"OMIT_REINDEX", |
#endif |
-#ifdef SQLITE_OMIT_SCHEMA_PRAGMAS |
+#if SQLITE_OMIT_SCHEMA_PRAGMAS |
"OMIT_SCHEMA_PRAGMAS", |
#endif |
-#ifdef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS |
+#if SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS |
"OMIT_SCHEMA_VERSION_PRAGMAS", |
#endif |
-#ifdef SQLITE_OMIT_SHARED_CACHE |
+#if SQLITE_OMIT_SHARED_CACHE |
"OMIT_SHARED_CACHE", |
#endif |
-#ifdef SQLITE_OMIT_SUBQUERY |
+#if SQLITE_OMIT_SUBQUERY |
"OMIT_SUBQUERY", |
#endif |
-#ifdef SQLITE_OMIT_TCL_VARIABLE |
+#if SQLITE_OMIT_TCL_VARIABLE |
"OMIT_TCL_VARIABLE", |
#endif |
-#ifdef SQLITE_OMIT_TEMPDB |
+#if SQLITE_OMIT_TEMPDB |
"OMIT_TEMPDB", |
#endif |
-#ifdef SQLITE_OMIT_TRACE |
+#if SQLITE_OMIT_TRACE |
"OMIT_TRACE", |
#endif |
-#ifdef SQLITE_OMIT_TRIGGER |
+#if SQLITE_OMIT_TRIGGER |
"OMIT_TRIGGER", |
#endif |
-#ifdef SQLITE_OMIT_TRUNCATE_OPTIMIZATION |
+#if SQLITE_OMIT_TRUNCATE_OPTIMIZATION |
"OMIT_TRUNCATE_OPTIMIZATION", |
#endif |
-#ifdef SQLITE_OMIT_UTF16 |
+#if SQLITE_OMIT_UTF16 |
"OMIT_UTF16", |
#endif |
-#ifdef SQLITE_OMIT_VACUUM |
+#if SQLITE_OMIT_VACUUM |
"OMIT_VACUUM", |
#endif |
-#ifdef SQLITE_OMIT_VIEW |
+#if SQLITE_OMIT_VIEW |
"OMIT_VIEW", |
#endif |
-#ifdef SQLITE_OMIT_VIRTUALTABLE |
+#if SQLITE_OMIT_VIRTUALTABLE |
"OMIT_VIRTUALTABLE", |
#endif |
-#ifdef SQLITE_OMIT_WAL |
+#if SQLITE_OMIT_WAL |
"OMIT_WAL", |
#endif |
-#ifdef SQLITE_OMIT_WSD |
+#if SQLITE_OMIT_WSD |
"OMIT_WSD", |
#endif |
-#ifdef SQLITE_OMIT_XFER_OPT |
+#if SQLITE_OMIT_XFER_OPT |
"OMIT_XFER_OPT", |
#endif |
-#ifdef SQLITE_PERFORMANCE_TRACE |
+#if SQLITE_PERFORMANCE_TRACE |
"PERFORMANCE_TRACE", |
#endif |
-#ifdef SQLITE_PROXY_DEBUG |
+#if SQLITE_PROXY_DEBUG |
"PROXY_DEBUG", |
#endif |
-#ifdef SQLITE_RTREE_INT_ONLY |
+#if SQLITE_RTREE_INT_ONLY |
"RTREE_INT_ONLY", |
#endif |
-#ifdef SQLITE_SECURE_DELETE |
+#if SQLITE_SECURE_DELETE |
"SECURE_DELETE", |
#endif |
-#ifdef SQLITE_SMALL_STACK |
+#if SQLITE_SMALL_STACK |
"SMALL_STACK", |
#endif |
-#ifdef SQLITE_SOUNDEX |
+#if SQLITE_SOUNDEX |
"SOUNDEX", |
#endif |
-#ifdef SQLITE_SYSTEM_MALLOC |
+#if SQLITE_SYSTEM_MALLOC |
"SYSTEM_MALLOC", |
#endif |
-#ifdef SQLITE_TCL |
+#if SQLITE_TCL |
"TCL", |
#endif |
#if defined(SQLITE_TEMP_STORE) && !defined(SQLITE_TEMP_STORE_xc) |
"TEMP_STORE=" CTIMEOPT_VAL(SQLITE_TEMP_STORE), |
#endif |
-#ifdef SQLITE_TEST |
+#if SQLITE_TEST |
"TEST", |
#endif |
#if defined(SQLITE_THREADSAFE) |
"THREADSAFE=" CTIMEOPT_VAL(SQLITE_THREADSAFE), |
#endif |
-#ifdef SQLITE_USE_ALLOCA |
+#if SQLITE_USE_ALLOCA |
"USE_ALLOCA", |
#endif |
-#ifdef SQLITE_USER_AUTHENTICATION |
+#if SQLITE_USER_AUTHENTICATION |
"USER_AUTHENTICATION", |
#endif |
-#ifdef SQLITE_WIN32_MALLOC |
+#if SQLITE_WIN32_MALLOC |
"WIN32_MALLOC", |
#endif |
-#ifdef SQLITE_ZERO_MALLOC |
+#if SQLITE_ZERO_MALLOC |
"ZERO_MALLOC" |
#endif |
}; |
@@ -388,6 +406,13 @@ static const char * const azCompileOpt[] = { |
*/ |
int sqlite3_compileoption_used(const char *zOptName){ |
int i, n; |
+ |
+#if SQLITE_ENABLE_API_ARMOR |
+ if( zOptName==0 ){ |
+ (void)SQLITE_MISUSE_BKPT; |
+ return 0; |
+ } |
+#endif |
if( sqlite3StrNICmp(zOptName, "SQLITE_", 7)==0 ) zOptName += 7; |
n = sqlite3Strlen30(zOptName); |