diff --git a/apps/mobile/patches/@react-native+community-cli-plugin+0.77.2.patch b/apps/mobile/patches/@react-native+community-cli-plugin+0.77.2.patch new file mode 100644 index 000000000..32913b424 --- /dev/null +++ b/apps/mobile/patches/@react-native+community-cli-plugin+0.77.2.patch @@ -0,0 +1,11 @@ +diff --git a/node_modules/@react-native/community-cli-plugin/dist/utils/loadMetroConfig.js b/node_modules/@react-native/community-cli-plugin/dist/utils/loadMetroConfig.js +index c0749e1..bbcb97e 100644 +--- a/node_modules/@react-native/community-cli-plugin/dist/utils/loadMetroConfig.js ++++ b/node_modules/@react-native/community-cli-plugin/dist/utils/loadMetroConfig.js +@@ -83,5 +83,6 @@ This warning will be removed in future (https://github.com/facebook/metro/issues + ...options, + }); + const overrideConfig = getOverrideConfig(ctx, config); ++ if (!overrideConfig.resolver.resolveRequest) delete overrideConfig.resolver.resolveRequest; + return (0, _metroConfig.mergeConfig)(config, overrideConfig); + } diff --git a/apps/mobile/patches/react-native-mmkv-storage+0.11.2.patch b/apps/mobile/patches/react-native-mmkv-storage+0.11.2.patch new file mode 100644 index 000000000..608edee0f --- /dev/null +++ b/apps/mobile/patches/react-native-mmkv-storage+0.11.2.patch @@ -0,0 +1,9159 @@ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/cache-v2 b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/cache-v2 +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/cmakeFiles-v1 b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/cmakeFiles-v1 +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/codemodel-v2 b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/query/client-agp/codemodel-v2 +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cache-v2-4fcc3a0282421a2d3b89.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cache-v2-4fcc3a0282421a2d3b89.json +new file mode 100644 +index 0000000..37940c6 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cache-v2-4fcc3a0282421a2d3b89.json +@@ -0,0 +1,1615 @@ ++{ ++ "entries" : ++ [ ++ { ++ "name" : "ANDROID_ABI", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "arm64-v8a" ++ }, ++ { ++ "name" : "ANDROID_NDK", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006" ++ }, ++ { ++ "name" : "ANDROID_PLATFORM", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "android-24" ++ }, ++ { ++ "name" : "ANDROID_STL", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "c++_shared" ++ }, ++ { ++ "name" : "CMAKE_ADDR2LINE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-addr2line" ++ }, ++ { ++ "name" : "CMAKE_ANDROID_ARCH_ABI", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "arm64-v8a" ++ }, ++ { ++ "name" : "CMAKE_ANDROID_NDK", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006" ++ }, ++ { ++ "name" : "CMAKE_AR", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Archiver" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar" ++ }, ++ { ++ "name" : "CMAKE_ASM_COMPILER", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "ASM compiler" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" ++ }, ++ { ++ "name" : "CMAKE_ASM_COMPILER_AR", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "LLVM archiver" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar" ++ }, ++ { ++ "name" : "CMAKE_ASM_COMPILER_RANLIB", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Generate index for LLVM archive" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib" ++ }, ++ { ++ "name" : "CMAKE_ASM_COMPILER_WORKS", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "1" ++ }, ++ { ++ "name" : "CMAKE_ASM_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during all build types." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_ASM_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during debug builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_ASM_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the ASM compiler during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-Os -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_ASM_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during release builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_ASM_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the ASM compiler during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-O2 -g -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_BUILD_TYPE", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ..." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "Debug" ++ }, ++ { ++ "name" : "CMAKE_CACHEFILE_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "This is the directory where this CMakeCache.txt was created" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a" ++ }, ++ { ++ "name" : "CMAKE_CACHE_MAJOR_VERSION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Major version of cmake used to create the current loaded cache" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "3" ++ }, ++ { ++ "name" : "CMAKE_CACHE_MINOR_VERSION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Minor version of cmake used to create the current loaded cache" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "22" ++ }, ++ { ++ "name" : "CMAKE_CACHE_PATCH_VERSION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Patch version of cmake used to create the current loaded cache" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "1" ++ }, ++ { ++ "name" : "CMAKE_COMMAND", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to CMake executable." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake" ++ }, ++ { ++ "name" : "CMAKE_CPACK_COMMAND", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to cpack program executable." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cpack" ++ }, ++ { ++ "name" : "CMAKE_CTEST_COMMAND", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to ctest program executable." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ctest" ++ }, ++ { ++ "name" : "CMAKE_CXX_COMPILER", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "(This variable does not exist and should not be used)" ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_CXX_COMPILER_AR", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "LLVM archiver" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar" ++ }, ++ { ++ "name" : "CMAKE_CXX_COMPILER_LAUNCHER", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Compiler launcher for CXX." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "ccache" ++ }, ++ { ++ "name" : "CMAKE_CXX_COMPILER_RANLIB", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Generate index for LLVM archive" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib" ++ }, ++ { ++ "name" : "CMAKE_CXX_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during all build types." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-O3 -frtti -fexceptions -Wall -fstack-protector-all" ++ }, ++ { ++ "name" : "CMAKE_CXX_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during debug builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_CXX_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the CXX compiler during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-Os -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_CXX_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during release builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_CXX_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the CXX compiler during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-O2 -g -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_CXX_STANDARD_LIBRARIES", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Libraries linked by default with all C++ applications." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-latomic -lm" ++ }, ++ { ++ "name" : "CMAKE_C_COMPILER", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "(This variable does not exist and should not be used)" ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_C_COMPILER_AR", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "LLVM archiver" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar" ++ }, ++ { ++ "name" : "CMAKE_C_COMPILER_LAUNCHER", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Compiler launcher for C." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "ccache" ++ }, ++ { ++ "name" : "CMAKE_C_COMPILER_RANLIB", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Generate index for LLVM archive" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib" ++ }, ++ { ++ "name" : "CMAKE_C_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during all build types." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_C_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during debug builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_C_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the C compiler during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-Os -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_C_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the compiler during release builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_C_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the C compiler during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-O2 -g -DNDEBUG" ++ }, ++ { ++ "name" : "CMAKE_C_STANDARD_LIBRARIES", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Libraries linked by default with all C applications." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "-latomic -lm" ++ }, ++ { ++ "name" : "CMAKE_DLLTOOL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dlltool" ++ }, ++ { ++ "name" : "CMAKE_EDIT_COMMAND", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to cache edit program executable." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ccmake" ++ }, ++ { ++ "name" : "CMAKE_EXECUTABLE_FORMAT", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Executable file format" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "ELF" ++ }, ++ { ++ "name" : "CMAKE_EXE_LINKER_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_EXE_LINKER_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during DEBUG builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_EXE_LINKER_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_EXE_LINKER_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during RELEASE builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_EXPORT_COMPILE_COMMANDS", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "ON" ++ }, ++ { ++ "name" : "CMAKE_EXTRA_GENERATOR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Name of external makefile project generator." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_FIND_ROOT_PATH", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab" ++ }, ++ { ++ "name" : "CMAKE_GENERATOR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Name of generator." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "Ninja" ++ }, ++ { ++ "name" : "CMAKE_GENERATOR_INSTANCE", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Generator instance identifier." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_GENERATOR_PLATFORM", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Name of generator platform." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_GENERATOR_TOOLSET", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Name of generator toolset." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_HOME_DIRECTORY", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Source directory with the top level CMakeLists.txt file for this project" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv" ++ }, ++ { ++ "name" : "CMAKE_INSTALL_PREFIX", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Install path prefix, prepended onto install directories." ++ } ++ ], ++ "type" : "PATH", ++ "value" : "/usr/local" ++ }, ++ { ++ "name" : "CMAKE_INSTALL_SO_NO_EXE", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Install .so files without execute permission." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "0" ++ }, ++ { ++ "name" : "CMAKE_LIBRARY_OUTPUT_DIRECTORY", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a" ++ }, ++ { ++ "name" : "CMAKE_LINKER", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld" ++ }, ++ { ++ "name" : "CMAKE_MAKE_PROGRAM", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja" ++ }, ++ { ++ "name" : "CMAKE_MODULE_LINKER_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of modules." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_MODULE_LINKER_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of modules during DEBUG builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of modules during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_MODULE_LINKER_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of modules during RELEASE builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of modules during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_NM", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm" ++ }, ++ { ++ "name" : "CMAKE_NUMBER_OF_MAKEFILES", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "number of local generators" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "2" ++ }, ++ { ++ "name" : "CMAKE_OBJCOPY", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy" ++ }, ++ { ++ "name" : "CMAKE_OBJDUMP", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump" ++ }, ++ { ++ "name" : "CMAKE_PLATFORM_INFO_INITIALIZED", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Platform information initialized" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "1" ++ }, ++ { ++ "name" : "CMAKE_PROJECT_DESCRIPTION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_PROJECT_HOMEPAGE_URL", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_PROJECT_NAME", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "PACKAGE_NAME" ++ }, ++ { ++ "name" : "CMAKE_RANLIB", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Ranlib" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib" ++ }, ++ { ++ "name" : "CMAKE_READELF", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a program." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readelf" ++ }, ++ { ++ "name" : "CMAKE_ROOT", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to CMake installation." ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" ++ }, ++ { ++ "name" : "CMAKE_RUNTIME_OUTPUT_DIRECTORY", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a" ++ }, ++ { ++ "name" : "CMAKE_SHARED_LINKER_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of dll's." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_SHARED_LINKER_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of shared libraries during DEBUG builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of shared libraries during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_SHARED_LINKER_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of shared libraries during RELEASE builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of shared libraries during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_SKIP_INSTALL_RPATH", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "If set, runtime paths are not added when installing shared libraries, but are added when building." ++ } ++ ], ++ "type" : "BOOL", ++ "value" : "NO" ++ }, ++ { ++ "name" : "CMAKE_SKIP_RPATH", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "If set, runtime paths are not added when using shared libraries." ++ } ++ ], ++ "type" : "BOOL", ++ "value" : "NO" ++ }, ++ { ++ "name" : "CMAKE_STATIC_LINKER_FLAGS", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of static libraries during all build types." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_STATIC_LINKER_FLAGS_DEBUG", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of static libraries during DEBUG builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of static libraries during MINSIZEREL builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_STATIC_LINKER_FLAGS_RELEASE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of static libraries during RELEASE builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Flags used by the linker during the creation of static libraries during RELWITHDEBINFO builds." ++ } ++ ], ++ "type" : "STRING", ++ "value" : "" ++ }, ++ { ++ "name" : "CMAKE_STRIP", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "Strip" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip" ++ }, ++ { ++ "name" : "CMAKE_SYSTEM_NAME", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "Android" ++ }, ++ { ++ "name" : "CMAKE_SYSTEM_VERSION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "24" ++ }, ++ { ++ "name" : "CMAKE_TOOLCHAIN_FILE", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "The CMake toolchain file" ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake" ++ }, ++ { ++ "name" : "CMAKE_UNAME", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "uname command" ++ } ++ ], ++ "type" : "INTERNAL", ++ "value" : "/usr/bin/uname" ++ }, ++ { ++ "name" : "CMAKE_VERBOSE_MAKEFILE", ++ "properties" : ++ [ ++ { ++ "name" : "ADVANCED", ++ "value" : "1" ++ }, ++ { ++ "name" : "HELPSTRING", ++ "value" : "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo." ++ } ++ ], ++ "type" : "BOOL", ++ "value" : "FALSE" ++ }, ++ { ++ "name" : "PACKAGE_NAME_BINARY_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a" ++ }, ++ { ++ "name" : "PACKAGE_NAME_IS_TOP_LEVEL", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "ON" ++ }, ++ { ++ "name" : "PACKAGE_NAME_SOURCE_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv" ++ }, ++ { ++ "name" : "REACT_NATIVE_MINOR_VERSION", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "No help, variable specified on the command line." ++ } ++ ], ++ "type" : "UNINITIALIZED", ++ "value" : "77" ++ }, ++ { ++ "name" : "ReactAndroid_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "The directory containing a CMake configuration file for ReactAndroid." ++ } ++ ], ++ "type" : "PATH", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid" ++ }, ++ { ++ "name" : "core_BINARY_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core" ++ }, ++ { ++ "name" : "core_IS_TOP_LEVEL", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "OFF" ++ }, ++ { ++ "name" : "core_LIB_DEPENDS", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Dependencies for the target" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "general;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so;" ++ }, ++ { ++ "name" : "core_SOURCE_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Value Computed by CMake" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ }, ++ { ++ "name" : "fbjni_DIR", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "The directory containing a CMake configuration file for fbjni." ++ } ++ ], ++ "type" : "PATH", ++ "value" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni" ++ }, ++ { ++ "name" : "log-lib", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a library." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so" ++ }, ++ { ++ "name" : "rnmmkv_LIB_DEPENDS", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Dependencies for the target" ++ } ++ ], ++ "type" : "STATIC", ++ "value" : "general;core;general;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so;general;fbjni::fbjni;general;ReactAndroid::jsi;general;ReactAndroid::reactnative;general;android;" ++ }, ++ { ++ "name" : "zlib", ++ "properties" : ++ [ ++ { ++ "name" : "HELPSTRING", ++ "value" : "Path to a library." ++ } ++ ], ++ "type" : "FILEPATH", ++ "value" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so" ++ } ++ ], ++ "kind" : "cache", ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 0 ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cmakeFiles-v1-1e19e9e1c2dd6b6409a0.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cmakeFiles-v1-1e19e9e1c2dd6b6409a0.json +new file mode 100644 +index 0000000..1da75bf +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/cmakeFiles-v1-1e19e9e1c2dd6b6409a0.json +@@ -0,0 +1,892 @@ ++{ ++ "inputs" : ++ [ ++ { ++ "path" : "CMakeLists.txt" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineSystem.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android-legacy.toolchain.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/abis.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/platforms.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Determine.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystem.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInitialize.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Initialize.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Initialize.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-C.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android/Determine-Compiler.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Determine-Compiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerId.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCompilerIdDetection.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ADSP-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMCC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/AppleClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Borland-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Bruce-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Cray-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GHS-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IAR-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Intel-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/MSVC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVHPC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PGI-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PathScale-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SCO-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TI-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Watcom-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-C-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeFindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-FindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompiler.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCXXCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-CXX.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android/Determine-Compiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerId.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCompilerIdDetection.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ADSP-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMCC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/AppleClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Borland-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Cray-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GHS-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IAR-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Intel-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/MSVC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVHPC-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PGI-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PathScale-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SCO-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TI-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Watcom-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeFindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-FindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompiler.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeGenericSystem.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeInitializeConfigs.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Linux.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/UnixPaths.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeLanguageInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-C.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/CMakeCommonCompilerMacros.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/CMakeCommonCompilerMacros.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-C.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Clang.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/flags.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCommonLanguageInclude.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerABI.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitIncludeInfo.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitLinkInfo.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseLibraryArchitecture.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompilerABI.c" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompileFeatures.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Internal/FeatureTesting.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompiler.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeLanguageInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-CXX.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-CXX.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCommonLanguageInclude.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerABI.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitIncludeInfo.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitLinkInfo.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseLibraryArchitecture.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompileFeatures.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Internal/FeatureTesting.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompiler.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake" ++ }, ++ { ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineASMCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerId.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCompilerIdDetection.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeFindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-FindBinUtils.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMCompiler.cmake.in" ++ }, ++ { ++ "isGenerated" : true, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMInformation.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-ASM.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-ASM.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang.cmake" ++ }, ++ { ++ "isCMake" : true, ++ "isExternal" : true, ++ "path" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestASMCompiler.cmake" ++ } ++ ], ++ "kind" : "cmakeFiles", ++ "paths" : ++ { ++ "build" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "source" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv" ++ }, ++ "version" : ++ { ++ "major" : 1, ++ "minor" : 0 ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/codemodel-v2-ef3ec3946d637dcb85cc.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/codemodel-v2-ef3ec3946d637dcb85cc.json +new file mode 100644 +index 0000000..ac4e8cb +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/codemodel-v2-ef3ec3946d637dcb85cc.json +@@ -0,0 +1,102 @@ ++{ ++ "configurations" : ++ [ ++ { ++ "directories" : ++ [ ++ { ++ "build" : ".", ++ "childIndexes" : ++ [ ++ 1 ++ ], ++ "jsonFile" : "directory-.-Debug-f5ebdc15457944623624.json", ++ "minimumCMakeVersion" : ++ { ++ "string" : "3.6.0" ++ }, ++ "projectIndex" : 0, ++ "source" : ".", ++ "targetIndexes" : ++ [ ++ 1 ++ ] ++ }, ++ { ++ "build" : "core", ++ "jsonFile" : "directory-core-Debug-0c55b56e6e49717d3843.json", ++ "minimumCMakeVersion" : ++ { ++ "string" : "3.10.0" ++ }, ++ "parentIndex" : 0, ++ "projectIndex" : 1, ++ "source" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core", ++ "targetIndexes" : ++ [ ++ 0 ++ ] ++ } ++ ], ++ "name" : "Debug", ++ "projects" : ++ [ ++ { ++ "childIndexes" : ++ [ ++ 1 ++ ], ++ "directoryIndexes" : ++ [ ++ 0 ++ ], ++ "name" : "PACKAGE_NAME", ++ "targetIndexes" : ++ [ ++ 1 ++ ] ++ }, ++ { ++ "directoryIndexes" : ++ [ ++ 1 ++ ], ++ "name" : "core", ++ "parentIndex" : 0, ++ "targetIndexes" : ++ [ ++ 0 ++ ] ++ } ++ ], ++ "targets" : ++ [ ++ { ++ "directoryIndex" : 1, ++ "id" : "core::@57760688d1f824db5d9c", ++ "jsonFile" : "target-core-Debug-6fdee91f06b602da4884.json", ++ "name" : "core", ++ "projectIndex" : 1 ++ }, ++ { ++ "directoryIndex" : 0, ++ "id" : "rnmmkv::@6890427a1f51a3e7e1df", ++ "jsonFile" : "target-rnmmkv-Debug-0134b721e8df58d1deb2.json", ++ "name" : "rnmmkv", ++ "projectIndex" : 0 ++ } ++ ] ++ } ++ ], ++ "kind" : "codemodel", ++ "paths" : ++ { ++ "build" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "source" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv" ++ }, ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 3 ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-.-Debug-f5ebdc15457944623624.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-.-Debug-f5ebdc15457944623624.json +new file mode 100644 +index 0000000..3a67af9 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-.-Debug-f5ebdc15457944623624.json +@@ -0,0 +1,14 @@ ++{ ++ "backtraceGraph" : ++ { ++ "commands" : [], ++ "files" : [], ++ "nodes" : [] ++ }, ++ "installers" : [], ++ "paths" : ++ { ++ "build" : ".", ++ "source" : "." ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-core-Debug-0c55b56e6e49717d3843.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-core-Debug-0c55b56e6e49717d3843.json +new file mode 100644 +index 0000000..3aa9fe2 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/directory-core-Debug-0c55b56e6e49717d3843.json +@@ -0,0 +1,14 @@ ++{ ++ "backtraceGraph" : ++ { ++ "commands" : [], ++ "files" : [], ++ "nodes" : [] ++ }, ++ "installers" : [], ++ "paths" : ++ { ++ "build" : "core", ++ "source" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/index-2025-05-21T04-48-09-0271.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/index-2025-05-21T04-48-09-0271.json +new file mode 100644 +index 0000000..f7a9ea5 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/index-2025-05-21T04-48-09-0271.json +@@ -0,0 +1,92 @@ ++{ ++ "cmake" : ++ { ++ "generator" : ++ { ++ "multiConfig" : false, ++ "name" : "Ninja" ++ }, ++ "paths" : ++ { ++ "cmake" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake", ++ "cpack" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cpack", ++ "ctest" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ctest", ++ "root" : "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" ++ }, ++ "version" : ++ { ++ "isDirty" : false, ++ "major" : 3, ++ "minor" : 22, ++ "patch" : 1, ++ "string" : "3.22.1-g37088a8", ++ "suffix" : "g37088a8" ++ } ++ }, ++ "objects" : ++ [ ++ { ++ "jsonFile" : "codemodel-v2-ef3ec3946d637dcb85cc.json", ++ "kind" : "codemodel", ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 3 ++ } ++ }, ++ { ++ "jsonFile" : "cache-v2-4fcc3a0282421a2d3b89.json", ++ "kind" : "cache", ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 0 ++ } ++ }, ++ { ++ "jsonFile" : "cmakeFiles-v1-1e19e9e1c2dd6b6409a0.json", ++ "kind" : "cmakeFiles", ++ "version" : ++ { ++ "major" : 1, ++ "minor" : 0 ++ } ++ } ++ ], ++ "reply" : ++ { ++ "client-agp" : ++ { ++ "cache-v2" : ++ { ++ "jsonFile" : "cache-v2-4fcc3a0282421a2d3b89.json", ++ "kind" : "cache", ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 0 ++ } ++ }, ++ "cmakeFiles-v1" : ++ { ++ "jsonFile" : "cmakeFiles-v1-1e19e9e1c2dd6b6409a0.json", ++ "kind" : "cmakeFiles", ++ "version" : ++ { ++ "major" : 1, ++ "minor" : 0 ++ } ++ }, ++ "codemodel-v2" : ++ { ++ "jsonFile" : "codemodel-v2-ef3ec3946d637dcb85cc.json", ++ "kind" : "codemodel", ++ "version" : ++ { ++ "major" : 2, ++ "minor" : 3 ++ } ++ } ++ } ++ } ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-core-Debug-6fdee91f06b602da4884.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-core-Debug-6fdee91f06b602da4884.json +new file mode 100644 +index 0000000..bddfa4f +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-core-Debug-6fdee91f06b602da4884.json +@@ -0,0 +1,589 @@ ++{ ++ "archive" : {}, ++ "artifacts" : ++ [ ++ { ++ "path" : "core/libcore.a" ++ } ++ ], ++ "backtrace" : 1, ++ "backtraceGraph" : ++ { ++ "commands" : ++ [ ++ "add_library", ++ "target_include_directories", ++ "set_target_properties", ++ "target_sources" ++ ], ++ "files" : ++ [ ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt" ++ ], ++ "nodes" : ++ [ ++ { ++ "file" : 0 ++ }, ++ { ++ "command" : 0, ++ "file" : 0, ++ "line" : 72, ++ "parent" : 0 ++ }, ++ { ++ "command" : 1, ++ "file" : 0, ++ "line" : 149, ++ "parent" : 0 ++ }, ++ { ++ "command" : 2, ++ "file" : 0, ++ "line" : 157, ++ "parent" : 0 ++ }, ++ { ++ "command" : 3, ++ "file" : 0, ++ "line" : 144, ++ "parent" : 0 ++ } ++ ] ++ }, ++ "compileGroups" : ++ [ ++ { ++ "compileCommandFragments" : ++ [ ++ { ++ "fragment" : "-g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC" ++ }, ++ { ++ "fragment" : "-std=c++20" ++ } ++ ], ++ "includes" : ++ [ ++ { ++ "backtrace" : 2, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ } ++ ], ++ "language" : "CXX", ++ "languageStandard" : ++ { ++ "backtraces" : ++ [ ++ 3 ++ ], ++ "standard" : "20" ++ }, ++ "sourceIndexes" : ++ [ ++ 1, ++ 2, ++ 4, ++ 5, ++ 7, ++ 8, ++ 10, ++ 11, ++ 13, ++ 14, ++ 16, ++ 18, ++ 20, ++ 22, ++ 23, ++ 25, ++ 27, ++ 28, ++ 29, ++ 31, ++ 32, ++ 33, ++ 34, ++ 35, ++ 37, ++ 38, ++ 41, ++ 43, ++ 45, ++ 47, ++ 49, ++ 54, ++ 58 ++ ], ++ "sysroot" : ++ { ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot" ++ } ++ }, ++ { ++ "compileCommandFragments" : ++ [ ++ { ++ "fragment" : " -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC" ++ } ++ ], ++ "includes" : ++ [ ++ { ++ "backtrace" : 2, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ } ++ ], ++ "language" : "ASM", ++ "sourceIndexes" : ++ [ ++ 60, ++ 61 ++ ], ++ "sysroot" : ++ { ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot" ++ } ++ } ++ ], ++ "id" : "core::@57760688d1f824db5d9c", ++ "name" : "core", ++ "nameOnDisk" : "libcore.a", ++ "paths" : ++ { ++ "build" : "core", ++ "source" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ }, ++ "sourceGroups" : ++ [ ++ { ++ "name" : "Header Files", ++ "sourceIndexes" : ++ [ ++ 0, ++ 3, ++ 6, ++ 9, ++ 12, ++ 15, ++ 17, ++ 19, ++ 21, ++ 24, ++ 26, ++ 30, ++ 36, ++ 39, ++ 40, ++ 42, ++ 44, ++ 46, ++ 48, ++ 50, ++ 51, ++ 52, ++ 53, ++ 55, ++ 56, ++ 57, ++ 59 ++ ] ++ }, ++ { ++ "name" : "Source Files", ++ "sourceIndexes" : ++ [ ++ 1, ++ 2, ++ 4, ++ 5, ++ 7, ++ 8, ++ 10, ++ 11, ++ 13, ++ 14, ++ 16, ++ 18, ++ 20, ++ 22, ++ 23, ++ 25, ++ 27, ++ 28, ++ 29, ++ 31, ++ 32, ++ 33, ++ 34, ++ 35, ++ 37, ++ 38, ++ 41, ++ 43, ++ 45, ++ 47, ++ 49, ++ 54, ++ 58 ++ ] ++ }, ++ { ++ "name" : "", ++ "sourceIndexes" : ++ [ ++ 60, ++ 61 ++ ] ++ } ++ ], ++ "sources" : ++ [ ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVMetaInfo.hpp", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_locl.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_opensslconf.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_locl.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md32_common.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_arm_arch.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/Checksum.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/zconf.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/zutil.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp", ++ "sourceGroupIndex" : 1 ++ }, ++ { ++ "backtrace" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVPredef.h", ++ "sourceGroupIndex" : 0 ++ }, ++ { ++ "backtrace" : 4, ++ "compileGroupIndex" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S", ++ "sourceGroupIndex" : 2 ++ }, ++ { ++ "backtrace" : 4, ++ "compileGroupIndex" : 1, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S", ++ "sourceGroupIndex" : 2 ++ } ++ ], ++ "type" : "STATIC_LIBRARY" ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-rnmmkv-Debug-0134b721e8df58d1deb2.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-rnmmkv-Debug-0134b721e8df58d1deb2.json +new file mode 100644 +index 0000000..03af3e6 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.cmake/api/v1/reply/target-rnmmkv-Debug-0134b721e8df58d1deb2.json +@@ -0,0 +1,190 @@ ++{ ++ "artifacts" : ++ [ ++ { ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so" ++ } ++ ], ++ "backtrace" : 1, ++ "backtraceGraph" : ++ { ++ "commands" : ++ [ ++ "add_library", ++ "target_link_libraries", ++ "set_target_properties" ++ ], ++ "files" : ++ [ ++ "CMakeLists.txt" ++ ], ++ "nodes" : ++ [ ++ { ++ "file" : 0 ++ }, ++ { ++ "command" : 0, ++ "file" : 0, ++ "line" : 11, ++ "parent" : 0 ++ }, ++ { ++ "command" : 1, ++ "file" : 0, ++ "line" : 30, ++ "parent" : 0 ++ }, ++ { ++ "command" : 2, ++ "file" : 0, ++ "line" : 17, ++ "parent" : 0 ++ } ++ ] ++ }, ++ "compileGroups" : ++ [ ++ { ++ "compileCommandFragments" : ++ [ ++ { ++ "fragment" : "-g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC" ++ } ++ ], ++ "defines" : ++ [ ++ { ++ "define" : "rnmmkv_EXPORTS" ++ } ++ ], ++ "includes" : ++ [ ++ { ++ "backtrace" : 2, ++ "path" : "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core" ++ }, ++ { ++ "backtrace" : 2, ++ "isSystem" : true, ++ "path" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/include" ++ }, ++ { ++ "backtrace" : 2, ++ "isSystem" : true, ++ "path" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/include" ++ }, ++ { ++ "backtrace" : 2, ++ "isSystem" : true, ++ "path" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/include" ++ } ++ ], ++ "language" : "CXX", ++ "languageStandard" : ++ { ++ "backtraces" : ++ [ ++ 3 ++ ], ++ "standard" : "17" ++ }, ++ "sourceIndexes" : ++ [ ++ 0 ++ ], ++ "sysroot" : ++ { ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot" ++ } ++ } ++ ], ++ "dependencies" : ++ [ ++ { ++ "backtrace" : 2, ++ "id" : "core::@57760688d1f824db5d9c" ++ } ++ ], ++ "id" : "rnmmkv::@6890427a1f51a3e7e1df", ++ "link" : ++ { ++ "commandFragments" : ++ [ ++ { ++ "fragment" : "-Wl,--build-id=sha1 -Wl,--no-rosegment -Wl,--no-undefined-version -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments", ++ "role" : "flags" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "core/libcore.a", ++ "role" : "libraries" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so", ++ "role" : "libraries" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so", ++ "role" : "libraries" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so", ++ "role" : "libraries" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so", ++ "role" : "libraries" ++ }, ++ { ++ "backtrace" : 2, ++ "fragment" : "-landroid", ++ "role" : "libraries" ++ }, ++ { ++ "fragment" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so", ++ "role" : "libraries" ++ }, ++ { ++ "fragment" : "-latomic -lm", ++ "role" : "libraries" ++ } ++ ], ++ "language" : "CXX", ++ "sysroot" : ++ { ++ "path" : "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot" ++ } ++ }, ++ "name" : "rnmmkv", ++ "nameOnDisk" : "librnmmkv.so", ++ "paths" : ++ { ++ "build" : ".", ++ "source" : "." ++ }, ++ "sourceGroups" : ++ [ ++ { ++ "name" : "Source Files", ++ "sourceIndexes" : ++ [ ++ 0 ++ ] ++ } ++ ], ++ "sources" : ++ [ ++ { ++ "backtrace" : 1, ++ "compileGroupIndex" : 0, ++ "path" : "rnmmkv-adapter.cpp", ++ "sourceGroupIndex" : 0 ++ } ++ ], ++ "type" : "SHARED_LIBRARY" ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_deps b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_deps +new file mode 100644 +index 0000000..2043829 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_deps differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_log b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_log +new file mode 100644 +index 0000000..b7f9462 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/.ninja_log +@@ -0,0 +1,39 @@ ++# ninja log v5 ++1 215 1747802889677598620 core/CMakeFiles/core.dir/MMKV_OSX.cpp.o da07b9df5bd10ccc ++1 222 1747802889681723284 core/CMakeFiles/core.dir/MMKV.cpp.o 1808d54a74d65af ++1 223 1747802889678136136 core/CMakeFiles/core.dir/MMKV_Android.cpp.o f2ebf4c76fbaad5a ++1 224 1747802889681606239 core/CMakeFiles/core.dir/MMKV_IO.cpp.o cf8187da0938b5df ++1 224 1747802889677996674 core/CMakeFiles/core.dir/MMKVLog.cpp.o 9bf74317ce32ffc6 ++2 225 1747802889681578446 core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o 32e0e5f6f54428d4 ++3 225 1747802889678348392 core/CMakeFiles/core.dir/CodedInputData.cpp.o 27bd4b77b1baa844 ++3 226 1747802889678263390 core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o 756111422dff3d3f ++4 226 1747802889678147595 core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o 7ef3283d43d1a40d ++4 227 1747802889678184638 core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o 54eabf01b8e76c07 ++5 227 1747802889677655914 core/CMakeFiles/core.dir/CodedOutputData.cpp.o 846547eeb72476a2 ++6 228 1747802889677753833 core/CMakeFiles/core.dir/KeyValueHolder.cpp.o 10c18ce1cff9b597 ++6 230 1747802889678704153 core/CMakeFiles/core.dir/PBUtility.cpp.o c131725682e452d4 ++1 230 1747802889683396875 CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o 6149d9a4be17990b ++223 299 1747802889765664767 core/CMakeFiles/core.dir/MMBuffer.cpp.o eee51a8927e0dfab ++222 312 1747802889778952451 core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o 16d0fd15cd19e036 ++224 313 1747802889779142540 core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o 38fb26b087a1fbf4 ++224 317 1747802889784442489 core/CMakeFiles/core.dir/InterProcessLock.cpp.o 4e953281c51f3cf4 ++225 319 1747802889784968212 core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o 486741ae68f3ec05 ++230 319 1747802889785657316 core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o affdbafb04258685 ++227 322 1747802889786730598 core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o 836473648cdd5991 ++225 323 1747802889790035362 core/CMakeFiles/core.dir/MemoryFile.cpp.o 2e27a61f9fad3a50 ++222 325 1747802889786677763 core/CMakeFiles/core.dir/MiniPBCoder.cpp.o 6faa9bc3cc97e253 ++226 325 1747802889792760526 core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o 8b19abd6e8be1a37 ++226 326 1747802889792937740 core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o 162ec30e4cc0defa ++228 327 1747802889788207308 core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o c8badba4d6970931 ++228 327 1747802889791172396 core/CMakeFiles/core.dir/ThreadLock.cpp.o a15f55db94ad35cd ++231 328 1747802889791387861 core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o 670192d5e8952658 ++313 328 1747802889796113959 core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o c656fe5a91f458de ++317 332 1747802889800585799 core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o 8de52f007a260401 ++299 343 1747802889811449579 core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o 161c2c463792ce8 ++312 350 1747802889817964188 core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o be325a345735fc93 ++319 351 1747802889819520901 core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o 3005644854e524cc ++320 351 1747802889819524818 core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o 7c7abf6fe4235577 ++323 366 1747802889834600805 core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o c820628926bbde9 ++322 369 1747802889837578268 core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o 8315e1c765e53aa7 ++369 432 1747802889901553000 core/libcore.a c3df6e9adba9f773 ++432 476 1747802889938398375 /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so 50067b3f82271e5b +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeCache.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeCache.txt +new file mode 100644 +index 0000000..1c9cb7d +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeCache.txt +@@ -0,0 +1,469 @@ ++# This is the CMakeCache file. ++# For build in directory: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++# It was generated by CMake: /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake ++# You can edit this file to change values found and used by cmake. ++# If you do not want to change any of the values, simply exit the editor. ++# If you do want to change a value, simply edit, save, and exit the editor. ++# The syntax for the file is as follows: ++# KEY:TYPE=VALUE ++# KEY is the name of a variable in the cache. ++# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. ++# VALUE is the current value for the KEY. ++ ++######################## ++# EXTERNAL cache entries ++######################## ++ ++//No help, variable specified on the command line. ++ANDROID_ABI:UNINITIALIZED=arm64-v8a ++ ++//No help, variable specified on the command line. ++ANDROID_NDK:UNINITIALIZED=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 ++ ++//No help, variable specified on the command line. ++ANDROID_PLATFORM:UNINITIALIZED=android-24 ++ ++//No help, variable specified on the command line. ++ANDROID_STL:UNINITIALIZED=c++_shared ++ ++//Path to a program. ++CMAKE_ADDR2LINE:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-addr2line ++ ++//No help, variable specified on the command line. ++CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=arm64-v8a ++ ++//No help, variable specified on the command line. ++CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 ++ ++//Archiver ++CMAKE_AR:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar ++ ++//ASM compiler ++CMAKE_ASM_COMPILER:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang ++ ++//LLVM archiver ++CMAKE_ASM_COMPILER_AR:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar ++ ++//Generate index for LLVM archive ++CMAKE_ASM_COMPILER_RANLIB:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib ++ ++//Flags used by the compiler during all build types. ++CMAKE_ASM_FLAGS:STRING= ++ ++//Flags used by the compiler during debug builds. ++CMAKE_ASM_FLAGS_DEBUG:STRING= ++ ++//Flags used by the ASM compiler during MINSIZEREL builds. ++CMAKE_ASM_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG ++ ++//Flags used by the compiler during release builds. ++CMAKE_ASM_FLAGS_RELEASE:STRING= ++ ++//Flags used by the ASM compiler during RELWITHDEBINFO builds. ++CMAKE_ASM_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG ++ ++//Choose the type of build, options are: None Debug Release RelWithDebInfo ++// MinSizeRel ... ++CMAKE_BUILD_TYPE:STRING=Debug ++ ++//LLVM archiver ++CMAKE_CXX_COMPILER_AR:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar ++ ++//Compiler launcher for CXX. ++CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache ++ ++//Generate index for LLVM archive ++CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib ++ ++//Flags used by the compiler during all build types. ++CMAKE_CXX_FLAGS:STRING=-O3 -frtti -fexceptions -Wall -fstack-protector-all ++ ++//Flags used by the compiler during debug builds. ++CMAKE_CXX_FLAGS_DEBUG:STRING= ++ ++//Flags used by the CXX compiler during MINSIZEREL builds. ++CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG ++ ++//Flags used by the compiler during release builds. ++CMAKE_CXX_FLAGS_RELEASE:STRING= ++ ++//Flags used by the CXX compiler during RELWITHDEBINFO builds. ++CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG ++ ++//Libraries linked by default with all C++ applications. ++CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm ++ ++//LLVM archiver ++CMAKE_C_COMPILER_AR:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar ++ ++//Compiler launcher for C. ++CMAKE_C_COMPILER_LAUNCHER:STRING=ccache ++ ++//Generate index for LLVM archive ++CMAKE_C_COMPILER_RANLIB:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib ++ ++//Flags used by the compiler during all build types. ++CMAKE_C_FLAGS:STRING= ++ ++//Flags used by the compiler during debug builds. ++CMAKE_C_FLAGS_DEBUG:STRING= ++ ++//Flags used by the C compiler during MINSIZEREL builds. ++CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG ++ ++//Flags used by the compiler during release builds. ++CMAKE_C_FLAGS_RELEASE:STRING= ++ ++//Flags used by the C compiler during RELWITHDEBINFO builds. ++CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG ++ ++//Libraries linked by default with all C applications. ++CMAKE_C_STANDARD_LIBRARIES:STRING=-latomic -lm ++ ++//Path to a program. ++CMAKE_DLLTOOL:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dlltool ++ ++//Flags used by the linker. ++CMAKE_EXE_LINKER_FLAGS:STRING= ++ ++//Flags used by the linker during DEBUG builds. ++CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= ++ ++//Flags used by the linker during MINSIZEREL builds. ++CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= ++ ++//Flags used by the linker during RELEASE builds. ++CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= ++ ++//Flags used by the linker during RELWITHDEBINFO builds. ++CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= ++ ++//No help, variable specified on the command line. ++CMAKE_EXPORT_COMPILE_COMMANDS:UNINITIALIZED=ON ++ ++//No help, variable specified on the command line. ++CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab ++ ++//Install path prefix, prepended onto install directories. ++CMAKE_INSTALL_PREFIX:PATH=/usr/local ++ ++//No help, variable specified on the command line. ++CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a ++ ++//Path to a program. ++CMAKE_LINKER:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld ++ ++//No help, variable specified on the command line. ++CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja ++ ++//Flags used by the linker during the creation of modules. ++CMAKE_MODULE_LINKER_FLAGS:STRING= ++ ++//Flags used by the linker during the creation of modules during ++// DEBUG builds. ++CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= ++ ++//Flags used by the linker during the creation of modules during ++// MINSIZEREL builds. ++CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= ++ ++//Flags used by the linker during the creation of modules during ++// RELEASE builds. ++CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= ++ ++//Flags used by the linker during the creation of modules during ++// RELWITHDEBINFO builds. ++CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= ++ ++//Path to a program. ++CMAKE_NM:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm ++ ++//Path to a program. ++CMAKE_OBJCOPY:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy ++ ++//Path to a program. ++CMAKE_OBJDUMP:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump ++ ++//Value Computed by CMake ++CMAKE_PROJECT_DESCRIPTION:STATIC= ++ ++//Value Computed by CMake ++CMAKE_PROJECT_HOMEPAGE_URL:STATIC= ++ ++//Value Computed by CMake ++CMAKE_PROJECT_NAME:STATIC=PACKAGE_NAME ++ ++//Ranlib ++CMAKE_RANLIB:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib ++ ++//Path to a program. ++CMAKE_READELF:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readelf ++ ++//No help, variable specified on the command line. ++CMAKE_RUNTIME_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a ++ ++//Flags used by the linker during the creation of dll's. ++CMAKE_SHARED_LINKER_FLAGS:STRING= ++ ++//Flags used by the linker during the creation of shared libraries ++// during DEBUG builds. ++CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= ++ ++//Flags used by the linker during the creation of shared libraries ++// during MINSIZEREL builds. ++CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= ++ ++//Flags used by the linker during the creation of shared libraries ++// during RELEASE builds. ++CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= ++ ++//Flags used by the linker during the creation of shared libraries ++// during RELWITHDEBINFO builds. ++CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= ++ ++//If set, runtime paths are not added when installing shared libraries, ++// but are added when building. ++CMAKE_SKIP_INSTALL_RPATH:BOOL=NO ++ ++//If set, runtime paths are not added when using shared libraries. ++CMAKE_SKIP_RPATH:BOOL=NO ++ ++//Flags used by the linker during the creation of static libraries ++// during all build types. ++CMAKE_STATIC_LINKER_FLAGS:STRING= ++ ++//Flags used by the linker during the creation of static libraries ++// during DEBUG builds. ++CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= ++ ++//Flags used by the linker during the creation of static libraries ++// during MINSIZEREL builds. ++CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING= ++ ++//Flags used by the linker during the creation of static libraries ++// during RELEASE builds. ++CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= ++ ++//Flags used by the linker during the creation of static libraries ++// during RELWITHDEBINFO builds. ++CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= ++ ++//Strip ++CMAKE_STRIP:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip ++ ++//No help, variable specified on the command line. ++CMAKE_SYSTEM_NAME:UNINITIALIZED=Android ++ ++//No help, variable specified on the command line. ++CMAKE_SYSTEM_VERSION:UNINITIALIZED=24 ++ ++//The CMake toolchain file ++CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake ++ ++//If this value is on, makefiles will be generated without the ++// .SILENT directive, and all commands will be echoed to the console ++// during the make. This is useful for debugging only. With Visual ++// Studio IDE projects all commands are done without /nologo. ++CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE ++ ++//Value Computed by CMake ++PACKAGE_NAME_BINARY_DIR:STATIC=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ ++//Value Computed by CMake ++PACKAGE_NAME_IS_TOP_LEVEL:STATIC=ON ++ ++//Value Computed by CMake ++PACKAGE_NAME_SOURCE_DIR:STATIC=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv ++ ++//No help, variable specified on the command line. ++REACT_NATIVE_MINOR_VERSION:UNINITIALIZED=77 ++ ++//The directory containing a CMake configuration file for ReactAndroid. ++ReactAndroid_DIR:PATH=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid ++ ++//Value Computed by CMake ++core_BINARY_DIR:STATIC=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core ++ ++//Value Computed by CMake ++core_IS_TOP_LEVEL:STATIC=OFF ++ ++//Dependencies for the target ++core_LIB_DEPENDS:STATIC=general;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so; ++ ++//Value Computed by CMake ++core_SOURCE_DIR:STATIC=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ ++//The directory containing a CMake configuration file for fbjni. ++fbjni_DIR:PATH=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni ++ ++//Path to a library. ++log-lib:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so ++ ++//Dependencies for the target ++rnmmkv_LIB_DEPENDS:STATIC=general;core;general;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so;general;fbjni::fbjni;general;ReactAndroid::jsi;general;ReactAndroid::reactnative;general;android; ++ ++//Path to a library. ++zlib:FILEPATH=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so ++ ++ ++######################## ++# INTERNAL cache entries ++######################## ++ ++//ADVANCED property for variable: CMAKE_ADDR2LINE ++CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_AR ++CMAKE_AR-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_COMPILER ++CMAKE_ASM_COMPILER-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_COMPILER_AR ++CMAKE_ASM_COMPILER_AR-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_COMPILER_RANLIB ++CMAKE_ASM_COMPILER_RANLIB-ADVANCED:INTERNAL=1 ++CMAKE_ASM_COMPILER_WORKS:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_FLAGS ++CMAKE_ASM_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_FLAGS_DEBUG ++CMAKE_ASM_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_FLAGS_MINSIZEREL ++CMAKE_ASM_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_FLAGS_RELEASE ++CMAKE_ASM_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_ASM_FLAGS_RELWITHDEBINFO ++CMAKE_ASM_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//This is the directory where this CMakeCache.txt was created ++CMAKE_CACHEFILE_DIR:INTERNAL=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++//Major version of cmake used to create the current loaded cache ++CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 ++//Minor version of cmake used to create the current loaded cache ++CMAKE_CACHE_MINOR_VERSION:INTERNAL=22 ++//Patch version of cmake used to create the current loaded cache ++CMAKE_CACHE_PATCH_VERSION:INTERNAL=1 ++//Path to CMake executable. ++CMAKE_COMMAND:INTERNAL=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake ++//Path to cpack program executable. ++CMAKE_CPACK_COMMAND:INTERNAL=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cpack ++//Path to ctest program executable. ++CMAKE_CTEST_COMMAND:INTERNAL=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ctest ++//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR ++CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB ++CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_FLAGS ++CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG ++CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL ++CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE ++CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO ++CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES ++CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_COMPILER_AR ++CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB ++CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_FLAGS ++CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG ++CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL ++CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE ++CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO ++CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_C_STANDARD_LIBRARIES ++CMAKE_C_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_DLLTOOL ++CMAKE_DLLTOOL-ADVANCED:INTERNAL=1 ++//Path to cache edit program executable. ++CMAKE_EDIT_COMMAND:INTERNAL=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ccmake ++//Executable file format ++CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF ++//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS ++CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG ++CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL ++CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE ++CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ++CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//Name of external makefile project generator. ++CMAKE_EXTRA_GENERATOR:INTERNAL= ++//Name of generator. ++CMAKE_GENERATOR:INTERNAL=Ninja ++//Generator instance identifier. ++CMAKE_GENERATOR_INSTANCE:INTERNAL= ++//Name of generator platform. ++CMAKE_GENERATOR_PLATFORM:INTERNAL= ++//Name of generator toolset. ++CMAKE_GENERATOR_TOOLSET:INTERNAL= ++//Source directory with the top level CMakeLists.txt file for this ++// project ++CMAKE_HOME_DIRECTORY:INTERNAL=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv ++//Install .so files without execute permission. ++CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 ++//ADVANCED property for variable: CMAKE_LINKER ++CMAKE_LINKER-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS ++CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG ++CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL ++CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE ++CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO ++CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_NM ++CMAKE_NM-ADVANCED:INTERNAL=1 ++//number of local generators ++CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=2 ++//ADVANCED property for variable: CMAKE_OBJCOPY ++CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_OBJDUMP ++CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 ++//Platform information initialized ++CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_RANLIB ++CMAKE_RANLIB-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_READELF ++CMAKE_READELF-ADVANCED:INTERNAL=1 ++//Path to CMake installation. ++CMAKE_ROOT:INTERNAL=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22 ++//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS ++CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG ++CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL ++CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE ++CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO ++CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH ++CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_SKIP_RPATH ++CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS ++CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG ++CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL ++CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE ++CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO ++CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 ++//ADVANCED property for variable: CMAKE_STRIP ++CMAKE_STRIP-ADVANCED:INTERNAL=1 ++//uname command ++CMAKE_UNAME:INTERNAL=/usr/bin/uname ++//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE ++CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake +new file mode 100644 +index 0000000..22b34cd +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake +@@ -0,0 +1,20 @@ ++set(CMAKE_ASM_COMPILER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang") ++set(CMAKE_ASM_COMPILER_ARG1 "") ++set(CMAKE_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_ASM_COMPILER_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_ASM_COMPILER_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_LINKER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld") ++set(CMAKE_MT "") ++set(CMAKE_ASM_COMPILER_LOADED 1) ++set(CMAKE_ASM_COMPILER_ID "Clang") ++set(CMAKE_ASM_COMPILER_VERSION "") ++set(CMAKE_ASM_COMPILER_ENV_VAR "ASM") ++set(CMAKE_ASM_COMPILER_ID_VENDOR_MATCH [==[clang version]==]) ++ ++ ++ ++set(CMAKE_ASM_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) ++set(CMAKE_ASM_LINKER_PREFERENCE 0) ++ ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake +new file mode 100644 +index 0000000..9360f55 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake +@@ -0,0 +1,72 @@ ++set(CMAKE_C_COMPILER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang") ++set(CMAKE_C_COMPILER_ARG1 "") ++set(CMAKE_C_COMPILER_ID "Clang") ++set(CMAKE_C_COMPILER_VERSION "18.0.3") ++set(CMAKE_C_COMPILER_VERSION_INTERNAL "") ++set(CMAKE_C_COMPILER_WRAPPER "") ++set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "17") ++set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "ON") ++set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert;c_std_17;c_std_23") ++set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes") ++set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros") ++set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert") ++set(CMAKE_C17_COMPILE_FEATURES "c_std_17") ++set(CMAKE_C23_COMPILE_FEATURES "c_std_23") ++ ++set(CMAKE_C_PLATFORM_ID "Linux") ++set(CMAKE_C_SIMULATE_ID "") ++set(CMAKE_C_COMPILER_FRONTEND_VARIANT "GNU") ++set(CMAKE_C_SIMULATE_VERSION "") ++ ++ ++ ++ ++set(CMAKE_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_C_COMPILER_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_C_COMPILER_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_LINKER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld") ++set(CMAKE_MT "") ++set(CMAKE_COMPILER_IS_GNUCC ) ++set(CMAKE_C_COMPILER_LOADED 1) ++set(CMAKE_C_COMPILER_WORKS TRUE) ++set(CMAKE_C_ABI_COMPILED TRUE) ++ ++set(CMAKE_C_COMPILER_ENV_VAR "CC") ++ ++set(CMAKE_C_COMPILER_ID_RUN 1) ++set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) ++set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) ++set(CMAKE_C_LINKER_PREFERENCE 10) ++ ++# Save compiler ABI information. ++set(CMAKE_C_SIZEOF_DATA_PTR "8") ++set(CMAKE_C_COMPILER_ABI "ELF") ++set(CMAKE_C_BYTE_ORDER "LITTLE_ENDIAN") ++set(CMAKE_C_LIBRARY_ARCHITECTURE "") ++ ++if(CMAKE_C_SIZEOF_DATA_PTR) ++ set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") ++endif() ++ ++if(CMAKE_C_COMPILER_ABI) ++ set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") ++endif() ++ ++if(CMAKE_C_LIBRARY_ARCHITECTURE) ++ set(CMAKE_LIBRARY_ARCHITECTURE "") ++endif() ++ ++set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") ++if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) ++ set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") ++endif() ++ ++ ++ ++ ++ ++set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include") ++set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "-l:libunwind.a;dl;c;-l:libunwind.a;dl") ++set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib") ++set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake +new file mode 100644 +index 0000000..3bd2031 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake +@@ -0,0 +1,83 @@ ++set(CMAKE_CXX_COMPILER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++") ++set(CMAKE_CXX_COMPILER_ARG1 "") ++set(CMAKE_CXX_COMPILER_ID "Clang") ++set(CMAKE_CXX_COMPILER_VERSION "18.0.3") ++set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "") ++set(CMAKE_CXX_COMPILER_WRAPPER "") ++set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "17") ++set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "ON") ++set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17;cxx_std_20;cxx_std_23") ++set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters") ++set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") ++set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") ++set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17") ++set(CMAKE_CXX20_COMPILE_FEATURES "cxx_std_20") ++set(CMAKE_CXX23_COMPILE_FEATURES "cxx_std_23") ++ ++set(CMAKE_CXX_PLATFORM_ID "Linux") ++set(CMAKE_CXX_SIMULATE_ID "") ++set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "GNU") ++set(CMAKE_CXX_SIMULATE_VERSION "") ++ ++ ++ ++ ++set(CMAKE_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_CXX_COMPILER_AR "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar") ++set(CMAKE_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_CXX_COMPILER_RANLIB "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib") ++set(CMAKE_LINKER "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld") ++set(CMAKE_MT "") ++set(CMAKE_COMPILER_IS_GNUCXX ) ++set(CMAKE_CXX_COMPILER_LOADED 1) ++set(CMAKE_CXX_COMPILER_WORKS TRUE) ++set(CMAKE_CXX_ABI_COMPILED TRUE) ++ ++set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") ++ ++set(CMAKE_CXX_COMPILER_ID_RUN 1) ++set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm) ++set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) ++ ++foreach (lang C OBJC OBJCXX) ++ if (CMAKE_${lang}_COMPILER_ID_RUN) ++ foreach(extension IN LISTS CMAKE_${lang}_SOURCE_FILE_EXTENSIONS) ++ list(REMOVE_ITEM CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${extension}) ++ endforeach() ++ endif() ++endforeach() ++ ++set(CMAKE_CXX_LINKER_PREFERENCE 30) ++set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) ++ ++# Save compiler ABI information. ++set(CMAKE_CXX_SIZEOF_DATA_PTR "8") ++set(CMAKE_CXX_COMPILER_ABI "ELF") ++set(CMAKE_CXX_BYTE_ORDER "LITTLE_ENDIAN") ++set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") ++ ++if(CMAKE_CXX_SIZEOF_DATA_PTR) ++ set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") ++endif() ++ ++if(CMAKE_CXX_COMPILER_ABI) ++ set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") ++endif() ++ ++if(CMAKE_CXX_LIBRARY_ARCHITECTURE) ++ set(CMAKE_LIBRARY_ARCHITECTURE "") ++endif() ++ ++set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") ++if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) ++ set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") ++endif() ++ ++ ++ ++ ++ ++set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include") ++set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl") ++set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib") ++set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_C.bin b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_C.bin +new file mode 100755 +index 0000000..af27b9a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_C.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_CXX.bin b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_CXX.bin +new file mode 100755 +index 0000000..6181ba4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeDetermineCompilerABI_CXX.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +new file mode 100644 +index 0000000..d651da5 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +@@ -0,0 +1,15 @@ ++set(CMAKE_HOST_SYSTEM "Darwin-24.3.0") ++set(CMAKE_HOST_SYSTEM_NAME "Darwin") ++set(CMAKE_HOST_SYSTEM_VERSION "24.3.0") ++set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64") ++ ++include("/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake") ++ ++set(CMAKE_SYSTEM "Android-1") ++set(CMAKE_SYSTEM_NAME "Android") ++set(CMAKE_SYSTEM_VERSION "1") ++set(CMAKE_SYSTEM_PROCESSOR "aarch64") ++ ++set(CMAKE_CROSSCOMPILING "TRUE") ++ ++set(CMAKE_SYSTEM_LOADED 1) +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.c b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.c +new file mode 100644 +index 0000000..41b99d7 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.c +@@ -0,0 +1,803 @@ ++#ifdef __cplusplus ++# error "A C++ compiler has been selected for C." ++#endif ++ ++#if defined(__18CXX) ++# define ID_VOID_MAIN ++#endif ++#if defined(__CLASSIC_C__) ++/* cv-qualifiers did not exist in K&R C */ ++# define const ++# define volatile ++#endif ++ ++#if !defined(__has_include) ++/* If the compiler does not have __has_include, pretend the answer is ++ always no. */ ++# define __has_include(x) 0 ++#endif ++ ++ ++/* Version number components: V=Version, R=Revision, P=Patch ++ Version date components: YYYY=Year, MM=Month, DD=Day */ ++ ++#if defined(__INTEL_COMPILER) || defined(__ICC) ++# define COMPILER_ID "Intel" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# if defined(__GNUC__) ++# define SIMULATE_ID "GNU" ++# endif ++ /* __INTEL_COMPILER = VRP prior to 2021, and then VVVV for 2021 and later, ++ except that a few beta releases use the old format with V=2021. */ ++# if __INTEL_COMPILER < 2021 || __INTEL_COMPILER == 202110 || __INTEL_COMPILER == 202111 ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) ++# if defined(__INTEL_COMPILER_UPDATE) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) ++# else ++# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) ++# endif ++# else ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER_UPDATE) ++ /* The third version component from --version is an update index, ++ but no macro is provided for it. */ ++# define COMPILER_VERSION_PATCH DEC(0) ++# endif ++# if defined(__INTEL_COMPILER_BUILD_DATE) ++ /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ ++# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) ++# endif ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++# if defined(__GNUC__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) ++# elif defined(__GNUG__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) ++# endif ++# if defined(__GNUC_MINOR__) ++# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) ++# endif ++# if defined(__GNUC_PATCHLEVEL__) ++# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++# endif ++ ++#elif (defined(__clang__) && defined(__INTEL_CLANG_COMPILER)) || defined(__INTEL_LLVM_COMPILER) ++# define COMPILER_ID "IntelLLVM" ++#if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++#endif ++#if defined(__GNUC__) ++# define SIMULATE_ID "GNU" ++#endif ++/* __INTEL_LLVM_COMPILER = VVVVRP prior to 2021.2.0, VVVVRRPP for 2021.2.0 and ++ * later. Look for 6 digit vs. 8 digit version number to decide encoding. ++ * VVVV is no smaller than the current year when a version is released. ++ */ ++#if __INTEL_LLVM_COMPILER < 1000000L ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/100) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 10) ++#else ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/10000) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/100 % 100) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 100) ++#endif ++#if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++#endif ++#if defined(__GNUC__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) ++#elif defined(__GNUG__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) ++#endif ++#if defined(__GNUC_MINOR__) ++# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) ++#endif ++#if defined(__GNUC_PATCHLEVEL__) ++# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++#endif ++ ++#elif defined(__PATHCC__) ++# define COMPILER_ID "PathScale" ++# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) ++# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) ++# if defined(__PATHCC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) ++# endif ++ ++#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__) ++# define COMPILER_ID "Embarcadero" ++# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF) ++# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF) ++# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF) ++ ++#elif defined(__BORLANDC__) ++# define COMPILER_ID "Borland" ++ /* __BORLANDC__ = 0xVRR */ ++# define COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8) ++# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF) ++ ++#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 ++# define COMPILER_ID "Watcom" ++ /* __WATCOMC__ = VVRR */ ++# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) ++# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) ++# if (__WATCOMC__ % 10) > 0 ++# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) ++# endif ++ ++#elif defined(__WATCOMC__) ++# define COMPILER_ID "OpenWatcom" ++ /* __WATCOMC__ = VVRP + 1100 */ ++# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100) ++# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) ++# if (__WATCOMC__ % 10) > 0 ++# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) ++# endif ++ ++#elif defined(__SUNPRO_C) ++# define COMPILER_ID "SunPro" ++# if __SUNPRO_C >= 0x5100 ++ /* __SUNPRO_C = 0xVRRP */ ++# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>12) ++# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xFF) ++# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) ++# else ++ /* __SUNPRO_CC = 0xVRP */ ++# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8) ++# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF) ++# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) ++# endif ++ ++#elif defined(__HP_cc) ++# define COMPILER_ID "HP" ++ /* __HP_cc = VVRRPP */ ++# define COMPILER_VERSION_MAJOR DEC(__HP_cc/10000) ++# define COMPILER_VERSION_MINOR DEC(__HP_cc/100 % 100) ++# define COMPILER_VERSION_PATCH DEC(__HP_cc % 100) ++ ++#elif defined(__DECC) ++# define COMPILER_ID "Compaq" ++ /* __DECC_VER = VVRRTPPPP */ ++# define COMPILER_VERSION_MAJOR DEC(__DECC_VER/10000000) ++# define COMPILER_VERSION_MINOR DEC(__DECC_VER/100000 % 100) ++# define COMPILER_VERSION_PATCH DEC(__DECC_VER % 10000) ++ ++#elif defined(__IBMC__) && defined(__COMPILER_VER__) ++# define COMPILER_ID "zOS" ++ /* __IBMC__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) ++ ++#elif defined(__ibmxl__) && defined(__clang__) ++# define COMPILER_ID "XLClang" ++# define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) ++# define COMPILER_VERSION_MINOR DEC(__ibmxl_release__) ++# define COMPILER_VERSION_PATCH DEC(__ibmxl_modification__) ++# define COMPILER_VERSION_TWEAK DEC(__ibmxl_ptf_fix_level__) ++ ++ ++#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ >= 800 ++# define COMPILER_ID "XL" ++ /* __IBMC__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) ++ ++#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ < 800 ++# define COMPILER_ID "VisualAge" ++ /* __IBMC__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) ++ ++#elif defined(__NVCOMPILER) ++# define COMPILER_ID "NVHPC" ++# define COMPILER_VERSION_MAJOR DEC(__NVCOMPILER_MAJOR__) ++# define COMPILER_VERSION_MINOR DEC(__NVCOMPILER_MINOR__) ++# if defined(__NVCOMPILER_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__NVCOMPILER_PATCHLEVEL__) ++# endif ++ ++#elif defined(__PGI) ++# define COMPILER_ID "PGI" ++# define COMPILER_VERSION_MAJOR DEC(__PGIC__) ++# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__) ++# if defined(__PGIC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) ++# endif ++ ++#elif defined(_CRAYC) ++# define COMPILER_ID "Cray" ++# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR) ++# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR) ++ ++#elif defined(__TI_COMPILER_VERSION__) ++# define COMPILER_ID "TI" ++ /* __TI_COMPILER_VERSION__ = VVVRRRPPP */ ++# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000) ++# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000) ++# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000) ++ ++#elif defined(__CLANG_FUJITSU) ++# define COMPILER_ID "FujitsuClang" ++# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) ++# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) ++# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) ++# define COMPILER_VERSION_INTERNAL_STR __clang_version__ ++ ++ ++#elif defined(__FUJITSU) ++# define COMPILER_ID "Fujitsu" ++# if defined(__FCC_version__) ++# define COMPILER_VERSION __FCC_version__ ++# elif defined(__FCC_major__) ++# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) ++# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) ++# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) ++# endif ++# if defined(__fcc_version) ++# define COMPILER_VERSION_INTERNAL DEC(__fcc_version) ++# elif defined(__FCC_VERSION) ++# define COMPILER_VERSION_INTERNAL DEC(__FCC_VERSION) ++# endif ++ ++ ++#elif defined(__ghs__) ++# define COMPILER_ID "GHS" ++/* __GHS_VERSION_NUMBER = VVVVRP */ ++# ifdef __GHS_VERSION_NUMBER ++# define COMPILER_VERSION_MAJOR DEC(__GHS_VERSION_NUMBER / 100) ++# define COMPILER_VERSION_MINOR DEC(__GHS_VERSION_NUMBER / 10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__GHS_VERSION_NUMBER % 10) ++# endif ++ ++#elif defined(__TINYC__) ++# define COMPILER_ID "TinyCC" ++ ++#elif defined(__BCC__) ++# define COMPILER_ID "Bruce" ++ ++#elif defined(__SCO_VERSION__) ++# define COMPILER_ID "SCO" ++ ++#elif defined(__ARMCC_VERSION) && !defined(__clang__) ++# define COMPILER_ID "ARMCC" ++#if __ARMCC_VERSION >= 1000000 ++ /* __ARMCC_VERSION = VRRPPPP */ ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) ++#else ++ /* __ARMCC_VERSION = VRPPPP */ ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) ++#endif ++ ++ ++#elif defined(__clang__) && defined(__apple_build_version__) ++# define COMPILER_ID "AppleClang" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# define COMPILER_VERSION_MAJOR DEC(__clang_major__) ++# define COMPILER_VERSION_MINOR DEC(__clang_minor__) ++# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++# define COMPILER_VERSION_TWEAK DEC(__apple_build_version__) ++ ++#elif defined(__clang__) && defined(__ARMCOMPILER_VERSION) ++# define COMPILER_ID "ARMClang" ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCOMPILER_VERSION/1000000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCOMPILER_VERSION/10000 % 100) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCOMPILER_VERSION % 10000) ++# define COMPILER_VERSION_INTERNAL DEC(__ARMCOMPILER_VERSION) ++ ++#elif defined(__clang__) ++# define COMPILER_ID "Clang" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# define COMPILER_VERSION_MAJOR DEC(__clang_major__) ++# define COMPILER_VERSION_MINOR DEC(__clang_minor__) ++# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++ ++#elif defined(__GNUC__) ++# define COMPILER_ID "GNU" ++# define COMPILER_VERSION_MAJOR DEC(__GNUC__) ++# if defined(__GNUC_MINOR__) ++# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__) ++# endif ++# if defined(__GNUC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++# endif ++ ++#elif defined(_MSC_VER) ++# define COMPILER_ID "MSVC" ++ /* _MSC_VER = VVRR */ ++# define COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define COMPILER_VERSION_MINOR DEC(_MSC_VER % 100) ++# if defined(_MSC_FULL_VER) ++# if _MSC_VER >= 1400 ++ /* _MSC_FULL_VER = VVRRPPPPP */ ++# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000) ++# else ++ /* _MSC_FULL_VER = VVRRPPPP */ ++# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000) ++# endif ++# endif ++# if defined(_MSC_BUILD) ++# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) ++# endif ++ ++#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) ++# define COMPILER_ID "ADSP" ++#if defined(__VISUALDSPVERSION__) ++ /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ ++# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) ++# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) ++# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) ++#endif ++ ++#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) ++# define COMPILER_ID "IAR" ++# if defined(__VER__) && defined(__ICCARM__) ++# define COMPILER_VERSION_MAJOR DEC((__VER__) / 1000000) ++# define COMPILER_VERSION_MINOR DEC(((__VER__) / 1000) % 1000) ++# define COMPILER_VERSION_PATCH DEC((__VER__) % 1000) ++# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) ++# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__) || defined(__ICCSTM8__)) ++# define COMPILER_VERSION_MAJOR DEC((__VER__) / 100) ++# define COMPILER_VERSION_MINOR DEC((__VER__) - (((__VER__) / 100)*100)) ++# define COMPILER_VERSION_PATCH DEC(__SUBVERSION__) ++# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) ++# endif ++ ++#elif defined(__SDCC_VERSION_MAJOR) || defined(SDCC) ++# define COMPILER_ID "SDCC" ++# if defined(__SDCC_VERSION_MAJOR) ++# define COMPILER_VERSION_MAJOR DEC(__SDCC_VERSION_MAJOR) ++# define COMPILER_VERSION_MINOR DEC(__SDCC_VERSION_MINOR) ++# define COMPILER_VERSION_PATCH DEC(__SDCC_VERSION_PATCH) ++# else ++ /* SDCC = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(SDCC/100) ++# define COMPILER_VERSION_MINOR DEC(SDCC/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(SDCC % 10) ++# endif ++ ++ ++/* These compilers are either not known or too old to define an ++ identification macro. Try to identify the platform and guess that ++ it is the native compiler. */ ++#elif defined(__hpux) || defined(__hpua) ++# define COMPILER_ID "HP" ++ ++#else /* unknown compiler */ ++# define COMPILER_ID "" ++#endif ++ ++/* Construct the string literal in pieces to prevent the source from ++ getting matched. Store it in a pointer rather than an array ++ because some compilers will just produce instructions to fill the ++ array rather than assigning a pointer to a static array. */ ++char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; ++#ifdef SIMULATE_ID ++char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; ++#endif ++ ++#ifdef __QNXNTO__ ++char const* qnxnto = "INFO" ":" "qnxnto[]"; ++#endif ++ ++#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) ++char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; ++#endif ++ ++#define STRINGIFY_HELPER(X) #X ++#define STRINGIFY(X) STRINGIFY_HELPER(X) ++ ++/* Identify known platforms by name. */ ++#if defined(__linux) || defined(__linux__) || defined(linux) ++# define PLATFORM_ID "Linux" ++ ++#elif defined(__MSYS__) ++# define PLATFORM_ID "MSYS" ++ ++#elif defined(__CYGWIN__) ++# define PLATFORM_ID "Cygwin" ++ ++#elif defined(__MINGW32__) ++# define PLATFORM_ID "MinGW" ++ ++#elif defined(__APPLE__) ++# define PLATFORM_ID "Darwin" ++ ++#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ++# define PLATFORM_ID "Windows" ++ ++#elif defined(__FreeBSD__) || defined(__FreeBSD) ++# define PLATFORM_ID "FreeBSD" ++ ++#elif defined(__NetBSD__) || defined(__NetBSD) ++# define PLATFORM_ID "NetBSD" ++ ++#elif defined(__OpenBSD__) || defined(__OPENBSD) ++# define PLATFORM_ID "OpenBSD" ++ ++#elif defined(__sun) || defined(sun) ++# define PLATFORM_ID "SunOS" ++ ++#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__) ++# define PLATFORM_ID "AIX" ++ ++#elif defined(__hpux) || defined(__hpux__) ++# define PLATFORM_ID "HP-UX" ++ ++#elif defined(__HAIKU__) ++# define PLATFORM_ID "Haiku" ++ ++#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) ++# define PLATFORM_ID "BeOS" ++ ++#elif defined(__QNX__) || defined(__QNXNTO__) ++# define PLATFORM_ID "QNX" ++ ++#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__) ++# define PLATFORM_ID "Tru64" ++ ++#elif defined(__riscos) || defined(__riscos__) ++# define PLATFORM_ID "RISCos" ++ ++#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__) ++# define PLATFORM_ID "SINIX" ++ ++#elif defined(__UNIX_SV__) ++# define PLATFORM_ID "UNIX_SV" ++ ++#elif defined(__bsdos__) ++# define PLATFORM_ID "BSDOS" ++ ++#elif defined(_MPRAS) || defined(MPRAS) ++# define PLATFORM_ID "MP-RAS" ++ ++#elif defined(__osf) || defined(__osf__) ++# define PLATFORM_ID "OSF1" ++ ++#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv) ++# define PLATFORM_ID "SCO_SV" ++ ++#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX) ++# define PLATFORM_ID "ULTRIX" ++ ++#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX) ++# define PLATFORM_ID "Xenix" ++ ++#elif defined(__WATCOMC__) ++# if defined(__LINUX__) ++# define PLATFORM_ID "Linux" ++ ++# elif defined(__DOS__) ++# define PLATFORM_ID "DOS" ++ ++# elif defined(__OS2__) ++# define PLATFORM_ID "OS2" ++ ++# elif defined(__WINDOWS__) ++# define PLATFORM_ID "Windows3x" ++ ++# elif defined(__VXWORKS__) ++# define PLATFORM_ID "VxWorks" ++ ++# else /* unknown platform */ ++# define PLATFORM_ID ++# endif ++ ++#elif defined(__INTEGRITY) ++# if defined(INT_178B) ++# define PLATFORM_ID "Integrity178" ++ ++# else /* regular Integrity */ ++# define PLATFORM_ID "Integrity" ++# endif ++ ++#else /* unknown platform */ ++# define PLATFORM_ID ++ ++#endif ++ ++/* For windows compilers MSVC and Intel we can determine ++ the architecture of the compiler being used. This is because ++ the compilers do not have flags that can change the architecture, ++ but rather depend on which compiler is being used ++*/ ++#if defined(_WIN32) && defined(_MSC_VER) ++# if defined(_M_IA64) ++# define ARCHITECTURE_ID "IA64" ++ ++# elif defined(_M_ARM64EC) ++# define ARCHITECTURE_ID "ARM64EC" ++ ++# elif defined(_M_X64) || defined(_M_AMD64) ++# define ARCHITECTURE_ID "x64" ++ ++# elif defined(_M_IX86) ++# define ARCHITECTURE_ID "X86" ++ ++# elif defined(_M_ARM64) ++# define ARCHITECTURE_ID "ARM64" ++ ++# elif defined(_M_ARM) ++# if _M_ARM == 4 ++# define ARCHITECTURE_ID "ARMV4I" ++# elif _M_ARM == 5 ++# define ARCHITECTURE_ID "ARMV5I" ++# else ++# define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM) ++# endif ++ ++# elif defined(_M_MIPS) ++# define ARCHITECTURE_ID "MIPS" ++ ++# elif defined(_M_SH) ++# define ARCHITECTURE_ID "SHx" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__WATCOMC__) ++# if defined(_M_I86) ++# define ARCHITECTURE_ID "I86" ++ ++# elif defined(_M_IX86) ++# define ARCHITECTURE_ID "X86" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) ++# if defined(__ICCARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__ICCRX__) ++# define ARCHITECTURE_ID "RX" ++ ++# elif defined(__ICCRH850__) ++# define ARCHITECTURE_ID "RH850" ++ ++# elif defined(__ICCRL78__) ++# define ARCHITECTURE_ID "RL78" ++ ++# elif defined(__ICCRISCV__) ++# define ARCHITECTURE_ID "RISCV" ++ ++# elif defined(__ICCAVR__) ++# define ARCHITECTURE_ID "AVR" ++ ++# elif defined(__ICC430__) ++# define ARCHITECTURE_ID "MSP430" ++ ++# elif defined(__ICCV850__) ++# define ARCHITECTURE_ID "V850" ++ ++# elif defined(__ICC8051__) ++# define ARCHITECTURE_ID "8051" ++ ++# elif defined(__ICCSTM8__) ++# define ARCHITECTURE_ID "STM8" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__ghs__) ++# if defined(__PPC64__) ++# define ARCHITECTURE_ID "PPC64" ++ ++# elif defined(__ppc__) ++# define ARCHITECTURE_ID "PPC" ++ ++# elif defined(__ARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__x86_64__) ++# define ARCHITECTURE_ID "x64" ++ ++# elif defined(__i386__) ++# define ARCHITECTURE_ID "X86" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__TI_COMPILER_VERSION__) ++# if defined(__TI_ARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__MSP430__) ++# define ARCHITECTURE_ID "MSP430" ++ ++# elif defined(__TMS320C28XX__) ++# define ARCHITECTURE_ID "TMS320C28x" ++ ++# elif defined(__TMS320C6X__) || defined(_TMS320C6X) ++# define ARCHITECTURE_ID "TMS320C6x" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#else ++# define ARCHITECTURE_ID ++#endif ++ ++/* Convert integer to decimal digit literals. */ ++#define DEC(n) \ ++ ('0' + (((n) / 10000000)%10)), \ ++ ('0' + (((n) / 1000000)%10)), \ ++ ('0' + (((n) / 100000)%10)), \ ++ ('0' + (((n) / 10000)%10)), \ ++ ('0' + (((n) / 1000)%10)), \ ++ ('0' + (((n) / 100)%10)), \ ++ ('0' + (((n) / 10)%10)), \ ++ ('0' + ((n) % 10)) ++ ++/* Convert integer to hex digit literals. */ ++#define HEX(n) \ ++ ('0' + ((n)>>28 & 0xF)), \ ++ ('0' + ((n)>>24 & 0xF)), \ ++ ('0' + ((n)>>20 & 0xF)), \ ++ ('0' + ((n)>>16 & 0xF)), \ ++ ('0' + ((n)>>12 & 0xF)), \ ++ ('0' + ((n)>>8 & 0xF)), \ ++ ('0' + ((n)>>4 & 0xF)), \ ++ ('0' + ((n) & 0xF)) ++ ++/* Construct a string literal encoding the version number. */ ++#ifdef COMPILER_VERSION ++char const* info_version = "INFO" ":" "compiler_version[" COMPILER_VERSION "]"; ++ ++/* Construct a string literal encoding the version number components. */ ++#elif defined(COMPILER_VERSION_MAJOR) ++char const info_version[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','[', ++ COMPILER_VERSION_MAJOR, ++# ifdef COMPILER_VERSION_MINOR ++ '.', COMPILER_VERSION_MINOR, ++# ifdef COMPILER_VERSION_PATCH ++ '.', COMPILER_VERSION_PATCH, ++# ifdef COMPILER_VERSION_TWEAK ++ '.', COMPILER_VERSION_TWEAK, ++# endif ++# endif ++# endif ++ ']','\0'}; ++#endif ++ ++/* Construct a string literal encoding the internal version number. */ ++#ifdef COMPILER_VERSION_INTERNAL ++char const info_version_internal[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','_', ++ 'i','n','t','e','r','n','a','l','[', ++ COMPILER_VERSION_INTERNAL,']','\0'}; ++#elif defined(COMPILER_VERSION_INTERNAL_STR) ++char const* info_version_internal = "INFO" ":" "compiler_version_internal[" COMPILER_VERSION_INTERNAL_STR "]"; ++#endif ++ ++/* Construct a string literal encoding the version number components. */ ++#ifdef SIMULATE_VERSION_MAJOR ++char const info_simulate_version[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 's','i','m','u','l','a','t','e','_','v','e','r','s','i','o','n','[', ++ SIMULATE_VERSION_MAJOR, ++# ifdef SIMULATE_VERSION_MINOR ++ '.', SIMULATE_VERSION_MINOR, ++# ifdef SIMULATE_VERSION_PATCH ++ '.', SIMULATE_VERSION_PATCH, ++# ifdef SIMULATE_VERSION_TWEAK ++ '.', SIMULATE_VERSION_TWEAK, ++# endif ++# endif ++# endif ++ ']','\0'}; ++#endif ++ ++/* Construct the string literal in pieces to prevent the source from ++ getting matched. Store it in a pointer rather than an array ++ because some compilers will just produce instructions to fill the ++ array rather than assigning a pointer to a static array. */ ++char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]"; ++char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]"; ++ ++ ++ ++#if !defined(__STDC__) && !defined(__clang__) ++# if defined(_MSC_VER) || defined(__ibmxl__) || defined(__IBMC__) ++# define C_VERSION "90" ++# else ++# define C_VERSION ++# endif ++#elif __STDC_VERSION__ > 201710L ++# define C_VERSION "23" ++#elif __STDC_VERSION__ >= 201710L ++# define C_VERSION "17" ++#elif __STDC_VERSION__ >= 201000L ++# define C_VERSION "11" ++#elif __STDC_VERSION__ >= 199901L ++# define C_VERSION "99" ++#else ++# define C_VERSION "90" ++#endif ++const char* info_language_standard_default = ++ "INFO" ":" "standard_default[" C_VERSION "]"; ++ ++const char* info_language_extensions_default = "INFO" ":" "extensions_default[" ++/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ ++#if (defined(__clang__) || defined(__GNUC__) || \ ++ defined(__TI_COMPILER_VERSION__)) && \ ++ !defined(__STRICT_ANSI__) && !defined(_MSC_VER) ++ "ON" ++#else ++ "OFF" ++#endif ++"]"; ++ ++/*--------------------------------------------------------------------------*/ ++ ++#ifdef ID_VOID_MAIN ++void main() {} ++#else ++# if defined(__CLASSIC_C__) ++int main(argc, argv) int argc; char *argv[]; ++# else ++int main(int argc, char* argv[]) ++# endif ++{ ++ int require = 0; ++ require += info_compiler[argc]; ++ require += info_platform[argc]; ++ require += info_arch[argc]; ++#ifdef COMPILER_VERSION_MAJOR ++ require += info_version[argc]; ++#endif ++#ifdef COMPILER_VERSION_INTERNAL ++ require += info_version_internal[argc]; ++#endif ++#ifdef SIMULATE_ID ++ require += info_simulate[argc]; ++#endif ++#ifdef SIMULATE_VERSION_MAJOR ++ require += info_simulate_version[argc]; ++#endif ++#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) ++ require += info_cray[argc]; ++#endif ++ require += info_language_standard_default[argc]; ++ require += info_language_extensions_default[argc]; ++ (void)argv; ++ return require; ++} ++#endif +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.o +new file mode 100644 +index 0000000..6442261 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.cpp b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.cpp +new file mode 100644 +index 0000000..25c62a8 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.cpp +@@ -0,0 +1,791 @@ ++/* This source file must have a .cpp extension so that all C++ compilers ++ recognize the extension without flags. Borland does not know .cxx for ++ example. */ ++#ifndef __cplusplus ++# error "A C compiler has been selected for C++." ++#endif ++ ++#if !defined(__has_include) ++/* If the compiler does not have __has_include, pretend the answer is ++ always no. */ ++# define __has_include(x) 0 ++#endif ++ ++ ++/* Version number components: V=Version, R=Revision, P=Patch ++ Version date components: YYYY=Year, MM=Month, DD=Day */ ++ ++#if defined(__COMO__) ++# define COMPILER_ID "Comeau" ++ /* __COMO_VERSION__ = VRR */ ++# define COMPILER_VERSION_MAJOR DEC(__COMO_VERSION__ / 100) ++# define COMPILER_VERSION_MINOR DEC(__COMO_VERSION__ % 100) ++ ++#elif defined(__INTEL_COMPILER) || defined(__ICC) ++# define COMPILER_ID "Intel" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# if defined(__GNUC__) ++# define SIMULATE_ID "GNU" ++# endif ++ /* __INTEL_COMPILER = VRP prior to 2021, and then VVVV for 2021 and later, ++ except that a few beta releases use the old format with V=2021. */ ++# if __INTEL_COMPILER < 2021 || __INTEL_COMPILER == 202110 || __INTEL_COMPILER == 202111 ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) ++# if defined(__INTEL_COMPILER_UPDATE) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) ++# else ++# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) ++# endif ++# else ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER_UPDATE) ++ /* The third version component from --version is an update index, ++ but no macro is provided for it. */ ++# define COMPILER_VERSION_PATCH DEC(0) ++# endif ++# if defined(__INTEL_COMPILER_BUILD_DATE) ++ /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ ++# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) ++# endif ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++# if defined(__GNUC__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) ++# elif defined(__GNUG__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) ++# endif ++# if defined(__GNUC_MINOR__) ++# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) ++# endif ++# if defined(__GNUC_PATCHLEVEL__) ++# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++# endif ++ ++#elif (defined(__clang__) && defined(__INTEL_CLANG_COMPILER)) || defined(__INTEL_LLVM_COMPILER) ++# define COMPILER_ID "IntelLLVM" ++#if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++#endif ++#if defined(__GNUC__) ++# define SIMULATE_ID "GNU" ++#endif ++/* __INTEL_LLVM_COMPILER = VVVVRP prior to 2021.2.0, VVVVRRPP for 2021.2.0 and ++ * later. Look for 6 digit vs. 8 digit version number to decide encoding. ++ * VVVV is no smaller than the current year when a version is released. ++ */ ++#if __INTEL_LLVM_COMPILER < 1000000L ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/100) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 10) ++#else ++# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/10000) ++# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/100 % 100) ++# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 100) ++#endif ++#if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++#endif ++#if defined(__GNUC__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) ++#elif defined(__GNUG__) ++# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) ++#endif ++#if defined(__GNUC_MINOR__) ++# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) ++#endif ++#if defined(__GNUC_PATCHLEVEL__) ++# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++#endif ++ ++#elif defined(__PATHCC__) ++# define COMPILER_ID "PathScale" ++# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) ++# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) ++# if defined(__PATHCC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) ++# endif ++ ++#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__) ++# define COMPILER_ID "Embarcadero" ++# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF) ++# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF) ++# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF) ++ ++#elif defined(__BORLANDC__) ++# define COMPILER_ID "Borland" ++ /* __BORLANDC__ = 0xVRR */ ++# define COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8) ++# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF) ++ ++#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 ++# define COMPILER_ID "Watcom" ++ /* __WATCOMC__ = VVRR */ ++# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) ++# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) ++# if (__WATCOMC__ % 10) > 0 ++# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) ++# endif ++ ++#elif defined(__WATCOMC__) ++# define COMPILER_ID "OpenWatcom" ++ /* __WATCOMC__ = VVRP + 1100 */ ++# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100) ++# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) ++# if (__WATCOMC__ % 10) > 0 ++# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) ++# endif ++ ++#elif defined(__SUNPRO_CC) ++# define COMPILER_ID "SunPro" ++# if __SUNPRO_CC >= 0x5100 ++ /* __SUNPRO_CC = 0xVRRP */ ++# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>12) ++# define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xFF) ++# define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF) ++# else ++ /* __SUNPRO_CC = 0xVRP */ ++# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>8) ++# define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xF) ++# define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF) ++# endif ++ ++#elif defined(__HP_aCC) ++# define COMPILER_ID "HP" ++ /* __HP_aCC = VVRRPP */ ++# define COMPILER_VERSION_MAJOR DEC(__HP_aCC/10000) ++# define COMPILER_VERSION_MINOR DEC(__HP_aCC/100 % 100) ++# define COMPILER_VERSION_PATCH DEC(__HP_aCC % 100) ++ ++#elif defined(__DECCXX) ++# define COMPILER_ID "Compaq" ++ /* __DECCXX_VER = VVRRTPPPP */ ++# define COMPILER_VERSION_MAJOR DEC(__DECCXX_VER/10000000) ++# define COMPILER_VERSION_MINOR DEC(__DECCXX_VER/100000 % 100) ++# define COMPILER_VERSION_PATCH DEC(__DECCXX_VER % 10000) ++ ++#elif defined(__IBMCPP__) && defined(__COMPILER_VER__) ++# define COMPILER_ID "zOS" ++ /* __IBMCPP__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) ++ ++#elif defined(__ibmxl__) && defined(__clang__) ++# define COMPILER_ID "XLClang" ++# define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) ++# define COMPILER_VERSION_MINOR DEC(__ibmxl_release__) ++# define COMPILER_VERSION_PATCH DEC(__ibmxl_modification__) ++# define COMPILER_VERSION_TWEAK DEC(__ibmxl_ptf_fix_level__) ++ ++ ++#elif defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ >= 800 ++# define COMPILER_ID "XL" ++ /* __IBMCPP__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) ++ ++#elif defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ < 800 ++# define COMPILER_ID "VisualAge" ++ /* __IBMCPP__ = VRP */ ++# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) ++# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) ++ ++#elif defined(__NVCOMPILER) ++# define COMPILER_ID "NVHPC" ++# define COMPILER_VERSION_MAJOR DEC(__NVCOMPILER_MAJOR__) ++# define COMPILER_VERSION_MINOR DEC(__NVCOMPILER_MINOR__) ++# if defined(__NVCOMPILER_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__NVCOMPILER_PATCHLEVEL__) ++# endif ++ ++#elif defined(__PGI) ++# define COMPILER_ID "PGI" ++# define COMPILER_VERSION_MAJOR DEC(__PGIC__) ++# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__) ++# if defined(__PGIC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) ++# endif ++ ++#elif defined(_CRAYC) ++# define COMPILER_ID "Cray" ++# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR) ++# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR) ++ ++#elif defined(__TI_COMPILER_VERSION__) ++# define COMPILER_ID "TI" ++ /* __TI_COMPILER_VERSION__ = VVVRRRPPP */ ++# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000) ++# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000) ++# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000) ++ ++#elif defined(__CLANG_FUJITSU) ++# define COMPILER_ID "FujitsuClang" ++# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) ++# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) ++# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) ++# define COMPILER_VERSION_INTERNAL_STR __clang_version__ ++ ++ ++#elif defined(__FUJITSU) ++# define COMPILER_ID "Fujitsu" ++# if defined(__FCC_version__) ++# define COMPILER_VERSION __FCC_version__ ++# elif defined(__FCC_major__) ++# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) ++# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) ++# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) ++# endif ++# if defined(__fcc_version) ++# define COMPILER_VERSION_INTERNAL DEC(__fcc_version) ++# elif defined(__FCC_VERSION) ++# define COMPILER_VERSION_INTERNAL DEC(__FCC_VERSION) ++# endif ++ ++ ++#elif defined(__ghs__) ++# define COMPILER_ID "GHS" ++/* __GHS_VERSION_NUMBER = VVVVRP */ ++# ifdef __GHS_VERSION_NUMBER ++# define COMPILER_VERSION_MAJOR DEC(__GHS_VERSION_NUMBER / 100) ++# define COMPILER_VERSION_MINOR DEC(__GHS_VERSION_NUMBER / 10 % 10) ++# define COMPILER_VERSION_PATCH DEC(__GHS_VERSION_NUMBER % 10) ++# endif ++ ++#elif defined(__SCO_VERSION__) ++# define COMPILER_ID "SCO" ++ ++#elif defined(__ARMCC_VERSION) && !defined(__clang__) ++# define COMPILER_ID "ARMCC" ++#if __ARMCC_VERSION >= 1000000 ++ /* __ARMCC_VERSION = VRRPPPP */ ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) ++#else ++ /* __ARMCC_VERSION = VRPPPP */ ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) ++#endif ++ ++ ++#elif defined(__clang__) && defined(__apple_build_version__) ++# define COMPILER_ID "AppleClang" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# define COMPILER_VERSION_MAJOR DEC(__clang_major__) ++# define COMPILER_VERSION_MINOR DEC(__clang_minor__) ++# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++# define COMPILER_VERSION_TWEAK DEC(__apple_build_version__) ++ ++#elif defined(__clang__) && defined(__ARMCOMPILER_VERSION) ++# define COMPILER_ID "ARMClang" ++ # define COMPILER_VERSION_MAJOR DEC(__ARMCOMPILER_VERSION/1000000) ++ # define COMPILER_VERSION_MINOR DEC(__ARMCOMPILER_VERSION/10000 % 100) ++ # define COMPILER_VERSION_PATCH DEC(__ARMCOMPILER_VERSION % 10000) ++# define COMPILER_VERSION_INTERNAL DEC(__ARMCOMPILER_VERSION) ++ ++#elif defined(__clang__) ++# define COMPILER_ID "Clang" ++# if defined(_MSC_VER) ++# define SIMULATE_ID "MSVC" ++# endif ++# define COMPILER_VERSION_MAJOR DEC(__clang_major__) ++# define COMPILER_VERSION_MINOR DEC(__clang_minor__) ++# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) ++# if defined(_MSC_VER) ++ /* _MSC_VER = VVRR */ ++# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) ++# endif ++ ++#elif defined(__GNUC__) || defined(__GNUG__) ++# define COMPILER_ID "GNU" ++# if defined(__GNUC__) ++# define COMPILER_VERSION_MAJOR DEC(__GNUC__) ++# else ++# define COMPILER_VERSION_MAJOR DEC(__GNUG__) ++# endif ++# if defined(__GNUC_MINOR__) ++# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__) ++# endif ++# if defined(__GNUC_PATCHLEVEL__) ++# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) ++# endif ++ ++#elif defined(_MSC_VER) ++# define COMPILER_ID "MSVC" ++ /* _MSC_VER = VVRR */ ++# define COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100) ++# define COMPILER_VERSION_MINOR DEC(_MSC_VER % 100) ++# if defined(_MSC_FULL_VER) ++# if _MSC_VER >= 1400 ++ /* _MSC_FULL_VER = VVRRPPPPP */ ++# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000) ++# else ++ /* _MSC_FULL_VER = VVRRPPPP */ ++# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000) ++# endif ++# endif ++# if defined(_MSC_BUILD) ++# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) ++# endif ++ ++#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) ++# define COMPILER_ID "ADSP" ++#if defined(__VISUALDSPVERSION__) ++ /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ ++# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) ++# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) ++# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) ++#endif ++ ++#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) ++# define COMPILER_ID "IAR" ++# if defined(__VER__) && defined(__ICCARM__) ++# define COMPILER_VERSION_MAJOR DEC((__VER__) / 1000000) ++# define COMPILER_VERSION_MINOR DEC(((__VER__) / 1000) % 1000) ++# define COMPILER_VERSION_PATCH DEC((__VER__) % 1000) ++# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) ++# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__) || defined(__ICCSTM8__)) ++# define COMPILER_VERSION_MAJOR DEC((__VER__) / 100) ++# define COMPILER_VERSION_MINOR DEC((__VER__) - (((__VER__) / 100)*100)) ++# define COMPILER_VERSION_PATCH DEC(__SUBVERSION__) ++# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) ++# endif ++ ++ ++/* These compilers are either not known or too old to define an ++ identification macro. Try to identify the platform and guess that ++ it is the native compiler. */ ++#elif defined(__hpux) || defined(__hpua) ++# define COMPILER_ID "HP" ++ ++#else /* unknown compiler */ ++# define COMPILER_ID "" ++#endif ++ ++/* Construct the string literal in pieces to prevent the source from ++ getting matched. Store it in a pointer rather than an array ++ because some compilers will just produce instructions to fill the ++ array rather than assigning a pointer to a static array. */ ++char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; ++#ifdef SIMULATE_ID ++char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; ++#endif ++ ++#ifdef __QNXNTO__ ++char const* qnxnto = "INFO" ":" "qnxnto[]"; ++#endif ++ ++#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) ++char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; ++#endif ++ ++#define STRINGIFY_HELPER(X) #X ++#define STRINGIFY(X) STRINGIFY_HELPER(X) ++ ++/* Identify known platforms by name. */ ++#if defined(__linux) || defined(__linux__) || defined(linux) ++# define PLATFORM_ID "Linux" ++ ++#elif defined(__MSYS__) ++# define PLATFORM_ID "MSYS" ++ ++#elif defined(__CYGWIN__) ++# define PLATFORM_ID "Cygwin" ++ ++#elif defined(__MINGW32__) ++# define PLATFORM_ID "MinGW" ++ ++#elif defined(__APPLE__) ++# define PLATFORM_ID "Darwin" ++ ++#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ++# define PLATFORM_ID "Windows" ++ ++#elif defined(__FreeBSD__) || defined(__FreeBSD) ++# define PLATFORM_ID "FreeBSD" ++ ++#elif defined(__NetBSD__) || defined(__NetBSD) ++# define PLATFORM_ID "NetBSD" ++ ++#elif defined(__OpenBSD__) || defined(__OPENBSD) ++# define PLATFORM_ID "OpenBSD" ++ ++#elif defined(__sun) || defined(sun) ++# define PLATFORM_ID "SunOS" ++ ++#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__) ++# define PLATFORM_ID "AIX" ++ ++#elif defined(__hpux) || defined(__hpux__) ++# define PLATFORM_ID "HP-UX" ++ ++#elif defined(__HAIKU__) ++# define PLATFORM_ID "Haiku" ++ ++#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) ++# define PLATFORM_ID "BeOS" ++ ++#elif defined(__QNX__) || defined(__QNXNTO__) ++# define PLATFORM_ID "QNX" ++ ++#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__) ++# define PLATFORM_ID "Tru64" ++ ++#elif defined(__riscos) || defined(__riscos__) ++# define PLATFORM_ID "RISCos" ++ ++#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__) ++# define PLATFORM_ID "SINIX" ++ ++#elif defined(__UNIX_SV__) ++# define PLATFORM_ID "UNIX_SV" ++ ++#elif defined(__bsdos__) ++# define PLATFORM_ID "BSDOS" ++ ++#elif defined(_MPRAS) || defined(MPRAS) ++# define PLATFORM_ID "MP-RAS" ++ ++#elif defined(__osf) || defined(__osf__) ++# define PLATFORM_ID "OSF1" ++ ++#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv) ++# define PLATFORM_ID "SCO_SV" ++ ++#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX) ++# define PLATFORM_ID "ULTRIX" ++ ++#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX) ++# define PLATFORM_ID "Xenix" ++ ++#elif defined(__WATCOMC__) ++# if defined(__LINUX__) ++# define PLATFORM_ID "Linux" ++ ++# elif defined(__DOS__) ++# define PLATFORM_ID "DOS" ++ ++# elif defined(__OS2__) ++# define PLATFORM_ID "OS2" ++ ++# elif defined(__WINDOWS__) ++# define PLATFORM_ID "Windows3x" ++ ++# elif defined(__VXWORKS__) ++# define PLATFORM_ID "VxWorks" ++ ++# else /* unknown platform */ ++# define PLATFORM_ID ++# endif ++ ++#elif defined(__INTEGRITY) ++# if defined(INT_178B) ++# define PLATFORM_ID "Integrity178" ++ ++# else /* regular Integrity */ ++# define PLATFORM_ID "Integrity" ++# endif ++ ++#else /* unknown platform */ ++# define PLATFORM_ID ++ ++#endif ++ ++/* For windows compilers MSVC and Intel we can determine ++ the architecture of the compiler being used. This is because ++ the compilers do not have flags that can change the architecture, ++ but rather depend on which compiler is being used ++*/ ++#if defined(_WIN32) && defined(_MSC_VER) ++# if defined(_M_IA64) ++# define ARCHITECTURE_ID "IA64" ++ ++# elif defined(_M_ARM64EC) ++# define ARCHITECTURE_ID "ARM64EC" ++ ++# elif defined(_M_X64) || defined(_M_AMD64) ++# define ARCHITECTURE_ID "x64" ++ ++# elif defined(_M_IX86) ++# define ARCHITECTURE_ID "X86" ++ ++# elif defined(_M_ARM64) ++# define ARCHITECTURE_ID "ARM64" ++ ++# elif defined(_M_ARM) ++# if _M_ARM == 4 ++# define ARCHITECTURE_ID "ARMV4I" ++# elif _M_ARM == 5 ++# define ARCHITECTURE_ID "ARMV5I" ++# else ++# define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM) ++# endif ++ ++# elif defined(_M_MIPS) ++# define ARCHITECTURE_ID "MIPS" ++ ++# elif defined(_M_SH) ++# define ARCHITECTURE_ID "SHx" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__WATCOMC__) ++# if defined(_M_I86) ++# define ARCHITECTURE_ID "I86" ++ ++# elif defined(_M_IX86) ++# define ARCHITECTURE_ID "X86" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) ++# if defined(__ICCARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__ICCRX__) ++# define ARCHITECTURE_ID "RX" ++ ++# elif defined(__ICCRH850__) ++# define ARCHITECTURE_ID "RH850" ++ ++# elif defined(__ICCRL78__) ++# define ARCHITECTURE_ID "RL78" ++ ++# elif defined(__ICCRISCV__) ++# define ARCHITECTURE_ID "RISCV" ++ ++# elif defined(__ICCAVR__) ++# define ARCHITECTURE_ID "AVR" ++ ++# elif defined(__ICC430__) ++# define ARCHITECTURE_ID "MSP430" ++ ++# elif defined(__ICCV850__) ++# define ARCHITECTURE_ID "V850" ++ ++# elif defined(__ICC8051__) ++# define ARCHITECTURE_ID "8051" ++ ++# elif defined(__ICCSTM8__) ++# define ARCHITECTURE_ID "STM8" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__ghs__) ++# if defined(__PPC64__) ++# define ARCHITECTURE_ID "PPC64" ++ ++# elif defined(__ppc__) ++# define ARCHITECTURE_ID "PPC" ++ ++# elif defined(__ARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__x86_64__) ++# define ARCHITECTURE_ID "x64" ++ ++# elif defined(__i386__) ++# define ARCHITECTURE_ID "X86" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#elif defined(__TI_COMPILER_VERSION__) ++# if defined(__TI_ARM__) ++# define ARCHITECTURE_ID "ARM" ++ ++# elif defined(__MSP430__) ++# define ARCHITECTURE_ID "MSP430" ++ ++# elif defined(__TMS320C28XX__) ++# define ARCHITECTURE_ID "TMS320C28x" ++ ++# elif defined(__TMS320C6X__) || defined(_TMS320C6X) ++# define ARCHITECTURE_ID "TMS320C6x" ++ ++# else /* unknown architecture */ ++# define ARCHITECTURE_ID "" ++# endif ++ ++#else ++# define ARCHITECTURE_ID ++#endif ++ ++/* Convert integer to decimal digit literals. */ ++#define DEC(n) \ ++ ('0' + (((n) / 10000000)%10)), \ ++ ('0' + (((n) / 1000000)%10)), \ ++ ('0' + (((n) / 100000)%10)), \ ++ ('0' + (((n) / 10000)%10)), \ ++ ('0' + (((n) / 1000)%10)), \ ++ ('0' + (((n) / 100)%10)), \ ++ ('0' + (((n) / 10)%10)), \ ++ ('0' + ((n) % 10)) ++ ++/* Convert integer to hex digit literals. */ ++#define HEX(n) \ ++ ('0' + ((n)>>28 & 0xF)), \ ++ ('0' + ((n)>>24 & 0xF)), \ ++ ('0' + ((n)>>20 & 0xF)), \ ++ ('0' + ((n)>>16 & 0xF)), \ ++ ('0' + ((n)>>12 & 0xF)), \ ++ ('0' + ((n)>>8 & 0xF)), \ ++ ('0' + ((n)>>4 & 0xF)), \ ++ ('0' + ((n) & 0xF)) ++ ++/* Construct a string literal encoding the version number. */ ++#ifdef COMPILER_VERSION ++char const* info_version = "INFO" ":" "compiler_version[" COMPILER_VERSION "]"; ++ ++/* Construct a string literal encoding the version number components. */ ++#elif defined(COMPILER_VERSION_MAJOR) ++char const info_version[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','[', ++ COMPILER_VERSION_MAJOR, ++# ifdef COMPILER_VERSION_MINOR ++ '.', COMPILER_VERSION_MINOR, ++# ifdef COMPILER_VERSION_PATCH ++ '.', COMPILER_VERSION_PATCH, ++# ifdef COMPILER_VERSION_TWEAK ++ '.', COMPILER_VERSION_TWEAK, ++# endif ++# endif ++# endif ++ ']','\0'}; ++#endif ++ ++/* Construct a string literal encoding the internal version number. */ ++#ifdef COMPILER_VERSION_INTERNAL ++char const info_version_internal[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','_', ++ 'i','n','t','e','r','n','a','l','[', ++ COMPILER_VERSION_INTERNAL,']','\0'}; ++#elif defined(COMPILER_VERSION_INTERNAL_STR) ++char const* info_version_internal = "INFO" ":" "compiler_version_internal[" COMPILER_VERSION_INTERNAL_STR "]"; ++#endif ++ ++/* Construct a string literal encoding the version number components. */ ++#ifdef SIMULATE_VERSION_MAJOR ++char const info_simulate_version[] = { ++ 'I', 'N', 'F', 'O', ':', ++ 's','i','m','u','l','a','t','e','_','v','e','r','s','i','o','n','[', ++ SIMULATE_VERSION_MAJOR, ++# ifdef SIMULATE_VERSION_MINOR ++ '.', SIMULATE_VERSION_MINOR, ++# ifdef SIMULATE_VERSION_PATCH ++ '.', SIMULATE_VERSION_PATCH, ++# ifdef SIMULATE_VERSION_TWEAK ++ '.', SIMULATE_VERSION_TWEAK, ++# endif ++# endif ++# endif ++ ']','\0'}; ++#endif ++ ++/* Construct the string literal in pieces to prevent the source from ++ getting matched. Store it in a pointer rather than an array ++ because some compilers will just produce instructions to fill the ++ array rather than assigning a pointer to a static array. */ ++char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]"; ++char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]"; ++ ++ ++ ++#if defined(__INTEL_COMPILER) && defined(_MSVC_LANG) && _MSVC_LANG < 201403L ++# if defined(__INTEL_CXX11_MODE__) ++# if defined(__cpp_aggregate_nsdmi) ++# define CXX_STD 201402L ++# else ++# define CXX_STD 201103L ++# endif ++# else ++# define CXX_STD 199711L ++# endif ++#elif defined(_MSC_VER) && defined(_MSVC_LANG) ++# define CXX_STD _MSVC_LANG ++#else ++# define CXX_STD __cplusplus ++#endif ++ ++const char* info_language_standard_default = "INFO" ":" "standard_default[" ++#if CXX_STD > 202002L ++ "23" ++#elif CXX_STD > 201703L ++ "20" ++#elif CXX_STD >= 201703L ++ "17" ++#elif CXX_STD >= 201402L ++ "14" ++#elif CXX_STD >= 201103L ++ "11" ++#else ++ "98" ++#endif ++"]"; ++ ++const char* info_language_extensions_default = "INFO" ":" "extensions_default[" ++/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ ++#if (defined(__clang__) || defined(__GNUC__) || \ ++ defined(__TI_COMPILER_VERSION__)) && \ ++ !defined(__STRICT_ANSI__) && !defined(_MSC_VER) ++ "ON" ++#else ++ "OFF" ++#endif ++"]"; ++ ++/*--------------------------------------------------------------------------*/ ++ ++int main(int argc, char* argv[]) ++{ ++ int require = 0; ++ require += info_compiler[argc]; ++ require += info_platform[argc]; ++#ifdef COMPILER_VERSION_MAJOR ++ require += info_version[argc]; ++#endif ++#ifdef COMPILER_VERSION_INTERNAL ++ require += info_version_internal[argc]; ++#endif ++#ifdef SIMULATE_ID ++ require += info_simulate[argc]; ++#endif ++#ifdef SIMULATE_VERSION_MAJOR ++ require += info_simulate_version[argc]; ++#endif ++#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) ++ require += info_cray[argc]; ++#endif ++ require += info_language_standard_default[argc]; ++ require += info_language_extensions_default[argc]; ++ (void)argv; ++ return require; ++} +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.o +new file mode 100644 +index 0000000..61f3d99 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeError.log b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeError.log +new file mode 100644 +index 0000000..088c1a6 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeError.log +@@ -0,0 +1,5 @@ ++Checking whether the ASM compiler is GNU using "--version" did not match "(GNU assembler)|(GCC)|(Free Software Foundation)": ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: x86_64-apple-darwin24.3.0 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeOutput.log b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeOutput.log +new file mode 100644 +index 0000000..68e7751 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeOutput.log +@@ -0,0 +1,267 @@ ++The target system is: Android - 1 - aarch64 ++The host system is: Darwin - 24.3.0 - arm64 ++Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded. ++Compiler: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang ++Build flags: -g;-DANDROID;-fdata-sections;-ffunction-sections;-funwind-tables;-fstack-protector-strong;-no-canonical-prefixes;-D_FORTIFY_SOURCE=2;-Wformat;-Werror=format-security; ++Id flags: -c;--target=aarch64-none-linux-android24 ++ ++The output was: ++0 ++ ++ ++Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CMakeCCompilerId.o" ++ ++The C compiler identification is Clang, found in "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdC/CMakeCCompilerId.o" ++ ++Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded. ++Compiler: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ ++Build flags: -g;-DANDROID;-fdata-sections;-ffunction-sections;-funwind-tables;-fstack-protector-strong;-no-canonical-prefixes;-D_FORTIFY_SOURCE=2;-Wformat;-Werror=format-security;;-O3;-frtti;-fexceptions;-Wall;-fstack-protector-all ++Id flags: -c;--target=aarch64-none-linux-android24 ++ ++The output was: ++0 ++ ++ ++Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CMakeCXXCompilerId.o" ++ ++The CXX compiler identification is Clang, found in "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CompilerIdCXX/CMakeCXXCompilerId.o" ++ ++Detecting C compiler ABI info compiled with the following output: ++Change Dir: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp ++ ++Run Build Command(s):/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja cmTC_5018b && [1/2] Building C object CMakeFiles/cmTC_5018b.dir/CMakeCCompilerABI.c.o ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: aarch64-none-linux-android24 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin ++ (in-process) ++ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" -cc1 -triple aarch64-none-linux-android24 -emit-obj -mrelax-all -disable-free -clear-ast-before-backend -disable-llvm-verifier -discard-value-names -main-file-name CMakeCCompilerABI.c -mrelocation-model pic -pic-level 2 -pic-is-pie -mframe-pointer=non-leaf -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu generic -target-feature +neon -target-feature +v8a -target-feature +fix-cortex-a53-835769 -target-abi aapcs -debug-info-kind=constructor -dwarf-version=4 -debugger-tuning=gdb -fdebug-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -v -ffunction-sections -fdata-sections -fcoverage-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -resource-dir /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18 -dependency-file CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o.d -MT CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o -sys-header-deps -D ANDROID -D _FORTIFY_SOURCE=2 -isysroot /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include -Wformat -ferror-limit 19 -femulated-tls -stack-protector 2 -fno-signed-char -fgnuc-version=4.2.1 -fcolor-diagnostics -target-feature +outline-atomics -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o -x c /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompilerABI.c ++clang -cc1 version 18.0.3 based upon LLVM 18.0.3 default target x86_64-apple-darwin24.3.0 ++ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include" ++ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include" ++#include "..." search starts here: ++#include <...> search starts here: ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include ++End of search list. ++[2/2] Linking C executable cmTC_5018b ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: aarch64-none-linux-android24 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin ++ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld" --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -EL --fix-cortex-a53-843419 -z now -z relro -z max-page-size=4096 --hash-style=gnu --eh-frame-hdr -m aarch64linux -pie -dynamic-linker /system/bin/linker64 -o cmTC_5018b /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib --build-id=sha1 --no-rosegment --no-undefined-version --fatal-warnings --no-undefined CMakeFiles/cmTC_5018b.dir/CMakeCCompilerABI.c.o /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl -lc /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o ++ ++ ++ ++Parsed C implicit include dir info from above output: rv=done ++ found start of include info ++ found start of implicit include info ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ end of search list found ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ implicit include dirs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ ++ ++Parsed C implicit link information from above output: ++ link line regex: [^( *|.*[/\])(ld\.lld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] ++ ignore line: [Change Dir: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp] ++ ignore line: [] ++ ignore line: [Run Build Command(s):/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja cmTC_5018b && [1/2] Building C object CMakeFiles/cmTC_5018b.dir/CMakeCCompilerABI.c.o] ++ ignore line: [Android (12470979 +pgo -bolt +lto -mlgo based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262)] ++ ignore line: [Target: aarch64-none-linux-android24] ++ ignore line: [Thread model: posix] ++ ignore line: [InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin] ++ ignore line: [ (in-process)] ++ ignore line: [ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" -cc1 -triple aarch64-none-linux-android24 -emit-obj -mrelax-all -disable-free -clear-ast-before-backend -disable-llvm-verifier -discard-value-names -main-file-name CMakeCCompilerABI.c -mrelocation-model pic -pic-level 2 -pic-is-pie -mframe-pointer=non-leaf -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu generic -target-feature +neon -target-feature +v8a -target-feature +fix-cortex-a53-835769 -target-abi aapcs -debug-info-kind=constructor -dwarf-version=4 -debugger-tuning=gdb -fdebug-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -v -ffunction-sections -fdata-sections -fcoverage-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -resource-dir /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18 -dependency-file CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o.d -MT CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o -sys-header-deps -D ANDROID -D _FORTIFY_SOURCE=2 -isysroot /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include -Wformat -ferror-limit 19 -femulated-tls -stack-protector 2 -fno-signed-char -fgnuc-version=4.2.1 -fcolor-diagnostics -target-feature +outline-atomics -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o CMakeFiles/cmTC_045bc.dir/CMakeCCompilerABI.c.o -x c /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompilerABI.c] ++ ignore line: [clang -cc1 version 18.0.3 based upon LLVM 18.0.3 default target x86_64-apple-darwin24.3.0] ++ ignore line: [ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include"] ++ ignore line: [ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include"] ++ ignore line: [#include "..." search starts here:] ++ ignore line: [#include <...> search starts here:] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ ignore line: [End of search list.] ++ ignore line: [[2/2] Linking C executable cmTC_5018b] ++ ignore line: [Android (12470979 +pgo -bolt +lto -mlgo based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262)] ++ ignore line: [Target: aarch64-none-linux-android24] ++ ignore line: [Thread model: posix] ++ ignore line: [InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin] ++ link line: [ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld" --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -EL --fix-cortex-a53-843419 -z now -z relro -z max-page-size=4096 --hash-style=gnu --eh-frame-hdr -m aarch64linux -pie -dynamic-linker /system/bin/linker64 -o cmTC_5018b /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib --build-id=sha1 --no-rosegment --no-undefined-version --fatal-warnings --no-undefined CMakeFiles/cmTC_5018b.dir/CMakeCCompilerABI.c.o /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl -lc /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld] ==> ignore ++ arg [--sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot] ==> ignore ++ arg [-EL] ==> ignore ++ arg [--fix-cortex-a53-843419] ==> ignore ++ arg [-znow] ==> ignore ++ arg [-zrelro] ==> ignore ++ arg [-zmax-page-size=4096] ==> ignore ++ arg [--hash-style=gnu] ==> ignore ++ arg [--eh-frame-hdr] ==> ignore ++ arg [-m] ==> ignore ++ arg [aarch64linux] ==> ignore ++ arg [-pie] ==> ignore ++ arg [-dynamic-linker] ==> ignore ++ arg [/system/bin/linker64] ==> ignore ++ arg [-o] ==> ignore ++ arg [cmTC_5018b] ==> ignore ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o] ==> obj [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ arg [--build-id=sha1] ==> ignore ++ arg [--no-rosegment] ==> ignore ++ arg [--no-undefined-version] ==> ignore ++ arg [--fatal-warnings] ==> ignore ++ arg [--no-undefined] ==> ignore ++ arg [CMakeFiles/cmTC_5018b.dir/CMakeCCompilerABI.c.o] ==> ignore ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ==> lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ arg [-l:libunwind.a] ==> lib [-l:libunwind.a] ++ arg [-ldl] ==> lib [dl] ++ arg [-lc] ==> lib [c] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ==> lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ arg [-l:libunwind.a] ==> lib [-l:libunwind.a] ++ arg [-ldl] ==> lib [dl] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ==> obj [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ remove lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ remove lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ implicit libs: [-l:libunwind.a;dl;c;-l:libunwind.a;dl] ++ implicit objs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ implicit dirs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ implicit fwks: [] ++ ++ ++Detecting CXX compiler ABI info compiled with the following output: ++Change Dir: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp ++ ++Run Build Command(s):/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja cmTC_5c510 && [1/2] Building CXX object CMakeFiles/cmTC_5c510.dir/CMakeCXXCompilerABI.cpp.o ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: aarch64-none-linux-android24 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin ++ (in-process) ++ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++" -cc1 -triple aarch64-none-linux-android24 -emit-obj -disable-free -clear-ast-before-backend -disable-llvm-verifier -discard-value-names -main-file-name CMakeCXXCompilerABI.cpp -mrelocation-model pic -pic-level 2 -pic-is-pie -mframe-pointer=non-leaf -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu generic -target-feature +neon -target-feature +v8a -target-feature +fix-cortex-a53-835769 -target-abi aapcs -debug-info-kind=constructor -dwarf-version=4 -debugger-tuning=gdb -fdebug-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -v -ffunction-sections -fdata-sections -fcoverage-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -resource-dir /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18 -dependency-file CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o.d -MT CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o -sys-header-deps -D ANDROID -D _FORTIFY_SOURCE=2 -isysroot /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1 -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include -O3 -Wformat -Wall -fdeprecated-macro -ferror-limit 19 -femulated-tls -stack-protector 3 -fno-signed-char -fgnuc-version=4.2.1 -fcxx-exceptions -fexceptions -fcolor-diagnostics -vectorize-loops -vectorize-slp -target-feature +outline-atomics -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o -x c++ /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp ++clang -cc1 version 18.0.3 based upon LLVM 18.0.3 default target x86_64-apple-darwin24.3.0 ++ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include" ++ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include" ++#include "..." search starts here: ++#include <...> search starts here: ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1 ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android ++ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include ++End of search list. ++[2/2] Linking CXX executable cmTC_5c510 ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: aarch64-none-linux-android24 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin ++ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld" --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -EL --fix-cortex-a53-843419 -z now -z relro -z max-page-size=4096 --hash-style=gnu --eh-frame-hdr -m aarch64linux -pie -dynamic-linker /system/bin/linker64 -o cmTC_5c510 /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib --build-id=sha1 --no-rosegment --no-undefined-version --fatal-warnings --no-undefined CMakeFiles/cmTC_5c510.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lm /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl -lc /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o ++ ++ ++ ++Parsed CXX implicit include dir info from above output: rv=done ++ found start of include info ++ found start of implicit include info ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1] ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ add: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ end of search list found ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1] ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ collapse include dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ implicit include dirs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ ++ ++Parsed CXX implicit link information from above output: ++ link line regex: [^( *|.*[/\])(ld\.lld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] ++ ignore line: [Change Dir: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp] ++ ignore line: [] ++ ignore line: [Run Build Command(s):/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja cmTC_5c510 && [1/2] Building CXX object CMakeFiles/cmTC_5c510.dir/CMakeCXXCompilerABI.cpp.o] ++ ignore line: [Android (12470979 +pgo -bolt +lto -mlgo based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262)] ++ ignore line: [Target: aarch64-none-linux-android24] ++ ignore line: [Thread model: posix] ++ ignore line: [InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin] ++ ignore line: [ (in-process)] ++ ignore line: [ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++" -cc1 -triple aarch64-none-linux-android24 -emit-obj -disable-free -clear-ast-before-backend -disable-llvm-verifier -discard-value-names -main-file-name CMakeCXXCompilerABI.cpp -mrelocation-model pic -pic-level 2 -pic-is-pie -mframe-pointer=non-leaf -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu generic -target-feature +neon -target-feature +v8a -target-feature +fix-cortex-a53-835769 -target-abi aapcs -debug-info-kind=constructor -dwarf-version=4 -debugger-tuning=gdb -fdebug-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -v -ffunction-sections -fdata-sections -fcoverage-compilation-dir=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/CMakeTmp -resource-dir /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18 -dependency-file CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o.d -MT CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o -sys-header-deps -D ANDROID -D _FORTIFY_SOURCE=2 -isysroot /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1 -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include -internal-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include -internal-externc-isystem /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include -O3 -Wformat -Wall -fdeprecated-macro -ferror-limit 19 -femulated-tls -stack-protector 3 -fno-signed-char -fgnuc-version=4.2.1 -fcxx-exceptions -fexceptions -fcolor-diagnostics -vectorize-loops -vectorize-slp -target-feature +outline-atomics -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o CMakeFiles/cmTC_a9293.dir/CMakeCXXCompilerABI.cpp.o -x c++ /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp] ++ ignore line: [clang -cc1 version 18.0.3 based upon LLVM 18.0.3 default target x86_64-apple-darwin24.3.0] ++ ignore line: [ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include"] ++ ignore line: [ignoring nonexistent directory "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/include"] ++ ignore line: [#include "..." search starts here:] ++ ignore line: [#include <...> search starts here:] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/c++/v1] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/include] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android] ++ ignore line: [ /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include] ++ ignore line: [End of search list.] ++ ignore line: [[2/2] Linking CXX executable cmTC_5c510] ++ ignore line: [Android (12470979 +pgo -bolt +lto -mlgo based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262)] ++ ignore line: [Target: aarch64-none-linux-android24] ++ ignore line: [Thread model: posix] ++ ignore line: [InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin] ++ link line: [ "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld" --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -EL --fix-cortex-a53-843419 -z now -z relro -z max-page-size=4096 --hash-style=gnu --eh-frame-hdr -m aarch64linux -pie -dynamic-linker /system/bin/linker64 -o cmTC_5c510 /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24 -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android -L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib --build-id=sha1 --no-rosegment --no-undefined-version --fatal-warnings --no-undefined CMakeFiles/cmTC_5c510.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lm /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl -lc /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a -l:libunwind.a -ldl /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld] ==> ignore ++ arg [--sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot] ==> ignore ++ arg [-EL] ==> ignore ++ arg [--fix-cortex-a53-843419] ==> ignore ++ arg [-znow] ==> ignore ++ arg [-zrelro] ==> ignore ++ arg [-zmax-page-size=4096] ==> ignore ++ arg [--hash-style=gnu] ==> ignore ++ arg [--eh-frame-hdr] ==> ignore ++ arg [-m] ==> ignore ++ arg [aarch64linux] ==> ignore ++ arg [-pie] ==> ignore ++ arg [-dynamic-linker] ==> ignore ++ arg [/system/bin/linker64] ==> ignore ++ arg [-o] ==> ignore ++ arg [cmTC_5c510] ==> ignore ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o] ==> obj [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ++ arg [-L/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ==> dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ arg [--build-id=sha1] ==> ignore ++ arg [--no-rosegment] ==> ignore ++ arg [--no-undefined-version] ==> ignore ++ arg [--fatal-warnings] ==> ignore ++ arg [--no-undefined] ==> ignore ++ arg [CMakeFiles/cmTC_5c510.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore ++ arg [-lc++] ==> lib [c++] ++ arg [-lm] ==> lib [m] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ==> lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ arg [-l:libunwind.a] ==> lib [-l:libunwind.a] ++ arg [-ldl] ==> lib [dl] ++ arg [-lc] ==> lib [c] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ==> lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ arg [-l:libunwind.a] ==> lib [-l:libunwind.a] ++ arg [-ldl] ==> lib [dl] ++ arg [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ==> obj [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ remove lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ remove lib [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-aarch64-android.a] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android] ++ collapse library dir [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ==> [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ implicit libs: [c++;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl] ++ implicit objs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtbegin_dynamic.o;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/crtend_android.o] ++ implicit dirs: [/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/aarch64;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android;/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib] ++ implicit fwks: [] ++ ++ ++Checking whether the ASM compiler is Clang using "--version" matched "(clang version)": ++Android (12470979, +pgo, -bolt, +lto, -mlgo, based on r522817c) clang version 18.0.3 (https://android.googlesource.com/toolchain/llvm-project d8003a456d14a3deb8054cdaa529ffbf02d9b262) ++Target: x86_64-apple-darwin24.3.0 ++Thread model: posix ++InstalledDir: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/TargetDirectories.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/TargetDirectories.txt +new file mode 100644 +index 0000000..d9d47d2 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/TargetDirectories.txt +@@ -0,0 +1,6 @@ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rnmmkv.dir ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/edit_cache.dir ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rebuild_cache.dir ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/edit_cache.dir ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/rebuild_cache.dir +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/cmake.check_cache b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/cmake.check_cache +new file mode 100644 +index 0000000..3dccd73 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/cmake.check_cache +@@ -0,0 +1 @@ ++# This file is generated by cmake for dependency checking of the CMakeCache.txt file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o +new file mode 100644 +index 0000000..2ce9ab1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rules.ninja b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rules.ninja +new file mode 100644 +index 0000000..e06f79e +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/CMakeFiles/rules.ninja +@@ -0,0 +1,93 @@ ++# CMAKE generated file: DO NOT EDIT! ++# Generated by "Ninja" Generator, CMake Version 3.22 ++ ++# This file contains all the rules used to get the outputs files ++# built from the input files. ++# It is included in the main 'build.ninja'. ++ ++# ============================================================================= ++# Project: PACKAGE_NAME ++# Configurations: Debug ++# ============================================================================= ++# ============================================================================= ++ ++############################################# ++# Rule for compiling CXX files. ++ ++rule CXX_COMPILER__rnmmkv_Debug ++ depfile = $DEP_FILE ++ deps = gcc ++ command = ccache /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in ++ description = Building CXX object $out ++ ++ ++############################################# ++# Rule for linking CXX shared library. ++ ++rule CXX_SHARED_LIBRARY_LINKER__rnmmkv_Debug ++ command = $PRE_LINK && /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD ++ description = Linking CXX shared library $TARGET_FILE ++ restat = $RESTAT ++ ++ ++############################################# ++# Rule for running custom commands. ++ ++rule CUSTOM_COMMAND ++ command = $COMMAND ++ description = $DESC ++ ++ ++############################################# ++# Rule for compiling ASM files. ++ ++rule ASM_COMPILER__core_Debug ++ depfile = $DEP_FILE ++ deps = gcc ++ command = /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in ++ description = Building ASM object $out ++ ++ ++############################################# ++# Rule for compiling CXX files. ++ ++rule CXX_COMPILER__core_Debug ++ depfile = $DEP_FILE ++ deps = gcc ++ command = ccache /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in ++ description = Building CXX object $out ++ ++ ++############################################# ++# Rule for linking CXX static library. ++ ++rule CXX_STATIC_LIBRARY_LINKER__core_Debug ++ command = $PRE_LINK && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake -E rm -f $TARGET_FILE && /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar qc $TARGET_FILE $LINK_FLAGS $in && /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib $TARGET_FILE && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake -E touch $TARGET_FILE && $POST_BUILD ++ description = Linking CXX static library $TARGET_FILE ++ restat = $RESTAT ++ ++ ++############################################# ++# Rule for re-running cmake. ++ ++rule RERUN_CMAKE ++ command = /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake --regenerate-during-build -S/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ description = Re-running CMake... ++ generator = 1 ++ ++ ++############################################# ++# Rule for cleaning all built files. ++ ++rule CLEAN ++ command = /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja $FILE_ARG -t clean $TARGETS ++ description = Cleaning all built files... ++ ++ ++############################################# ++# Rule for printing all primary targets available. ++ ++rule HELP ++ command = /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja -t targets ++ description = All primary targets available: ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/additional_project_files.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/additional_project_files.txt +new file mode 100644 +index 0000000..f0e585a +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/additional_project_files.txt +@@ -0,0 +1,29 @@ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVMetaInfo.hpp ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_locl.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_opensslconf.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_locl.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md32_common.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_arm_arch.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/Checksum.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/zconf.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/zutil.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVPredef.h ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build.json +new file mode 100644 +index 0000000..12c81e7 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build.json +@@ -0,0 +1,49 @@ ++{ ++ "buildFiles": [ ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt" ++ ], ++ "cleanCommandsComponents": [ ++ [ ++ "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "-C", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "clean" ++ ] ++ ], ++ "buildTargetsCommandComponents": [ ++ "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "-C", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "{LIST_OF_TARGETS_TO_BUILD}" ++ ], ++ "libraries": { ++ "core::@57760688d1f824db5d9c": { ++ "toolchain": "toolchain", ++ "abi": "arm64-v8a", ++ "artifactName": "core", ++ "output": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/libcore.a" ++ }, ++ "rnmmkv::@6890427a1f51a3e7e1df": { ++ "toolchain": "toolchain", ++ "abi": "arm64-v8a", ++ "artifactName": "rnmmkv", ++ "output": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so", ++ "runtimeFiles": [ ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so" ++ ] ++ } ++ }, ++ "toolchains": { ++ "toolchain": { ++ "cCompilerExecutable": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang.lld", ++ "cppCompilerExecutable": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++.lld" ++ } ++ }, ++ "cFileExtensions": [], ++ "cppFileExtensions": [ ++ "cpp" ++ ] ++} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build_mini.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build_mini.json +new file mode 100644 +index 0000000..27c81fa +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build_mini.json +@@ -0,0 +1,38 @@ ++{ ++ "buildFiles": [ ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt" ++ ], ++ "cleanCommandsComponents": [ ++ [ ++ "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "-C", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "clean" ++ ] ++ ], ++ "buildTargetsCommandComponents": [ ++ "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "-C", ++ "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "{LIST_OF_TARGETS_TO_BUILD}" ++ ], ++ "libraries": { ++ "core::@57760688d1f824db5d9c": { ++ "artifactName": "core", ++ "abi": "arm64-v8a", ++ "output": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/libcore.a", ++ "runtimeFiles": [] ++ }, ++ "rnmmkv::@6890427a1f51a3e7e1df": { ++ "artifactName": "rnmmkv", ++ "abi": "arm64-v8a", ++ "output": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so", ++ "runtimeFiles": [ ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so" ++ ] ++ } ++ } ++} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build.ninja b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build.ninja +new file mode 100644 +index 0000000..47a9641 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build.ninja +@@ -0,0 +1,537 @@ ++# CMAKE generated file: DO NOT EDIT! ++# Generated by "Ninja" Generator, CMake Version 3.22 ++ ++# This file contains all the build statements describing the ++# compilation DAG. ++ ++# ============================================================================= ++# Write statements declared in CMakeLists.txt: ++# ++# Which is the root file. ++# ============================================================================= ++ ++# ============================================================================= ++# Project: PACKAGE_NAME ++# Configurations: Debug ++# ============================================================================= ++ ++############################################# ++# Minimal version of Ninja required by this file ++ ++ninja_required_version = 1.5 ++ ++ ++############################################# ++# Set configuration variable for custom commands. ++ ++CONFIGURATION = Debug ++# ============================================================================= ++# Include auxiliary files. ++ ++ ++############################################# ++# Include rules file. ++ ++include CMakeFiles/rules.ninja ++ ++# ============================================================================= ++ ++############################################# ++# Logical path to working directory; prefix for absolute paths. ++ ++cmake_ninja_workdir = /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/ ++# ============================================================================= ++# Object build statements for SHARED_LIBRARY target rnmmkv ++ ++ ++############################################# ++# Order-only phony target for rnmmkv ++ ++build cmake_object_order_depends_target_rnmmkv: phony || cmake_object_order_depends_target_core ++ ++build CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o: CXX_COMPILER__rnmmkv_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/rnmmkv-adapter.cpp || cmake_object_order_depends_target_rnmmkv ++ DEFINES = -Drnmmkv_EXPORTS ++ DEP_FILE = CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/include ++ OBJECT_DIR = CMakeFiles/rnmmkv.dir ++ OBJECT_FILE_DIR = CMakeFiles/rnmmkv.dir ++ TARGET_COMPILE_PDB = CMakeFiles/rnmmkv.dir/ ++ TARGET_PDB = /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.pdb ++ ++ ++# ============================================================================= ++# Link build statements for SHARED_LIBRARY target rnmmkv ++ ++ ++############################################# ++# Link the shared library /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so ++ ++build /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so: CXX_SHARED_LIBRARY_LINKER__rnmmkv_Debug CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o | core/libcore.a /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so || core/libcore.a ++ LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info ++ LINK_FLAGS = -Wl,--build-id=sha1 -Wl,--no-rosegment -Wl,--no-undefined-version -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments ++ LINK_LIBRARIES = core/libcore.a /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/liblog.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so -landroid /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libz.so -latomic -lm ++ OBJECT_DIR = CMakeFiles/rnmmkv.dir ++ POST_BUILD = : ++ PRE_LINK = : ++ SONAME = librnmmkv.so ++ SONAME_FLAG = -Wl,-soname, ++ TARGET_COMPILE_PDB = CMakeFiles/rnmmkv.dir/ ++ TARGET_FILE = /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so ++ TARGET_PDB = /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.pdb ++ ++ ++############################################# ++# Utility command for edit_cache ++ ++build CMakeFiles/edit_cache.util: CUSTOM_COMMAND ++ COMMAND = cd /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ccmake -S/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ DESC = Running CMake cache editor... ++ pool = console ++ restat = 1 ++ ++build edit_cache: phony CMakeFiles/edit_cache.util ++ ++ ++############################################# ++# Utility command for rebuild_cache ++ ++build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND ++ COMMAND = cd /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake --regenerate-during-build -S/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ DESC = Running CMake to regenerate build system... ++ pool = console ++ restat = 1 ++ ++build rebuild_cache: phony CMakeFiles/rebuild_cache.util ++ ++# ============================================================================= ++# Write statements declared in CMakeLists.txt: ++# /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt ++# ============================================================================= ++ ++# ============================================================================= ++# Object build statements for STATIC_LIBRARY target core ++ ++ ++############################################# ++# Order-only phony target for core ++ ++build cmake_object_order_depends_target_core: phony || core/CMakeFiles/core.dir ++ ++build core/CMakeFiles/core.dir/MMKV.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKV.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMKV_Android.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKV_Android.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMKV_IO.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKV_IO.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMKV_OSX.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKV_OSX.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMKVLog.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKVLog.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/CodedInputData.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/CodedInputData.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/CodedOutputData.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/CodedOutputData.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/KeyValueHolder.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/KeyValueHolder.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/PBUtility.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/PBUtility.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MiniPBCoder.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MiniPBCoder.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MMBuffer.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MMBuffer.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/InterProcessLock.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/InterProcessLock.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MemoryFile.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MemoryFile.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/ThreadLock.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/ThreadLock.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/crc32 ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o: CXX_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o.d ++ FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/crc32/zlib ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o: ASM_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o.d ++ FLAGS = -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++build core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o: ASM_COMPILER__core_Debug /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S || cmake_object_order_depends_target_core ++ DEP_FILE = core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o.d ++ FLAGS = -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC ++ INCLUDES = -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ OBJECT_FILE_DIR = core/CMakeFiles/core.dir/aes/openssl ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_PDB = core/libcore.pdb ++ ++ ++# ============================================================================= ++# Link build statements for STATIC_LIBRARY target core ++ ++ ++############################################# ++# Link the static library core/libcore.a ++ ++build core/libcore.a: CXX_STATIC_LIBRARY_LINKER__core_Debug core/CMakeFiles/core.dir/MMKV.cpp.o core/CMakeFiles/core.dir/MMKV_Android.cpp.o core/CMakeFiles/core.dir/MMKV_IO.cpp.o core/CMakeFiles/core.dir/MMKV_OSX.cpp.o core/CMakeFiles/core.dir/MMKVLog.cpp.o core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o core/CMakeFiles/core.dir/CodedInputData.cpp.o core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o core/CMakeFiles/core.dir/CodedOutputData.cpp.o core/CMakeFiles/core.dir/KeyValueHolder.cpp.o core/CMakeFiles/core.dir/PBUtility.cpp.o core/CMakeFiles/core.dir/MiniPBCoder.cpp.o core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o core/CMakeFiles/core.dir/MMBuffer.cpp.o core/CMakeFiles/core.dir/InterProcessLock.cpp.o core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o core/CMakeFiles/core.dir/MemoryFile.cpp.o core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o core/CMakeFiles/core.dir/ThreadLock.cpp.o core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o ++ LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info ++ OBJECT_DIR = core/CMakeFiles/core.dir ++ POST_BUILD = : ++ PRE_LINK = : ++ TARGET_COMPILE_PDB = core/CMakeFiles/core.dir/core.pdb ++ TARGET_FILE = core/libcore.a ++ TARGET_PDB = core/libcore.pdb ++ ++ ++############################################# ++# Utility command for edit_cache ++ ++build core/CMakeFiles/edit_cache.util: CUSTOM_COMMAND ++ COMMAND = cd /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ccmake -S/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ DESC = Running CMake cache editor... ++ pool = console ++ restat = 1 ++ ++build core/edit_cache: phony core/CMakeFiles/edit_cache.util ++ ++ ++############################################# ++# Utility command for rebuild_cache ++ ++build core/CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND ++ COMMAND = cd /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core && /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake --regenerate-during-build -S/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ DESC = Running CMake to regenerate build system... ++ pool = console ++ restat = 1 ++ ++build core/rebuild_cache: phony core/CMakeFiles/rebuild_cache.util ++ ++# ============================================================================= ++# Target aliases. ++ ++build core: phony core/libcore.a ++ ++build libcore.a: phony core/libcore.a ++ ++build librnmmkv.so: phony /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so ++ ++build rnmmkv: phony /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so ++ ++# ============================================================================= ++# Folder targets. ++ ++# ============================================================================= ++ ++############################################# ++# Folder: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++ ++build all: phony /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so core/all ++ ++# ============================================================================= ++ ++############################################# ++# Folder: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core ++ ++build core/all: phony core/libcore.a ++ ++# ============================================================================= ++# Built-in targets ++ ++ ++############################################# ++# Re-run CMake if any of its inputs changed. ++ ++build build.ninja: RERUN_CMAKE | /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompilerABI.c /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCommonLanguageInclude.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCompilerIdDetection.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineASMCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCXXCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompileFeatures.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerABI.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerId.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineSystem.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeFindBinUtils.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeGenericSystem.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeInitializeConfigs.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeLanguageInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitIncludeInfo.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitLinkInfo.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseLibraryArchitecture.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystem.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInitialize.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestASMCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ADSP-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMCC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/AppleClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Borland-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Bruce-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-ASM.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-FindBinUtils.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Cray-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Embarcadero-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Fujitsu-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GHS-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IAR-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Intel-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/MSVC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVHPC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVIDIA-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PGI-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PathScale-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SCO-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SDCC-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TI-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Watcom-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Internal/FeatureTesting.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-ASM.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Initialize.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android/Determine-Compiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Linux.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/UnixPaths.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/abis.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android-legacy.toolchain.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/flags.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Clang.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Determine.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Initialize.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Determine-Compiler.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/platforms.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt CMakeCache.txt CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake ++ pool = console ++ ++ ++############################################# ++# A missing CMake input file is not an error. ++ ++build /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeASMInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCCompilerABI.c /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompiler.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCXXInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCommonLanguageInclude.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeCompilerIdDetection.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineASMCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCXXCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompileFeatures.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerABI.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineCompilerId.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeDetermineSystem.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeFindBinUtils.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeGenericSystem.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeInitializeConfigs.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeLanguageInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitIncludeInfo.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseImplicitLinkInfo.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeParseLibraryArchitecture.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystem.cmake.in /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInformation.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeSystemSpecificInitialize.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestASMCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/CMakeTestCompilerCommon.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ADSP-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMCC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/ARMClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/AppleClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Borland-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Bruce-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-ASM.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-DetermineCompilerInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang-FindBinUtils.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Clang.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Cray-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Embarcadero-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Fujitsu-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GHS-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/GNU.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/HP-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IAR-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Intel-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/MSVC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVHPC-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/NVIDIA-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PGI-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/PathScale-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SCO-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SDCC-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TI-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/Watcom-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XL-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-C-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Internal/FeatureTesting.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-ASM.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Clang.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-C.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine-CXX.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Determine.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android-Initialize.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Android/Determine-Compiler.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/Linux.cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22/Modules/Platform/UnixPaths.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/abis.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android-legacy.toolchain.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/flags.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Clang.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Determine.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android-Initialize.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Android.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/hooks/pre/Determine-Compiler.cmake /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/platforms.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt CMakeCache.txt CMakeFiles/3.22.1-g37088a8/CMakeASMCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeCCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeCXXCompiler.cmake CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake: phony ++ ++ ++############################################# ++# Clean all the built files. ++ ++build clean: CLEAN ++ ++ ++############################################# ++# Print all primary targets available. ++ ++build help: HELP ++ ++ ++############################################# ++# Make the all target the default. ++ ++default all +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build_file_index.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build_file_index.txt +new file mode 100644 +index 0000000..5c14b54 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build_file_index.txt +@@ -0,0 +1,2 @@ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CMakeLists.txt ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/cmake_install.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/cmake_install.cmake +new file mode 100644 +index 0000000..3d0c094 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/cmake_install.cmake +@@ -0,0 +1,60 @@ ++# Install script for directory: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv ++ ++# Set the install prefix ++if(NOT DEFINED CMAKE_INSTALL_PREFIX) ++ set(CMAKE_INSTALL_PREFIX "/usr/local") ++endif() ++string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++ ++# Set the install configuration name. ++if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) ++ if(BUILD_TYPE) ++ string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" ++ CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") ++ else() ++ set(CMAKE_INSTALL_CONFIG_NAME "Debug") ++ endif() ++ message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") ++endif() ++ ++# Set the component getting installed. ++if(NOT CMAKE_INSTALL_COMPONENT) ++ if(COMPONENT) ++ message(STATUS "Install component: \"${COMPONENT}\"") ++ set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") ++ else() ++ set(CMAKE_INSTALL_COMPONENT) ++ endif() ++endif() ++ ++# Install shared libraries without execute permission? ++if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) ++ set(CMAKE_INSTALL_SO_NO_EXE "0") ++endif() ++ ++# Is this installation the result of a crosscompile? ++if(NOT DEFINED CMAKE_CROSSCOMPILING) ++ set(CMAKE_CROSSCOMPILING "TRUE") ++endif() ++ ++# Set default install directory permissions. ++if(NOT DEFINED CMAKE_OBJDUMP) ++ set(CMAKE_OBJDUMP "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump") ++endif() ++ ++if(NOT CMAKE_INSTALL_LOCAL_ONLY) ++ # Include the install script for each subdirectory. ++ include("/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/cmake_install.cmake") ++ ++endif() ++ ++if(CMAKE_INSTALL_COMPONENT) ++ set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt") ++else() ++ set(CMAKE_INSTALL_MANIFEST "install_manifest.txt") ++endif() ++ ++string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT ++ "${CMAKE_INSTALL_MANIFEST_FILES}") ++file(WRITE "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/${CMAKE_INSTALL_MANIFEST}" ++ "${CMAKE_INSTALL_MANIFEST_CONTENT}") +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json +new file mode 100644 +index 0000000..5a5cceb +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json +@@ -0,0 +1,182 @@ ++[ ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Drnmmkv_EXPORTS -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -o CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/rnmmkv-adapter.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/rnmmkv-adapter.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_IO.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKVLog.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputData.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedOutputData.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/KeyValueHolder.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/PBUtility.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MiniPBCoder.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMBuffer.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/ThreadLock.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC -o core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC -o core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S" ++} ++] +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json.bin b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json.bin +new file mode 100644 +index 0000000..c649fe2 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/configure_fingerprint.bin b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/configure_fingerprint.bin +new file mode 100644 +index 0000000..44ed276 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/configure_fingerprint.bin +@@ -0,0 +1,28 @@ ++C/C++ Structured Log ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/additional_project_files.txtC ++A ++?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ָ2 ¸2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build.json  ָ2 ø2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build_mini.json  ָ2 Ҹ2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build.ninja  ָ2 2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build.ninja.txt  ָ2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/build_file_index.txt  ָ2 Ը2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json  ָ2 2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json.bin  ָ2 E 2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/metadata_generation_command.txt  ָ2 ++ Ը2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/prefab_config.json  ָ2  Ը2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/symbol_folder_index.txt  ָ2  Ը2 ++ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt  ָ2  2 +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData.cpp.o +new file mode 100644 +index 0000000..cd9af89 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o +new file mode 100644 +index 0000000..7d4c546 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o +new file mode 100644 +index 0000000..51c9315 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o +new file mode 100644 +index 0000000..bb8af37 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedOutputData.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedOutputData.cpp.o +new file mode 100644 +index 0000000..d7a3ec2 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/CodedOutputData.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock.cpp.o +new file mode 100644 +index 0000000..278e3db +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o +new file mode 100644 +index 0000000..c2f6cb8 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o +new file mode 100644 +index 0000000..351b861 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/KeyValueHolder.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/KeyValueHolder.cpp.o +new file mode 100644 +index 0000000..ea92114 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/KeyValueHolder.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMBuffer.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMBuffer.cpp.o +new file mode 100644 +index 0000000..9715703 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMBuffer.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV.cpp.o +new file mode 100644 +index 0000000..2ef9163 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog.cpp.o +new file mode 100644 +index 0000000..e140232 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o +new file mode 100644 +index 0000000..643578e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_Android.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_Android.cpp.o +new file mode 100644 +index 0000000..ad712d7 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_Android.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_IO.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_IO.cpp.o +new file mode 100644 +index 0000000..0c0358b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_IO.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_OSX.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_OSX.cpp.o +new file mode 100644 +index 0000000..5fe6be9 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MMKV_OSX.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile.cpp.o +new file mode 100644 +index 0000000..23c4c7a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o +new file mode 100644 +index 0000000..1b53ad7 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o +new file mode 100644 +index 0000000..a9d4807 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o +new file mode 100644 +index 0000000..532bc9c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o +new file mode 100644 +index 0000000..3871cd4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder.cpp.o +new file mode 100644 +index 0000000..e70d9c8 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o +new file mode 100644 +index 0000000..4424c14 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/PBUtility.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/PBUtility.cpp.o +new file mode 100644 +index 0000000..bb4af51 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/PBUtility.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock.cpp.o +new file mode 100644 +index 0000000..d8b867b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o +new file mode 100644 +index 0000000..77f6058 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o +new file mode 100644 +index 0000000..0f08a15 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o +new file mode 100644 +index 0000000..d7e0afc +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o +new file mode 100644 +index 0000000..d6bd8f1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o +new file mode 100644 +index 0000000..026839c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o +new file mode 100644 +index 0000000..5cc8950 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o +new file mode 100644 +index 0000000..3fd0206 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o +new file mode 100644 +index 0000000..eb237ec +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o +new file mode 100644 +index 0000000..f71d457 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o +new file mode 100644 +index 0000000..d39ab97 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/cmake_install.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/cmake_install.cmake +new file mode 100644 +index 0000000..90777b2 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/cmake_install.cmake +@@ -0,0 +1,44 @@ ++# Install script for directory: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core ++ ++# Set the install prefix ++if(NOT DEFINED CMAKE_INSTALL_PREFIX) ++ set(CMAKE_INSTALL_PREFIX "/usr/local") ++endif() ++string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++ ++# Set the install configuration name. ++if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) ++ if(BUILD_TYPE) ++ string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" ++ CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") ++ else() ++ set(CMAKE_INSTALL_CONFIG_NAME "Debug") ++ endif() ++ message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") ++endif() ++ ++# Set the component getting installed. ++if(NOT CMAKE_INSTALL_COMPONENT) ++ if(COMPONENT) ++ message(STATUS "Install component: \"${COMPONENT}\"") ++ set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") ++ else() ++ set(CMAKE_INSTALL_COMPONENT) ++ endif() ++endif() ++ ++# Install shared libraries without execute permission? ++if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) ++ set(CMAKE_INSTALL_SO_NO_EXE "0") ++endif() ++ ++# Is this installation the result of a crosscompile? ++if(NOT DEFINED CMAKE_CROSSCOMPILING) ++ set(CMAKE_CROSSCOMPILING "TRUE") ++endif() ++ ++# Set default install directory permissions. ++if(NOT DEFINED CMAKE_OBJDUMP) ++ set(CMAKE_OBJDUMP "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump") ++endif() ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/libcore.a b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/libcore.a +new file mode 100644 +index 0000000..5959ee3 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/core/libcore.a differ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/metadata_generation_command.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/metadata_generation_command.txt +new file mode 100644 +index 0000000..eb20c17 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/metadata_generation_command.txt +@@ -0,0 +1,22 @@ ++ -H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv ++-DCMAKE_SYSTEM_NAME=Android ++-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ++-DCMAKE_SYSTEM_VERSION=24 ++-DANDROID_PLATFORM=android-24 ++-DANDROID_ABI=arm64-v8a ++-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a ++-DANDROID_NDK=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 ++-DCMAKE_ANDROID_NDK=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 ++-DCMAKE_TOOLCHAIN_FILE=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake ++-DCMAKE_MAKE_PROGRAM=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja ++-DCMAKE_CXX_FLAGS=-O3 -frtti -fexceptions -Wall -fstack-protector-all ++-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a ++-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a ++-DCMAKE_BUILD_TYPE=Debug ++-DCMAKE_FIND_ROOT_PATH=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab ++-B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a ++-GNinja ++-DANDROID_STL=c++_shared ++-DREACT_NATIVE_MINOR_VERSION=77 ++ Build command args: [] ++ Version: 2 +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/prefab_config.json b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/prefab_config.json +new file mode 100644 +index 0000000..2d0e64d +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/prefab_config.json +@@ -0,0 +1,8 @@ ++{ ++ "enabled": true, ++ "prefabPath": "/Users/ammarahmed/.gradle/caches/modules-2/files-2.1/com.google.prefab/cli/2.1.0/aa32fec809c44fa531f01dcfb739b5b3304d3050/cli-2.1.0-all.jar", ++ "packages": [ ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab" ++ ] ++} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/symbol_folder_index.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/symbol_folder_index.txt +new file mode 100644 +index 0000000..d6b8f93 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/symbol_folder_index.txt +@@ -0,0 +1 @@ ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/hash_key.txt b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/hash_key.txt +new file mode 100644 +index 0000000..a025bb7 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/hash_key.txt +@@ -0,0 +1,29 @@ ++# Values used to calculate the hash in this folder name. ++# Should not depend on the absolute path of the project itself. ++# - AGP: 8.7.2. ++# - $NDK is the path to NDK 27.2.12479018. ++# - $PROJECT is the path to the parent folder of the root Gradle build file. ++# - $ABI is the ABI to be built with. The specific value doesn't contribute to the value of the hash. ++# - $HASH is the hash value computed from this text. ++# - $CMAKE is the path to CMake 3.22.1. ++# - $NINJA is the path to Ninja. ++-H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv ++-DCMAKE_SYSTEM_NAME=Android ++-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ++-DCMAKE_SYSTEM_VERSION=24 ++-DANDROID_PLATFORM=android-24 ++-DANDROID_ABI=$ABI ++-DCMAKE_ANDROID_ARCH_ABI=$ABI ++-DANDROID_NDK=$NDK ++-DCMAKE_ANDROID_NDK=$NDK ++-DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake ++-DCMAKE_MAKE_PROGRAM=$NINJA ++-DCMAKE_CXX_FLAGS=-O3 -frtti -fexceptions -Wall -fstack-protector-all ++-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/$HASH/obj/$ABI ++-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/$HASH/obj/$ABI ++-DCMAKE_BUILD_TYPE=Debug ++-DCMAKE_FIND_ROOT_PATH=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/$HASH/prefab/$ABI/prefab ++-B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/$HASH/$ABI ++-GNinja ++-DANDROID_STL=c++_shared ++-DREACT_NATIVE_MINOR_VERSION=77 +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake +new file mode 100644 +index 0000000..3b54b7d +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfig.cmake +@@ -0,0 +1,36 @@ ++if(NOT TARGET ReactAndroid::hermestooling) ++add_library(ReactAndroid::hermestooling SHARED IMPORTED) ++set_target_properties(ReactAndroid::hermestooling PROPERTIES ++ IMPORTED_LOCATION "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/hermestooling/libs/android.arm64-v8a/libhermestooling.so" ++ INTERFACE_INCLUDE_DIRECTORIES "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/hermestooling/include" ++ INTERFACE_LINK_LIBRARIES "" ++) ++endif() ++ ++if(NOT TARGET ReactAndroid::jsctooling) ++add_library(ReactAndroid::jsctooling SHARED IMPORTED) ++set_target_properties(ReactAndroid::jsctooling PROPERTIES ++ IMPORTED_LOCATION "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsctooling/libs/android.arm64-v8a/libjsctooling.so" ++ INTERFACE_INCLUDE_DIRECTORIES "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsctooling/include" ++ INTERFACE_LINK_LIBRARIES "" ++) ++endif() ++ ++if(NOT TARGET ReactAndroid::jsi) ++add_library(ReactAndroid::jsi SHARED IMPORTED) ++set_target_properties(ReactAndroid::jsi PROPERTIES ++ IMPORTED_LOCATION "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/libs/android.arm64-v8a/libjsi.so" ++ INTERFACE_INCLUDE_DIRECTORIES "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/include" ++ INTERFACE_LINK_LIBRARIES "" ++) ++endif() ++ ++if(NOT TARGET ReactAndroid::reactnative) ++add_library(ReactAndroid::reactnative SHARED IMPORTED) ++set_target_properties(ReactAndroid::reactnative PROPERTIES ++ IMPORTED_LOCATION "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/libs/android.arm64-v8a/libreactnative.so" ++ INTERFACE_INCLUDE_DIRECTORIES "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/include" ++ INTERFACE_LINK_LIBRARIES "" ++) ++endif() ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake +new file mode 100644 +index 0000000..ceca376 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/ReactAndroid/ReactAndroidConfigVersion.cmake +@@ -0,0 +1,9 @@ ++set(PACKAGE_VERSION 0.77.2) ++if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++else() ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif() ++endif() +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake +new file mode 100644 +index 0000000..dc3e49a +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfig.cmake +@@ -0,0 +1,9 @@ ++if(NOT TARGET fbjni::fbjni) ++add_library(fbjni::fbjni SHARED IMPORTED) ++set_target_properties(fbjni::fbjni PROPERTIES ++ IMPORTED_LOCATION "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/libs/android.arm64-v8a/libfbjni.so" ++ INTERFACE_INCLUDE_DIRECTORIES "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/include" ++ INTERFACE_LINK_LIBRARIES "" ++) ++endif() ++ +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake +new file mode 100644 +index 0000000..fdd188a +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab/lib/aarch64-linux-android/cmake/fbjni/fbjniConfigVersion.cmake +@@ -0,0 +1,9 @@ ++set(PACKAGE_VERSION 3.22.1) ++if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++else() ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif() ++endif() +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/.cxx/tools/debug/arm64-v8a/compile_commands.json b/node_modules/react-native-mmkv-storage/android/.cxx/tools/debug/arm64-v8a/compile_commands.json +new file mode 100644 +index 0000000..5a5cceb +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/.cxx/tools/debug/arm64-v8a/compile_commands.json +@@ -0,0 +1,182 @@ ++[ ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Drnmmkv_EXPORTS -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab/modules/fbjni/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/jsi/include -isystem /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab/modules/reactnative/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -o CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/rnmmkv-adapter.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/rnmmkv-adapter.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_IO.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_IO.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKV_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKV_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKVLog.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMKVLog_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputData.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputDataCrypt_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/CodedOutputData.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedOutputData.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/KeyValueHolder.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/KeyValueHolder.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/PBUtility.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/PBUtility.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MiniPBCoder.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MiniPBCoder_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MMBuffer.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MMBuffer.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/InterProcessLock_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Android.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Linux.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/MemoryFile_OSX.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/ThreadLock.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/ThreadLock_Win32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/AESCrypt.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes_core.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_cfb128.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_dgst.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_md5_one.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/crc32_armv8.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ --target=aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O3 -frtti -fexceptions -Wall -fstack-protector-all -fno-limit-debug-info -fPIC -std=c++20 -o core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/crc32/zlib/crc32.cpp" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC -o core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aesv8-armx.S" ++}, ++{ ++ "directory": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "command": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target aarch64-none-linux-android24 --sysroot=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -I/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core -x assembler-with-cpp -march=armv8-a+crypto -fno-limit-debug-info -fPIC -o core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o -c /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S", ++ "file": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/aes/openssl/openssl_aes-armv4.S" ++} ++] +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build.gradle b/node_modules/react-native-mmkv-storage/android/build.gradle +index abb696e..ba35baa 100644 +--- a/node_modules/react-native-mmkv-storage/android/build.gradle ++++ b/node_modules/react-native-mmkv-storage/android/build.gradle +@@ -98,7 +98,8 @@ android { + cmake { + cppFlags "-O3 -frtti -fexceptions -Wall -fstack-protector-all" + arguments "-DANDROID_STL=c++_shared", +- "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}" ++ "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}", ++ "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" + abiFilters (*reactNativeArchitectures()) + } + } +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/results.bin b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/results.bin +new file mode 100644 +index 0000000..7ed749e +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/results.bin +@@ -0,0 +1 @@ ++o/bundleLibRuntimeToDirDebug +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/BuildConfig.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/BuildConfig.dex +new file mode 100644 +index 0000000..1d6377e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/BuildConfig.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Constants.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Constants.dex +new file mode 100644 +index 0000000..d654c29 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Constants.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MMKV.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MMKV.dex +new file mode 100644 +index 0000000..833403e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MMKV.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MmkvStorageSpec.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MmkvStorageSpec.dex +new file mode 100644 +index 0000000..7d0b376 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/MmkvStorageSpec.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVModule.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVModule.dex +new file mode 100644 +index 0000000..d016273 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVModule.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVPackage.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVPackage.dex +new file mode 100644 +index 0000000..14a5234 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/RNMMKVPackage.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/SecureKeystore.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/SecureKeystore.dex +new file mode 100644 +index 0000000..bc085ef +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/SecureKeystore.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Storage.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Storage.dex +new file mode 100644 +index 0000000..c2d7d42 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/ammarahmed/mmkv/Storage.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/desugar_graph.bin b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/desugar_graph.bin +new file mode 100644 +index 0000000..601f245 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/eccc69f2d20028ee30be50f896fdd6e6/transformed/bundleLibRuntimeToDirDebug/desugar_graph.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/results.bin b/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/results.bin +new file mode 100644 +index 0000000..0d259dd +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/results.bin +@@ -0,0 +1 @@ ++o/classes +diff --git a/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/transformed/classes/classes_dex/classes.dex b/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/transformed/classes/classes_dex/classes.dex +new file mode 100644 +index 0000000..2622598 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/.transforms/fa8696f116f5d031eb7dc4c90a7e1a29/transformed/classes/classes_dex/classes.dex differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/generated/source/buildConfig/debug/com/ammarahmed/mmkv/BuildConfig.java b/node_modules/react-native-mmkv-storage/android/build/generated/source/buildConfig/debug/com/ammarahmed/mmkv/BuildConfig.java +new file mode 100644 +index 0000000..f855f1c +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/generated/source/buildConfig/debug/com/ammarahmed/mmkv/BuildConfig.java +@@ -0,0 +1,12 @@ ++/** ++ * Automatically generated file. DO NOT MODIFY ++ */ ++package com.ammarahmed.mmkv; ++ ++public final class BuildConfig { ++ public static final boolean DEBUG = Boolean.parseBoolean("true"); ++ public static final String LIBRARY_PACKAGE_NAME = "com.ammarahmed.mmkv"; ++ public static final String BUILD_TYPE = "debug"; ++ // Field from default config. ++ public static final boolean IS_NEW_ARCHITECTURE_ENABLED = false; ++} +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml +new file mode 100644 +index 0000000..0a3cc21 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml +@@ -0,0 +1,7 @@ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output-metadata.json b/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output-metadata.json +new file mode 100644 +index 0000000..81d7d4c +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output-metadata.json +@@ -0,0 +1,18 @@ ++{ ++ "version": 3, ++ "artifactType": { ++ "type": "AAPT_FRIENDLY_MERGED_MANIFESTS", ++ "kind": "Directory" ++ }, ++ "applicationId": "com.ammarahmed.mmkv", ++ "variantName": "debug", ++ "elements": [ ++ { ++ "type": "SINGLE", ++ "filters": [], ++ "attributes": [], ++ "outputFile": "AndroidManifest.xml" ++ } ++ ], ++ "elementType": "File" ++} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/aar_metadata/debug/writeDebugAarMetadata/aar-metadata.properties b/node_modules/react-native-mmkv-storage/android/build/intermediates/aar_metadata/debug/writeDebugAarMetadata/aar-metadata.properties +new file mode 100644 +index 0000000..1211b1e +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/aar_metadata/debug/writeDebugAarMetadata/aar-metadata.properties +@@ -0,0 +1,6 @@ ++aarFormatVersion=1.0 ++aarMetadataVersion=1.0 ++minCompileSdk=1 ++minCompileSdkExtension=0 ++minAndroidGradlePluginVersion=1.0.0 ++coreLibraryDesugaringEnabled=false +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json b/node_modules/react-native-mmkv-storage/android/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json +new file mode 100644 +index 0000000..9e26dfe +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json +@@ -0,0 +1 @@ ++{} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar b/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar +new file mode 100644 +index 0000000..2633cf6 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_r_class_jar/debug/generateDebugRFile/R.jar b/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_r_class_jar/debug/generateDebugRFile/R.jar +new file mode 100644 +index 0000000..d09ba38 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_r_class_jar/debug/generateDebugRFile/R.jar differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_symbol_list/debug/generateDebugRFile/R.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/compile_symbol_list/debug/generateDebugRFile/R.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_command_rnmmkv b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_command_rnmmkv +new file mode 100755 +index 0000000..dc858cd +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_command_rnmmkv +@@ -0,0 +1,4 @@ ++/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja \ ++ -C \ ++ /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a \ ++ rnmmkv +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_model.json b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_model.json +new file mode 100644 +index 0000000..dc3834f +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_model.json +@@ -0,0 +1,207 @@ ++{ ++ "info": { ++ "name": "arm64-v8a", ++ "bitness": 64, ++ "isDefault": true, ++ "isDeprecated": false, ++ "architecture": "arm64", ++ "triple": "aarch64-linux-android", ++ "llvmTriple": "aarch64-none-linux-android" ++ }, ++ "cxxBuildFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "soFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a", ++ "soRepublishFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cmake/debug/obj/arm64-v8a", ++ "abiPlatformVersion": 24, ++ "cmake": { ++ "effectiveConfiguration": { ++ "inheritEnvironments": [], ++ "variables": [] ++ } ++ }, ++ "variant": { ++ "buildSystemArgumentList": [ ++ "-DANDROID_STL\u003dc++_shared", ++ "-DREACT_NATIVE_MINOR_VERSION\u003d77" ++ ], ++ "cFlagsList": [], ++ "cppFlagsList": [ ++ "-O3 -frtti -fexceptions -Wall -fstack-protector-all" ++ ], ++ "variantName": "debug", ++ "isDebuggableEnabled": true, ++ "validAbiList": [ ++ "arm64-v8a" ++ ], ++ "buildTargetSet": [], ++ "implicitBuildTargetSet": [], ++ "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", ++ "module": { ++ "cxxFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx", ++ "intermediatesBaseFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates", ++ "intermediatesFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx", ++ "gradleModulePathName": ":react-native-mmkv-storage", ++ "moduleRootFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android", ++ "moduleBuildFile": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle", ++ "makeFile": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "buildSystem": "CMAKE", ++ "ndkFolder": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006", ++ "ndkFolderBeforeSymLinking": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006", ++ "ndkVersion": "27.2.12479018", ++ "ndkSupportedAbiList": [ ++ "armeabi-v7a", ++ "arm64-v8a", ++ "riscv64", ++ "x86", ++ "x86_64" ++ ], ++ "ndkDefaultAbiList": [ ++ "armeabi-v7a", ++ "arm64-v8a", ++ "x86", ++ "x86_64" ++ ], ++ "ndkDefaultStl": "LIBCXX_STATIC", ++ "ndkMetaPlatforms": { ++ "min": 21, ++ "max": 35, ++ "aliases": { ++ "20": 19, ++ "25": 24, ++ "J": 16, ++ "J-MR1": 17, ++ "J-MR2": 18, ++ "K": 19, ++ "L": 21, ++ "L-MR1": 22, ++ "M": 23, ++ "N": 24, ++ "N-MR1": 24, ++ "O": 26, ++ "O-MR1": 27, ++ "P": 28, ++ "Q": 29, ++ "R": 30, ++ "S": 31, ++ "Sv2": 32, ++ "Tiramisu": 33, ++ "UpsideDownCake": 34, ++ "VanillaIceCream": 35 ++ } ++ }, ++ "ndkMetaAbiList": [ ++ { ++ "name": "armeabi-v7a", ++ "bitness": 32, ++ "isDefault": true, ++ "isDeprecated": false, ++ "architecture": "arm", ++ "triple": "arm-linux-androideabi", ++ "llvmTriple": "armv7-none-linux-androideabi" ++ }, ++ { ++ "name": "arm64-v8a", ++ "bitness": 64, ++ "isDefault": true, ++ "isDeprecated": false, ++ "architecture": "arm64", ++ "triple": "aarch64-linux-android", ++ "llvmTriple": "aarch64-none-linux-android" ++ }, ++ { ++ "name": "riscv64", ++ "bitness": 64, ++ "isDefault": false, ++ "isDeprecated": false, ++ "architecture": "riscv64", ++ "triple": "riscv64-linux-android", ++ "llvmTriple": "riscv64-none-linux-android" ++ }, ++ { ++ "name": "x86", ++ "bitness": 32, ++ "isDefault": true, ++ "isDeprecated": false, ++ "architecture": "x86", ++ "triple": "i686-linux-android", ++ "llvmTriple": "i686-none-linux-android" ++ }, ++ { ++ "name": "x86_64", ++ "bitness": 64, ++ "isDefault": true, ++ "isDeprecated": false, ++ "architecture": "x86_64", ++ "triple": "x86_64-linux-android", ++ "llvmTriple": "x86_64-none-linux-android" ++ } ++ ], ++ "cmakeToolchainFile": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake", ++ "cmake": { ++ "cmakeExe": "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake" ++ }, ++ "stlSharedObjectMap": { ++ "LIBCXX_SHARED": { ++ "armeabi-v7a": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", ++ "arm64-v8a": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", ++ "riscv64": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/riscv64-linux-android/libc++_shared.so", ++ "x86": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", ++ "x86_64": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" ++ }, ++ "LIBCXX_STATIC": {}, ++ "NONE": {}, ++ "SYSTEM": {} ++ }, ++ "project": { ++ "rootBuildGradleFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/native/android", ++ "sdkFolder": "/Users/ammarahmed/Library/Android/sdk", ++ "isBuildOnlyTargetAbiEnabled": true, ++ "isCmakeBuildCohabitationEnabled": false, ++ "isPrefabEnabled": true ++ }, ++ "outputOptions": [], ++ "ninjaExe": "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "hasBuildTimeInformation": true ++ }, ++ "prefabClassPaths": [ ++ "/Users/ammarahmed/.gradle/caches/modules-2/files-2.1/com.google.prefab/cli/2.1.0/aa32fec809c44fa531f01dcfb739b5b3304d3050/cli-2.1.0-all.jar" ++ ], ++ "prefabPackages": [ ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab", ++ "/Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab" ++ ], ++ "prefabPackageConfigurations": [], ++ "stlType": "c++_shared", ++ "optimizationTag": "Debug" ++ }, ++ "buildSettings": { ++ "environmentVariables": [] ++ }, ++ "prefabFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a", ++ "isActiveAbi": true, ++ "fullConfigurationHash": "5w1m6j51j6b43b1576e1i5d1j3r30395r4d373zc6j6c21n5fu1z1p6q29", ++ "fullConfigurationHashKey": "# Values used to calculate the hash in this folder name.\n# Should not depend on the absolute path of the project itself.\n# - AGP: 8.7.2.\n# - $NDK is the path to NDK 27.2.12479018.\n# - $PROJECT is the path to the parent folder of the root Gradle build file.\n# - $ABI is the ABI to be built with. The specific value doesn\u0027t contribute to the value of the hash.\n# - $HASH is the hash value computed from this text.\n# - $CMAKE is the path to CMake 3.22.1.\n# - $NINJA is the path to Ninja.\n-H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d24\n-DANDROID_PLATFORM\u003dandroid-24\n-DANDROID_ABI\u003d$ABI\n-DCMAKE_ANDROID_ARCH_ABI\u003d$ABI\n-DANDROID_NDK\u003d$NDK\n-DCMAKE_ANDROID_NDK\u003d$NDK\n-DCMAKE_TOOLCHAIN_FILE\u003d$NDK/build/cmake/android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003d$NINJA\n-DCMAKE_CXX_FLAGS\u003d-O3 -frtti -fexceptions -Wall -fstack-protector-all\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/$HASH/obj/$ABI\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/$HASH/obj/$ABI\n-DCMAKE_BUILD_TYPE\u003dDebug\n-DCMAKE_FIND_ROOT_PATH\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/$HASH/prefab/$ABI/prefab\n-B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/$HASH/$ABI\n-GNinja\n-DANDROID_STL\u003dc++_shared\n-DREACT_NATIVE_MINOR_VERSION\u003d77", ++ "configurationArguments": [ ++ "-H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv", ++ "-DCMAKE_SYSTEM_NAME\u003dAndroid", ++ "-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON", ++ "-DCMAKE_SYSTEM_VERSION\u003d24", ++ "-DANDROID_PLATFORM\u003dandroid-24", ++ "-DANDROID_ABI\u003darm64-v8a", ++ "-DCMAKE_ANDROID_ARCH_ABI\u003darm64-v8a", ++ "-DANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006", ++ "-DCMAKE_ANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006", ++ "-DCMAKE_TOOLCHAIN_FILE\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake", ++ "-DCMAKE_MAKE_PROGRAM\u003d/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja", ++ "-DCMAKE_CXX_FLAGS\u003d-O3 -frtti -fexceptions -Wall -fstack-protector-all", ++ "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a", ++ "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a", ++ "-DCMAKE_BUILD_TYPE\u003dDebug", ++ "-DCMAKE_FIND_ROOT_PATH\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab", ++ "-B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a", ++ "-GNinja", ++ "-DANDROID_STL\u003dc++_shared", ++ "-DREACT_NATIVE_MINOR_VERSION\u003d77" ++ ], ++ "stlLibraryFile": "/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", ++ "intermediatesParentFolder": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51" ++} +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_stderr_rnmmkv.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_stderr_rnmmkv.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_stdout_rnmmkv.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_stdout_rnmmkv.txt +new file mode 100644 +index 0000000..62a587e +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/build_stdout_rnmmkv.txt +@@ -0,0 +1,43 @@ ++ninja: Entering directory `/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a' ++[1/38] Building CXX object core/CMakeFiles/core.dir/MMKV_OSX.cpp.o ++[2/38] Building CXX object core/CMakeFiles/core.dir/MMKV.cpp.o ++[3/38] Building CXX object core/CMakeFiles/core.dir/MMKV_Android.cpp.o ++[4/38] Building CXX object core/CMakeFiles/core.dir/MMKV_IO.cpp.o ++[5/38] Building CXX object core/CMakeFiles/core.dir/MMKVLog.cpp.o ++[6/38] Building CXX object core/CMakeFiles/core.dir/MMKVLog_Android.cpp.o ++[7/38] Building CXX object core/CMakeFiles/core.dir/CodedInputData.cpp.o ++/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/MMKV/Core/CodedInputData.cpp:132:14: warning: unused variable 'ptr' [-Wunused-variable] ++ 132 | auto ptr = m_ptr + m_position; ++ | ^~~ ++1 warning generated. ++[8/38] Building CXX object core/CMakeFiles/core.dir/CodedInputData_OSX.cpp.o ++[9/38] Building CXX object core/CMakeFiles/core.dir/CodedInputDataCrypt.cpp.o ++[10/38] Building CXX object core/CMakeFiles/core.dir/CodedInputDataCrypt_OSX.cpp.o ++[11/38] Building CXX object core/CMakeFiles/core.dir/CodedOutputData.cpp.o ++[12/38] Building CXX object core/CMakeFiles/core.dir/KeyValueHolder.cpp.o ++[13/38] Building CXX object core/CMakeFiles/core.dir/PBUtility.cpp.o ++[14/38] Building CXX object CMakeFiles/rnmmkv.dir/rnmmkv-adapter.cpp.o ++[15/38] Building CXX object core/CMakeFiles/core.dir/MMBuffer.cpp.o ++[16/38] Building CXX object core/CMakeFiles/core.dir/MiniPBCoder_OSX.cpp.o ++[17/38] Building CXX object core/CMakeFiles/core.dir/InterProcessLock_Win32.cpp.o ++[18/38] Building CXX object core/CMakeFiles/core.dir/InterProcessLock.cpp.o ++[19/38] Building CXX object core/CMakeFiles/core.dir/InterProcessLock_Android.cpp.o ++[20/38] Building CXX object core/CMakeFiles/core.dir/ThreadLock_Win32.cpp.o ++[21/38] Building CXX object core/CMakeFiles/core.dir/MemoryFile_Win32.cpp.o ++[22/38] Building CXX object core/CMakeFiles/core.dir/MemoryFile.cpp.o ++[23/38] Building CXX object core/CMakeFiles/core.dir/MiniPBCoder.cpp.o ++[24/38] Building CXX object core/CMakeFiles/core.dir/MemoryFile_Android.cpp.o ++[25/38] Building CXX object core/CMakeFiles/core.dir/MemoryFile_Linux.cpp.o ++[26/38] Building CXX object core/CMakeFiles/core.dir/MemoryFile_OSX.cpp.o ++[27/38] Building CXX object core/CMakeFiles/core.dir/ThreadLock.cpp.o ++[28/38] Building CXX object core/CMakeFiles/core.dir/aes/AESCrypt.cpp.o ++[29/38] Building CXX object core/CMakeFiles/core.dir/aes/openssl/openssl_md5_dgst.cpp.o ++[30/38] Building CXX object core/CMakeFiles/core.dir/aes/openssl/openssl_md5_one.cpp.o ++[31/38] Building CXX object core/CMakeFiles/core.dir/aes/openssl/openssl_aes_core.cpp.o ++[32/38] Building CXX object core/CMakeFiles/core.dir/aes/openssl/openssl_cfb128.cpp.o ++[33/38] Building CXX object core/CMakeFiles/core.dir/crc32/crc32_armv8.cpp.o ++[34/38] Building CXX object core/CMakeFiles/core.dir/crc32/zlib/crc32.cpp.o ++[35/38] Building ASM object core/CMakeFiles/core.dir/aes/openssl/openssl_aes-armv4.S.o ++[36/38] Building ASM object core/CMakeFiles/core.dir/aes/openssl/openssl_aesv8-armx.S.o ++[37/38] Linking CXX static library core/libcore.a ++[38/38] Linking CXX shared library /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_command b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_command +new file mode 100755 +index 0000000..4b919a6 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_command +@@ -0,0 +1,21 @@ ++/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake \ ++ -H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv \ ++ -DCMAKE_SYSTEM_NAME=Android \ ++ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ ++ -DCMAKE_SYSTEM_VERSION=24 \ ++ -DANDROID_PLATFORM=android-24 \ ++ -DANDROID_ABI=arm64-v8a \ ++ -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \ ++ -DANDROID_NDK=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \ ++ -DCMAKE_ANDROID_NDK=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \ ++ -DCMAKE_TOOLCHAIN_FILE=/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake \ ++ -DCMAKE_MAKE_PROGRAM=/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja \ ++ "-DCMAKE_CXX_FLAGS=-O3 -frtti -fexceptions -Wall -fstack-protector-all" \ ++ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \ ++ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \ ++ -DCMAKE_BUILD_TYPE=Debug \ ++ -DCMAKE_FIND_ROOT_PATH=/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab \ ++ -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a \ ++ -GNinja \ ++ -DANDROID_STL=c++_shared \ ++ -DREACT_NATIVE_MINOR_VERSION=77 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_stderr.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_stderr.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_stdout.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_stdout.txt +new file mode 100644 +index 0000000..ddfe068 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/configure_stdout.txt +@@ -0,0 +1,17 @@ ++-- The C compiler identification is Clang 18.0.3 ++-- The CXX compiler identification is Clang 18.0.3 ++-- Detecting C compiler ABI info ++-- Detecting C compiler ABI info - done ++-- Check for working C compiler: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang - skipped ++-- Detecting C compile features ++-- Detecting C compile features - done ++-- Detecting CXX compiler ABI info ++-- Detecting CXX compiler ABI info - done ++-- Check for working CXX compiler: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ - skipped ++-- Detecting CXX compile features ++-- Detecting CXX compile features - done ++-- The ASM compiler identification is Clang with GNU-like command-line ++-- Found assembler: /Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang ++-- Configuring done ++-- Generating done ++-- Build files have been written to: /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/generate_cxx_metadata_98_timing.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/generate_cxx_metadata_98_timing.txt +new file mode 100644 +index 0000000..cdcf8fd +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/generate_cxx_metadata_98_timing.txt +@@ -0,0 +1,11 @@ ++# C/C++ build system timings ++generate_cxx_metadata ++ generate-prefab-packages ++ exec-prefab 1321ms ++ generate-prefab-packages completed in 1326ms ++ execute-generate-process ++ exec-configure 650ms ++ [gap of 22ms] ++ execute-generate-process completed in 673ms ++generate_cxx_metadata completed in 2009ms ++ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/metadata_generation_record.json b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/metadata_generation_record.json +new file mode 100644 +index 0000000..a4e3747 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/metadata_generation_record.json +@@ -0,0 +1,184 @@ ++[ ++ { ++ "level_": 0, ++ "message_": "Start JSON generation. Platform version: 24 min SDK version: arm64-v8a", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "rebuilding JSON /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/android_gradle_build.json due to:", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "- no fingerprint file, will remove stale configuration folder", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home/bin/java \\\n --class-path \\\n /Users/ammarahmed/.gradle/caches/modules-2/files-2.1/com.google.prefab/cli/2.1.0/aa32fec809c44fa531f01dcfb739b5b3304d3050/cli-2.1.0-all.jar \\\n com.google.prefab.cli.AppKt \\\n --build-system \\\n cmake \\\n --platform \\\n android \\\n --abi \\\n arm64-v8a \\\n --os-version \\\n 24 \\\n --stl \\\n c++_shared \\\n --ndk-version \\\n 27 \\\n --output \\\n /var/folders/hf/kzntv9s152n0_7__6b28ybx40000gn/T/agp-prefab-staging5305947913257771723/staged-cli-output \\\n /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab \\\n /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab\n", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "Received process result: 0", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "removing stale contents from \u0027/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a\u0027", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "created folder \u0027/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a\u0027", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "executing cmake /Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake \\\n -H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv \\\n -DCMAKE_SYSTEM_NAME\u003dAndroid \\\n -DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON \\\n -DCMAKE_SYSTEM_VERSION\u003d24 \\\n -DANDROID_PLATFORM\u003dandroid-24 \\\n -DANDROID_ABI\u003darm64-v8a \\\n -DCMAKE_ANDROID_ARCH_ABI\u003darm64-v8a \\\n -DANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \\\n -DCMAKE_ANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \\\n -DCMAKE_TOOLCHAIN_FILE\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake \\\n -DCMAKE_MAKE_PROGRAM\u003d/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja \\\n \"-DCMAKE_CXX_FLAGS\u003d-O3 -frtti -fexceptions -Wall -fstack-protector-all\" \\\n -DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \\\n -DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \\\n -DCMAKE_BUILD_TYPE\u003dDebug \\\n -DCMAKE_FIND_ROOT_PATH\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab \\\n -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a \\\n -GNinja \\\n -DANDROID_STL\u003dc++_shared \\\n -DREACT_NATIVE_MINOR_VERSION\u003d77\n", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/cmake \\\n -H/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv \\\n -DCMAKE_SYSTEM_NAME\u003dAndroid \\\n -DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON \\\n -DCMAKE_SYSTEM_VERSION\u003d24 \\\n -DANDROID_PLATFORM\u003dandroid-24 \\\n -DANDROID_ABI\u003darm64-v8a \\\n -DCMAKE_ANDROID_ARCH_ABI\u003darm64-v8a \\\n -DANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \\\n -DCMAKE_ANDROID_NDK\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006 \\\n -DCMAKE_TOOLCHAIN_FILE\u003d/Users/ammarahmed/Library/Android/sdk/ndk/27.1.12297006/build/cmake/android.toolchain.cmake \\\n -DCMAKE_MAKE_PROGRAM\u003d/Users/ammarahmed/Library/Android/sdk/cmake/3.22.1/bin/ninja \\\n \"-DCMAKE_CXX_FLAGS\u003d-O3 -frtti -fexceptions -Wall -fstack-protector-all\" \\\n -DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \\\n -DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a \\\n -DCMAKE_BUILD_TYPE\u003dDebug \\\n -DCMAKE_FIND_ROOT_PATH\u003d/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/prefab/arm64-v8a/prefab \\\n -B/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a \\\n -GNinja \\\n -DANDROID_STL\u003dc++_shared \\\n -DREACT_NATIVE_MINOR_VERSION\u003d77\n", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "Received process result: 0", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "Exiting generation of /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json.bin normally", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "done executing cmake", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "hard linked /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/Debug/5w1m6j51/arm64-v8a/compile_commands.json to /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/.cxx/tools/debug/arm64-v8a/compile_commands.json", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ }, ++ { ++ "level_": 0, ++ "message_": "JSON generation completed without problems", ++ "file_": "/Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/rnmmkv/CMakeLists.txt", ++ "tag_": "debug|arm64-v8a", ++ "diagnosticCode_": 0, ++ "memoizedIsInitialized": 1, ++ "unknownFields": { ++ "fields": {} ++ }, ++ "memoizedSize": -1, ++ "memoizedHashCode": 0 ++ } ++] +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_command b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_command +new file mode 100755 +index 0000000..bd238d7 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_command +@@ -0,0 +1,20 @@ ++/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home/bin/java \ ++ --class-path \ ++ /Users/ammarahmed/.gradle/caches/modules-2/files-2.1/com.google.prefab/cli/2.1.0/aa32fec809c44fa531f01dcfb739b5b3304d3050/cli-2.1.0-all.jar \ ++ com.google.prefab.cli.AppKt \ ++ --build-system \ ++ cmake \ ++ --platform \ ++ android \ ++ --abi \ ++ arm64-v8a \ ++ --os-version \ ++ 24 \ ++ --stl \ ++ c++_shared \ ++ --ndk-version \ ++ 27 \ ++ --output \ ++ /var/folders/hf/kzntv9s152n0_7__6b28ybx40000gn/T/agp-prefab-staging5305947913257771723/staged-cli-output \ ++ /Users/ammarahmed/.gradle/caches/8.10.2/transforms/f266411dc21cf4bb3d95238b7256dd2c/transformed/react-android-0.77.2-debug/prefab \ ++ /Users/ammarahmed/.gradle/caches/8.10.2/transforms/d7d422c0963f92aa7b8a765f3bd54231/transformed/fbjni-0.7.0/prefab +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_stderr.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_stderr.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_stdout.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/logs/arm64-v8a/prefab_stdout.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libc++_shared.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libc++_shared.so +new file mode 100755 +index 0000000..0ee8307 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libc++_shared.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libfbjni.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libfbjni.so +new file mode 100644 +index 0000000..aadd325 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libfbjni.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libjsi.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libjsi.so +new file mode 100644 +index 0000000..0d856b9 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libjsi.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libreactnative.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libreactnative.so +new file mode 100644 +index 0000000..604c369 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/libreactnative.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so +new file mode 100755 +index 0000000..4c16480 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/cxx/Debug/5w1m6j51/obj/arm64-v8a/librnmmkv.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +new file mode 100644 +index 0000000..fe30b7a +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +@@ -0,0 +1 @@ ++#Wed May 21 09:48:04 PKT 2025 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml +new file mode 100644 +index 0000000..8a48ea9 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml +@@ -0,0 +1,2 @@ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +new file mode 100644 +index 0000000..cb0de62 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +@@ -0,0 +1,2 @@ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugShaders/merger.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugShaders/merger.xml +new file mode 100644 +index 0000000..b6b2fe0 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/mergeDebugShaders/merger.xml +@@ -0,0 +1,2 @@ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/packageDebugAssets/merger.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/packageDebugAssets/merger.xml +new file mode 100644 +index 0000000..2df90cd +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/incremental/packageDebugAssets/merger.xml +@@ -0,0 +1,2 @@ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/java_res/debug/processDebugJavaRes/out/META-INF/react-native-mmkv-storage_debug.kotlin_module b/node_modules/react-native-mmkv-storage/android/build/intermediates/java_res/debug/processDebugJavaRes/out/META-INF/react-native-mmkv-storage_debug.kotlin_module +new file mode 100644 +index 0000000..c998a4c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/java_res/debug/processDebugJavaRes/out/META-INF/react-native-mmkv-storage_debug.kotlin_module differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/BuildConfig.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/BuildConfig.class +new file mode 100644 +index 0000000..ae8d4c1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/BuildConfig.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Constants.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Constants.class +new file mode 100644 +index 0000000..9ea11c6 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Constants.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/MMKV.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/MMKV.class +new file mode 100644 +index 0000000..1bcce02 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/MMKV.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVModule.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVModule.class +new file mode 100644 +index 0000000..344f3b4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVModule.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVPackage.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVPackage.class +new file mode 100644 +index 0000000..eea279f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/RNMMKVPackage.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/SecureKeystore.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/SecureKeystore.class +new file mode 100644 +index 0000000..de178b4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/SecureKeystore.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Storage.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Storage.class +new file mode 100644 +index 0000000..6e082f4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ammarahmed/mmkv/Storage.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/library_jni/debug/copyDebugJniLibsProjectOnly/jni/arm64-v8a/librnmmkv.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/library_jni/debug/copyDebugJniLibsProjectOnly/jni/arm64-v8a/librnmmkv.so +new file mode 100644 +index 0000000..4c16480 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/library_jni/debug/copyDebugJniLibsProjectOnly/jni/arm64-v8a/librnmmkv.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt +new file mode 100644 +index 0000000..78ac5b8 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt +@@ -0,0 +1,2 @@ ++R_DEF: Internal format may change without notice ++local +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt +new file mode 100644 +index 0000000..ca99826 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt +@@ -0,0 +1,7 @@ ++1 ++2 ++4 ++5 ++6 ++7 +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_manifest/debug/processDebugManifest/AndroidManifest.xml b/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_manifest/debug/processDebugManifest/AndroidManifest.xml +new file mode 100644 +index 0000000..0a3cc21 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_manifest/debug/processDebugManifest/AndroidManifest.xml +@@ -0,0 +1,7 @@ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/arm64-v8a/librnmmkv.so b/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/arm64-v8a/librnmmkv.so +new file mode 100644 +index 0000000..4c16480 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/arm64-v8a/librnmmkv.so differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/navigation_json/debug/extractDeepLinksDebug/navigation.json b/node_modules/react-native-mmkv-storage/android/build/intermediates/navigation_json/debug/extractDeepLinksDebug/navigation.json +new file mode 100644 +index 0000000..0637a08 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/navigation_json/debug/extractDeepLinksDebug/navigation.json +@@ -0,0 +1 @@ ++[] +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/nested_resources_validation_report/debug/generateDebugResources/nestedResourcesValidationReport.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/nested_resources_validation_report/debug/generateDebugResources/nestedResourcesValidationReport.txt +new file mode 100644 +index 0000000..08f4ebe +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/nested_resources_validation_report/debug/generateDebugResources/nestedResourcesValidationReport.txt +@@ -0,0 +1 @@ ++0 Warning/Error +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/META-INF/react-native-mmkv-storage_debug.kotlin_module b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/META-INF/react-native-mmkv-storage_debug.kotlin_module +new file mode 100644 +index 0000000..c998a4c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/META-INF/react-native-mmkv-storage_debug.kotlin_module differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/BuildConfig.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/BuildConfig.class +new file mode 100644 +index 0000000..ae8d4c1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/BuildConfig.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Constants.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Constants.class +new file mode 100644 +index 0000000..9ea11c6 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Constants.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MMKV.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MMKV.class +new file mode 100644 +index 0000000..1bcce02 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MMKV.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MmkvStorageSpec.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MmkvStorageSpec.class +new file mode 100644 +index 0000000..da20ee8 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/MmkvStorageSpec.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVModule.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVModule.class +new file mode 100644 +index 0000000..344f3b4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVModule.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVPackage.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVPackage.class +new file mode 100644 +index 0000000..eea279f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/RNMMKVPackage.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/SecureKeystore.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/SecureKeystore.class +new file mode 100644 +index 0000000..de178b4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/SecureKeystore.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Storage.class b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Storage.class +new file mode 100644 +index 0000000..6e082f4 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/ammarahmed/mmkv/Storage.class differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar +new file mode 100644 +index 0000000..7a935e1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/intermediates/symbol_list_with_package_name/debug/generateDebugRFile/package-aware-r.txt b/node_modules/react-native-mmkv-storage/android/build/intermediates/symbol_list_with_package_name/debug/generateDebugRFile/package-aware-r.txt +new file mode 100644 +index 0000000..a1364eb +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/intermediates/symbol_list_with_package_name/debug/generateDebugRFile/package-aware-r.txt +@@ -0,0 +1 @@ ++com.ammarahmed.mmkv +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream +new file mode 100644 +index 0000000..eecc160 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len +new file mode 100644 +index 0000000..991997b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at +new file mode 100644 +index 0000000..6f6b36a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i +new file mode 100644 +index 0000000..d99197f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream +new file mode 100644 +index 0000000..847ff8c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len +new file mode 100644 +index 0000000..7f1939e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at +new file mode 100644 +index 0000000..53b2d29 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i +new file mode 100644 +index 0000000..ad8f651 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream +new file mode 100644 +index 0000000..847ff8c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len +new file mode 100644 +index 0000000..7f1939e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at +new file mode 100644 +index 0000000..29eeb24 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i +new file mode 100644 +index 0000000..ad8f651 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream +new file mode 100644 +index 0000000..9587d76 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len +new file mode 100644 +index 0000000..7f1939e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at +new file mode 100644 +index 0000000..29eeb24 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i +new file mode 100644 +index 0000000..d83ee6f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab +new file mode 100644 +index 0000000..202d72e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream +new file mode 100644 +index 0000000..4f2601b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len +new file mode 100644 +index 0000000..002e02c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len +new file mode 100644 +index 0000000..01bdaa1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at +new file mode 100644 +index 0000000..77272ec +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i +new file mode 100644 +index 0000000..f4df5d5 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream +new file mode 100644 +index 0000000..eecc160 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len +new file mode 100644 +index 0000000..991997b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at +new file mode 100644 +index 0000000..76ec258 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i +new file mode 100644 +index 0000000..d99197f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream +new file mode 100644 +index 0000000..b249289 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len +new file mode 100644 +index 0000000..508fc67 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at +new file mode 100644 +index 0000000..8e36c70 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i +new file mode 100644 +index 0000000..570de17 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream +new file mode 100644 +index 0000000..8844a3b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len +new file mode 100644 +index 0000000..8c81f1d +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at +new file mode 100644 +index 0000000..8087f3e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i +new file mode 100644 +index 0000000..ad8f651 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab +new file mode 100644 +index 0000000..166c057 +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab +@@ -0,0 +1,2 @@ ++1 ++0 +\ No newline at end of file +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab +new file mode 100644 +index 0000000..bdf584a +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream +new file mode 100644 +index 0000000..eecc160 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len +new file mode 100644 +index 0000000..991997b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at +new file mode 100644 +index 0000000..5875372 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i +new file mode 100644 +index 0000000..d99197f +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab +new file mode 100644 +index 0000000..8aad32b +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream +new file mode 100644 +index 0000000..08e7df1 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len +new file mode 100644 +index 0000000..b7da01d +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len +new file mode 100644 +index 0000000..2a17e6e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at +new file mode 100644 +index 0000000..b0764f3 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i.len +new file mode 100644 +index 0000000..1b1cb4d +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab +new file mode 100644 +index 0000000..fdfc045 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream +new file mode 100644 +index 0000000..b3d0fdc +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len +new file mode 100644 +index 0000000..a6f781d +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len +new file mode 100644 +index 0000000..817b326 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at +new file mode 100644 +index 0000000..3165992 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i +new file mode 100644 +index 0000000..4f31eaf +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len +new file mode 100644 +index 0000000..131e265 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/last-build.bin b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/last-build.bin +new file mode 100644 +index 0000000..4328b5e +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/cacheable/last-build.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +new file mode 100644 +index 0000000..24cccf6 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/local-state/build-history.bin b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/local-state/build-history.bin +new file mode 100644 +index 0000000..55c65b0 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/kotlin/compileDebugKotlin/local-state/build-history.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/outputs/logs/manifest-merger-debug-report.txt b/node_modules/react-native-mmkv-storage/android/build/outputs/logs/manifest-merger-debug-report.txt +new file mode 100644 +index 0000000..22caa0a +--- /dev/null ++++ b/node_modules/react-native-mmkv-storage/android/build/outputs/logs/manifest-merger-debug-report.txt +@@ -0,0 +1,16 @@ ++-- Merging decision tree log --- ++manifest ++ADDED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml:1:1-2:12 ++INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml:1:1-2:12 ++ package ++ INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml ++ xmlns:android ++ ADDED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml:1:11-69 ++uses-sdk ++INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml reason: use-sdk injection requested ++INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml ++INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml ++ android:targetSdkVersion ++ INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml ++ android:minSdkVersion ++ INJECTED from /Users/ammarahmed/Work/Projects/apps/notesnook/apps/mobile/node_modules/react-native-mmkv-storage/android/src/main/AndroidManifestNew.xml +diff --git a/node_modules/react-native-mmkv-storage/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/node_modules/react-native-mmkv-storage/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin +new file mode 100644 +index 0000000..614b591 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/META-INF/react-native-mmkv-storage_debug.kotlin_module b/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/META-INF/react-native-mmkv-storage_debug.kotlin_module +new file mode 100644 +index 0000000..c998a4c +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/META-INF/react-native-mmkv-storage_debug.kotlin_module differ +diff --git a/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/com/ammarahmed/mmkv/MmkvStorageSpec.class b/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/com/ammarahmed/mmkv/MmkvStorageSpec.class +new file mode 100644 +index 0000000..da20ee8 +Binary files /dev/null and b/node_modules/react-native-mmkv-storage/android/build/tmp/kotlin-classes/debug/com/ammarahmed/mmkv/MmkvStorageSpec.class differ diff --git a/apps/mobile/patches/react-native-quick-sqlite+8.2.7.patch b/apps/mobile/patches/react-native-quick-sqlite+8.2.7.patch new file mode 100644 index 000000000..790794ed6 --- /dev/null +++ b/apps/mobile/patches/react-native-quick-sqlite+8.2.7.patch @@ -0,0 +1,113323 @@ +diff --git a/node_modules/react-native-quick-sqlite/.DS_Store b/node_modules/react-native-quick-sqlite/.DS_Store +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-quick-sqlite/android/CMakeLists.txt b/node_modules/react-native-quick-sqlite/android/CMakeLists.txt +index 756979a..ff14bef 100644 +--- a/node_modules/react-native-quick-sqlite/android/CMakeLists.txt ++++ b/node_modules/react-native-quick-sqlite/android/CMakeLists.txt +@@ -5,7 +5,7 @@ set (CMAKE_VERBOSE_MAKEFILE ON) + set (CMAKE_CXX_STANDARD 17) + + add_definitions( +- ${SQLITE_FLAGS} ++ ${SQLITE_FLAGS} -DSQLITE_CORE + ) + + include_directories( +@@ -15,6 +15,8 @@ include_directories( + file(GLOB_RECURSE cpp_files RELATIVE ${CMAKE_SOURCE_DIR} + "../cpp/**.c" + "../cpp/**.cpp" ++ "../better-trigram/better-trigram.c" ++ "../sqlite3-fts5-html/fts5-html.c" + "cpp-adapter.cpp" + ) + +diff --git a/node_modules/react-native-quick-sqlite/android/build.gradle b/node_modules/react-native-quick-sqlite/android/build.gradle +index 8bbfd2d..c37d1db 100644 +--- a/node_modules/react-native-quick-sqlite/android/build.gradle ++++ b/node_modules/react-native-quick-sqlite/android/build.gradle +@@ -108,7 +108,8 @@ android { + arguments "-DANDROID_STL=c++_shared", + "-DANDROID_TOOLCHAIN=clang", + "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}", +- "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'" ++ "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'", ++ "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" + abiFilters (*reactNativeArchitectures()) + } + } +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/.DS_Store b/node_modules/react-native-quick-sqlite/better-trigram/.DS_Store +new file mode 100644 +index 0000000..e69de29 +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/release.yml b/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/release.yml +new file mode 100644 +index 0000000..e070b8f +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/release.yml +@@ -0,0 +1,252 @@ ++name: "Release" ++on: ++ release: ++ types: [published] ++permissions: ++ contents: read ++ ++jobs: ++ build-linux-x86_64-extension: ++ runs-on: ubuntu-20.04 ++ steps: ++ - uses: actions/checkout@v4 ++ - run: make loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-linux-x86_64-extension ++ path: dist/* ++ build-linux-aarch64-extension: ++ runs-on: ubuntu-20.04 ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: korandoru/setup-zig@v1 ++ with: ++ zig-version: 0.13.0 # released versions or master ++ - run: make CC="zig cc -target aarch64-linux-gnu" loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-linux-aarch64-extension ++ path: dist/* ++ build-macos-x86_64-extension: ++ runs-on: macos-12 ++ steps: ++ - uses: actions/checkout@v4 ++ - run: make loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-macos-x86_64-extension ++ path: dist/* ++ build-macos-aarch64-extension: ++ runs-on: macos-14 ++ steps: ++ - uses: actions/checkout@v4 ++ - run: make loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-macos-aarch64-extension ++ path: dist/* ++ build-windows-x86_64-extension: ++ runs-on: windows-2019 ++ permissions: ++ contents: write ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: ilammy/msvc-dev-cmd@v1 ++ - run: nmake /f Makefile.vc loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-windows-x86_64-extension ++ path: dist/* ++ build-windows-aarch64-extension: ++ runs-on: windows-2019 ++ permissions: ++ contents: write ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: ilammy/msvc-dev-cmd@v1 ++ with: ++ arch: amd64_arm64 ++ - run: nmake /f Makefile.vc loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-windows-aarch64-extension ++ path: dist/* ++ build-android-extensions: ++ runs-on: ubuntu-latest ++ strategy: ++ matrix: ++ platforms: ++ [ ++ { name: android-aarch64, cc: aarch64-linux-android21-clang }, ++ { name: android-i686, cc: i686-linux-android21-clang }, ++ { name: android-x86_64, cc: x86_64-linux-android21-clang }, ++ { name: android-armv7a, cc: armv7a-linux-androideabi21-clang }, ++ ] ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: actions/setup-java@v4 ++ with: ++ java-version: "17" ++ distribution: "temurin" ++ - uses: android-actions/setup-android@v3 ++ - run: | ++ sdkmanager --install "ndk;27.0.12077973" ++ echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/27.0.12077973" >> $GITHUB_ENV ++ - run: | ++ ls $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/ ++ ls $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin ++ - run: | ++ export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH ++ make CC=${{ matrix.platforms.cc }} \ ++ AR=llvm-ar \ ++ RANLIB=llvm-ranlib \ ++ STRIP=llvm-strip loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-${{ matrix.platforms.name }}-extension ++ path: dist/*.so ++ build-ios-extensions: ++ runs-on: ${{ matrix.platforms.runner }} ++ strategy: ++ fail-fast: false ++ matrix: ++ platforms: [ ++ { ++ name: ios-aarch64, ++ target: arm64-apple-ios, ++ sdk: iphoneos, ++ runner: macos-14, ++ }, ++ #{ ++ # name: ios-x86_64, ++ # target: x86_64-apple-ios, ++ # sdk: iphoneos, ++ # runner: macos-12, ++ #}, ++ { ++ name: iossimulator-aarch64, ++ target: arm64-apple-ios-simulator, ++ sdk: iphonesimulator, ++ runner: macos-14, ++ }, ++ { ++ name: iossimulator-x86_64, ++ target: x86_64-apple-ios-simulator, ++ sdk: iphonesimulator, ++ runner: macos-14, ++ }, ++ ] ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: maxim-lobanov/setup-xcode@v1 ++ with: ++ xcode-version: latest-stable ++ ++ - run: make CFLAGS="-target ${{ matrix.platforms.target }} -isysroot $(xcrun -sdk ${{ matrix.platforms.sdk }} --show-sdk-path) -fembed-bitcode -DNDEBUG=1" loadable ++ - uses: actions/upload-artifact@v4 ++ with: ++ name: sqlite-better-trigram-${{ matrix.platforms.name }}-extension ++ path: dist/* ++ ++ dist: ++ runs-on: ubuntu-latest ++ needs: ++ [ ++ build-linux-x86_64-extension, ++ build-linux-aarch64-extension, ++ build-macos-x86_64-extension, ++ build-macos-aarch64-extension, ++ build-windows-x86_64-extension, ++ build-windows-aarch64-extension, ++ build-android-extensions, ++ build-ios-extensions, ++ ] ++ permissions: ++ contents: write ++ steps: ++ - uses: actions/checkout@v4 ++ ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-linux-x86_64-extension ++ path: dist/linux-x86_64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-linux-aarch64-extension ++ path: dist/linux-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-macos-x86_64-extension ++ path: dist/macos-x86_64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-macos-aarch64-extension ++ path: dist/macos-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-windows-x86_64-extension ++ path: dist/windows-x86_64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-windows-aarch64-extension ++ path: dist/windows-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-android-aarch64-extension ++ path: dist/android-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-android-i686-extension ++ path: dist/android-i686 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-android-x86_64-extension ++ path: dist/android-x86_64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-android-armv7a-extension ++ path: dist/android-armv7a ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-android-armv7a-extension ++ path: dist/android-armv7a ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-ios-aarch64-extension ++ path: dist/ios-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-iossimulator-aarch64-extension ++ path: dist/iossimulator-aarch64 ++ - uses: actions/download-artifact@v4 ++ with: ++ name: sqlite-better-trigram-iossimulator-x86_64-extension ++ path: dist/iossimulator-x86_64 ++ - run: | ++ curl -L https://github.com/asg017/sqlite-dist/releases/download/v0.0.1-alpha.17/sqlite-dist-x86_64-unknown-linux-gnu.tar.xz \ ++ | tar xfJ - --strip-components 1 ++ - run: ./sqlite-dist ./sqlite-dist.toml --input dist/ --output distx/ --version $(cat VERSION) ++ - run: | ++ gh release upload --clobber ${{ github.ref_name }} \ ++ distx/amalgamation/* \ ++ distx/github_releases/* \ ++ distx/checksums.txt \ ++ distx/sqlite-dist-manifest.json \ ++ distx/install.sh ++ env: ++ GH_TOKEN: ${{ github.token }} ++ - name: Install node ++ uses: actions/setup-node@v3 ++ with: ++ node-version: "16" ++ registry-url: "https://registry.npmjs.org" ++ - run: | ++ npm publish --access public distx/npm/sqlite-better-trigram-darwin-arm64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram-darwin-x64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram-linux-x64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram-linux-arm64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram-windows-x64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram-windows-arm64.tar.gz ++ npm publish --access public distx/npm/sqlite-better-trigram.tar.gz ++ env: ++ NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/test.yml b/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/test.yml +new file mode 100644 +index 0000000..84ee7c1 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/.github/workflows/test.yml +@@ -0,0 +1,68 @@ ++name: Test ++ ++on: ++ workflow_dispatch: ++ push: ++ branch: "master" ++ pull_request: ++ types: ++ - "ready_for_review" ++ - "opened" ++ - "synchronize" ++ - "reopened" ++ ++jobs: ++ test-linux: ++ name: Test Linux ++ runs-on: ubuntu-latest ++ steps: ++ - name: Checkout ++ uses: actions/checkout@v3 ++ ++ - name: Install dependencies ++ run: | ++ sudo apt install lemon tcl ++ ++ - name: Install bun ++ uses: oven-sh/setup-bun@v2 ++ ++ - name: Run tests ++ run: make test ++ ++ test-windows: ++ name: Test Windows ++ runs-on: windows-latest ++ steps: ++ - name: Checkout ++ uses: actions/checkout@v3 ++ ++ - name: Install bun ++ uses: oven-sh/setup-bun@v2 ++ ++ - uses: ilammy/msvc-dev-cmd@v1 ++ ++ - name: Run tests ++ run: nmake /f Makefile.vc test ++ ++ test-macos: ++ name: Test macOS ++ runs-on: macos-latest ++ steps: ++ - name: Checkout ++ uses: actions/checkout@v3 ++ ++ - name: Install dependencies ++ run: | ++ brew install lemon ++ brew install tcl-tk ++ brew tap-new $USER/local-sqlite ++ brew extract --version=3.46.1 sqlite $USER/local-sqlite ++ brew install sqlite@3.46.1 ++ ++ - name: Install bun ++ uses: oven-sh/setup-bun@v2 ++ ++ - name: Run tests ++ run: | ++ export SQLITE_LIB_PATH=/opt/homebrew/Cellar/sqlite@3.46.1/3.46.1/lib/libsqlite3.dylib ++ make test +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/.gitignore b/node_modules/react-native-quick-sqlite/better-trigram/.gitignore +new file mode 100644 +index 0000000..0029ea5 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/.gitignore +@@ -0,0 +1,10 @@ ++*.so ++deps/ ++cache/ ++*.dll ++*.obj ++*.exp ++*.lib ++*.exe ++lempar.c ++dist/ +\ No newline at end of file +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/Makefile b/node_modules/react-native-quick-sqlite/better-trigram/Makefile +new file mode 100755 +index 0000000..9999050 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/Makefile +@@ -0,0 +1,57 @@ ++EXT = .so ++SQLITE_VERSION ?= version-3.46.1 ++ ++SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION} ++SQLITE_SRC = deps/$(SQLITE_VERSION)/src ++SQLITE_AMALGAMATION_URL = https://sqlite.org/2024/sqlite-amalgamation-3460100.zip ++SQLITE_AMALGAMATION_PATH = deps/sqlite-amalgamation-3460100 ++ ++override CFLAGS += -Ideps/$(SQLITE_VERSION)/ext/fts5 -I$(SQLITE_AMALGAMATION_PATH) -Os -Wall -Wextra ++CONDITIONAL_CFLAGS = -lm ++ ++UNAME_S := $(shell uname -s) ++ifeq ($(UNAME_S),Darwin) ++ EXT = .dylib ++endif ++ ++.PHONY: all clean test ++ ++prefix=dist ++$(prefix): ++ mkdir -p $(prefix) ++ ++TARGET_LOADABLE=$(prefix)/better-trigram$(EXT) ++TARGET_FTS5=$(prefix)/fts5$(EXT) ++ ++all: test loadable ++loadable: $(TARGET_LOADABLE) ++ ++clean: ++ rm -rf deps ++ rm -rf $(prefix) ++ ++$(SQLITE_SRC): ++ mkdir -p deps/$(SQLITE_VERSION) ++ curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C deps/$(SQLITE_VERSION)/ --strip-components=1 ++ ++$(SQLITE_AMALGAMATION_PATH): ++ @echo Downloading SQLite amalgamation... ++ wget -q $(SQLITE_AMALGAMATION_URL) -O sqlite.zip ++ @echo Extracting SQLite amalgamation... ++ unzip sqlite.zip -d deps/ ++ rm -f sqlite.zip ++ ++$(TARGET_LOADABLE): $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix) ++ $(CC) $(CFLAGS) $(CONDITIONAL_CFLAGS) -shared -fPIC -o $@ better-trigram.c ++ ++$(TARGET_FTS5): $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix) ++ dir=deps/$(SQLITE_VERSION) \ ++ cwd=$$(pwd); \ ++ lemon $$dir/ext/fts5/fts5parse.y; \ ++ cd $$dir/ext/fts5; \ ++ tclsh $$cwd/$$dir/ext/fts5/tool/mkfts5c.tcl; \ ++ cd $$cwd; \ ++ $(CC) $(CFLAGS) $(CONDITIONAL_CFLAGS) -DSQLITE_TEST -shared -fPIC -o $@ $$dir/ext/fts5/fts5.c; \ ++ ++test: $(TARGET_FTS5) $(TARGET_LOADABLE) ++ bun test +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/Makefile.vc b/node_modules/react-native-quick-sqlite/better-trigram/Makefile.vc +new file mode 100755 +index 0000000..7e54140 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/Makefile.vc +@@ -0,0 +1,62 @@ ++EXT = .dll ++SQLITE_VERSION = version-3.46.1 ++ ++SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=$(SQLITE_VERSION) ++SQLITE_SRC = deps\$(SQLITE_VERSION)\src ++SQLITE_AMALGAMATION_URL = https://sqlite.org/2024/sqlite-amalgamation-3460100.zip ++SQLITE_AMALGAMATION_PATH = deps/sqlite-amalgamation-3460100 ++ ++TCL_DOWNLOAD_URL = https://www.irontcl.com/downloads/irontcl-amd64-8.6.7.zip ++TCLSH_PATH = deps\IronTcl\bin\tclsh86t.exe ++ ++CFLAGS = -I$(SQLITE_AMALGAMATION_PATH) -Ideps\$(SQLITE_VERSION)\src -Ideps\$(SQLITE_VERSION)\ext\fts5 -Os -Wall ++ ++prefix=dist ++$(prefix): ++ if not exist $(prefix) mkdir $(prefix) ++ ++TARGET_LOADABLE=$(prefix)\better-trigram$(EXT) ++TARGET_FTS5=$(prefix)\fts5$(EXT) ++TARGET_LEMON=$(prefix)\lemon.exe ++ ++all: test loadable ++loadable: $(TARGET_LOADABLE) ++ ++clean: ++ if exist deps rmdir /S /Q deps ++ if exist $(prefix) rmdir /S /Q $(prefix) ++ if exist *.obj del *.obj ++ ++$(SQLITE_SRC): ++ if not exist deps\$(SQLITE_VERSION) git clone --depth=1 --branch=$(SQLITE_VERSION) https://github.com/sqlite/sqlite.git deps\$(SQLITE_VERSION) ++ REM curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C deps\$(SQLITE_VERSION)\ --strip-components=1 ++ ++$(SQLITE_AMALGAMATION_PATH): ++ @echo Downloading SQLite amalgamation... ++ powershell -Command "iwr -Uri $(SQLITE_AMALGAMATION_URL) -OutFile sqlite.zip" ++ @echo Extracting SQLite amalgamation... ++ powershell -Command "Expand-Archive -Path sqlite.zip -DestinationPath deps/" ++ del sqlite.zip ++ ++$(TCLSH_PATH): ++ @echo Downloading Tcl/Tk... ++ powershell -Command "iwr -Uri $(TCL_DOWNLOAD_URL) -OutFile tcl.zip" ++ @echo Extracting Tcl/Tk... ++ powershell -Command "Expand-Archive -Path tcl.zip -DestinationPath deps/" ++ del tcl.zip ++ ++$(TARGET_LOADABLE): $(SQLITE_AMALGAMATION_PATH) $(SQLITE_SRC) $(prefix) ++ cl $(CFLAGS) /LD /Fe$@ better-trigram.c ++ ++$(TARGET_LEMON): $(SQLITE_SRC) $(prefix) ++ cl deps\$(SQLITE_VERSION)\tool\lemon.c /Fe$@ ++ copy deps\$(SQLITE_VERSION)\tool\lempar.c $(prefix)\lempar.c ++ ++$(TARGET_FTS5): $(TARGET_LEMON) $(TCLSH_PATH) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix) ++ $(TARGET_LEMON) deps\$(SQLITE_VERSION)\ext\fts5\fts5parse.y ++ ++ powershell -Command "$$CWD = pwd; cd deps\$(SQLITE_VERSION)\ext\fts5; & $$CWD\$(TCLSH_PATH) $$CWD\deps\$(SQLITE_VERSION)\ext\fts5\tool\mkfts5c.tcl" ++ cl /DSQLITE_TEST -I$(SQLITE_AMALGAMATION_PATH) /LD /Fe$(TARGET_FTS5) deps\$(SQLITE_VERSION)\ext\fts5\fts5.c ++ ++test: $(TARGET_FTS5) $(TARGET_LOADABLE) ++ bun test +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/README.md b/node_modules/react-native-quick-sqlite/better-trigram/README.md +new file mode 100755 +index 0000000..e32c316 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/README.md +@@ -0,0 +1,80 @@ ++

better-trigram

++ ++

A (better) trigram tokenizer for SQLite3 FTS5

++ ++While SQLite3 already has a built-in trigram tokenizer, it does not have any kind of word segmentation support. For example, `i am a bird` gets tokenized as `['i a', ' am', 'm a', ' a ', ' bi', 'bir', 'ird']` which isn't too bad but in real-world use cases users usually type queries as `SELECT * FROM fts_table WHERE title MATCH 'a bird'` which returns no results. ++ ++This tokenizer fixes this by treating spaces as a word boundary. The result is that `i am a bird` gets tokenized as `['i', 'am', 'a', 'bir', 'ird']` and `SELECT * FROM fts_table WHERE title MATCH 'a bird'` correctly returns the expected results. You get all the benefits for substring matching just with a wider range of queries. ++ ++Furthermore, the built-in `trigram` tokenizer treats CJK as normal characters and creates trigrams out of them. The problem is, in CJK a single Unicode character can be a whole word. `better-trigram` fixes this by treating each CJK character as its own token. For example: `李红：那是钢笔` gets tokenized as `['李','红','：','那','是','钢','笔']` and if there are any non-CJK words mixed in the input, they also get properly tokenized automatically. ++ ++## Compatibility with `trigram` ++ ++`better-trigram` is 99% compatible with `trigram`. This means it has full UTF-8 support, handles all the same edge cases etc. To ensure `better-trigram` remains compatible, it passes all the `trigram` tokenizer tests. Yay! ++ ++With that being said, `better-trigram` doesn't support `LIKE` & `GLOB` patterns. This is a limitation in FTS5 because it doesn't allow custom tokenizers to opt-in to this behavior. (You _could_ technically compile a custom version of FTS5 that enables support for this but I haven't looked into it.) Using `LIKE` & `GLOB` will fallback to full table scans (not recommended). ++ ++## Usage ++ ++You can use this tokenizer like any other custom tokenizer: ++ ++```sh ++make ++``` ++ ++Load the `better-trigram.so` file as a loadable SQLite extension (e.g. `.load better-trigram.so`). ++ ++Then specify it when creating your FTS5 virtual table: ++ ++```sql ++CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize='better_trigram') ++``` ++ ++### Options ++ ++`better-trigram` supports exactly the same options as `trigram` and copies the exact behavior of the original tokenizer when specifying invalid options. This means setting `case_sensitive 1` and `remove_diacritics 1` will throw an error. ++ ++Refer to [FTS5 documentation for the Trigram tokenizer](https://sqlite.org/fts5.html#the_trigram_tokenizer) for more details on what each options does and how you can use it. ++ ++## Performance ++ ++`better-trigram` is significantly faster than `trigram`. Here are the benchmarks: ++ ++``` ++Text length: 289091 ++clk: ~4.09 GHz ++cpu: AMD Ryzen 5 PRO 5650U with Radeon Graphics ++runtime: bun 1.1.31 (x64-linux) ++ ++benchmark avg (min … max) p75 p99 (min … top 1%) ++-------------------------------------- ------------------------------- ++better-trigram 6.37 ms/iter 6.86 ms 7.31 ms ▂▅▃▂▂▃▄▇█▄▂ ++trigram 10.21 ms/iter 11.23 ms 12.75 ms █▄▄▄▃▅▅▇▄▂▂ ++ ++summary ++ better-trigram ++ 1.6x faster than trigram ++``` ++ ++To reproduce on your own machine, run `bun bench.ts`. ++ ++## Contributing ++ ++All kinds of PRs are welcome, of course. Just make sure all the tests pass. You can run the tests like this: ++ ++```sh ++make test ++``` ++ ++## License ++ ++``` ++2024-10-21 ++ ++The author disclaims copyright to this source code. In place of ++a legal notice, here is a blessing: ++ ++ May you do good and not evil. ++ May you find forgiveness for yourself and forgive others. ++ May you share freely, never taking more than you give. ++``` +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/VERSION b/node_modules/react-native-quick-sqlite/better-trigram/VERSION +new file mode 100755 +index 0000000..6812f81 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/VERSION +@@ -0,0 +1 @@ ++0.0.3 +\ No newline at end of file +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/bench.ts b/node_modules/react-native-quick-sqlite/better-trigram/bench.ts +new file mode 100755 +index 0000000..bd9fe70 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/bench.ts +@@ -0,0 +1,44 @@ ++import { run, bench, compact, summary } from "mitata"; ++import { Database } from "bun:sqlite"; ++import { LoremIpsum } from "lorem-ipsum"; ++ ++const lorem = new LoremIpsum({ ++ sentencesPerParagraph: { ++ max: 15, ++ min: 10, ++ }, ++ wordsPerSentence: { ++ max: 50, ++ min: 20, ++ }, ++}); ++ ++const text = lorem.generateParagraphs(100); ++function initDatabase() { ++ const db = new Database(":memory:"); ++ db.loadExtension("./dist/better-trigram.so"); ++ return db; ++} ++const db = initDatabase(); ++db.query( ++ `CREATE VIRTUAL TABLE bt1 USING fts5(y, tokenize='better_trigram');` ++).run(); ++db.query(`CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize='trigram');`).run(); ++const btQuery = db.query(`INSERT INTO bt1 VALUES( ? );`); ++const tQuery = db.query(`INSERT INTO t1 VALUES( ? );`); ++ ++console.log("Text length:", text.length); ++ ++compact(() => { ++ summary(() => { ++ bench("better-trigram", () => { ++ btQuery.run(text); ++ }); ++ ++ bench("trigram", () => { ++ tQuery.run(text); ++ }); ++ }); ++}); ++ ++await run(); +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.c b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.c +new file mode 100755 +index 0000000..010fce1 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.c +@@ -0,0 +1,151 @@ ++/* ++** 2024-10-21 ++** ++** The author disclaims copyright to this source code. In place of ++** a legal notice, here is a blessing: ++** ++** May you do good and not evil. ++** May you find forgiveness for yourself and forgive others. ++** May you share freely, never taking more than you give. ++** ++*/ ++ ++#include "better-trigram.h" ++#include "tokenizer.c" ++#include ++#include ++ ++#ifndef SQLITE_CORE ++#include "sqlite3ext.h" ++SQLITE_EXTENSION_INIT1 ++#else ++#include "sqlite3.h" ++#endif ++ ++#define UNUSED_PARAM(x) (void)(x) ++ ++#ifndef SQLITE_PRIVATE ++#define SQLITE_PRIVATE static ++#endif ++ ++static fts5_api *fts5_api_from_db(sqlite3 *db) { ++ fts5_api *pRet = 0; ++ sqlite3_stmt *pStmt = 0; ++ ++ int version = sqlite3_libversion_number(); ++ if (version >= 3020000) { // current api ++ if (SQLITE_OK == sqlite3_prepare(db, "SELECT fts5(?1)", -1, &pStmt, 0)) { ++ sqlite3_bind_pointer(pStmt, 1, (void *)&pRet, "fts5_api_ptr", NULL); ++ sqlite3_step(pStmt); ++ } ++ sqlite3_finalize(pStmt); ++ } else { // before 3.20 ++ int rc = sqlite3_prepare(db, "SELECT fts5()", -1, &pStmt, 0); ++ if (rc == SQLITE_OK) { ++ if (SQLITE_ROW == sqlite3_step(pStmt) && ++ sizeof(fts5_api *) == sqlite3_column_bytes(pStmt, 0)) { ++ memcpy(&pRet, sqlite3_column_blob(pStmt, 0), sizeof(fts5_api *)); ++ } ++ sqlite3_finalize(pStmt); ++ } ++ } ++ return pRet; ++} ++ ++/* Tokenizer structure */ ++typedef struct { ++ int bFold; /* Fold case if 1 */ ++ int iFoldParam; /* Diacritic removal parameter */ ++} BetterTrigramTokenizer; ++ ++/* Free the tokenizer */ ++static void fts5BetterTrigramDelete(Fts5Tokenizer *p) { sqlite3_free(p); } ++ ++/* Create the tokenizer */ ++static int fts5BetterTrigramCreate(void *pUnused, const char **azArg, int nArg, ++ Fts5Tokenizer **ppOut) { ++ BetterTrigramTokenizer *p = ++ (BetterTrigramTokenizer *)sqlite3_malloc(sizeof(BetterTrigramTokenizer)); ++ UNUSED_PARAM(pUnused); ++ if (!p) ++ return SQLITE_NOMEM; ++ ++ int rc = SQLITE_OK; ++ p->bFold = 1; /* Default case folding enabled */ ++ p->iFoldParam = 0; /* Default diacritic removal disabled */ ++ ++ /* Parse options */ ++ for (int i = 0; rc == SQLITE_OK && i < nArg; i += 2) { ++ const char *zArg = azArg[i + 1]; ++ if (0 == sqlite3_stricmp(azArg[i], "case_sensitive")) { ++ if ((zArg[0] != '0' && zArg[0] != '1') || zArg[1]) { ++ rc = SQLITE_ERROR; ++ } else { ++ p->bFold = (zArg[0] == '0'); ++ } ++ } else if (0 == sqlite3_stricmp(azArg[i], "remove_diacritics")) { ++ if ((zArg[0] != '0' && zArg[0] != '1' && zArg[0] != '2') || zArg[1]) { ++ rc = SQLITE_ERROR; ++ } else { ++ p->iFoldParam = (zArg[0] != '0') ? 2 : 0; ++ } ++ } else { ++ rc = SQLITE_ERROR; ++ } ++ ++ if (p->iFoldParam != 0 && p->bFold == 0) { ++ rc = SQLITE_ERROR; ++ } ++ ++ if (rc != SQLITE_OK) { ++ fts5BetterTrigramDelete((Fts5Tokenizer *)p); ++ p = 0; ++ } ++ } ++ ++ *ppOut = (Fts5Tokenizer *)p; ++ return rc; ++} ++ ++static int fts5BetterTrigramTokenize(Fts5Tokenizer *pTokenizer, void *pCtx, ++ int flags, const char *pText, int nText, ++ int (*xToken)(void *, int, const char *, ++ int, int, int)) { ++ UNUSED_PARAM(flags); ++ BetterTrigramTokenizer *p = (BetterTrigramTokenizer *)pTokenizer; ++ tokenize(pText, nText, p->bFold, p->iFoldParam, pCtx, xToken); ++ return SQLITE_OK; ++} ++ ++static int fts5BetterTrigramInit(sqlite3 *db) { ++ fts5_api *ftsApi; ++ ++ fts5_tokenizer tokenizer = {fts5BetterTrigramCreate, fts5BetterTrigramDelete, ++ fts5BetterTrigramTokenize}; ++ ++ ftsApi = fts5_api_from_db(db); ++ ++ if (ftsApi) { ++ ftsApi->xCreateTokenizer(ftsApi, "better_trigram", (void *)ftsApi, ++ &tokenizer, NULL); ++ return SQLITE_OK; ++ } else { ++ // *error = sqlite3_mprintf("Can't find fts5 extension"); ++ return SQLITE_ERROR; ++ } ++} ++ ++#ifdef SQLITE_CORE ++SQLITE_PRIVATE int sqlite3Fts5BetterTrigramInit(sqlite3 *db) { ++ return fts5BetterTrigramInit(db); ++} ++#else ++SQLITE_BETTER_TRIGRAM_API int ++sqlite3_bettertrigram_init(sqlite3 *db, char **error, ++ const sqlite3_api_routines *api) { ++ SQLITE_EXTENSION_INIT2(api); ++ UNUSED_PARAM(error); ++ ++ return fts5BetterTrigramInit(db); ++} ++#endif +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.h b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.h +new file mode 100755 +index 0000000..ed2be79 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.h +@@ -0,0 +1,41 @@ ++#ifndef SQLITE_BETTER_TRIGRAM_H ++#define SQLITE_BETTER_TRIGRAM_H ++ ++#ifndef SQLITE_CORE ++#include "sqlite3ext.h" ++#else ++#include "sqlite3.h" ++#endif ++ ++#ifndef SQLITE_PRIVATE ++#define SQLITE_PRIVATE static ++#endif ++ ++#ifdef SQLITE_BETTER_TRIGRAM_STATIC ++#define SQLITE_BETTER_TRIGRAM_API ++#else ++#ifdef _WIN32 ++#define SQLITE_BETTER_TRIGRAM_API __declspec(dllexport) ++#else ++#define SQLITE_BETTER_TRIGRAM_API ++#endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#ifdef SQLITE_CORE ++SQLITE_PRIVATE int sqlite3Fts5BetterTrigramInit(sqlite3 *db); ++#else ++SQLITE_BETTER_TRIGRAM_API int ++sqlite3_bettertrigram_init(sqlite3 *db, char **pzErrMsg, ++ const sqlite3_api_routines *pApi); ++ ++#endif ++ ++#ifdef __cplusplus ++} /* end of the 'extern "C"' block */ ++#endif ++ ++#endif /* ifndef SQLITE_BETTER_TRIGRAM_H */ +\ No newline at end of file +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.test.ts b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.test.ts +new file mode 100755 +index 0000000..190a003 +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/better-trigram.test.ts +@@ -0,0 +1,860 @@ ++/* ++ ** 2024-10-21 ++ ** ++ ** The author disclaims copyright to this source code. In place of ++ ** a legal notice, here is a blessing: ++ ** ++ ** May you do good and not evil. ++ ** May you find forgiveness for yourself and forgive others. ++ ** May you share freely, never taking more than you give. ++ ** ++ */ ++// to run: bun test ++ ++import { Database } from "bun:sqlite"; ++import { test, describe, expect, afterAll, beforeAll } from "bun:test"; ++ ++const EXT = ++ process.platform === "win32" ++ ? ".dll" ++ : process.platform === "darwin" ++ ? ".dylib" ++ : ".so"; ++ ++if (process.platform === "darwin" && process.env.SQLITE_LIB_PATH) ++ Database.setCustomSQLite(process.env.SQLITE_LIB_PATH); ++ ++function initDatabase() { ++ const db = new Database(":memory:"); ++ db.loadExtension(`./dist/fts5${EXT}`); ++ db.loadExtension(`./dist/better-trigram${EXT}`); ++ return db; ++} ++ ++describe("remove_diacritics", () => { ++ describe("v1", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("1.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize='better_trigram remove_diacritics 1');`, ++ `INSERT INTO t1 VALUES('abc\u0303defghijklm');`, ++ `INSERT INTO t1 VALUES('a\u0303b\u0303c\u0303defghijklm');`, ++ ].forEach((stmt) => db.query(stmt).run()); ++ }); ++ ++ sqlTest( ++ db, ++ `1.1`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('abc');`, ++ [], ++ ["(abc\u0303)defghijklm", "(a\u0303b\u0303c\u0303)defghijklm"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.2`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('bcde');`, ++ [], ++ ["a(bc\u0303de)fghijklm", "a\u0303(b\u0303c\u0303de)fghijklm"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.3`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('cdef');`, ++ [], ++ ["ab(c\u0303def)ghijklm", "a\u0303b\u0303(c\u0303def)ghijklm"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.4`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('def');`, ++ [], ++ ["abc\u0303(def)ghijklm", "a\u0303b\u0303c\u0303(def)ghijklm"] ++ ); ++ }); ++ ++ describe("v2", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("2.0", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t2 USING fts5( ++ z, tokenize='better_trigram case_sensitive 1 remove_diacritics 1' ++);` ++ ) ++ .run() ++ ).toThrowError(/error in tokenizer constructor/g); ++ }); ++ ++ test("2.1", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t2 USING fts5( ++ z, tokenize='better_trigram case_sensitive 0 remove_diacritics 1' ++);` ++ ) ++ .run() ++ ).not.toThrowError(); ++ }); ++ ++ test("2.2", () => { ++ [ ++ `INSERT INTO t2 VALUES('\u00E3bcdef');`, ++ `INSERT INTO t2 VALUES('b\u00E3cdef');`, ++ `INSERT INTO t2 VALUES('bc\u00E3def');`, ++ `INSERT INTO t2 VALUES('bcd\u00E3ef');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ "2.3", ++ `SELECT highlight(t2, 0, '(', ')') as res FROM t2('abc');`, ++ [], ++ "(\u00E3bc)def" ++ ); ++ ++ sqlTest( ++ db, ++ "2.4", ++ `SELECT highlight(t2, 0, '(', ')') as res FROM t2('bac');`, ++ [], ++ "(b\u00E3c)def" ++ ); ++ ++ sqlTest( ++ db, ++ "2.5", ++ `SELECT highlight(t2, 0, '(', ')') as res FROM t2('bca');`, ++ [], ++ "(bc\u00E3)def" ++ ); ++ ++ sqlTest( ++ db, ++ "2.6", ++ `SELECT highlight(t2, 0, '(', ')') as res FROM t2('\u00E3bc');`, ++ [], ++ "(\u00E3bc)def" ++ ); ++ }); ++ ++ describe("v3", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("3.0", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t3 USING fts5( ++ z, tokenize='better_trigram remove_diacritics 1' ++);` ++ ) ++ .run() ++ ).not.toThrowError(); ++ }); ++ ++ test("3.1", () => { ++ expect( ++ db.prepare(`INSERT INTO t3 VALUES ('\u0303abc\u0303');`).run().changes ++ ).toBeGreaterThan(0); ++ }); ++ ++ sqlTest( ++ db, ++ "3.2", ++ `SELECT highlight(t3, 0, '(', ')') as res FROM t3('abc');`, ++ [], ++ "\u0303(abc\u0303)" ++ ); ++ }); ++ ++ describe("v4", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("4.0", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t4 USING fts5(z, tokenize=better_trigram);` ++ ) ++ .run() ++ ).not.toThrowError(); ++ }); ++ ++ test("4.1", () => { ++ [ ++ `INSERT INTO t4 VALUES('ABCD');`, ++ `INSERT INTO t4 VALUES('DEFG');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ explainQueryPlanTest( ++ db, ++ "4.2", ++ `SELECT rowid FROM t4 WHERE z LIKE '%abc%'`, ++ [], ++ "SCAN t4 VIRTUAL TABLE INDEX 0:" ++ // TODO: "VIRTUAL TABLE INDEX 0:L0" ++ ); ++ ++ sqlTest( ++ db, ++ "4.3", ++ `SELECT rowid as res FROM t4 WHERE z LIKE '%abc%'`, ++ [], ++ 1 ++ ); ++ }); ++ ++ describe("v5", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("5.0", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t5 USING fts5( ++ c1, tokenize='better_trigram', detail='none' ++ );` ++ ) ++ .run() ++ ).not.toThrowError(); ++ ++ [ ++ `INSERT INTO t5(rowid, c1) VALUES(1, 'abc_____xyx_yxz');`, ++ `INSERT INTO t5(rowid, c1) VALUES(2, 'abc_____xyxz');`, ++ `INSERT INTO t5(rowid, c1) VALUES(3, 'ac_____xyxz');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ "5.1", ++ `SELECT rowid as res FROM t5 WHERE c1 LIKE 'abc%xyxz'`, ++ [], ++ 2 ++ ); ++ }); ++}); ++ ++describe("case_sensitive", () => { ++ describe("v1", () => { ++ const db = initDatabase(); ++ ++ test("1.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize = 'better_trigram');`, ++ `INSERT INTO t1 VALUES('abcdefghijklm')`, ++ `INSERT INTO t1 VALUES('กรุงเทพมหานคร');`, ++ ].forEach((stmt) => db.query(stmt).run()); ++ }); ++ ++ [ ++ ["abc", "(abc)defghijklm"], ++ ["defgh", "abc(defgh)ijklm"], ++ ["abcdefghijklm", "(abcdefghijklm)"], ++ ["กรุ", "(กรุ)งเทพมหานคร"], ++ ["งเทพมห", "กรุ(งเทพมห)านคร"], ++ ["กรุงเทพมหานคร", "(กรุงเทพมหานคร)"], ++ ["Abc", "(abc)defghijklm"], ++ ["deFgh", "abc(defgh)ijklm"], ++ ["aBcdefGhijKlm", "(abcdefghijklm)"], ++ ].forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `1.1.${index + 1}`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1(?)`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ `1.2.0`, ++ `SELECT fts5_expr('ABCD', 'tokenize=better_trigram') as res`, ++ [], ++ `"abc" + "bcd"` ++ ); ++ ++ ( ++ [ ++ ["%cDef%", 1], ++ ["cDef%", undefined], ++ ["%f%", 1], ++ ["%f_h%", 1], ++ ["%f_g%", undefined], ++ ["abc%klm", 1], ++ ["ABCDEFG%", 1], ++ ["%รุงเ%", 2], ++ ["%งเ%", 2], ++ ] as const ++ ).forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `1.3.${index + 1}`, ++ `SELECT rowid as res FROM t1 WHERE y LIKE ?`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ }); ++ ++ describe("v2", () => { ++ const db = initDatabase(); ++ ++ test("2.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize = 'better_trigram case_sensitive 1');`, ++ `INSERT INTO t1 VALUES('abcdefghijklm')`, ++ `INSERT INTO t1 VALUES('กรุงเทพมหานคร');`, ++ ].forEach((stmt) => db.query(stmt).run()); ++ }); ++ ++ ( ++ [ ++ ["abc", "(abc)defghijklm"], ++ ["defgh", "abc(defgh)ijklm"], ++ ["abcdefghijklm", "(abcdefghijklm)"], ++ ["กรุ", "(กรุ)งเทพมหานคร"], ++ ["งเทพมห", "กรุ(งเทพมห)านคร"], ++ ["กรุงเทพมหานคร", "(กรุงเทพมหานคร)"], ++ ["Abc", undefined], ++ ["deFgh", undefined], ++ ["aBcdefGhijKlm", undefined], ++ ] as const ++ ).forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `2.1.${index + 1}`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1(?)`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ ++ ( ++ [ ++ ["%cDef%", 1], ++ ["cDef%", undefined], ++ ["%f%", 1], ++ ["%f_h%", 1], ++ ["%f_g%", undefined], ++ ["abc%klm", 1], ++ ["ABCDEFG%", 1], ++ ["%รุงเ%", 2], ++ ] as const ++ ).forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `2.2.${index + 1}`, ++ `SELECT rowid as res FROM t1 WHERE y LIKE ?`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ ++ ( ++ [ ++ ["*cdef*", 1], ++ ["cdef*", undefined], ++ ["*f*", 1], ++ ["*f?h*", 1], ++ ["*f?g*", undefined], ++ ["abc*klm", 1], ++ ["abcdefg*", 1], ++ ["*รุงเ*", 2], ++ ["abc[d]efg*", 1], ++ ["abc[]d]efg*", 1], ++ ["abc[^]d]efg*", undefined], ++ ["abc[^]XYZ]efg*", 1], ++ ] as const ++ ).forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `2.3.${index + 1}`, ++ `SELECT rowid as res FROM t1 WHERE y GLOB ?`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ "2.3.null.1", ++ `SELECT rowid FROM t1 WHERE y LIKE NULL`, ++ [], ++ undefined ++ ); ++ }); ++ ++ describe("v3", () => { ++ const db = initDatabase(); ++ ++ test("3.0", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="better_trigram case_sensitive 2")` ++ ) ++ .run() ++ ).toThrow(/error in tokenizer constructor/g); ++ }); ++ ++ test("3.1", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="better_trigram case_sensitive 11")` ++ ) ++ .run() ++ ).toThrow(/error in tokenizer constructor/g); ++ }); ++ ++ test("3.2", () => { ++ expect(() => ++ db ++ .query( ++ `CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="better_trigram case_sensitive 1")` ++ ) ++ .run() ++ ).not.toThrow(); ++ }); ++ }); ++ ++ describe("v4", () => { ++ const db = initDatabase(); ++ ++ test("4.0", () => { ++ expect( ++ db ++ .query( ++ `CREATE VIRTUAL TABLE t0 USING fts5(b, tokenize = "better_trigram");` ++ ) ++ .run().changes ++ ).toBeGreaterThan(0); ++ }); ++ ++ test("4.1", () => { ++ expect( ++ db.query(`INSERT INTO t0 VALUES (x'000b01');`).run().changes ++ ).toBeGreaterThan(0); ++ }); ++ ++ test("4.2", () => { ++ expect( ++ db.query(`INSERT INTO t0(t0) VALUES('integrity-check');`).run().changes ++ ).toBeGreaterThan(0); ++ }); ++ }); ++ ++ describe("v5", () => { ++ for (const detailMode of ["full", "col", "none"]) { ++ for (const flag of [0, 1]) { ++ const db = initDatabase(); ++ ++ test(`5.cs=${flag}.0.1 (${detailMode})`, () => { ++ expect( ++ db ++ .prepare( ++ `CREATE VIRTUAL TABLE t1 USING fts5( ++ y, tokenize="better_trigram case_sensitive ${flag}", detail=${detailMode} ++ );` ++ ) ++ .run().changes ++ ).toBeGreaterThan(0); ++ }); ++ ++ test(`5.cs=${flag}.0.2 (${detailMode})`, () => { ++ [ ++ `INSERT INTO t1 VALUES('abcdefghijklm');`, ++ `INSERT INTO t1 VALUES('กรุงเทพมหานคร');`, ++ ].forEach((stmt) => { ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0); ++ }); ++ }); ++ ++ ( ++ [ ++ ["%cDef%", 1], ++ ["cDef%", undefined], ++ ["%f%", 1], ++ ["%f_h%", 1], ++ ["%f_g%", undefined], ++ ["abc%klm", 1], ++ ["ABCDEFG%", 1], ++ ["%รุงเ%", 2], ++ ] as const ++ ).forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `5.cs=${flag}.1.${index + 1} (${detailMode})`, ++ `SELECT rowid as res FROM t1 WHERE y LIKE ?`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ } ++ } ++ }); ++ ++ describe("v6", () => { ++ const db = initDatabase(); ++ ++ test("6.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE ci0 USING fts5(x, tokenize="better_trigram");`, ++ `CREATE VIRTUAL TABLE ci1 USING fts5(x, tokenize="better_trigram case_sensitive 1");`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ explainQueryPlanTest( ++ db, ++ "6.1", ++ `SELECT * FROM ci0 WHERE x LIKE '??'`, ++ [], ++ "SCAN ci0 VIRTUAL TABLE INDEX 0:" ++ // TODO: "VIRTUAL TABLE INDEX 0:L0" ++ ); ++ ++ explainQueryPlanTest( ++ db, ++ "6.2", ++ `SELECT * FROM ci0 WHERE x GLOB '??'`, ++ [], ++ "SCAN ci0 VIRTUAL TABLE INDEX 0:" ++ // TODO: "VIRTUAL TABLE INDEX 0:G0" ++ ); ++ ++ explainQueryPlanTest( ++ db, ++ "6.3", ++ `SELECT * FROM ci1 WHERE x LIKE '??'`, ++ [], ++ "SCAN ci1 VIRTUAL TABLE INDEX 0:" ++ ); ++ ++ explainQueryPlanTest( ++ db, ++ "6.4", ++ `SELECT * FROM ci1 WHERE x GLOB '??'`, ++ [], ++ "SCAN ci1 VIRTUAL TABLE INDEX 0:" ++ // TODO: "VIRTUAL TABLE INDEX 0:G0" ++ ); ++ }); ++ ++ describe("v7", () => { ++ const db = initDatabase(); ++ ++ test("7.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE f USING FTS5(filename, tokenize="better_trigram");`, ++ `INSERT INTO f (rowid, filename) VALUES ++ (10, 'giraffe.png'), ++ (20, 'жираф.png'), ++ (30, 'cat.png'), ++ (40, 'кот.png'), ++ (50, 'misic-🎵-.mp3');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ "7.1", ++ `SELECT rowid as res FROM f WHERE +filename GLOB '*ир*';`, ++ [], ++ 20 ++ ); ++ ++ sqlTest( ++ db, ++ "7.2", ++ `SELECT rowid as res FROM f WHERE filename GLOB '*ир*';`, ++ [], ++ 20 ++ ); ++ }); ++ ++ describe("v8", () => { ++ const db = initDatabase(); ++ ++ test("8.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize = 'better_trigram');`, ++ `INSERT INTO t1 VALUES('abcdefghijklm')`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ [ ++ ["abc ghi", "(abc)def(ghi)jklm"], ++ ["def ghi", "abc(defghi)jklm"], ++ ["efg ghi", "abcd(efghi)jklm"], ++ ["efghi", "abcd(efghi)jklm"], ++ ["abcd jklm", "(abcd)efghi(jklm)"], ++ ["ijkl jklm", "abcdefgh(ijklm)"], ++ ["ijk ijkl hijk", "abcdefg(hijkl)m"], ++ ].forEach((testCase, index) => { ++ sqlTest( ++ db, ++ `8.1.${index + 1}`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1(?)`, ++ [testCase[0]], ++ testCase[1] ++ ); ++ }); ++ ++ test("8.2", () => { ++ [ ++ `CREATE VIRTUAL TABLE ft2 USING fts5(a, tokenize="better_trigram");`, ++ `INSERT INTO ft2 VALUES('abc x cde');`, ++ `INSERT INTO ft2 VALUES('abc cde');`, ++ `INSERT INTO ft2 VALUES('abcde');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ test("8.3", () => { ++ const expected = ["[abc] x [cde]", "[abc] [cde]", "[abcde]"]; ++ db.prepare( ++ `SELECT highlight(ft2, 0, '[', ']') as res FROM ft2 WHERE ft2 MATCH 'abc AND cde';` ++ ) ++ .all() ++ .forEach((result, i) => { ++ expect((result as { res: string }).res).toBe(expected[i]); ++ }); ++ }); ++ }); ++ ++ describe("v9", () => { ++ const db = initDatabase(); ++ ++ test("9.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5( ++ a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, ++ tokenize=better_trigram ++ );`, ++ `INSERT INTO t1(rowid, a12) VALUES(111, 'thats a tricky case though');`, ++ `INSERT INTO t1(rowid, a12) VALUES(222, 'the query planner cannot do');`, ++ ].forEach((stmt) => ++ expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ sqlTest( ++ db, ++ "9.1", ++ `SELECT rowid as res FROM t1 WHERE a12 LIKE '%tricky%'`, ++ [], ++ 111 ++ ); ++ ++ sqlTest( ++ db, ++ "9.2", ++ `SELECT rowid as res FROM t1 WHERE a12 LIKE '%tricky%' AND a12 LIKE '%case%'`, ++ [], ++ 111 ++ ); ++ ++ sqlTest( ++ db, ++ "9.3", ++ `SELECT rowid as res FROM t1 WHERE a12 LIKE NULL`, ++ [], ++ undefined ++ ); ++ }); ++ ++ describe("v10", () => { ++ const db = initDatabase(); ++ ++ test("10.0", () => { ++ [`CREATE VIRTUAL TABLE t1 USING fts5(a, tokenize=trigram);`].forEach( ++ (stmt) => expect(db.prepare(stmt).run().changes).toBeGreaterThan(0) ++ ); ++ }); ++ ++ test("10.1", () => { ++ [ ++ `"abc UFFjklUFF"`, ++ `"abc UFFFjklUFFF"`, ++ `"abc UFFFFjklUFFFF"`, ++ `"abc UFFFFFjklUFFFFF"`, ++ `"UFFjklUFF abc"`, ++ `"UFFFjklUFFF abc"`, ++ `"UFFFFjklUFFFF abc"`, ++ `"UFFFFFjklUFFFFF abc"`, ++ `"U10001jklU10001 abc"`, ++ ].forEach((val) => db.query(`INSERT INTO t1 VALUES( ${val} ) `).run()); ++ }); ++ ++ test("10.2", () => { ++ [ ++ `X'E18000626320646566'`, ++ `X'61EDA0806320646566'`, ++ `X'61EDA0806320646566'`, ++ `X'61EFBFBE6320646566'`, ++ `X'76686920E18000626320646566'`, ++ `X'7668692061EDA0806320646566'`, ++ `X'7668692061EDA0806320646566'`, ++ `X'7668692061EFBFBE6320646566'`, ++ ].forEach((val) => db.query(`INSERT INTO t1 VALUES( ${val} ) `).run()); ++ }); ++ ++ test("10.3", () => { ++ const a = Buffer.from([0x61, 0xf7, 0xbf, 0xbf, 0xbf, 0x62]).toString( ++ "utf-8" ++ ); ++ const b = Buffer.from([ ++ 0x61, 0xf7, 0xbf, 0xbf, 0xbf, 0xbf, 0x62, ++ ]).toString("utf-8"); ++ const c = Buffer.from([ ++ 0x61, 0xf7, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0x62, ++ ]).toString("utf-8"); ++ const d = Buffer.from([ ++ 0x61, 0xf7, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0x62, ++ ]).toString("utf-8"); ++ ++ [ ++ `INSERT INTO t1 VALUES('${a}');`, ++ `INSERT INTO t1 VALUES('${b}');`, ++ `INSERT INTO t1 VALUES('${c}');`, ++ `INSERT INTO t1 VALUES('${d}');`, ++ ++ `INSERT INTO t1 VALUES('abcd' || '${a}');`, ++ `INSERT INTO t1 VALUES('abcd' || '${b}');`, ++ `INSERT INTO t1 VALUES('abcd' || '${c}');`, ++ `INSERT INTO t1 VALUES('abcd' || '${d}');`, ++ ].forEach((val) => { ++ db.query(val).run(); ++ }); ++ }); ++ }); ++}); ++ ++describe("cjk", () => { ++ const db = initDatabase(); ++ afterAll(() => db.close()); ++ ++ test("1.0", () => { ++ [ ++ `CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize='better_trigram remove_diacritics 1');`, ++ `INSERT INTO t1 VALUES('王明：这是什么？');`, ++ `INSERT INTO t1 VALUES('李红：这是书。');`, ++ `INSERT INTO t1 VALUES('王明：那是什么？');`, ++ `INSERT INTO t1 VALUES('李红：那是钢笔。');`, ++ `INSERT INTO t1 VALUES('王明：那是杂志吗？');`, ++ `INSERT INTO t1 VALUES('李红：不，那不是杂志。那是字典。');`, ++ `INSERT INTO t1 VALUES('some 李红：不，那不 text 是杂志。in 那是 chinese 字典。');`, ++ ].forEach((stmt) => db.query(stmt).run()); ++ }); ++ ++ sqlTest( ++ db, ++ `1.1`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('王明');`, ++ [], ++ ["(王明)：这是什么？", "(王明)：那是什么？", "(王明)：那是杂志吗？"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.2`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('那是');`, ++ [], ++ [ ++ "王明：(那是)什么？", ++ "李红：(那是)钢笔。", ++ "王明：(那是)杂志吗？", ++ "李红：不，那不是杂志。(那是)字典。", ++ "some 李红：不，那不 text 是杂志。in (那是) chinese 字典。", ++ ] ++ ); ++ ++ sqlTest( ++ db, ++ `1.3`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('钢');`, ++ [], ++ ["李红：那是(钢)笔。"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.4`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('王明：');`, ++ [], ++ ["(王明：)这是什么？", "(王明：)那是什么？", "(王明：)那是杂志吗？"] ++ ); ++ ++ sqlTest( ++ db, ++ `1.4`, ++ `SELECT highlight(t1, 0, '(', ')') as res FROM t1('some 李红');`, ++ [], ++ ["(some) (李红)：不，那不 text 是杂志。in 那是 chinese 字典。"] ++ ); ++}); ++ ++function sqlTest( ++ db: Database, ++ version: string, ++ query: string, ++ params: string[], ++ expected: string | number | undefined | (string | number | undefined)[] ++) { ++ test(version, () => { ++ const result = db.query(query).all(...params) as { ++ res: string | number; ++ }[]; ++ if (Array.isArray(expected)) { ++ expect(Array.isArray(expected)).toBeTrue(); ++ expect(result.length).toBe(expected.length); ++ result.forEach((result, i) => expect(result.res).toBe(expected[i]!)); ++ } else { ++ expect(result[0]?.res).toBe(expected!); ++ } ++ }); ++} ++ ++function explainQueryPlanTest( ++ db: Database, ++ version: string, ++ query: string, ++ params: string[], ++ expected: string ++) { ++ test(version, () => { ++ const result = db.query(`EXPLAIN QUERY PLAN ${query}`).get(...params) as { ++ detail?: string; ++ }; ++ expect(result?.detail).toInclude(expected); ++ }); ++} +diff --git a/node_modules/react-native-quick-sqlite/better-trigram/fts5_unicode2.c b/node_modules/react-native-quick-sqlite/better-trigram/fts5_unicode2.c +new file mode 100644 +index 0000000..2133d5d +--- /dev/null ++++ b/node_modules/react-native-quick-sqlite/better-trigram/fts5_unicode2.c +@@ -0,0 +1,780 @@ ++/* ++** 2012-05-25 ++** ++** The author disclaims copyright to this source code. In place of ++** a legal notice, here is a blessing: ++** ++** May you do good and not evil. ++** May you find forgiveness for yourself and forgive others. ++** May you share freely, never taking more than you give. ++** ++****************************************************************************** ++*/ ++ ++/* ++** DO NOT EDIT THIS MACHINE GENERATED FILE. ++*/ ++ ++ ++#include ++ ++ ++ ++/* ++** If the argument is a codepoint corresponding to a lowercase letter ++** in the ASCII range with a diacritic added, return the codepoint ++** of the ASCII letter only. For example, if passed 235 - "LATIN ++** SMALL LETTER E WITH DIAERESIS" - return 65 ("LATIN SMALL LETTER ++** E"). The resuls of passing a codepoint that corresponds to an ++** uppercase letter are undefined. ++*/ ++static int fts5_remove_diacritic(int c, int bComplex){ ++ unsigned short aDia[] = { ++ 0, 1797, 1848, 1859, 1891, 1928, 1940, 1995, ++ 2024, 2040, 2060, 2110, 2168, 2206, 2264, 2286, ++ 2344, 2383, 2472, 2488, 2516, 2596, 2668, 2732, ++ 2782, 2842, 2894, 2954, 2984, 3000, 3028, 3336, ++ 3456, 3696, 3712, 3728, 3744, 3766, 3832, 3896, ++ 3912, 3928, 3944, 3968, 4008, 4040, 4056, 4106, ++ 4138, 4170, 4202, 4234, 4266, 4296, 4312, 4344, ++ 4408, 4424, 4442, 4472, 4488, 4504, 6148, 6198, ++ 6264, 6280, 6360, 6429, 6505, 6529, 61448, 61468, ++ 61512, 61534, 61592, 61610, 61642, 61672, 61688, 61704, ++ 61726, 61784, 61800, 61816, 61836, 61880, 61896, 61914, ++ 61948, 61998, 62062, 62122, 62154, 62184, 62200, 62218, ++ 62252, 62302, 62364, 62410, 62442, 62478, 62536, 62554, ++ 62584, 62604, 62640, 62648, 62656, 62664, 62730, 62766, ++ 62830, 62890, 62924, 62974, 63032, 63050, 63082, 63118, ++ 63182, 63242, 63274, 63310, 63368, 63390, ++ }; ++#define HIBIT ((unsigned char)0x80) ++ unsigned char aChar[] = { ++ '\0', 'a', 'c', 'e', 'i', 'n', ++ 'o', 'u', 'y', 'y', 'a', 'c', ++ 'd', 'e', 'e', 'g', 'h', 'i', ++ 'j', 'k', 'l', 'n', 'o', 'r', ++ 's', 't', 'u', 'u', 'w', 'y', ++ 'z', 'o', 'u', 'a', 'i', 'o', ++ 'u', 'u'|HIBIT, 'a'|HIBIT, 'g', 'k', 'o', ++ 'o'|HIBIT, 'j', 'g', 'n', 'a'|HIBIT, 'a', ++ 'e', 'i', 'o', 'r', 'u', 's', ++ 't', 'h', 'a', 'e', 'o'|HIBIT, 'o', ++ 'o'|HIBIT, 'y', '\0', '\0', '\0', '\0', ++ '\0', '\0', '\0', '\0', 'a', 'b', ++ 'c'|HIBIT, 'd', 'd', 'e'|HIBIT, 'e', 'e'|HIBIT, ++ 'f', 'g', 'h', 'h', 'i', 'i'|HIBIT, ++ 'k', 'l', 'l'|HIBIT, 'l', 'm', 'n', ++ 'o'|HIBIT, 'p', 'r', 'r'|HIBIT, 'r', 's', ++ 's'|HIBIT, 't', 'u', 'u'|HIBIT, 'v', 'w', ++ 'w', 'x', 'y', 'z', 'h', 't', ++ 'w', 'y', 'a', 'a'|HIBIT, 'a'|HIBIT, 'a'|HIBIT, ++ 'e', 'e'|HIBIT, 'e'|HIBIT, 'i', 'o', 'o'|HIBIT, ++ 'o'|HIBIT, 'o'|HIBIT, 'u', 'u'|HIBIT, 'u'|HIBIT, 'y', ++ }; ++ ++ unsigned int key = (((unsigned int)c)<<3) | 0x00000007; ++ int iRes = 0; ++ int iHi = sizeof(aDia)/sizeof(aDia[0]) - 1; ++ int iLo = 0; ++ while( iHi>=iLo ){ ++ int iTest = (iHi + iLo) / 2; ++ if( key >= aDia[iTest] ){ ++ iRes = iTest; ++ iLo = iTest+1; ++ }else{ ++ iHi = iTest-1; ++ } ++ } ++ assert( key>=aDia[iRes] ); ++ if( bComplex==0 && (aChar[iRes] & 0x80) ) return c; ++ return (c > (aDia[iRes]>>3) + (aDia[iRes]&0x07)) ? c : ((int)aChar[iRes] & 0x7F); ++} ++ ++ ++/* ++** Return true if the argument interpreted as a unicode codepoint ++** is a diacritical modifier character. ++*/ ++int sqlite3Fts5UnicodeIsdiacritic(int c){ ++ unsigned int mask0 = 0x08029FDF; ++ unsigned int mask1 = 0x000361F8; ++ if( c<768 || c>817 ) return 0; ++ return (c < 768+32) ? ++ (mask0 & ((unsigned int)1 << (c-768))) : ++ (mask1 & ((unsigned int)1 << (c-768-32))); ++} ++ ++ ++/* ++** Interpret the argument as a unicode codepoint. If the codepoint ++** is an upper case character that has a lower case equivalent, ++** return the codepoint corresponding to the lower case version. ++** Otherwise, return a copy of the argument. ++** ++** The results are undefined if the value passed to this function ++** is less than zero. ++*/ ++int sqlite3Fts5UnicodeFold(int c, int eRemoveDiacritic){ ++ /* Each entry in the following array defines a rule for folding a range ++ ** of codepoints to lower case. The rule applies to a range of nRange ++ ** codepoints starting at codepoint iCode. ++ ** ++ ** If the least significant bit in flags is clear, then the rule applies ++ ** to all nRange codepoints (i.e. all nRange codepoints are upper case and ++ ** need to be folded). Or, if it is set, then the rule only applies to ++ ** every second codepoint in the range, starting with codepoint C. ++ ** ++ ** The 7 most significant bits in flags are an index into the aiOff[] ++ ** array. If a specific codepoint C does require folding, then its lower ++ ** case equivalent is ((C + aiOff[flags>>1]) & 0xFFFF). ++ ** ++ ** The contents of this array are generated by parsing the CaseFolding.txt ++ ** file distributed as part of the "Unicode Character Database". See ++ ** http://www.unicode.org for details. ++ */ ++ static const struct TableEntry { ++ unsigned short iCode; ++ unsigned char flags; ++ unsigned char nRange; ++ } aEntry[] = { ++ {65, 14, 26}, {181, 64, 1}, {192, 14, 23}, ++ {216, 14, 7}, {256, 1, 48}, {306, 1, 6}, ++ {313, 1, 16}, {330, 1, 46}, {376, 116, 1}, ++ {377, 1, 6}, {383, 104, 1}, {385, 50, 1}, ++ {386, 1, 4}, {390, 44, 1}, {391, 0, 1}, ++ {393, 42, 2}, {395, 0, 1}, {398, 32, 1}, ++ {399, 38, 1}, {400, 40, 1}, {401, 0, 1}, ++ {403, 42, 1}, {404, 46, 1}, {406, 52, 1}, ++ {407, 48, 1}, {408, 0, 1}, {412, 52, 1}, ++ {413, 54, 1}, {415, 56, 1}, {416, 1, 6}, ++ {422, 60, 1}, {423, 0, 1}, {425, 60, 1}, ++ {428, 0, 1}, {430, 60, 1}, {431, 0, 1}, ++ {433, 58, 2}, {435, 1, 4}, {439, 62, 1}, ++ {440, 0, 1}, {444, 0, 1}, {452, 2, 1}, ++ {453, 0, 1}, {455, 2, 1}, {456, 0, 1}, ++ {458, 2, 1}, {459, 1, 18}, {478, 1, 18}, ++ {497, 2, 1}, {498, 1, 4}, {502, 122, 1}, ++ {503, 134, 1}, {504, 1, 40}, {544, 110, 1}, ++ {546, 1, 18}, {570, 70, 1}, {571, 0, 1}, ++ {573, 108, 1}, {574, 68, 1}, {577, 0, 1}, ++ {579, 106, 1}, {580, 28, 1}, {581, 30, 1}, ++ {582, 1, 10}, {837, 36, 1}, {880, 1, 4}, ++ {886, 0, 1}, {902, 18, 1}, {904, 16, 3}, ++ {908, 26, 1}, {910, 24, 2}, {913, 14, 17}, ++ {931, 14, 9}, {962, 0, 1}, {975, 4, 1}, ++ {976, 140, 1}, {977, 142, 1}, {981, 146, 1}, ++ {982, 144, 1}, {984, 1, 24}, {1008, 136, 1}, ++ {1009, 138, 1}, {1012, 130, 1}, {1013, 128, 1}, ++ {1015, 0, 1}, {1017, 152, 1}, {1018, 0, 1}, ++ {1021, 110, 3}, {1024, 34, 16}, {1040, 14, 32}, ++ {1120, 1, 34}, {1162, 1, 54}, {1216, 6, 1}, ++ {1217, 1, 14}, {1232, 1, 88}, {1329, 22, 38}, ++ {4256, 66, 38}, {4295, 66, 1}, {4301, 66, 1}, ++ {7680, 1, 150}, {7835, 132, 1}, {7838, 96, 1}, ++ {7840, 1, 96}, {7944, 150, 8}, {7960, 150, 6}, ++ {7976, 150, 8}, {7992, 150, 8}, {8008, 150, 6}, ++ {8025, 151, 8}, {8040, 150, 8}, {8072, 150, 8}, ++ {8088, 150, 8}, {8104, 150, 8}, {8120, 150, 2}, ++ {8122, 126, 2}, {8124, 148, 1}, {8126, 100, 1}, ++ {8136, 124, 4}, {8140, 148, 1}, {8152, 150, 2}, ++ {8154, 120, 2}, {8168, 150, 2}, {8170, 118, 2}, ++ {8172, 152, 1}, {8184, 112, 2}, {8186, 114, 2}, ++ {8188, 148, 1}, {8486, 98, 1}, {8490, 92, 1}, ++ {8491, 94, 1}, {8498, 12, 1}, {8544, 8, 16}, ++ {8579, 0, 1}, {9398, 10, 26}, {11264, 22, 47}, ++ {11360, 0, 1}, {11362, 88, 1}, {11363, 102, 1}, ++ {11364, 90, 1}, {11367, 1, 6}, {11373, 84, 1}, ++ {11374, 86, 1}, {11375, 80, 1}, {11376, 82, 1}, ++ {11378, 0, 1}, {11381, 0, 1}, {11390, 78, 2}, ++ {11392, 1, 100}, {11499, 1, 4}, {11506, 0, 1}, ++ {42560, 1, 46}, {42624, 1, 24}, {42786, 1, 14}, ++ {42802, 1, 62}, {42873, 1, 4}, {42877, 76, 1}, ++ {42878, 1, 10}, {42891, 0, 1}, {42893, 74, 1}, ++ {42896, 1, 4}, {42912, 1, 10}, {42922, 72, 1}, ++ {65313, 14, 26}, ++ }; ++ static const unsigned short aiOff[] = { ++ 1, 2, 8, 15, 16, 26, 28, 32, ++ 37, 38, 40, 48, 63, 64, 69, 71, ++ 79, 80, 116, 202, 203, 205, 206, 207, ++ 209, 210, 211, 213, 214, 217, 218, 219, ++ 775, 7264, 10792, 10795, 23228, 23256, 30204, 54721, ++ 54753, 54754, 54756, 54787, 54793, 54809, 57153, 57274, ++ 57921, 58019, 58363, 61722, 65268, 65341, 65373, 65406, ++ 65408, 65410, 65415, 65424, 65436, 65439, 65450, 65462, ++ 65472, 65476, 65478, 65480, 65482, 65488, 65506, 65511, ++ 65514, 65521, 65527, 65528, 65529, ++ }; ++ ++ int ret = c; ++ ++ assert( sizeof(unsigned short)==2 && sizeof(unsigned char)==1 ); ++ ++ if( c<128 ){ ++ if( c>='A' && c<='Z' ) ret = c + ('a' - 'A'); ++ }else if( c<65536 ){ ++ const struct TableEntry *p; ++ int iHi = sizeof(aEntry)/sizeof(aEntry[0]) - 1; ++ int iLo = 0; ++ int iRes = -1; ++ ++ assert( c>aEntry[0].iCode ); ++ while( iHi>=iLo ){ ++ int iTest = (iHi + iLo) / 2; ++ int cmp = (c - aEntry[iTest].iCode); ++ if( cmp>=0 ){ ++ iRes = iTest; ++ iLo = iTest+1; ++ }else{ ++ iHi = iTest-1; ++ } ++ } ++ ++ assert( iRes>=0 && c>=aEntry[iRes].iCode ); ++ p = &aEntry[iRes]; ++ if( c<(p->iCode + p->nRange) && 0==(0x01 & p->flags & (p->iCode ^ c)) ){ ++ ret = (c + (aiOff[p->flags>>1])) & 0x0000FFFF; ++ assert( ret>0 ); ++ } ++ ++ if( eRemoveDiacritic ){ ++ ret = fts5_remove_diacritic(ret, eRemoveDiacritic==2); ++ } ++ } ++ ++ else if( c>=66560 && c<66600 ){ ++ ret = c + 40; ++ } ++ ++ return ret; ++} ++ ++ ++int sqlite3Fts5UnicodeCatParse(const char *zCat, u8 *aArray){ ++ aArray[0] = 1; ++ switch( zCat[0] ){ ++ case 'C': ++ switch( zCat[1] ){ ++ case 'c': aArray[1] = 1; break; ++ case 'f': aArray[2] = 1; break; ++ case 'n': aArray[3] = 1; break; ++ case 's': aArray[4] = 1; break; ++ case 'o': aArray[31] = 1; break; ++ case '*': ++ aArray[1] = 1; ++ aArray[2] = 1; ++ aArray[3] = 1; ++ aArray[4] = 1; ++ aArray[31] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'L': ++ switch( zCat[1] ){ ++ case 'l': aArray[5] = 1; break; ++ case 'm': aArray[6] = 1; break; ++ case 'o': aArray[7] = 1; break; ++ case 't': aArray[8] = 1; break; ++ case 'u': aArray[9] = 1; break; ++ case 'C': aArray[30] = 1; break; ++ case '*': ++ aArray[5] = 1; ++ aArray[6] = 1; ++ aArray[7] = 1; ++ aArray[8] = 1; ++ aArray[9] = 1; ++ aArray[30] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'M': ++ switch( zCat[1] ){ ++ case 'c': aArray[10] = 1; break; ++ case 'e': aArray[11] = 1; break; ++ case 'n': aArray[12] = 1; break; ++ case '*': ++ aArray[10] = 1; ++ aArray[11] = 1; ++ aArray[12] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'N': ++ switch( zCat[1] ){ ++ case 'd': aArray[13] = 1; break; ++ case 'l': aArray[14] = 1; break; ++ case 'o': aArray[15] = 1; break; ++ case '*': ++ aArray[13] = 1; ++ aArray[14] = 1; ++ aArray[15] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'P': ++ switch( zCat[1] ){ ++ case 'c': aArray[16] = 1; break; ++ case 'd': aArray[17] = 1; break; ++ case 'e': aArray[18] = 1; break; ++ case 'f': aArray[19] = 1; break; ++ case 'i': aArray[20] = 1; break; ++ case 'o': aArray[21] = 1; break; ++ case 's': aArray[22] = 1; break; ++ case '*': ++ aArray[16] = 1; ++ aArray[17] = 1; ++ aArray[18] = 1; ++ aArray[19] = 1; ++ aArray[20] = 1; ++ aArray[21] = 1; ++ aArray[22] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'S': ++ switch( zCat[1] ){ ++ case 'c': aArray[23] = 1; break; ++ case 'k': aArray[24] = 1; break; ++ case 'm': aArray[25] = 1; break; ++ case 'o': aArray[26] = 1; break; ++ case '*': ++ aArray[23] = 1; ++ aArray[24] = 1; ++ aArray[25] = 1; ++ aArray[26] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ case 'Z': ++ switch( zCat[1] ){ ++ case 'l': aArray[27] = 1; break; ++ case 'p': aArray[28] = 1; break; ++ case 's': aArray[29] = 1; break; ++ case '*': ++ aArray[27] = 1; ++ aArray[28] = 1; ++ aArray[29] = 1; ++ break; ++ default: return 1; } ++ break; ++ ++ ++ default: ++ return 1; ++ } ++ return 0; ++} ++ ++static u16 aFts5UnicodeBlock[] = { ++ 0, 1471, 1753, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ++ 1760, 1760, 1760, 1760, 1760, 1763, 1765, ++ }; ++static u16 aFts5UnicodeMap[] = { ++ 0, 32, 33, 36, 37, 40, 41, 42, 43, 44, ++ 45, 46, 48, 58, 60, 63, 65, 91, 92, 93, ++ 94, 95, 96, 97, 123, 124, 125, 126, 127, 160, ++ 161, 162, 166, 167, 168, 169, 170, 171, 172, 173, ++ 174, 175, 176, 177, 178, 180, 181, 182, 184, 185, ++ 186, 187, 188, 191, 192, 215, 216, 223, 247, 248, ++ 256, 312, 313, 329, 330, 377, 383, 385, 387, 388, ++ 391, 394, 396, 398, 402, 403, 405, 406, 409, 412, ++ 414, 415, 417, 418, 423, 427, 428, 431, 434, 436, ++ 437, 440, 442, 443, 444, 446, 448, 452, 453, 454, ++ 455, 456, 457, 458, 459, 460, 461, 477, 478, 496, ++ 497, 498, 499, 500, 503, 505, 506, 564, 570, 572, ++ 573, 575, 577, 580, 583, 584, 592, 660, 661, 688, ++ 706, 710, 722, 736, 741, 748, 749, 750, 751, 768, ++ 880, 884, 885, 886, 890, 891, 894, 900, 902, 903, ++ 904, 908, 910, 912, 913, 931, 940, 975, 977, 978, ++ 981, 984, 1008, 1012, 1014, 1015, 1018, 1020, 1021, 1072, ++ 1120, 1154, 1155, 1160, 1162, 1217, 1231, 1232, 1329, 1369, ++ 1370, 1377, 1417, 1418, 1423, 1425, 1470, 1471, 1472, 1473, ++ 1475, 1476, 1478, 1479, 1488, 1520, 1523, 1536, 1542, 1545, ++ 1547, 1548, 1550, 1552, 1563, 1566, 1568, 1600, 1601, 1611, ++ 1632, 1642, 1646, 1648, 1649, 1748, 1749, 1750, 1757, 1758, ++ 1759, 1765, 1767, 1769, 1770, 1774, 1776, 1786, 1789, 1791, ++ 1792, 1807, 1808, 1809, 1810, 1840, 1869, 1958, 1969, 1984, ++ 1994, 2027, 2036, 2038, 2039, 2042, 2048, 2070, 2074, 2075, ++ 2084, 2085, 2088, 2089, 2096, 2112, 2137, 2142, 2208, 2210, ++ 2276, 2304, 2307, 2308, 2362, 2363, 2364, 2365, 2366, 2369, ++ 2377, 2381, 2382, 2384, 2385, 2392, 2402, 2404, 2406, 2416, ++ 2417, 2418, 2425, 2433, 2434, 2437, 2447, 2451, 2474, 2482, ++ 2486, 2492, 2493, 2494, 2497, 2503, 2507, 2509, 2510, 2519, ++ 2524, 2527, 2530, 2534, 2544, 2546, 2548, 2554, 2555, 2561, ++ 2563, 2565, 2575, 2579, 2602, 2610, 2613, 2616, 2620, 2622, ++ 2625, 2631, 2635, 2641, 2649, 2654, 2662, 2672, 2674, 2677, ++ 2689, 2691, 2693, 2703, 2707, 2730, 2738, 2741, 2748, 2749, ++ 2750, 2753, 2759, 2761, 2763, 2765, 2768, 2784, 2786, 2790, ++ 2800, 2801, 2817, 2818, 2821, 2831, 2835, 2858, 2866, 2869, ++ 2876, 2877, 2878, 2879, 2880, 2881, 2887, 2891, 2893, 2902, ++ 2903, 2908, 2911, 2914, 2918, 2928, 2929, 2930, 2946, 2947, ++ 2949, 2958, 2962, 2969, 2972, 2974, 2979, 2984, 2990, 3006, ++ 3008, 3009, 3014, 3018, 3021, 3024, 3031, 3046, 3056, 3059, ++ 3065, 3066, 3073, 3077, 3086, 3090, 3114, 3125, 3133, 3134, ++ 3137, 3142, 3146, 3157, 3160, 3168, 3170, 3174, 3192, 3199, ++ 3202, 3205, 3214, 3218, 3242, 3253, 3260, 3261, 3262, 3263, ++ 3264, 3270, 3271, 3274, 3276, 3285, 3294, 3296, 3298, 3302, ++ 3313, 3330, 3333, 3342, 3346, 3389, 3390, 3393, 3398, 3402, ++ 3405, 3406, 3415, 3424, 3426, 3430, 3440, 3449, 3450, 3458, ++ 3461, 3482, 3507, 3517, 3520, 3530, 3535, 3538, 3542, 3544, ++ 3570, 3572, 3585, 3633, 3634, 3636, 3647, 3648, 3654, 3655, ++ 3663, 3664, 3674, 3713, 3716, 3719, 3722, 3725, 3732, 3737, ++ 3745, 3749, 3751, 3754, 3757, 3761, 3762, 3764, 3771, 3773, ++ 3776, 3782, 3784, 3792, 3804, 3840, 3841, 3844, 3859, 3860, ++ 3861, 3864, 3866, 3872, 3882, 3892, 3893, 3894, 3895, 3896, ++ 3897, 3898, 3899, 3900, 3901, 3902, 3904, 3913, 3953, 3967, ++ 3968, 3973, 3974, 3976, 3981, 3993, 4030, 4038, 4039, 4046, ++ 4048, 4053, 4057, 4096, 4139, 4141, 4145, 4146, 4152, 4153, ++ 4155, 4157, 4159, 4160, 4170, 4176, 4182, 4184, 4186, 4190, ++ 4193, 4194, 4197, 4199, 4206, 4209, 4213, 4226, 4227, 4229, ++ 4231, 4237, 4238, 4239, 4240, 4250, 4253, 4254, 4256, 4295, ++ 4301, 4304, 4347, 4348, 4349, 4682, 4688, 4696, 4698, 4704, ++ 4746, 4752, 4786, 4792, 4800, 4802, 4808, 4824, 4882, 4888, ++ 4957, 4960, 4969, 4992, 5008, 5024, 5120, 5121, 5741, 5743, ++ 5760, 5761, 5787, 5788, 5792, 5867, 5870, 5888, 5902, 5906, ++ 5920, 5938, 5941, 5952, 5970, 5984, 5998, 6002, 6016, 6068, ++ 6070, 6071, 6078, 6086, 6087, 6089, 6100, 6103, 6104, 6107, ++ 6108, 6109, 6112, 6128, 6144, 6150, 6151, 6155, 6158, 6160, ++ 6176, 6211, 6212, 6272, 6313, 6314, 6320, 6400, 6432, 6435, ++ 6439, 6441, 6448, 6450, 6451, 6457, 6464, 6468, 6470, 6480, ++ 6512, 6528, 6576, 6593, 6600, 6608, 6618, 6622, 6656, 6679, ++ 6681, 6686, 6688, 6741, 6742, 6743, 6744, 6752, 6753, 6754, ++ 6755, 6757, 6765, 6771, 6783, 6784, 6800, 6816, 6823, 6824, ++ 6912, 6916, 6917, 6964, 6965, 6966, 6971, 6972, 6973, 6978, ++ 6979, 6981, 6992, 7002, 7009, 7019, 7028, 7040, 7042, 7043, ++ 7073, 7074, 7078, 7080, 7082, 7083, 7084, 7086, 7088, 7098, ++ 7142, 7143, 7144, 7146, 7149, 7150, 7151, 7154, 7164, 7168, ++ 7204, 7212, 7220, 7222, 7227, 7232, 7245, 7248, 7258, 7288, ++ 7294, 7360, 7376, 7379, 7380, 7393, 7394, 7401, 7405, 7406, ++ 7410, 7412, 7413, 7424, 7468, 7531, 7544, 7545, 7579, 7616, ++ 7676, 7680, 7830, 7838, 7936, 7944, 7952, 7960, 7968, 7976, ++ 7984, 7992, 8000, 8008, 8016, 8025, 8027, 8029, 8031, 8033, ++ 8040, 8048, 8064, 8072, 8080, 8088, 8096, 8104, 8112, 8118, ++ 8120, 8124, 8125, 8126, 8127, 8130, 8134, 8136, 8140, 8141, ++ 8144, 8150, 8152, 8157, 8160, 8168, 8173, 8178, 8182, 8184, ++ 8188, 8189, 8192, 8203, 8208, 8214, 8216, 8217, 8218, 8219, ++ 8221, 8222, 8223, 8224, 8232, 8233, 8234, 8239, 8240, 8249, ++ 8250, 8251, 8255, 8257, 8260, 8261, 8262, 8263, 8274, 8275, ++ 8276, 8277, 8287, 8288, 8298, 8304, 8305, 8308, 8314, 8317, ++ 8318, 8319, 8320, 8330, 8333, 8334, 8336, 8352, 8400, 8413, ++ 8417, 8418, 8421, 8448, 8450, 8451, 8455, 8456, 8458, 8459, ++ 8462, 8464, 8467, 8468, 8469, 8470, 8472, 8473, 8478, 8484, ++ 8485, 8486, 8487, 8488, 8489, 8490, 8494, 8495, 8496, 8500, ++ 8501, 8505, 8506, 8508, 8510, 8512, 8517, 8519, 8522, 8523, ++ 8524, 8526, 8527, 8528, 8544, 8579, 8581, 8585, 8592, 8597, ++ 8602, 8604, 8608, 8609, 8611, 8612, 8614, 8615, 8622, 8623, ++ 8654, 8656, 8658, 8659, 8660, 8661, 8692, 8960, 8968, 8972, ++ 8992, 8994, 9001, 9002, 9003, 9084, 9085, 9115, 9140, 9180, ++ 9186, 9216, 9280, 9312, 9372, 9450, 9472, 9655, 9656, 9665, ++ 9666, 9720, 9728, 9839, 9840, 9985, 10088, 10089, 10090, 10091, ++ 10092, 10093, 10094, 10095, 10096, 10097, 10098, 10099, 10100, 10101, ++ 10102, 10132, 10176, 10181, 10182, 10183, 10214, 10215, 10216, 10217, ++ 10218, 10219, 10220, 10221, 10222, 10223, 10224, 10240, 10496, 10627, ++ 10628, 10629, 10630, 10631, 10632, 10633, 10634, 10635, 10636, 10637, ++ 10638, 10639, 10640, 10641, 10642, 10643, 10644, 10645, 10646, 10647, ++ 10648, 10649, 10712, 10713, 10714, 10715, 10716, 10748, 10749, 10750, ++ 11008, 11056, 11077, 11079, 11088, 11264, 11312, 11360, 11363, 11365, ++ 11367, 11374, 11377, 11378, 11380, 11381, 11383, 11388, 11390, 11393, ++ 11394, 11492, 11493, 11499, 11503, 11506, 11513, 11517, 11518, 11520, ++ 11559, 11565, 11568, 11631, 11632, 11647, 11648, 11680, 11688, 11696, ++ 11704, 11712, 11720, 11728, 11736, 11744, 11776, 11778, 11779, 11780, ++ 11781, 11782, 11785, 11786, 11787, 11788, 11789, 11790, 11799, 11800, ++ 11802, 11803, 11804, 11805, 11806, 11808, 11809, 11810, 11811, 11812, ++ 11813, 11814, 11815, 11816, 11817, 11818, 11823, 11824, 11834, 11904, ++ 11931, 12032, 12272, 12288, 12289, 12292, 12293, 12294, 12295, 12296, ++ 12297, 12298, 12299, 12300, 12301, 12302, 12303, 12304, 12305, 12306, ++ 12308, 12309, 12310, 12311, 12312, 12313, 12314, 12315, 12316, 12317, ++ 12318, 12320, 12321, 12330, 12334, 12336, 12337, 12342, 12344, 12347, ++ 12348, 12349, 12350, 12353, 12441, 12443, 12445, 12447, 12448, 12449, ++ 12539, 12540, 12543, 12549, 12593, 12688, 12690, 12694, 12704, 12736, ++ 12784, 12800, 12832, 12842, 12872, 12880, 12881, 12896, 12928, 12938, ++ 12977, 12992, 13056, 13312, 19893, 19904, 19968, 40908, 40960, 40981, ++ 40982, 42128, 42192, 42232, 42238, 42240, 42508, 42509, 42512, 42528, ++ 42538, 42560, 42606, 42607, 42608, 42611, 42612, 42622, 42623, 42624, ++ 42655, 42656, 42726, 42736, 42738, 42752, 42775, 42784, 42786, 42800, ++ 42802, 42864, 42865, 42873, 42878, 42888, 42889, 42891, 42896, 42912, ++ 43000, 43002, 43003, 43010, 43011, 43014, 43015, 43019, 43020, 43043, ++ 43045, 43047, 43048, 43056, 43062, 43064, 43065, 43072, 43124, 43136, ++ 43138, 43188, 43204, 43214, 43216, 43232, 43250, 43256, 43259, 43264, ++ 43274, 43302, 43310, 43312, 43335, 43346, 43359, 43360, 43392, 43395, ++ 43396, 43443, 43444, 43446, 43450, 43452, 43453, 43457, 43471, 43472, ++ 43486, 43520, 43561, 43567, 43569, 43571, 43573, 43584, 43587, 43588, ++ 43596, 43597, 43600, 43612, 43616, 43632, 43633, 43639, 43642, 43643, ++ 43648, 43696, 43697, 43698, 43701, 43703, 43705, 43710, 43712, 43713, ++ 43714, 43739, 43741, 43742, 43744, 43755, 43756, 43758, 43760, 43762, ++ 43763, 43765, 43766, 43777, 43785, 43793, 43808, 43816, 43968, 44003, ++ 44005, 44006, 44008, 44009, 44011, 44012, 44013, 44016, 44032, 55203, ++ 55216, 55243, 55296, 56191, 56319, 57343, 57344, 63743, 63744, 64112, ++ 64256, 64275, 64285, 64286, 64287, 64297, 64298, 64312, 64318, 64320, ++ 64323, 64326, 64434, 64467, 64830, 64831, 64848, 64914, 65008, 65020, ++ 65021, 65024, 65040, 65047, 65048, 65049, 65056, 65072, 65073, 65075, ++ 65077, 65078, 65079, 65080, 65081, 65082, 65083, 65084, 65085, 65086, ++ 65087, 65088, 65089, 65090, 65091, 65092, 65093, 65095, 65096, 65097, ++ 65101, 65104, 65108, 65112, 65113, 65114, 65115, 65116, 65117, 65118, ++ 65119, 65122, 65123, 65124, 65128, 65129, 65130, 65136, 65142, 65279, ++ 65281, 65284, 65285, 65288, 65289, 65290, 65291, 65292, 65293, 65294, ++ 65296, 65306, 65308, 65311, 65313, 65339, 65340, 65341, 65342, 65343, ++ 65344, 65345, 65371, 65372, 65373, 65374, 65375, 65376, 65377, 65378, ++ 65379, 65380, 65382, 65392, 65393, 65438, 65440, 65474, 65482, 65490, ++ 65498, 65504, 65506, 65507, 65508, 65509, 65512, 65513, 65517, 65529, ++ 65532, 0, 13, 40, 60, 63, 80, 128, 256, 263, ++ 311, 320, 373, 377, 394, 400, 464, 509, 640, 672, ++ 768, 800, 816, 833, 834, 842, 896, 927, 928, 968, ++ 976, 977, 1024, 1064, 1104, 1184, 2048, 2056, 2058, 2103, ++ 2108, 2111, 2135, 2136, 2304, 2326, 2335, 2336, 2367, 2432, ++ 2494, 2560, 2561, 2565, 2572, 2576, 2581, 2585, 2616, 2623, ++ 2624, 2640, 2656, 2685, 2687, 2816, 2873, 2880, 2904, 2912, ++ 2936, 3072, 3680, 4096, 4097, 4098, 4099, 4152, 4167, 4178, ++ 4198, 4224, 4226, 4227, 4272, 4275, 4279, 4281, 4283, 4285, ++ 4286, 4304, 4336, 4352, 4355, 4391, 4396, 4397, 4406, 4416, ++ 4480, 4482, 4483, 4531, 4534, 4543, 4545, 4549, 4560, 5760, ++ 5803, 5804, 5805, 5806, 5808, 5814, 5815, 5824, 8192, 9216, ++ 9328, 12288, 26624, 28416, 28496, 28497, 28559, 28563, 45056, 53248, ++ 53504, 53545, 53605, 53607, 53610, 53613, 53619, 53627, 53635, 53637, ++ 53644, 53674, 53678, 53760, 53826, 53829, 54016, 54112, 54272, 54298, ++ 54324, 54350, 54358, 54376, 54402, 54428, 54430, 54434, 54437, 54441, ++ 54446, 54454, 54459, 54461, 54469, 54480, 54506, 54532, 54535, 54541, ++ 54550, 54558, 54584, 54587, 54592, 54598, 54602, 54610, 54636, 54662, ++ 54688, 54714, 54740, 54766, 54792, 54818, 54844, 54870, 54896, 54922, ++ 54952, 54977, 54978, 55003, 55004, 55010, 55035, 55036, 55061, 55062, ++ 55068, 55093, 55094, 55119, 55120, 55126, 55151, 55152, 55177, 55178, ++ 55184, 55209, 55210, 55235, 55236, 55242, 55246, 60928, 60933, 60961, ++ 60964, 60967, 60969, 60980, 60985, 60987, 60994, 60999, 61001, 61003, ++ 61005, 61009, 61012, 61015, 61017, 61019, 61021, 61023, 61025, 61028, ++ 61031, 61036, 61044, 61049, 61054, 61056, 61067, 61089, 61093, 61099, ++ 61168, 61440, 61488, 61600, 61617, 61633, 61649, 61696, 61712, 61744, ++ 61808, 61926, 61968, 62016, 62032, 62208, 62256, 62263, 62336, 62368, ++ 62406, 62432, 62464, 62528, 62530, 62713, 62720, 62784, 62800, 62971, ++ 63045, 63104, 63232, 0, 42710, 42752, 46900, 46912, 47133, 63488, ++ 1, 32, 256, 0, 65533, ++ }; ++static u16 aFts5UnicodeData[] = { ++ 1025, 61, 117, 55, 117, 54, 50, 53, 57, 53, ++ 49, 85, 333, 85, 121, 85, 841, 54, 53, 50, ++ 56, 48, 56, 837, 54, 57, 50, 57, 1057, 61, ++ 53, 151, 58, 53, 56, 58, 39, 52, 57, 34, ++ 58, 56, 58, 57, 79, 56, 37, 85, 56, 47, ++ 39, 51, 111, 53, 745, 57, 233, 773, 57, 261, ++ 1822, 37, 542, 37, 1534, 222, 69, 73, 37, 126, ++ 126, 73, 69, 137, 37, 73, 37, 105, 101, 73, ++ 37, 73, 37, 190, 158, 37, 126, 126, 73, 37, ++ 126, 94, 37, 39, 94, 69, 135, 41, 40, 37, ++ 41, 40, 37, 41, 40, 37, 542, 37, 606, 37, ++ 41, 40, 37, 126, 73, 37, 1886, 197, 73, 37, ++ 73, 69, 126, 105, 37, 286, 2181, 39, 869, 582, ++ 152, 390, 472, 166, 248, 38, 56, 38, 568, 3596, ++ 158, 38, 56, 94, 38, 101, 53, 88, 41, 53, ++ 105, 41, 73, 37, 553, 297, 1125, 94, 37, 105, ++ 101, 798, 133, 94, 57, 126, 94, 37, 1641, 1541, ++ 1118, 58, 172, 75, 1790, 478, 37, 2846, 1225, 38, ++ 213, 1253, 53, 49, 55, 1452, 49, 44, 53, 76, ++ 53, 76, 53, 44, 871, 103, 85, 162, 121, 85, ++ 55, 85, 90, 364, 53, 85, 1031, 38, 327, 684, ++ 333, 149, 71, 44, 3175, 53, 39, 236, 34, 58, ++ 204, 70, 76, 58, 140, 71, 333, 103, 90, 39, ++ 469, 34, 39, 44, 967, 876, 2855, 364, 39, 333, ++ 1063, 300, 70, 58, 117, 38, 711, 140, 38, 300, ++ 38, 108, 38, 172, 501, 807, 108, 53, 39, 359, ++ 876, 108, 42, 1735, 44, 42, 44, 39, 106, 268, ++ 138, 44, 74, 39, 236, 327, 76, 85, 333, 53, ++ 38, 199, 231, 44, 74, 263, 71, 711, 231, 39, ++ 135, 44, 39, 106, 140, 74, 74, 44, 39, 42, ++ 71, 103, 76, 333, 71, 87, 207, 58, 55, 76, ++ 42, 199, 71, 711, 231, 71, 71, 71, 44, 106, ++ 76, 76, 108, 44, 135, 39, 333, 76, 103, 44, ++ 76, 42, 295, 103, 711, 231, 71, 167, 44, 39, ++ 106, 172, 76, 42, 74, 44, 39, 71, 76, 333, ++ 53, 55, 44, 74, 263, 71, 711, 231, 71, 167, ++ 44, 39, 42, 44, 42, 140, 74, 74, 44, 44, ++ 42, 71, 103, 76, 333, 58, 39, 207, 44, 39, ++ 199, 103, 135, 71, 39, 71, 71, 103, 391, 74, ++ 44, 74, 106, 106, 44, 39, 42, 333, 111, 218, ++ 55, 58, 106, 263, 103, 743, 327, 167, 39, 108, ++ 138, 108, 140, 76, 71, 71, 76, 333, 239, 58, ++ 74, 263, 103, 743, 327, 167, 44, 39, 42, 44, ++ 170, 44, 74, 74, 76, 74, 39, 71, 76, 333, ++ 71, 74, 263, 103, 1319, 39, 106, 140, 106, 106, ++ 44, 39, 42, 71, 76, 333, 207, 58, 199, 74, ++ 583, 775, 295, 39, 231, 44, 106, 108, 44, 266, ++ 74, 53, 1543, 44, 71, 236, 55, 199, 38, 268, ++ 53, 333, 85, 71, 39, 71, 39, 39, 135, 231, ++ 103, 39, 39, 71, 135, 44, 71, 204, 76, 39, ++ 167, 38, 204, 333, 135, 39, 122, 501, 58, 53, ++ 122, 76, 218, 333, 335, 58, 44, 58, 44, 58, ++ 44, 54, 50, 54, 50, 74, 263, 1159, 460, 42, ++ 172, 53, 76, 167, 364, 1164, 282, 44, 218, 90, ++ 181, 154, 85, 1383, 74, 140, 42, 204, 42, 76, ++ 74, 76, 39, 333, 213, 199, 74, 76, 135, 108, ++ 39, 106, 71, 234, 103, 140, 423, 44, 74, 76, ++ 202, 44, 39, 42, 333, 106, 44, 90, 1225, 41, ++ 41, 1383, 53, 38, 10631, 135, 231, 39, 135, 1319, ++ 135, 1063, 135, 231, 39, 135, 487, 1831, 135, 2151, ++ 108, 309, 655, 519, 346, 2727, 49, 19847, 85, 551, ++ 61, 839, 54, 50, 2407, 117, 110, 423, 135, 108, ++ 583, 108, 85, 583, 76, 423, 103, 76, 1671, 76, ++ 42, 236, 266, 44, 74, 364, 117, 38, 117, 55, ++ 39, 44, 333, 335, 213, 49, 149, 108, 61, 333, ++ 1127, 38, 1671, 1319, 44, 39, 2247, 935, 108, 138, ++ 76, 106, 74, 44, 202, 108, 58, 85, 333, 967, ++ 167, 1415, 554, 231, 74, 333, 47, 1114, 743, 76, ++ 106, 85, 1703, 42, 44, 42, 236, 44, 42, 44, ++ 74, 268, 202, 332, 44, 333, 333, 245, 38, 213, ++ 140, 42, 1511, 44, 42, 172, 42, 44, 170, 44, ++ 74, 231, 333, 245, 346, 300, 314, 76, 42, 967, ++ 42, 140, 74, 76, 42, 44, 74, 71, 333, 1415, ++ 44, 42, 76, 106, 44, 42, 108, 74, 149, 1159, ++ 266, 268, 74, 76, 181, 333, 103, 333, 967, 198, ++ 85, 277, 108, 53, 428, 42, 236, 135, 44, 135, ++ 74, 44, 71, 1413, 2022, 421, 38, 1093, 1190, 1260, ++ 140, 4830, 261, 3166, 261, 265, 197, 201, 261, 265, ++ 261, 265, 197, 201, 261, 41, 41, 41, 94, 229, ++ 265, 453, 261, 264, 261, 264, 261, 264, 165, 69, ++ 137, 40, 56, 37, 120, 101, 69, 137, 40, 120, ++ 133, 69, 137, 120, 261, 169, 120, 101, 69, 137, ++ 40, 88, 381, 162, 209, 85, 52, 51, 54, 84, ++ 51, 54, 52, 277, 59, 60, 162, 61, 309, 52, ++ 51, 149, 80, 117, 57, 54, 50, 373, 57, 53, ++ 48, 341, 61, 162, 194, 47, 38, 207, 121, 54, ++ 50, 38, 335, 121, 54, 50, 422, 855, 428, 139, ++ 44, 107, 396, 90, 41, 154, 41, 90, 37, 105, ++ 69, 105, 37, 58, 41, 90, 57, 169, 218, 41, ++ 58, 41, 58, 41, 58, 137, 58, 37, 137, 37, ++ 135, 37, 90, 69, 73, 185, 94, 101, 58, 57, ++ 90, 37, 58, 527, 1134, 94, 142, 47, 185, 186, ++ 89, 154, 57, 90, 57, 90, 57, 250, 57, 1018, ++ 89, 90, 57, 58, 57, 1018, 8601, 282, 153, 666, ++ 89, 250, 54, 50, 2618, 57, 986, 825, 1306, 217, ++ 602, 1274, 378, 1935, 2522, 719, 5882, 57, 314, 57, ++ 1754, 281, 3578, 57, 4634, 3322, 54, 50, 54, 50, ++ 54, 50, 54, 50, 54, 50, 54, 50, 54, 50, ++ 975, 1434, 185, 54, 50, 1017, 54, 50, 54, 50, ++ 54, 50, 54, 50, 54, 50, 537, 8218, 4217, 54, ++ 50, 54, 50, 54, 50, 54, 50, 54, 50, 54, ++ 50, 54, 50, 54, 50, 54, 50, 54, 50, 54, ++ 50, 2041, 54, 50, 54, 50, 1049, 54, 50, 8281, ++ 1562, 697, 90, 217, 346, 1513, 1509, 126, 73, 69, ++ 254, 105, 37, 94, 37, 94, 165, 70, 105, 37, ++ 3166, 37, 218, 158, 108, 94, 149, 47, 85, 1221, ++ 37, 37, 1799, 38, 53, 44, 743, 231, 231, 231, ++ 231, 231, 231, 231, 231, 1036, 85, 52, 51, 52, ++ 51, 117, 52, 51, 53, 52, 51, 309, 49, 85, ++ 49, 53, 52, 51, 85, 52, 51, 54, 50, 54, ++ 50, 54, 50, 54, 50, 181, 38, 341, 81, 858, ++ 2874, 6874, 410, 61, 117, 58, 38, 39, 46, 54, ++ 50, 54, 50, 54, 50, 54, 50, 54, 50, 90, ++ 54, 50, 54, 50, 54, 50, 54, 50, 49, 54, ++ 82, 58, 302, 140, 74, 49, 166, 90, 110, 38, ++ 39, 53, 90, 2759, 76, 88, 70, 39, 49, 2887, ++ 53, 102, 39, 1319, 3015, 90, 143, 346, 871, 1178, ++ 519, 1018, 335, 986, 271, 58, 495, 1050, 335, 1274, ++ 495, 2042, 8218, 39, 39, 2074, 39, 39, 679, 38, ++ 36583, 1786, 1287, 198, 85, 8583, 38, 117, 519, 333, ++ 71, 1502, 39, 44, 107, 53, 332, 53, 38, 798, ++ 44, 2247, 334, 76, 213, 760, 294, 88, 478, 69, ++ 2014, 38, 261, 190, 350, 38, 88, 158, 158, 382, ++ 70, 37, 231, 44, 103, 44, 135, 44, 743, 74, ++ 76, 42, 154, 207, 90, 55, 58, 1671, 149, 74, ++ 1607, 522, 44, 85, 333, 588, 199, 117, 39, 333, ++ 903, 268, 85, 743, 364, 74, 53, 935, 108, 42, ++ 1511, 44, 74, 140, 74, 44, 138, 437, 38, 333, ++ 85, 1319, 204, 74, 76, 74, 76, 103, 44, 263, ++ 44, 42, 333, 149, 519, 38, 199, 122, 39, 42, ++ 1543, 44, 39, 108, 71, 76, 167, 76, 39, 44, ++ 39, 71, 38, 85, 359, 42, 76, 74, 85, 39, ++ 70, 42, 44, 199, 199, 199, 231, 231, 1127, 74, ++ 44, 74, 44, 74, 53, 42, 44, 333, 39, 39, ++ 743, 1575, 36, 68, 68, 36, 63, 63, 11719, 3399, ++ 229, 165, 39, 44, 327, 57, 423, 167, 39, 71, ++ 71, 3463, 536, 11623, 54, 50, 2055, 1735, 391, 55, ++ 58, 524, 245, 54, 50, 53, 236, 53, 81, 80, ++ 54, 50, 54, 50, 54, 50, 54, 50, 54, 50, ++ 54, 50, 54, 50, 54, 50, 85, 54, 50, 149, ++ 112, 117, 149, 49, 54, 50, 54, 50, 54, 50, ++ 117, 57, 49, 121, 53, 55, 85, 167, 4327, 34, ++ 117, 55, 117, 54, 50, 53, 57, 53, 49, 85, ++ 333, 85, 121, 85, 841, 54, 53, 50, 56, 48, ++ 56, 837, 54, 57, 50, 57, 54, 50, 53, 54, ++ 50, 85, 327, 38, 1447, 70, 999, 199, 199, 199, ++ 103, 87, 57, 56, 58, 87, 58, 153, 90, 98, ++ 90, 391, 839, 615, 71, 487, 455, 3943, 117, 1455, ++ 314, 1710, 143, 570, 47, 410, 1466, 44, 935, 1575, ++ 999, 143, 551, 46, 263, 46, 967, 53, 1159, 263, ++ 53, 174, 1289, 1285, 2503, 333, 199, 39, 1415, 71, ++ 39, 743, 53, 271, 711, 207, 53, 839, 53, 1799, ++ 71, 39, 108, 76, 140, 135, 103, 871, 108, 44, ++ 271, 309, 935, 79, 53, 1735, 245, 711, 271, 615, ++ 271, 2343, 1007, 42, 44, 42, 1703, 492, 245, 655, ++ 333, 76, 42, 1447, 106, 140, 74, 76, 85, 34, ++ 149, 807, 333, 108, 1159, 172, 42, 268, 333, 149, ++ 76, 42, 1543, 106, 300, 74, 135, 149, 333, 1383, ++ 44, 42, 44, 74, 204, 42, 44, 333, 28135, 3182, ++ 149, 34279, 18215, 2215, 39, 1482, 140, 422, 71, 7898, ++ 1274, 1946, 74, 108, 122, 202, 258, 268, 90, 236, ++ 986, 140, 1562, 2138, 108, 58, 2810, 591, 841, 837, ++ 841, 229, 581, 841, 837, 41, 73, 41, 73, 137, ++ 265, 133, 37, 229, 357, 841, 837, 73, 137, 265, ++ 233, 837, 73, 137, 169, 41, 233, 837, 841, 837, ++ 841, 837, 841, 837, 841, 837, 841, 837, 841, 901, ++ 809, 57, 805, 57, 197, 809, 57, 805, 57, 197, ++ 809, 57, 805, 57, 197, 809, 57, 805, 57, 197, ++ 809, 57, 805, 57, 197, 94, 1613, 135, 871, 71, ++ 39, 39, 327, 135, 39, 39, 39, 39, 39, 39, ++ 103, 71, 39, 39, 39, 39, 39, 39, 71, 39, ++ 135, 231, 135, 135, 39, 327, 551, 103, 167, 551, ++ 89, 1434, 3226, 506, 474, 506, 506, 367, 1018, 1946, ++ 1402, 954, 1402, 314, 90, 1082, 218, 2266, 666, 1210, ++ 186, 570, 2042, 58, 5850, 154, 2010, 154, 794, 2266, ++ 378, 2266, 3738, 39, 39, 39, 39, 39, 39, 17351, ++ 34, 3074, 7692, 63, 63, ++ }; ++ ++int sqlite3Fts5UnicodeCategory(u32 iCode) { ++ int iRes = -1; ++ int iHi; ++ int iLo; ++ int ret; ++ u16 iKey; ++ ++ if( iCode>=(1<<20) ){ ++ return 0; ++ } ++ iLo = aFts5UnicodeBlock[(iCode>>16)]; ++ iHi = aFts5UnicodeBlock[1+(iCode>>16)]; ++ iKey = (iCode & 0xFFFF); ++ while( iHi>iLo ){ ++ int iTest = (iHi + iLo) / 2; ++ assert( iTest>=iLo && iTest=aFts5UnicodeMap[iTest] ){ ++ iRes = iTest; ++ iLo = iTest+1; ++ }else{ ++ iHi = iTest; ++ } ++ } ++ ++ if( iRes<0 ) return 0; ++ if( iKey>=(aFts5UnicodeMap[iRes]+(aFts5UnicodeData[iRes]>>5)) ) return 0; ++ ret = aFts5UnicodeData[iRes] & 0x1F; ++ if( ret!=30 ) return ret; ++ return ((iKey - aFts5UnicodeMap[iRes]) & 0x01) ? 5 : 9; ++} ++ ++void sqlite3Fts5UnicodeAscii(u8 *aArray, u8 *aAscii){ ++ int i = 0; ++ int iTbl = 0; ++ while( i<128 ){ ++ int bToken = aArray[ aFts5UnicodeData[iTbl] & 0x1F ]; ++ int n = (aFts5UnicodeData[iTbl] >> 5) + i; ++ for(; i<128 && i ++#include ++ ++typedef uint8_t u8; ++typedef uint16_t u16; ++typedef uint16_t u32; ++ ++#include "fts5_unicode2.c" ++ ++/* ++** The following macro - WRITE_UTF8 - have been copied ++** from the sqlite3 source file: ++*https://github.com/sqlite/sqlite/blob/88282af521692b398b0d0cc58a8bdb220a8ff58c/ext/fts5/fts5_tokenize.c. ++*/ ++static const unsigned char sqlite3Utf8Trans1[] = { ++ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, ++ 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, ++ 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x00, ++ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, ++ 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, ++ 0x07, 0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00, ++}; ++ ++#define READ_UTF8(zIn, zTerm, c) \ ++ c = *(zIn++); \ ++ if (c >= 0xc0) { \ ++ c = sqlite3Utf8Trans1[c - 0xc0]; \ ++ while (zIn < zTerm && (*zIn & 0xc0) == 0x80) { \ ++ c = (c << 6) + (0x3f & *(zIn++)); \ ++ } \ ++ if (c < 0x80 || (c & 0xFFFFF800) == 0xD800 || \ ++ (c & 0xFFFFFFFE) == 0xFFFE) { \ ++ c = 0xFFFD; \ ++ } \ ++ } ++ ++#define WRITE_UTF8(zOut, c) \ ++ { \ ++ if (c < 0x00080) { \ ++ *zOut++ = (unsigned char)(c & 0xFF); \ ++ } else if (c < 0x00800) { \ ++ *zOut++ = 0xC0 + (unsigned char)((c >> 6) & 0x1F); \ ++ *zOut++ = 0x80 + (unsigned char)(c & 0x3F); \ ++ } else if (c < 0x10000) { \ ++ *zOut++ = 0xE0 + (unsigned char)((c >> 12) & 0x0F); \ ++ *zOut++ = 0x80 + (unsigned char)((c >> 6) & 0x3F); \ ++ *zOut++ = 0x80 + (unsigned char)(c & 0x3F); \ ++ } else { \ ++ *zOut++ = 0xF0 + (unsigned char)((c >> 18) & 0x07); \ ++ *zOut++ = 0x80 + (unsigned char)((c >> 12) & 0x3F); \ ++ *zOut++ = 0x80 + (unsigned char)((c >> 6) & 0x3F); \ ++ *zOut++ = 0x80 + (unsigned char)(c & 0x3F); \ ++ } \ ++ } ++ ++#define FTS5_SKIP_UTF8(zIn) \ ++ { \ ++ if (((unsigned char)(*(zIn++))) >= 0xc0) { \ ++ while ((((unsigned char)*zIn) & 0xc0) == 0x80) { \ ++ zIn++; \ ++ } \ ++ } \ ++ } ++ ++static const int CJK[6][2] = {{0x3400, 0x4DBF}, {0x4E00, 0x9FFF}, ++ {0xF900, 0xFAFF}, {0x20000, 0x2EBEF}, ++ {0x2F800, 0x2FA1F}, {0x30000, 0x3134F}}; ++// https://jrgraphix.net/research/unicode_blocks.php ++// https://en.wikipedia.org/wiki/CJK_Unified_Ideographs ++// 3400 — 4DBF CJK Unified Ideographs Extension A ++// 4E00 — 9FFF CJK Unified Ideographs ++// F900 — FAFF CJK Compatibility Ideographs ++// 20000 — 2A6DF 2A700-2B73F 2B740–2B81F. 2B820–2CEAF. 2CEB0–2EBEF. CJK ++// Unified Ideographs Extension B/C/D/E/F 2F800 — 2FA1F CJK ++// Compatibility Ideographs Supplement ++// 30000–3134F. CJK Unified Ideographs Extension G ++static inline int isCJK(int iCode) { ++ for (int i = 0; i < 6; i++) { ++ if (iCode < CJK[i][0]) { // smaller ++ break; ++ } ++ if (iCode <= CJK[i][1]) { // in range ++ return 1; ++ } ++ // bigger than range ++ } ++ return 0; ++} ++ ++/* Function to optionally fold case and remove diacritics */ ++static inline int customFold(int iCode, int foldCase, int removeDiacritics) { ++ if (iCode == 0) ++ return iCode; ++ if (foldCase) ++ return sqlite3Fts5UnicodeFold(iCode, removeDiacritics); ++ return iCode; ++} ++ ++static void tokenize(const char *pText, int nText, int foldCase, ++ int removeDiacritics, void *pCtx, ++ int (*xToken)(void *, int, const char *, int, int, int)) { ++ const unsigned char *zIn = (const unsigned char *)pText; ++ const unsigned char *zEnd = zIn + nText; ++ char aBuf[32]; /* Buffer for trigram tokens */ ++ char *zOut = aBuf; ++ int iCode; ++ int aStart[3]; // offsets for each character in a trigram ++ int i = 0; // index inside the trigram ++ int isPartial = 0; // flag to indicate we are in the middle of a word ++ ++ while (zIn < zEnd) { ++ int start; ++ ++ do { ++ start = zIn - (const unsigned char *)pText; ++ READ_UTF8(zIn, zEnd, iCode); ++ if (iCode == 0) ++ break; ++ iCode = customFold(iCode, foldCase, removeDiacritics); ++ } while (iCode == 0); ++ ++ if (iCode == 0) ++ break; ++ ++ if (i == 3) { ++ int result = xToken(pCtx, 0, aBuf, zOut - aBuf, aStart[0], start); ++ if (result != 0) ++ break; ++ ++ // remove first UTF-8 character from aBuf ++ const char *z1 = aBuf; ++ FTS5_SKIP_UTF8(z1); ++ memmove(aBuf, z1, zOut - z1); ++ // seek zOut back 1 step so we can add the next character ++ // of the trigram ++ zOut = zOut - (z1 - aBuf); ++ ++ // swap the offsets ++ aStart[0] = aStart[1]; ++ aStart[1] = aStart[2]; ++ ++ i--; ++ isPartial = 1; ++ } ++ ++ int cjk = isCJK(iCode); ++ int isSpace = iCode == 32; ++ if (isSpace || cjk) { ++ // write words smaller than 3 characters directly to output ++ // but make sure we aren't at the end of a word ++ if (!isPartial && i && i < 3) { ++ int result = xToken(pCtx, 0, aBuf, zOut - aBuf, aStart[0], start); ++ if (result != 0) ++ break; ++ } ++ ++ if (cjk) { ++ zOut = aBuf; ++ WRITE_UTF8(zOut, iCode); ++ ++ int result = ++ xToken(pCtx, 0, aBuf, zOut - aBuf, start, start + (zOut - aBuf)); ++ if (result != 0) ++ break; ++ } ++ ++ // reset for next word ++ isPartial = 0; ++ i = 0; ++ zOut = aBuf; ++ continue; ++ } ++ ++ aStart[i++] = start; ++ WRITE_UTF8(zOut, iCode); ++ } ++ ++ // write out the remaining tokens if any ++ if (i > 0) { ++ xToken(pCtx, 0, aBuf, zOut - aBuf, aStart[0], ++ zIn - (const unsigned char *)pText); ++ } ++} +diff --git a/node_modules/react-native-quick-sqlite/cpp/sqlite3.c b/node_modules/react-native-quick-sqlite/cpp/sqlite3.c +index 51d5dbd..f1295eb 100644 +--- a/node_modules/react-native-quick-sqlite/cpp/sqlite3.c ++++ b/node_modules/react-native-quick-sqlite/cpp/sqlite3.c +@@ -1,6 +1,139 @@ ++/* ++** Name: sqlite3mc.c ++** Purpose: Amalgamation of the SQLite3 Multiple Ciphers encryption extension for SQLite ++** Author: Ulrich Telle ++** Created: 2020-02-28 ++** Copyright: (c) 2006-2022 Ulrich Telle ++** License: MIT ++*/ ++ ++/* ++** Force some options required for WASM builds ++*/ ++ ++#ifdef __WASM__ ++ ++/* Disable User Authentication Extension */ ++#ifdef SQLITE_USER_AUTHENTICATION ++#undef SQLITE_USER_AUTHENTICATION ++#endif ++#define SQLITE_USER_AUTHENTICATION 0 ++ ++/* Disable AES hardware support */ ++/* Note: this may be changed in the future depending on available support */ ++#ifdef SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT ++#undef SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT ++#endif ++#define SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT 1 ++ ++#endif ++ ++/* ++** Enable SQLite debug assertions if requested ++*/ ++ ++#ifndef SQLITE_DEBUG ++#if defined(SQLITE_ENABLE_DEBUG) && (SQLITE_ENABLE_DEBUG == 1) ++#define SQLITE_DEBUG 1 ++#endif ++#endif ++ ++/* ++** Define function for extra initialization and extra shutdown ++** ++** The extra initialization function registers an extension function ++** which will be automatically executed for each new database connection. ++** ++** The extra shutdown function will be executed on the invocation of sqlite3_shutdown. ++** All created multiple ciphers VFSs will be unregistered and destroyed. ++*/ ++ ++#define SQLITE_EXTRA_INIT sqlite3mc_initialize ++#define SQLITE_EXTRA_SHUTDOWN sqlite3mc_shutdown ++ ++int sqlite3mc_initialize(const char* arg); ++void sqlite3mc_shutdown(void); ++ ++/* ++** To enable the extension functions define SQLITE_ENABLE_EXTFUNC on compiling this module ++** To enable the reading CSV files define SQLITE_ENABLE_CSV on compiling this module ++** To enable the SHA3 support define SQLITE_ENABLE_SHA3 on compiling this module ++** To enable the CARRAY support define SQLITE_ENABLE_CARRAY on compiling this module ++** To enable the FILEIO support define SQLITE_ENABLE_FILEIO on compiling this module ++** To enable the SERIES support define SQLITE_ENABLE_SERIES on compiling this module ++** To enable the UUID support define SQLITE_ENABLE_UUID on compiling this module ++*/ ++ ++/* ++** Enable the user authentication feature ++*/ ++#if !SQLITE_USER_AUTHENTICATION ++/* Option not defined or explicitly disabled */ ++#ifndef SQLITE_USER_AUTHENTICATION ++/* Option not defined, therefore enable by default */ ++#define SQLITE_USER_AUTHENTICATION 1 ++#else ++/* Option defined and disabled, therefore undefine option */ ++#undef SQLITE_USER_AUTHENTICATION ++#endif ++#endif ++ ++#if defined(_WIN32) || defined(WIN32) ++ ++#ifndef SQLITE3MC_USE_RAND_S ++#define SQLITE3MC_USE_RAND_S 1 ++#endif ++ ++#if SQLITE3MC_USE_RAND_S ++/* Force header stdlib.h to define rand_s() */ ++#if !defined(_CRT_RAND_S) ++#define _CRT_RAND_S ++#endif ++ ++#else /* !WIN32 */ ++ ++/* Define this before is included to */ ++/* retrieve memset_s() declaration if available. */ ++#define __STDC_WANT_LIB_EXT1__ 1 ++ ++#endif ++ ++#ifndef SQLITE_API ++#define SQLITE_API ++#endif ++ ++/* ++** We need to do the following check here BEFORE including , ++** because the header is included from somewhere within ++** , and we need support for the new Neon intrinsics, if ++** AES hardware support is enabled. ++*/ ++#if defined (_MSC_VER) ++#if defined _M_ARM ++#define _ARM_USE_NEW_NEON_INTRINSICS ++#endif ++#endif ++ ++#include ++ ++/* SQLite functions only needed on Win32 */ ++extern SQLITE_API void sqlite3_win32_write_debug(const char*, int); ++extern SQLITE_API char *sqlite3_win32_unicode_to_utf8(LPCWSTR); ++extern SQLITE_API char *sqlite3_win32_mbcs_to_utf8(const char*); ++extern SQLITE_API char *sqlite3_win32_mbcs_to_utf8_v2(const char*, int); ++extern SQLITE_API char *sqlite3_win32_utf8_to_mbcs(const char*); ++extern SQLITE_API char *sqlite3_win32_utf8_to_mbcs_v2(const char*, int); ++extern SQLITE_API LPWSTR sqlite3_win32_utf8_to_unicode(const char*); ++#endif ++ ++/* ++** Include SQLite3 amalgamation ++*/ ++/* #include "sqlite3patched.c" */ ++/*** Begin of #include "sqlite3patched.c" ***/ + /****************************************************************************** + ** This file is an amalgamation of many separate C source files from SQLite +-** version 3.39.4. By combining all the individual C code files into this ++** version 3.45.1. By combining all the individual C code files into this + ** single large file, the entire code can be compiled as a single translation + ** unit. This allows many compilers to do optimizations that would not be + ** possible if the files were compiled separately. Performance improvements +@@ -16,6 +149,9 @@ + ** if you want a wrapper to interface SQLite with your choice of programming + ** language. The code for the "sqlite3" command-line shell is also in a + ** separate file. This file contains only code for the core SQLite library. ++** ++** The content in this amalgamation comes from Fossil check-in ++** e876e51a0ed5c5b3126f52e532044363a014. + */ + #define SQLITE_CORE 1 + #define SQLITE_AMALGAMATION 1 +@@ -50,11 +186,11 @@ + ** used on lines of code that actually + ** implement parts of coverage testing. + ** +-** OPTIMIZATION-IF-TRUE - This branch is allowed to alway be false ++** OPTIMIZATION-IF-TRUE - This branch is allowed to always be false + ** and the correct answer is still obtained, + ** though perhaps more slowly. + ** +-** OPTIMIZATION-IF-FALSE - This branch is allowed to alway be true ++** OPTIMIZATION-IF-FALSE - This branch is allowed to always be true + ** and the correct answer is still obtained, + ** though perhaps more slowly. + ** +@@ -123,6 +259,10 @@ + #define SQLITE_4_BYTE_ALIGNED_MALLOC + #endif /* defined(_MSC_VER) && !defined(_WIN64) */ + ++#if !defined(HAVE_LOG2) && defined(_MSC_VER) && _MSC_VER<1800 ++#define HAVE_LOG2 0 ++#endif /* !defined(HAVE_LOG2) && defined(_MSC_VER) && _MSC_VER<1800 */ ++ + #endif /* SQLITE_MSVC_H */ + + /************** End of msvc.h ************************************************/ +@@ -452,9 +592,9 @@ extern "C" { + ** [sqlite3_libversion_number()], [sqlite3_sourceid()], + ** [sqlite_version()] and [sqlite_source_id()]. + */ +-#define SQLITE_VERSION "3.39.4" +-#define SQLITE_VERSION_NUMBER 3039004 +-#define SQLITE_SOURCE_ID "2022-09-29 15:55:41 a29f9949895322123f7c38fbe94c649a9d6e6c9cd0c3b41c96d694552f26b309" ++#define SQLITE_VERSION "3.45.1" ++#define SQLITE_VERSION_NUMBER 3045001 ++#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +@@ -834,6 +974,7 @@ SQLITE_API int sqlite3_exec( + #define SQLITE_IOERR_ROLLBACK_ATOMIC (SQLITE_IOERR | (31<<8)) + #define SQLITE_IOERR_DATA (SQLITE_IOERR | (32<<8)) + #define SQLITE_IOERR_CORRUPTFS (SQLITE_IOERR | (33<<8)) ++#define SQLITE_IOERR_IN_PAGE (SQLITE_IOERR | (34<<8)) + #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) + #define SQLITE_LOCKED_VTAB (SQLITE_LOCKED | (2<<8)) + #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) +@@ -869,6 +1010,7 @@ SQLITE_API int sqlite3_exec( + #define SQLITE_CONSTRAINT_DATATYPE (SQLITE_CONSTRAINT |(12<<8)) + #define SQLITE_NOTICE_RECOVER_WAL (SQLITE_NOTICE | (1<<8)) + #define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8)) ++#define SQLITE_NOTICE_RBU (SQLITE_NOTICE | (3<<8)) + #define SQLITE_WARNING_AUTOINDEX (SQLITE_WARNING | (1<<8)) + #define SQLITE_AUTH_USER (SQLITE_AUTH | (1<<8)) + #define SQLITE_OK_LOAD_PERMANENTLY (SQLITE_OK | (1<<8)) +@@ -976,13 +1118,17 @@ SQLITE_API int sqlite3_exec( + ** + ** SQLite uses one of these integer values as the second + ** argument to calls it makes to the xLock() and xUnlock() methods +-** of an [sqlite3_io_methods] object. ++** of an [sqlite3_io_methods] object. These values are ordered from ++** lest restrictive to most restrictive. ++** ++** The argument to xLock() is always SHARED or higher. The argument to ++** xUnlock is either SHARED or NONE. + */ +-#define SQLITE_LOCK_NONE 0 +-#define SQLITE_LOCK_SHARED 1 +-#define SQLITE_LOCK_RESERVED 2 +-#define SQLITE_LOCK_PENDING 3 +-#define SQLITE_LOCK_EXCLUSIVE 4 ++#define SQLITE_LOCK_NONE 0 /* xUnlock() only */ ++#define SQLITE_LOCK_SHARED 1 /* xLock() or xUnlock() */ ++#define SQLITE_LOCK_RESERVED 2 /* xLock() only */ ++#define SQLITE_LOCK_PENDING 3 /* xLock() only */ ++#define SQLITE_LOCK_EXCLUSIVE 4 /* xLock() only */ + + /* + ** CAPI3REF: Synchronization Type Flags +@@ -1060,7 +1206,14 @@ struct sqlite3_file { + **
  • [SQLITE_LOCK_PENDING], or + **
  • [SQLITE_LOCK_EXCLUSIVE]. + ** +-** xLock() increases the lock. xUnlock() decreases the lock. ++** xLock() upgrades the database file lock. In other words, xLock() moves the ++** database file lock in the direction NONE toward EXCLUSIVE. The argument to ++** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never ++** SQLITE_LOCK_NONE. If the database file lock is already at or above the ++** requested lock, then the call to xLock() is a no-op. ++** xUnlock() downgrades the database file lock to either SHARED or NONE. ++* If the lock is already at or below the requested lock state, then the call ++** to xUnlock() is a no-op. + ** The xCheckReservedLock() method checks whether any database connection, + ** either in this process or in some other process, is holding a RESERVED, + ** PENDING, or EXCLUSIVE lock on the file. It returns true +@@ -1165,9 +1318,8 @@ struct sqlite3_io_methods { + ** opcode causes the xFileControl method to write the current state of + ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED], + ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE]) +-** into an integer that the pArg argument points to. This capability +-** is used during testing and is only available when the SQLITE_TEST +-** compile-time option is used. ++** into an integer that the pArg argument points to. ++** This capability is only available if SQLite is compiled with [SQLITE_DEBUG]. + ** + **
  • [[SQLITE_FCNTL_SIZE_HINT]] + ** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS +@@ -1471,7 +1623,6 @@ struct sqlite3_io_methods { + ** in wal mode after the client has finished copying pages from the wal + ** file to the database file, but before the *-shm file is updated to + ** record the fact that the pages have been checkpointed. +-** + ** + **
  • [[SQLITE_FCNTL_EXTERNAL_READER]] + ** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect +@@ -1484,10 +1635,16 @@ struct sqlite3_io_methods { + ** the database is not a wal-mode db, or if there is no such connection in any + ** other process. This opcode cannot be used to detect transactions opened + ** by clients within the current process, only within other processes. +-** + ** + **
  • [[SQLITE_FCNTL_CKSM_FILE]] +-** Used by the cksmvfs VFS module only. ++** The [SQLITE_FCNTL_CKSM_FILE] opcode is for use internally by the ++** [checksum VFS shim] only. ++** ++**
  • [[SQLITE_FCNTL_RESET_CACHE]] ++** If there is currently no transaction open on the database, and the ++** database is not a temp db, then the [SQLITE_FCNTL_RESET_CACHE] file-control ++** purges the contents of the in-memory page cache. If there is an open ++** transaction, or if the db is a temp-db, this opcode is a no-op, not an error. + ** + */ + #define SQLITE_FCNTL_LOCKSTATE 1 +@@ -1530,6 +1687,7 @@ struct sqlite3_io_methods { + #define SQLITE_FCNTL_CKPT_START 39 + #define SQLITE_FCNTL_EXTERNAL_READER 40 + #define SQLITE_FCNTL_CKSM_FILE 41 ++#define SQLITE_FCNTL_RESET_CACHE 42 + + /* deprecated names */ + #define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE +@@ -1559,6 +1717,26 @@ typedef struct sqlite3_mutex sqlite3_mutex; + */ + typedef struct sqlite3_api_routines sqlite3_api_routines; + ++/* ++** CAPI3REF: File Name ++** ++** Type [sqlite3_filename] is used by SQLite to pass filenames to the ++** xOpen method of a [VFS]. It may be cast to (const char*) and treated ++** as a normal, nul-terminated, UTF-8 buffer containing the filename, but ++** may also be passed to special APIs such as: ++** ++**
      ++**
    • sqlite3_filename_database() ++**
    • sqlite3_filename_journal() ++**
    • sqlite3_filename_wal() ++**
    • sqlite3_uri_parameter() ++**
    • sqlite3_uri_boolean() ++**
    • sqlite3_uri_int64() ++**
    • sqlite3_uri_key() ++**
    ++*/ ++typedef const char *sqlite3_filename; ++ + /* + ** CAPI3REF: OS Interface Object + ** +@@ -1737,7 +1915,7 @@ struct sqlite3_vfs { + sqlite3_vfs *pNext; /* Next registered VFS */ + const char *zName; /* Name of this virtual file system */ + void *pAppData; /* Pointer to application-specific data */ +- int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*, ++ int (*xOpen)(sqlite3_vfs*, sqlite3_filename zName, sqlite3_file*, + int flags, int *pOutFlags); + int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir); + int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut); +@@ -1924,20 +2102,23 @@ SQLITE_API int sqlite3_os_end(void); + ** must ensure that no other SQLite interfaces are invoked by other + ** threads while sqlite3_config() is running. + ** +-** The sqlite3_config() interface +-** may only be invoked prior to library initialization using +-** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()]. +-** ^If sqlite3_config() is called after [sqlite3_initialize()] and before +-** [sqlite3_shutdown()] then it will return SQLITE_MISUSE. +-** Note, however, that ^sqlite3_config() can be called as part of the +-** implementation of an application-defined [sqlite3_os_init()]. +-** + ** The first argument to sqlite3_config() is an integer + ** [configuration option] that determines + ** what property of SQLite is to be configured. Subsequent arguments + ** vary depending on the [configuration option] + ** in the first argument. + ** ++** For most configuration options, the sqlite3_config() interface ++** may only be invoked prior to library initialization using ++** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()]. ++** The exceptional configuration options that may be invoked at any time ++** are called "anytime configuration options". ++** ^If sqlite3_config() is called after [sqlite3_initialize()] and before ++** [sqlite3_shutdown()] with a first argument that is not an anytime ++** configuration option, then the sqlite3_config() call will return SQLITE_MISUSE. ++** Note, however, that ^sqlite3_config() can be called as part of the ++** implementation of an application-defined [sqlite3_os_init()]. ++** + ** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK]. + ** ^If the option is unknown or SQLite is unable to set the option + ** then this routine returns a non-zero [error code]. +@@ -2045,6 +2226,23 @@ struct sqlite3_mem_methods { + ** These constants are the available integer configuration options that + ** can be passed as the first argument to the [sqlite3_config()] interface. + ** ++** Most of the configuration options for sqlite3_config() ++** will only work if invoked prior to [sqlite3_initialize()] or after ++** [sqlite3_shutdown()]. The few exceptions to this rule are called ++** "anytime configuration options". ++** ^Calling [sqlite3_config()] with a first argument that is not an ++** anytime configuration option in between calls to [sqlite3_initialize()] and ++** [sqlite3_shutdown()] is a no-op that returns SQLITE_MISUSE. ++** ++** The set of anytime configuration options can change (by insertions ++** and/or deletions) from one release of SQLite to the next. ++** As of SQLite version 3.42.0, the complete set of anytime configuration ++** options is: ++**
      ++**
    • SQLITE_CONFIG_LOG ++**
    • SQLITE_CONFIG_PCACHE_HDRSZ ++**
    ++** + ** New configuration options may be added in future releases of SQLite. + ** Existing configuration options might be discontinued. Applications + ** should check the return code from [sqlite3_config()] to make sure that +@@ -2375,7 +2573,7 @@ struct sqlite3_mem_methods { + ** is stored in each sorted record and the required column values loaded + ** from the database as records are returned in sorted order. The default + ** value for this option is to never use this optimization. Specifying a +-** negative value for this option restores the default behaviour. ++** negative value for this option restores the default behavior. + ** This option is only available if SQLite is compiled with the + ** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option. + ** +@@ -2391,28 +2589,28 @@ struct sqlite3_mem_methods { + ** compile-time option is not set, then the default maximum is 1073741824. + ** + */ +-#define SQLITE_CONFIG_SINGLETHREAD 1 /* nil */ +-#define SQLITE_CONFIG_MULTITHREAD 2 /* nil */ +-#define SQLITE_CONFIG_SERIALIZED 3 /* nil */ +-#define SQLITE_CONFIG_MALLOC 4 /* sqlite3_mem_methods* */ +-#define SQLITE_CONFIG_GETMALLOC 5 /* sqlite3_mem_methods* */ +-#define SQLITE_CONFIG_SCRATCH 6 /* No longer used */ +-#define SQLITE_CONFIG_PAGECACHE 7 /* void*, int sz, int N */ +-#define SQLITE_CONFIG_HEAP 8 /* void*, int nByte, int min */ +-#define SQLITE_CONFIG_MEMSTATUS 9 /* boolean */ +-#define SQLITE_CONFIG_MUTEX 10 /* sqlite3_mutex_methods* */ +-#define SQLITE_CONFIG_GETMUTEX 11 /* sqlite3_mutex_methods* */ +-/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ +-#define SQLITE_CONFIG_LOOKASIDE 13 /* int int */ +-#define SQLITE_CONFIG_PCACHE 14 /* no-op */ +-#define SQLITE_CONFIG_GETPCACHE 15 /* no-op */ +-#define SQLITE_CONFIG_LOG 16 /* xFunc, void* */ +-#define SQLITE_CONFIG_URI 17 /* int */ +-#define SQLITE_CONFIG_PCACHE2 18 /* sqlite3_pcache_methods2* */ +-#define SQLITE_CONFIG_GETPCACHE2 19 /* sqlite3_pcache_methods2* */ ++#define SQLITE_CONFIG_SINGLETHREAD 1 /* nil */ ++#define SQLITE_CONFIG_MULTITHREAD 2 /* nil */ ++#define SQLITE_CONFIG_SERIALIZED 3 /* nil */ ++#define SQLITE_CONFIG_MALLOC 4 /* sqlite3_mem_methods* */ ++#define SQLITE_CONFIG_GETMALLOC 5 /* sqlite3_mem_methods* */ ++#define SQLITE_CONFIG_SCRATCH 6 /* No longer used */ ++#define SQLITE_CONFIG_PAGECACHE 7 /* void*, int sz, int N */ ++#define SQLITE_CONFIG_HEAP 8 /* void*, int nByte, int min */ ++#define SQLITE_CONFIG_MEMSTATUS 9 /* boolean */ ++#define SQLITE_CONFIG_MUTEX 10 /* sqlite3_mutex_methods* */ ++#define SQLITE_CONFIG_GETMUTEX 11 /* sqlite3_mutex_methods* */ ++/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ ++#define SQLITE_CONFIG_LOOKASIDE 13 /* int int */ ++#define SQLITE_CONFIG_PCACHE 14 /* no-op */ ++#define SQLITE_CONFIG_GETPCACHE 15 /* no-op */ ++#define SQLITE_CONFIG_LOG 16 /* xFunc, void* */ ++#define SQLITE_CONFIG_URI 17 /* int */ ++#define SQLITE_CONFIG_PCACHE2 18 /* sqlite3_pcache_methods2* */ ++#define SQLITE_CONFIG_GETPCACHE2 19 /* sqlite3_pcache_methods2* */ + #define SQLITE_CONFIG_COVERING_INDEX_SCAN 20 /* int */ +-#define SQLITE_CONFIG_SQLLOG 21 /* xSqllog, void* */ +-#define SQLITE_CONFIG_MMAP_SIZE 22 /* sqlite3_int64, sqlite3_int64 */ ++#define SQLITE_CONFIG_SQLLOG 21 /* xSqllog, void* */ ++#define SQLITE_CONFIG_MMAP_SIZE 22 /* sqlite3_int64, sqlite3_int64 */ + #define SQLITE_CONFIG_WIN32_HEAPSIZE 23 /* int nByte */ + #define SQLITE_CONFIG_PCACHE_HDRSZ 24 /* int *psz */ + #define SQLITE_CONFIG_PMASZ 25 /* unsigned int szPma */ +@@ -2453,7 +2651,7 @@ struct sqlite3_mem_methods { + ** configuration for a database connection can only be changed when that + ** connection is not currently using lookaside memory, or in other words + ** when the "current value" returned by +-** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero. ++** [sqlite3_db_status](D,[SQLITE_DBSTATUS_LOOKASIDE_USED],...) is zero. + ** Any attempt to change the lookaside memory configuration when lookaside + ** memory is in use leaves the configuration unchanged and returns + ** [SQLITE_BUSY].)^ +@@ -2550,7 +2748,7 @@ struct sqlite3_mem_methods { + ** database handle, SQLite checks if this will mean that there are now no + ** connections at all to the database. If so, it performs a checkpoint + ** operation before closing the connection. This option may be used to +-** override this behaviour. The first parameter passed to this operation ++** override this behavior. The first parameter passed to this operation + ** is an integer - positive to disable checkpoints-on-close, or zero (the + ** default) to enable them, and negative to leave the setting unchanged. + ** The second parameter is a pointer to an integer +@@ -2603,8 +2801,12 @@ struct sqlite3_mem_methods { + **
  • sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0); + ** + ** Because resetting a database is destructive and irreversible, the +-** process requires the use of this obscure API and multiple steps to help +-** ensure that it does not happen by accident. ++** process requires the use of this obscure API and multiple steps to ++** help ensure that it does not happen by accident. Because this ++** feature must be capable of resetting corrupt databases, and ++** shutting down virtual tables may require access to that corrupt ++** storage, the library must abandon any installed virtual tables ++** without calling their xDestroy() methods. + ** + ** [[SQLITE_DBCONFIG_DEFENSIVE]]
    SQLITE_DBCONFIG_DEFENSIVE
    + **
    The SQLITE_DBCONFIG_DEFENSIVE option activates or deactivates the +@@ -2615,6 +2817,7 @@ struct sqlite3_mem_methods { + **
      + **
    • The [PRAGMA writable_schema=ON] statement. + **
    • The [PRAGMA journal_mode=OFF] statement. ++**
    • The [PRAGMA schema_version=N] statement. + **
    • Writes to the [sqlite_dbpage] virtual table. + **
    • Direct writes to [shadow tables]. + **
    +@@ -2642,7 +2845,7 @@ struct sqlite3_mem_methods { + **
    + ** + ** [[SQLITE_DBCONFIG_DQS_DML]] +-**
    SQLITE_DBCONFIG_DQS_DML ++**
    SQLITE_DBCONFIG_DQS_DML
    + **
    The SQLITE_DBCONFIG_DQS_DML option activates or deactivates + ** the legacy [double-quoted string literal] misfeature for DML statements + ** only, that is DELETE, INSERT, SELECT, and UPDATE statements. The +@@ -2651,7 +2854,7 @@ struct sqlite3_mem_methods { + **
    + ** + ** [[SQLITE_DBCONFIG_DQS_DDL]] +-**
    SQLITE_DBCONFIG_DQS_DDL ++**
    SQLITE_DBCONFIG_DQS_DDL
    + **
    The SQLITE_DBCONFIG_DQS option activates or deactivates + ** the legacy [double-quoted string literal] misfeature for DDL statements, + ** such as CREATE TABLE and CREATE INDEX. The +@@ -2660,7 +2863,7 @@ struct sqlite3_mem_methods { + **
    + ** + ** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]] +-**
    SQLITE_DBCONFIG_TRUSTED_SCHEMA ++**
    SQLITE_DBCONFIG_TRUSTED_SCHEMA
    + **
    The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to + ** assume that database schemas are untainted by malicious content. + ** When the SQLITE_DBCONFIG_TRUSTED_SCHEMA option is disabled, SQLite +@@ -2680,7 +2883,7 @@ struct sqlite3_mem_methods { + **
    + ** + ** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]] +-**
    SQLITE_DBCONFIG_LEGACY_FILE_FORMAT ++**
    SQLITE_DBCONFIG_LEGACY_FILE_FORMAT
    + **
    The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates + ** the legacy file format flag. When activated, this flag causes all newly + ** created database file to have a schema format version number (the 4-byte +@@ -2689,7 +2892,7 @@ struct sqlite3_mem_methods { + ** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting, + ** newly created databases are generally not understandable by SQLite versions + ** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there +-** is now scarcely any need to generated database files that are compatible ++** is now scarcely any need to generate database files that are compatible + ** all the way back to version 3.0.0, and so this setting is of little + ** practical use, but is provided so that SQLite can continue to claim the + ** ability to generate new database files that are compatible with version +@@ -2698,8 +2901,40 @@ struct sqlite3_mem_methods { + ** the [VACUUM] command will fail with an obscure error when attempting to + ** process a table with generated columns and a descending index. This is + ** not considered a bug since SQLite versions 3.3.0 and earlier do not support +-** either generated columns or decending indexes. ++** either generated columns or descending indexes. ++**
    ++** ++** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]] ++**
    SQLITE_DBCONFIG_STMT_SCANSTATUS
    ++**
    The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in ++** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears ++** a flag that enables collection of the sqlite3_stmt_scanstatus_v2() ++** statistics. For statistics to be collected, the flag must be set on ++** the database handle both when the SQL statement is prepared and when it ++** is stepped. The flag is set (collection of statistics is enabled) ++** by default. This option takes two arguments: an integer and a pointer to ++** an integer.. The first argument is 1, 0, or -1 to enable, disable, or ++** leave unchanged the statement scanstatus option. If the second argument ++** is not NULL, then the value of the statement scanstatus setting after ++** processing the first argument is written into the integer that the second ++** argument points to. ++**
    ++** ++** [[SQLITE_DBCONFIG_REVERSE_SCANORDER]] ++**
    SQLITE_DBCONFIG_REVERSE_SCANORDER
    ++**
    The SQLITE_DBCONFIG_REVERSE_SCANORDER option changes the default order ++** in which tables and indexes are scanned so that the scans start at the end ++** and work toward the beginning rather than starting at the beginning and ++** working toward the end. Setting SQLITE_DBCONFIG_REVERSE_SCANORDER is the ++** same as setting [PRAGMA reverse_unordered_selects]. This option takes ++** two arguments which are an integer and a pointer to an integer. The first ++** argument is 1, 0, or -1 to enable, disable, or leave unchanged the ++** reverse scan order flag, respectively. If the second argument is not NULL, ++** then 0 or 1 is written into the integer that the second argument points to ++** depending on if the reverse scan order flag is set after processing the ++** first argument. + **
    ++** + ** + */ + #define SQLITE_DBCONFIG_MAINDBNAME 1000 /* const char* */ +@@ -2720,7 +2955,9 @@ struct sqlite3_mem_methods { + #define SQLITE_DBCONFIG_ENABLE_VIEW 1015 /* int int* */ + #define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT 1016 /* int int* */ + #define SQLITE_DBCONFIG_TRUSTED_SCHEMA 1017 /* int int* */ +-#define SQLITE_DBCONFIG_MAX 1017 /* Largest DBCONFIG */ ++#define SQLITE_DBCONFIG_STMT_SCANSTATUS 1018 /* int int* */ ++#define SQLITE_DBCONFIG_REVERSE_SCANORDER 1019 /* int int* */ ++#define SQLITE_DBCONFIG_MAX 1019 /* Largest DBCONFIG */ + + /* + ** CAPI3REF: Enable Or Disable Extended Result Codes +@@ -2942,8 +3179,13 @@ SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*); + ** ^A call to sqlite3_interrupt(D) that occurs when there are no running + ** SQL statements is a no-op and has no effect on SQL statements + ** that are started after the sqlite3_interrupt() call returns. ++** ++** ^The [sqlite3_is_interrupted(D)] interface can be used to determine whether ++** or not an interrupt is currently in effect for [database connection] D. ++** It returns 1 if an interrupt is currently in effect, or 0 otherwise. + */ + SQLITE_API void sqlite3_interrupt(sqlite3*); ++SQLITE_API int sqlite3_is_interrupted(sqlite3*); + + /* + ** CAPI3REF: Determine If An SQL Statement Is Complete +@@ -3561,8 +3803,8 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*, + **
    ^An SQLITE_TRACE_PROFILE callback provides approximately the same + ** information as is provided by the [sqlite3_profile()] callback. + ** ^The P argument is a pointer to the [prepared statement] and the +-** X argument points to a 64-bit integer which is the estimated of +-** the number of nanosecond that the prepared statement took to run. ++** X argument points to a 64-bit integer which is approximately ++** the number of nanoseconds that the prepared statement took to run. + ** ^The SQLITE_TRACE_PROFILE callback is invoked when the statement finishes. + ** + ** [[SQLITE_TRACE_ROW]]
    SQLITE_TRACE_ROW
    +@@ -3594,8 +3836,10 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*, + ** M argument should be the bitwise OR-ed combination of + ** zero or more [SQLITE_TRACE] constants. + ** +-** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides +-** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2(). ++** ^Each call to either sqlite3_trace(D,X,P) or sqlite3_trace_v2(D,M,X,P) ++** overrides (cancels) all prior calls to sqlite3_trace(D,X,P) or ++** sqlite3_trace_v2(D,M,X,P) for the [database connection] D. Each ++** database connection may have at most one trace callback. + ** + ** ^The X callback is invoked whenever any of the events identified by + ** mask M occur. ^The integer return value from the callback is currently +@@ -3625,7 +3869,7 @@ SQLITE_API int sqlite3_trace_v2( + ** + ** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback + ** function X to be invoked periodically during long running calls to +-** [sqlite3_exec()], [sqlite3_step()] and [sqlite3_get_table()] for ++** [sqlite3_step()] and [sqlite3_prepare()] and similar for + ** database connection D. An example use for this + ** interface is to keep a GUI updated during a large query. + ** +@@ -3650,6 +3894,13 @@ SQLITE_API int sqlite3_trace_v2( + ** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their + ** database connections for the meaning of "modify" in this paragraph. + ** ++** The progress handler callback would originally only be invoked from the ++** bytecode engine. It still might be invoked during [sqlite3_prepare()] ++** and similar because those routines might force a reparse of the schema ++** which involves running the bytecode engine. However, beginning with ++** SQLite version 3.41.0, the progress handler callback might also be ++** invoked directly from [sqlite3_prepare()] while analyzing and generating ++** code for complex queries. + */ + SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); + +@@ -3686,13 +3937,18 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); + ** + **
    + ** ^(
    [SQLITE_OPEN_READONLY]
    +-**
    The database is opened in read-only mode. If the database does not +-** already exist, an error is returned.
    )^ ++**
    The database is opened in read-only mode. If the database does ++** not already exist, an error is returned.
    )^ + ** + ** ^(
    [SQLITE_OPEN_READWRITE]
    +-**
    The database is opened for reading and writing if possible, or reading +-** only if the file is write protected by the operating system. In either +-** case the database must already exist, otherwise an error is returned.
    )^ ++**
    The database is opened for reading and writing if possible, or ++** reading only if the file is write protected by the operating ++** system. In either case the database must already exist, otherwise ++** an error is returned. For historical reasons, if opening in ++** read-write mode fails due to OS-level permissions, an attempt is ++** made to open it in read-only mode. [sqlite3_db_readonly()] can be ++** used to determine whether the database is actually ++** read-write.
    )^ + ** + ** ^(
    [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]
    + **
    The database is opened for reading and writing, and is created if +@@ -3730,6 +3986,9 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); + **
    The database is opened [shared cache] enabled, overriding + ** the default shared cache setting provided by + ** [sqlite3_enable_shared_cache()].)^ ++** The [use of shared cache mode is discouraged] and hence shared cache ++** capabilities may be omitted from many builds of SQLite. In such cases, ++** this option is a no-op. + ** + ** ^(
    [SQLITE_OPEN_PRIVATECACHE]
    + **
    The database is opened [shared cache] disabled, overriding +@@ -3745,7 +4004,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); + ** to return an extended result code.
    + ** + ** [[OPEN_NOFOLLOW]] ^(
    [SQLITE_OPEN_NOFOLLOW]
    +-**
    The database filename is not allowed to be a symbolic link
    ++**
    The database filename is not allowed to contain a symbolic link
    + **
    )^ + ** + ** If the 3rd parameter to sqlite3_open_v2() is not one of the +@@ -3949,7 +4208,7 @@ SQLITE_API int sqlite3_open_v2( + ** as F) must be one of: + **
      + **
    • A database filename pointer created by the SQLite core and +-** passed into the xOpen() method of a VFS implemention, or ++** passed into the xOpen() method of a VFS implementation, or + **
    • A filename obtained from [sqlite3_db_filename()], or + **
    • A new filename constructed using [sqlite3_create_filename()]. + **
    +@@ -4004,10 +4263,10 @@ SQLITE_API int sqlite3_open_v2( + ** + ** See the [URI filename] documentation for additional information. + */ +-SQLITE_API const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam); +-SQLITE_API int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault); +-SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64); +-SQLITE_API const char *sqlite3_uri_key(const char *zFilename, int N); ++SQLITE_API const char *sqlite3_uri_parameter(sqlite3_filename z, const char *zParam); ++SQLITE_API int sqlite3_uri_boolean(sqlite3_filename z, const char *zParam, int bDefault); ++SQLITE_API sqlite3_int64 sqlite3_uri_int64(sqlite3_filename, const char*, sqlite3_int64); ++SQLITE_API const char *sqlite3_uri_key(sqlite3_filename z, int N); + + /* + ** CAPI3REF: Translate filenames +@@ -4036,9 +4295,9 @@ SQLITE_API const char *sqlite3_uri_key(const char *zFilename, int N); + ** return value from [sqlite3_db_filename()], then the result is + ** undefined and is likely a memory access violation. + */ +-SQLITE_API const char *sqlite3_filename_database(const char*); +-SQLITE_API const char *sqlite3_filename_journal(const char*); +-SQLITE_API const char *sqlite3_filename_wal(const char*); ++SQLITE_API const char *sqlite3_filename_database(sqlite3_filename); ++SQLITE_API const char *sqlite3_filename_journal(sqlite3_filename); ++SQLITE_API const char *sqlite3_filename_wal(sqlite3_filename); + + /* + ** CAPI3REF: Database File Corresponding To A Journal +@@ -4062,7 +4321,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*); + /* + ** CAPI3REF: Create and Destroy VFS Filenames + ** +-** These interfces are provided for use by [VFS shim] implementations and ++** These interfaces are provided for use by [VFS shim] implementations and + ** are not useful outside of that context. + ** + ** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of +@@ -4104,14 +4363,14 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*); + ** then the corresponding [sqlite3_module.xClose() method should also be + ** invoked prior to calling sqlite3_free_filename(Y). + */ +-SQLITE_API char *sqlite3_create_filename( ++SQLITE_API sqlite3_filename sqlite3_create_filename( + const char *zDatabase, + const char *zJournal, + const char *zWal, + int nParam, + const char **azParam + ); +-SQLITE_API void sqlite3_free_filename(char*); ++SQLITE_API void sqlite3_free_filename(sqlite3_filename); + + /* + ** CAPI3REF: Error Codes And Messages +@@ -4141,14 +4400,17 @@ SQLITE_API void sqlite3_free_filename(char*); + ** + ** + ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language +-** text that describes the error, as either UTF-8 or UTF-16 respectively. ++** text that describes the error, as either UTF-8 or UTF-16 respectively, ++** or NULL if no error message is available. ++** (See how SQLite handles [invalid UTF] for exceptions to this rule.) + ** ^(Memory to hold the error message string is managed internally. + ** The application does not need to worry about freeing the result. + ** However, the error string might be overwritten or deallocated by + ** subsequent calls to other SQLite interface functions.)^ + ** +-** ^The sqlite3_errstr() interface returns the English-language text +-** that describes the [result code], as UTF-8. ++** ^The sqlite3_errstr(E) interface returns the English-language text ++** that describes the [result code] E, as UTF-8, or NULL if E is not an ++** result code for which a text error message is available. + ** ^(Memory to hold the error message string is managed internally + ** and must not be freed by the application)^. + ** +@@ -4609,6 +4871,41 @@ SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt); + */ + SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt); + ++/* ++** CAPI3REF: Change The EXPLAIN Setting For A Prepared Statement ++** METHOD: sqlite3_stmt ++** ++** The sqlite3_stmt_explain(S,E) interface changes the EXPLAIN ++** setting for [prepared statement] S. If E is zero, then S becomes ++** a normal prepared statement. If E is 1, then S behaves as if ++** its SQL text began with "[EXPLAIN]". If E is 2, then S behaves as if ++** its SQL text began with "[EXPLAIN QUERY PLAN]". ++** ++** Calling sqlite3_stmt_explain(S,E) might cause S to be reprepared. ++** SQLite tries to avoid a reprepare, but a reprepare might be necessary ++** on the first transition into EXPLAIN or EXPLAIN QUERY PLAN mode. ++** ++** Because of the potential need to reprepare, a call to ++** sqlite3_stmt_explain(S,E) will fail with SQLITE_ERROR if S cannot be ++** reprepared because it was created using [sqlite3_prepare()] instead of ++** the newer [sqlite3_prepare_v2()] or [sqlite3_prepare_v3()] interfaces and ++** hence has no saved SQL text with which to reprepare. ++** ++** Changing the explain setting for a prepared statement does not change ++** the original SQL text for the statement. Hence, if the SQL text originally ++** began with EXPLAIN or EXPLAIN QUERY PLAN, but sqlite3_stmt_explain(S,0) ++** is called to convert the statement into an ordinary statement, the EXPLAIN ++** or EXPLAIN QUERY PLAN keywords will still appear in the sqlite3_sql(S) ++** output, even though the statement now acts like a normal SQL statement. ++** ++** This routine returns SQLITE_OK if the explain mode is successfully ++** changed, or an error code if the explain mode could not be changed. ++** The explain mode cannot be changed while a statement is active. ++** Hence, it is good practice to call [sqlite3_reset(S)] ++** immediately prior to calling sqlite3_stmt_explain(S,E). ++*/ ++SQLITE_API int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode); ++ + /* + ** CAPI3REF: Determine If A Prepared Statement Has Been Reset + ** METHOD: sqlite3_stmt +@@ -4772,7 +5069,7 @@ typedef struct sqlite3_context sqlite3_context; + ** with it may be passed. ^It is called to dispose of the BLOB or string even + ** if the call to the bind API fails, except the destructor is not called if + ** the third parameter is a NULL pointer or the fourth parameter is negative. +-** ^ (2) The special constant, [SQLITE_STATIC], may be passsed to indicate that ++** ^ (2) The special constant, [SQLITE_STATIC], may be passed to indicate that + ** the application remains responsible for disposing of the object. ^In this + ** case, the object and the provided pointer to it must remain valid until + ** either the prepared statement is finalized or the same SQL parameter is +@@ -5451,20 +5748,33 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); + ** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S + ** back to the beginning of its program. + ** +-** ^If the most recent call to [sqlite3_step(S)] for the +-** [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE], +-** or if [sqlite3_step(S)] has never before been called on S, +-** then [sqlite3_reset(S)] returns [SQLITE_OK]. ++** ^The return code from [sqlite3_reset(S)] indicates whether or not ++** the previous evaluation of prepared statement S completed successfully. ++** ^If [sqlite3_step(S)] has never before been called on S or if ++** [sqlite3_step(S)] has not been called since the previous call ++** to [sqlite3_reset(S)], then [sqlite3_reset(S)] will return ++** [SQLITE_OK]. + ** + ** ^If the most recent call to [sqlite3_step(S)] for the + ** [prepared statement] S indicated an error, then + ** [sqlite3_reset(S)] returns an appropriate [error code]. ++** ^The [sqlite3_reset(S)] interface might also return an [error code] ++** if there were no prior errors but the process of resetting ++** the prepared statement caused a new error. ^For example, if an ++** [INSERT] statement with a [RETURNING] clause is only stepped one time, ++** that one call to [sqlite3_step(S)] might return SQLITE_ROW but ++** the overall statement might still fail and the [sqlite3_reset(S)] call ++** might return SQLITE_BUSY if locking constraints prevent the ++** database change from committing. Therefore, it is important that ++** applications check the return code from [sqlite3_reset(S)] even if ++** no prior call to [sqlite3_step(S)] indicated a problem. + ** + ** ^The [sqlite3_reset(S)] interface does not change the values + ** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S. + */ + SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); + ++ + /* + ** CAPI3REF: Create Or Redefine SQL Functions + ** KEYWORDS: {function creation routines} +@@ -5670,10 +5980,21 @@ SQLITE_API int sqlite3_create_window_function( + ** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in + ** schema structures such as [CHECK constraints], [DEFAULT clauses], + ** [expression indexes], [partial indexes], or [generated columns]. +-** The SQLITE_DIRECTONLY flags is a security feature which is recommended +-** for all [application-defined SQL functions], and especially for functions +-** that have side-effects or that could potentially leak sensitive +-** information. ++**

    ++** The SQLITE_DIRECTONLY flag is recommended for any ++** [application-defined SQL function] ++** that has side-effects or that could potentially leak sensitive information. ++** This will prevent attacks in which an application is tricked ++** into using a database file that has had its schema surreptitiously ++** modified to invoke the application-defined function in ways that are ++** harmful. ++**

    ++** Some people say it is good practice to set SQLITE_DIRECTONLY on all ++** [application-defined SQL functions], regardless of whether or not they ++** are security sensitive, as doing so prevents those functions from being used ++** inside of the database schema, and thus ensures that the database ++** can be inspected and modified using generic tools (such as the [CLI]) ++** that do not have access to the application-defined functions. + ** + ** + ** [[SQLITE_INNOCUOUS]]

    SQLITE_INNOCUOUS
    +@@ -5700,13 +6021,27 @@ SQLITE_API int sqlite3_create_window_function( + **
    + ** + ** [[SQLITE_SUBTYPE]]
    SQLITE_SUBTYPE
    +-** The SQLITE_SUBTYPE flag indicates to SQLite that a function may call ++** The SQLITE_SUBTYPE flag indicates to SQLite that a function might call + ** [sqlite3_value_subtype()] to inspect the sub-types of its arguments. +-** Specifying this flag makes no difference for scalar or aggregate user +-** functions. However, if it is not specified for a user-defined window +-** function, then any sub-types belonging to arguments passed to the window +-** function may be discarded before the window function is called (i.e. +-** sqlite3_value_subtype() will always return 0). ++** This flag instructs SQLite to omit some corner-case optimizations that ++** might disrupt the operation of the [sqlite3_value_subtype()] function, ++** causing it to return zero rather than the correct subtype(). ++** SQL functions that invokes [sqlite3_value_subtype()] should have this ++** property. If the SQLITE_SUBTYPE property is omitted, then the return ++** value from [sqlite3_value_subtype()] might sometimes be zero even though ++** a non-zero subtype was specified by the function argument expression. ++** ++** [[SQLITE_RESULT_SUBTYPE]]
    SQLITE_RESULT_SUBTYPE
    ++** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call ++** [sqlite3_result_subtype()] to cause a sub-type to be associated with its ++** result. ++** Every function that invokes [sqlite3_result_subtype()] should have this ++** property. If it does not, then the call to [sqlite3_result_subtype()] ++** might become a no-op if the function is used as term in an ++** [expression index]. On the other hand, SQL functions that never invoke ++** [sqlite3_result_subtype()] should avoid setting this property, as the ++** purpose of this property is to disable certain optimizations that are ++** incompatible with subtypes. + **
    + ** + */ +@@ -5714,6 +6049,7 @@ SQLITE_API int sqlite3_create_window_function( + #define SQLITE_DIRECTONLY 0x000080000 + #define SQLITE_SUBTYPE 0x000100000 + #define SQLITE_INNOCUOUS 0x000200000 ++#define SQLITE_RESULT_SUBTYPE 0x001000000 + + /* + ** CAPI3REF: Deprecated Functions +@@ -5879,6 +6215,28 @@ SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*); + SQLITE_API int sqlite3_value_nochange(sqlite3_value*); + SQLITE_API int sqlite3_value_frombind(sqlite3_value*); + ++/* ++** CAPI3REF: Report the internal text encoding state of an sqlite3_value object ++** METHOD: sqlite3_value ++** ++** ^(The sqlite3_value_encoding(X) interface returns one of [SQLITE_UTF8], ++** [SQLITE_UTF16BE], or [SQLITE_UTF16LE] according to the current text encoding ++** of the value X, assuming that X has type TEXT.)^ If sqlite3_value_type(X) ++** returns something other than SQLITE_TEXT, then the return value from ++** sqlite3_value_encoding(X) is meaningless. ^Calls to ++** [sqlite3_value_text(X)], [sqlite3_value_text16(X)], [sqlite3_value_text16be(X)], ++** [sqlite3_value_text16le(X)], [sqlite3_value_bytes(X)], or ++** [sqlite3_value_bytes16(X)] might change the encoding of the value X and ++** thus change the return from subsequent calls to sqlite3_value_encoding(X). ++** ++** This routine is intended for used by applications that test and validate ++** the SQLite implementation. This routine is inquiring about the opaque ++** internal state of an [sqlite3_value] object. Ordinary applications should ++** not need to know what the internal state of an sqlite3_value object is and ++** hence should not need to use this interface. ++*/ ++SQLITE_API int sqlite3_value_encoding(sqlite3_value*); ++ + /* + ** CAPI3REF: Finding The Subtype Of SQL Values + ** METHOD: sqlite3_value +@@ -5888,6 +6246,12 @@ SQLITE_API int sqlite3_value_frombind(sqlite3_value*); + ** information can be used to pass a limited amount of context from + ** one SQL function to another. Use the [sqlite3_result_subtype()] + ** routine to set the subtype for the return value of an SQL function. ++** ++** Every [application-defined SQL function] that invoke this interface ++** should include the [SQLITE_SUBTYPE] property in the text ++** encoding argument when the function is [sqlite3_create_function|registered]. ++** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype() ++** might return zero instead of the upstream subtype in some corner cases. + */ + SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*); + +@@ -5931,7 +6295,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*); + ** + ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer + ** when first called if N is less than or equal to zero or if a memory +-** allocate error occurs. ++** allocation error occurs. + ** + ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is + ** determined by the N parameter on first successful call. Changing the +@@ -5986,48 +6350,56 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); + ** METHOD: sqlite3_context + ** + ** These functions may be used by (non-aggregate) SQL functions to +-** associate metadata with argument values. If the same value is passed to +-** multiple invocations of the same SQL function during query execution, under +-** some circumstances the associated metadata may be preserved. An example +-** of where this might be useful is in a regular-expression matching +-** function. The compiled version of the regular expression can be stored as +-** metadata associated with the pattern string. ++** associate auxiliary data with argument values. If the same argument ++** value is passed to multiple invocations of the same SQL function during ++** query execution, under some circumstances the associated auxiliary data ++** might be preserved. An example of where this might be useful is in a ++** regular-expression matching function. The compiled version of the regular ++** expression can be stored as auxiliary data associated with the pattern string. + ** Then as long as the pattern string remains the same, + ** the compiled regular expression can be reused on multiple + ** invocations of the same function. + ** +-** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata ++** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data + ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument + ** value to the application-defined function. ^N is zero for the left-most +-** function argument. ^If there is no metadata ++** function argument. ^If there is no auxiliary data + ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface + ** returns a NULL pointer. + ** +-** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th +-** argument of the application-defined function. ^Subsequent ++** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the ++** N-th argument of the application-defined function. ^Subsequent + ** calls to sqlite3_get_auxdata(C,N) return P from the most recent +-** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or +-** NULL if the metadata has been discarded. ++** sqlite3_set_auxdata(C,N,P,X) call if the auxiliary data is still valid or ++** NULL if the auxiliary data has been discarded. + ** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL, + ** SQLite will invoke the destructor function X with parameter P exactly +-** once, when the metadata is discarded. +-** SQLite is free to discard the metadata at any time, including:
      ++** once, when the auxiliary data is discarded. ++** SQLite is free to discard the auxiliary data at any time, including:
        + **
      • ^(when the corresponding function parameter changes)^, or + **
      • ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the + ** SQL statement)^, or + **
      • ^(when sqlite3_set_auxdata() is invoked again on the same + ** parameter)^, or + **
      • ^(during the original sqlite3_set_auxdata() call when a memory +-** allocation error occurs.)^
      ++** allocation error occurs.)^ ++**
    • ^(during the original sqlite3_set_auxdata() call if the function ++** is evaluated during query planning instead of during query execution, ++** as sometimes happens with [SQLITE_ENABLE_STAT4].)^
    + ** +-** Note the last bullet in particular. The destructor X in ++** Note the last two bullets in particular. The destructor X in + ** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the + ** sqlite3_set_auxdata() interface even returns. Hence sqlite3_set_auxdata() + ** should be called near the end of the function implementation and the + ** function implementation should not make any use of P after +-** sqlite3_set_auxdata() has been called. +-** +-** ^(In practice, metadata is preserved between function calls for ++** sqlite3_set_auxdata() has been called. Furthermore, a call to ++** sqlite3_get_auxdata() that occurs immediately after a corresponding call ++** to sqlite3_set_auxdata() might still return NULL if an out-of-memory ++** condition occurred during the sqlite3_set_auxdata() call or if the ++** function is being evaluated during query planning rather than during ++** query execution. ++** ++** ^(In practice, auxiliary data is preserved between function calls for + ** function parameters that are compile-time constants, including literal + ** values and [parameters] and expressions composed from the same.)^ + ** +@@ -6037,10 +6409,67 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); + ** + ** These routines must be called from the same thread in which + ** the SQL function is running. ++** ++** See also: [sqlite3_get_clientdata()] and [sqlite3_set_clientdata()]. + */ + SQLITE_API void *sqlite3_get_auxdata(sqlite3_context*, int N); + SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*)); + ++/* ++** CAPI3REF: Database Connection Client Data ++** METHOD: sqlite3 ++** ++** These functions are used to associate one or more named pointers ++** with a [database connection]. ++** A call to sqlite3_set_clientdata(D,N,P,X) causes the pointer P ++** to be attached to [database connection] D using name N. Subsequent ++** calls to sqlite3_get_clientdata(D,N) will return a copy of pointer P ++** or a NULL pointer if there were no prior calls to ++** sqlite3_set_clientdata() with the same values of D and N. ++** Names are compared using strcmp() and are thus case sensitive. ++** ++** If P and X are both non-NULL, then the destructor X is invoked with ++** argument P on the first of the following occurrences: ++**
      ++**
    • An out-of-memory error occurs during the call to ++** sqlite3_set_clientdata() which attempts to register pointer P. ++**
    • A subsequent call to sqlite3_set_clientdata(D,N,P,X) is made ++** with the same D and N parameters. ++**
    • The database connection closes. SQLite does not make any guarantees ++** about the order in which destructors are called, only that all ++** destructors will be called exactly once at some point during the ++** database connection closing process. ++**
    ++** ++** SQLite does not do anything with client data other than invoke ++** destructors on the client data at the appropriate time. The intended ++** use for client data is to provide a mechanism for wrapper libraries ++** to store additional information about an SQLite database connection. ++** ++** There is no limit (other than available memory) on the number of different ++** client data pointers (with different names) that can be attached to a ++** single database connection. However, the implementation is optimized ++** for the case of having only one or two different client data names. ++** Applications and wrapper libraries are discouraged from using more than ++** one client data name each. ++** ++** There is no way to enumerate the client data pointers ++** associated with a database connection. The N parameter can be thought ++** of as a secret key such that only code that knows the secret key is able ++** to access the associated data. ++** ++** Security Warning: These interfaces should not be exposed in scripting ++** languages or in other circumstances where it might be possible for an ++** an attacker to invoke them. Any agent that can invoke these interfaces ++** can probably also take control of the process. ++** ++** Database connection client data is only available for SQLite ++** version 3.44.0 ([dateof:3.44.0]) and later. ++** ++** See also: [sqlite3_set_auxdata()] and [sqlite3_get_auxdata()]. ++*/ ++SQLITE_API void *sqlite3_get_clientdata(sqlite3*,const char*); ++SQLITE_API int sqlite3_set_clientdata(sqlite3*, const char*, void*, void(*)(void*)); + + /* + ** CAPI3REF: Constants Defining Special Destructor Behavior +@@ -6136,9 +6565,10 @@ typedef void (*sqlite3_destructor_type)(void*); + ** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]. + ** ^SQLite takes the text result from the application from + ** the 2nd parameter of the sqlite3_result_text* interfaces. +-** ^If the 3rd parameter to the sqlite3_result_text* interfaces +-** is negative, then SQLite takes result text from the 2nd parameter +-** through the first zero character. ++** ^If the 3rd parameter to any of the sqlite3_result_text* interfaces ++** other than sqlite3_result_text64() is negative, then SQLite computes ++** the string length itself by searching the 2nd parameter for the first ++** zero character. + ** ^If the 3rd parameter to the sqlite3_result_text* interfaces + ** is non-negative, then as many bytes (not characters) of the text + ** pointed to by the 2nd parameter are taken as the application-defined +@@ -6241,6 +6671,20 @@ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n); + ** higher order bits are discarded. + ** The number of subtype bytes preserved by SQLite might increase + ** in future releases of SQLite. ++** ++** Every [application-defined SQL function] that invokes this interface ++** should include the [SQLITE_RESULT_SUBTYPE] property in its ++** text encoding argument when the SQL function is ++** [sqlite3_create_function|registered]. If the [SQLITE_RESULT_SUBTYPE] ++** property is omitted from the function that invokes sqlite3_result_subtype(), ++** then in some cases the sqlite3_result_subtype() might fail to set ++** the result subtype. ++** ++** If SQLite is compiled with -DSQLITE_STRICT_SUBTYPE=1, then any ++** SQL function that invokes the sqlite3_result_subtype() interface ++** and that does not have the SQLITE_RESULT_SUBTYPE property will raise ++** an error. Future versions of SQLite might enable -DSQLITE_STRICT_SUBTYPE=1 ++** by default. + */ + SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int); + +@@ -6412,6 +6856,13 @@ SQLITE_API void sqlite3_activate_cerod( + ** of the default VFS is not implemented correctly, or not implemented at + ** all, then the behavior of sqlite3_sleep() may deviate from the description + ** in the previous paragraphs. ++** ++** If a negative argument is passed to sqlite3_sleep() the results vary by ++** VFS and operating system. Some system treat a negative argument as an ++** instruction to sleep forever. Others understand it to mean do not sleep ++** at all. ^In SQLite version 3.42.0 and later, a negative ++** argument passed into sqlite3_sleep() is changed to zero before it is relayed ++** down into the xSleep method of the VFS. + */ + SQLITE_API int sqlite3_sleep(int); + +@@ -6634,7 +7085,7 @@ SQLITE_API const char *sqlite3_db_name(sqlite3 *db, int N); + **
  • [sqlite3_filename_wal()] + ** + */ +-SQLITE_API const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName); ++SQLITE_API sqlite3_filename sqlite3_db_filename(sqlite3 *db, const char *zDbName); + + /* + ** CAPI3REF: Determine if a database is read-only +@@ -6665,7 +7116,7 @@ SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName); + SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema); + + /* +-** CAPI3REF: Allowed return values from [sqlite3_txn_state()] ++** CAPI3REF: Allowed return values from sqlite3_txn_state() + ** KEYWORDS: {transaction state} + ** + ** These constants define the current transaction state of a database file. +@@ -6771,7 +7222,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); + ** function C that is invoked prior to each autovacuum of the database + ** file. ^The callback is passed a copy of the generic data pointer (P), + ** the schema-name of the attached database that is being autovacuumed, +-** the the size of the database file in pages, the number of free pages, ++** the size of the database file in pages, the number of free pages, + ** and the number of bytes per page, respectively. The callback should + ** return the number of free pages that should be removed by the + ** autovacuum. ^If the callback returns zero, then no autovacuum happens. +@@ -6797,7 +7248,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); + ** ^Each call to the sqlite3_autovacuum_pages() interface overrides all + ** previous invocations for that database connection. ^If the callback + ** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer, +-** then the autovacuum steps callback is cancelled. The return value ++** then the autovacuum steps callback is canceled. The return value + ** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might + ** be some other error code if something goes wrong. The current + ** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other +@@ -6892,6 +7343,11 @@ SQLITE_API void *sqlite3_update_hook( + ** to the same database. Sharing is enabled if the argument is true + ** and disabled if the argument is false.)^ + ** ++** This interface is omitted if SQLite is compiled with ++** [-DSQLITE_OMIT_SHARED_CACHE]. The [-DSQLITE_OMIT_SHARED_CACHE] ++** compile-time option is recommended because the ++** [use of shared cache mode is discouraged]. ++** + ** ^Cache sharing is enabled and disabled for an entire process. + ** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]). + ** In prior versions of SQLite, +@@ -6990,7 +7446,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*); + ** ^The soft heap limit may not be greater than the hard heap limit. + ** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N) + ** is invoked with a value of N that is greater than the hard heap limit, +-** the the soft heap limit is set to the value of the hard heap limit. ++** the soft heap limit is set to the value of the hard heap limit. + ** ^The soft heap limit is automatically enabled whenever the hard heap + ** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and + ** the soft heap limit is outside the range of 1..N, then the soft heap +@@ -7251,15 +7707,6 @@ SQLITE_API int sqlite3_cancel_auto_extension(void(*xEntryPoint)(void)); + */ + SQLITE_API void sqlite3_reset_auto_extension(void); + +-/* +-** The interface to the virtual-table mechanism is currently considered +-** to be experimental. The interface might change in incompatible ways. +-** If this is a problem for you, do not use the interface at this time. +-** +-** When the virtual-table mechanism stabilizes, we will declare the +-** interface fixed, support it indefinitely, and remove this comment. +-*/ +- + /* + ** Structures used by the virtual table interface + */ +@@ -7320,6 +7767,10 @@ struct sqlite3_module { + /* The methods above are in versions 1 and 2 of the sqlite_module object. + ** Those below are for version 3 and greater. */ + int (*xShadowName)(const char*); ++ /* The methods above are in versions 1 through 3 of the sqlite_module object. ++ ** Those below are for version 4 and greater. */ ++ int (*xIntegrity)(sqlite3_vtab *pVTab, const char *zSchema, ++ const char *zTabName, int mFlags, char **pzErr); + }; + + /* +@@ -7378,10 +7829,10 @@ struct sqlite3_module { + ** when the omit flag is true there is no guarantee that the constraint will + ** not be checked again using byte code.)^ + ** +-** ^The idxNum and idxPtr values are recorded and passed into the ++** ^The idxNum and idxStr values are recorded and passed into the + ** [xFilter] method. +-** ^[sqlite3_free()] is used to free idxPtr if and only if +-** needToFreeIdxPtr is true. ++** ^[sqlite3_free()] is used to free idxStr if and only if ++** needToFreeIdxStr is true. + ** + ** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in + ** the correct order to satisfy the ORDER BY clause so that no separate +@@ -7501,7 +7952,7 @@ struct sqlite3_index_info { + ** the [sqlite3_vtab_collation()] interface. For most real-world virtual + ** tables, the collating sequence of constraints does not matter (for example + ** because the constraints are numeric) and so the sqlite3_vtab_collation() +-** interface is no commonly needed. ++** interface is not commonly needed. + */ + #define SQLITE_INDEX_CONSTRAINT_EQ 2 + #define SQLITE_INDEX_CONSTRAINT_GT 4 +@@ -7660,16 +8111,6 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL); + */ + SQLITE_API int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg); + +-/* +-** The interface to the virtual-table mechanism defined above (back up +-** to a comment remarkably similar to this one) is currently considered +-** to be experimental. The interface might change in incompatible ways. +-** If this is a problem for you, do not use the interface at this time. +-** +-** When the virtual-table mechanism stabilizes, we will declare the +-** interface fixed, support it indefinitely, and remove this comment. +-*/ +- + /* + ** CAPI3REF: A Handle To An Open BLOB + ** KEYWORDS: {BLOB handle} {BLOB handles} +@@ -7817,7 +8258,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64); + ** code is returned and the transaction rolled back. + ** + ** Calling this function with an argument that is not a NULL pointer or an +-** open blob handle results in undefined behaviour. ^Calling this routine ++** open blob handle results in undefined behavior. ^Calling this routine + ** with a null pointer (such as would be returned by a failed call to + ** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function + ** is passed a valid open blob handle, the values returned by the +@@ -8044,18 +8485,20 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*); + ** + ** ^(Some systems (for example, Windows 95) do not support the operation + ** implemented by sqlite3_mutex_try(). On those systems, sqlite3_mutex_try() +-** will always return SQLITE_BUSY. The SQLite core only ever uses +-** sqlite3_mutex_try() as an optimization so this is acceptable +-** behavior.)^ ++** will always return SQLITE_BUSY. In most cases the SQLite core only uses ++** sqlite3_mutex_try() as an optimization, so this is acceptable ++** behavior. The exceptions are unix builds that set the ++** SQLITE_ENABLE_SETLK_TIMEOUT build option. In that case a working ++** sqlite3_mutex_try() is required.)^ + ** + ** ^The sqlite3_mutex_leave() routine exits a mutex that was + ** previously entered by the same thread. The behavior + ** is undefined if the mutex is not currently entered by the + ** calling thread or is not currently allocated. + ** +-** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), or +-** sqlite3_mutex_leave() is a NULL pointer, then all three routines +-** behave as no-ops. ++** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), ++** sqlite3_mutex_leave(), or sqlite3_mutex_free() is a NULL pointer, ++** then any of the four routines behaves as a no-op. + ** + ** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()]. + */ +@@ -8297,6 +8740,7 @@ SQLITE_API int sqlite3_test_control(int op, ...); + #define SQLITE_TESTCTRL_PRNG_SAVE 5 + #define SQLITE_TESTCTRL_PRNG_RESTORE 6 + #define SQLITE_TESTCTRL_PRNG_RESET 7 /* NOT USED */ ++#define SQLITE_TESTCTRL_FK_NO_ACTION 7 + #define SQLITE_TESTCTRL_BITVEC_TEST 8 + #define SQLITE_TESTCTRL_FAULT_INSTALL 9 + #define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS 10 +@@ -8304,6 +8748,7 @@ SQLITE_API int sqlite3_test_control(int op, ...); + #define SQLITE_TESTCTRL_ASSERT 12 + #define SQLITE_TESTCTRL_ALWAYS 13 + #define SQLITE_TESTCTRL_RESERVE 14 /* NOT USED */ ++#define SQLITE_TESTCTRL_JSON_SELFCHECK 14 + #define SQLITE_TESTCTRL_OPTIMIZATIONS 15 + #define SQLITE_TESTCTRL_ISKEYWORD 16 /* NOT USED */ + #define SQLITE_TESTCTRL_SCRATCHMALLOC 17 /* NOT USED */ +@@ -8325,7 +8770,8 @@ SQLITE_API int sqlite3_test_control(int op, ...); + #define SQLITE_TESTCTRL_TRACEFLAGS 31 + #define SQLITE_TESTCTRL_TUNE 32 + #define SQLITE_TESTCTRL_LOGEST 33 +-#define SQLITE_TESTCTRL_LAST 33 /* Largest TESTCTRL */ ++#define SQLITE_TESTCTRL_USELONGDOUBLE 34 ++#define SQLITE_TESTCTRL_LAST 34 /* Largest TESTCTRL */ + + /* + ** CAPI3REF: SQL Keyword Checking +@@ -9285,7 +9731,7 @@ typedef struct sqlite3_backup sqlite3_backup; + ** if the application incorrectly accesses the destination [database connection] + ** and so no error code is reported, but the operations may malfunction + ** nevertheless. Use of the destination database connection while a +-** backup is in progress might also also cause a mutex deadlock. ++** backup is in progress might also cause a mutex deadlock. + ** + ** If running in [shared cache mode], the application must + ** guarantee that the shared cache used by the destination database +@@ -9713,7 +10159,7 @@ SQLITE_API int sqlite3_wal_checkpoint_v2( + */ + #define SQLITE_CHECKPOINT_PASSIVE 0 /* Do as much as possible w/o blocking */ + #define SQLITE_CHECKPOINT_FULL 1 /* Wait for writers, then checkpoint */ +-#define SQLITE_CHECKPOINT_RESTART 2 /* Like FULL but wait for for readers */ ++#define SQLITE_CHECKPOINT_RESTART 2 /* Like FULL but wait for readers */ + #define SQLITE_CHECKPOINT_TRUNCATE 3 /* Like RESTART but also truncate WAL */ + + /* +@@ -9781,7 +10227,7 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...); + ** [[SQLITE_VTAB_DIRECTONLY]]
    SQLITE_VTAB_DIRECTONLY
    + **
    Calls of the form + ** [sqlite3_vtab_config](db,SQLITE_VTAB_DIRECTONLY) from within the +-** the [xConnect] or [xCreate] methods of a [virtual table] implmentation ++** the [xConnect] or [xCreate] methods of a [virtual table] implementation + ** prohibits that virtual table from being used from within triggers and + ** views. + **
    +@@ -9789,18 +10235,28 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...); + ** [[SQLITE_VTAB_INNOCUOUS]]
    SQLITE_VTAB_INNOCUOUS
    + **
    Calls of the form + ** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the +-** the [xConnect] or [xCreate] methods of a [virtual table] implmentation ++** the [xConnect] or [xCreate] methods of a [virtual table] implementation + ** identify that virtual table as being safe to use from within triggers + ** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the + ** virtual table can do no serious harm even if it is controlled by a + ** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS + ** flag unless absolutely necessary. + **
    ++** ++** [[SQLITE_VTAB_USES_ALL_SCHEMAS]]
    SQLITE_VTAB_USES_ALL_SCHEMAS
    ++**
    Calls of the form ++** [sqlite3_vtab_config](db,SQLITE_VTAB_USES_ALL_SCHEMA) from within the ++** the [xConnect] or [xCreate] methods of a [virtual table] implementation ++** instruct the query planner to begin at least a read transaction on ++** all schemas ("main", "temp", and any ATTACH-ed databases) whenever the ++** virtual table is used. ++**
    + ** + */ + #define SQLITE_VTAB_CONSTRAINT_SUPPORT 1 + #define SQLITE_VTAB_INNOCUOUS 2 + #define SQLITE_VTAB_DIRECTONLY 3 ++#define SQLITE_VTAB_USES_ALL_SCHEMAS 4 + + /* + ** CAPI3REF: Determine The Virtual Table Conflict Policy +@@ -9873,7 +10329,7 @@ SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*); + **

  • Otherwise, "BINARY" is returned. + ** + */ +-SQLITE_API SQLITE_EXPERIMENTAL const char *sqlite3_vtab_collation(sqlite3_index_info*,int); ++SQLITE_API const char *sqlite3_vtab_collation(sqlite3_index_info*,int); + + /* + ** CAPI3REF: Determine if a virtual table query is DISTINCT +@@ -9961,7 +10417,7 @@ SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*); + ** communicated to the xBestIndex method as a + ** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^ If xBestIndex wants to use + ** this constraint, it must set the corresponding +-** aConstraintUsage[].argvIndex to a postive integer. ^(Then, under ++** aConstraintUsage[].argvIndex to a positive integer. ^(Then, under + ** the usual mode of handling IN operators, SQLite generates [bytecode] + ** that invokes the [xFilter|xFilter() method] once for each value + ** on the right-hand side of the IN operator.)^ Thus the virtual table +@@ -10030,21 +10486,20 @@ SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle); + ** is undefined and probably harmful. + ** + ** The X parameter in a call to sqlite3_vtab_in_first(X,P) or +-** sqlite3_vtab_in_next(X,P) must be one of the parameters to the ++** sqlite3_vtab_in_next(X,P) should be one of the parameters to the + ** xFilter method which invokes these routines, and specifically + ** a parameter that was previously selected for all-at-once IN constraint + ** processing use the [sqlite3_vtab_in()] interface in the + ** [xBestIndex|xBestIndex method]. ^(If the X parameter is not + ** an xFilter argument that was selected for all-at-once IN constraint +-** processing, then these routines return [SQLITE_MISUSE])^ or perhaps +-** exhibit some other undefined or harmful behavior. ++** processing, then these routines return [SQLITE_ERROR].)^ + ** + ** ^(Use these routines to access all values on the right-hand side + ** of the IN constraint using code like the following: + ** + ** 

    + **    for(rc=sqlite3_vtab_in_first(pList, &pVal);
+-**        rc==SQLITE_OK && pVal
++**        rc==SQLITE_OK && pVal;
+ **        rc=sqlite3_vtab_in_next(pList, &pVal)
+ **    ){
+ **      // do something with pVal
+@@ -10142,6 +10597,10 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ ** managed by the prepared statement S and will be automatically freed when
+ ** S is finalized.
+ **
++** Not all values are available for all query elements. When a value is
++** not available, the output variable is set to -1 if the value is numeric,
++** or to NULL if it is a string (SQLITE_SCANSTAT_NAME).
++**
+ ** 
    
+ ** [[SQLITE_SCANSTAT_NLOOP]] 
    SQLITE_SCANSTAT_NLOOP
    
+ ** 
    ^The [sqlite3_int64] variable pointed to by the V parameter will be
+@@ -10169,12 +10628,24 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ ** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
+ ** description for the X-th loop.
+ **
+-** [[SQLITE_SCANSTAT_SELECTID]] 
    SQLITE_SCANSTAT_SELECT
    
++** [[SQLITE_SCANSTAT_SELECTID]] 
    SQLITE_SCANSTAT_SELECTID
    
+ ** 
    ^The "int" variable pointed to by the V parameter will be set to the
+-** "select-id" for the X-th loop.  The select-id identifies which query or
+-** subquery the loop is part of.  The main query has a select-id of zero.
+-** The select-id is the same value as is output in the first column
+-** of an [EXPLAIN QUERY PLAN] query.
++** id for the X-th query plan element. The id value is unique within the
++** statement. The select-id is the same value as is output in the first
++** column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_PARENTID]] 
    SQLITE_SCANSTAT_PARENTID
    
++** 
    The "int" variable pointed to by the V parameter will be set to the
++** the id of the parent of the current query element, if applicable, or
++** to zero if the query element has no parent. This is the same value as
++** returned in the second column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_NCYCLE]] 
    SQLITE_SCANSTAT_NCYCLE
    
++** 
    The sqlite3_int64 output value is set to the number of cycles,
++** according to the processor time-stamp counter, that elapsed while the
++** query element was being processed. This value is not available for
++** all query elements - if it is unavailable the output variable is
++** set to -1.
+ ** 
    
+ */
+ #define SQLITE_SCANSTAT_NLOOP    0
+@@ -10183,12 +10654,14 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ #define SQLITE_SCANSTAT_NAME     3
+ #define SQLITE_SCANSTAT_EXPLAIN  4
+ #define SQLITE_SCANSTAT_SELECTID 5
++#define SQLITE_SCANSTAT_PARENTID 6
++#define SQLITE_SCANSTAT_NCYCLE   7
+ 
+ /*
+ ** CAPI3REF: Prepared Statement Scan Status
+ ** METHOD: sqlite3_stmt
+ **
+-** This interface returns information about the predicted and measured
++** These interfaces return information about the predicted and measured
+ ** performance for pStmt.  Advanced applications can use this
+ ** interface to compare the predicted and the measured performance and
+ ** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
+@@ -10199,19 +10672,25 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ **
+ ** The "iScanStatusOp" parameter determines which status information to return.
+ ** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
+-** of this interface is undefined.
+-** ^The requested measurement is written into a variable pointed to by
+-** the "pOut" parameter.
+-** Parameter "idx" identifies the specific loop to retrieve statistics for.
+-** Loops are numbered starting from zero. ^If idx is out of range - less than
+-** zero or greater than or equal to the total number of loops used to implement
+-** the statement - a non-zero value is returned and the variable that pOut
+-** points to is unchanged.
+-**
+-** ^Statistics might not be available for all loops in all statements. ^In cases
+-** where there exist loops with no available statistics, this function behaves
+-** as if the loop did not exist - it returns non-zero and leave the variable
+-** that pOut points to unchanged.
++** of this interface is undefined. ^The requested measurement is written into
++** a variable pointed to by the "pOut" parameter.
++**
++** The "flags" parameter must be passed a mask of flags. At present only
++** one flag is defined - SQLITE_SCANSTAT_COMPLEX. If SQLITE_SCANSTAT_COMPLEX
++** is specified, then status information is available for all elements
++** of a query plan that are reported by "EXPLAIN QUERY PLAN" output. If
++** SQLITE_SCANSTAT_COMPLEX is not specified, then only query plan elements
++** that correspond to query loops (the "SCAN..." and "SEARCH..." elements of
++** the EXPLAIN QUERY PLAN output) are available. Invoking API
++** sqlite3_stmt_scanstatus() is equivalent to calling
++** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
++**
++** Parameter "idx" identifies the specific query element to retrieve statistics
++** for. Query elements are numbered starting from zero. A value of -1 may be
++** to query for statistics regarding the entire query. ^If idx is out of range
++** - less than -1 or greater than or equal to the total number of query
++** elements used to implement the statement - a non-zero value is returned and
++** the variable that pOut points to is unchanged.
+ **
+ ** See also: [sqlite3_stmt_scanstatus_reset()]
+ */
+@@ -10221,6 +10700,19 @@ SQLITE_API int sqlite3_stmt_scanstatus(
+   int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
+   void *pOut                /* Result written here */
+ );
++SQLITE_API int sqlite3_stmt_scanstatus_v2(
++  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
++  int idx,                  /* Index of loop to report on */
++  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
++  int flags,                /* Mask of flags defined below */
++  void *pOut                /* Result written here */
++);
++
++/*
++** CAPI3REF: Prepared Statement Scan Status
++** KEYWORDS: {scan status flags}
++*/
++#define SQLITE_SCANSTAT_COMPLEX 0x0001
+ 
+ /*
+ ** CAPI3REF: Zero Scan-Status Counters
+@@ -10311,6 +10803,10 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+ ** function is not defined for operations on WITHOUT ROWID tables, or for
+ ** DELETE operations on rowid tables.
+ **
++** ^The sqlite3_preupdate_hook(D,C,P) function returns the P argument from
++** the previous call on the same [database connection] D, or NULL for
++** the first call on D.
++**
+ ** The [sqlite3_preupdate_old()], [sqlite3_preupdate_new()],
+ ** [sqlite3_preupdate_count()], and [sqlite3_preupdate_depth()] interfaces
+ ** provide additional information about a preupdate event. These routines
+@@ -10350,7 +10846,7 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+ ** When the [sqlite3_blob_write()] API is used to update a blob column,
+ ** the pre-update hook is invoked with SQLITE_DELETE. This is because the
+ ** in this case the new values are not available. In this case, when a
+-** callback made with op==SQLITE_DELETE is actuall a write using the
++** callback made with op==SQLITE_DELETE is actually a write using the
+ ** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
+ ** the index of the column being written. In other cases, where the
+ ** pre-update hook is being invoked for some other reason, including a
+@@ -10611,6 +11107,13 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const c
+ ** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
+ ** of the database exists.
+ **
++** After the call, if the SQLITE_SERIALIZE_NOCOPY bit had been set,
++** the returned buffer content will remain accessible and unchanged
++** until either the next write operation on the connection or when
++** the connection is closed, and applications must not modify the
++** buffer. If the bit had been clear, the returned buffer will not
++** be accessed by SQLite after the call.
++**
+ ** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
+ ** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
+ ** allocation error occurs.
+@@ -10659,6 +11162,9 @@ SQLITE_API unsigned char *sqlite3_serialize(
+ ** SQLite will try to increase the buffer size using sqlite3_realloc64()
+ ** if writes on the database cause it to grow larger than M bytes.
+ **
++** Applications must not modify the buffer P or invalidate it before
++** the database connection D is closed.
++**
+ ** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
+ ** database is currently in a read transaction or is involved in a backup
+ ** operation.
+@@ -10667,6 +11173,13 @@ SQLITE_API unsigned char *sqlite3_serialize(
+ ** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
+ ** function returns SQLITE_ERROR.
+ **
++** The deserialized database should not be in [WAL mode].  If the database
++** is in WAL mode, then any attempt to use the database file will result
++** in an [SQLITE_CANTOPEN] error.  The application can set the
++** [file format version numbers] (bytes 18 and 19) of the input database P
++** to 0x01 prior to invoking sqlite3_deserialize(D,S,P,N,M,F) to force the
++** database file into rollback mode and work around this limitation.
++**
+ ** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
+ ** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
+ ** [sqlite3_free()] is invoked on argument P prior to returning.
+@@ -10716,11 +11229,35 @@ SQLITE_API int sqlite3_deserialize(
+ # undef double
+ #endif
+ 
++#if defined(__wasi__)
++# undef SQLITE_WASI
++# define SQLITE_WASI 1
++# undef SQLITE_OMIT_WAL
++# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */
++# ifndef SQLITE_OMIT_LOAD_EXTENSION
++#  define SQLITE_OMIT_LOAD_EXTENSION
++# endif
++# ifndef SQLITE_THREADSAFE
++#  define SQLITE_THREADSAFE 0
++# endif
++#endif
++
+ #if 0
+ }  /* End of the 'extern "C"' block */
+ #endif
+ #endif /* SQLITE3_H */
+ 
++/* Function prototypes of SQLite3 Multiple Ciphers */
++SQLITE_PRIVATE int sqlite3mcCheckVfs(const char*);
++SQLITE_PRIVATE int sqlite3mcFileControlPragma(sqlite3*, const char*, int, void*);
++SQLITE_PRIVATE int sqlite3mcHandleAttachKey(sqlite3*, const char*, const char*, sqlite3_value*, char**);
++SQLITE_PRIVATE int sqlite3mcHandleMainKey(sqlite3*, const char*);
++typedef struct PgHdr PgHdrMC;
++SQLITE_PRIVATE void* sqlite3mcPagerCodec(PgHdrMC* pPg);
++typedef struct Pager PagerMC;
++SQLITE_PRIVATE int sqlite3mcPagerHasCodec(PagerMC* pPager);
++SQLITE_PRIVATE void sqlite3mcInitMemoryMethods();
++
+ /******** Begin file sqlite3rtree.h *********/
+ /*
+ ** 2010 August 30
+@@ -10922,16 +11459,20 @@ SQLITE_API int sqlite3session_create(
+ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
+ 
+ /*
+-** CAPIREF: Conigure a Session Object
++** CAPI3REF: Configure a Session Object
+ ** METHOD: sqlite3_session
+ **
+ ** This method is used to configure a session object after it has been
+-** created. At present the only valid value for the second parameter is
+-** [SQLITE_SESSION_OBJCONFIG_SIZE].
++** created. At present the only valid values for the second parameter are
++** [SQLITE_SESSION_OBJCONFIG_SIZE] and [SQLITE_SESSION_OBJCONFIG_ROWID].
+ **
+-** Arguments for sqlite3session_object_config()
++*/
++SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
++
++/*
++** CAPI3REF: Options for sqlite3session_object_config
+ **
+-** The following values may passed as the the 4th parameter to
++** The following values may passed as the the 2nd parameter to
+ ** sqlite3session_object_config().
+ **
+ ** 
    SQLITE_SESSION_OBJCONFIG_SIZE 
    
+@@ -10947,12 +11488,21 @@ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
+ **
+ **   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
+ **   the first table has been attached to the session object.
++**
++** 
    SQLITE_SESSION_OBJCONFIG_ROWID 
    
++**   This option is used to set, clear or query the flag that enables
++**   collection of data for tables with no explicit PRIMARY KEY.
++**
++**   Normally, tables with no explicit PRIMARY KEY are simply ignored
++**   by the sessions module. However, if this flag is set, it behaves
++**   as if such tables have a column "_rowid_ INTEGER PRIMARY KEY" inserted
++**   as their leftmost columns.
++**
++**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
++**   the first table has been attached to the session object.
+ */
+-SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
+-
+-/*
+-*/
+-#define SQLITE_SESSION_OBJCONFIG_SIZE 1
++#define SQLITE_SESSION_OBJCONFIG_SIZE  1
++#define SQLITE_SESSION_OBJCONFIG_ROWID 2
+ 
+ /*
+ ** CAPI3REF: Enable Or Disable A Session Object
+@@ -11713,6 +12263,18 @@ SQLITE_API int sqlite3changeset_concat(
+ );
+ 
+ 
++/*
++** CAPI3REF: Upgrade the Schema of a Changeset/Patchset
++*/
++SQLITE_API int sqlite3changeset_upgrade(
++  sqlite3 *db,
++  const char *zDb,
++  int nIn, const void *pIn,       /* Input changeset */
++  int *pnOut, void **ppOut        /* OUT: Inverse of input */
++);
++
++
++
+ /*
+ ** CAPI3REF: Changegroup Handle
+ **
+@@ -11759,6 +12321,38 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;
+ */
+ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+ 
++/*
++** CAPI3REF: Add a Schema to a Changegroup
++** METHOD: sqlite3_changegroup_schema
++**
++** This method may be used to optionally enforce the rule that the changesets
++** added to the changegroup handle must match the schema of database zDb
++** ("main", "temp", or the name of an attached database). If
++** sqlite3changegroup_add() is called to add a changeset that is not compatible
++** with the configured schema, SQLITE_SCHEMA is returned and the changegroup
++** object is left in an undefined state.
++**
++** A changeset schema is considered compatible with the database schema in
++** the same way as for sqlite3changeset_apply(). Specifically, for each
++** table in the changeset, there exists a database table with:
++**
++** 
      
++**   
    •  The name identified by the changeset, and
++**   
    •  at least as many columns as recorded in the changeset, and
++**   
    •  the primary key columns in the same position as recorded in
++**        the changeset.
++** 
    
++**
++** The output of the changegroup object always has the same schema as the
++** database nominated using this function. In cases where changesets passed
++** to sqlite3changegroup_add() have fewer columns than the corresponding table
++** in the database schema, these are filled in using the default column
++** values from the database schema. This makes it possible to combined
++** changesets that have different numbers of columns for a single table
++** within a changegroup, provided that they are otherwise compatible.
++*/
++SQLITE_API int sqlite3changegroup_schema(sqlite3_changegroup*, sqlite3*, const char *zDb);
++
+ /*
+ ** CAPI3REF: Add A Changeset To A Changegroup
+ ** METHOD: sqlite3_changegroup
+@@ -11827,13 +12421,18 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+ ** If the new changeset contains changes to a table that is already present
+ ** in the changegroup, then the number of columns and the position of the
+ ** primary key columns for the table must be consistent. If this is not the
+-** case, this function fails with SQLITE_SCHEMA. If the input changeset
+-** appears to be corrupt and the corruption is detected, SQLITE_CORRUPT is
+-** returned. Or, if an out-of-memory condition occurs during processing, this
+-** function returns SQLITE_NOMEM. In all cases, if an error occurs the state
+-** of the final contents of the changegroup is undefined.
++** case, this function fails with SQLITE_SCHEMA. Except, if the changegroup
++** object has been configured with a database schema using the
++** sqlite3changegroup_schema() API, then it is possible to combine changesets
++** with different numbers of columns for a single table, provided that
++** they are otherwise compatible.
+ **
+-** If no error occurs, SQLITE_OK is returned.
++** If the input changeset appears to be corrupt and the corruption is
++** detected, SQLITE_CORRUPT is returned. Or, if an out-of-memory condition
++** occurs during processing, this function returns SQLITE_NOMEM.
++**
++** In all cases, if an error occurs the state of the final contents of the
++** changegroup is undefined. If no error occurs, SQLITE_OK is returned.
+ */
+ SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
+ 
+@@ -12085,9 +12684,30 @@ SQLITE_API int sqlite3changeset_apply_v2(
+ **   Invert the changeset before applying it. This is equivalent to inverting
+ **   a changeset using sqlite3changeset_invert() before applying it. It is
+ **   an error to specify this flag with a patchset.
++**
++** 
    SQLITE_CHANGESETAPPLY_IGNORENOOP 
    
++**   Do not invoke the conflict handler callback for any changes that
++**   would not actually modify the database even if they were applied.
++**   Specifically, this means that the conflict handler is not invoked
++**   for:
++**    
      
++**    
    • a delete change if the row being deleted cannot be found,
++**    
    • an update change if the modified fields are already set to
++**        their new values in the conflicting row, or
++**    
    • an insert change if all fields of the conflicting row match
++**        the row being inserted.
++**    
    
++**
++** 
    SQLITE_CHANGESETAPPLY_FKNOACTION 
    
++**   If this flag it set, then all foreign key constraints in the target
++**   database behave as if they were declared with "ON UPDATE NO ACTION ON
++**   DELETE NO ACTION", even if they are actually CASCADE, RESTRICT, SET NULL
++**   or SET DEFAULT.
+ */
+ #define SQLITE_CHANGESETAPPLY_NOSAVEPOINT   0x0001
+ #define SQLITE_CHANGESETAPPLY_INVERT        0x0002
++#define SQLITE_CHANGESETAPPLY_IGNORENOOP    0x0004
++#define SQLITE_CHANGESETAPPLY_FKNOACTION    0x0008
+ 
+ /*
+ ** CAPI3REF: Constants Passed To The Conflict Handler
+@@ -12653,8 +13273,11 @@ struct Fts5PhraseIter {
+ **   created with the "columnsize=0" option.
+ **
+ ** xColumnText:
+-**   This function attempts to retrieve the text of column iCol of the
+-**   current document. If successful, (*pz) is set to point to a buffer
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of columns in the table, SQLITE_RANGE is returned.
++**
++**   Otherwise, this function attempts to retrieve the text of column iCol of
++**   the current document. If successful, (*pz) is set to point to a buffer
+ **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
+ **   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
+ **   if an error occurs, an SQLite error code is returned and the final values
+@@ -12664,8 +13287,10 @@ struct Fts5PhraseIter {
+ **   Returns the number of phrases in the current query expression.
+ **
+ ** xPhraseSize:
+-**   Returns the number of tokens in phrase iPhrase of the query. Phrases
+-**   are numbered starting from zero.
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of phrases in the current query, as returned by xPhraseCount,
++**   0 is returned. Otherwise, this function returns the number of tokens in
++**   phrase iPhrase of the query. Phrases are numbered starting from zero.
+ **
+ ** xInstCount:
+ **   Set *pnInst to the total number of occurrences of all phrases within
+@@ -12681,12 +13306,13 @@ struct Fts5PhraseIter {
+ **   Query for the details of phrase match iIdx within the current row.
+ **   Phrase matches are numbered starting from zero, so the iIdx argument
+ **   should be greater than or equal to zero and smaller than the value
+-**   output by xInstCount().
++**   output by xInstCount(). If iIdx is less than zero or greater than
++**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
+ **
+-**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
++**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
+ **   to the column in which it occurs and *piOff the token offset of the
+-**   first token of the phrase. Returns SQLITE_OK if successful, or an error
+-**   code (i.e. SQLITE_NOMEM) if an error occurs.
++**   first token of the phrase. SQLITE_OK is returned if successful, or an
++**   error code (i.e. SQLITE_NOMEM) if an error occurs.
+ **
+ **   This API can be quite slow if used with an FTS5 table created with the
+ **   "detail=none" or "detail=column" option.
+@@ -12712,6 +13338,10 @@ struct Fts5PhraseIter {
+ **   Invoking Api.xUserData() returns a copy of the pointer passed as
+ **   the third argument to pUserData.
+ **
++**   If parameter iPhrase is less than zero, or greater than or equal to
++**   the number of phrases in the query, as returned by xPhraseCount(),
++**   this function returns SQLITE_RANGE.
++**
+ **   If the callback function returns any value other than SQLITE_OK, the
+ **   query is abandoned and the xQueryPhrase function returns immediately.
+ **   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
+@@ -12826,6 +13456,39 @@ struct Fts5PhraseIter {
+ **
+ ** xPhraseNextColumn()
+ **   See xPhraseFirstColumn above.
++**
++** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase iPhrase of the current
++**   query. Before returning, output parameter *ppToken is set to point
++**   to a buffer containing the requested token, and *pnToken to the
++**   size of this buffer in bytes.
++**
++**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
++**   or equal to the number of phrases in the query as reported by
++**   xPhraseCount(), or if iToken is equal to or greater than the number of
++**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
++     are both zeroed.
++**
++**   The output text is not a copy of the query text that specified the
++**   token. It is the output of the tokenizer module. For tokendata=1
++**   tables, this includes any embedded 0x00 and trailing data.
++**
++** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase hit iIdx within the
++**   current row. If iIdx is less than zero or greater than or equal to the
++**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
++**   output variable (*ppToken) is set to point to a buffer containing the
++**   matching document token, and (*pnToken) to the size of that buffer in
++**   bytes. This API is not available if the specified token matches a
++**   prefix query term. In that case both output variables are always set
++**   to 0.
++**
++**   The output text is not a copy of the document text that was tokenized.
++**   It is the output of the tokenizer module. For tokendata=1 tables, this
++**   includes any embedded 0x00 and trailing data.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option.
+ */
+ struct Fts5ExtensionApi {
+   int iVersion;                   /* Currently always set to 3 */
+@@ -12863,6 +13526,13 @@ struct Fts5ExtensionApi {
+ 
+   int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
+   void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
++
++  /* Below this point are iVersion>=3 only */
++  int (*xQueryToken)(Fts5Context*,
++      int iPhrase, int iToken,
++      const char **ppToken, int *pnToken
++  );
++  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
+ };
+ 
+ /*
+@@ -13057,8 +13727,8 @@ struct Fts5ExtensionApi {
+ **   as separate queries of the FTS index are required for each synonym.
+ **
+ **   When using methods (2) or (3), it is important that the tokenizer only
+-**   provide synonyms when tokenizing document text (method (2)) or query
+-**   text (method (3)), not both. Doing so will not cause any errors, but is
++**   provide synonyms when tokenizing document text (method (3)) or query
++**   text (method (2)), not both. Doing so will not cause any errors, but is
+ **   inefficient.
+ */
+ typedef struct Fts5Tokenizer Fts5Tokenizer;
+@@ -13106,7 +13776,7 @@ struct fts5_api {
+   int (*xCreateTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_tokenizer *pTokenizer,
+     void (*xDestroy)(void*)
+   );
+@@ -13115,7 +13785,7 @@ struct fts5_api {
+   int (*xFindTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void **ppContext,
++    void **ppUserData,
+     fts5_tokenizer *pTokenizer
+   );
+ 
+@@ -13123,7 +13793,7 @@ struct fts5_api {
+   int (*xCreateFunction)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_extension_function xFunction,
+     void (*xDestroy)(void*)
+   );
+@@ -13154,7 +13824,7 @@ struct fts5_api {
+ ** autoconf-based build
+ */
+ #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
+-#include "config.h"
++#include "sqlite_cfg.h"
+ #define SQLITECONFIG_H 1
+ #endif
+ 
+@@ -13234,7 +13904,7 @@ struct fts5_api {
+ ** level of recursion for each term.  A stack overflow can result
+ ** if the number of terms is too large.  In practice, most SQL
+ ** never has more than 3 or 4 terms.  Use a value of 0 to disable
+-** any limit on the number of terms in a compount SELECT.
++** any limit on the number of terms in a compound SELECT.
+ */
+ #ifndef SQLITE_MAX_COMPOUND_SELECT
+ # define SQLITE_MAX_COMPOUND_SELECT 500
+@@ -13349,7 +14019,7 @@ struct fts5_api {
+ ** max_page_count macro.
+ */
+ #ifndef SQLITE_MAX_PAGE_COUNT
+-# define SQLITE_MAX_PAGE_COUNT 1073741823
++# define SQLITE_MAX_PAGE_COUNT 0xfffffffe /* 4294967294 */
+ #endif
+ 
+ /*
+@@ -13384,8 +14054,8 @@ struct fts5_api {
+ #endif
+ 
+ /*
+-** WAL mode depends on atomic aligned 32-bit loads and stores in a few
+-** places.  The following macros try to make this explicit.
++** A few places in the code require atomic load/store of aligned
++** integer values.
+ */
+ #ifndef __has_extension
+ # define __has_extension(x) 0     /* compatibility with non-clang compilers */
+@@ -13441,15 +14111,22 @@ struct fts5_api {
+ #endif
+ 
+ /*
+-** A macro to hint to the compiler that a function should not be
++** Macros to hint to the compiler that a function should or should not be
+ ** inlined.
+ */
+ #if defined(__GNUC__)
+ #  define SQLITE_NOINLINE  __attribute__((noinline))
++#  define SQLITE_INLINE    __attribute__((always_inline)) inline
+ #elif defined(_MSC_VER) && _MSC_VER>=1310
+ #  define SQLITE_NOINLINE  __declspec(noinline)
++#  define SQLITE_INLINE    __forceinline
+ #else
+ #  define SQLITE_NOINLINE
++#  define SQLITE_INLINE
++#endif
++#if defined(SQLITE_COVERAGE_TEST) || defined(__STRICT_ANSI__)
++# undef SQLITE_INLINE
++# define SQLITE_INLINE
+ #endif
+ 
+ /*
+@@ -13471,6 +14148,29 @@ struct fts5_api {
+ #  endif
+ #endif
+ 
++/*
++** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
++** SEH support if the -DSQLITE_OMIT_SEH option is given.
++*/
++#if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
++# define SQLITE_USE_SEH 1
++#else
++# undef SQLITE_USE_SEH
++#endif
++
++/*
++** Enable SQLITE_DIRECT_OVERFLOW_READ, unless the build explicitly
++** disables it using -DSQLITE_DIRECT_OVERFLOW_READ=0
++*/
++#if defined(SQLITE_DIRECT_OVERFLOW_READ) && SQLITE_DIRECT_OVERFLOW_READ+1==1
++  /* Disable if -DSQLITE_DIRECT_OVERFLOW_READ=0 */
++# undef SQLITE_DIRECT_OVERFLOW_READ
++#else
++  /* In all other cases, enable */
++# define SQLITE_DIRECT_OVERFLOW_READ 1
++#endif
++
++
+ /*
+ ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
+ ** 0 means mutexes are permanently disable and the library is never
+@@ -14267,15 +14967,9 @@ typedef INT8_TYPE i8;              /* 1-byte signed integer */
+ 
+ /*
+ ** The datatype used to store estimates of the number of rows in a
+-** table or index.  This is an unsigned integer type.  For 99.9% of
+-** the world, a 32-bit integer is sufficient.  But a 64-bit integer
+-** can be used at compile-time if desired.
++** table or index.
+ */
+-#ifdef SQLITE_64BIT_STATS
+- typedef u64 tRowcnt;    /* 64-bit only if requested at compile-time */
+-#else
+- typedef u32 tRowcnt;    /* 32-bit is the default */
+-#endif
++typedef u64 tRowcnt;
+ 
+ /*
+ ** Estimated quantities used for query planning are stored as 16-bit
+@@ -14336,8 +15030,31 @@ typedef INT16_TYPE LogEst;
+ ** the end of buffer S.  This macro returns true if P points to something
+ ** contained within the buffer S.
+ */
+-#define SQLITE_WITHIN(P,S,E) (((uptr)(P)>=(uptr)(S))&&((uptr)(P)<(uptr)(E)))
++#define SQLITE_WITHIN(P,S,E)   (((uptr)(P)>=(uptr)(S))&&((uptr)(P)<(uptr)(E)))
+ 
++/*
++** P is one byte past the end of a large buffer. Return true if a span of bytes
++** between S..E crosses the end of that buffer.  In other words, return true
++** if the sub-buffer S..E-1 overflows the buffer whose last byte is P-1.
++**
++** S is the start of the span.  E is one byte past the end of end of span.
++**
++**                        P
++**     |-----------------|                FALSE
++**               |-------|
++**               S        E
++**
++**                        P
++**     |-----------------|
++**                    |-------|           TRUE
++**                    S        E
++**
++**                        P
++**     |-----------------|
++**                        |-------|       FALSE
++**                        S        E
++*/
++#define SQLITE_OVERFLOW(P,S,E) (((uptr)(S)<(uptr)(P))&&((uptr)(E)>(uptr)(P)))
+ 
+ /*
+ ** Macros to determine whether the machine is big or little endian,
+@@ -14347,16 +15064,33 @@ typedef INT16_TYPE LogEst;
+ ** using C-preprocessor macros.  If that is unsuccessful, or if
+ ** -DSQLITE_BYTEORDER=0 is set, then byte-order is determined
+ ** at run-time.
++**
++** If you are building SQLite on some obscure platform for which the
++** following ifdef magic does not work, you can always include either:
++**
++**    -DSQLITE_BYTEORDER=1234
++**
++** or
++**
++**    -DSQLITE_BYTEORDER=4321
++**
++** to cause the build to work for little-endian or big-endian processors,
++** respectively.
+ */
+-#ifndef SQLITE_BYTEORDER
+-# if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
++#ifndef SQLITE_BYTEORDER  /* Replicate changes at tag-20230904a */
++# if defined(__BYTE_ORDER__) && __BYTE_ORDER__==__ORDER_BIG_ENDIAN__
++#   define SQLITE_BYTEORDER 4321
++# elif defined(__BYTE_ORDER__) && __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
++#   define SQLITE_BYTEORDER 1234
++# elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__==1
++#   define SQLITE_BYTEORDER 4321
++# elif defined(i386)    || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+      defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
+-#   define SQLITE_BYTEORDER    1234
+-# elif defined(sparc)     || defined(__ppc__) || \
+-       defined(__ARMEB__) || defined(__AARCH64EB__)
+-#   define SQLITE_BYTEORDER    4321
++#   define SQLITE_BYTEORDER 1234
++# elif defined(sparc)   || defined(__ARMEB__)     || defined(__AARCH64EB__)
++#   define SQLITE_BYTEORDER 4321
+ # else
+ #   define SQLITE_BYTEORDER 0
+ # endif
+@@ -14421,9 +15155,9 @@ typedef INT16_TYPE LogEst;
+ ** pointers.  In that case, only verify 4-byte alignment.
+ */
+ #ifdef SQLITE_4_BYTE_ALIGNED_MALLOC
+-# define EIGHT_BYTE_ALIGNMENT(X)   ((((char*)(X) - (char*)0)&3)==0)
++# define EIGHT_BYTE_ALIGNMENT(X)   ((((uptr)(X) - (uptr)0)&3)==0)
+ #else
+-# define EIGHT_BYTE_ALIGNMENT(X)   ((((char*)(X) - (char*)0)&7)==0)
++# define EIGHT_BYTE_ALIGNMENT(X)   ((((uptr)(X) - (uptr)0)&7)==0)
+ #endif
+ 
+ /*
+@@ -14477,15 +15211,38 @@ SQLITE_PRIVATE u32 sqlite3TreeTrace;
+     && (defined(SQLITE_TEST) || defined(SQLITE_ENABLE_SELECTTRACE) \
+                              || defined(SQLITE_ENABLE_TREETRACE))
+ # define TREETRACE_ENABLED 1
+-# define SELECTTRACE(K,P,S,X)  \
++# define TREETRACE(K,P,S,X)  \
+   if(sqlite3TreeTrace&(K))   \
+     sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\
+     sqlite3DebugPrintf X
+ #else
+-# define SELECTTRACE(K,P,S,X)
++# define TREETRACE(K,P,S,X)
+ # define TREETRACE_ENABLED 0
+ #endif
+ 
++/* TREETRACE flag meanings:
++**
++**   0x00000001     Beginning and end of SELECT processing
++**   0x00000002     WHERE clause processing
++**   0x00000004     Query flattener
++**   0x00000008     Result-set wildcard expansion
++**   0x00000010     Query name resolution
++**   0x00000020     Aggregate analysis
++**   0x00000040     Window functions
++**   0x00000080     Generated column names
++**   0x00000100     Move HAVING terms into WHERE
++**   0x00000200     Count-of-view optimization
++**   0x00000400     Compound SELECT processing
++**   0x00000800     Drop superfluous ORDER BY
++**   0x00001000     LEFT JOIN simplifies to JOIN
++**   0x00002000     Constant propagation
++**   0x00004000     Push-down optimization
++**   0x00008000     After all FROM-clause analysis
++**   0x00010000     Beginning of DELETE/INSERT/UPDATE processing
++**   0x00020000     Transform DISTINCT into GROUP BY
++**   0x00040000     SELECT tree dump after all code has been generated
++*/
++
+ /*
+ ** Macros for "wheretrace"
+ */
+@@ -14498,6 +15255,36 @@ SQLITE_PRIVATE u32 sqlite3WhereTrace;
+ # define WHERETRACE(K,X)
+ #endif
+ 
++/*
++** Bits for the sqlite3WhereTrace mask:
++**
++** (---any--)   Top-level block structure
++** 0x-------F   High-level debug messages
++** 0x----FFF-   More detail
++** 0xFFFF----   Low-level debug messages
++**
++** 0x00000001   Code generation
++** 0x00000002   Solver
++** 0x00000004   Solver costs
++** 0x00000008   WhereLoop inserts
++**
++** 0x00000010   Display sqlite3_index_info xBestIndex calls
++** 0x00000020   Range an equality scan metrics
++** 0x00000040   IN operator decisions
++** 0x00000080   WhereLoop cost adjustements
++** 0x00000100
++** 0x00000200   Covering index decisions
++** 0x00000400   OR optimization
++** 0x00000800   Index scanner
++** 0x00001000   More details associated with code generation
++** 0x00002000
++** 0x00004000   Show all WHERE terms at key points
++** 0x00008000   Show the full SELECT statement at key places
++**
++** 0x00010000   Show more detail when printing WHERE terms
++** 0x00020000   Show WHERE terms returned from whereScanNext()
++*/
++
+ 
+ /*
+ ** An instance of the following structure is used to store the busy-handler
+@@ -14518,7 +15305,7 @@ struct BusyHandler {
+ /*
+ ** Name of table that holds the database schema.
+ **
+-** The PREFERRED names are used whereever possible.  But LEGACY is also
++** The PREFERRED names are used wherever possible.  But LEGACY is also
+ ** used for backwards compatibility.
+ **
+ **  1.  Queries can use either the PREFERRED or the LEGACY names
+@@ -14627,16 +15414,19 @@ typedef struct Column Column;
+ typedef struct Cte Cte;
+ typedef struct CteUse CteUse;
+ typedef struct Db Db;
++typedef struct DbClientData DbClientData;
+ typedef struct DbFixer DbFixer;
+ typedef struct Schema Schema;
+ typedef struct Expr Expr;
+ typedef struct ExprList ExprList;
+ typedef struct FKey FKey;
++typedef struct FpDecode FpDecode;
+ typedef struct FuncDestructor FuncDestructor;
+ typedef struct FuncDef FuncDef;
+ typedef struct FuncDefHash FuncDefHash;
+ typedef struct IdList IdList;
+ typedef struct Index Index;
++typedef struct IndexedExpr IndexedExpr;
+ typedef struct IndexSample IndexSample;
+ typedef struct KeyClass KeyClass;
+ typedef struct KeyInfo KeyInfo;
+@@ -14649,6 +15439,7 @@ typedef struct Parse Parse;
+ typedef struct ParseCleanup ParseCleanup;
+ typedef struct PreUpdate PreUpdate;
+ typedef struct PrintfArguments PrintfArguments;
++typedef struct RCStr RCStr;
+ typedef struct RenameToken RenameToken;
+ typedef struct Returning Returning;
+ typedef struct RowSet RowSet;
+@@ -14702,6 +15493,7 @@ typedef struct With With;
+ #define MASKBIT32(n)  (((unsigned int)1)<<(n))
+ #define SMASKBIT32(n) ((n)<=31?((unsigned int)1)<<(n):0)
+ #define ALLBITS       ((Bitmask)-1)
++#define TOPBIT        (((Bitmask)1)<<(BMS-1))
+ 
+ /* A VList object records a mapping between parameters/variables/wildcards
+ ** in the SQL statement (such as $abc, @pqr, or :xyz) and the integer
+@@ -14716,6 +15508,331 @@ typedef int VList;
+ ** "BusyHandler" typedefs. vdbe.h also requires a few of the opaque
+ ** pointer types (i.e. FuncDef) defined above.
+ */
++/************** Include os.h in the middle of sqliteInt.h ********************/
++/************** Begin file os.h **********************************************/
++/*
++** 2001 September 16
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This header file (together with is companion C source-code file
++** "os.c") attempt to abstract the underlying operating system so that
++** the SQLite library will work on both POSIX and windows systems.
++**
++** This header file is #include-ed by sqliteInt.h and thus ends up
++** being included by every source file.
++*/
++#ifndef _SQLITE_OS_H_
++#define _SQLITE_OS_H_
++
++/*
++** Attempt to automatically detect the operating system and setup the
++** necessary pre-processor macros for it.
++*/
++/************** Include os_setup.h in the middle of os.h *********************/
++/************** Begin file os_setup.h ****************************************/
++/*
++** 2013 November 25
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains pre-processor directives related to operating system
++** detection and/or setup.
++*/
++#ifndef SQLITE_OS_SETUP_H
++#define SQLITE_OS_SETUP_H
++
++/*
++** Figure out if we are dealing with Unix, Windows, or some other operating
++** system.
++**
++** After the following block of preprocess macros, all of
++**
++**    SQLITE_OS_KV
++**    SQLITE_OS_OTHER
++**    SQLITE_OS_UNIX
++**    SQLITE_OS_WIN
++**
++** will defined to either 1 or 0. One of them will be 1. The others will be 0.
++** If none of the macros are initially defined, then select either
++** SQLITE_OS_UNIX or SQLITE_OS_WIN depending on the target platform.
++**
++** If SQLITE_OS_OTHER=1 is specified at compile-time, then the application
++** must provide its own VFS implementation together with sqlite3_os_init()
++** and sqlite3_os_end() routines.
++*/
++#if !defined(SQLITE_OS_KV) && !defined(SQLITE_OS_OTHER) && \
++       !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_WIN)
++#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
++          defined(__MINGW32__) || defined(__BORLANDC__)
++#    define SQLITE_OS_WIN 1
++#    define SQLITE_OS_UNIX 0
++#  else
++#    define SQLITE_OS_WIN 0
++#    define SQLITE_OS_UNIX 1
++#  endif
++#endif
++#if SQLITE_OS_OTHER+1>1
++#  undef SQLITE_OS_KV
++#  define SQLITE_OS_KV 0
++#  undef SQLITE_OS_UNIX
++#  define SQLITE_OS_UNIX 0
++#  undef SQLITE_OS_WIN
++#  define SQLITE_OS_WIN 0
++#endif
++#if SQLITE_OS_KV+1>1
++#  undef SQLITE_OS_OTHER
++#  define SQLITE_OS_OTHER 0
++#  undef SQLITE_OS_UNIX
++#  define SQLITE_OS_UNIX 0
++#  undef SQLITE_OS_WIN
++#  define SQLITE_OS_WIN 0
++#  define SQLITE_OMIT_LOAD_EXTENSION 1
++#  define SQLITE_OMIT_WAL 1
++#  define SQLITE_OMIT_DEPRECATED 1
++#  undef SQLITE_TEMP_STORE
++#  define SQLITE_TEMP_STORE 3  /* Always use memory for temporary storage */
++#  define SQLITE_DQS 0
++#  define SQLITE_OMIT_SHARED_CACHE 1
++#  define SQLITE_OMIT_AUTOINIT 1
++#endif
++#if SQLITE_OS_UNIX+1>1
++#  undef SQLITE_OS_KV
++#  define SQLITE_OS_KV 0
++#  undef SQLITE_OS_OTHER
++#  define SQLITE_OS_OTHER 0
++#  undef SQLITE_OS_WIN
++#  define SQLITE_OS_WIN 0
++#endif
++#if SQLITE_OS_WIN+1>1
++#  undef SQLITE_OS_KV
++#  define SQLITE_OS_KV 0
++#  undef SQLITE_OS_OTHER
++#  define SQLITE_OS_OTHER 0
++#  undef SQLITE_OS_UNIX
++#  define SQLITE_OS_UNIX 0
++#endif
++
++
++#endif /* SQLITE_OS_SETUP_H */
++
++/************** End of os_setup.h ********************************************/
++/************** Continuing where we left off in os.h *************************/
++
++/* If the SET_FULLSYNC macro is not defined above, then make it
++** a no-op
++*/
++#ifndef SET_FULLSYNC
++# define SET_FULLSYNC(x,y)
++#endif
++
++/* Maximum pathname length.  Note: FILENAME_MAX defined by stdio.h
++*/
++#ifndef SQLITE_MAX_PATHLEN
++# define SQLITE_MAX_PATHLEN FILENAME_MAX
++#endif
++
++/* Maximum number of symlinks that will be resolved while trying to
++** expand a filename in xFullPathname() in the VFS.
++*/
++#ifndef SQLITE_MAX_SYMLINK
++# define SQLITE_MAX_SYMLINK 200
++#endif
++
++/*
++** The default size of a disk sector
++*/
++#ifndef SQLITE_DEFAULT_SECTOR_SIZE
++# define SQLITE_DEFAULT_SECTOR_SIZE 4096
++#endif
++
++/*
++** Temporary files are named starting with this prefix followed by 16 random
++** alphanumeric characters, and no file extension. They are stored in the
++** OS's standard temporary file directory, and are deleted prior to exit.
++** If sqlite is being embedded in another program, you may wish to change the
++** prefix to reflect your program's name, so that if your program exits
++** prematurely, old temporary files can be easily identified. This can be done
++** using -DSQLITE_TEMP_FILE_PREFIX=myprefix_ on the compiler command line.
++**
++** 2006-10-31:  The default prefix used to be "sqlite_".  But then
++** Mcafee started using SQLite in their anti-virus product and it
++** started putting files with the "sqlite" name in the c:/temp folder.
++** This annoyed many windows users.  Those users would then do a
++** Google search for "sqlite", find the telephone numbers of the
++** developers and call to wake them up at night and complain.
++** For this reason, the default name prefix is changed to be "sqlite"
++** spelled backwards.  So the temp files are still identified, but
++** anybody smart enough to figure out the code is also likely smart
++** enough to know that calling the developer will not help get rid
++** of the file.
++*/
++#ifndef SQLITE_TEMP_FILE_PREFIX
++# define SQLITE_TEMP_FILE_PREFIX "etilqs_"
++#endif
++
++/*
++** The following values may be passed as the second argument to
++** sqlite3OsLock(). The various locks exhibit the following semantics:
++**
++** SHARED:    Any number of processes may hold a SHARED lock simultaneously.
++** RESERVED:  A single process may hold a RESERVED lock on a file at
++**            any time. Other processes may hold and obtain new SHARED locks.
++** PENDING:   A single process may hold a PENDING lock on a file at
++**            any one time. Existing SHARED locks may persist, but no new
++**            SHARED locks may be obtained by other processes.
++** EXCLUSIVE: An EXCLUSIVE lock precludes all other locks.
++**
++** PENDING_LOCK may not be passed directly to sqlite3OsLock(). Instead, a
++** process that requests an EXCLUSIVE lock may actually obtain a PENDING
++** lock. This can be upgraded to an EXCLUSIVE lock by a subsequent call to
++** sqlite3OsLock().
++*/
++#define NO_LOCK         0
++#define SHARED_LOCK     1
++#define RESERVED_LOCK   2
++#define PENDING_LOCK    3
++#define EXCLUSIVE_LOCK  4
++
++/*
++** File Locking Notes:  (Mostly about windows but also some info for Unix)
++**
++** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because
++** those functions are not available.  So we use only LockFile() and
++** UnlockFile().
++**
++** LockFile() prevents not just writing but also reading by other processes.
++** A SHARED_LOCK is obtained by locking a single randomly-chosen
++** byte out of a specific range of bytes. The lock byte is obtained at
++** random so two separate readers can probably access the file at the
++** same time, unless they are unlucky and choose the same lock byte.
++** An EXCLUSIVE_LOCK is obtained by locking all bytes in the range.
++** There can only be one writer.  A RESERVED_LOCK is obtained by locking
++** a single byte of the file that is designated as the reserved lock byte.
++** A PENDING_LOCK is obtained by locking a designated byte different from
++** the RESERVED_LOCK byte.
++**
++** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available,
++** which means we can use reader/writer locks.  When reader/writer locks
++** are used, the lock is placed on the same range of bytes that is used
++** for probabilistic locking in Win95/98/ME.  Hence, the locking scheme
++** will support two or more Win95 readers or two or more WinNT readers.
++** But a single Win95 reader will lock out all WinNT readers and a single
++** WinNT reader will lock out all other Win95 readers.
++**
++** The following #defines specify the range of bytes used for locking.
++** SHARED_SIZE is the number of bytes available in the pool from which
++** a random byte is selected for a shared lock.  The pool of bytes for
++** shared locks begins at SHARED_FIRST.
++**
++** The same locking strategy and
++** byte ranges are used for Unix.  This leaves open the possibility of having
++** clients on win95, winNT, and unix all talking to the same shared file
++** and all locking correctly.  To do so would require that samba (or whatever
++** tool is being used for file sharing) implements locks correctly between
++** windows and unix.  I'm guessing that isn't likely to happen, but by
++** using the same locking range we are at least open to the possibility.
++**
++** Locking in windows is manditory.  For this reason, we cannot store
++** actual data in the bytes used for locking.  The pager never allocates
++** the pages involved in locking therefore.  SHARED_SIZE is selected so
++** that all locks will fit on a single page even at the minimum page size.
++** PENDING_BYTE defines the beginning of the locks.  By default PENDING_BYTE
++** is set high so that we don't have to allocate an unused page except
++** for very large databases.  But one should test the page skipping logic
++** by setting PENDING_BYTE low and running the entire regression suite.
++**
++** Changing the value of PENDING_BYTE results in a subtly incompatible
++** file format.  Depending on how it is changed, you might not notice
++** the incompatibility right away, even running a full regression test.
++** The default location of PENDING_BYTE is the first byte past the
++** 1GB boundary.
++**
++*/
++#ifdef SQLITE_OMIT_WSD
++# define PENDING_BYTE     (0x40000000)
++#else
++# define PENDING_BYTE      sqlite3PendingByte
++#endif
++#define RESERVED_BYTE     (PENDING_BYTE+1)
++#define SHARED_FIRST      (PENDING_BYTE+2)
++#define SHARED_SIZE       510
++
++/*
++** Wrapper around OS specific sqlite3_os_init() function.
++*/
++SQLITE_PRIVATE int sqlite3OsInit(void);
++
++/*
++** Functions for accessing sqlite3_file methods
++*/
++SQLITE_PRIVATE void sqlite3OsClose(sqlite3_file*);
++SQLITE_PRIVATE int sqlite3OsRead(sqlite3_file*, void*, int amt, i64 offset);
++SQLITE_PRIVATE int sqlite3OsWrite(sqlite3_file*, const void*, int amt, i64 offset);
++SQLITE_PRIVATE int sqlite3OsTruncate(sqlite3_file*, i64 size);
++SQLITE_PRIVATE int sqlite3OsSync(sqlite3_file*, int);
++SQLITE_PRIVATE int sqlite3OsFileSize(sqlite3_file*, i64 *pSize);
++SQLITE_PRIVATE int sqlite3OsLock(sqlite3_file*, int);
++SQLITE_PRIVATE int sqlite3OsUnlock(sqlite3_file*, int);
++SQLITE_PRIVATE int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut);
++SQLITE_PRIVATE int sqlite3OsFileControl(sqlite3_file*,int,void*);
++SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file*,int,void*);
++#define SQLITE_FCNTL_DB_UNCHANGED 0xca093fa0
++SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id);
++SQLITE_PRIVATE int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
++#ifndef SQLITE_OMIT_WAL
++SQLITE_PRIVATE int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **);
++SQLITE_PRIVATE int sqlite3OsShmLock(sqlite3_file *id, int, int, int);
++SQLITE_PRIVATE void sqlite3OsShmBarrier(sqlite3_file *id);
++SQLITE_PRIVATE int sqlite3OsShmUnmap(sqlite3_file *id, int);
++#endif /* SQLITE_OMIT_WAL */
++SQLITE_PRIVATE int sqlite3OsFetch(sqlite3_file *id, i64, int, void **);
++SQLITE_PRIVATE int sqlite3OsUnfetch(sqlite3_file *, i64, void *);
++
++
++/*
++** Functions for accessing sqlite3_vfs methods
++*/
++SQLITE_PRIVATE int sqlite3OsOpen(sqlite3_vfs *, const char *, sqlite3_file*, int, int *);
++SQLITE_PRIVATE int sqlite3OsDelete(sqlite3_vfs *, const char *, int);
++SQLITE_PRIVATE int sqlite3OsAccess(sqlite3_vfs *, const char *, int, int *pResOut);
++SQLITE_PRIVATE int sqlite3OsFullPathname(sqlite3_vfs *, const char *, int, char *);
++#ifndef SQLITE_OMIT_LOAD_EXTENSION
++SQLITE_PRIVATE void *sqlite3OsDlOpen(sqlite3_vfs *, const char *);
++SQLITE_PRIVATE void sqlite3OsDlError(sqlite3_vfs *, int, char *);
++SQLITE_PRIVATE void (*sqlite3OsDlSym(sqlite3_vfs *, void *, const char *))(void);
++SQLITE_PRIVATE void sqlite3OsDlClose(sqlite3_vfs *, void *);
++#endif /* SQLITE_OMIT_LOAD_EXTENSION */
++SQLITE_PRIVATE int sqlite3OsRandomness(sqlite3_vfs *, int, char *);
++SQLITE_PRIVATE int sqlite3OsSleep(sqlite3_vfs *, int);
++SQLITE_PRIVATE int sqlite3OsGetLastError(sqlite3_vfs*);
++SQLITE_PRIVATE int sqlite3OsCurrentTimeInt64(sqlite3_vfs *, sqlite3_int64*);
++
++/*
++** Convenience functions for opening and closing files using
++** sqlite3_malloc() to obtain space for the file-handle structure.
++*/
++SQLITE_PRIVATE int sqlite3OsOpenMalloc(sqlite3_vfs *, const char *, sqlite3_file **, int,int*);
++SQLITE_PRIVATE void sqlite3OsCloseFree(sqlite3_file *);
++
++#endif /* _SQLITE_OS_H_ */
++
++/************** End of os.h **************************************************/
++/************** Continuing where we left off in sqliteInt.h ******************/
+ /************** Include pager.h in the middle of sqliteInt.h *****************/
+ /************** Begin file pager.h *******************************************/
+ /*
+@@ -14936,7 +16053,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3PagerJrnlFile(Pager*);
+ SQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager*);
+ SQLITE_PRIVATE void *sqlite3PagerTempSpace(Pager*);
+ SQLITE_PRIVATE int sqlite3PagerIsMemdb(Pager*);
+-SQLITE_PRIVATE void sqlite3PagerCacheStat(Pager *, int, int, int *);
++SQLITE_PRIVATE void sqlite3PagerCacheStat(Pager *, int, int, u64*);
+ SQLITE_PRIVATE void sqlite3PagerClearCache(Pager*);
+ SQLITE_PRIVATE int sqlite3SectorSize(sqlite3_file *);
+ 
+@@ -14960,6 +16077,10 @@ SQLITE_PRIVATE   void sqlite3PagerRefdump(Pager*);
+ # define enable_simulated_io_errors()
+ #endif
+ 
++#if defined(SQLITE_USE_SEH) && !defined(SQLITE_OMIT_WAL)
++SQLITE_PRIVATE int sqlite3PagerWalSystemErrno(Pager*);
++#endif
++
+ #endif /* SQLITE_PAGER_H */
+ 
+ /************** End of pager.h ***********************************************/
+@@ -15151,7 +16272,7 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p);
+ **     reduce network bandwidth.
+ **
+ ** Note that BTREE_HINT_FLAGS with BTREE_BULKLOAD is the only hint used by
+-** standard SQLite.  The other hints are provided for extentions that use
++** standard SQLite.  The other hints are provided for extensions that use
+ ** the SQLite parser and code generator but substitute their own storage
+ ** engine.
+ */
+@@ -15289,15 +16410,21 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int flags);
+ SQLITE_PRIVATE i64 sqlite3BtreeIntegerKey(BtCursor*);
+ SQLITE_PRIVATE void sqlite3BtreeCursorPin(BtCursor*);
+ SQLITE_PRIVATE void sqlite3BtreeCursorUnpin(BtCursor*);
+-#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
+ SQLITE_PRIVATE i64 sqlite3BtreeOffset(BtCursor*);
+-#endif
+ SQLITE_PRIVATE int sqlite3BtreePayload(BtCursor*, u32 offset, u32 amt, void*);
+ SQLITE_PRIVATE const void *sqlite3BtreePayloadFetch(BtCursor*, u32 *pAmt);
+ SQLITE_PRIVATE u32 sqlite3BtreePayloadSize(BtCursor*);
+ SQLITE_PRIVATE sqlite3_int64 sqlite3BtreeMaxRecordSize(BtCursor*);
+ 
+-SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(sqlite3*,Btree*,Pgno*aRoot,int nRoot,int,int*);
++SQLITE_PRIVATE int sqlite3BtreeIntegrityCheck(
++  sqlite3 *db,  /* Database connection that is running the check */
++  Btree *p,     /* The btree to be checked */
++  Pgno *aRoot,  /* An array of root pages numbers for individual trees */
++  int nRoot,    /* Number of entries in aRoot[] */
++  int mxErr,    /* Stop reporting errors after this many */
++  int *pnErr,   /* OUT: Write number of errors seen to this variable */
++  char **pzOut  /* OUT: Write the error message string here */
++);
+ SQLITE_PRIVATE struct Pager *sqlite3BtreePager(Btree*);
+ SQLITE_PRIVATE i64 sqlite3BtreeRowCountEst(BtCursor*);
+ 
+@@ -15336,6 +16463,8 @@ SQLITE_PRIVATE   int sqlite3BtreeCheckpoint(Btree*, int, int *, int *);
+ 
+ SQLITE_PRIVATE int sqlite3BtreeTransferRow(BtCursor*, BtCursor*, i64);
+ 
++SQLITE_PRIVATE void sqlite3BtreeClearCache(Btree*);
++
+ /*
+ ** If we are not using shared cache, then there is no need to
+ ** use mutexes to access the BtShared structures.  So make the
+@@ -15452,14 +16581,14 @@ struct VdbeOp {
+ #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+   char *zComment;          /* Comment to improve readability */
+ #endif
+-#ifdef VDBE_PROFILE
+-  u32 cnt;                 /* Number of times this instruction was executed */
+-  u64 cycles;              /* Total time spent executing this instruction */
+-#endif
+ #ifdef SQLITE_VDBE_COVERAGE
+   u32 iSrcLine;            /* Source-code line that generated this opcode
+                            ** with flags in the upper 8 bits */
+ #endif
++#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
++  u64 nExec;
++  u64 nCycle;
++#endif
+ };
+ typedef struct VdbeOp VdbeOp;
+ 
+@@ -15511,6 +16640,7 @@ typedef struct VdbeOpList VdbeOpList;
+ #define P4_INT64      (-13) /* P4 is a 64-bit signed integer */
+ #define P4_INTARRAY   (-14) /* P4 is a vector of 32-bit integers */
+ #define P4_FUNCCTX    (-15) /* P4 is a pointer to an sqlite3_context object */
++#define P4_TABLEREF   (-16) /* Like P4_TABLE, but reference counted */
+ 
+ /* Error message codes for OP_Halt */
+ #define P5_ConstraintNotNull 1
+@@ -15560,48 +16690,48 @@ typedef struct VdbeOpList VdbeOpList;
+ #define OP_Vacuum          5
+ #define OP_VFilter         6 /* jump, synopsis: iplan=r[P3] zplan='P4'     */
+ #define OP_VUpdate         7 /* synopsis: data=r[P3@P2]                    */
+-#define OP_Goto            8 /* jump                                       */
+-#define OP_Gosub           9 /* jump                                       */
+-#define OP_InitCoroutine  10 /* jump                                       */
+-#define OP_Yield          11 /* jump                                       */
+-#define OP_MustBeInt      12 /* jump                                       */
+-#define OP_Jump           13 /* jump                                       */
+-#define OP_Once           14 /* jump                                       */
+-#define OP_If             15 /* jump                                       */
+-#define OP_IfNot          16 /* jump                                       */
+-#define OP_IsNullOrType   17 /* jump, synopsis: if typeof(r[P1]) IN (P3,5) goto P2 */
+-#define OP_IfNullRow      18 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
++#define OP_Init            8 /* jump, synopsis: Start at P2                */
++#define OP_Goto            9 /* jump                                       */
++#define OP_Gosub          10 /* jump                                       */
++#define OP_InitCoroutine  11 /* jump                                       */
++#define OP_Yield          12 /* jump                                       */
++#define OP_MustBeInt      13 /* jump                                       */
++#define OP_Jump           14 /* jump                                       */
++#define OP_Once           15 /* jump                                       */
++#define OP_If             16 /* jump                                       */
++#define OP_IfNot          17 /* jump                                       */
++#define OP_IsType         18 /* jump, synopsis: if typeof(P1.P3) in P5 goto P2 */
+ #define OP_Not            19 /* same as TK_NOT, synopsis: r[P2]= !r[P1]    */
+-#define OP_SeekLT         20 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_SeekLE         21 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_SeekGE         22 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_SeekGT         23 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_IfNotOpen      24 /* jump, synopsis: if( !csr[P1] ) goto P2     */
+-#define OP_IfNoHope       25 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_NoConflict     26 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_NotFound       27 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_Found          28 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_SeekRowid      29 /* jump, synopsis: intkey=r[P3]               */
+-#define OP_NotExists      30 /* jump, synopsis: intkey=r[P3]               */
+-#define OP_Last           31 /* jump                                       */
+-#define OP_IfSmaller      32 /* jump                                       */
+-#define OP_SorterSort     33 /* jump                                       */
+-#define OP_Sort           34 /* jump                                       */
+-#define OP_Rewind         35 /* jump                                       */
+-#define OP_SorterNext     36 /* jump                                       */
+-#define OP_Prev           37 /* jump                                       */
+-#define OP_Next           38 /* jump                                       */
+-#define OP_IdxLE          39 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_IdxGT          40 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_IdxLT          41 /* jump, synopsis: key=r[P3@P4]               */
+-#define OP_IdxGE          42 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_IfNullRow      20 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
++#define OP_SeekLT         21 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_SeekLE         22 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_SeekGE         23 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_SeekGT         24 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_IfNotOpen      25 /* jump, synopsis: if( !csr[P1] ) goto P2     */
++#define OP_IfNoHope       26 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_NoConflict     27 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_NotFound       28 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_Found          29 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_SeekRowid      30 /* jump, synopsis: intkey=r[P3]               */
++#define OP_NotExists      31 /* jump, synopsis: intkey=r[P3]               */
++#define OP_Last           32 /* jump                                       */
++#define OP_IfSmaller      33 /* jump                                       */
++#define OP_SorterSort     34 /* jump                                       */
++#define OP_Sort           35 /* jump                                       */
++#define OP_Rewind         36 /* jump                                       */
++#define OP_SorterNext     37 /* jump                                       */
++#define OP_Prev           38 /* jump                                       */
++#define OP_Next           39 /* jump                                       */
++#define OP_IdxLE          40 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_IdxGT          41 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_IdxLT          42 /* jump, synopsis: key=r[P3@P4]               */
+ #define OP_Or             43 /* same as TK_OR, synopsis: r[P3]=(r[P1] || r[P2]) */
+ #define OP_And            44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
+-#define OP_RowSetRead     45 /* jump, synopsis: r[P3]=rowset(P1)           */
+-#define OP_RowSetTest     46 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
+-#define OP_Program        47 /* jump                                       */
+-#define OP_FkIfZero       48 /* jump, synopsis: if fkctr[P1]==0 goto P2    */
+-#define OP_IfPos          49 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
++#define OP_IdxGE          45 /* jump, synopsis: key=r[P3@P4]               */
++#define OP_RowSetRead     46 /* jump, synopsis: r[P3]=rowset(P1)           */
++#define OP_RowSetTest     47 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
++#define OP_Program        48 /* jump                                       */
++#define OP_FkIfZero       49 /* jump, synopsis: if fkctr[P1]==0 goto P2    */
+ #define OP_IsNull         50 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
+ #define OP_NotNull        51 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
+ #define OP_Ne             52 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
+@@ -15611,12 +16741,12 @@ typedef struct VdbeOpList VdbeOpList;
+ #define OP_Lt             56 /* jump, same as TK_LT, synopsis: IF r[P3]=r[P1] */
+ #define OP_ElseEq         58 /* jump, same as TK_ESCAPE                    */
+-#define OP_IfNotZero      59 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
+-#define OP_DecrJumpZero   60 /* jump, synopsis: if (--r[P1])==0 goto P2    */
+-#define OP_IncrVacuum     61 /* jump                                       */
+-#define OP_VNext          62 /* jump                                       */
+-#define OP_Filter         63 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
+-#define OP_Init           64 /* jump, synopsis: Start at P2                */
++#define OP_IfPos          59 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
++#define OP_IfNotZero      60 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
++#define OP_DecrJumpZero   61 /* jump, synopsis: if (--r[P1])==0 goto P2    */
++#define OP_IncrVacuum     62 /* jump                                       */
++#define OP_VNext          63 /* jump                                       */
++#define OP_Filter         64 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
+ #define OP_PureFunc       65 /* synopsis: r[P3]=func(r[P2@NP])             */
+ #define OP_Function       66 /* synopsis: r[P3]=func(r[P2@NP])             */
+ #define OP_Return         67
+@@ -15726,19 +16856,22 @@ typedef struct VdbeOpList VdbeOpList;
+ #define OP_VCreate       171
+ #define OP_VDestroy      172
+ #define OP_VOpen         173
+-#define OP_VInitIn       174 /* synopsis: r[P2]=ValueList(P1,P3)           */
+-#define OP_VColumn       175 /* synopsis: r[P3]=vcolumn(P2)                */
+-#define OP_VRename       176
+-#define OP_Pagecount     177
+-#define OP_MaxPgcnt      178
+-#define OP_ClrSubtype    179 /* synopsis: r[P1].subtype = 0                */
+-#define OP_FilterAdd     180 /* synopsis: filter(P1) += key(P3@P4)         */
+-#define OP_Trace         181
+-#define OP_CursorHint    182
+-#define OP_ReleaseReg    183 /* synopsis: release r[P1@P2] mask P3         */
+-#define OP_Noop          184
+-#define OP_Explain       185
+-#define OP_Abortable     186
++#define OP_VCheck        174
++#define OP_VInitIn       175 /* synopsis: r[P2]=ValueList(P1,P3)           */
++#define OP_VColumn       176 /* synopsis: r[P3]=vcolumn(P2)                */
++#define OP_VRename       177
++#define OP_Pagecount     178
++#define OP_MaxPgcnt      179
++#define OP_ClrSubtype    180 /* synopsis: r[P1].subtype = 0                */
++#define OP_GetSubtype    181 /* synopsis: r[P2] = r[P1].subtype            */
++#define OP_SetSubtype    182 /* synopsis: r[P2].subtype = r[P1]            */
++#define OP_FilterAdd     183 /* synopsis: filter(P1) += key(P3@P4)         */
++#define OP_Trace         184
++#define OP_CursorHint    185
++#define OP_ReleaseReg    186 /* synopsis: release r[P1@P2] mask P3         */
++#define OP_Noop          187
++#define OP_Explain       188
++#define OP_Abortable     189
+ 
+ /* Properties such as "out2" or "jump" that are specified in
+ ** comments following the "case" for each opcode in the vdbe.c
+@@ -15750,31 +16883,32 @@ typedef struct VdbeOpList VdbeOpList;
+ #define OPFLG_IN3         0x08  /* in3:   P3 is an input */
+ #define OPFLG_OUT2        0x10  /* out2:  P2 is an output */
+ #define OPFLG_OUT3        0x20  /* out3:  P3 is an output */
++#define OPFLG_NCYCLE      0x40  /* ncycle:Cycles count against P1 */
+ #define OPFLG_INITIALIZER {\
+-/*   0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,\
+-/*   8 */ 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 0x03,\
+-/*  16 */ 0x03, 0x03, 0x01, 0x12, 0x09, 0x09, 0x09, 0x09,\
+-/*  24 */ 0x01, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x01,\
+-/*  32 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\
+-/*  40 */ 0x01, 0x01, 0x01, 0x26, 0x26, 0x23, 0x0b, 0x01,\
+-/*  48 */ 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
+-/*  56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x01, 0x01, 0x01,\
++/*   0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x41, 0x00,\
++/*   8 */ 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01,\
++/*  16 */ 0x03, 0x03, 0x01, 0x12, 0x01, 0x49, 0x49, 0x49,\
++/*  24 */ 0x49, 0x01, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49,\
++/*  32 */ 0x41, 0x01, 0x41, 0x41, 0x41, 0x01, 0x41, 0x41,\
++/*  40 */ 0x41, 0x41, 0x41, 0x26, 0x26, 0x41, 0x23, 0x0b,\
++/*  48 */ 0x01, 0x01, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
++/*  56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x03, 0x01, 0x41,\
+ /*  64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
+ /*  72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
+ /*  80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
+-/*  88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x00, 0x00,\
+-/*  96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x26, 0x26,\
++/*  88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x40, 0x00,\
++/*  96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x26, 0x26,\
+ /* 104 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26,\
+-/* 112 */ 0x00, 0x00, 0x12, 0x00, 0x00, 0x10, 0x00, 0x00,\
+-/* 120 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,\
+-/* 128 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,\
+-/* 136 */ 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x10, 0x00,\
++/* 112 */ 0x40, 0x00, 0x12, 0x40, 0x40, 0x10, 0x40, 0x00,\
++/* 120 */ 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x10, 0x10,\
++/* 128 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x50,\
++/* 136 */ 0x00, 0x40, 0x04, 0x04, 0x00, 0x40, 0x50, 0x40,\
+ /* 144 */ 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,\
+ /* 152 */ 0x00, 0x10, 0x00, 0x00, 0x06, 0x10, 0x00, 0x04,\
+ /* 160 */ 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
+-/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,\
+-/* 176 */ 0x00, 0x10, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00,\
+-/* 184 */ 0x00, 0x00, 0x00,}
++/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x50,\
++/* 176 */ 0x40, 0x00, 0x10, 0x10, 0x02, 0x12, 0x12, 0x00,\
++/* 184 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,}
+ 
+ /* The resolve3P2Values() routine is able to run faster if it knows
+ ** the value of the largest JUMP opcode.  The smaller the maximum
+@@ -15827,14 +16961,20 @@ SQLITE_PRIVATE   void sqlite3VdbeNoJumpsOutsideSubrtn(Vdbe*,int,int,int);
+ #endif
+ SQLITE_PRIVATE VdbeOp *sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp,int iLineno);
+ #ifndef SQLITE_OMIT_EXPLAIN
+-SQLITE_PRIVATE   void sqlite3VdbeExplain(Parse*,u8,const char*,...);
++SQLITE_PRIVATE   int sqlite3VdbeExplain(Parse*,u8,const char*,...);
+ SQLITE_PRIVATE   void sqlite3VdbeExplainPop(Parse*);
+ SQLITE_PRIVATE   int sqlite3VdbeExplainParent(Parse*);
+ # define ExplainQueryPlan(P)        sqlite3VdbeExplain P
++# ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++#  define ExplainQueryPlan2(V,P)     (V = sqlite3VdbeExplain P)
++# else
++#  define ExplainQueryPlan2(V,P)     ExplainQueryPlan(P)
++# endif
+ # define ExplainQueryPlanPop(P)     sqlite3VdbeExplainPop(P)
+ # define ExplainQueryPlanParent(P)  sqlite3VdbeExplainParent(P)
+ #else
+ # define ExplainQueryPlan(P)
++# define ExplainQueryPlan2(V,P)
+ # define ExplainQueryPlanPop(P)
+ # define ExplainQueryPlanParent(P) 0
+ # define sqlite3ExplainBreakpoint(A,B) /*no-op*/
+@@ -15850,6 +16990,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1);
+ SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2);
+ SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, int addr, int P3);
+ SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe*, u16 P5);
++SQLITE_PRIVATE void sqlite3VdbeTypeofColumn(Vdbe*, int);
+ SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr);
+ SQLITE_PRIVATE void sqlite3VdbeJumpHereOrPopInst(Vdbe*, int addr);
+ SQLITE_PRIVATE int sqlite3VdbeChangeToNoop(Vdbe*, int addr);
+@@ -15864,6 +17005,7 @@ SQLITE_PRIVATE void sqlite3VdbeAppendP4(Vdbe*, void *pP4, int p4type);
+ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse*, Index*);
+ SQLITE_PRIVATE void sqlite3VdbeUsesBtree(Vdbe*, int);
+ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int);
++SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetLastOp(Vdbe*);
+ SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Parse*);
+ SQLITE_PRIVATE void sqlite3VdbeRunOnlyOnce(Vdbe*);
+ SQLITE_PRIVATE void sqlite3VdbeReusable(Vdbe*);
+@@ -15941,7 +17083,7 @@ SQLITE_PRIVATE   void sqlite3VdbeNoopComment(Vdbe*, const char*, ...);
+ ** The VdbeCoverage macros are used to set a coverage testing point
+ ** for VDBE branch instructions.  The coverage testing points are line
+ ** numbers in the sqlite3.c source file.  VDBE branch coverage testing
+-** only works with an amalagmation build.  That's ok since a VDBE branch
++** only works with an amalgamation build.  That's ok since a VDBE branch
+ ** coverage build designed for testing the test suite only.  No application
+ ** should ever ship with VDBE branch coverage measuring turned on.
+ **
+@@ -15959,7 +17101,7 @@ SQLITE_PRIVATE   void sqlite3VdbeNoopComment(Vdbe*, const char*, ...);
+ **                                     // NULL option is not possible
+ **
+ **    VdbeCoverageEqNe(v)              // Previous OP_Jump is only interested
+-**                                     // in distingishing equal and not-equal.
++**                                     // in distinguishing equal and not-equal.
+ **
+ ** Every VDBE branch operation must be tagged with one of the macros above.
+ ** If not, then when "make test" is run with -DSQLITE_VDBE_COVERAGE and
+@@ -15969,7 +17111,7 @@ SQLITE_PRIVATE   void sqlite3VdbeNoopComment(Vdbe*, const char*, ...);
+ ** During testing, the test application will invoke
+ ** sqlite3_test_control(SQLITE_TESTCTRL_VDBE_COVERAGE,...) to set a callback
+ ** routine that is invoked as each bytecode branch is taken.  The callback
+-** contains the sqlite3.c source line number ov the VdbeCoverage macro and
++** contains the sqlite3.c source line number of the VdbeCoverage macro and
+ ** flags to indicate whether or not the branch was taken.  The test application
+ ** is responsible for keeping track of this and reporting byte-code branches
+ ** that are never taken.
+@@ -16005,14 +17147,22 @@ SQLITE_PRIVATE   void sqlite3VdbeSetLineNumber(Vdbe*,int);
+ 
+ #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+ SQLITE_PRIVATE void sqlite3VdbeScanStatus(Vdbe*, int, int, int, LogEst, const char*);
++SQLITE_PRIVATE void sqlite3VdbeScanStatusRange(Vdbe*, int, int, int);
++SQLITE_PRIVATE void sqlite3VdbeScanStatusCounters(Vdbe*, int, int, int);
+ #else
+-# define sqlite3VdbeScanStatus(a,b,c,d,e)
++# define sqlite3VdbeScanStatus(a,b,c,d,e,f)
++# define sqlite3VdbeScanStatusRange(a,b,c,d)
++# define sqlite3VdbeScanStatusCounters(a,b,c,d)
+ #endif
+ 
+ #if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
+ SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, VdbeOp*);
+ #endif
+ 
++#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
++SQLITE_PRIVATE int sqlite3CursorRangeHintExprCheck(Walker *pWalker, Expr *pExpr);
++#endif
++
+ #endif /* SQLITE_VDBE_H */
+ 
+ /************** End of vdbe.h ************************************************/
+@@ -16061,7 +17211,7 @@ struct PgHdr {
+   ** private to pcache.c and should not be accessed by other modules.
+   ** pCache is grouped with the public elements for efficiency.
+   */
+-  i16 nRef;                      /* Number of users of this page */
++  i64 nRef;                      /* Number of users of this page */
+   PgHdr *pDirtyNext;             /* Next element in list of dirty pages */
+   PgHdr *pDirtyPrev;             /* Previous element in list of dirty pages */
+                           /* NB: pDirtyNext and pDirtyPrev are undefined if the
+@@ -16142,12 +17292,12 @@ SQLITE_PRIVATE void sqlite3PcacheClearSyncFlags(PCache *);
+ SQLITE_PRIVATE void sqlite3PcacheClear(PCache*);
+ 
+ /* Return the total number of outstanding page references */
+-SQLITE_PRIVATE int sqlite3PcacheRefCount(PCache*);
++SQLITE_PRIVATE i64 sqlite3PcacheRefCount(PCache*);
+ 
+ /* Increment the reference count of an existing page */
+ SQLITE_PRIVATE void sqlite3PcacheRef(PgHdr*);
+ 
+-SQLITE_PRIVATE int sqlite3PcachePageRefcount(PgHdr*);
++SQLITE_PRIVATE i64 sqlite3PcachePageRefcount(PgHdr*);
+ 
+ /* Return the total number of pages stored in the cache */
+ SQLITE_PRIVATE int sqlite3PcachePagecount(PCache*);
+@@ -16212,297 +17362,6 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);
+ 
+ /************** End of pcache.h **********************************************/
+ /************** Continuing where we left off in sqliteInt.h ******************/
+-/************** Include os.h in the middle of sqliteInt.h ********************/
+-/************** Begin file os.h **********************************************/
+-/*
+-** 2001 September 16
+-**
+-** The author disclaims copyright to this source code.  In place of
+-** a legal notice, here is a blessing:
+-**
+-**    May you do good and not evil.
+-**    May you find forgiveness for yourself and forgive others.
+-**    May you share freely, never taking more than you give.
+-**
+-******************************************************************************
+-**
+-** This header file (together with is companion C source-code file
+-** "os.c") attempt to abstract the underlying operating system so that
+-** the SQLite library will work on both POSIX and windows systems.
+-**
+-** This header file is #include-ed by sqliteInt.h and thus ends up
+-** being included by every source file.
+-*/
+-#ifndef _SQLITE_OS_H_
+-#define _SQLITE_OS_H_
+-
+-/*
+-** Attempt to automatically detect the operating system and setup the
+-** necessary pre-processor macros for it.
+-*/
+-/************** Include os_setup.h in the middle of os.h *********************/
+-/************** Begin file os_setup.h ****************************************/
+-/*
+-** 2013 November 25
+-**
+-** The author disclaims copyright to this source code.  In place of
+-** a legal notice, here is a blessing:
+-**
+-**    May you do good and not evil.
+-**    May you find forgiveness for yourself and forgive others.
+-**    May you share freely, never taking more than you give.
+-**
+-******************************************************************************
+-**
+-** This file contains pre-processor directives related to operating system
+-** detection and/or setup.
+-*/
+-#ifndef SQLITE_OS_SETUP_H
+-#define SQLITE_OS_SETUP_H
+-
+-/*
+-** Figure out if we are dealing with Unix, Windows, or some other operating
+-** system.
+-**
+-** After the following block of preprocess macros, all of SQLITE_OS_UNIX,
+-** SQLITE_OS_WIN, and SQLITE_OS_OTHER will defined to either 1 or 0.  One of
+-** the three will be 1.  The other two will be 0.
+-*/
+-#if defined(SQLITE_OS_OTHER)
+-#  if SQLITE_OS_OTHER==1
+-#    undef SQLITE_OS_UNIX
+-#    define SQLITE_OS_UNIX 0
+-#    undef SQLITE_OS_WIN
+-#    define SQLITE_OS_WIN 0
+-#  else
+-#    undef SQLITE_OS_OTHER
+-#  endif
+-#endif
+-#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
+-#  define SQLITE_OS_OTHER 0
+-#  ifndef SQLITE_OS_WIN
+-#    if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
+-        defined(__MINGW32__) || defined(__BORLANDC__)
+-#      define SQLITE_OS_WIN 1
+-#      define SQLITE_OS_UNIX 0
+-#    else
+-#      define SQLITE_OS_WIN 0
+-#      define SQLITE_OS_UNIX 1
+-#    endif
+-#  else
+-#    define SQLITE_OS_UNIX 0
+-#  endif
+-#else
+-#  ifndef SQLITE_OS_WIN
+-#    define SQLITE_OS_WIN 0
+-#  endif
+-#endif
+-
+-#endif /* SQLITE_OS_SETUP_H */
+-
+-/************** End of os_setup.h ********************************************/
+-/************** Continuing where we left off in os.h *************************/
+-
+-/* If the SET_FULLSYNC macro is not defined above, then make it
+-** a no-op
+-*/
+-#ifndef SET_FULLSYNC
+-# define SET_FULLSYNC(x,y)
+-#endif
+-
+-/* Maximum pathname length.  Note: FILENAME_MAX defined by stdio.h
+-*/
+-#ifndef SQLITE_MAX_PATHLEN
+-# define SQLITE_MAX_PATHLEN FILENAME_MAX
+-#endif
+-
+-/* Maximum number of symlinks that will be resolved while trying to
+-** expand a filename in xFullPathname() in the VFS.
+-*/
+-#ifndef SQLITE_MAX_SYMLINK
+-# define SQLITE_MAX_SYMLINK 200
+-#endif
+-
+-/*
+-** The default size of a disk sector
+-*/
+-#ifndef SQLITE_DEFAULT_SECTOR_SIZE
+-# define SQLITE_DEFAULT_SECTOR_SIZE 4096
+-#endif
+-
+-/*
+-** Temporary files are named starting with this prefix followed by 16 random
+-** alphanumeric characters, and no file extension. They are stored in the
+-** OS's standard temporary file directory, and are deleted prior to exit.
+-** If sqlite is being embedded in another program, you may wish to change the
+-** prefix to reflect your program's name, so that if your program exits
+-** prematurely, old temporary files can be easily identified. This can be done
+-** using -DSQLITE_TEMP_FILE_PREFIX=myprefix_ on the compiler command line.
+-**
+-** 2006-10-31:  The default prefix used to be "sqlite_".  But then
+-** Mcafee started using SQLite in their anti-virus product and it
+-** started putting files with the "sqlite" name in the c:/temp folder.
+-** This annoyed many windows users.  Those users would then do a
+-** Google search for "sqlite", find the telephone numbers of the
+-** developers and call to wake them up at night and complain.
+-** For this reason, the default name prefix is changed to be "sqlite"
+-** spelled backwards.  So the temp files are still identified, but
+-** anybody smart enough to figure out the code is also likely smart
+-** enough to know that calling the developer will not help get rid
+-** of the file.
+-*/
+-#ifndef SQLITE_TEMP_FILE_PREFIX
+-# define SQLITE_TEMP_FILE_PREFIX "etilqs_"
+-#endif
+-
+-/*
+-** The following values may be passed as the second argument to
+-** sqlite3OsLock(). The various locks exhibit the following semantics:
+-**
+-** SHARED:    Any number of processes may hold a SHARED lock simultaneously.
+-** RESERVED:  A single process may hold a RESERVED lock on a file at
+-**            any time. Other processes may hold and obtain new SHARED locks.
+-** PENDING:   A single process may hold a PENDING lock on a file at
+-**            any one time. Existing SHARED locks may persist, but no new
+-**            SHARED locks may be obtained by other processes.
+-** EXCLUSIVE: An EXCLUSIVE lock precludes all other locks.
+-**
+-** PENDING_LOCK may not be passed directly to sqlite3OsLock(). Instead, a
+-** process that requests an EXCLUSIVE lock may actually obtain a PENDING
+-** lock. This can be upgraded to an EXCLUSIVE lock by a subsequent call to
+-** sqlite3OsLock().
+-*/
+-#define NO_LOCK         0
+-#define SHARED_LOCK     1
+-#define RESERVED_LOCK   2
+-#define PENDING_LOCK    3
+-#define EXCLUSIVE_LOCK  4
+-
+-/*
+-** File Locking Notes:  (Mostly about windows but also some info for Unix)
+-**
+-** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because
+-** those functions are not available.  So we use only LockFile() and
+-** UnlockFile().
+-**
+-** LockFile() prevents not just writing but also reading by other processes.
+-** A SHARED_LOCK is obtained by locking a single randomly-chosen
+-** byte out of a specific range of bytes. The lock byte is obtained at
+-** random so two separate readers can probably access the file at the
+-** same time, unless they are unlucky and choose the same lock byte.
+-** An EXCLUSIVE_LOCK is obtained by locking all bytes in the range.
+-** There can only be one writer.  A RESERVED_LOCK is obtained by locking
+-** a single byte of the file that is designated as the reserved lock byte.
+-** A PENDING_LOCK is obtained by locking a designated byte different from
+-** the RESERVED_LOCK byte.
+-**
+-** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available,
+-** which means we can use reader/writer locks.  When reader/writer locks
+-** are used, the lock is placed on the same range of bytes that is used
+-** for probabilistic locking in Win95/98/ME.  Hence, the locking scheme
+-** will support two or more Win95 readers or two or more WinNT readers.
+-** But a single Win95 reader will lock out all WinNT readers and a single
+-** WinNT reader will lock out all other Win95 readers.
+-**
+-** The following #defines specify the range of bytes used for locking.
+-** SHARED_SIZE is the number of bytes available in the pool from which
+-** a random byte is selected for a shared lock.  The pool of bytes for
+-** shared locks begins at SHARED_FIRST.
+-**
+-** The same locking strategy and
+-** byte ranges are used for Unix.  This leaves open the possibility of having
+-** clients on win95, winNT, and unix all talking to the same shared file
+-** and all locking correctly.  To do so would require that samba (or whatever
+-** tool is being used for file sharing) implements locks correctly between
+-** windows and unix.  I'm guessing that isn't likely to happen, but by
+-** using the same locking range we are at least open to the possibility.
+-**
+-** Locking in windows is manditory.  For this reason, we cannot store
+-** actual data in the bytes used for locking.  The pager never allocates
+-** the pages involved in locking therefore.  SHARED_SIZE is selected so
+-** that all locks will fit on a single page even at the minimum page size.
+-** PENDING_BYTE defines the beginning of the locks.  By default PENDING_BYTE
+-** is set high so that we don't have to allocate an unused page except
+-** for very large databases.  But one should test the page skipping logic
+-** by setting PENDING_BYTE low and running the entire regression suite.
+-**
+-** Changing the value of PENDING_BYTE results in a subtly incompatible
+-** file format.  Depending on how it is changed, you might not notice
+-** the incompatibility right away, even running a full regression test.
+-** The default location of PENDING_BYTE is the first byte past the
+-** 1GB boundary.
+-**
+-*/
+-#ifdef SQLITE_OMIT_WSD
+-# define PENDING_BYTE     (0x40000000)
+-#else
+-# define PENDING_BYTE      sqlite3PendingByte
+-#endif
+-#define RESERVED_BYTE     (PENDING_BYTE+1)
+-#define SHARED_FIRST      (PENDING_BYTE+2)
+-#define SHARED_SIZE       510
+-
+-/*
+-** Wrapper around OS specific sqlite3_os_init() function.
+-*/
+-SQLITE_PRIVATE int sqlite3OsInit(void);
+-
+-/*
+-** Functions for accessing sqlite3_file methods
+-*/
+-SQLITE_PRIVATE void sqlite3OsClose(sqlite3_file*);
+-SQLITE_PRIVATE int sqlite3OsRead(sqlite3_file*, void*, int amt, i64 offset);
+-SQLITE_PRIVATE int sqlite3OsWrite(sqlite3_file*, const void*, int amt, i64 offset);
+-SQLITE_PRIVATE int sqlite3OsTruncate(sqlite3_file*, i64 size);
+-SQLITE_PRIVATE int sqlite3OsSync(sqlite3_file*, int);
+-SQLITE_PRIVATE int sqlite3OsFileSize(sqlite3_file*, i64 *pSize);
+-SQLITE_PRIVATE int sqlite3OsLock(sqlite3_file*, int);
+-SQLITE_PRIVATE int sqlite3OsUnlock(sqlite3_file*, int);
+-SQLITE_PRIVATE int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut);
+-SQLITE_PRIVATE int sqlite3OsFileControl(sqlite3_file*,int,void*);
+-SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file*,int,void*);
+-#define SQLITE_FCNTL_DB_UNCHANGED 0xca093fa0
+-SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id);
+-SQLITE_PRIVATE int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
+-#ifndef SQLITE_OMIT_WAL
+-SQLITE_PRIVATE int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **);
+-SQLITE_PRIVATE int sqlite3OsShmLock(sqlite3_file *id, int, int, int);
+-SQLITE_PRIVATE void sqlite3OsShmBarrier(sqlite3_file *id);
+-SQLITE_PRIVATE int sqlite3OsShmUnmap(sqlite3_file *id, int);
+-#endif /* SQLITE_OMIT_WAL */
+-SQLITE_PRIVATE int sqlite3OsFetch(sqlite3_file *id, i64, int, void **);
+-SQLITE_PRIVATE int sqlite3OsUnfetch(sqlite3_file *, i64, void *);
+-
+-
+-/*
+-** Functions for accessing sqlite3_vfs methods
+-*/
+-SQLITE_PRIVATE int sqlite3OsOpen(sqlite3_vfs *, const char *, sqlite3_file*, int, int *);
+-SQLITE_PRIVATE int sqlite3OsDelete(sqlite3_vfs *, const char *, int);
+-SQLITE_PRIVATE int sqlite3OsAccess(sqlite3_vfs *, const char *, int, int *pResOut);
+-SQLITE_PRIVATE int sqlite3OsFullPathname(sqlite3_vfs *, const char *, int, char *);
+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
+-SQLITE_PRIVATE void *sqlite3OsDlOpen(sqlite3_vfs *, const char *);
+-SQLITE_PRIVATE void sqlite3OsDlError(sqlite3_vfs *, int, char *);
+-SQLITE_PRIVATE void (*sqlite3OsDlSym(sqlite3_vfs *, void *, const char *))(void);
+-SQLITE_PRIVATE void sqlite3OsDlClose(sqlite3_vfs *, void *);
+-#endif /* SQLITE_OMIT_LOAD_EXTENSION */
+-SQLITE_PRIVATE int sqlite3OsRandomness(sqlite3_vfs *, int, char *);
+-SQLITE_PRIVATE int sqlite3OsSleep(sqlite3_vfs *, int);
+-SQLITE_PRIVATE int sqlite3OsGetLastError(sqlite3_vfs*);
+-SQLITE_PRIVATE int sqlite3OsCurrentTimeInt64(sqlite3_vfs *, sqlite3_int64*);
+-
+-/*
+-** Convenience functions for opening and closing files using
+-** sqlite3_malloc() to obtain space for the file-handle structure.
+-*/
+-SQLITE_PRIVATE int sqlite3OsOpenMalloc(sqlite3_vfs *, const char *, sqlite3_file **, int,int*);
+-SQLITE_PRIVATE void sqlite3OsCloseFree(sqlite3_file *);
+-
+-#endif /* _SQLITE_OS_H_ */
+-
+-/************** End of os.h **************************************************/
+-/************** Continuing where we left off in sqliteInt.h ******************/
+ /************** Include mutex.h in the middle of sqliteInt.h *****************/
+ /************** Begin file mutex.h *******************************************/
+ /*
+@@ -16591,7 +17450,7 @@ SQLITE_API int sqlite3_mutex_held(sqlite3_mutex*);
+ /*
+ ** Default synchronous levels.
+ **
+-** Note that (for historcal reasons) the PAGER_SYNCHRONOUS_* macros differ
++** Note that (for historical reasons) the PAGER_SYNCHRONOUS_* macros differ
+ ** from the SQLITE_DEFAULT_SYNCHRONOUS value by 1.
+ **
+ **           PAGER_SYNCHRONOUS       DEFAULT_SYNCHRONOUS
+@@ -16630,7 +17489,7 @@ struct Db {
+ ** An instance of the following structure stores a database schema.
+ **
+ ** Most Schema objects are associated with a Btree.  The exception is
+-** the Schema for the TEMP databaes (sqlite3.aDb[1]) which is free-standing.
++** the Schema for the TEMP database (sqlite3.aDb[1]) which is free-standing.
+ ** In shared cache mode, a single Schema object can be shared by multiple
+ ** Btrees that refer to the same underlying BtShared object.
+ **
+@@ -16741,13 +17600,14 @@ struct Lookaside {
+   LookasideSlot *pInit;   /* List of buffers not previously used */
+   LookasideSlot *pFree;   /* List of available buffers */
+ #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
+-  LookasideSlot *pSmallInit; /* List of small buffers not prediously used */
++  LookasideSlot *pSmallInit; /* List of small buffers not previously used */
+   LookasideSlot *pSmallFree; /* List of available small buffers */
+   void *pMiddle;          /* First byte past end of full-size buffers and
+                           ** the first byte of LOOKASIDE_SMALL buffers */
+ #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
+   void *pStart;           /* First byte of available memory space */
+   void *pEnd;             /* First byte past end of available space */
++  void *pTrueEnd;         /* True value of pEnd, when db->pnBytesFreed!=0 */
+ };
+ struct LookasideSlot {
+   LookasideSlot *pNext;    /* Next buffer in the list of free buffers */
+@@ -16757,7 +17617,7 @@ struct LookasideSlot {
+ #define EnableLookaside   db->lookaside.bDisable--;\
+    db->lookaside.sz=db->lookaside.bDisable?0:db->lookaside.szTrue
+ 
+-/* Size of the smaller allocations in two-size lookside */
++/* Size of the smaller allocations in two-size lookaside */
+ #ifdef SQLITE_OMIT_TWOSIZE_LOOKASIDE
+ #  define LOOKASIDE_SMALL           0
+ #else
+@@ -16957,6 +17817,7 @@ struct sqlite3 {
+   i64 nDeferredCons;            /* Net deferred constraints this transaction. */
+   i64 nDeferredImmCons;         /* Net deferred immediate constraints */
+   int *pnBytesFreed;            /* If not NULL, increment this in DbFree() */
++  DbClientData *pDbData;        /* sqlite3_set_clientdata() content */
+ #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
+   /* The following variables are all protected by the STATIC_MAIN
+   ** mutex, not by sqlite3.mutex. They are used by code in notify.c.
+@@ -17012,7 +17873,7 @@ struct sqlite3 {
+ #define SQLITE_NullCallback   0x00000100  /* Invoke the callback once if the */
+                                           /*   result set is empty */
+ #define SQLITE_IgnoreChecks   0x00000200  /* Do not enforce check constraints */
+-#define SQLITE_ReadUncommit   0x00000400  /* READ UNCOMMITTED in shared-cache */
++#define SQLITE_StmtScanStatus 0x00000400  /* Enable stmt_scanstats() counters */
+ #define SQLITE_NoCkptOnClose  0x00000800  /* No checkpoint on close()/DETACH */
+ #define SQLITE_ReverseOrder   0x00001000  /* Reverse unordered SELECTs */
+ #define SQLITE_RecTriggers    0x00002000  /* Enable recursive triggers */
+@@ -17038,6 +17899,8 @@ struct sqlite3 {
+                                           /*   DELETE, or UPDATE and return */
+                                           /*   the count using a callback. */
+ #define SQLITE_CorruptRdOnly  HI(0x00002) /* Prohibit writes due to error */
++#define SQLITE_ReadUncommit   HI(0x00004) /* READ UNCOMMITTED in shared-cache */
++#define SQLITE_FkNoAction     HI(0x00008) /* Treat all FK as NO ACTION */
+ 
+ /* Flags used only if debugging */
+ #ifdef SQLITE_DEBUG
+@@ -17092,6 +17955,10 @@ struct sqlite3 {
+ #define SQLITE_ReleaseReg     0x00400000 /* Use OP_ReleaseReg for testing */
+ #define SQLITE_FlttnUnionAll  0x00800000 /* Disable the UNION ALL flattener */
+    /* TH3 expects this value  ^^^^^^^^^^ See flatten04.test */
++#define SQLITE_IndexedExpr    0x01000000 /* Pull exprs from index when able */
++#define SQLITE_Coroutines     0x02000000 /* Co-routines for subqueries */
++#define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
++#define SQLITE_OnePass        0x08000000 /* Single-pass DELETE and UPDATE */
+ #define SQLITE_AllOpts        0xffffffff /* All optimizations */
+ 
+ /*
+@@ -17174,10 +18041,17 @@ struct FuncDestructor {
+ **     SQLITE_FUNC_ANYORDER    ==  NC_OrderAgg       == SF_OrderByReqd
+ **     SQLITE_FUNC_LENGTH      ==  OPFLAG_LENGTHARG
+ **     SQLITE_FUNC_TYPEOF      ==  OPFLAG_TYPEOFARG
++**     SQLITE_FUNC_BYTELEN     ==  OPFLAG_BYTELENARG
+ **     SQLITE_FUNC_CONSTANT    ==  SQLITE_DETERMINISTIC from the API
+ **     SQLITE_FUNC_DIRECT      ==  SQLITE_DIRECTONLY from the API
+-**     SQLITE_FUNC_UNSAFE      ==  SQLITE_INNOCUOUS
++**     SQLITE_FUNC_UNSAFE      ==  SQLITE_INNOCUOUS  -- opposite meanings!!!
+ **     SQLITE_FUNC_ENCMASK   depends on SQLITE_UTF* macros in the API
++**
++** Note that even though SQLITE_FUNC_UNSAFE and SQLITE_INNOCUOUS have the
++** same bit value, their meanings are inverted.  SQLITE_FUNC_UNSAFE is
++** used internally and if set means that the function has side effects.
++** SQLITE_INNOCUOUS is used by application code and means "not unsafe".
++** See multiple instances of tag-20230109-1.
+ */
+ #define SQLITE_FUNC_ENCMASK  0x0003 /* SQLITE_UTF8, SQLITE_UTF16BE or UTF16LE */
+ #define SQLITE_FUNC_LIKE     0x0004 /* Candidate for the LIKE optimization */
+@@ -17186,6 +18060,7 @@ struct FuncDestructor {
+ #define SQLITE_FUNC_NEEDCOLL 0x0020 /* sqlite3GetFuncCollSeq() might be called*/
+ #define SQLITE_FUNC_LENGTH   0x0040 /* Built-in length() function */
+ #define SQLITE_FUNC_TYPEOF   0x0080 /* Built-in typeof() function */
++#define SQLITE_FUNC_BYTELEN  0x00c0 /* Built-in octet_length() function */
+ #define SQLITE_FUNC_COUNT    0x0100 /* Built-in count(*) aggregate */
+ /*                           0x0200 -- available for reuse */
+ #define SQLITE_FUNC_UNLIKELY 0x0400 /* Built-in unlikely() function */
+@@ -17194,14 +18069,15 @@ struct FuncDestructor {
+ #define SQLITE_FUNC_SLOCHNG  0x2000 /* "Slow Change". Value constant during a
+                                     ** single query - might change over time */
+ #define SQLITE_FUNC_TEST     0x4000 /* Built-in testing functions */
+-/*                           0x8000 -- available for reuse */
++#define SQLITE_FUNC_RUNONLY  0x8000 /* Cannot be used by valueFromFunction */
+ #define SQLITE_FUNC_WINDOW   0x00010000 /* Built-in window-only function */
+ #define SQLITE_FUNC_INTERNAL 0x00040000 /* For use by NestedParse() only */
+ #define SQLITE_FUNC_DIRECT   0x00080000 /* Not for use in TRIGGERs or VIEWs */
+-#define SQLITE_FUNC_SUBTYPE  0x00100000 /* Result likely to have sub-type */
++/* SQLITE_SUBTYPE            0x00100000 // Consumer of subtypes */
+ #define SQLITE_FUNC_UNSAFE   0x00200000 /* Function has side effects */
+ #define SQLITE_FUNC_INLINE   0x00400000 /* Functions implemented in-line */
+ #define SQLITE_FUNC_BUILTIN  0x00800000 /* This is a built-in function */
++/*  SQLITE_RESULT_SUBTYPE    0x01000000 // Generator of subtypes */
+ #define SQLITE_FUNC_ANYORDER 0x08000000 /* count/min/max aggregate */
+ 
+ /* Identifier numbers for each in-line function */
+@@ -17293,10 +18169,11 @@ struct FuncDestructor {
+ #define MFUNCTION(zName, nArg, xPtr, xFunc) \
+   {nArg, SQLITE_FUNC_BUILTIN|SQLITE_FUNC_CONSTANT|SQLITE_UTF8, \
+    xPtr, 0, xFunc, 0, 0, 0, #zName, {0} }
+-#define JFUNCTION(zName, nArg, iArg, xFunc) \
+-  {nArg, SQLITE_FUNC_BUILTIN|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS|\
+-   SQLITE_FUNC_CONSTANT|SQLITE_UTF8, \
+-   SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} }
++#define JFUNCTION(zName, nArg, bUseCache, bWS, bRS, bJsonB, iArg, xFunc) \
++  {nArg, SQLITE_FUNC_BUILTIN|SQLITE_DETERMINISTIC|SQLITE_FUNC_CONSTANT|\
++   SQLITE_UTF8|((bUseCache)*SQLITE_FUNC_RUNONLY)|\
++   ((bRS)*SQLITE_SUBTYPE)|((bWS)*SQLITE_RESULT_SUBTYPE), \
++   SQLITE_INT_TO_PTR(iArg|((bJsonB)*JSON_BLOB)),0,xFunc,0, 0, 0, #zName, {0} }
+ #define INLINE_FUNC(zName, nArg, iArg, mFlags) \
+   {nArg, SQLITE_FUNC_BUILTIN|\
+    SQLITE_UTF8|SQLITE_FUNC_INLINE|SQLITE_FUNC_CONSTANT|(mFlags), \
+@@ -17486,6 +18363,7 @@ struct CollSeq {
+ #define SQLITE_AFF_NUMERIC  0x43  /* 'C' */
+ #define SQLITE_AFF_INTEGER  0x44  /* 'D' */
+ #define SQLITE_AFF_REAL     0x45  /* 'E' */
++#define SQLITE_AFF_FLEXNUM  0x46  /* 'F' */
+ 
+ #define sqlite3IsNumericAffinity(X)  ((X)>=SQLITE_AFF_NUMERIC)
+ 
+@@ -17556,6 +18434,7 @@ struct VTable {
+   sqlite3_vtab *pVtab;      /* Pointer to vtab instance */
+   int nRef;                 /* Number of pointers to this structure */
+   u8 bConstraint;           /* True if constraints are supported */
++  u8 bAllSchemas;           /* True if might use any attached schema */
+   u8 eVtabRisk;             /* Riskiness of allowing hacker access */
+   int iSavepoint;           /* Depth of the SAVEPOINT stack */
+   VTable *pNext;            /* Next in linked list (see above) */
+@@ -17664,7 +18543,7 @@ struct Table {
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ #  define IsVirtual(X)      ((X)->eTabType==TABTYP_VTAB)
+ #  define ExprIsVtab(X)  \
+-    ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->eTabType==TABTYP_VTAB)
++   ((X)->op==TK_COLUMN && (X)->y.pTab->eTabType==TABTYP_VTAB)
+ #else
+ #  define IsVirtual(X)      0
+ #  define ExprIsVtab(X)     0
+@@ -17763,7 +18642,7 @@ struct FKey {
+ ** foreign key.
+ **
+ ** The OE_Default value is a place holder that means to use whatever
+-** conflict resolution algorthm is required from context.
++** conflict resolution algorithm is required from context.
+ **
+ ** The following symbolic values are used to record which type
+ ** of conflict resolution action to take.
+@@ -17881,10 +18760,22 @@ struct UnpackedRecord {
+ ** The Index.onError field determines whether or not the indexed columns
+ ** must be unique and what to do if they are not.  When Index.onError=OE_None,
+ ** it means this is not a unique index.  Otherwise it is a unique index
+-** and the value of Index.onError indicate the which conflict resolution
+-** algorithm to employ whenever an attempt is made to insert a non-unique
++** and the value of Index.onError indicates which conflict resolution
++** algorithm to employ when an attempt is made to insert a non-unique
+ ** element.
+ **
++** The colNotIdxed bitmask is used in combination with SrcItem.colUsed
++** for a fast test to see if an index can serve as a covering index.
++** colNotIdxed has a 1 bit for every column of the original table that
++** is *not* available in the index.  Thus the expression
++** "colUsed & colNotIdxed" will be non-zero if the index is not a
++** covering index.  The most significant bit of of colNotIdxed will always
++** be true (note-20221022-a).  If a column beyond the 63rd column of the
++** table is used, the "colUsed & colNotIdxed" test will always be non-zero
++** and we have to assume either that the index is not covering, or use
++** an alternative (slower) algorithm to determine whether or not
++** the index is covering.
++**
+ ** While parsing a CREATE TABLE or CREATE INDEX statement in order to
+ ** generate VDBE code (as opposed to parsing one read from an sqlite_schema
+ ** table as part of parsing an existing database schema), transient instances
+@@ -17917,18 +18808,22 @@ struct Index {
+   unsigned isCovering:1;   /* True if this is a covering index */
+   unsigned noSkipScan:1;   /* Do not try to use skip-scan if true */
+   unsigned hasStat1:1;     /* aiRowLogEst values come from sqlite_stat1 */
++  unsigned bLowQual:1;     /* sqlite_stat1 says this is a low-quality index */
+   unsigned bNoQuery:1;     /* Do not use this index to optimize queries */
+   unsigned bAscKeyBug:1;   /* True if the bba7b69f9849b5bf bug applies */
+   unsigned bHasVCol:1;     /* Index references one or more VIRTUAL columns */
++  unsigned bHasExpr:1;     /* Index contains an expression, either a literal
++                           ** expression, or a reference to a VIRTUAL column */
+ #ifdef SQLITE_ENABLE_STAT4
+   int nSample;             /* Number of elements in aSample[] */
++  int mxSample;            /* Number of slots allocated to aSample[] */
+   int nSampleCol;          /* Size of IndexSample.anEq[] and so on */
+   tRowcnt *aAvgEq;         /* Average nEq values for keys not in aSample */
+   IndexSample *aSample;    /* Samples of the left-most key */
+   tRowcnt *aiRowEst;       /* Non-logarithmic stat1 data for this index */
+   tRowcnt nRowEst0;        /* Non-logarithmic number of rows in the index */
+ #endif
+-  Bitmask colNotIdxed;     /* 0 for unindexed columns in pTab */
++  Bitmask colNotIdxed;     /* Unindexed columns in pTab */
+ };
+ 
+ /*
+@@ -18003,16 +18898,15 @@ struct AggInfo {
+                           ** from source tables rather than from accumulators */
+   u8 useSortingIdx;       /* In direct mode, reference the sorting index rather
+                           ** than the source table */
++  u16 nSortingColumn;     /* Number of columns in the sorting index */
+   int sortingIdx;         /* Cursor number of the sorting index */
+   int sortingIdxPTab;     /* Cursor number of pseudo-table */
+-  int nSortingColumn;     /* Number of columns in the sorting index */
+-  int mnReg, mxReg;       /* Range of registers allocated for aCol and aFunc */
++  int iFirstReg;          /* First register in range for aCol[] and aFunc[] */
+   ExprList *pGroupBy;     /* The group by clause */
+   struct AggInfo_col {    /* For each column used in source tables */
+     Table *pTab;             /* Source table */
+     Expr *pCExpr;            /* The original expression */
+     int iTable;              /* Cursor number of the source table */
+-    int iMem;                /* Memory location that acts as accumulator */
+     i16 iColumn;             /* Column number within the source table */
+     i16 iSorterColumn;       /* Column number in the sorting index */
+   } *aCol;
+@@ -18023,14 +18917,31 @@ struct AggInfo {
+   struct AggInfo_func {   /* For each aggregate function */
+     Expr *pFExpr;            /* Expression encoding the function */
+     FuncDef *pFunc;          /* The aggregate function implementation */
+-    int iMem;                /* Memory location that acts as accumulator */
+     int iDistinct;           /* Ephemeral table used to enforce DISTINCT */
+     int iDistAddr;           /* Address of OP_OpenEphemeral */
++    int iOBTab;              /* Ephemeral table to implement ORDER BY */
++    u8 bOBPayload;           /* iOBTab has payload columns separate from key */
++    u8 bOBUnique;            /* Enforce uniqueness on iOBTab keys */
++    u8 bUseSubtype;          /* Transfer subtype info through sorter */
+   } *aFunc;
+   int nFunc;              /* Number of entries in aFunc[] */
+   u32 selId;              /* Select to which this AggInfo belongs */
++#ifdef SQLITE_DEBUG
++  Select *pSelect;        /* SELECT statement that this AggInfo supports */
++#endif
+ };
+ 
++/*
++** Macros to compute aCol[] and aFunc[] register numbers.
++**
++** These macros should not be used prior to the call to
++** assignAggregateRegisters() that computes the value of pAggInfo->iFirstReg.
++** The assert()s that are part of this macro verify that constraint.
++*/
++#define AggInfoColumnReg(A,I)  (assert((A)->iFirstReg),(A)->iFirstReg+(I))
++#define AggInfoFuncReg(A,I)    \
++                      (assert((A)->iFirstReg),(A)->iFirstReg+(A)->nColumn+(I))
++
+ /*
+ ** The datatype ynVar is a signed integer, either 16-bit or 32-bit.
+ ** Usually it is 16-bits.  But if SQLITE_MAX_VARIABLE_NUMBER is greater
+@@ -18150,7 +19061,7 @@ struct Expr {
+                          ** TK_REGISTER: register number
+                          ** TK_TRIGGER: 1 -> new, 0 -> old
+                          ** EP_Unlikely:  134217728 times likelihood
+-                         ** TK_IN: ephemerial table holding RHS
++                         ** TK_IN: ephemeral table holding RHS
+                          ** TK_SELECT_COLUMN: Number of columns on the LHS
+                          ** TK_SELECT: 1st register of result vector */
+   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
+@@ -18196,7 +19107,7 @@ struct Expr {
+ #define EP_Reduced    0x004000 /* Expr struct EXPR_REDUCEDSIZE bytes only */
+ #define EP_Win        0x008000 /* Contains window functions */
+ #define EP_TokenOnly  0x010000 /* Expr struct EXPR_TOKENONLYSIZE bytes only */
+-#define EP_MemToken   0x020000 /* Need to sqlite3DbFree() Expr.zToken */
++#define EP_FullSize   0x020000 /* Expr structure must remain full sized */
+ #define EP_IfNullRow  0x040000 /* The TK_IF_NULL_ROW opcode */
+ #define EP_Unlikely   0x080000 /* unlikely() or likelihood() function */
+ #define EP_ConstFunc  0x100000 /* A SQLITE_FUNC_CONSTANT or _SLOCHNG function */
+@@ -18226,12 +19137,15 @@ struct Expr {
+ #define ExprClearProperty(E,P)   (E)->flags&=~(P)
+ #define ExprAlwaysTrue(E)   (((E)->flags&(EP_OuterON|EP_IsTrue))==EP_IsTrue)
+ #define ExprAlwaysFalse(E)  (((E)->flags&(EP_OuterON|EP_IsFalse))==EP_IsFalse)
++#define ExprIsFullSize(E)   (((E)->flags&(EP_Reduced|EP_TokenOnly))==0)
+ 
+ /* Macros used to ensure that the correct members of unions are accessed
+ ** in Expr.
+ */
+ #define ExprUseUToken(E)    (((E)->flags&EP_IntValue)==0)
+ #define ExprUseUValue(E)    (((E)->flags&EP_IntValue)!=0)
++#define ExprUseWOfst(E)     (((E)->flags&(EP_InnerON|EP_OuterON))==0)
++#define ExprUseWJoin(E)     (((E)->flags&(EP_InnerON|EP_OuterON))!=0)
+ #define ExprUseXList(E)     (((E)->flags&EP_xIsSelect)==0)
+ #define ExprUseXSelect(E)   (((E)->flags&EP_xIsSelect)!=0)
+ #define ExprUseYTab(E)      (((E)->flags&(EP_WinFunc|EP_Subrtn))==0)
+@@ -18341,6 +19255,7 @@ struct ExprList {
+ #define ENAME_NAME  0       /* The AS clause of a result set */
+ #define ENAME_SPAN  1       /* Complete text of the result set expression */
+ #define ENAME_TAB   2       /* "DB.TABLE.NAME" for the result set */
++#define ENAME_ROWID 3       /* "DB.TABLE._rowid_" for * expansion of rowid */
+ 
+ /*
+ ** An instance of this structure can hold a simple list of identifiers,
+@@ -18381,6 +19296,14 @@ struct IdList {
+ ** The SrcItem object represents a single term in the FROM clause of a query.
+ ** The SrcList object is mostly an array of SrcItems.
+ **
++** The jointype starts out showing the join type between the current table
++** and the next table on the list.  The parser builds the list this way.
++** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
++** jointype expresses the join between the table and the previous table.
++**
++** In the colUsed field, the high-order bit (bit 63) is set if the table
++** contains more than 63 columns and the 64-th or later column is used.
++**
+ ** Union member validity:
+ **
+ **    u1.zIndexedBy          fg.isIndexedBy && !fg.isTabFunc
+@@ -18412,7 +19335,7 @@ struct SrcItem {
+     unsigned notCte :1;        /* This item may not match a CTE */
+     unsigned isUsing :1;       /* u3.pUsing is valid */
+     unsigned isOn :1;          /* u3.pOn was once valid and non-NULL */
+-    unsigned isSynthUsing :1;  /* u3.pUsing is synthensized from NATURAL */
++    unsigned isSynthUsing :1;  /* u3.pUsing is synthesized from NATURAL */
+     unsigned isNestedFrom :1;  /* pSelect is a SF_NestedFrom subquery */
+   } fg;
+   int iCursor;      /* The VDBE cursor number used to access this table */
+@@ -18420,14 +19343,14 @@ struct SrcItem {
+     Expr *pOn;        /* fg.isUsing==0 =>  The ON clause of a join */
+     IdList *pUsing;   /* fg.isUsing==1 =>  The USING clause of a join */
+   } u3;
+-  Bitmask colUsed;  /* Bit N (1<62 */
+   union {
+     char *zIndexedBy;    /* Identifier from "INDEXED BY " clause */
+     ExprList *pFuncArg;  /* Arguments to table-valued-function */
+   } u1;
+   union {
+     Index *pIBIndex;  /* Index structure corresponding to u1.zIndexedBy */
+-    CteUse *pCteUse;  /* CTE Usage info info fg.isCte is true */
++    CteUse *pCteUse;  /* CTE Usage info when fg.isCte is true */
+   } u2;
+ };
+ 
+@@ -18441,23 +19364,11 @@ struct OnOrUsing {
+ };
+ 
+ /*
+-** The following structure describes the FROM clause of a SELECT statement.
+-** Each table or subquery in the FROM clause is a separate element of
+-** the SrcList.a[] array.
++** This object represents one or more tables that are the source of
++** content for an SQL statement.  For example, a single SrcList object
++** is used to hold the FROM clause of a SELECT statement.  SrcList also
++** represents the target tables for DELETE, INSERT, and UPDATE statements.
+ **
+-** With the addition of multiple database support, the following structure
+-** can also be used to describe a particular table such as the table that
+-** is modified by an INSERT, DELETE, or UPDATE statement.  In standard SQL,
+-** such a table must be a simple name: ID.  But in SQLite, the table can
+-** now be identified by a database name, a dot, then the table name: ID.ID.
+-**
+-** The jointype starts out showing the join type between the current table
+-** and the next table on the list.  The parser builds the list this way.
+-** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
+-** jointype expresses the join between the table and the previous table.
+-**
+-** In the colUsed field, the high-order bit (bit 63) is set if the table
+-** contains more than 63 columns and the 64-th or later column is used.
+ */
+ struct SrcList {
+   int nSrc;        /* Number of tables or subqueries in the FROM clause */
+@@ -18545,6 +19456,7 @@ struct NameContext {
+   int nRef;            /* Number of names resolved by this context */
+   int nNcErr;          /* Number of errors encountered while resolving names */
+   int ncFlags;         /* Zero or more NC_* flags defined below */
++  u32 nNestedSelect;   /* Number of nested selects using this NC */
+   Select *pWinSelect;  /* SELECT statement for any window functions */
+ };
+ 
+@@ -18565,7 +19477,7 @@ struct NameContext {
+ #define NC_HasAgg    0x000010 /* One or more aggregate functions seen */
+ #define NC_IdxExpr   0x000020 /* True if resolving columns of CREATE INDEX */
+ #define NC_SelfRef   0x00002e /* Combo: PartIdx, isCheck, GenCol, and IdxExpr */
+-#define NC_VarSelect 0x000040 /* A correlated subquery has been seen */
++#define NC_Subquery  0x000040 /* A subquery has been seen */
+ #define NC_UEList    0x000080 /* True if uNC.pEList is used */
+ #define NC_UAggInfo  0x000100 /* True if uNC.pAggInfo is used */
+ #define NC_UUpsert   0x000200 /* True if uNC.pUpsert is used */
+@@ -18694,6 +19606,7 @@ struct Select {
+ #define SF_MultiPart     0x2000000 /* Has multiple incompatible PARTITIONs */
+ #define SF_CopyCte       0x4000000 /* SELECT statement is a copy of a CTE */
+ #define SF_OrderByReqd   0x8000000 /* The ORDER BY clause may not be omitted */
++#define SF_UpdateFrom   0x10000000 /* Query originates with UPDATE FROM */
+ 
+ /* True if S exists and has SF_NestedFrom */
+ #define IsNestedFrom(S) ((S)!=0 && ((S)->selFlags&SF_NestedFrom)!=0)
+@@ -18802,7 +19715,7 @@ struct SelectDest {
+   int iSDParm2;        /* A second parameter for the eDest disposal method */
+   int iSdst;           /* Base register where results are written */
+   int nSdst;           /* Number of registers allocated */
+-  char *zAffSdst;      /* Affinity used when eDest==SRT_Set */
++  char *zAffSdst;      /* Affinity used for SRT_Set */
+   ExprList *pOrderBy;  /* Key columns for SRT_Queue and SRT_DistQueue */
+ };
+ 
+@@ -18861,11 +19774,34 @@ struct TriggerPrg {
+ #else
+   typedef unsigned int yDbMask;
+ # define DbMaskTest(M,I)    (((M)&(((yDbMask)1)<<(I)))!=0)
+-# define DbMaskZero(M)      (M)=0
+-# define DbMaskSet(M,I)     (M)|=(((yDbMask)1)<<(I))
+-# define DbMaskAllZero(M)   (M)==0
+-# define DbMaskNonZero(M)   (M)!=0
++# define DbMaskZero(M)      ((M)=0)
++# define DbMaskSet(M,I)     ((M)|=(((yDbMask)1)<<(I)))
++# define DbMaskAllZero(M)   ((M)==0)
++# define DbMaskNonZero(M)   ((M)!=0)
++#endif
++
++/*
++** For each index X that has as one of its arguments either an expression
++** or the name of a virtual generated column, and if X is in scope such that
++** the value of the expression can simply be read from the index, then
++** there is an instance of this object on the Parse.pIdxExpr list.
++**
++** During code generation, while generating code to evaluate expressions,
++** this list is consulted and if a matching expression is found, the value
++** is read from the index rather than being recomputed.
++*/
++struct IndexedExpr {
++  Expr *pExpr;            /* The expression contained in the index */
++  int iDataCur;           /* The data cursor associated with the index */
++  int iIdxCur;            /* The index cursor */
++  int iIdxCol;            /* The index column that contains value of pExpr */
++  u8 bMaybeNullRow;       /* True if we need an OP_IfNullRow check */
++  u8 aff;                 /* Affinity of the pExpr expression */
++  IndexedExpr *pIENext;   /* Next in a list of all indexed expressions */
++#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
++  const char *zIdxName;   /* Name of index, used only for bytecode comments */
+ #endif
++};
+ 
+ /*
+ ** An instance of the ParseCleanup object specifies an operation that
+@@ -18908,10 +19844,13 @@ struct Parse {
+   u8 hasCompound;      /* Need to invoke convertCompoundSelectToSubquery() */
+   u8 okConstFactor;    /* OK to factor out constants */
+   u8 disableLookaside; /* Number of times lookaside has been disabled */
+-  u8 disableVtab;      /* Disable all virtual tables for this parse */
++  u8 prepFlags;        /* SQLITE_PREPARE_* flags */
+   u8 withinRJSubrtn;   /* Nesting level for RIGHT JOIN body subroutines */
+ #if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST)
+   u8 earlyCleanup;     /* OOM inside sqlite3ParserAddCleanup() */
++#endif
++#ifdef SQLITE_DEBUG
++  u8 ifNotExists;      /* Might be true if IF NOT EXISTS.  Assert()s only */
+ #endif
+   int nRangeReg;       /* Size of the temporary register block */
+   int iRangeReg;       /* First register in temporary register block */
+@@ -18925,6 +19864,8 @@ struct Parse {
+   int nLabelAlloc;     /* Number of slots in aLabel */
+   int *aLabel;         /* Space to hold the labels */
+   ExprList *pConstExpr;/* Constant expressions */
++  IndexedExpr *pIdxEpr;/* List of expressions used by active indexes */
++  IndexedExpr *pIdxPartExpr; /* Exprs constrained by index WHERE clauses */
+   Token constraintName;/* Name of the constraint currently being parsed */
+   yDbMask writeMask;   /* Start a write transaction on these databases */
+   yDbMask cookieMask;  /* Bitmask of schema verified databases */
+@@ -18932,6 +19873,9 @@ struct Parse {
+   int regRoot;         /* Register holding root page number for new objects */
+   int nMaxArg;         /* Max args passed to user function by sub-program */
+   int nSelect;         /* Number of SELECT stmts. Counter for Select.selId */
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++  u32 nProgressSteps;  /* xProgress steps taken during sqlite3_prepare() */
++#endif
+ #ifndef SQLITE_OMIT_SHARED_CACHE
+   int nTableLock;        /* Number of locks in aTableLock */
+   TableLock *aTableLock; /* Required table locks for shared-cache mode */
+@@ -18945,9 +19889,9 @@ struct Parse {
+     int addrCrTab;         /* Address of OP_CreateBtree on CREATE TABLE */
+     Returning *pReturning; /* The RETURNING clause */
+   } u1;
+-  u32 nQueryLoop;      /* Est number of iterations of a query (10*log2(N)) */
+   u32 oldmask;         /* Mask of old.* columns referenced */
+   u32 newmask;         /* Mask of new.* columns referenced */
++  LogEst nQueryLoop;   /* Est number of iterations of a query (10*log2(N)) */
+   u8 eTriggerOp;       /* TK_UPDATE, TK_INSERT or TK_DELETE */
+   u8 bReturning;       /* Coding a RETURNING trigger */
+   u8 eOrconf;          /* Default ON CONFLICT policy for trigger steps */
+@@ -19071,6 +20015,7 @@ struct AuthContext {
+ #define OPFLAG_ISNOOP        0x40    /* OP_Delete does pre-update-hook only */
+ #define OPFLAG_LENGTHARG     0x40    /* OP_Column only used for length() */
+ #define OPFLAG_TYPEOFARG     0x80    /* OP_Column only used for typeof() */
++#define OPFLAG_BYTELENARG    0xc0    /* OP_Column only for octet_length() */
+ #define OPFLAG_BULKCSR       0x01    /* OP_Open** used to open bulk cursor */
+ #define OPFLAG_SEEKEQ        0x02    /* OP_Open** cursor uses EQ seek only */
+ #define OPFLAG_FORDELETE     0x08    /* OP_Open should use BTREE_FORDELETE */
+@@ -19192,6 +20137,7 @@ struct Returning {
+   int iRetCur;          /* Transient table holding RETURNING results */
+   int nRetCol;          /* Number of in pReturnEL after expansion */
+   int iRetReg;          /* Register array for holding a row of RETURNING */
++  char zName[40];       /* Name of trigger: "sqlite_returning_%p" */
+ };
+ 
+ /*
+@@ -19213,6 +20159,28 @@ struct sqlite3_str {
+ 
+ #define isMalloced(X)  (((X)->printfFlags & SQLITE_PRINTF_MALLOCED)!=0)
+ 
++/*
++** The following object is the header for an "RCStr" or "reference-counted
++** string".  An RCStr is passed around and used like any other char*
++** that has been dynamically allocated.  The important interface
++** differences:
++**
++**   1.  RCStr strings are reference counted.  They are deallocated
++**       when the reference count reaches zero.
++**
++**   2.  Use sqlite3RCStrUnref() to free an RCStr string rather than
++**       sqlite3_free()
++**
++**   3.  Make a (read-only) copy of a read-only RCStr string using
++**       sqlite3RCStrRef().
++**
++** "String" is in the name, but an RCStr object can also be used to hold
++** binary data.
++*/
++struct RCStr {
++  u64 nRCRef;            /* Number of references */
++  /* Total structure size should be a multiple of 8 bytes for alignment */
++};
+ 
+ /*
+ ** A pointer to this structure is used to communicate information
+@@ -19239,7 +20207,7 @@ typedef struct {
+ /* Tuning parameters are set using SQLITE_TESTCTRL_TUNE and are controlled
+ ** on debug-builds of the CLI using ".testctrl tune ID VALUE".  Tuning
+ ** parameters are for temporary use during development, to help find
+-** optimial values for parameters in the query planner.  The should not
++** optimal values for parameters in the query planner.  The should not
+ ** be used on trunk check-ins.  They are a temporary mechanism available
+ ** for transient development builds only.
+ **
+@@ -19265,6 +20233,10 @@ struct Sqlite3Config {
+   u8 bUseCis;                       /* Use covering indices for full-scans */
+   u8 bSmallMalloc;                  /* Avoid large memory allocations if true */
+   u8 bExtraSchemaChecks;            /* Verify type,name,tbl_name in schema */
++  u8 bUseLongDouble;                /* Make use of long double */
++#ifdef SQLITE_DEBUG
++  u8 bJsonSelfcheck;                /* Double-check JSON parsing */
++#endif
+   int mxStrlen;                     /* Maximum string length */
+   int neverCorrupt;                 /* Database is always well-formed */
+   int szLookaside;                  /* Default lookaside buffer size */
+@@ -19351,6 +20323,7 @@ struct Walker {
+   void (*xSelectCallback2)(Walker*,Select*);/* Second callback for SELECTs */
+   int walkerDepth;                          /* Number of subqueries */
+   u16 eCode;                                /* A small processing code */
++  u16 mWFlags;                              /* Use-dependent flags */
+   union {                                   /* Extra data for callback */
+     NameContext *pNC;                         /* Naming context */
+     int n;                                    /* A counter */
+@@ -19360,15 +20333,16 @@ struct Walker {
+     struct RefSrcList *pRefSrcList;           /* sqlite3ReferencesSrcList() */
+     int *aiCol;                               /* array of column indexes */
+     struct IdxCover *pIdxCover;               /* Check for index coverage */
+-    struct IdxExprTrans *pIdxTrans;           /* Convert idxed expr to column */
+     ExprList *pGroupBy;                       /* GROUP BY clause */
+     Select *pSelect;                          /* HAVING to WHERE clause ctx */
+     struct WindowRewrite *pRewrite;           /* Window rewrite context */
+     struct WhereConst *pConst;                /* WHERE clause constants */
+     struct RenameCtx *pRename;                /* RENAME COLUMN context */
+     struct Table *pTab;                       /* Table of generated column */
++    struct CoveringIndexCheck *pCovIdxCk;     /* Check for covering index */
+     SrcItem *pSrcItem;                        /* A single FROM clause item */
+-    DbFixer *pFix;
++    DbFixer *pFix;                            /* See sqlite3FixSelect() */
++    Mem *aMem;                                /* See sqlite3BtreeCursorHint() */
+   } u;
+ };
+ 
+@@ -19389,6 +20363,7 @@ struct DbFixer {
+ 
+ /* Forward declarations */
+ SQLITE_PRIVATE int sqlite3WalkExpr(Walker*, Expr*);
++SQLITE_PRIVATE int sqlite3WalkExprNN(Walker*, Expr*);
+ SQLITE_PRIVATE int sqlite3WalkExprList(Walker*, ExprList*);
+ SQLITE_PRIVATE int sqlite3WalkSelect(Walker*, Select*);
+ SQLITE_PRIVATE int sqlite3WalkSelectExpr(Walker*, Select*);
+@@ -19469,6 +20444,16 @@ struct CteUse {
+ };
+ 
+ 
++/* Client data associated with sqlite3_set_clientdata() and
++** sqlite3_get_clientdata().
++*/
++struct DbClientData {
++  DbClientData *pNext;        /* Next in a linked list */
++  void *pData;                /* The data */
++  void (*xDestructor)(void*); /* Destructor.  Might be NULL */
++  char zName[1];              /* Name of this client data. MUST BE LAST */
++};
++
+ #ifdef SQLITE_DEBUG
+ /*
+ ** An instance of the TreeView object is used for printing the content of
+@@ -19638,6 +20623,8 @@ SQLITE_PRIVATE   int sqlite3CorruptPgnoError(int,Pgno);
+ # define sqlite3Isxdigit(x)  (sqlite3CtypeMap[(unsigned char)(x)]&0x08)
+ # define sqlite3Tolower(x)   (sqlite3UpperToLower[(unsigned char)(x)])
+ # define sqlite3Isquote(x)   (sqlite3CtypeMap[(unsigned char)(x)]&0x80)
++# define sqlite3JsonId1(x)   (sqlite3CtypeMap[(unsigned char)(x)]&0x42)
++# define sqlite3JsonId2(x)   (sqlite3CtypeMap[(unsigned char)(x)]&0x46)
+ #else
+ # define sqlite3Toupper(x)   toupper((unsigned char)(x))
+ # define sqlite3Isspace(x)   isspace((unsigned char)(x))
+@@ -19647,6 +20634,8 @@ SQLITE_PRIVATE   int sqlite3CorruptPgnoError(int,Pgno);
+ # define sqlite3Isxdigit(x)  isxdigit((unsigned char)(x))
+ # define sqlite3Tolower(x)   tolower((unsigned char)(x))
+ # define sqlite3Isquote(x)   ((x)=='"'||(x)=='\''||(x)=='['||(x)=='`')
++# define sqlite3JsonId1(x)   (sqlite3IsIdChar(x)&&(x)<'0')
++# define sqlite3JsonId2(x)   sqlite3IsIdChar(x)
+ #endif
+ SQLITE_PRIVATE int sqlite3IsIdChar(u8);
+ 
+@@ -19674,6 +20663,7 @@ SQLITE_PRIVATE void *sqlite3DbReallocOrFree(sqlite3 *, void *, u64);
+ SQLITE_PRIVATE void *sqlite3DbRealloc(sqlite3 *, void *, u64);
+ SQLITE_PRIVATE void sqlite3DbFree(sqlite3*, void*);
+ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3*, void*);
++SQLITE_PRIVATE void sqlite3DbNNFreeNN(sqlite3*, void*);
+ SQLITE_PRIVATE int sqlite3MallocSize(const void*);
+ SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3*, const void*);
+ SQLITE_PRIVATE void *sqlite3PageMalloc(int);
+@@ -19694,12 +20684,14 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull(void);
+ */
+ #ifdef SQLITE_USE_ALLOCA
+ # define sqlite3StackAllocRaw(D,N)   alloca(N)
+-# define sqlite3StackAllocZero(D,N)  memset(alloca(N), 0, N)
++# define sqlite3StackAllocRawNN(D,N) alloca(N)
+ # define sqlite3StackFree(D,P)
++# define sqlite3StackFreeNN(D,P)
+ #else
+ # define sqlite3StackAllocRaw(D,N)   sqlite3DbMallocRaw(D,N)
+-# define sqlite3StackAllocZero(D,N)  sqlite3DbMallocZero(D,N)
++# define sqlite3StackAllocRawNN(D,N) sqlite3DbMallocRawNN(D,N)
+ # define sqlite3StackFree(D,P)       sqlite3DbFree(D,P)
++# define sqlite3StackFreeNN(D,P)     sqlite3DbFreeNN(D,P)
+ #endif
+ 
+ /* Do not allow both MEMSYS5 and MEMSYS3 to be defined together.  If they
+@@ -19763,6 +20755,20 @@ struct PrintfArguments {
+   sqlite3_value **apArg;   /* The argument values */
+ };
+ 
++/*
++** An instance of this object receives the decoding of a floating point
++** value into an approximate decimal representation.
++*/
++struct FpDecode {
++  char sign;           /* '+' or '-' */
++  char isSpecial;      /* 1: Infinity  2: NaN */
++  int n;               /* Significant digits in the decode */
++  int iDP;             /* Location of the decimal point */
++  char *z;             /* Start of significant digits */
++  char zBuf[24];       /* Storage for significant digits */
++};
++
++SQLITE_PRIVATE void sqlite3FpDecode(FpDecode*,double,int,int);
+ SQLITE_PRIVATE char *sqlite3MPrintf(sqlite3*,const char*, ...);
+ SQLITE_PRIVATE char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
+ #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE)
+@@ -19822,6 +20828,7 @@ SQLITE_PRIVATE   void sqlite3ShowWinFunc(const Window*);
+ #endif
+ 
+ SQLITE_PRIVATE void sqlite3SetString(char **, sqlite3*, const char*);
++SQLITE_PRIVATE void sqlite3ProgressCheck(Parse*);
+ SQLITE_PRIVATE void sqlite3ErrorMsg(Parse*, const char*, ...);
+ SQLITE_PRIVATE int sqlite3ErrorToParser(sqlite3*,int);
+ SQLITE_PRIVATE void sqlite3Dequote(char*);
+@@ -19836,6 +20843,10 @@ SQLITE_PRIVATE void sqlite3ReleaseTempReg(Parse*,int);
+ SQLITE_PRIVATE int sqlite3GetTempRange(Parse*,int);
+ SQLITE_PRIVATE void sqlite3ReleaseTempRange(Parse*,int,int);
+ SQLITE_PRIVATE void sqlite3ClearTempRegCache(Parse*);
++SQLITE_PRIVATE void sqlite3TouchRegister(Parse*,int);
++#if defined(SQLITE_ENABLE_STAT4) || defined(SQLITE_DEBUG)
++SQLITE_PRIVATE int sqlite3FirstAvailableRegister(Parse*,int);
++#endif
+ #ifdef SQLITE_DEBUG
+ SQLITE_PRIVATE int sqlite3NoTempsInRange(Parse*,int,int);
+ #endif
+@@ -19847,9 +20858,12 @@ SQLITE_PRIVATE void sqlite3PExprAddSelect(Parse*, Expr*, Select*);
+ SQLITE_PRIVATE Expr *sqlite3ExprAnd(Parse*,Expr*, Expr*);
+ SQLITE_PRIVATE Expr *sqlite3ExprSimplifiedAndOr(Expr*);
+ SQLITE_PRIVATE Expr *sqlite3ExprFunction(Parse*,ExprList*, const Token*, int);
++SQLITE_PRIVATE void sqlite3ExprAddFunctionOrderBy(Parse*,Expr*,ExprList*);
++SQLITE_PRIVATE void sqlite3ExprOrderByAggregateError(Parse*,Expr*);
+ SQLITE_PRIVATE void sqlite3ExprFunctionUsable(Parse*,const Expr*,const FuncDef*);
+ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse*, Expr*, u32);
+ SQLITE_PRIVATE void sqlite3ExprDelete(sqlite3*, Expr*);
++SQLITE_PRIVATE void sqlite3ExprDeleteGeneric(sqlite3*,void*);
+ SQLITE_PRIVATE void sqlite3ExprDeferredDelete(Parse*, Expr*);
+ SQLITE_PRIVATE void sqlite3ExprUnmapAndDelete(Parse*, Expr*);
+ SQLITE_PRIVATE ExprList *sqlite3ExprListAppend(Parse*,ExprList*,Expr*);
+@@ -19859,6 +20873,7 @@ SQLITE_PRIVATE void sqlite3ExprListSetSortOrder(ExprList*,int,int);
+ SQLITE_PRIVATE void sqlite3ExprListSetName(Parse*,ExprList*,const Token*,int);
+ SQLITE_PRIVATE void sqlite3ExprListSetSpan(Parse*,ExprList*,const char*,const char*);
+ SQLITE_PRIVATE void sqlite3ExprListDelete(sqlite3*, ExprList*);
++SQLITE_PRIVATE void sqlite3ExprListDeleteGeneric(sqlite3*,void*);
+ SQLITE_PRIVATE u32 sqlite3ExprListFlags(const ExprList*);
+ SQLITE_PRIVATE int sqlite3IndexHasDuplicateRootPage(Index*);
+ SQLITE_PRIVATE int sqlite3Init(sqlite3*, char**);
+@@ -19879,7 +20894,7 @@ SQLITE_PRIVATE const char *sqlite3ColumnColl(Column*);
+ SQLITE_PRIVATE void sqlite3DeleteColumnNames(sqlite3*,Table*);
+ SQLITE_PRIVATE void sqlite3GenerateColumnNames(Parse *pParse, Select *pSelect);
+ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(Parse*,ExprList*,i16*,Column**);
+-SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(Parse*,Table*,Select*,char);
++SQLITE_PRIVATE void sqlite3SubqueryColumnTypes(Parse*,Table*,Select*,char);
+ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse*,Select*,char);
+ SQLITE_PRIVATE void sqlite3OpenSchemaTable(Parse *, int);
+ SQLITE_PRIVATE Index *sqlite3PrimaryKeyIndex(Table*);
+@@ -19949,6 +20964,7 @@ SQLITE_PRIVATE   int sqlite3DbMaskAllZero(yDbMask);
+ SQLITE_PRIVATE void sqlite3DropTable(Parse*, SrcList*, int, int);
+ SQLITE_PRIVATE void sqlite3CodeDropTable(Parse*, Table*, int, int);
+ SQLITE_PRIVATE void sqlite3DeleteTable(sqlite3*, Table*);
++SQLITE_PRIVATE void sqlite3DeleteTableGeneric(sqlite3*, void*);
+ SQLITE_PRIVATE void sqlite3FreeIndex(sqlite3*, Index*);
+ #ifndef SQLITE_OMIT_AUTOINCREMENT
+ SQLITE_PRIVATE   void sqlite3AutoincrementBegin(Parse *pParse);
+@@ -19985,8 +21001,9 @@ SQLITE_PRIVATE int sqlite3Select(Parse*, Select*, SelectDest*);
+ SQLITE_PRIVATE Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
+                          Expr*,ExprList*,u32,Expr*);
+ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3*, Select*);
++SQLITE_PRIVATE void sqlite3SelectDeleteGeneric(sqlite3*,void*);
+ SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*);
+-SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int);
++SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, Trigger*);
+ SQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);
+ #if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY)
+ SQLITE_PRIVATE Expr *sqlite3LimitWhere(Parse*,SrcList*,Expr*,ExprList*,Expr*,char*);
+@@ -20048,7 +21065,7 @@ SQLITE_PRIVATE int sqlite3ExprCompare(const Parse*,const Expr*,const Expr*, int)
+ SQLITE_PRIVATE int sqlite3ExprCompareSkip(Expr*,Expr*,int);
+ SQLITE_PRIVATE int sqlite3ExprListCompare(const ExprList*,const ExprList*, int);
+ SQLITE_PRIVATE int sqlite3ExprImpliesExpr(const Parse*,const Expr*,const Expr*, int);
+-SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr*,int);
++SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr*,int,int);
+ SQLITE_PRIVATE void sqlite3AggInfoPersistWalkerInit(Walker*,Parse*);
+ SQLITE_PRIVATE void sqlite3ExprAnalyzeAggregates(NameContext*, Expr*);
+ SQLITE_PRIVATE void sqlite3ExprAnalyzeAggList(NameContext*,ExprList*);
+@@ -20075,7 +21092,7 @@ SQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr*);
+ SQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr*, u8);
+ SQLITE_PRIVATE int sqlite3ExprIsConstantOrGroupBy(Parse*, Expr*, ExprList*);
+ SQLITE_PRIVATE int sqlite3ExprIsTableConstant(Expr*,int);
+-SQLITE_PRIVATE int sqlite3ExprIsTableConstraint(Expr*,const SrcItem*);
++SQLITE_PRIVATE int sqlite3ExprIsSingleTableConstraint(Expr*,const SrcList*,int);
+ #ifdef SQLITE_ENABLE_CURSOR_HINTS
+ SQLITE_PRIVATE int sqlite3ExprContainsSubquery(Expr*);
+ #endif
+@@ -20083,6 +21100,7 @@ SQLITE_PRIVATE int sqlite3ExprIsInteger(const Expr*, int*);
+ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr*);
+ SQLITE_PRIVATE int sqlite3ExprNeedsNoAffinityChange(const Expr*, char);
+ SQLITE_PRIVATE int sqlite3IsRowid(const char*);
++SQLITE_PRIVATE const char *sqlite3RowidAlias(Table *pTab);
+ SQLITE_PRIVATE void sqlite3GenerateRowDelete(
+     Parse*,Table*,Trigger*,int,int,int,i16,u8,u8,u8,int);
+ SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int, int*, int);
+@@ -20197,8 +21215,10 @@ SQLITE_PRIVATE int sqlite3FixSrcList(DbFixer*, SrcList*);
+ SQLITE_PRIVATE int sqlite3FixSelect(DbFixer*, Select*);
+ SQLITE_PRIVATE int sqlite3FixExpr(DbFixer*, Expr*);
+ SQLITE_PRIVATE int sqlite3FixTriggerStep(DbFixer*, TriggerStep*);
++
+ SQLITE_PRIVATE int sqlite3RealSameAsInt(double,sqlite3_int64);
+-SQLITE_PRIVATE void sqlite3Int64ToText(i64,char*);
++SQLITE_PRIVATE i64 sqlite3RealToI64(double);
++SQLITE_PRIVATE int sqlite3Int64ToText(i64,char*);
+ SQLITE_PRIVATE int sqlite3AtoF(const char *z, double*, int, u8);
+ SQLITE_PRIVATE int sqlite3GetInt32(const char *, int*);
+ SQLITE_PRIVATE int sqlite3GetUInt32(const char*, u32*);
+@@ -20208,6 +21228,7 @@ SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *pData, int nChar);
+ #endif
+ SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *pData, int nByte);
+ SQLITE_PRIVATE u32 sqlite3Utf8Read(const u8**);
++SQLITE_PRIVATE int sqlite3Utf8ReadLimited(const u8*, int, u32*);
+ SQLITE_PRIVATE LogEst sqlite3LogEst(u64);
+ SQLITE_PRIVATE LogEst sqlite3LogEstAdd(LogEst,LogEst);
+ SQLITE_PRIVATE LogEst sqlite3LogEstFromDouble(double);
+@@ -20243,11 +21264,13 @@ SQLITE_PRIVATE int sqlite3VarintLen(u64 v);
+ 
+ 
+ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3*, Index*);
++SQLITE_PRIVATE char *sqlite3TableAffinityStr(sqlite3*,const Table*);
+ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe*, Table*, int);
+ SQLITE_PRIVATE char sqlite3CompareAffinity(const Expr *pExpr, char aff2);
+ SQLITE_PRIVATE int sqlite3IndexAffinityOk(const Expr *pExpr, char idx_affinity);
+ SQLITE_PRIVATE char sqlite3TableColumnAffinity(const Table*,int);
+ SQLITE_PRIVATE char sqlite3ExprAffinity(const Expr *pExpr);
++SQLITE_PRIVATE int sqlite3ExprDataType(const Expr *pExpr);
+ SQLITE_PRIVATE int sqlite3Atoi64(const char*, i64*, int, u8);
+ SQLITE_PRIVATE int sqlite3DecOrHexToI64(const char*, i64*);
+ SQLITE_PRIVATE void sqlite3ErrorWithMsg(sqlite3*, int, const char*,...);
+@@ -20264,6 +21287,9 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int);
+ 
+ #ifndef SQLITE_OMIT_DESERIALIZE
+ SQLITE_PRIVATE int sqlite3MemdbInit(void);
++SQLITE_PRIVATE int sqlite3IsMemdb(const sqlite3_vfs*);
++#else
++# define sqlite3IsMemdb(X) 0
+ #endif
+ 
+ SQLITE_PRIVATE const char *sqlite3ErrStr(int);
+@@ -20295,6 +21321,7 @@ SQLITE_PRIVATE void sqlite3FileSuffix3(const char*, char*);
+ SQLITE_PRIVATE u8 sqlite3GetBoolean(const char *z,u8);
+ 
+ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value*, u8);
++SQLITE_PRIVATE int sqlite3ValueIsOfClass(const sqlite3_value*, void(*)(void*));
+ SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value*, u8);
+ SQLITE_PRIVATE void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8,
+                         void(*)(void*));
+@@ -20314,7 +21341,6 @@ SQLITE_PRIVATE const unsigned char sqlite3OpcodeProperty[];
+ SQLITE_PRIVATE const char sqlite3StrBINARY[];
+ SQLITE_PRIVATE const unsigned char sqlite3StdTypeLen[];
+ SQLITE_PRIVATE const char sqlite3StdTypeAffinity[];
+-SQLITE_PRIVATE const char sqlite3StdTypeMap[];
+ SQLITE_PRIVATE const char *sqlite3StdType[];
+ SQLITE_PRIVATE const unsigned char sqlite3UpperToLower[];
+ SQLITE_PRIVATE const unsigned char *sqlite3aLTb;
+@@ -20347,7 +21373,8 @@ SQLITE_PRIVATE int sqlite3MatchEName(
+   const struct ExprList_item*,
+   const char*,
+   const char*,
+-  const char*
++  const char*,
++  int*
+ );
+ SQLITE_PRIVATE Bitmask sqlite3ExprColUsed(Expr*);
+ SQLITE_PRIVATE u8 sqlite3StrIHash(const char*);
+@@ -20403,8 +21430,13 @@ SQLITE_PRIVATE void sqlite3OomClear(sqlite3*);
+ SQLITE_PRIVATE int sqlite3ApiExit(sqlite3 *db, int);
+ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *);
+ 
++SQLITE_PRIVATE char *sqlite3RCStrRef(char*);
++SQLITE_PRIVATE void sqlite3RCStrUnref(void*);
++SQLITE_PRIVATE char *sqlite3RCStrNew(u64);
++SQLITE_PRIVATE char *sqlite3RCStrResize(char*,u64);
++
+ SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum*, sqlite3*, char*, int, int);
+-SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum*, int);
++SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum*, i64);
+ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum*);
+ SQLITE_PRIVATE void sqlite3StrAccumSetError(StrAccum*, u8);
+ SQLITE_PRIVATE void sqlite3ResultStrAccum(sqlite3_context*,StrAccum*);
+@@ -20518,10 +21550,7 @@ SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3*, int, const char *);
+ SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *, VTable *);
+ 
+ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
+-#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
+-    && !defined(SQLITE_OMIT_VIRTUALTABLE)
+-SQLITE_PRIVATE   void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
+-#endif
++SQLITE_PRIVATE void sqlite3VtabUsesAllSchemas(Parse*);
+ SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
+ SQLITE_PRIVATE int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
+ SQLITE_PRIVATE int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
+@@ -20546,6 +21575,7 @@ SQLITE_PRIVATE   Cte *sqlite3CteNew(Parse*,Token*,ExprList*,Select*,u8);
+ SQLITE_PRIVATE   void sqlite3CteDelete(sqlite3*,Cte*);
+ SQLITE_PRIVATE   With *sqlite3WithAdd(Parse*,With*,Cte*);
+ SQLITE_PRIVATE   void sqlite3WithDelete(sqlite3*,With*);
++SQLITE_PRIVATE   void sqlite3WithDeleteGeneric(sqlite3*,void*);
+ SQLITE_PRIVATE   With *sqlite3WithPush(Parse*, With*, u8);
+ #else
+ # define sqlite3CteNew(P,T,E,S)   ((void*)0)
+@@ -20657,6 +21687,7 @@ SQLITE_PRIVATE   int sqlite3ExprCheckHeight(Parse*, int);
+   #define sqlite3SelectExprHeight(x) 0
+   #define sqlite3ExprCheckHeight(x,y)
+ #endif
++SQLITE_PRIVATE void sqlite3ExprSetErrorOffset(Expr*,int);
+ 
+ SQLITE_PRIVATE u32 sqlite3Get4byte(const u8*);
+ SQLITE_PRIVATE void sqlite3Put4byte(u8*, u32);
+@@ -20758,6 +21789,22 @@ SQLITE_PRIVATE void sqlite3VectorErrorMsg(Parse*, Expr*);
+ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt);
+ #endif
+ 
++#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
++SQLITE_PRIVATE int sqlite3KvvfsInit(void);
++#endif
++
++#if defined(VDBE_PROFILE) \
++ || defined(SQLITE_PERFORMANCE_TRACE) \
++ || defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++SQLITE_PRIVATE sqlite3_uint64 sqlite3Hwtime(void);
++#endif
++
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStatus)
++#else
++# define IS_STMT_SCANSTATUS(db) 0
++#endif
++
+ #endif /* SQLITEINT_H */
+ 
+ /************** End of sqliteInt.h *******************************************/
+@@ -20799,101 +21846,6 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt);
+ */
+ #ifdef SQLITE_PERFORMANCE_TRACE
+ 
+-/*
+-** hwtime.h contains inline assembler code for implementing
+-** high-performance timing routines.
+-*/
+-/************** Include hwtime.h in the middle of os_common.h ****************/
+-/************** Begin file hwtime.h ******************************************/
+-/*
+-** 2008 May 27
+-**
+-** The author disclaims copyright to this source code.  In place of
+-** a legal notice, here is a blessing:
+-**
+-**    May you do good and not evil.
+-**    May you find forgiveness for yourself and forgive others.
+-**    May you share freely, never taking more than you give.
+-**
+-******************************************************************************
+-**
+-** This file contains inline asm code for retrieving "high-performance"
+-** counters for x86 and x86_64 class CPUs.
+-*/
+-#ifndef SQLITE_HWTIME_H
+-#define SQLITE_HWTIME_H
+-
+-/*
+-** The following routine only works on pentium-class (or newer) processors.
+-** It uses the RDTSC opcode to read the cycle count value out of the
+-** processor and returns that value.  This can be used for high-res
+-** profiling.
+-*/
+-#if !defined(__STRICT_ANSI__) && \
+-    (defined(__GNUC__) || defined(_MSC_VER)) && \
+-    (defined(i386) || defined(__i386__) || defined(_M_IX86))
+-
+-  #if defined(__GNUC__)
+-
+-  __inline__ sqlite_uint64 sqlite3Hwtime(void){
+-     unsigned int lo, hi;
+-     __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
+-     return (sqlite_uint64)hi << 32 | lo;
+-  }
+-
+-  #elif defined(_MSC_VER)
+-
+-  __declspec(naked) __inline sqlite_uint64 __cdecl sqlite3Hwtime(void){
+-     __asm {
+-        rdtsc
+-        ret       ; return value at EDX:EAX
+-     }
+-  }
+-
+-  #endif
+-
+-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__x86_64__))
+-
+-  __inline__ sqlite_uint64 sqlite3Hwtime(void){
+-      unsigned long val;
+-      __asm__ __volatile__ ("rdtsc" : "=A" (val));
+-      return val;
+-  }
+-
+-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__))
+-
+-  __inline__ sqlite_uint64 sqlite3Hwtime(void){
+-      unsigned long long retval;
+-      unsigned long junk;
+-      __asm__ __volatile__ ("\n\
+-          1:      mftbu   %1\n\
+-                  mftb    %L0\n\
+-                  mftbu   %0\n\
+-                  cmpw    %0,%1\n\
+-                  bne     1b"
+-                  : "=r" (retval), "=r" (junk));
+-      return retval;
+-  }
+-
+-#else
+-
+-  /*
+-  ** asm() is needed for hardware timing support.  Without asm(),
+-  ** disable the sqlite3Hwtime() routine.
+-  **
+-  ** sqlite3Hwtime() is only used for some obscure debugging
+-  ** and analysis configurations, not in any deliverable, so this
+-  ** should not be a great loss.
+-  */
+-SQLITE_PRIVATE   sqlite_uint64 sqlite3Hwtime(void){ return ((sqlite_uint64)0); }
+-
+-#endif
+-
+-#endif /* !defined(SQLITE_HWTIME_H) */
+-
+-/************** End of hwtime.h **********************************************/
+-/************** Continuing where we left off in os_common.h ******************/
+-
+ static sqlite_uint64 g_start;
+ static sqlite_uint64 g_elapsed;
+ #define TIMER_START       g_start=sqlite3Hwtime()
+@@ -20989,7 +21941,7 @@ SQLITE_API extern int sqlite3_open_file_count;
+ ** autoconf-based build
+ */
+ #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
+-/* #include "config.h" */
++/* #include "sqlite_cfg.h" */
+ #define SQLITECONFIG_H 1
+ #endif
+ 
+@@ -21021,9 +21973,6 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_4_BYTE_ALIGNED_MALLOC
+   "4_BYTE_ALIGNED_MALLOC",
+ #endif
+-#ifdef SQLITE_64BIT_STATS
+-  "64BIT_STATS",
+-#endif
+ #ifdef SQLITE_ALLOW_COVERING_INDEX_SCAN
+ # if SQLITE_ALLOW_COVERING_INDEX_SCAN != 1
+   "ALLOW_COVERING_INDEX_SCAN=" CTIMEOPT_VAL(SQLITE_ALLOW_COVERING_INDEX_SCAN),
+@@ -21154,6 +22103,9 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
+   "DISABLE_SKIPAHEAD_DISTINCT",
+ #endif
++#ifdef SQLITE_DQS
++  "DQS=" CTIMEOPT_VAL(SQLITE_DQS),
++#endif
+ #ifdef SQLITE_ENABLE_8_3_NAMES
+   "ENABLE_8_3_NAMES=" CTIMEOPT_VAL(SQLITE_ENABLE_8_3_NAMES),
+ #endif
+@@ -21316,6 +22268,9 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_EXPLAIN_ESTIMATED_ROWS
+   "EXPLAIN_ESTIMATED_ROWS",
+ #endif
++#ifdef SQLITE_EXTRA_AUTOEXT
++  "EXTRA_AUTOEXT=" CTIMEOPT_VAL(SQLITE_EXTRA_AUTOEXT),
++#endif
+ #ifdef SQLITE_EXTRA_IFNULLROW
+   "EXTRA_IFNULLROW",
+ #endif
+@@ -21357,6 +22312,9 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_INTEGRITY_CHECK_ERROR_MAX
+   "INTEGRITY_CHECK_ERROR_MAX=" CTIMEOPT_VAL(SQLITE_INTEGRITY_CHECK_ERROR_MAX),
+ #endif
++#ifdef SQLITE_LEGACY_JSON_VALID
++  "LEGACY_JSON_VALID",
++#endif
+ #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
+   "LIKE_DOESNT_MATCH_BLOBS",
+ #endif
+@@ -21594,6 +22552,9 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
+   "OMIT_SCHEMA_VERSION_PRAGMAS",
+ #endif
++#ifdef SQLITE_OMIT_SEH
++  "OMIT_SEH",
++#endif
+ #ifdef SQLITE_OMIT_SHARED_CACHE
+   "OMIT_SHARED_CACHE",
+ #endif
+@@ -21644,9 +22605,6 @@ static const char * const sqlite3azCompileOpt[] = {
+ #ifdef SQLITE_OMIT_XFER_OPT
+   "OMIT_XFER_OPT",
+ #endif
+-#ifdef SQLITE_PCACHE_SEPARATE_HEADER
+-  "PCACHE_SEPARATE_HEADER",
+-#endif
+ #ifdef SQLITE_PERFORMANCE_TRACE
+   "PERFORMANCE_TRACE",
+ #endif
+@@ -21848,7 +22806,7 @@ SQLITE_PRIVATE const unsigned char *sqlite3aGTb = &sqlite3UpperToLower[256+12-OP
+ **   isalnum()                        0x06
+ **   isxdigit()                       0x08
+ **   toupper()                        0x20
+-**   SQLite identifier character      0x40
++**   SQLite identifier character      0x40   $, _, or non-ascii
+ **   Quote character                  0x80
+ **
+ ** Bit 0x20 is set if the mapped character requires translation to upper
+@@ -21994,6 +22952,10 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
+    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
+    0,                         /* bSmallMalloc */
+    1,                         /* bExtraSchemaChecks */
++   sizeof(LONGDOUBLE_TYPE)>8, /* bUseLongDouble */
++#ifdef SQLITE_DEBUG
++   0,                         /* bJsonSelfcheck */
++#endif
+    0x7ffffffe,                /* mxStrlen */
+    0,                         /* neverCorrupt */
+    SQLITE_DEFAULT_LOOKASIDE,  /* szLookaside, nLookaside */
+@@ -22042,7 +23004,7 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
+    SQLITE_DEFAULT_SORTERREF_SIZE,   /* szSorterRef */
+    0,                         /* iPrngSeed */
+ #ifdef SQLITE_DEBUG
+-   {0,0,0,0,0,0}              /* aTune */
++   {0,0,0,0,0,0},             /* aTune */
+ #endif
+ };
+ 
+@@ -22126,10 +23088,6 @@ SQLITE_PRIVATE const char sqlite3StrBINARY[] = "BINARY";
+ **
+ **    sqlite3StdTypeAffinity[]    The affinity associated with each entry
+ **                                in sqlite3StdType[].
+-**
+-**    sqlite3StdTypeMap[]         The type value (as returned from
+-**                                sqlite3_column_type() or sqlite3_value_type())
+-**                                for each entry in sqlite3StdType[].
+ */
+ SQLITE_PRIVATE const unsigned char sqlite3StdTypeLen[] = { 3, 4, 3, 7, 4, 4 };
+ SQLITE_PRIVATE const char sqlite3StdTypeAffinity[] = {
+@@ -22140,14 +23098,6 @@ SQLITE_PRIVATE const char sqlite3StdTypeAffinity[] = {
+   SQLITE_AFF_REAL,
+   SQLITE_AFF_TEXT
+ };
+-SQLITE_PRIVATE const char sqlite3StdTypeMap[] = {
+-  0,
+-  SQLITE_BLOB,
+-  SQLITE_INTEGER,
+-  SQLITE_INTEGER,
+-  SQLITE_FLOAT,
+-  SQLITE_TEXT
+-};
+ SQLITE_PRIVATE const char *sqlite3StdType[] = {
+   "ANY",
+   "BLOB",
+@@ -22235,6 +23185,9 @@ typedef struct VdbeSorter VdbeSorter;
+ /* Elements of the linked list at Vdbe.pAuxData */
+ typedef struct AuxData AuxData;
+ 
++/* A cache of large TEXT or BLOB values in a VdbeCursor */
++typedef struct VdbeTxtBlbCache VdbeTxtBlbCache;
++
+ /* Types of VDBE cursors */
+ #define CURTYPE_BTREE       0
+ #define CURTYPE_SORTER      1
+@@ -22266,6 +23219,7 @@ struct VdbeCursor {
+   Bool useRandomRowid:1;  /* Generate new record numbers semi-randomly */
+   Bool isOrdered:1;       /* True if the table is not BTREE_UNORDERED */
+   Bool noReuse:1;         /* OpenEphemeral may not reuse this cursor */
++  Bool colCache:1;        /* pCache pointer is initialized and non-NULL */
+   u16 seekHit;            /* See the OP_SeekHit and OP_IfNoHope opcodes */
+   union {                 /* pBtx for isEphermeral.  pAltMap otherwise */
+     Btree *pBtx;            /* Separate file holding temporary table */
+@@ -22306,6 +23260,7 @@ struct VdbeCursor {
+ #ifdef SQLITE_ENABLE_COLUMN_USED_MASK
+   u64 maskUsed;           /* Mask of columns used by this cursor */
+ #endif
++  VdbeTxtBlbCache *pCache; /* Cache of large TEXT or BLOB values */
+ 
+   /* 2*nField extra array elements allocated for aType[], beyond the one
+   ** static element declared in the structure.  nField total array slots for
+@@ -22318,12 +23273,25 @@ struct VdbeCursor {
+ #define IsNullCursor(P) \
+   ((P)->eCurType==CURTYPE_PSEUDO && (P)->nullRow && (P)->seekResult==0)
+ 
+-
+ /*
+ ** A value for VdbeCursor.cacheStatus that means the cache is always invalid.
+ */
+ #define CACHE_STALE 0
+ 
++/*
++** Large TEXT or BLOB values can be slow to load, so we want to avoid
++** loading them more than once.  For that reason, large TEXT and BLOB values
++** can be stored in a cache defined by this object, and attached to the
++** VdbeCursor using the pCache field.
++*/
++struct VdbeTxtBlbCache {
++  char *pCValue;        /* A RCStr buffer to hold the value */
++  i64 iOffset;          /* File offset of the row being cached */
++  int iCol;             /* Column for which the cache is valid */
++  u32 cacheStatus;      /* Vdbe.cacheCtr value */
++  u32 colCacheCtr;      /* Column cache counter */
++};
++
+ /*
+ ** When a sub-program is executed (OP_Program), a structure of this type
+ ** is allocated to store the current value of the program counter, as
+@@ -22350,7 +23318,6 @@ struct VdbeFrame {
+   Vdbe *v;                /* VM this frame belongs to */
+   VdbeFrame *pParent;     /* Parent of this frame, or NULL if parent is main */
+   Op *aOp;                /* Program instructions for parent frame */
+-  i64 *anExec;            /* Event counters from parent frame */
+   Mem *aMem;              /* Array of memory cells for parent frame */
+   VdbeCursor **apCsr;     /* Array of Vdbe cursors for parent frame */
+   u8 *aOnce;              /* Bitmask used by OP_Once */
+@@ -22566,10 +23533,19 @@ typedef unsigned bft;  /* Bit Field Type */
+ 
+ /* The ScanStatus object holds a single value for the
+ ** sqlite3_stmt_scanstatus() interface.
++**
++** aAddrRange[]:
++**   This array is used by ScanStatus elements associated with EQP
++**   notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
++**   an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
++**   values should be summed to calculate the NCYCLE value. Each pair of
++**   integer addresses is a start and end address (both inclusive) for a range
++**   instructions. A start value of 0 indicates an empty range.
+ */
+ typedef struct ScanStatus ScanStatus;
+ struct ScanStatus {
+   int addrExplain;                /* OP_Explain for loop */
++  int aAddrRange[6];
+   int addrLoop;                   /* Address of "loops" counter */
+   int addrVisit;                  /* Address of "rows visited" counter */
+   int iSelectID;                  /* The "Select-ID" for this loop */
+@@ -22599,7 +23575,7 @@ struct DblquoteStr {
+ */
+ struct Vdbe {
+   sqlite3 *db;            /* The database connection that owns this statement */
+-  Vdbe *pPrev,*pNext;     /* Linked list of VDBEs with the same Vdbe.db */
++  Vdbe **ppVPrev,*pVNext; /* Linked list of VDBEs with the same Vdbe.db */
+   Parse *pParse;          /* Parsing context used to create this Vdbe */
+   ynVar nVar;             /* Number of entries in aVar[] */
+   int nMem;               /* Number of memory locations currently allocated */
+@@ -22625,7 +23601,7 @@ struct Vdbe {
+   int nOp;                /* Number of instructions in the program */
+   int nOpAlloc;           /* Slots allocated for aOp[] */
+   Mem *aColName;          /* Column names to return */
+-  Mem *pResultSet;        /* Pointer to an array of results */
++  Mem *pResultRow;        /* Current output row */
+   char *zErrMsg;          /* Error message written here */
+   VList *pVList;          /* Name of variables */
+ #ifndef SQLITE_OMIT_TRACE
+@@ -22636,16 +23612,18 @@ struct Vdbe {
+   u32 nWrite;             /* Number of write operations that have occurred */
+ #endif
+   u16 nResColumn;         /* Number of columns in one row of the result set */
++  u16 nResAlloc;          /* Column slots allocated to aColName[] */
+   u8 errorAction;         /* Recovery action to do in case of an error */
+   u8 minWriteFileFormat;  /* Minimum file format for writable database files */
+   u8 prepFlags;           /* SQLITE_PREPARE_* flags */
+   u8 eVdbeState;          /* On of the VDBE_*_STATE values */
+   bft expired:2;          /* 1: recompile VM immediately  2: when convenient */
+-  bft explain:2;          /* True if EXPLAIN present on SQL command */
++  bft explain:2;          /* 0: normal, 1: EXPLAIN, 2: EXPLAIN QUERY PLAN */
+   bft changeCntOn:1;      /* True to update the change-counter */
+   bft usesStmtJournal:1;  /* True if uses a statement journal */
+   bft readOnly:1;         /* True for statements that do not write */
+   bft bIsReader:1;        /* True for statements that read */
++  bft haveEqpOps:1;       /* Bytecode supports EXPLAIN QUERY PLAN */
+   yDbMask btreeMask;      /* Bitmask of db->aDb[] entries referenced */
+   yDbMask lockMask;       /* Subset of btreeMask that requires a lock */
+   u32 aCounter[9];        /* Counters used by sqlite3_stmt_status() */
+@@ -22662,7 +23640,6 @@ struct Vdbe {
+   SubProgram *pProgram;   /* Linked list of all sub-programs used by VM */
+   AuxData *pAuxData;      /* Linked list of auxdata allocations */
+ #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-  i64 *anExec;            /* Number of times each op has been executed */
+   int nScan;              /* Entries in aScan[] */
+   ScanStatus *aScan;      /* Scan definitions for sqlite3_stmt_scanstatus() */
+ #endif
+@@ -22693,7 +23670,7 @@ struct PreUpdate {
+   i64 iKey1;                      /* First key value passed to hook */
+   i64 iKey2;                      /* Second key value passed to hook */
+   Mem *aNew;                      /* Array of new.* values */
+-  Table *pTab;                    /* Schema object being upated */
++  Table *pTab;                    /* Schema object being updated */
+   Index *pPk;                     /* PK index if pTab is WITHOUT ROWID */
+ };
+ 
+@@ -22783,6 +23760,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetZeroBlob(Mem*,int);
+ SQLITE_PRIVATE int sqlite3VdbeMemIsRowSet(const Mem*);
+ #endif
+ SQLITE_PRIVATE int sqlite3VdbeMemSetRowSet(Mem*);
++SQLITE_PRIVATE void sqlite3VdbeMemZeroTerminateIfAble(Mem*);
+ SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem*);
+ SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem*, u8, u8);
+ SQLITE_PRIVATE int sqlite3IntFloatCompare(i64,double);
+@@ -22829,6 +23807,8 @@ SQLITE_PRIVATE int sqlite3VdbeSorterRewind(const VdbeCursor *, int *);
+ SQLITE_PRIVATE int sqlite3VdbeSorterWrite(const VdbeCursor *, Mem *);
+ SQLITE_PRIVATE int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int, int *);
+ 
++SQLITE_PRIVATE void sqlite3VdbeValueListFree(void*);
++
+ #ifdef SQLITE_DEBUG
+ SQLITE_PRIVATE   void sqlite3VdbeIncrWriteCounter(Vdbe*, VdbeCursor*);
+ SQLITE_PRIVATE   void sqlite3VdbeAssertAbortable(Vdbe*);
+@@ -23157,6 +24137,8 @@ SQLITE_API int sqlite3_db_status(
+ 
+       sqlite3BtreeEnterAll(db);
+       db->pnBytesFreed = &nByte;
++      assert( db->lookaside.pEnd==db->lookaside.pTrueEnd );
++      db->lookaside.pEnd = db->lookaside.pStart;
+       for(i=0; inDb; i++){
+         Schema *pSchema = db->aDb[i].pSchema;
+         if( ALWAYS(pSchema!=0) ){
+@@ -23182,6 +24164,7 @@ SQLITE_API int sqlite3_db_status(
+         }
+       }
+       db->pnBytesFreed = 0;
++      db->lookaside.pEnd = db->lookaside.pTrueEnd;
+       sqlite3BtreeLeaveAll(db);
+ 
+       *pHighwater = 0;
+@@ -23199,9 +24182,12 @@ SQLITE_API int sqlite3_db_status(
+       int nByte = 0;              /* Used to accumulate return value */
+ 
+       db->pnBytesFreed = &nByte;
+-      for(pVdbe=db->pVdbe; pVdbe; pVdbe=pVdbe->pNext){
++      assert( db->lookaside.pEnd==db->lookaside.pTrueEnd );
++      db->lookaside.pEnd = db->lookaside.pStart;
++      for(pVdbe=db->pVdbe; pVdbe; pVdbe=pVdbe->pVNext){
+         sqlite3VdbeDelete(pVdbe);
+       }
++      db->lookaside.pEnd = db->lookaside.pTrueEnd;
+       db->pnBytesFreed = 0;
+ 
+       *pHighwater = 0;  /* IMP: R-64479-57858 */
+@@ -23222,7 +24208,7 @@ SQLITE_API int sqlite3_db_status(
+     case SQLITE_DBSTATUS_CACHE_MISS:
+     case SQLITE_DBSTATUS_CACHE_WRITE:{
+       int i;
+-      int nRet = 0;
++      u64 nRet = 0;
+       assert( SQLITE_DBSTATUS_CACHE_MISS==SQLITE_DBSTATUS_CACHE_HIT+1 );
+       assert( SQLITE_DBSTATUS_CACHE_WRITE==SQLITE_DBSTATUS_CACHE_HIT+2 );
+ 
+@@ -23235,7 +24221,7 @@ SQLITE_API int sqlite3_db_status(
+       *pHighwater = 0; /* IMP: R-42420-56072 */
+                        /* IMP: R-54100-20147 */
+                        /* IMP: R-29431-39229 */
+-      *pCurrent = nRet;
++      *pCurrent = (int)nRet & 0x7fffffff;
+       break;
+     }
+ 
+@@ -23338,6 +24324,7 @@ struct DateTime {
+   char validTZ;       /* True (1) if tz is valid */
+   char tzSet;         /* Timezone was set explicitly */
+   char isError;       /* An overflow has occurred */
++  char useSubsec;     /* Display subsecond precision */
+ };
+ 
+ 
+@@ -23370,8 +24357,8 @@ struct DateTime {
+ */
+ static int getDigits(const char *zDate, const char *zFormat, ...){
+   /* The aMx[] array translates the 3rd character of each format
+-  ** spec into a max size:    a   b   c   d   e     f */
+-  static const u16 aMx[] = { 12, 14, 24, 31, 59, 9999 };
++  ** spec into a max size:    a   b   c   d   e      f */
++  static const u16 aMx[] = { 12, 14, 24, 31, 59, 14712 };
+   va_list ap;
+   int cnt = 0;
+   char nextC;
+@@ -23537,7 +24524,7 @@ static void computeJD(DateTime *p){
+   p->iJD = (sqlite3_int64)((X1 + X2 + D + B - 1524.5 ) * 86400000);
+   p->validJD = 1;
+   if( p->validHMS ){
+-    p->iJD += p->h*3600000 + p->m*60000 + (sqlite3_int64)(p->s*1000);
++    p->iJD += p->h*3600000 + p->m*60000 + (sqlite3_int64)(p->s*1000 + 0.5);
+     if( p->validTZ ){
+       p->iJD -= p->tz*60000;
+       p->validYMD = 0;
+@@ -23652,6 +24639,11 @@ static int parseDateOrTime(
+   }else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
+     setRawDateNumber(p, r);
+     return 0;
++  }else if( (sqlite3StrICmp(zDate,"subsec")==0
++             || sqlite3StrICmp(zDate,"subsecond")==0)
++           && sqlite3NotPureFunc(context) ){
++    p->useSubsec = 1;
++    return setDateTimeToCurrent(context, p);
+   }
+   return 1;
+ }
+@@ -23707,17 +24699,14 @@ static void computeYMD(DateTime *p){
+ ** Compute the Hour, Minute, and Seconds from the julian day number.
+ */
+ static void computeHMS(DateTime *p){
+-  int s;
++  int day_ms, day_min; /* milliseconds, minutes into the day */
+   if( p->validHMS ) return;
+   computeJD(p);
+-  s = (int)((p->iJD + 43200000) % 86400000);
+-  p->s = s/1000.0;
+-  s = (int)p->s;
+-  p->s -= s;
+-  p->h = s/3600;
+-  s -= p->h*3600;
+-  p->m = s/60;
+-  p->s += s - p->m*60;
++  day_ms = (int)((p->iJD + 43200000) % 86400000);
++  p->s = (day_ms % 60000)/1000.0;
++  day_min = day_ms/60000;
++  p->m = day_min % 60;
++  p->h = day_min / 60;
+   p->rawS = 0;
+   p->validHMS = 1;
+ }
+@@ -23896,6 +24885,25 @@ static const struct {
+   { 4, "year",   14713.0,   31536000.0  },
+ };
+ 
++/*
++** If the DateTime p is raw number, try to figure out if it is
++** a julian day number of a unix timestamp.  Set the p value
++** appropriately.
++*/
++static void autoAdjustDate(DateTime *p){
++  if( !p->rawS || p->validJD ){
++    p->rawS = 0;
++  }else if( p->s>=-21086676*(i64)10000        /* -4713-11-24 12:00:00 */
++         && p->s<=(25340230*(i64)10000)+799   /*  9999-12-31 23:59:59 */
++  ){
++    double r = p->s*1000.0 + 210866760000000.0;
++    clearYMD_HMS_TZ(p);
++    p->iJD = (sqlite3_int64)(r + 0.5);
++    p->validJD = 1;
++    p->rawS = 0;
++  }
++}
++
+ /*
+ ** Process a modifier to a date-time stamp.  The modifiers are
+ ** as follows:
+@@ -23939,19 +24947,8 @@ static int parseModifier(
+       */
+       if( sqlite3_stricmp(z, "auto")==0 ){
+         if( idx>1 ) return 1; /* IMP: R-33611-57934 */
+-        if( !p->rawS || p->validJD ){
+-          rc = 0;
+-          p->rawS = 0;
+-        }else if( p->s>=-21086676*(i64)10000        /* -4713-11-24 12:00:00 */
+-               && p->s<=(25340230*(i64)10000)+799   /*  9999-12-31 23:59:59 */
+-        ){
+-          r = p->s*1000.0 + 210866760000000.0;
+-          clearYMD_HMS_TZ(p);
+-          p->iJD = (sqlite3_int64)(r + 0.5);
+-          p->validJD = 1;
+-          p->rawS = 0;
+-          rc = 0;
+-        }
++        autoAdjustDate(p);
++        rc = 0;
+       }
+       break;
+     }
+@@ -24010,7 +25007,7 @@ static int parseModifier(
+           i64 iOrigJD;              /* Original localtime */
+           i64 iGuess;               /* Guess at the corresponding utc time */
+           int cnt = 0;              /* Safety to prevent infinite loop */
+-          int iErr;                 /* Guess is off by this much */
++          i64 iErr;                 /* Guess is off by this much */
+ 
+           computeJD(p);
+           iGuess = iOrigJD = p->iJD;
+@@ -24046,7 +25043,7 @@ static int parseModifier(
+       */
+       if( sqlite3_strnicmp(z, "weekday ", 8)==0
+                && sqlite3AtoF(&z[8], &r, sqlite3Strlen30(&z[8]), SQLITE_UTF8)>0
+-               && (n=(int)r)==r && n>=0 && r<7 ){
++               && r>=0.0 && r<7.0 && (n=(int)r)==r ){
+         sqlite3_int64 Z;
+         computeYMD_HMS(p);
+         p->validTZ = 0;
+@@ -24066,8 +25063,22 @@ static int parseModifier(
+       **
+       ** Move the date backwards to the beginning of the current day,
+       ** or month or year.
++      **
++      **    subsecond
++      **    subsec
++      **
++      ** Show subsecond precision in the output of datetime() and
++      ** unixepoch() and strftime('%s').
+       */
+-      if( sqlite3_strnicmp(z, "start of ", 9)!=0 ) break;
++      if( sqlite3_strnicmp(z, "start of ", 9)!=0 ){
++        if( sqlite3_stricmp(z, "subsec")==0
++         || sqlite3_stricmp(z, "subsecond")==0
++        ){
++          p->useSubsec = 1;
++          rc = 0;
++        }
++        break;
++      }
+       if( !p->validJD && !p->validYMD && !p->validHMS ) break;
+       z += 9;
+       computeYMD(p);
+@@ -24103,18 +25114,73 @@ static int parseModifier(
+     case '9': {
+       double rRounder;
+       int i;
+-      for(n=1; z[n] && z[n]!=':' && !sqlite3Isspace(z[n]); n++){}
++      int Y,M,D,h,m,x;
++      const char *z2 = z;
++      char z0 = z[0];
++      for(n=1; z[n]; n++){
++        if( z[n]==':' ) break;
++        if( sqlite3Isspace(z[n]) ) break;
++        if( z[n]=='-' ){
++          if( n==5 && getDigits(&z[1], "40f", &Y)==1 ) break;
++          if( n==6 && getDigits(&z[1], "50f", &Y)==1 ) break;
++        }
++      }
+       if( sqlite3AtoF(z, &r, n, SQLITE_UTF8)<=0 ){
+-        rc = 1;
++        assert( rc==1 );
+         break;
+       }
+-      if( z[n]==':' ){
++      if( z[n]=='-' ){
++        /* A modifier of the form (+|-)YYYY-MM-DD adds or subtracts the
++        ** specified number of years, months, and days.  MM is limited to
++        ** the range 0-11 and DD is limited to 0-30.
++        */
++        if( z0!='+' && z0!='-' ) break;  /* Must start with +/- */
++        if( n==5 ){
++          if( getDigits(&z[1], "40f-20a-20d", &Y, &M, &D)!=3 ) break;
++        }else{
++          assert( n==6 );
++          if( getDigits(&z[1], "50f-20a-20d", &Y, &M, &D)!=3 ) break;
++          z++;
++        }
++        if( M>=12 ) break;                   /* M range 0..11 */
++        if( D>=31 ) break;                   /* D range 0..30 */
++        computeYMD_HMS(p);
++        p->validJD = 0;
++        if( z0=='-' ){
++          p->Y -= Y;
++          p->M -= M;
++          D = -D;
++        }else{
++          p->Y += Y;
++          p->M += M;
++        }
++        x = p->M>0 ? (p->M-1)/12 : (p->M-12)/12;
++        p->Y += x;
++        p->M -= x*12;
++        computeJD(p);
++        p->validHMS = 0;
++        p->validYMD = 0;
++        p->iJD += (i64)D*86400000;
++        if( z[11]==0 ){
++          rc = 0;
++          break;
++        }
++        if( sqlite3Isspace(z[11])
++         && getDigits(&z[12], "20c:20e", &h, &m)==2
++        ){
++          z2 = &z[12];
++          n = 2;
++        }else{
++          break;
++        }
++      }
++      if( z2[n]==':' ){
+         /* A modifier of the form (+|-)HH:MM:SS.FFF adds (or subtracts) the
+         ** specified number of hours, minutes, seconds, and fractional seconds
+         ** to the time.  The ".FFF" may be omitted.  The ":SS.FFF" may be
+         ** omitted.
+         */
+-        const char *z2 = z;
++
+         DateTime tx;
+         sqlite3_int64 day;
+         if( !sqlite3Isdigit(*z2) ) z2++;
+@@ -24124,7 +25190,7 @@ static int parseModifier(
+         tx.iJD -= 43200000;
+         day = tx.iJD/86400000;
+         tx.iJD -= day*86400000;
+-        if( z[0]=='-' ) tx.iJD = -tx.iJD;
++        if( z0=='-' ) tx.iJD = -tx.iJD;
+         computeJD(p);
+         clearYMD_HMS_TZ(p);
+         p->iJD += tx.iJD;
+@@ -24140,7 +25206,7 @@ static int parseModifier(
+       if( n>10 || n<3 ) break;
+       if( sqlite3UpperToLower[(u8)z[n-1]]=='s' ) n--;
+       computeJD(p);
+-      rc = 1;
++      assert( rc==1 );
+       rRounder = r<0 ? -0.5 : +0.5;
+       for(i=0; iM += (int)r;
+@@ -24225,6 +25290,12 @@ static int isDate(
+   }
+   computeJD(p);
+   if( p->isError || !validJulianDay(p->iJD) ) return 1;
++  if( argc==1 && p->validYMD && p->D>28 ){
++    /* Make sure a YYYY-MM-DD is normalized.
++    ** Example: 2023-02-31 -> 2023-03-03 */
++    assert( p->validJD );
++    p->validYMD = 0;
++  }
+   return 0;
+ }
+ 
+@@ -24265,7 +25336,11 @@ static void unixepochFunc(
+   DateTime x;
+   if( isDate(context, argc, argv, &x)==0 ){
+     computeJD(&x);
+-    sqlite3_result_int64(context, x.iJD/1000 - 21086676*(i64)10000);
++    if( x.useSubsec ){
++      sqlite3_result_double(context, (x.iJD - 21086676*(i64)10000000)/1000.0);
++    }else{
++      sqlite3_result_int64(context, x.iJD/1000 - 21086676*(i64)10000);
++    }
+   }
+ }
+ 
+@@ -24281,8 +25356,8 @@ static void datetimeFunc(
+ ){
+   DateTime x;
+   if( isDate(context, argc, argv, &x)==0 ){
+-    int Y, s;
+-    char zBuf[24];
++    int Y, s, n;
++    char zBuf[32];
+     computeYMD_HMS(&x);
+     Y = x.Y;
+     if( Y<0 ) Y = -Y;
+@@ -24303,15 +25378,28 @@ static void datetimeFunc(
+     zBuf[15] = '0' + (x.m/10)%10;
+     zBuf[16] = '0' + (x.m)%10;
+     zBuf[17] = ':';
+-    s = (int)x.s;
+-    zBuf[18] = '0' + (s/10)%10;
+-    zBuf[19] = '0' + (s)%10;
+-    zBuf[20] = 0;
++    if( x.useSubsec ){
++      s = (int)(1000.0*x.s + 0.5);
++      zBuf[18] = '0' + (s/10000)%10;
++      zBuf[19] = '0' + (s/1000)%10;
++      zBuf[20] = '.';
++      zBuf[21] = '0' + (s/100)%10;
++      zBuf[22] = '0' + (s/10)%10;
++      zBuf[23] = '0' + (s)%10;
++      zBuf[24] = 0;
++      n = 24;
++    }else{
++      s = (int)x.s;
++      zBuf[18] = '0' + (s/10)%10;
++      zBuf[19] = '0' + (s)%10;
++      zBuf[20] = 0;
++      n = 20;
++    }
+     if( x.Y<0 ){
+       zBuf[0] = '-';
+-      sqlite3_result_text(context, zBuf, 20, SQLITE_TRANSIENT);
++      sqlite3_result_text(context, zBuf, n, SQLITE_TRANSIENT);
+     }else{
+-      sqlite3_result_text(context, &zBuf[1], 19, SQLITE_TRANSIENT);
++      sqlite3_result_text(context, &zBuf[1], n-1, SQLITE_TRANSIENT);
+     }
+   }
+ }
+@@ -24328,7 +25416,7 @@ static void timeFunc(
+ ){
+   DateTime x;
+   if( isDate(context, argc, argv, &x)==0 ){
+-    int s;
++    int s, n;
+     char zBuf[16];
+     computeHMS(&x);
+     zBuf[0] = '0' + (x.h/10)%10;
+@@ -24337,11 +25425,24 @@ static void timeFunc(
+     zBuf[3] = '0' + (x.m/10)%10;
+     zBuf[4] = '0' + (x.m)%10;
+     zBuf[5] = ':';
+-    s = (int)x.s;
+-    zBuf[6] = '0' + (s/10)%10;
+-    zBuf[7] = '0' + (s)%10;
+-    zBuf[8] = 0;
+-    sqlite3_result_text(context, zBuf, 8, SQLITE_TRANSIENT);
++    if( x.useSubsec ){
++      s = (int)(1000.0*x.s + 0.5);
++      zBuf[6] = '0' + (s/10000)%10;
++      zBuf[7] = '0' + (s/1000)%10;
++      zBuf[8] = '.';
++      zBuf[9] = '0' + (s/100)%10;
++      zBuf[10] = '0' + (s/10)%10;
++      zBuf[11] = '0' + (s)%10;
++      zBuf[12] = 0;
++      n = 12;
++    }else{
++      s = (int)x.s;
++      zBuf[6] = '0' + (s/10)%10;
++      zBuf[7] = '0' + (s)%10;
++      zBuf[8] = 0;
++      n = 8;
++    }
++    sqlite3_result_text(context, zBuf, n, SQLITE_TRANSIENT);
+   }
+ }
+ 
+@@ -24396,7 +25497,7 @@ static void dateFunc(
+ **   %M  minute 00-59
+ **   %s  seconds since 1970-01-01
+ **   %S  seconds 00-59
+-**   %w  day of week 0-6  sunday==0
++**   %w  day of week 0-6  Sunday==0
+ **   %W  week of year 00-53
+ **   %Y  year 0000-9999
+ **   %%  %
+@@ -24422,13 +25523,16 @@ static void strftimeFunc(
+   computeJD(&x);
+   computeYMD_HMS(&x);
+   for(i=j=0; zFmt[i]; i++){
++    char cf;
+     if( zFmt[i]!='%' ) continue;
+     if( j12 ) h -= 12;
++        if( h==0 ) h = 12;
++        sqlite3_str_appendf(&sRes, cf=='I' ? "%02d" : "%2d", h);
+         break;
+       }
+       case 'W': /* Fall thru */
+@@ -24450,7 +25567,7 @@ static void strftimeFunc(
+         y.D = 1;
+         computeJD(&y);
+         nDay = (int)((x.iJD-y.iJD+43200000)/86400000);
+-        if( zFmt[i]=='W' ){
++        if( cf=='W' ){
+           int wd;   /* 0=Monday, 1=Tuesday, ... 6=Sunday */
+           wd = (int)(((x.iJD+43200000)/86400000)%7);
+           sqlite3_str_appendf(&sRes,"%02d",(nDay+7-wd)/7);
+@@ -24471,18 +25588,42 @@ static void strftimeFunc(
+         sqlite3_str_appendf(&sRes,"%02d",x.m);
+         break;
+       }
++      case 'p': /* Fall thru */
++      case 'P': {
++        if( x.h>=12 ){
++          sqlite3_str_append(&sRes, cf=='p' ? "PM" : "pm", 2);
++        }else{
++          sqlite3_str_append(&sRes, cf=='p' ? "AM" : "am", 2);
++        }
++        break;
++      }
++      case 'R': {
++        sqlite3_str_appendf(&sRes, "%02d:%02d", x.h, x.m);
++        break;
++      }
+       case 's': {
+-        i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);
+-        sqlite3_str_appendf(&sRes,"%lld",iS);
++        if( x.useSubsec ){
++          sqlite3_str_appendf(&sRes,"%.3f",
++                (x.iJD - 21086676*(i64)10000000)/1000.0);
++        }else{
++          i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);
++          sqlite3_str_appendf(&sRes,"%lld",iS);
++        }
+         break;
+       }
+       case 'S': {
+         sqlite3_str_appendf(&sRes,"%02d",(int)x.s);
+         break;
+       }
++      case 'T': {
++        sqlite3_str_appendf(&sRes,"%02d:%02d:%02d", x.h, x.m, (int)x.s);
++        break;
++      }
++      case 'u': /* Fall thru */
+       case 'w': {
+-        sqlite3_str_appendchar(&sRes, 1,
+-                       (char)(((x.iJD+129600000)/86400000) % 7) + '0');
++        char c = (char)(((x.iJD+129600000)/86400000) % 7) + '0';
++        if( c=='0' && cf=='u' ) c = '7';
++        sqlite3_str_appendchar(&sRes, 1, c);
+         break;
+       }
+       case 'Y': {
+@@ -24531,6 +25672,117 @@ static void cdateFunc(
+   dateFunc(context, 0, 0);
+ }
+ 
++/*
++** timediff(DATE1, DATE2)
++**
++** Return the amount of time that must be added to DATE2 in order to
++** convert it into DATE2.  The time difference format is:
++**
++**     +YYYY-MM-DD HH:MM:SS.SSS
++**
++** The initial "+" becomes "-" if DATE1 occurs before DATE2.  For
++** date/time values A and B, the following invariant should hold:
++**
++**     datetime(A) == (datetime(B, timediff(A,B))
++**
++** Both DATE arguments must be either a julian day number, or an
++** ISO-8601 string.  The unix timestamps are not supported by this
++** routine.
++*/
++static void timediffFunc(
++  sqlite3_context *context,
++  int NotUsed1,
++  sqlite3_value **argv
++){
++  char sign;
++  int Y, M;
++  DateTime d1, d2;
++  sqlite3_str sRes;
++  UNUSED_PARAMETER(NotUsed1);
++  if( isDate(context, 1, &argv[0], &d1) ) return;
++  if( isDate(context, 1, &argv[1], &d2) ) return;
++  computeYMD_HMS(&d1);
++  computeYMD_HMS(&d2);
++  if( d1.iJD>=d2.iJD ){
++    sign = '+';
++    Y = d1.Y - d2.Y;
++    if( Y ){
++      d2.Y = d1.Y;
++      d2.validJD = 0;
++      computeJD(&d2);
++    }
++    M = d1.M - d2.M;
++    if( M<0 ){
++      Y--;
++      M += 12;
++    }
++    if( M!=0 ){
++      d2.M = d1.M;
++      d2.validJD = 0;
++      computeJD(&d2);
++    }
++    while( d1.iJDd2.iJD ){
++      M--;
++      if( M<0 ){
++        M = 11;
++        Y--;
++      }
++      d2.M++;
++      if( d2.M>12 ){
++        d2.M = 1;
++        d2.Y++;
++      }
++      d2.validJD = 0;
++      computeJD(&d2);
++    }
++    d1.iJD = d2.iJD - d1.iJD;
++    d1.iJD += (u64)1486995408 * (u64)100000;
++  }
++  d1.validYMD = 0;
++  d1.validHMS = 0;
++  d1.validTZ = 0;
++  computeYMD_HMS(&d1);
++  sqlite3StrAccumInit(&sRes, 0, 0, 0, 100);
++  sqlite3_str_appendf(&sRes, "%c%04d-%02d-%02d %02d:%02d:%06.3f",
++       sign, Y, M, d1.D-1, d1.h, d1.m, d1.s);
++  sqlite3ResultStrAccum(context, &sRes);
++}
++
++
+ /*
+ ** current_timestamp()
+ **
+@@ -24605,6 +25857,7 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(void){
+     PURE_DATE(time,             -1, 0, 0, timeFunc      ),
+     PURE_DATE(datetime,         -1, 0, 0, datetimeFunc  ),
+     PURE_DATE(strftime,         -1, 0, 0, strftimeFunc  ),
++    PURE_DATE(timediff,          2, 0, 0, timediffFunc  ),
+     DFUNCTION(current_time,      0, 0, 0, ctimeFunc     ),
+     DFUNCTION(current_timestamp, 0, 0, 0, ctimestampFunc),
+     DFUNCTION(current_date,      0, 0, 0, cdateFunc     ),
+@@ -24727,9 +25980,11 @@ SQLITE_PRIVATE int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
+ }
+ SQLITE_PRIVATE int sqlite3OsLock(sqlite3_file *id, int lockType){
+   DO_OS_MALLOC_TEST(id);
++  assert( lockType>=SQLITE_LOCK_SHARED && lockType<=SQLITE_LOCK_EXCLUSIVE );
+   return id->pMethods->xLock(id, lockType);
+ }
+ SQLITE_PRIVATE int sqlite3OsUnlock(sqlite3_file *id, int lockType){
++  assert( lockType==SQLITE_LOCK_NONE || lockType==SQLITE_LOCK_SHARED );
+   return id->pMethods->xUnlock(id, lockType);
+ }
+ SQLITE_PRIVATE int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut){
+@@ -24756,7 +26011,7 @@ SQLITE_PRIVATE int sqlite3OsFileControl(sqlite3_file *id, int op, void *pArg){
+     /* Faults are not injected into COMMIT_PHASETWO because, assuming SQLite
+     ** is using a regular VFS, it is called after the corresponding
+     ** transaction has been committed. Injecting a fault at this point
+-    ** confuses the test scripts - the COMMIT comand returns SQLITE_NOMEM
++    ** confuses the test scripts - the COMMIT command returns SQLITE_NOMEM
+     ** but the transaction is committed anyway.
+     **
+     ** The core must call OsFileControl() though, not OsFileControlHint(),
+@@ -24844,6 +26099,7 @@ SQLITE_PRIVATE int sqlite3OsOpen(
+   ** down into the VFS layer.  Some SQLITE_OPEN_ flags (for example,
+   ** SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before
+   ** reaching the VFS. */
++  assert( zPath || (flags & SQLITE_OPEN_EXCLUSIVE) );
+   rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x1087f7f, pFlagsOut);
+   assert( rc==SQLITE_OK || pFile->pMethods==0 );
+   return rc;
+@@ -25376,7 +26632,7 @@ static void *sqlite3MemMalloc(int nByte){
+ ** or sqlite3MemRealloc().
+ **
+ ** For this low-level routine, we already know that pPrior!=0 since
+-** cases where pPrior==0 will have been intecepted and dealt with
++** cases where pPrior==0 will have been intercepted and dealt with
+ ** by higher-level routines.
+ */
+ static void sqlite3MemFree(void *pPrior){
+@@ -25464,7 +26720,7 @@ static int sqlite3MemInit(void *NotUsed){
+     return SQLITE_OK;
+   }
+   len = sizeof(cpuCount);
+-  /* One usually wants to use hw.acctivecpu for MT decisions, but not here */
++  /* One usually wants to use hw.activecpu for MT decisions, but not here */
+   sysctlbyname("hw.ncpu", &cpuCount, &len, NULL, 0);
+   if( cpuCount>1 ){
+     /* defer MT decisions to system malloc */
+@@ -27159,9 +28415,13 @@ static int memsys5Roundup(int n){
+     if( n<=mem5.szAtom ) return mem5.szAtom;
+     return mem5.szAtom*2;
+   }
+-  if( n>0x40000000 ) return 0;
++  if( n>0x10000000 ){
++    if( n>0x40000000 ) return 0;
++    if( n>0x20000000 ) return 0x40000000;
++    return 0x20000000;
++  }
+   for(iFullSz=mem5.szAtom*8; iFullSz=n ) return iFullSz/2;
++  if( (iFullSz/2)>=(i64)n ) return iFullSz/2;
+   return iFullSz;
+ }
+ 
+@@ -27452,7 +28712,7 @@ static void checkMutexFree(sqlite3_mutex *p){
+   assert( SQLITE_MUTEX_FAST<2 );
+   assert( SQLITE_MUTEX_WARNONCONTENTION<2 );
+ 
+-#if SQLITE_ENABLE_API_ARMOR
++#ifdef SQLITE_ENABLE_API_ARMOR
+   if( ((CheckMutex*)p)->iType<2 )
+ #endif
+   {
+@@ -27927,7 +29187,7 @@ SQLITE_PRIVATE sqlite3_mutex_methods const *sqlite3DefaultMutex(void){
+ 
+ /*
+ ** The sqlite3_mutex.id, sqlite3_mutex.nRef, and sqlite3_mutex.owner fields
+-** are necessary under two condidtions:  (1) Debug builds and (2) using
++** are necessary under two conditions:  (1) Debug builds and (2) using
+ ** home-grown mutexes.  Encapsulate these conditions into a single #define.
+ */
+ #if defined(SQLITE_DEBUG) || defined(SQLITE_HOMEGROWN_RECURSIVE_MUTEX)
+@@ -28124,7 +29384,7 @@ static sqlite3_mutex *pthreadMutexAlloc(int iType){
+ */
+ static void pthreadMutexFree(sqlite3_mutex *p){
+   assert( p->nRef==0 );
+-#if SQLITE_ENABLE_API_ARMOR
++#ifdef SQLITE_ENABLE_API_ARMOR
+   if( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE )
+ #endif
+   {
+@@ -28428,7 +29688,7 @@ struct sqlite3_mutex {
+   CRITICAL_SECTION mutex;    /* Mutex controlling the lock */
+   int id;                    /* Mutex type */
+ #ifdef SQLITE_DEBUG
+-  volatile int nRef;         /* Number of enterances */
++  volatile int nRef;         /* Number of entrances */
+   volatile DWORD owner;      /* Thread holding this mutex */
+   volatile LONG trace;       /* True to trace changes */
+ #endif
+@@ -28477,7 +29737,7 @@ SQLITE_PRIVATE void sqlite3MemoryBarrier(void){
+   SQLITE_MEMORY_BARRIER;
+ #elif defined(__GNUC__)
+   __sync_synchronize();
+-#elif MSVC_VERSION>=1300
++#elif MSVC_VERSION>=1400
+   _ReadWriteBarrier();
+ #elif defined(MemoryBarrier)
+   MemoryBarrier();
+@@ -28961,6 +30221,12 @@ SQLITE_PRIVATE int sqlite3MallocInit(void){
+   }
+   rc = sqlite3GlobalConfig.m.xInit(sqlite3GlobalConfig.m.pAppData);
+   if( rc!=SQLITE_OK ) memset(&mem0, 0, sizeof(mem0));
++
++  /* Initialize wrapper for memory management.*/
++  if( rc==SQLITE_OK ) {
++    sqlite3mcInitMemoryMethods();
++  }
++
+   return rc;
+ }
+ 
+@@ -29062,18 +30328,34 @@ static void mallocWithAlarm(int n, void **pp){
+   *pp = p;
+ }
+ 
++/*
++** Maximum size of any single memory allocation.
++**
++** This is not a limit on the total amount of memory used.  This is
++** a limit on the size parameter to sqlite3_malloc() and sqlite3_realloc().
++**
++** The upper bound is slightly less than 2GiB:  0x7ffffeff == 2,147,483,391
++** This provides a 256-byte safety margin for defense against 32-bit
++** signed integer overflow bugs when computing memory allocation sizes.
++** Paranoid applications might want to reduce the maximum allocation size
++** further for an even larger safety margin.  0x3fffffff or 0x0fffffff
++** or even smaller would be reasonable upper bounds on the size of a memory
++** allocations for most applications.
++*/
++#ifndef SQLITE_MAX_ALLOCATION_SIZE
++# define SQLITE_MAX_ALLOCATION_SIZE  2147483391
++#endif
++#if SQLITE_MAX_ALLOCATION_SIZE>2147483391
++# error Maximum size for SQLITE_MAX_ALLOCATION_SIZE is 2147483391
++#endif
++
+ /*
+ ** Allocate memory.  This routine is like sqlite3_malloc() except that it
+ ** assumes the memory subsystem has already been initialized.
+ */
+ SQLITE_PRIVATE void *sqlite3Malloc(u64 n){
+   void *p;
+-  if( n==0 || n>=0x7fffff00 ){
+-    /* A memory allocation of a number of bytes which is near the maximum
+-    ** signed integer value might cause an integer overflow inside of the
+-    ** xMalloc().  Hence we limit the maximum size to 0x7fffff00, giving
+-    ** 255 bytes of overhead.  SQLite itself will never use anything near
+-    ** this amount.  The only way to reach the limit is with sqlite3_malloc() */
++  if( n==0 || n>SQLITE_MAX_ALLOCATION_SIZE ){
+     p = 0;
+   }else if( sqlite3GlobalConfig.bMemstat ){
+     sqlite3_mutex_enter(mem0.mutex);
+@@ -29109,7 +30391,7 @@ SQLITE_API void *sqlite3_malloc64(sqlite3_uint64 n){
+ */
+ #ifndef SQLITE_OMIT_LOOKASIDE
+ static int isLookaside(sqlite3 *db, const void *p){
+-  return SQLITE_WITHIN(p, db->lookaside.pStart, db->lookaside.pEnd);
++  return SQLITE_WITHIN(p, db->lookaside.pStart, db->lookaside.pTrueEnd);
+ }
+ #else
+ #define isLookaside(A,B) 0
+@@ -29133,18 +30415,16 @@ static int lookasideMallocSize(sqlite3 *db, const void *p){
+ SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3 *db, const void *p){
+   assert( p!=0 );
+ #ifdef SQLITE_DEBUG
+-  if( db==0 || !isLookaside(db,p) ){
+-    if( db==0 ){
+-      assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
+-      assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
+-    }else{
+-      assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
+-      assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
+-    }
++  if( db==0 ){
++    assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
++    assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
++  }else if( !isLookaside(db,p) ){
++    assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
++    assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
+   }
+ #endif
+   if( db ){
+-    if( ((uptr)p)<(uptr)(db->lookaside.pEnd) ){
++    if( ((uptr)p)<(uptr)(db->lookaside.pTrueEnd) ){
+ #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
+       if( ((uptr)p)>=(uptr)(db->lookaside.pMiddle) ){
+         assert( sqlite3_mutex_held(db->mutex) );
+@@ -29200,14 +30480,11 @@ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3 *db, void *p){
+   assert( db==0 || sqlite3_mutex_held(db->mutex) );
+   assert( p!=0 );
+   if( db ){
+-    if( db->pnBytesFreed ){
+-      measureAllocationSize(db, p);
+-      return;
+-    }
+     if( ((uptr)p)<(uptr)(db->lookaside.pEnd) ){
+ #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
+       if( ((uptr)p)>=(uptr)(db->lookaside.pMiddle) ){
+         LookasideSlot *pBuf = (LookasideSlot*)p;
++        assert( db->pnBytesFreed==0 );
+ #ifdef SQLITE_DEBUG
+         memset(p, 0xaa, LOOKASIDE_SMALL);  /* Trash freed content */
+ #endif
+@@ -29218,6 +30495,7 @@ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3 *db, void *p){
+ #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
+       if( ((uptr)p)>=(uptr)(db->lookaside.pStart) ){
+         LookasideSlot *pBuf = (LookasideSlot*)p;
++        assert( db->pnBytesFreed==0 );
+ #ifdef SQLITE_DEBUG
+         memset(p, 0xaa, db->lookaside.szTrue);  /* Trash freed content */
+ #endif
+@@ -29226,6 +30504,10 @@ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3 *db, void *p){
+         return;
+       }
+     }
++    if( db->pnBytesFreed ){
++      measureAllocationSize(db, p);
++      return;
++    }
+   }
+   assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
+   assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
+@@ -29233,6 +30515,43 @@ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3 *db, void *p){
+   sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
+   sqlite3_free(p);
+ }
++SQLITE_PRIVATE void sqlite3DbNNFreeNN(sqlite3 *db, void *p){
++  assert( db!=0 );
++  assert( sqlite3_mutex_held(db->mutex) );
++  assert( p!=0 );
++  if( ((uptr)p)<(uptr)(db->lookaside.pEnd) ){
++#ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
++    if( ((uptr)p)>=(uptr)(db->lookaside.pMiddle) ){
++      LookasideSlot *pBuf = (LookasideSlot*)p;
++      assert( db->pnBytesFreed==0 );
++#ifdef SQLITE_DEBUG
++      memset(p, 0xaa, LOOKASIDE_SMALL);  /* Trash freed content */
++#endif
++      pBuf->pNext = db->lookaside.pSmallFree;
++      db->lookaside.pSmallFree = pBuf;
++      return;
++    }
++#endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
++    if( ((uptr)p)>=(uptr)(db->lookaside.pStart) ){
++      LookasideSlot *pBuf = (LookasideSlot*)p;
++      assert( db->pnBytesFreed==0 );
++#ifdef SQLITE_DEBUG
++      memset(p, 0xaa, db->lookaside.szTrue);  /* Trash freed content */
++#endif
++      pBuf->pNext = db->lookaside.pFree;
++      db->lookaside.pFree = pBuf;
++      return;
++    }
++  }
++  if( db->pnBytesFreed ){
++    measureAllocationSize(db, p);
++    return;
++  }
++  assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
++  assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
++  sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
++  sqlite3_free(p);
++}
+ SQLITE_PRIVATE void sqlite3DbFree(sqlite3 *db, void *p){
+   assert( db==0 || sqlite3_mutex_held(db->mutex) );
+   if( p ) sqlite3DbFreeNN(db, p);
+@@ -29532,9 +30851,14 @@ SQLITE_PRIVATE char *sqlite3DbStrNDup(sqlite3 *db, const char *z, u64 n){
+ */
+ SQLITE_PRIVATE char *sqlite3DbSpanDup(sqlite3 *db, const char *zStart, const char *zEnd){
+   int n;
++#ifdef SQLITE_DEBUG
++  /* Because of the way the parser works, the span is guaranteed to contain
++  ** at least one non-space character */
++  for(n=0; sqlite3Isspace(zStart[n]); n++){ assert( &zStart[n]0) && sqlite3Isspace(zStart[n-1]) ) n--;
++  while( sqlite3Isspace(zStart[n-1]) ) n--;
+   return sqlite3DbStrNDup(db, zStart, n);
+ }
+ 
+@@ -29630,7 +30954,7 @@ SQLITE_PRIVATE int sqlite3ApiExit(sqlite3* db, int rc){
+   if( db->mallocFailed || rc ){
+     return apiHandleError(db, rc);
+   }
+-  return rc & db->errMask;
++  return 0;
+ }
+ 
+ /************** End of malloc.c **********************************************/
+@@ -29742,43 +31066,6 @@ static const et_info fmtinfo[] = {
+ **    %!S   Like %S but prefer the zName over the zAlias
+ */
+ 
+-/* Floating point constants used for rounding */
+-static const double arRound[] = {
+-  5.0e-01, 5.0e-02, 5.0e-03, 5.0e-04, 5.0e-05,
+-  5.0e-06, 5.0e-07, 5.0e-08, 5.0e-09, 5.0e-10,
+-};
+-
+-/*
+-** If SQLITE_OMIT_FLOATING_POINT is defined, then none of the floating point
+-** conversions will work.
+-*/
+-#ifndef SQLITE_OMIT_FLOATING_POINT
+-/*
+-** "*val" is a double such that 0.1 <= *val < 10.0
+-** Return the ascii code for the leading digit of *val, then
+-** multiply "*val" by 10.0 to renormalize.
+-**
+-** Example:
+-**     input:     *val = 3.14159
+-**     output:    *val = 1.4159    function return = '3'
+-**
+-** The counter *cnt is incremented each time.  After counter exceeds
+-** 16 (the number of significant digits in a 64-bit float) '0' is
+-** always returned.
+-*/
+-static char et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
+-  int digit;
+-  LONGDOUBLE_TYPE d;
+-  if( (*cnt)<=0 ) return '0';
+-  (*cnt)--;
+-  digit = (int)*val;
+-  d = digit;
+-  digit += '0';
+-  *val = (*val - d)*10.0;
+-  return (char)digit;
+-}
+-#endif /* SQLITE_OMIT_FLOATING_POINT */
+-
+ /*
+ ** Set the StrAccum object to an error mode.
+ */
+@@ -29870,18 +31157,15 @@ SQLITE_API void sqlite3_str_vappendf(
+   u8 bArgList;               /* True for SQLITE_PRINTF_SQLFUNC */
+   char prefix;               /* Prefix character.  "+" or "-" or " " or '\0'. */
+   sqlite_uint64 longvalue;   /* Value for integer types */
+-  LONGDOUBLE_TYPE realvalue; /* Value for real types */
++  double realvalue;          /* Value for real types */
+   const et_info *infop;      /* Pointer to the appropriate info structure */
+   char *zOut;                /* Rendering buffer */
+   int nOut;                  /* Size of the rendering buffer */
+   char *zExtra = 0;          /* Malloced memory used by some conversion */
+-#ifndef SQLITE_OMIT_FLOATING_POINT
+-  int  exp, e2;              /* exponent of real numbers */
+-  int nsd;                   /* Number of significant digits returned */
+-  double rounder;            /* Used for rounding floating point values */
++  int exp, e2;               /* exponent of real numbers */
+   etByte flag_dp;            /* True if decimal point should be shown */
+   etByte flag_rtz;           /* True if trailing zeros should be removed */
+-#endif
++
+   PrintfArguments *pArgList = 0; /* Arguments for SQLITE_PRINTF_SQLFUNC */
+   char buf[etBUFSIZE];       /* Conversion buffer */
+ 
+@@ -30156,73 +31440,66 @@ SQLITE_API void sqlite3_str_vappendf(
+         break;
+       case etFLOAT:
+       case etEXP:
+-      case etGENERIC:
++      case etGENERIC: {
++        FpDecode s;
++        int iRound;
++        int j;
++
+         if( bArgList ){
+           realvalue = getDoubleArg(pArgList);
+         }else{
+           realvalue = va_arg(ap,double);
+         }
+-#ifdef SQLITE_OMIT_FLOATING_POINT
+-        length = 0;
+-#else
+         if( precision<0 ) precision = 6;         /* Set default precision */
+ #ifdef SQLITE_FP_PRECISION_LIMIT
+         if( precision>SQLITE_FP_PRECISION_LIMIT ){
+           precision = SQLITE_FP_PRECISION_LIMIT;
+         }
+ #endif
+-        if( realvalue<0.0 ){
+-          realvalue = -realvalue;
+-          prefix = '-';
+-        }else{
+-          prefix = flag_prefix;
+-        }
+-        if( xtype==etGENERIC && precision>0 ) precision--;
+-        testcase( precision>0xfff );
+-        idx = precision & 0xfff;
+-        rounder = arRound[idx%10];
+-        while( idx>=10 ){ rounder *= 1.0e-10; idx -= 10; }
+         if( xtype==etFLOAT ){
+-          double rx = (double)realvalue;
+-          sqlite3_uint64 u;
+-          int ex;
+-          memcpy(&u, &rx, sizeof(u));
+-          ex = -1023 + (int)((u>>52)&0x7ff);
+-          if( precision+(ex/3) < 15 ) rounder += realvalue*3e-16;
+-          realvalue += rounder;
+-        }
+-        /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
+-        exp = 0;
+-        if( sqlite3IsNaN((double)realvalue) ){
+-          bufpt = "NaN";
+-          length = 3;
+-          break;
++          iRound = -precision;
++        }else if( xtype==etGENERIC ){
++          iRound = precision;
++        }else{
++          iRound = precision+1;
+         }
+-        if( realvalue>0.0 ){
+-          LONGDOUBLE_TYPE scale = 1.0;
+-          while( realvalue>=1e100*scale && exp<=350 ){ scale *= 1e100;exp+=100;}
+-          while( realvalue>=1e10*scale && exp<=350 ){ scale *= 1e10; exp+=10; }
+-          while( realvalue>=10.0*scale && exp<=350 ){ scale *= 10.0; exp++; }
+-          realvalue /= scale;
+-          while( realvalue<1e-8 ){ realvalue *= 1e8; exp-=8; }
+-          while( realvalue<1.0 ){ realvalue *= 10.0; exp--; }
+-          if( exp>350 ){
++        sqlite3FpDecode(&s, realvalue, iRound, flag_altform2 ? 26 : 16);
++        if( s.isSpecial ){
++          if( s.isSpecial==2 ){
++            bufpt = flag_zeropad ? "null" : "NaN";
++            length = sqlite3Strlen30(bufpt);
++            break;
++          }else if( flag_zeropad ){
++            s.z[0] = '9';
++            s.iDP = 1000;
++            s.n = 1;
++          }else{
++            memcpy(buf, "-Inf", 5);
+             bufpt = buf;
+-            buf[0] = prefix;
+-            memcpy(buf+(prefix!=0),"Inf",4);
+-            length = 3+(prefix!=0);
++            if( s.sign=='-' ){
++              /* no-op */
++            }else if( flag_prefix ){
++              buf[0] = flag_prefix;
++            }else{
++              bufpt++;
++            }
++            length = sqlite3Strlen30(bufpt);
+             break;
+           }
+         }
+-        bufpt = buf;
++        if( s.sign=='-' ){
++          prefix = '-';
++        }else{
++          prefix = flag_prefix;
++        }
++
++        exp = s.iDP-1;
++        if( xtype==etGENERIC && precision>0 ) precision--;
++
+         /*
+         ** If the field type is etGENERIC, then convert to either etEXP
+         ** or etFLOAT, as appropriate.
+         */
+-        if( xtype!=etFLOAT ){
+-          realvalue += rounder;
+-          if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
+-        }
+         if( xtype==etGENERIC ){
+           flag_rtz = !flag_alternateform;
+           if( exp<-4 || exp>precision ){
+@@ -30237,29 +31514,32 @@ SQLITE_API void sqlite3_str_vappendf(
+         if( xtype==etEXP ){
+           e2 = 0;
+         }else{
+-          e2 = exp;
++          e2 = s.iDP - 1;
+         }
++        bufpt = buf;
+         {
+           i64 szBufNeeded;           /* Size of a temporary buffer needed */
+           szBufNeeded = MAX(e2,0)+(i64)precision+(i64)width+15;
++          if( cThousand && e2>0 ) szBufNeeded += (e2+2)/3;
+           if( szBufNeeded > etBUFSIZE ){
+             bufpt = zExtra = printfTempBuf(pAccum, szBufNeeded);
+             if( bufpt==0 ) return;
+           }
+         }
+         zOut = bufpt;
+-        nsd = 16 + flag_altform2*10;
+         flag_dp = (precision>0 ?1:0) | flag_alternateform | flag_altform2;
+         /* The sign in front of the number */
+         if( prefix ){
+           *(bufpt++) = prefix;
+         }
+         /* Digits prior to the decimal point */
++        j = 0;
+         if( e2<0 ){
+           *(bufpt++) = '0';
+         }else{
+           for(; e2>=0; e2--){
+-            *(bufpt++) = et_getdigit(&realvalue,&nsd);
++            *(bufpt++) = j1 ) *(bufpt++) = ',';
+           }
+         }
+         /* The decimal point */
+@@ -30268,13 +31548,12 @@ SQLITE_API void sqlite3_str_vappendf(
+         }
+         /* "0" digits after the decimal point but before the first
+         ** significant digit of the number */
+-        for(e2++; e2<0; precision--, e2++){
+-          assert( precision>0 );
++        for(e2++; e2<0 && precision>0; precision--, e2++){
+           *(bufpt++) = '0';
+         }
+         /* Significant digits after the decimal point */
+         while( (precision--)>0 ){
+-          *(bufpt++) = et_getdigit(&realvalue,&nsd);
++          *(bufpt++) = jcharset];
+           if( exp<0 ){
+             *(bufpt++) = '-'; exp = -exp;
+@@ -30323,8 +31603,8 @@ SQLITE_API void sqlite3_str_vappendf(
+           while( nPad-- ) bufpt[i++] = '0';
+           length = width;
+         }
+-#endif /* !defined(SQLITE_OMIT_FLOATING_POINT) */
+         break;
++      }
+       case etSIZE:
+         if( !bArgList ){
+           *(va_arg(ap,int*)) = pAccum->nChar;
+@@ -30373,13 +31653,26 @@ SQLITE_API void sqlite3_str_vappendf(
+           }
+         }
+         if( precision>1 ){
++          i64 nPrior = 1;
+           width -= precision-1;
+           if( width>1 && !flag_leftjustify ){
+             sqlite3_str_appendchar(pAccum, width-1, ' ');
+             width = 0;
+           }
+-          while( precision-- > 1 ){
+-            sqlite3_str_append(pAccum, buf, length);
++          sqlite3_str_append(pAccum, buf, length);
++          precision--;
++          while( precision > 1 ){
++            i64 nCopyBytes;
++            if( nPrior > precision-1 ) nPrior = precision - 1;
++            nCopyBytes = length*nPrior;
++            if( nCopyBytes + pAccum->nChar >= pAccum->nAlloc ){
++              sqlite3StrAccumEnlarge(pAccum, nCopyBytes);
++            }
++            if( pAccum->accError ) break;
++            sqlite3_str_append(pAccum,
++                 &pAccum->zText[pAccum->nChar-nCopyBytes], nCopyBytes);
++            precision -= nPrior;
++            nPrior *= 2;
+           }
+         }
+         bufpt = buf;
+@@ -30607,9 +31900,9 @@ SQLITE_PRIVATE void sqlite3RecordErrorOffsetOfExpr(sqlite3 *db, const Expr *pExp
+ ** Return the number of bytes of text that StrAccum is able to accept
+ ** after the attempted enlargement.  The value returned might be zero.
+ */
+-SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum *p, int N){
++SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum *p, i64 N){
+   char *zNew;
+-  assert( p->nChar+(i64)N >= p->nAlloc ); /* Only called if really needed */
++  assert( p->nChar+N >= p->nAlloc ); /* Only called if really needed */
+   if( p->accError ){
+     testcase(p->accError==SQLITE_TOOBIG);
+     testcase(p->accError==SQLITE_NOMEM);
+@@ -30620,8 +31913,7 @@ SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum *p, int N){
+     return p->nAlloc - p->nChar - 1;
+   }else{
+     char *zOld = isMalloced(p) ? p->zText : 0;
+-    i64 szNew = p->nChar;
+-    szNew += (sqlite3_int64)N + 1;
++    i64 szNew = p->nChar + N + 1;
+     if( szNew+p->nChar<=p->mxAlloc ){
+       /* Force exponential buffer size growth as long as it does not overflow,
+       ** to avoid having to call this routine too often */
+@@ -30651,7 +31943,8 @@ SQLITE_PRIVATE int sqlite3StrAccumEnlarge(StrAccum *p, int N){
+       return 0;
+     }
+   }
+-  return N;
++  assert( N>=0 && N<=0x7fffffff );
++  return (int)N;
+ }
+ 
+ /*
+@@ -30942,12 +32235,22 @@ SQLITE_API char *sqlite3_vsnprintf(int n, char *zBuf, const char *zFormat, va_li
+   return zBuf;
+ }
+ SQLITE_API char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){
+-  char *z;
++  StrAccum acc;
+   va_list ap;
++  if( n<=0 ) return zBuf;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( zBuf==0 || zFormat==0 ) {
++    (void)SQLITE_MISUSE_BKPT;
++    if( zBuf ) zBuf[0] = 0;
++    return zBuf;
++  }
++#endif
++  sqlite3StrAccumInit(&acc, 0, zBuf, n, 0);
+   va_start(ap,zFormat);
+-  z = sqlite3_vsnprintf(n, zBuf, zFormat, ap);
++  sqlite3_str_vappendf(&acc, zFormat, ap);
+   va_end(ap);
+-  return z;
++  zBuf[acc.nChar] = 0;
++  return zBuf;
+ }
+ 
+ /*
+@@ -31025,6 +32328,75 @@ SQLITE_API void sqlite3_str_appendf(StrAccum *p, const char *zFormat, ...){
+   va_end(ap);
+ }
+ 
++
++/*****************************************************************************
++** Reference counted string/blob storage
++*****************************************************************************/
++
++/*
++** Increase the reference count of the string by one.
++**
++** The input parameter is returned.
++*/
++SQLITE_PRIVATE char *sqlite3RCStrRef(char *z){
++  RCStr *p = (RCStr*)z;
++  assert( p!=0 );
++  p--;
++  p->nRCRef++;
++  return z;
++}
++
++/*
++** Decrease the reference count by one.  Free the string when the
++** reference count reaches zero.
++*/
++SQLITE_PRIVATE void sqlite3RCStrUnref(void *z){
++  RCStr *p = (RCStr*)z;
++  assert( p!=0 );
++  p--;
++  assert( p->nRCRef>0 );
++  if( p->nRCRef>=2 ){
++    p->nRCRef--;
++  }else{
++    sqlite3_free(p);
++  }
++}
++
++/*
++** Create a new string that is capable of holding N bytes of text, not counting
++** the zero byte at the end.  The string is uninitialized.
++**
++** The reference count is initially 1.  Call sqlite3RCStrUnref() to free the
++** newly allocated string.
++**
++** This routine returns 0 on an OOM.
++*/
++SQLITE_PRIVATE char *sqlite3RCStrNew(u64 N){
++  RCStr *p = sqlite3_malloc64( N + sizeof(*p) + 1 );
++  if( p==0 ) return 0;
++  p->nRCRef = 1;
++  return (char*)&p[1];
++}
++
++/*
++** Change the size of the string so that it is able to hold N bytes.
++** The string might be reallocated, so return the new allocation.
++*/
++SQLITE_PRIVATE char *sqlite3RCStrResize(char *z, u64 N){
++  RCStr *p = (RCStr*)z;
++  RCStr *pNew;
++  assert( p!=0 );
++  p--;
++  assert( p->nRCRef==1 );
++  pNew = sqlite3_realloc64(p, N+sizeof(RCStr)+1);
++  if( pNew==0 ){
++    sqlite3_free(p);
++    return 0;
++  }else{
++    return (char*)&pNew[1];
++  }
++}
++
+ /************** End of printf.c **********************************************/
+ /************** Begin file treeview.c ****************************************/
+ /*
+@@ -31247,6 +32619,13 @@ SQLITE_PRIVATE void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc)
+     if( pItem->fg.isOn || (pItem->fg.isUsing==0 && pItem->u3.pOn!=0) ){
+       sqlite3_str_appendf(&x, " ON");
+     }
++    if( pItem->fg.isTabFunc )      sqlite3_str_appendf(&x, " isTabFunc");
++    if( pItem->fg.isCorrelated )   sqlite3_str_appendf(&x, " isCorrelated");
++    if( pItem->fg.isMaterialized ) sqlite3_str_appendf(&x, " isMaterialized");
++    if( pItem->fg.viaCoroutine )   sqlite3_str_appendf(&x, " viaCoroutine");
++    if( pItem->fg.notCte )         sqlite3_str_appendf(&x, " notCte");
++    if( pItem->fg.isNestedFrom )   sqlite3_str_appendf(&x, " isNestedFrom");
++
+     sqlite3StrAccumFinish(&x);
+     sqlite3TreeViewItem(pView, zLine, inSrc-1);
+     n = 0;
+@@ -31434,6 +32813,7 @@ SQLITE_PRIVATE void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u
+     sqlite3TreeViewItem(pView, "FILTER", 1);
+     sqlite3TreeViewExpr(pView, pWin->pFilter, 0);
+     sqlite3TreeViewPop(&pView);
++    if( pWin->eFrmType==TK_FILTER ) return;
+   }
+   sqlite3TreeViewPush(&pView, more);
+   if( pWin->zName ){
+@@ -31443,7 +32823,7 @@ SQLITE_PRIVATE void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u
+   }
+   if( pWin->zBase )    nElement++;
+   if( pWin->pOrderBy ) nElement++;
+-  if( pWin->eFrmType ) nElement++;
++  if( pWin->eFrmType!=0 && pWin->eFrmType!=TK_FILTER ) nElement++;
+   if( pWin->eExclude ) nElement++;
+   if( pWin->zBase ){
+     sqlite3TreeViewPush(&pView, (--nElement)>0);
+@@ -31456,7 +32836,7 @@ SQLITE_PRIVATE void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u
+   if( pWin->pOrderBy ){
+     sqlite3TreeViewExprList(pView, pWin->pOrderBy, (--nElement)>0, "ORDER-BY");
+   }
+-  if( pWin->eFrmType ){
++  if( pWin->eFrmType!=0 && pWin->eFrmType!=TK_FILTER ){
+     char zBuf[30];
+     const char *zFrmType = "ROWS";
+     if( pWin->eFrmType==TK_RANGE ) zFrmType = "RANGE";
+@@ -31516,7 +32896,7 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+     sqlite3TreeViewPop(&pView);
+     return;
+   }
+-  if( pExpr->flags || pExpr->affExpr || pExpr->vvaFlags ){
++  if( pExpr->flags || pExpr->affExpr || pExpr->vvaFlags || pExpr->pAggInfo ){
+     StrAccum x;
+     sqlite3StrAccumInit(&x, 0, zFlgs, sizeof(zFlgs), 0);
+     sqlite3_str_appendf(&x, " fg.af=%x.%c",
+@@ -31533,6 +32913,9 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+     if( ExprHasVVAProperty(pExpr, EP_Immutable) ){
+       sqlite3_str_appendf(&x, " IMMUTABLE");
+     }
++    if( pExpr->pAggInfo!=0 ){
++      sqlite3_str_appendf(&x, " agg-column[%d]", pExpr->iAgg);
++    }
+     sqlite3StrAccumFinish(&x);
+   }else{
+     zFlgs[0] = 0;
+@@ -31662,7 +33045,8 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+       };
+       assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT );
+       assert( pExpr->pRight );
+-      assert( sqlite3ExprSkipCollate(pExpr->pRight)->op==TK_TRUEFALSE );
++      assert( sqlite3ExprSkipCollateAndLikely(pExpr->pRight)->op
++                  == TK_TRUEFALSE );
+       x = (pExpr->op2==TK_ISNOT)*2 + sqlite3ExprTruthValue(pExpr->pRight);
+       zUniOp = azOp[x];
+       break;
+@@ -31700,7 +33084,7 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+         assert( ExprUseXList(pExpr) );
+         pFarg = pExpr->x.pList;
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+-        pWin = ExprHasProperty(pExpr, EP_WinFunc) ? pExpr->y.pWin : 0;
++        pWin = IsWindowFunc(pExpr) ? pExpr->y.pWin : 0;
+ #else
+         pWin = 0;
+ #endif
+@@ -31726,7 +33110,13 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+         sqlite3TreeViewLine(pView, "FUNCTION %Q%s", pExpr->u.zToken, zFlgs);
+       }
+       if( pFarg ){
+-        sqlite3TreeViewExprList(pView, pFarg, pWin!=0, 0);
++        sqlite3TreeViewExprList(pView, pFarg, pWin!=0 || pExpr->pLeft, 0);
++        if( pExpr->pLeft ){
++          Expr *pOB = pExpr->pLeft;
++          assert( pOB->op==TK_ORDER );
++          assert( ExprUseXList(pOB) );
++          sqlite3TreeViewExprList(pView, pOB->x.pList, pWin!=0, "ORDERBY");
++        }
+       }
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+       if( pWin ){
+@@ -31735,6 +33125,10 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+ #endif
+       break;
+     }
++    case TK_ORDER: {
++      sqlite3TreeViewExprList(pView, pExpr->x.pList, 0, "ORDERBY");
++      break;
++    }
+ #ifndef SQLITE_OMIT_SUBQUERY
+     case TK_EXISTS: {
+       assert( ExprUseXSelect(pExpr) );
+@@ -31788,7 +33182,7 @@ SQLITE_PRIVATE void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 m
+       assert( pExpr->x.pList->nExpr==2 );
+       pY = pExpr->x.pList->a[0].pExpr;
+       pZ = pExpr->x.pList->a[1].pExpr;
+-      sqlite3TreeViewLine(pView, "BETWEEN");
++      sqlite3TreeViewLine(pView, "BETWEEN%s", zFlgs);
+       sqlite3TreeViewExpr(pView, pX, 1);
+       sqlite3TreeViewExpr(pView, pY, 1);
+       sqlite3TreeViewExpr(pView, pZ, 0);
+@@ -32344,16 +33738,41 @@ SQLITE_PRIVATE void sqlite3ShowWinFunc(const Window *p){ sqlite3TreeViewWinFunc(
+ ** This structure is the current state of the generator.
+ */
+ static SQLITE_WSD struct sqlite3PrngType {
+-  unsigned char isInit;          /* True if initialized */
+-  unsigned char i, j;            /* State variables */
+-  unsigned char s[256];          /* State variables */
++  u32 s[16];                 /* 64 bytes of chacha20 state */
++  u8 out[64];                /* Output bytes */
++  u8 n;                      /* Output bytes remaining */
+ } sqlite3Prng;
+ 
++
++/* The RFC-7539 ChaCha20 block function
++*/
++#define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
++#define QR(a, b, c, d) ( \
++    a += b, d ^= a, d = ROTL(d,16), \
++    c += d, b ^= c, b = ROTL(b,12), \
++    a += b, d ^= a, d = ROTL(d, 8), \
++    c += d, b ^= c, b = ROTL(b, 7))
++static void chacha_block(u32 *out, const u32 *in){
++  int i;
++  u32 x[16];
++  memcpy(x, in, 64);
++  for(i=0; i<10; i++){
++    QR(x[0], x[4], x[ 8], x[12]);
++    QR(x[1], x[5], x[ 9], x[13]);
++    QR(x[2], x[6], x[10], x[14]);
++    QR(x[3], x[7], x[11], x[15]);
++    QR(x[0], x[5], x[10], x[15]);
++    QR(x[1], x[6], x[11], x[12]);
++    QR(x[2], x[7], x[ 8], x[13]);
++    QR(x[3], x[4], x[ 9], x[14]);
++  }
++  for(i=0; i<16; i++) out[i] = x[i]+in[i];
++}
++
+ /*
+ ** Return N random bytes.
+ */
+ SQLITE_API void sqlite3_randomness(int N, void *pBuf){
+-  unsigned char t;
+   unsigned char *zBuf = pBuf;
+ 
+   /* The "wsdPrng" macro will resolve to the pseudo-random number generator
+@@ -32383,53 +33802,46 @@ SQLITE_API void sqlite3_randomness(int N, void *pBuf){
+ 
+   sqlite3_mutex_enter(mutex);
+   if( N<=0 || pBuf==0 ){
+-    wsdPrng.isInit = 0;
++    wsdPrng.s[0] = 0;
+     sqlite3_mutex_leave(mutex);
+     return;
+   }
+ 
+   /* Initialize the state of the random number generator once,
+-  ** the first time this routine is called.  The seed value does
+-  ** not need to contain a lot of randomness since we are not
+-  ** trying to do secure encryption or anything like that...
+-  **
+-  ** Nothing in this file or anywhere else in SQLite does any kind of
+-  ** encryption.  The RC4 algorithm is being used as a PRNG (pseudo-random
+-  ** number generator) not as an encryption device.
++  ** the first time this routine is called.
+   */
+-  if( !wsdPrng.isInit ){
++  if( wsdPrng.s[0]==0 ){
+     sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
+-    int i;
+-    char k[256];
+-    wsdPrng.j = 0;
+-    wsdPrng.i = 0;
++    static const u32 chacha20_init[] = {
++      0x61707865, 0x3320646e, 0x79622d32, 0x6b206574
++    };
++    memcpy(&wsdPrng.s[0], chacha20_init, 16);
+     if( NEVER(pVfs==0) ){
+-      memset(k, 0, sizeof(k));
++      memset(&wsdPrng.s[4], 0, 44);
+     }else{
+-      sqlite3OsRandomness(pVfs, 256, k);
+-    }
+-    for(i=0; i<256; i++){
+-      wsdPrng.s[i] = (u8)i;
++      sqlite3OsRandomness(pVfs, 44, (char*)&wsdPrng.s[4]);
+     }
+-    for(i=0; i<256; i++){
+-      wsdPrng.j += wsdPrng.s[i] + k[i];
+-      t = wsdPrng.s[wsdPrng.j];
+-      wsdPrng.s[wsdPrng.j] = wsdPrng.s[i];
+-      wsdPrng.s[i] = t;
+-    }
+-    wsdPrng.isInit = 1;
++    wsdPrng.s[15] = wsdPrng.s[12];
++    wsdPrng.s[12] = 0;
++    wsdPrng.n = 0;
+   }
+ 
+   assert( N>0 );
+-  do{
+-    wsdPrng.i++;
+-    t = wsdPrng.s[wsdPrng.i];
+-    wsdPrng.j += t;
+-    wsdPrng.s[wsdPrng.i] = wsdPrng.s[wsdPrng.j];
+-    wsdPrng.s[wsdPrng.j] = t;
+-    t += wsdPrng.s[wsdPrng.i];
+-    *(zBuf++) = wsdPrng.s[t];
+-  }while( --N );
++  while( 1 /* exit by break */ ){
++    if( N<=wsdPrng.n ){
++      memcpy(zBuf, &wsdPrng.out[wsdPrng.n-N], N);
++      wsdPrng.n -= N;
++      break;
++    }
++    if( wsdPrng.n>0 ){
++      memcpy(zBuf, wsdPrng.out, wsdPrng.n);
++      N -= wsdPrng.n;
++      zBuf += wsdPrng.n;
++    }
++    wsdPrng.s[12]++;
++    chacha_block((u32*)wsdPrng.out, wsdPrng.s);
++    wsdPrng.n = 64;
++  }
+   sqlite3_mutex_leave(mutex);
+ }
+ 
+@@ -32905,7 +34317,38 @@ SQLITE_PRIVATE u32 sqlite3Utf8Read(
+   return c;
+ }
+ 
+-
++/*
++** Read a single UTF8 character out of buffer z[], but reading no
++** more than n characters from the buffer.  z[] is not zero-terminated.
++**
++** Return the number of bytes used to construct the character.
++**
++** Invalid UTF8 might generate a strange result.  No effort is made
++** to detect invalid UTF8.
++**
++** At most 4 bytes will be read out of z[].  The return value will always
++** be between 1 and 4.
++*/
++SQLITE_PRIVATE int sqlite3Utf8ReadLimited(
++  const u8 *z,
++  int n,
++  u32 *piOut
++){
++  u32 c;
++  int i = 1;
++  assert( n>0 );
++  c = z[0];
++  if( c>=0xc0 ){
++    c = sqlite3Utf8Trans1[c-0xc0];
++    if( n>4 ) n = 4;
++    while( inDb; ii++){
++      if( db->aDb[ii].pBt ){
++        iErr = sqlite3PagerWalSystemErrno(sqlite3BtreePager(db->aDb[ii].pBt));
++        if( iErr ){
++          db->iSysErrno = iErr;
++        }
++      }
++    }
++    sqlite3BtreeLeaveAll(db);
++    return;
++  }
++#endif
+   rc &= 0xff;
+   if( rc==SQLITE_CANTOPEN || rc==SQLITE_IOERR ){
+     db->iSysErrno = sqlite3OsGetLastError(db->pVfs);
+@@ -33454,6 +34914,30 @@ SQLITE_PRIVATE void sqlite3ErrorWithMsg(sqlite3 *db, int err_code, const char *z
+   }
+ }
+ 
++/*
++** Check for interrupts and invoke progress callback.
++*/
++SQLITE_PRIVATE void sqlite3ProgressCheck(Parse *p){
++  sqlite3 *db = p->db;
++  if( AtomicLoad(&db->u1.isInterrupted) ){
++    p->nErr++;
++    p->rc = SQLITE_INTERRUPT;
++  }
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++  if( db->xProgress ){
++    if( p->rc==SQLITE_INTERRUPT ){
++      p->nProgressSteps = 0;
++    }else if( (++p->nProgressSteps)>=db->nProgressOps ){
++      if( db->xProgress(db->pProgressArg) ){
++        p->nErr++;
++        p->rc = SQLITE_INTERRUPT;
++      }
++      p->nProgressSteps = 0;
++    }
++  }
++#endif
++}
++
+ /*
+ ** Add an error message to pParse->zErrMsg and increment pParse->nErr.
+ **
+@@ -33645,43 +35129,40 @@ SQLITE_PRIVATE u8 sqlite3StrIHash(const char *z){
+   return h;
+ }
+ 
+-/*
+-** Compute 10 to the E-th power.  Examples:  E==1 results in 10.
+-** E==2 results in 100.  E==50 results in 1.0e50.
++/* Double-Double multiplication.  (x[0],x[1]) *= (y,yy)
+ **
+-** This routine only works for values of E between 1 and 341.
++** Reference:
++**   T. J. Dekker, "A Floating-Point Technique for Extending the
++**   Available Precision".  1971-07-26.
+ */
+-static LONGDOUBLE_TYPE sqlite3Pow10(int E){
+-#if defined(_MSC_VER)
+-  static const LONGDOUBLE_TYPE x[] = {
+-    1.0e+001L,
+-    1.0e+002L,
+-    1.0e+004L,
+-    1.0e+008L,
+-    1.0e+016L,
+-    1.0e+032L,
+-    1.0e+064L,
+-    1.0e+128L,
+-    1.0e+256L
+-  };
+-  LONGDOUBLE_TYPE r = 1.0;
+-  int i;
+-  assert( E>=0 && E<=307 );
+-  for(i=0; E!=0; i++, E >>=1){
+-    if( E & 1 ) r *= x[i];
+-  }
+-  return r;
+-#else
+-  LONGDOUBLE_TYPE x = 10.0;
+-  LONGDOUBLE_TYPE r = 1.0;
+-  while(1){
+-    if( E & 1 ) r *= x;
+-    E >>= 1;
+-    if( E==0 ) break;
+-    x *= x;
+-  }
+-  return r;
+-#endif
++static void dekkerMul2(volatile double *x, double y, double yy){
++  /*
++  ** The "volatile" keywords on parameter x[] and on local variables
++  ** below are needed force intermediate results to be truncated to
++  ** binary64 rather than be carried around in an extended-precision
++  ** format.  The truncation is necessary for the Dekker algorithm to
++  ** work.  Intel x86 floating point might omit the truncation without
++  ** the use of volatile.
++  */
++  volatile double tx, ty, p, q, c, cc;
++  double hx, hy;
++  u64 m;
++  memcpy(&m, (void*)&x[0], 8);
++  m &= 0xfffffffffc000000LL;
++  memcpy(&hx, &m, 8);
++  tx = x[0] - hx;
++  memcpy(&m, &y, 8);
++  m &= 0xfffffffffc000000LL;
++  memcpy(&hy, &m, 8);
++  ty = y - hy;
++  p = hx*hy;
++  q = hx*ty + tx*hy;
++  c = p+q;
++  cc = p - c + q + tx*ty;
++  cc = x[0]*yy + x[1]*y + cc;
++  x[0] = c + cc;
++  x[1] = c - x[0];
++  x[1] += cc;
+ }
+ 
+ /*
+@@ -33722,12 +35203,11 @@ SQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult, int length, u8 en
+   const char *zEnd;
+   /* sign * significand * (10 ^ (esign * exponent)) */
+   int sign = 1;    /* sign of significand */
+-  i64 s = 0;       /* significand */
++  u64 s = 0;       /* significand */
+   int d = 0;       /* adjust exponent for shifting decimal point */
+   int esign = 1;   /* sign of exponent */
+   int e = 0;       /* exponent */
+   int eValid = 1;  /* True exponent is either not used or is well-formed */
+-  double result;
+   int nDigit = 0;  /* Number of digits processed */
+   int eType = 1;   /* 1: pure integer,  2+: fractional  -1 or less: bad UTF16 */
+ 
+@@ -33767,7 +35247,7 @@ SQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult, int length, u8 en
+   while( z=((LARGEST_INT64-9)/10) ){
++    if( s>=((LARGEST_UINT64-9)/10) ){
+       /* skip non-significant significand digits
+       ** (increase exponent by d to shift decimal left) */
+       while( z0 ){                                       /*OPTIMIZATION-IF-TRUE*/
+-      if( esign>0 ){
+-        if( s>=(LARGEST_INT64/10) ) break;             /*OPTIMIZATION-IF-FALSE*/
+-        s *= 10;
+-      }else{
+-        if( s%10!=0 ) break;                           /*OPTIMIZATION-IF-FALSE*/
+-        s /= 10;
+-      }
+-      e--;
+-    }
++  /* adjust exponent by d, and update sign */
++  e = (e*esign) + d;
+ 
+-    /* adjust the sign of significand */
+-    s = sign<0 ? -s : s;
++  /* Try to adjust the exponent to make it smaller */
++  while( e>0 && s<(LARGEST_UINT64/10) ){
++    s *= 10;
++    e--;
++  }
++  while( e<0 && (s%10)==0 ){
++    s /= 10;
++    e++;
++  }
+ 
+-    if( e==0 ){                                         /*OPTIMIZATION-IF-TRUE*/
+-      result = (double)s;
++  if( e==0 ){
++    *pResult = s;
++  }else if( sqlite3Config.bUseLongDouble ){
++    LONGDOUBLE_TYPE r = (LONGDOUBLE_TYPE)s;
++    if( e>0 ){
++      while( e>=100  ){ e-=100; r *= 1.0e+100L; }
++      while( e>=10   ){ e-=10;  r *= 1.0e+10L;  }
++      while( e>=1    ){ e-=1;   r *= 1.0e+01L;  }
+     }else{
+-      /* attempt to handle extremely small/large numbers better */
+-      if( e>307 ){                                      /*OPTIMIZATION-IF-TRUE*/
+-        if( e<342 ){                                    /*OPTIMIZATION-IF-TRUE*/
+-          LONGDOUBLE_TYPE scale = sqlite3Pow10(e-308);
+-          if( esign<0 ){
+-            result = s / scale;
+-            result /= 1.0e+308;
+-          }else{
+-            result = s * scale;
+-            result *= 1.0e+308;
+-          }
+-        }else{ assert( e>=342 );
+-          if( esign<0 ){
+-            result = 0.0*s;
+-          }else{
++      while( e<=-100 ){ e+=100; r *= 1.0e-100L; }
++      while( e<=-10  ){ e+=10;  r *= 1.0e-10L;  }
++      while( e<=-1   ){ e+=1;   r *= 1.0e-01L;  }
++    }
++    assert( r>=0.0 );
++    if( r>+1.7976931348623157081452742373e+308L ){
+ #ifdef INFINITY
+-            result = INFINITY*s;
++      *pResult = +INFINITY;
+ #else
+-            result = 1e308*1e308*s;  /* Infinity */
++      *pResult = 1.0e308*10.0;
+ #endif
+-          }
+-        }
+-      }else{
+-        LONGDOUBLE_TYPE scale = sqlite3Pow10(e);
+-        if( esign<0 ){
+-          result = s / scale;
+-        }else{
+-          result = s * scale;
+-        }
++    }else{
++      *pResult = (double)r;
++    }
++  }else{
++    double rr[2];
++    u64 s2;
++    rr[0] = (double)s;
++    s2 = (u64)rr[0];
++    rr[1] = s>=s2 ? (double)(s - s2) : -(double)(s2 - s);
++    if( e>0 ){
++      while( e>=100  ){
++        e -= 100;
++        dekkerMul2(rr, 1.0e+100, -1.5902891109759918046e+83);
++      }
++      while( e>=10   ){
++        e -= 10;
++        dekkerMul2(rr, 1.0e+10, 0.0);
++      }
++      while( e>=1    ){
++        e -= 1;
++        dekkerMul2(rr, 1.0e+01, 0.0);
++      }
++    }else{
++      while( e<=-100 ){
++        e += 100;
++        dekkerMul2(rr, 1.0e-100, -1.99918998026028836196e-117);
++      }
++      while( e<=-10  ){
++        e += 10;
++        dekkerMul2(rr, 1.0e-10, -3.6432197315497741579e-27);
++      }
++      while( e<=-1   ){
++        e += 1;
++        dekkerMul2(rr, 1.0e-01, -5.5511151231257827021e-18);
+       }
+     }
++    *pResult = rr[0]+rr[1];
++    if( sqlite3IsNaN(*pResult) ) *pResult = 1e300*1e300;
+   }
++  if( sign<0 ) *pResult = -*pResult;
++  assert( !sqlite3IsNaN(*pResult) );
+ 
+-  /* store the result */
+-  *pResult = result;
+-
+-  /* return true if number and no extra non-whitespace chracters after */
++atof_return:
++  /* return true if number and no extra non-whitespace characters after */
+   if( z==zEnd && nDigit>0 && eValid && eType>0 ){
+     return eType;
+   }else if( eType>=2 && (eType==3 || eValid) && nDigit>0 ){
+@@ -33911,11 +35401,14 @@ do_atof_calc:
+ #endif
+ 
+ /*
+-** Render an signed 64-bit integer as text.  Store the result in zOut[].
++** Render an signed 64-bit integer as text.  Store the result in zOut[] and
++** return the length of the string that was stored, in bytes.  The value
++** returned does not include the zero terminator at the end of the output
++** string.
+ **
+ ** The caller must ensure that zOut[] is at least 21 bytes in size.
+ */
+-SQLITE_PRIVATE void sqlite3Int64ToText(i64 v, char *zOut){
++SQLITE_PRIVATE int sqlite3Int64ToText(i64 v, char *zOut){
+   int i;
+   u64 x;
+   char zTemp[22];
+@@ -33926,12 +35419,15 @@ SQLITE_PRIVATE void sqlite3Int64ToText(i64 v, char *zOut){
+   }
+   i = sizeof(zTemp)-2;
+   zTemp[sizeof(zTemp)-1] = 0;
+-  do{
+-    zTemp[i--] = (x%10) + '0';
++  while( 1 /*exit-by-break*/ ){
++    zTemp[i] = (x%10) + '0';
+     x = x/10;
+-  }while( x );
+-  if( v<0 ) zTemp[i--] = '-';
+-  memcpy(zOut, &zTemp[i+1], sizeof(zTemp)-1-i);
++    if( x==0 ) break;
++    i--;
++  };
++  if( v<0 ) zTemp[--i] = '-';
++  memcpy(zOut, &zTemp[i], sizeof(zTemp)-i);
++  return sizeof(zTemp)-1-i;
+ }
+ 
+ /*
+@@ -34024,7 +35520,7 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
+     /* This test and assignment is needed only to suppress UB warnings
+     ** from clang and -fsanitize=undefined.  This test and assignment make
+     ** the code a little larger and slower, and no harm comes from omitting
+-    ** them, but we must appaise the undefined-behavior pharisees. */
++    ** them, but we must appease the undefined-behavior pharisees. */
+     *pNum = neg ? SMALLEST_INT64 : LARGEST_INT64;
+   }else if( neg ){
+     *pNum = -(i64)u;
+@@ -34096,11 +35592,15 @@ SQLITE_PRIVATE int sqlite3DecOrHexToI64(const char *z, i64 *pOut){
+       u = u*16 + sqlite3HexToInt(z[k]);
+     }
+     memcpy(pOut, &u, 8);
+-    return (z[k]==0 && k-i<=16) ? 0 : 2;
++    if( k-i>16 ) return 2;
++    if( z[k]!=0 ) return 1;
++    return 0;
+   }else
+ #endif /* SQLITE_OMIT_HEX_INTEGER */
+   {
+-    return sqlite3Atoi64(z, pOut, sqlite3Strlen30(z), SQLITE_UTF8);
++    int n = (int)(0x3fffffff&strspn(z,"+- \n\t0123456789"));
++    if( z[n] ) n++;
++    return sqlite3Atoi64(z, pOut, n, SQLITE_UTF8);
+   }
+ }
+ 
+@@ -34132,7 +35632,7 @@ SQLITE_PRIVATE int sqlite3GetInt32(const char *zNum, int *pValue){
+     u32 u = 0;
+     zNum += 2;
+     while( zNum[0]=='0' ) zNum++;
+-    for(i=0; sqlite3Isxdigit(zNum[i]) && i<8; i++){
++    for(i=0; i<8 && sqlite3Isxdigit(zNum[i]); i++){
+       u = u*16 + sqlite3HexToInt(zNum[i]);
+     }
+     if( (u&0x80000000)==0 && sqlite3Isxdigit(zNum[i])==0 ){
+@@ -34179,6 +35679,153 @@ SQLITE_PRIVATE int sqlite3Atoi(const char *z){
+   return x;
+ }
+ 
++/*
++** Decode a floating-point value into an approximate decimal
++** representation.
++**
++** Round the decimal representation to n significant digits if
++** n is positive.  Or round to -n signficant digits after the
++** decimal point if n is negative.  No rounding is performed if
++** n is zero.
++**
++** The significant digits of the decimal representation are
++** stored in p->z[] which is a often (but not always) a pointer
++** into the middle of p->zBuf[].  There are p->n significant digits.
++** The p->z[] array is *not* zero-terminated.
++*/
++SQLITE_PRIVATE void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){
++  int i;
++  u64 v;
++  int e, exp = 0;
++  p->isSpecial = 0;
++  p->z = p->zBuf;
++
++  /* Convert negative numbers to positive.  Deal with Infinity, 0.0, and
++  ** NaN. */
++  if( r<0.0 ){
++    p->sign = '-';
++    r = -r;
++  }else if( r==0.0 ){
++    p->sign = '+';
++    p->n = 1;
++    p->iDP = 1;
++    p->z = "0";
++    return;
++  }else{
++    p->sign = '+';
++  }
++  memcpy(&v,&r,8);
++  e = v>>52;
++  if( (e&0x7ff)==0x7ff ){
++    p->isSpecial = 1 + (v!=0x7ff0000000000000LL);
++    p->n = 0;
++    p->iDP = 0;
++    return;
++  }
++
++  /* Multiply r by powers of ten until it lands somewhere in between
++  ** 1.0e+19 and 1.0e+17.
++  */
++  if( sqlite3Config.bUseLongDouble ){
++    LONGDOUBLE_TYPE rr = r;
++    if( rr>=1.0e+19 ){
++      while( rr>=1.0e+119L ){ exp+=100; rr *= 1.0e-100L; }
++      while( rr>=1.0e+29L  ){ exp+=10;  rr *= 1.0e-10L;  }
++      while( rr>=1.0e+19L  ){ exp++;    rr *= 1.0e-1L;   }
++    }else{
++      while( rr<1.0e-97L   ){ exp-=100; rr *= 1.0e+100L; }
++      while( rr<1.0e+07L   ){ exp-=10;  rr *= 1.0e+10L;  }
++      while( rr<1.0e+17L   ){ exp--;    rr *= 1.0e+1L;   }
++    }
++    v = (u64)rr;
++  }else{
++    /* If high-precision floating point is not available using "long double",
++    ** then use Dekker-style double-double computation to increase the
++    ** precision.
++    **
++    ** The error terms on constants like 1.0e+100 computed using the
++    ** decimal extension, for example as follows:
++    **
++    **   SELECT decimal_exp(decimal_sub('1.0e+100',decimal(1.0e+100)));
++    */
++    double rr[2];
++    rr[0] = r;
++    rr[1] = 0.0;
++    if( rr[0]>9.223372036854774784e+18 ){
++      while( rr[0]>9.223372036854774784e+118 ){
++        exp += 100;
++        dekkerMul2(rr, 1.0e-100, -1.99918998026028836196e-117);
++      }
++      while( rr[0]>9.223372036854774784e+28 ){
++        exp += 10;
++        dekkerMul2(rr, 1.0e-10, -3.6432197315497741579e-27);
++      }
++      while( rr[0]>9.223372036854774784e+18 ){
++        exp += 1;
++        dekkerMul2(rr, 1.0e-01, -5.5511151231257827021e-18);
++      }
++    }else{
++      while( rr[0]<9.223372036854774784e-83  ){
++        exp -= 100;
++        dekkerMul2(rr, 1.0e+100, -1.5902891109759918046e+83);
++      }
++      while( rr[0]<9.223372036854774784e+07  ){
++        exp -= 10;
++        dekkerMul2(rr, 1.0e+10, 0.0);
++      }
++      while( rr[0]<9.22337203685477478e+17  ){
++        exp -= 1;
++        dekkerMul2(rr, 1.0e+01, 0.0);
++      }
++    }
++    v = rr[1]<0.0 ? (u64)rr[0]-(u64)(-rr[1]) : (u64)rr[0]+(u64)rr[1];
++  }
++
++
++  /* Extract significant digits. */
++  i = sizeof(p->zBuf)-1;
++  assert( v>0 );
++  while( v ){  p->zBuf[i--] = (v%10) + '0'; v /= 10; }
++  assert( i>=0 && izBuf)-1 );
++  p->n = sizeof(p->zBuf) - 1 - i;
++  assert( p->n>0 );
++  assert( p->nzBuf) );
++  p->iDP = p->n + exp;
++  if( iRound<0 ){
++    iRound = p->iDP - iRound;
++    if( iRound==0 && p->zBuf[i+1]>='5' ){
++      iRound = 1;
++      p->zBuf[i--] = '0';
++      p->n++;
++      p->iDP++;
++    }
++  }
++  if( iRound>0 && (iRoundn || p->n>mxRound) ){
++    char *z = &p->zBuf[i+1];
++    if( iRound>mxRound ) iRound = mxRound;
++    p->n = iRound;
++    if( z[iRound]>='5' ){
++      int j = iRound-1;
++      while( 1 /*exit-by-break*/ ){
++        z[j]++;
++        if( z[j]<='9' ) break;
++        z[j] = '0';
++        if( j==0 ){
++          p->z[i--] = '1';
++          p->n++;
++          p->iDP++;
++          break;
++        }else{
++          j--;
++        }
++      }
++    }
++  }
++  p->z = &p->zBuf[i+1];
++  assert( i+p->n < sizeof(p->zBuf) );
++  while( ALWAYS(p->n>0) && p->z[p->n-1]=='0' ){ p->n--; }
++}
++
+ /*
+ ** Try to convert z into an unsigned 32-bit integer.  Return true on
+ ** success and false if there is an error.
+@@ -34442,121 +36089,32 @@ SQLITE_PRIVATE u8 sqlite3GetVarint(const unsigned char *p, u64 *v){
+ ** this function assumes the single-byte case has already been handled.
+ */
+ SQLITE_PRIVATE u8 sqlite3GetVarint32(const unsigned char *p, u32 *v){
+-  u32 a,b;
++  u64 v64;
++  u8 n;
+ 
+-  /* The 1-byte case.  Overwhelmingly the most common.  Handled inline
+-  ** by the getVarin32() macro */
+-  a = *p;
+-  /* a: p0 (unmasked) */
+-#ifndef getVarint32
+-  if (!(a&0x80))
+-  {
+-    /* Values between 0 and 127 */
+-    *v = a;
+-    return 1;
+-  }
+-#endif
++  /* Assume that the single-byte case has already been handled by
++  ** the getVarint32() macro */
++  assert( (p[0] & 0x80)!=0 );
+ 
+-  /* The 2-byte case */
+-  p++;
+-  b = *p;
+-  /* b: p1 (unmasked) */
+-  if (!(b&0x80))
+-  {
+-    /* Values between 128 and 16383 */
+-    a &= 0x7f;
+-    a = a<<7;
+-    *v = a | b;
++  if( (p[1] & 0x80)==0 ){
++    /* This is the two-byte case */
++    *v = ((p[0]&0x7f)<<7) | p[1];
+     return 2;
+   }
+-
+-  /* The 3-byte case */
+-  p++;
+-  a = a<<14;
+-  a |= *p;
+-  /* a: p0<<14 | p2 (unmasked) */
+-  if (!(a&0x80))
+-  {
+-    /* Values between 16384 and 2097151 */
+-    a &= (0x7f<<14)|(0x7f);
+-    b &= 0x7f;
+-    b = b<<7;
+-    *v = a | b;
++  if( (p[2] & 0x80)==0 ){
++    /* This is the three-byte case */
++    *v = ((p[0]&0x7f)<<14) | ((p[1]&0x7f)<<7) | p[2];
+     return 3;
+   }
+-
+-  /* A 32-bit varint is used to store size information in btrees.
+-  ** Objects are rarely larger than 2MiB limit of a 3-byte varint.
+-  ** A 3-byte varint is sufficient, for example, to record the size
+-  ** of a 1048569-byte BLOB or string.
+-  **
+-  ** We only unroll the first 1-, 2-, and 3- byte cases.  The very
+-  ** rare larger cases can be handled by the slower 64-bit varint
+-  ** routine.
+-  */
+-#if 1
+-  {
+-    u64 v64;
+-    u8 n;
+-
+-    n = sqlite3GetVarint(p-2, &v64);
+-    assert( n>3 && n<=9 );
+-    if( (v64 & SQLITE_MAX_U32)!=v64 ){
+-      *v = 0xffffffff;
+-    }else{
+-      *v = (u32)v64;
+-    }
+-    return n;
+-  }
+-
+-#else
+-  /* For following code (kept for historical record only) shows an
+-  ** unrolling for the 3- and 4-byte varint cases.  This code is
+-  ** slightly faster, but it is also larger and much harder to test.
+-  */
+-  p++;
+-  b = b<<14;
+-  b |= *p;
+-  /* b: p1<<14 | p3 (unmasked) */
+-  if (!(b&0x80))
+-  {
+-    /* Values between 2097152 and 268435455 */
+-    b &= (0x7f<<14)|(0x7f);
+-    a &= (0x7f<<14)|(0x7f);
+-    a = a<<7;
+-    *v = a | b;
+-    return 4;
+-  }
+-
+-  p++;
+-  a = a<<14;
+-  a |= *p;
+-  /* a: p0<<28 | p2<<14 | p4 (unmasked) */
+-  if (!(a&0x80))
+-  {
+-    /* Values  between 268435456 and 34359738367 */
+-    a &= SLOT_4_2_0;
+-    b &= SLOT_4_2_0;
+-    b = b<<7;
+-    *v = a | b;
+-    return 5;
+-  }
+-
+-  /* We can only reach this point when reading a corrupt database
+-  ** file.  In that case we are not in any hurry.  Use the (relatively
+-  ** slow) general-purpose sqlite3GetVarint() routine to extract the
+-  ** value. */
+-  {
+-    u64 v64;
+-    u8 n;
+-
+-    p -= 4;
+-    n = sqlite3GetVarint(p, &v64);
+-    assert( n>5 && n<=9 );
++  /* four or more bytes */
++  n = sqlite3GetVarint(p, &v64);
++  assert( n>3 && n<=9 );
++  if( (v64 & SQLITE_MAX_U32)!=v64 ){
++    *v = 0xffffffff;
++  }else{
+     *v = (u32)v64;
+-    return n;
+   }
+-#endif
++  return n;
+ }
+ 
+ /*
+@@ -34707,7 +36265,7 @@ SQLITE_PRIVATE int sqlite3SafetyCheckSickOrOk(sqlite3 *db){
+ }
+ 
+ /*
+-** Attempt to add, substract, or multiply the 64-bit signed value iB against
++** Attempt to add, subtract, or multiply the 64-bit signed value iB against
+ ** the other 64-bit signed integer at *pA and store the result in *pA.
+ ** Return 0 on success.  Or if the operation would have resulted in an
+ ** overflow, leave *pA unchanged and return 1.
+@@ -34993,6 +36551,104 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam
+   return 0;
+ }
+ 
++/*
++** High-resolution hardware timer used for debugging and testing only.
++*/
++#if defined(VDBE_PROFILE)  \
++ || defined(SQLITE_PERFORMANCE_TRACE) \
++ || defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++/************** Include hwtime.h in the middle of util.c *********************/
++/************** Begin file hwtime.h ******************************************/
++/*
++** 2008 May 27
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains inline asm code for retrieving "high-performance"
++** counters for x86 and x86_64 class CPUs.
++*/
++#ifndef SQLITE_HWTIME_H
++#define SQLITE_HWTIME_H
++
++/*
++** The following routine only works on Pentium-class (or newer) processors.
++** It uses the RDTSC opcode to read the cycle count value out of the
++** processor and returns that value.  This can be used for high-res
++** profiling.
++*/
++#if !defined(__STRICT_ANSI__) && \
++    (defined(__GNUC__) || defined(_MSC_VER)) && \
++    (defined(i386) || defined(__i386__) || defined(_M_IX86))
++
++  #if defined(__GNUC__)
++
++  __inline__ sqlite_uint64 sqlite3Hwtime(void){
++     unsigned int lo, hi;
++     __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
++     return (sqlite_uint64)hi << 32 | lo;
++  }
++
++  #elif defined(_MSC_VER)
++
++  __declspec(naked) __inline sqlite_uint64 __cdecl sqlite3Hwtime(void){
++     __asm {
++        rdtsc
++        ret       ; return value at EDX:EAX
++     }
++  }
++
++  #endif
++
++#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__x86_64__))
++
++  __inline__ sqlite_uint64 sqlite3Hwtime(void){
++     unsigned int lo, hi;
++     __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
++     return (sqlite_uint64)hi << 32 | lo;
++  }
++
++#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__))
++
++  __inline__ sqlite_uint64 sqlite3Hwtime(void){
++      unsigned long long retval;
++      unsigned long junk;
++      __asm__ __volatile__ ("\n\
++          1:      mftbu   %1\n\
++                  mftb    %L0\n\
++                  mftbu   %0\n\
++                  cmpw    %0,%1\n\
++                  bne     1b"
++                  : "=r" (retval), "=r" (junk));
++      return retval;
++  }
++
++#else
++
++  /*
++  ** asm() is needed for hardware timing support.  Without asm(),
++  ** disable the sqlite3Hwtime() routine.
++  **
++  ** sqlite3Hwtime() is only used for some obscure debugging
++  ** and analysis configurations, not in any deliverable, so this
++  ** should not be a great loss.
++  */
++SQLITE_PRIVATE   sqlite_uint64 sqlite3Hwtime(void){ return ((sqlite_uint64)0); }
++
++#endif
++
++#endif /* !defined(SQLITE_HWTIME_H) */
++
++/************** End of hwtime.h **********************************************/
++/************** Continuing where we left off in util.c ***********************/
++#endif
++
+ /************** End of util.c ************************************************/
+ /************** Begin file hash.c ********************************************/
+ /*
+@@ -35094,7 +36750,7 @@ static void insertElement(
+ }
+ 
+ 
+-/* Resize the hash table so that it cantains "new_size" buckets.
++/* Resize the hash table so that it contains "new_size" buckets.
+ **
+ ** The hash table might fail to resize if sqlite3_malloc() fails or
+ ** if the new size is the same as the prior size.
+@@ -35163,12 +36819,13 @@ static HashElem *findElementWithHash(
+     count = pH->count;
+   }
+   if( pHash ) *pHash = h;
+-  while( count-- ){
++  while( count ){
+     assert( elem!=0 );
+     if( sqlite3StrICmp(elem->pKey,pKey)==0 ){
+       return elem;
+     }
+     elem = elem->next;
++    count--;
+   }
+   return &nullElement;
+ }
+@@ -35287,48 +36944,48 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+     /*   5 */ "Vacuum"           OpHelp(""),
+     /*   6 */ "VFilter"          OpHelp("iplan=r[P3] zplan='P4'"),
+     /*   7 */ "VUpdate"          OpHelp("data=r[P3@P2]"),
+-    /*   8 */ "Goto"             OpHelp(""),
+-    /*   9 */ "Gosub"            OpHelp(""),
+-    /*  10 */ "InitCoroutine"    OpHelp(""),
+-    /*  11 */ "Yield"            OpHelp(""),
+-    /*  12 */ "MustBeInt"        OpHelp(""),
+-    /*  13 */ "Jump"             OpHelp(""),
+-    /*  14 */ "Once"             OpHelp(""),
+-    /*  15 */ "If"               OpHelp(""),
+-    /*  16 */ "IfNot"            OpHelp(""),
+-    /*  17 */ "IsNullOrType"     OpHelp("if typeof(r[P1]) IN (P3,5) goto P2"),
+-    /*  18 */ "IfNullRow"        OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
++    /*   8 */ "Init"             OpHelp("Start at P2"),
++    /*   9 */ "Goto"             OpHelp(""),
++    /*  10 */ "Gosub"            OpHelp(""),
++    /*  11 */ "InitCoroutine"    OpHelp(""),
++    /*  12 */ "Yield"            OpHelp(""),
++    /*  13 */ "MustBeInt"        OpHelp(""),
++    /*  14 */ "Jump"             OpHelp(""),
++    /*  15 */ "Once"             OpHelp(""),
++    /*  16 */ "If"               OpHelp(""),
++    /*  17 */ "IfNot"            OpHelp(""),
++    /*  18 */ "IsType"           OpHelp("if typeof(P1.P3) in P5 goto P2"),
+     /*  19 */ "Not"              OpHelp("r[P2]= !r[P1]"),
+-    /*  20 */ "SeekLT"           OpHelp("key=r[P3@P4]"),
+-    /*  21 */ "SeekLE"           OpHelp("key=r[P3@P4]"),
+-    /*  22 */ "SeekGE"           OpHelp("key=r[P3@P4]"),
+-    /*  23 */ "SeekGT"           OpHelp("key=r[P3@P4]"),
+-    /*  24 */ "IfNotOpen"        OpHelp("if( !csr[P1] ) goto P2"),
+-    /*  25 */ "IfNoHope"         OpHelp("key=r[P3@P4]"),
+-    /*  26 */ "NoConflict"       OpHelp("key=r[P3@P4]"),
+-    /*  27 */ "NotFound"         OpHelp("key=r[P3@P4]"),
+-    /*  28 */ "Found"            OpHelp("key=r[P3@P4]"),
+-    /*  29 */ "SeekRowid"        OpHelp("intkey=r[P3]"),
+-    /*  30 */ "NotExists"        OpHelp("intkey=r[P3]"),
+-    /*  31 */ "Last"             OpHelp(""),
+-    /*  32 */ "IfSmaller"        OpHelp(""),
+-    /*  33 */ "SorterSort"       OpHelp(""),
+-    /*  34 */ "Sort"             OpHelp(""),
+-    /*  35 */ "Rewind"           OpHelp(""),
+-    /*  36 */ "SorterNext"       OpHelp(""),
+-    /*  37 */ "Prev"             OpHelp(""),
+-    /*  38 */ "Next"             OpHelp(""),
+-    /*  39 */ "IdxLE"            OpHelp("key=r[P3@P4]"),
+-    /*  40 */ "IdxGT"            OpHelp("key=r[P3@P4]"),
+-    /*  41 */ "IdxLT"            OpHelp("key=r[P3@P4]"),
+-    /*  42 */ "IdxGE"            OpHelp("key=r[P3@P4]"),
++    /*  20 */ "IfNullRow"        OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
++    /*  21 */ "SeekLT"           OpHelp("key=r[P3@P4]"),
++    /*  22 */ "SeekLE"           OpHelp("key=r[P3@P4]"),
++    /*  23 */ "SeekGE"           OpHelp("key=r[P3@P4]"),
++    /*  24 */ "SeekGT"           OpHelp("key=r[P3@P4]"),
++    /*  25 */ "IfNotOpen"        OpHelp("if( !csr[P1] ) goto P2"),
++    /*  26 */ "IfNoHope"         OpHelp("key=r[P3@P4]"),
++    /*  27 */ "NoConflict"       OpHelp("key=r[P3@P4]"),
++    /*  28 */ "NotFound"         OpHelp("key=r[P3@P4]"),
++    /*  29 */ "Found"            OpHelp("key=r[P3@P4]"),
++    /*  30 */ "SeekRowid"        OpHelp("intkey=r[P3]"),
++    /*  31 */ "NotExists"        OpHelp("intkey=r[P3]"),
++    /*  32 */ "Last"             OpHelp(""),
++    /*  33 */ "IfSmaller"        OpHelp(""),
++    /*  34 */ "SorterSort"       OpHelp(""),
++    /*  35 */ "Sort"             OpHelp(""),
++    /*  36 */ "Rewind"           OpHelp(""),
++    /*  37 */ "SorterNext"       OpHelp(""),
++    /*  38 */ "Prev"             OpHelp(""),
++    /*  39 */ "Next"             OpHelp(""),
++    /*  40 */ "IdxLE"            OpHelp("key=r[P3@P4]"),
++    /*  41 */ "IdxGT"            OpHelp("key=r[P3@P4]"),
++    /*  42 */ "IdxLT"            OpHelp("key=r[P3@P4]"),
+     /*  43 */ "Or"               OpHelp("r[P3]=(r[P1] || r[P2])"),
+     /*  44 */ "And"              OpHelp("r[P3]=(r[P1] && r[P2])"),
+-    /*  45 */ "RowSetRead"       OpHelp("r[P3]=rowset(P1)"),
+-    /*  46 */ "RowSetTest"       OpHelp("if r[P3] in rowset(P1) goto P2"),
+-    /*  47 */ "Program"          OpHelp(""),
+-    /*  48 */ "FkIfZero"         OpHelp("if fkctr[P1]==0 goto P2"),
+-    /*  49 */ "IfPos"            OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
++    /*  45 */ "IdxGE"            OpHelp("key=r[P3@P4]"),
++    /*  46 */ "RowSetRead"       OpHelp("r[P3]=rowset(P1)"),
++    /*  47 */ "RowSetTest"       OpHelp("if r[P3] in rowset(P1) goto P2"),
++    /*  48 */ "Program"          OpHelp(""),
++    /*  49 */ "FkIfZero"         OpHelp("if fkctr[P1]==0 goto P2"),
+     /*  50 */ "IsNull"           OpHelp("if r[P1]==NULL goto P2"),
+     /*  51 */ "NotNull"          OpHelp("if r[P1]!=NULL goto P2"),
+     /*  52 */ "Ne"               OpHelp("IF r[P3]!=r[P1]"),
+@@ -35338,12 +36995,12 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+     /*  56 */ "Lt"               OpHelp("IF r[P3]=r[P1]"),
+     /*  58 */ "ElseEq"           OpHelp(""),
+-    /*  59 */ "IfNotZero"        OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
+-    /*  60 */ "DecrJumpZero"     OpHelp("if (--r[P1])==0 goto P2"),
+-    /*  61 */ "IncrVacuum"       OpHelp(""),
+-    /*  62 */ "VNext"            OpHelp(""),
+-    /*  63 */ "Filter"           OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
+-    /*  64 */ "Init"             OpHelp("Start at P2"),
++    /*  59 */ "IfPos"            OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
++    /*  60 */ "IfNotZero"        OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
++    /*  61 */ "DecrJumpZero"     OpHelp("if (--r[P1])==0 goto P2"),
++    /*  62 */ "IncrVacuum"       OpHelp(""),
++    /*  63 */ "VNext"            OpHelp(""),
++    /*  64 */ "Filter"           OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
+     /*  65 */ "PureFunc"         OpHelp("r[P3]=func(r[P2@NP])"),
+     /*  66 */ "Function"         OpHelp("r[P3]=func(r[P2@NP])"),
+     /*  67 */ "Return"           OpHelp(""),
+@@ -35453,25 +37110,1010 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+     /* 171 */ "VCreate"          OpHelp(""),
+     /* 172 */ "VDestroy"         OpHelp(""),
+     /* 173 */ "VOpen"            OpHelp(""),
+-    /* 174 */ "VInitIn"          OpHelp("r[P2]=ValueList(P1,P3)"),
+-    /* 175 */ "VColumn"          OpHelp("r[P3]=vcolumn(P2)"),
+-    /* 176 */ "VRename"          OpHelp(""),
+-    /* 177 */ "Pagecount"        OpHelp(""),
+-    /* 178 */ "MaxPgcnt"         OpHelp(""),
+-    /* 179 */ "ClrSubtype"       OpHelp("r[P1].subtype = 0"),
+-    /* 180 */ "FilterAdd"        OpHelp("filter(P1) += key(P3@P4)"),
+-    /* 181 */ "Trace"            OpHelp(""),
+-    /* 182 */ "CursorHint"       OpHelp(""),
+-    /* 183 */ "ReleaseReg"       OpHelp("release r[P1@P2] mask P3"),
+-    /* 184 */ "Noop"             OpHelp(""),
+-    /* 185 */ "Explain"          OpHelp(""),
+-    /* 186 */ "Abortable"        OpHelp(""),
++    /* 174 */ "VCheck"           OpHelp(""),
++    /* 175 */ "VInitIn"          OpHelp("r[P2]=ValueList(P1,P3)"),
++    /* 176 */ "VColumn"          OpHelp("r[P3]=vcolumn(P2)"),
++    /* 177 */ "VRename"          OpHelp(""),
++    /* 178 */ "Pagecount"        OpHelp(""),
++    /* 179 */ "MaxPgcnt"         OpHelp(""),
++    /* 180 */ "ClrSubtype"       OpHelp("r[P1].subtype = 0"),
++    /* 181 */ "GetSubtype"       OpHelp("r[P2] = r[P1].subtype"),
++    /* 182 */ "SetSubtype"       OpHelp("r[P2].subtype = r[P1]"),
++    /* 183 */ "FilterAdd"        OpHelp("filter(P1) += key(P3@P4)"),
++    /* 184 */ "Trace"            OpHelp(""),
++    /* 185 */ "CursorHint"       OpHelp(""),
++    /* 186 */ "ReleaseReg"       OpHelp("release r[P1@P2] mask P3"),
++    /* 187 */ "Noop"             OpHelp(""),
++    /* 188 */ "Explain"          OpHelp(""),
++    /* 189 */ "Abortable"        OpHelp(""),
+   };
+   return azName[i];
+ }
+ #endif
+ 
+ /************** End of opcodes.c *********************************************/
++/************** Begin file os_kv.c *******************************************/
++/*
++** 2022-09-06
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains an experimental VFS layer that operates on a
++** Key/Value storage engine where both keys and values must be pure
++** text.
++*/
++/* #include  */
++#if SQLITE_OS_KV || (SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL))
++
++/*****************************************************************************
++** Debugging logic
++*/
++
++/* SQLITE_KV_TRACE() is used for tracing calls to kvstorage routines. */
++#if 0
++#define SQLITE_KV_TRACE(X)  printf X
++#else
++#define SQLITE_KV_TRACE(X)
++#endif
++
++/* SQLITE_KV_LOG() is used for tracing calls to the VFS interface */
++#if 0
++#define SQLITE_KV_LOG(X)  printf X
++#else
++#define SQLITE_KV_LOG(X)
++#endif
++
++
++/*
++** Forward declaration of objects used by this VFS implementation
++*/
++typedef struct KVVfsFile KVVfsFile;
++
++/* A single open file.  There are only two files represented by this
++** VFS - the database and the rollback journal.
++*/
++struct KVVfsFile {
++  sqlite3_file base;              /* IO methods */
++  const char *zClass;             /* Storage class */
++  int isJournal;                  /* True if this is a journal file */
++  unsigned int nJrnl;             /* Space allocated for aJrnl[] */
++  char *aJrnl;                    /* Journal content */
++  int szPage;                     /* Last known page size */
++  sqlite3_int64 szDb;             /* Database file size.  -1 means unknown */
++  char *aData;                    /* Buffer to hold page data */
++};
++#define SQLITE_KVOS_SZ 133073
++
++/*
++** Methods for KVVfsFile
++*/
++static int kvvfsClose(sqlite3_file*);
++static int kvvfsReadDb(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
++static int kvvfsReadJrnl(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
++static int kvvfsWriteDb(sqlite3_file*,const void*,int iAmt, sqlite3_int64);
++static int kvvfsWriteJrnl(sqlite3_file*,const void*,int iAmt, sqlite3_int64);
++static int kvvfsTruncateDb(sqlite3_file*, sqlite3_int64 size);
++static int kvvfsTruncateJrnl(sqlite3_file*, sqlite3_int64 size);
++static int kvvfsSyncDb(sqlite3_file*, int flags);
++static int kvvfsSyncJrnl(sqlite3_file*, int flags);
++static int kvvfsFileSizeDb(sqlite3_file*, sqlite3_int64 *pSize);
++static int kvvfsFileSizeJrnl(sqlite3_file*, sqlite3_int64 *pSize);
++static int kvvfsLock(sqlite3_file*, int);
++static int kvvfsUnlock(sqlite3_file*, int);
++static int kvvfsCheckReservedLock(sqlite3_file*, int *pResOut);
++static int kvvfsFileControlDb(sqlite3_file*, int op, void *pArg);
++static int kvvfsFileControlJrnl(sqlite3_file*, int op, void *pArg);
++static int kvvfsSectorSize(sqlite3_file*);
++static int kvvfsDeviceCharacteristics(sqlite3_file*);
++
++/*
++** Methods for sqlite3_vfs
++*/
++static int kvvfsOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *);
++static int kvvfsDelete(sqlite3_vfs*, const char *zName, int syncDir);
++static int kvvfsAccess(sqlite3_vfs*, const char *zName, int flags, int *);
++static int kvvfsFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut);
++static void *kvvfsDlOpen(sqlite3_vfs*, const char *zFilename);
++static int kvvfsRandomness(sqlite3_vfs*, int nByte, char *zOut);
++static int kvvfsSleep(sqlite3_vfs*, int microseconds);
++static int kvvfsCurrentTime(sqlite3_vfs*, double*);
++static int kvvfsCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
++
++static sqlite3_vfs sqlite3OsKvvfsObject = {
++  1,                              /* iVersion */
++  sizeof(KVVfsFile),              /* szOsFile */
++  1024,                           /* mxPathname */
++  0,                              /* pNext */
++  "kvvfs",                        /* zName */
++  0,                              /* pAppData */
++  kvvfsOpen,                      /* xOpen */
++  kvvfsDelete,                    /* xDelete */
++  kvvfsAccess,                    /* xAccess */
++  kvvfsFullPathname,              /* xFullPathname */
++  kvvfsDlOpen,                    /* xDlOpen */
++  0,                              /* xDlError */
++  0,                              /* xDlSym */
++  0,                              /* xDlClose */
++  kvvfsRandomness,                /* xRandomness */
++  kvvfsSleep,                     /* xSleep */
++  kvvfsCurrentTime,               /* xCurrentTime */
++  0,                              /* xGetLastError */
++  kvvfsCurrentTimeInt64           /* xCurrentTimeInt64 */
++};
++
++/* Methods for sqlite3_file objects referencing a database file
++*/
++static sqlite3_io_methods kvvfs_db_io_methods = {
++  1,                              /* iVersion */
++  kvvfsClose,                     /* xClose */
++  kvvfsReadDb,                    /* xRead */
++  kvvfsWriteDb,                   /* xWrite */
++  kvvfsTruncateDb,                /* xTruncate */
++  kvvfsSyncDb,                    /* xSync */
++  kvvfsFileSizeDb,                /* xFileSize */
++  kvvfsLock,                      /* xLock */
++  kvvfsUnlock,                    /* xUnlock */
++  kvvfsCheckReservedLock,         /* xCheckReservedLock */
++  kvvfsFileControlDb,             /* xFileControl */
++  kvvfsSectorSize,                /* xSectorSize */
++  kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
++  0,                              /* xShmMap */
++  0,                              /* xShmLock */
++  0,                              /* xShmBarrier */
++  0,                              /* xShmUnmap */
++  0,                              /* xFetch */
++  0                               /* xUnfetch */
++};
++
++/* Methods for sqlite3_file objects referencing a rollback journal
++*/
++static sqlite3_io_methods kvvfs_jrnl_io_methods = {
++  1,                              /* iVersion */
++  kvvfsClose,                     /* xClose */
++  kvvfsReadJrnl,                  /* xRead */
++  kvvfsWriteJrnl,                 /* xWrite */
++  kvvfsTruncateJrnl,              /* xTruncate */
++  kvvfsSyncJrnl,                  /* xSync */
++  kvvfsFileSizeJrnl,              /* xFileSize */
++  kvvfsLock,                      /* xLock */
++  kvvfsUnlock,                    /* xUnlock */
++  kvvfsCheckReservedLock,         /* xCheckReservedLock */
++  kvvfsFileControlJrnl,           /* xFileControl */
++  kvvfsSectorSize,                /* xSectorSize */
++  kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
++  0,                              /* xShmMap */
++  0,                              /* xShmLock */
++  0,                              /* xShmBarrier */
++  0,                              /* xShmUnmap */
++  0,                              /* xFetch */
++  0                               /* xUnfetch */
++};
++
++/****** Storage subsystem **************************************************/
++#include 
++#include 
++#include 
++
++/* Forward declarations for the low-level storage engine
++*/
++static int kvstorageWrite(const char*, const char *zKey, const char *zData);
++static int kvstorageDelete(const char*, const char *zKey);
++static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
++#define KVSTORAGE_KEY_SZ  32
++
++/* Expand the key name with an appropriate prefix and put the result
++** zKeyOut[].  The zKeyOut[] buffer is assumed to hold at least
++** KVSTORAGE_KEY_SZ bytes.
++*/
++static void kvstorageMakeKey(
++  const char *zClass,
++  const char *zKeyIn,
++  char *zKeyOut
++){
++  sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "kvvfs-%s-%s", zClass, zKeyIn);
++}
++
++/* Write content into a key.  zClass is the particular namespace of the
++** underlying key/value store to use - either "local" or "session".
++**
++** Both zKey and zData are zero-terminated pure text strings.
++**
++** Return the number of errors.
++*/
++static int kvstorageWrite(
++  const char *zClass,
++  const char *zKey,
++  const char *zData
++){
++  FILE *fd;
++  char zXKey[KVSTORAGE_KEY_SZ];
++  kvstorageMakeKey(zClass, zKey, zXKey);
++  fd = fopen(zXKey, "wb");
++  if( fd ){
++    SQLITE_KV_TRACE(("KVVFS-WRITE  %-15s (%d) %.50s%s\n", zXKey,
++                 (int)strlen(zData), zData,
++                 strlen(zData)>50 ? "..." : ""));
++    fputs(zData, fd);
++    fclose(fd);
++    return 0;
++  }else{
++    return 1;
++  }
++}
++
++/* Delete a key (with its corresponding data) from the key/value
++** namespace given by zClass.  If the key does not previously exist,
++** this routine is a no-op.
++*/
++static int kvstorageDelete(const char *zClass, const char *zKey){
++  char zXKey[KVSTORAGE_KEY_SZ];
++  kvstorageMakeKey(zClass, zKey, zXKey);
++  unlink(zXKey);
++  SQLITE_KV_TRACE(("KVVFS-DELETE %-15s\n", zXKey));
++  return 0;
++}
++
++/* Read the value associated with a zKey from the key/value namespace given
++** by zClass and put the text data associated with that key in the first
++** nBuf bytes of zBuf[].  The value might be truncated if zBuf is not large
++** enough to hold it all.  The value put into zBuf must always be zero
++** terminated, even if it gets truncated because nBuf is not large enough.
++**
++** Return the total number of bytes in the data, without truncation, and
++** not counting the final zero terminator.   Return -1 if the key does
++** not exist.
++**
++** If nBuf<=0 then this routine simply returns the size of the data without
++** actually reading it.
++*/
++static int kvstorageRead(
++  const char *zClass,
++  const char *zKey,
++  char *zBuf,
++  int nBuf
++){
++  FILE *fd;
++  struct stat buf;
++  char zXKey[KVSTORAGE_KEY_SZ];
++  kvstorageMakeKey(zClass, zKey, zXKey);
++  if( access(zXKey, R_OK)!=0
++   || stat(zXKey, &buf)!=0
++   || !S_ISREG(buf.st_mode)
++  ){
++    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
++    return -1;
++  }
++  if( nBuf<=0 ){
++    return (int)buf.st_size;
++  }else if( nBuf==1 ){
++    zBuf[0] = 0;
++    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (%d)\n", zXKey,
++                 (int)buf.st_size));
++    return (int)buf.st_size;
++  }
++  if( nBuf > buf.st_size + 1 ){
++    nBuf = buf.st_size + 1;
++  }
++  fd = fopen(zXKey, "rb");
++  if( fd==0 ){
++    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
++    return -1;
++  }else{
++    sqlite3_int64 n = fread(zBuf, 1, nBuf-1, fd);
++    fclose(fd);
++    zBuf[n] = 0;
++    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (%lld) %.50s%s\n", zXKey,
++                 n, zBuf, n>50 ? "..." : ""));
++    return (int)n;
++  }
++}
++
++/*
++** An internal level of indirection which enables us to replace the
++** kvvfs i/o methods with JavaScript implementations in WASM builds.
++** Maintenance reminder: if this struct changes in any way, the JSON
++** rendering of its structure must be updated in
++** sqlite3_wasm_enum_json(). There are no binary compatibility
++** concerns, so it does not need an iVersion member. This file is
++** necessarily always compiled together with sqlite3_wasm_enum_json(),
++** and JS code dynamically creates the mapping of members based on
++** that JSON description.
++*/
++typedef struct sqlite3_kvvfs_methods sqlite3_kvvfs_methods;
++struct sqlite3_kvvfs_methods {
++  int (*xRead)(const char *zClass, const char *zKey, char *zBuf, int nBuf);
++  int (*xWrite)(const char *zClass, const char *zKey, const char *zData);
++  int (*xDelete)(const char *zClass, const char *zKey);
++  const int nKeySize;
++};
++
++/*
++** This object holds the kvvfs I/O methods which may be swapped out
++** for JavaScript-side implementations in WASM builds. In such builds
++** it cannot be const, but in native builds it should be so that
++** the compiler can hopefully optimize this level of indirection out.
++** That said, kvvfs is intended primarily for use in WASM builds.
++**
++** Note that this is not explicitly flagged as static because the
++** amalgamation build will tag it with SQLITE_PRIVATE.
++*/
++#ifndef SQLITE_WASM
++const
++#endif
++SQLITE_PRIVATE sqlite3_kvvfs_methods sqlite3KvvfsMethods = {
++kvstorageRead,
++kvstorageWrite,
++kvstorageDelete,
++KVSTORAGE_KEY_SZ
++};
++
++/****** Utility subroutines ************************************************/
++
++/*
++** Encode binary into the text encoded used to persist on disk.
++** The output text is stored in aOut[], which must be at least
++** nData+1 bytes in length.
++**
++** Return the actual length of the encoded text, not counting the
++** zero terminator at the end.
++**
++** Encoding format
++** ---------------
++**
++**   *  Non-zero bytes are encoded as upper-case hexadecimal
++**
++**   *  A sequence of one or more zero-bytes that are not at the
++**      beginning of the buffer are encoded as a little-endian
++**      base-26 number using a..z.  "a" means 0.  "b" means 1,
++**      "z" means 25.  "ab" means 26.  "ac" means 52.  And so forth.
++**
++**   *  Because there is no overlap between the encoding characters
++**      of hexadecimal and base-26 numbers, it is always clear where
++**      one stops and the next begins.
++*/
++static int kvvfsEncode(const char *aData, int nData, char *aOut){
++  int i, j;
++  const unsigned char *a = (const unsigned char*)aData;
++  for(i=j=0; i>4];
++      aOut[j++] = "0123456789ABCDEF"[c&0xf];
++    }else{
++      /* A sequence of 1 or more zeros is stored as a little-endian
++      ** base-26 number using a..z as the digits. So one zero is "b".
++      ** Two zeros is "c". 25 zeros is "z", 26 zeros is "ab", 27 is "bb",
++      ** and so forth.
++      */
++      int k;
++      for(k=1; i+k0 ){
++        aOut[j++] = 'a'+(k%26);
++        k /= 26;
++      }
++    }
++  }
++  aOut[j] = 0;
++  return j;
++}
++
++static const signed char kvvfsHexValue[256] = {
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++   0,  1,  2,  3,  4,  5,  6,  7,    8,  9, -1, -1, -1, -1, -1, -1,
++  -1, 10, 11, 12, 13, 14, 15, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1
++};
++
++/*
++** Decode the text encoding back to binary.  The binary content is
++** written into pOut, which must be at least nOut bytes in length.
++**
++** The return value is the number of bytes actually written into aOut[].
++*/
++static int kvvfsDecode(const char *a, char *aOut, int nOut){
++  int i, j;
++  int c;
++  const unsigned char *aIn = (const unsigned char*)a;
++  i = 0;
++  j = 0;
++  while( 1 ){
++    c = kvvfsHexValue[aIn[i]];
++    if( c<0 ){
++      int n = 0;
++      int mult = 1;
++      c = aIn[i];
++      if( c==0 ) break;
++      while( c>='a' && c<='z' ){
++        n += (c - 'a')*mult;
++        mult *= 26;
++        c = aIn[++i];
++      }
++      if( j+n>nOut ) return -1;
++      memset(&aOut[j], 0, n);
++      j += n;
++      if( c==0 || mult==1 ) break; /* progress stalled if mult==1 */
++    }else{
++      aOut[j] = c<<4;
++      c = kvvfsHexValue[aIn[++i]];
++      if( c<0 ) break;
++      aOut[j++] += c;
++      i++;
++    }
++  }
++  return j;
++}
++
++/*
++** Decode a complete journal file.  Allocate space in pFile->aJrnl
++** and store the decoding there.  Or leave pFile->aJrnl set to NULL
++** if an error is encountered.
++**
++** The first few characters of the text encoding will be a little-endian
++** base-26 number (digits a..z) that is the total number of bytes
++** in the decoded journal file image.  This base-26 number is followed
++** by a single space, then the encoding of the journal.  The space
++** separator is required to act as a terminator for the base-26 number.
++*/
++static void kvvfsDecodeJournal(
++  KVVfsFile *pFile,      /* Store decoding in pFile->aJrnl */
++  const char *zTxt,      /* Text encoding.  Zero-terminated */
++  int nTxt               /* Bytes in zTxt, excluding zero terminator */
++){
++  unsigned int n = 0;
++  int c, i, mult;
++  i = 0;
++  mult = 1;
++  while( (c = zTxt[i++])>='a' && c<='z' ){
++    n += (zTxt[i] - 'a')*mult;
++    mult *= 26;
++  }
++  sqlite3_free(pFile->aJrnl);
++  pFile->aJrnl = sqlite3_malloc64( n );
++  if( pFile->aJrnl==0 ){
++    pFile->nJrnl = 0;
++    return;
++  }
++  pFile->nJrnl = n;
++  n = kvvfsDecode(zTxt+i, pFile->aJrnl, pFile->nJrnl);
++  if( nnJrnl ){
++    sqlite3_free(pFile->aJrnl);
++    pFile->aJrnl = 0;
++    pFile->nJrnl = 0;
++  }
++}
++
++/*
++** Read or write the "sz" element, containing the database file size.
++*/
++static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
++  char zData[50];
++  zData[0] = 0;
++  sqlite3KvvfsMethods.xRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
++  return strtoll(zData, 0, 0);
++}
++static int kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
++  char zData[50];
++  sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
++  return sqlite3KvvfsMethods.xWrite(pFile->zClass, "sz", zData);
++}
++
++/****** sqlite3_io_methods methods ******************************************/
++
++/*
++** Close an kvvfs-file.
++*/
++static int kvvfsClose(sqlite3_file *pProtoFile){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++
++  SQLITE_KV_LOG(("xClose %s %s\n", pFile->zClass,
++             pFile->isJournal ? "journal" : "db"));
++  sqlite3_free(pFile->aJrnl);
++  sqlite3_free(pFile->aData);
++  return SQLITE_OK;
++}
++
++/*
++** Read from the -journal file.
++*/
++static int kvvfsReadJrnl(
++  sqlite3_file *pProtoFile,
++  void *zBuf,
++  int iAmt,
++  sqlite_int64 iOfst
++){
++  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
++  assert( pFile->isJournal );
++  SQLITE_KV_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
++  if( pFile->aJrnl==0 ){
++    int szTxt = kvstorageRead(pFile->zClass, "jrnl", 0, 0);
++    char *aTxt;
++    if( szTxt<=4 ){
++      return SQLITE_IOERR;
++    }
++    aTxt = sqlite3_malloc64( szTxt+1 );
++    if( aTxt==0 ) return SQLITE_NOMEM;
++    kvstorageRead(pFile->zClass, "jrnl", aTxt, szTxt+1);
++    kvvfsDecodeJournal(pFile, aTxt, szTxt);
++    sqlite3_free(aTxt);
++    if( pFile->aJrnl==0 ) return SQLITE_IOERR;
++  }
++  if( iOfst+iAmt>pFile->nJrnl ){
++    return SQLITE_IOERR_SHORT_READ;
++  }
++  memcpy(zBuf, pFile->aJrnl+iOfst, iAmt);
++  return SQLITE_OK;
++}
++
++/*
++** Read from the database file.
++*/
++static int kvvfsReadDb(
++  sqlite3_file *pProtoFile,
++  void *zBuf,
++  int iAmt,
++  sqlite_int64 iOfst
++){
++  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
++  unsigned int pgno;
++  int got, n;
++  char zKey[30];
++  char *aData = pFile->aData;
++  assert( iOfst>=0 );
++  assert( iAmt>=0 );
++  SQLITE_KV_LOG(("xRead('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
++  if( iOfst+iAmt>=512 ){
++    if( (iOfst % iAmt)!=0 ){
++      return SQLITE_IOERR_READ;
++    }
++    if( (iAmt & (iAmt-1))!=0 || iAmt<512 || iAmt>65536 ){
++      return SQLITE_IOERR_READ;
++    }
++    pFile->szPage = iAmt;
++    pgno = 1 + iOfst/iAmt;
++  }else{
++    pgno = 1;
++  }
++  sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
++  got = sqlite3KvvfsMethods.xRead(pFile->zClass, zKey,
++                                  aData, SQLITE_KVOS_SZ-1);
++  if( got<0 ){
++    n = 0;
++  }else{
++    aData[got] = 0;
++    if( iOfst+iAmt<512 ){
++      int k = iOfst+iAmt;
++      aData[k*2] = 0;
++      n = kvvfsDecode(aData, &aData[2000], SQLITE_KVOS_SZ-2000);
++      if( n>=iOfst+iAmt ){
++        memcpy(zBuf, &aData[2000+iOfst], iAmt);
++        n = iAmt;
++      }else{
++        n = 0;
++      }
++    }else{
++      n = kvvfsDecode(aData, zBuf, iAmt);
++    }
++  }
++  if( nzClass, iAmt, iOfst));
++  if( iEnd>=0x10000000 ) return SQLITE_FULL;
++  if( pFile->aJrnl==0 || pFile->nJrnlaJrnl, iEnd);
++    if( aNew==0 ){
++      return SQLITE_IOERR_NOMEM;
++    }
++    pFile->aJrnl = aNew;
++    if( pFile->nJrnlaJrnl+pFile->nJrnl, 0, iOfst-pFile->nJrnl);
++    }
++    pFile->nJrnl = iEnd;
++  }
++  memcpy(pFile->aJrnl+iOfst, zBuf, iAmt);
++  return SQLITE_OK;
++}
++
++/*
++** Write into the database file.
++*/
++static int kvvfsWriteDb(
++  sqlite3_file *pProtoFile,
++  const void *zBuf,
++  int iAmt,
++  sqlite_int64 iOfst
++){
++  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
++  unsigned int pgno;
++  char zKey[30];
++  char *aData = pFile->aData;
++  SQLITE_KV_LOG(("xWrite('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
++  assert( iAmt>=512 && iAmt<=65536 );
++  assert( (iAmt & (iAmt-1))==0 );
++  assert( pFile->szPage<0 || pFile->szPage==iAmt );
++  pFile->szPage = iAmt;
++  pgno = 1 + iOfst/iAmt;
++  sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
++  kvvfsEncode(zBuf, iAmt, aData);
++  if( sqlite3KvvfsMethods.xWrite(pFile->zClass, zKey, aData) ){
++    return SQLITE_IOERR;
++  }
++  if( iOfst+iAmt > pFile->szDb ){
++    pFile->szDb = iOfst + iAmt;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Truncate an kvvfs-file.
++*/
++static int kvvfsTruncateJrnl(sqlite3_file *pProtoFile, sqlite_int64 size){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  SQLITE_KV_LOG(("xTruncate('%s-journal',%lld)\n", pFile->zClass, size));
++  assert( size==0 );
++  sqlite3KvvfsMethods.xDelete(pFile->zClass, "jrnl");
++  sqlite3_free(pFile->aJrnl);
++  pFile->aJrnl = 0;
++  pFile->nJrnl = 0;
++  return SQLITE_OK;
++}
++static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  if( pFile->szDb>size
++   && pFile->szPage>0
++   && (size % pFile->szPage)==0
++  ){
++    char zKey[50];
++    unsigned int pgno, pgnoMax;
++    SQLITE_KV_LOG(("xTruncate('%s-db',%lld)\n", pFile->zClass, size));
++    pgno = 1 + size/pFile->szPage;
++    pgnoMax = 2 + pFile->szDb/pFile->szPage;
++    while( pgno<=pgnoMax ){
++      sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
++      sqlite3KvvfsMethods.xDelete(pFile->zClass, zKey);
++      pgno++;
++    }
++    pFile->szDb = size;
++    return kvvfsWriteFileSize(pFile, size) ? SQLITE_IOERR : SQLITE_OK;
++  }
++  return SQLITE_IOERR;
++}
++
++/*
++** Sync an kvvfs-file.
++*/
++static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
++  int i, n;
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  char *zOut;
++  SQLITE_KV_LOG(("xSync('%s-journal')\n", pFile->zClass));
++  if( pFile->nJrnl<=0 ){
++    return kvvfsTruncateJrnl(pProtoFile, 0);
++  }
++  zOut = sqlite3_malloc64( pFile->nJrnl*2 + 50 );
++  if( zOut==0 ){
++    return SQLITE_IOERR_NOMEM;
++  }
++  n = pFile->nJrnl;
++  i = 0;
++  do{
++    zOut[i++] = 'a' + (n%26);
++    n /= 26;
++  }while( n>0 );
++  zOut[i++] = ' ';
++  kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
++  i = sqlite3KvvfsMethods.xWrite(pFile->zClass, "jrnl", zOut);
++  sqlite3_free(zOut);
++  return i ? SQLITE_IOERR : SQLITE_OK;
++}
++static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
++  return SQLITE_OK;
++}
++
++/*
++** Return the current file-size of an kvvfs-file.
++*/
++static int kvvfsFileSizeJrnl(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  SQLITE_KV_LOG(("xFileSize('%s-journal')\n", pFile->zClass));
++  *pSize = pFile->nJrnl;
++  return SQLITE_OK;
++}
++static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  SQLITE_KV_LOG(("xFileSize('%s-db')\n", pFile->zClass));
++  if( pFile->szDb>=0 ){
++    *pSize = pFile->szDb;
++  }else{
++    *pSize = kvvfsReadFileSize(pFile);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Lock an kvvfs-file.
++*/
++static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  assert( !pFile->isJournal );
++  SQLITE_KV_LOG(("xLock(%s,%d)\n", pFile->zClass, eLock));
++
++  if( eLock!=SQLITE_LOCK_NONE ){
++    pFile->szDb = kvvfsReadFileSize(pFile);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Unlock an kvvfs-file.
++*/
++static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
++  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++  assert( !pFile->isJournal );
++  SQLITE_KV_LOG(("xUnlock(%s,%d)\n", pFile->zClass, eLock));
++  if( eLock==SQLITE_LOCK_NONE ){
++    pFile->szDb = -1;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Check if another file-handle holds a RESERVED lock on an kvvfs-file.
++*/
++static int kvvfsCheckReservedLock(sqlite3_file *pProtoFile, int *pResOut){
++  SQLITE_KV_LOG(("xCheckReservedLock\n"));
++  *pResOut = 0;
++  return SQLITE_OK;
++}
++
++/*
++** File control method. For custom operations on an kvvfs-file.
++*/
++static int kvvfsFileControlJrnl(sqlite3_file *pProtoFile, int op, void *pArg){
++  SQLITE_KV_LOG(("xFileControl(%d) on journal\n", op));
++  return SQLITE_NOTFOUND;
++}
++static int kvvfsFileControlDb(sqlite3_file *pProtoFile, int op, void *pArg){
++  SQLITE_KV_LOG(("xFileControl(%d) on database\n", op));
++  if( op==SQLITE_FCNTL_SYNC ){
++    KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
++    int rc = SQLITE_OK;
++    SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
++    if( pFile->szDb>0 && 0!=kvvfsWriteFileSize(pFile, pFile->szDb) ){
++      rc = SQLITE_IOERR;
++    }
++    return rc;
++  }
++  return SQLITE_NOTFOUND;
++}
++
++/*
++** Return the sector-size in bytes for an kvvfs-file.
++*/
++static int kvvfsSectorSize(sqlite3_file *pFile){
++  return 512;
++}
++
++/*
++** Return the device characteristic flags supported by an kvvfs-file.
++*/
++static int kvvfsDeviceCharacteristics(sqlite3_file *pProtoFile){
++  return 0;
++}
++
++/****** sqlite3_vfs methods *************************************************/
++
++/*
++** Open an kvvfs file handle.
++*/
++static int kvvfsOpen(
++  sqlite3_vfs *pProtoVfs,
++  const char *zName,
++  sqlite3_file *pProtoFile,
++  int flags,
++  int *pOutFlags
++){
++  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
++  if( zName==0 ) zName = "";
++  SQLITE_KV_LOG(("xOpen(\"%s\")\n", zName));
++  if( strcmp(zName, "local")==0
++   || strcmp(zName, "session")==0
++  ){
++    pFile->isJournal = 0;
++    pFile->base.pMethods = &kvvfs_db_io_methods;
++  }else
++  if( strcmp(zName, "local-journal")==0
++   || strcmp(zName, "session-journal")==0
++  ){
++    pFile->isJournal = 1;
++    pFile->base.pMethods = &kvvfs_jrnl_io_methods;
++  }else{
++    return SQLITE_CANTOPEN;
++  }
++  if( zName[0]=='s' ){
++    pFile->zClass = "session";
++  }else{
++    pFile->zClass = "local";
++  }
++  pFile->aData = sqlite3_malloc64(SQLITE_KVOS_SZ);
++  if( pFile->aData==0 ){
++    return SQLITE_NOMEM;
++  }
++  pFile->aJrnl = 0;
++  pFile->nJrnl = 0;
++  pFile->szPage = -1;
++  pFile->szDb = -1;
++  return SQLITE_OK;
++}
++
++/*
++** Delete the file located at zPath. If the dirSync argument is true,
++** ensure the file-system modifications are synced to disk before
++** returning.
++*/
++static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
++  if( strcmp(zPath, "local-journal")==0 ){
++    sqlite3KvvfsMethods.xDelete("local", "jrnl");
++  }else
++  if( strcmp(zPath, "session-journal")==0 ){
++    sqlite3KvvfsMethods.xDelete("session", "jrnl");
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Test for access permissions. Return true if the requested permission
++** is available, or false otherwise.
++*/
++static int kvvfsAccess(
++  sqlite3_vfs *pProtoVfs,
++  const char *zPath,
++  int flags,
++  int *pResOut
++){
++  SQLITE_KV_LOG(("xAccess(\"%s\")\n", zPath));
++  if( strcmp(zPath, "local-journal")==0 ){
++    *pResOut = sqlite3KvvfsMethods.xRead("local", "jrnl", 0, 0)>0;
++  }else
++  if( strcmp(zPath, "session-journal")==0 ){
++    *pResOut = sqlite3KvvfsMethods.xRead("session", "jrnl", 0, 0)>0;
++  }else
++  if( strcmp(zPath, "local")==0 ){
++    *pResOut = sqlite3KvvfsMethods.xRead("local", "sz", 0, 0)>0;
++  }else
++  if( strcmp(zPath, "session")==0 ){
++    *pResOut = sqlite3KvvfsMethods.xRead("session", "sz", 0, 0)>0;
++  }else
++  {
++    *pResOut = 0;
++  }
++  SQLITE_KV_LOG(("xAccess returns %d\n",*pResOut));
++  return SQLITE_OK;
++}
++
++/*
++** Populate buffer zOut with the full canonical pathname corresponding
++** to the pathname in zPath. zOut is guaranteed to point to a buffer
++** of at least (INST_MAX_PATHNAME+1) bytes.
++*/
++static int kvvfsFullPathname(
++  sqlite3_vfs *pVfs,
++  const char *zPath,
++  int nOut,
++  char *zOut
++){
++  size_t nPath;
++#ifdef SQLITE_OS_KV_ALWAYS_LOCAL
++  zPath = "local";
++#endif
++  nPath = strlen(zPath);
++  SQLITE_KV_LOG(("xFullPathname(\"%s\")\n", zPath));
++  if( nOut
++static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
++  static const sqlite3_int64 unixEpoch = 24405875*(sqlite3_int64)8640000;
++  struct timeval sNow;
++  (void)gettimeofday(&sNow, 0);  /* Cannot fail given valid arguments */
++  *pTimeOut = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_usec/1000;
++  return SQLITE_OK;
++}
++#endif /* SQLITE_OS_KV || SQLITE_OS_UNIX */
++
++#if SQLITE_OS_KV
++/*
++** This routine is called initialize the KV-vfs as the default VFS.
++*/
++SQLITE_API int sqlite3_os_init(void){
++  return sqlite3_vfs_register(&sqlite3OsKvvfsObject, 1);
++}
++SQLITE_API int sqlite3_os_end(void){
++  return SQLITE_OK;
++}
++#endif /* SQLITE_OS_KV */
++
++#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
++SQLITE_PRIVATE int sqlite3KvvfsInit(void){
++  return sqlite3_vfs_register(&sqlite3OsKvvfsObject, 0);
++}
++#endif
++
++/************** End of os_kv.c ***********************************************/
+ /************** Begin file os_unix.c *****************************************/
+ /*
+ ** 2004 May 22
+@@ -35497,7 +38139,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+ ** This source file is organized into divisions where the logic for various
+ ** subfunctions is contained within the appropriate division.  PLEASE
+ ** KEEP THE STRUCTURE OF THIS FILE INTACT.  New code should be placed
+-** in the correct division and should be clearly labeled.
++** in the correct division and should be clearly labelled.
+ **
+ ** The layout of divisions is as follows:
+ **
+@@ -35547,7 +38189,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+ #endif
+ 
+ /* Use pread() and pwrite() if they are available */
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__linux__)
+ # define HAVE_PREAD 1
+ # define HAVE_PWRITE 1
+ #endif
+@@ -35562,15 +38204,16 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+ /*
+ ** standard include files.
+ */
+-#include 
+-#include 
++#include    /* amalgamator: keep */
++#include     /* amalgamator: keep */
+ #include 
+ #include 
+-#include 
++#include       /* amalgamator: keep */
+ /* #include  */
+-#include 
++#include     /* amalgamator: keep */
+ #include 
+-#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
++#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \
++  && !defined(SQLITE_WASI)
+ # include 
+ #endif
+ 
+@@ -35651,16 +38294,57 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+ /*
+ ** Maximum supported path-length.
+ */
++#if SQLITE3MC_MAX_PATHNAME > 512
++#define MAX_PATHNAME SQLITE3MC_MAX_PATHNAME
++#else
+ #define MAX_PATHNAME 512
++#endif
+ 
+ /*
+ ** Maximum supported symbolic links
+ */
+ #define SQLITE_MAX_SYMLINKS 100
+ 
++/*
++** Remove and stub certain info for WASI (WebAssembly System
++** Interface) builds.
++*/
++#ifdef SQLITE_WASI
++# undef HAVE_FCHMOD
++# undef HAVE_FCHOWN
++# undef HAVE_MREMAP
++# define HAVE_MREMAP 0
++# ifndef SQLITE_DEFAULT_UNIX_VFS
++#  define SQLITE_DEFAULT_UNIX_VFS "unix-dotfile"
++   /* ^^^ should SQLITE_DEFAULT_UNIX_VFS be "unix-none"? */
++# endif
++# ifndef F_RDLCK
++#  define F_RDLCK 0
++#  define F_WRLCK 1
++#  define F_UNLCK 2
++#  if __LONG_MAX == 0x7fffffffL
++#   define F_GETLK 12
++#   define F_SETLK 13
++#   define F_SETLKW 14
++#  else
++#   define F_GETLK 5
++#   define F_SETLK 6
++#   define F_SETLKW 7
++#  endif
++# endif
++#else /* !SQLITE_WASI */
++# ifndef HAVE_FCHMOD
++#  define HAVE_FCHMOD
++# endif
++#endif /* SQLITE_WASI */
++
++#ifdef SQLITE_WASI
++# define osGetpid(X) (pid_t)1
++#else
+ /* Always cast the getpid() return type for compatibility with
+ ** kernel modules in VxWorks. */
+-#define osGetpid(X) (pid_t)getpid()
++# define osGetpid(X) (pid_t)getpid()
++#endif
+ 
+ /*
+ ** Only set the lastErrno if the error code is a real error and not
+@@ -35932,7 +38616,11 @@ static struct unix_syscall {
+ #define osPwrite64  ((ssize_t(*)(int,const void*,size_t,off64_t))\
+                     aSyscall[13].pCurrent)
+ 
++#if defined(HAVE_FCHMOD)
+   { "fchmod",       (sqlite3_syscall_ptr)fchmod,          0  },
++#else
++  { "fchmod",       (sqlite3_syscall_ptr)0,               0  },
++#endif
+ #define osFchmod    ((int(*)(int,mode_t))aSyscall[14].pCurrent)
+ 
+ #if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
+@@ -35968,14 +38656,16 @@ static struct unix_syscall {
+ #endif
+ #define osGeteuid   ((uid_t(*)(void))aSyscall[21].pCurrent)
+ 
+-#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
++#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \
++  && !defined(SQLITE_WASI)
+   { "mmap",         (sqlite3_syscall_ptr)mmap,            0 },
+ #else
+   { "mmap",         (sqlite3_syscall_ptr)0,               0 },
+ #endif
+ #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[22].pCurrent)
+ 
+-#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
++#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \
++  && !defined(SQLITE_WASI)
+   { "munmap",       (sqlite3_syscall_ptr)munmap,          0 },
+ #else
+   { "munmap",       (sqlite3_syscall_ptr)0,               0 },
+@@ -36040,7 +38730,7 @@ static int robustFchown(int fd, uid_t uid, gid_t gid){
+ 
+ /*
+ ** This is the xSetSystemCall() method of sqlite3_vfs for all of the
+-** "unix" VFSes.  Return SQLITE_OK opon successfully updating the
++** "unix" VFSes.  Return SQLITE_OK upon successfully updating the
+ ** system call pointer, or SQLITE_NOTFOUND if there is no configurable
+ ** system call named zName.
+ */
+@@ -36161,6 +38851,9 @@ static int robust_open(const char *z, int f, mode_t m){
+       break;
+     }
+     if( fd>=SQLITE_MINIMUM_FILE_DESCRIPTOR ) break;
++    if( (f & (O_EXCL|O_CREAT))==(O_EXCL|O_CREAT) ){
++      (void)osUnlink(z);
++    }
+     osClose(fd);
+     sqlite3_log(SQLITE_WARNING,
+                 "attempt to open \"%s\" as file descriptor %d", z, fd);
+@@ -36559,7 +39252,7 @@ static void vxworksReleaseFileId(struct vxworksFileId *pId){
+ ** If you close a file descriptor that points to a file that has locks,
+ ** all locks on that file that are owned by the current process are
+ ** released.  To work around this problem, each unixInodeInfo object
+-** maintains a count of the number of pending locks on tha inode.
++** maintains a count of the number of pending locks on the inode.
+ ** When an attempt is made to close an unixFile, if there are
+ ** other unixFile open on the same inode that are holding locks, the call
+ ** to close() the file descriptor is deferred until all of the locks clear.
+@@ -36573,7 +39266,7 @@ static void vxworksReleaseFileId(struct vxworksFileId *pId){
+ ** not posix compliant.  Under LinuxThreads, a lock created by thread
+ ** A cannot be modified or overridden by a different thread B.
+ ** Only thread A can modify the lock.  Locking behavior is correct
+-** if the appliation uses the newer Native Posix Thread Library (NPTL)
++** if the application uses the newer Native Posix Thread Library (NPTL)
+ ** on linux - with NPTL a lock created by thread A can override locks
+ ** in thread B.  But there is no way to know at compile-time which
+ ** threading library is being used.  So there is no way to know at
+@@ -36775,7 +39468,7 @@ static void storeLastErrno(unixFile *pFile, int error){
+ }
+ 
+ /*
+-** Close all file descriptors accumuated in the unixInodeInfo->pUnused list.
++** Close all file descriptors accumulated in the unixInodeInfo->pUnused list.
+ */
+ static void closePendingFds(unixFile *pFile){
+   unixInodeInfo *pInode = pFile->pInode;
+@@ -37123,7 +39816,7 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){
+ **
+ **    UNLOCKED -> SHARED
+ **    SHARED -> RESERVED
+-**    SHARED -> (PENDING) -> EXCLUSIVE
++**    SHARED -> EXCLUSIVE
+ **    RESERVED -> (PENDING) -> EXCLUSIVE
+ **    PENDING -> EXCLUSIVE
+ **
+@@ -37138,7 +39831,7 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+   ** slightly in order to be compatible with Windows95 systems simultaneously
+   ** accessing the same database file, in case that is ever required.
+   **
+-  ** Symbols defined in os.h indentify the 'pending byte' and the 'reserved
++  ** Symbols defined in os.h identify the 'pending byte' and the 'reserved
+   ** byte', each single bytes at well known offsets, and the 'shared byte
+   ** range', a range of 510 bytes at a well known offset.
+   **
+@@ -37146,7 +39839,7 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+   ** byte'.  If this is successful, 'shared byte range' is read-locked
+   ** and the lock on the 'pending byte' released.  (Legacy note:  When
+   ** SQLite was first developed, Windows95 systems were still very common,
+-  ** and Widnows95 lacks a shared-lock capability.  So on Windows95, a
++  ** and Windows95 lacks a shared-lock capability.  So on Windows95, a
+   ** single randomly selected by from the 'shared byte range' is locked.
+   ** Windows95 is now pretty much extinct, but this work-around for the
+   ** lack of shared-locks on Windows95 lives on, for backwards
+@@ -37156,19 +39849,20 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+   ** A RESERVED lock is implemented by grabbing a write-lock on the
+   ** 'reserved byte'.
+   **
+-  ** A process may only obtain a PENDING lock after it has obtained a
+-  ** SHARED lock. A PENDING lock is implemented by obtaining a write-lock
+-  ** on the 'pending byte'. This ensures that no new SHARED locks can be
+-  ** obtained, but existing SHARED locks are allowed to persist. A process
+-  ** does not have to obtain a RESERVED lock on the way to a PENDING lock.
+-  ** This property is used by the algorithm for rolling back a journal file
+-  ** after a crash.
++  ** An EXCLUSIVE lock may only be requested after either a SHARED or
++  ** RESERVED lock is held. An EXCLUSIVE lock is implemented by obtaining
++  ** a write-lock on the entire 'shared byte range'. Since all other locks
++  ** require a read-lock on one of the bytes within this range, this ensures
++  ** that no other locks are held on the database.
+   **
+-  ** An EXCLUSIVE lock, obtained after a PENDING lock is held, is
+-  ** implemented by obtaining a write-lock on the entire 'shared byte
+-  ** range'. Since all other locks require a read-lock on one of the bytes
+-  ** within this range, this ensures that no other locks are held on the
+-  ** database.
++  ** If a process that holds a RESERVED lock requests an EXCLUSIVE, then
++  ** a PENDING lock is obtained first. A PENDING lock is implemented by
++  ** obtaining a write-lock on the 'pending byte'. This ensures that no new
++  ** SHARED locks can be obtained, but existing SHARED locks are allowed to
++  ** persist. If the call to this function fails to obtain the EXCLUSIVE
++  ** lock in this case, it holds the PENDING lock instead. The client may
++  ** then re-attempt the EXCLUSIVE lock later on, after existing SHARED
++  ** locks have cleared.
+   */
+   int rc = SQLITE_OK;
+   unixFile *pFile = (unixFile*)id;
+@@ -37194,7 +39888,7 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+ 
+   /* Make sure the locking sequence is correct.
+   **  (1) We never move from unlocked to anything higher than shared lock.
+-  **  (2) SQLite never explicitly requests a pendig lock.
++  **  (2) SQLite never explicitly requests a pending lock.
+   **  (3) A shared lock is always held when a reserve lock is requested.
+   */
+   assert( pFile->eFileLock!=NO_LOCK || eFileLock==SHARED_LOCK );
+@@ -37239,7 +39933,7 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+   lock.l_len = 1L;
+   lock.l_whence = SEEK_SET;
+   if( eFileLock==SHARED_LOCK
+-      || (eFileLock==EXCLUSIVE_LOCK && pFile->eFileLockeFileLock==RESERVED_LOCK)
+   ){
+     lock.l_type = (eFileLock==SHARED_LOCK?F_RDLCK:F_WRLCK);
+     lock.l_start = PENDING_BYTE;
+@@ -37250,6 +39944,9 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+         storeLastErrno(pFile, tErrno);
+       }
+       goto end_lock;
++    }else if( eFileLock==EXCLUSIVE_LOCK ){
++      pFile->eFileLock = PENDING_LOCK;
++      pInode->eFileLock = PENDING_LOCK;
+     }
+   }
+ 
+@@ -37337,13 +40034,9 @@ static int unixLock(sqlite3_file *id, int eFileLock){
+   }
+ #endif
+ 
+-
+   if( rc==SQLITE_OK ){
+     pFile->eFileLock = eFileLock;
+     pInode->eFileLock = eFileLock;
+-  }else if( eFileLock==EXCLUSIVE_LOCK ){
+-    pFile->eFileLock = PENDING_LOCK;
+-    pInode->eFileLock = PENDING_LOCK;
+   }
+ 
+ end_lock:
+@@ -38413,7 +41106,7 @@ static int afpLock(sqlite3_file *id, int eFileLock){
+ 
+   /* Make sure the locking sequence is correct
+   **  (1) We never move from unlocked to anything higher than shared lock.
+-  **  (2) SQLite never explicitly requests a pendig lock.
++  **  (2) SQLite never explicitly requests a pending lock.
+   **  (3) A shared lock is always held when a reserve lock is requested.
+   */
+   assert( pFile->eFileLock!=NO_LOCK || eFileLock==SHARED_LOCK );
+@@ -38529,7 +41222,7 @@ static int afpLock(sqlite3_file *id, int eFileLock){
+       if( !(failed = afpSetLock(context->dbPath, pFile, SHARED_FIRST +
+                          pInode->sharedByte, 1, 0)) ){
+         int failed2 = SQLITE_OK;
+-        /* now attemmpt to get the exclusive lock range */
++        /* now attempt to get the exclusive lock range */
+         failed = afpSetLock(context->dbPath, pFile, SHARED_FIRST,
+                                SHARED_SIZE, 1);
+         if( failed && (failed2 = afpSetLock(context->dbPath, pFile,
+@@ -38578,9 +41271,6 @@ static int afpUnlock(sqlite3_file *id, int eFileLock) {
+   unixInodeInfo *pInode;
+   afpLockingContext *context = (afpLockingContext *) pFile->lockingContext;
+   int skipShared = 0;
+-#ifdef SQLITE_TEST
+-  int h = pFile->h;
+-#endif
+ 
+   assert( pFile );
+   OSTRACE(("UNLOCK  %d %d was %d(%d,%d) pid=%d (afp)\n", pFile->h, eFileLock,
+@@ -38596,9 +41286,6 @@ static int afpUnlock(sqlite3_file *id, int eFileLock) {
+   assert( pInode->nShared!=0 );
+   if( pFile->eFileLock>SHARED_LOCK ){
+     assert( pInode->eFileLock==pFile->eFileLock );
+-    SimulateIOErrorBenign(1);
+-    SimulateIOError( h=(-1) )
+-    SimulateIOErrorBenign(0);
+ 
+ #ifdef SQLITE_DEBUG
+     /* When reducing a lock such that other processes can start
+@@ -38647,9 +41334,6 @@ static int afpUnlock(sqlite3_file *id, int eFileLock) {
+     unsigned long long sharedLockByte = SHARED_FIRST+pInode->sharedByte;
+     pInode->nShared--;
+     if( pInode->nShared==0 ){
+-      SimulateIOErrorBenign(1);
+-      SimulateIOError( h=(-1) )
+-      SimulateIOErrorBenign(0);
+       if( !skipShared ){
+         rc = afpSetLock(context->dbPath, pFile, sharedLockByte, 1, 0);
+       }
+@@ -38750,12 +41434,6 @@ static int nfsUnlock(sqlite3_file *id, int eFileLock){
+ ** Seek to the offset passed as the second argument, then read cnt
+ ** bytes into pBuf. Return the number of bytes actually read.
+ **
+-** NB:  If you define USE_PREAD or USE_PREAD64, then it might also
+-** be necessary to define _XOPEN_SOURCE to be 500.  This varies from
+-** one system to another.  Since SQLite does not define USE_PREAD
+-** in any form by default, we will not attempt to define _XOPEN_SOURCE.
+-** See tickets #2741 and #2681.
+-**
+ ** To avoid stomping the errno value on a failed read the lastErrno value
+ ** is set before returning.
+ */
+@@ -38830,7 +41508,7 @@ static int unixRead(
+ #endif
+ 
+ #if SQLITE_MAX_MMAP_SIZE>0
+-  /* Deal with as much of this read request as possible by transfering
++  /* Deal with as much of this read request as possible by transferring
+   ** data from the memory mapping using memcpy().  */
+   if( offsetmmapSize ){
+     if( offset+amt <= pFile->mmapSize ){
+@@ -38982,7 +41660,7 @@ static int unixWrite(
+ #endif
+ 
+ #if defined(SQLITE_MMAP_READWRITE) && SQLITE_MAX_MMAP_SIZE>0
+-  /* Deal with as much of this write request as possible by transfering
++  /* Deal with as much of this write request as possible by transferring
+   ** data from the memory mapping using memcpy().  */
+   if( offsetmmapSize ){
+     if( offset+amt <= pFile->mmapSize ){
+@@ -39104,7 +41782,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){
+   /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a
+   ** no-op.  But go ahead and call fstat() to validate the file
+   ** descriptor as we need a method to provoke a failure during
+-  ** coverate testing.
++  ** coverage testing.
+   */
+ #ifdef SQLITE_NO_SYNC
+   {
+@@ -39497,7 +42175,13 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
+ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
+     case SQLITE_FCNTL_LOCK_TIMEOUT: {
+       int iOld = pFile->iBusyTimeout;
++#if SQLITE_ENABLE_SETLK_TIMEOUT==1
+       pFile->iBusyTimeout = *(int*)pArg;
++#elif SQLITE_ENABLE_SETLK_TIMEOUT==2
++      pFile->iBusyTimeout = !!(*(int*)pArg);
++#else
++# error "SQLITE_ENABLE_SETLK_TIMEOUT must be set to 1 or 2"
++#endif
+       *(int*)pArg = iOld;
+       return SQLITE_OK;
+     }
+@@ -39750,6 +42434,25 @@ static int unixGetpagesize(void){
+ ** Either unixShmNode.pShmMutex must be held or unixShmNode.nRef==0 and
+ ** unixMutexHeld() is true when reading or writing any other field
+ ** in this structure.
++**
++** aLock[SQLITE_SHM_NLOCK]:
++**   This array records the various locks held by clients on each of the
++**   SQLITE_SHM_NLOCK slots. If the aLock[] entry is set to 0, then no
++**   locks are held by the process on this slot. If it is set to -1, then
++**   some client holds an EXCLUSIVE lock on the locking slot. If the aLock[]
++**   value is set to a positive value, then it is the number of shared
++**   locks currently held on the slot.
++**
++** aMutex[SQLITE_SHM_NLOCK]:
++**   Normally, when SQLITE_ENABLE_SETLK_TIMEOUT is not defined, mutex
++**   pShmMutex is used to protect the aLock[] array and the right to
++**   call fcntl() on unixShmNode.hShm to obtain or release locks.
++**
++**   If SQLITE_ENABLE_SETLK_TIMEOUT is defined though, we use an array
++**   of mutexes - one for each locking slot. To read or write locking
++**   slot aLock[iSlot], the caller must hold the corresponding mutex
++**   aMutex[iSlot]. Similarly, to call fcntl() to obtain or release a
++**   lock corresponding to slot iSlot, mutex aMutex[iSlot] must be held.
+ */
+ struct unixShmNode {
+   unixInodeInfo *pInode;     /* unixInodeInfo that owns this SHM node */
+@@ -39763,10 +42466,11 @@ struct unixShmNode {
+   char **apRegion;           /* Array of mapped shared-memory regions */
+   int nRef;                  /* Number of unixShm objects pointing to this */
+   unixShm *pFirst;           /* All unixShm objects pointing to this */
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++  sqlite3_mutex *aMutex[SQLITE_SHM_NLOCK];
++#endif
+   int aLock[SQLITE_SHM_NLOCK];  /* # shared locks on slot, -1==excl lock */
+ #ifdef SQLITE_DEBUG
+-  u8 exclMask;               /* Mask of exclusive locks held */
+-  u8 sharedMask;             /* Mask of shared locks held */
+   u8 nextShmId;              /* Next available unixShm.id value */
+ #endif
+ };
+@@ -39849,16 +42553,35 @@ static int unixShmSystemLock(
+   struct flock f;        /* The posix advisory locking structure */
+   int rc = SQLITE_OK;    /* Result code form fcntl() */
+ 
+-  /* Access to the unixShmNode object is serialized by the caller */
+   pShmNode = pFile->pInode->pShmNode;
+-  assert( pShmNode->nRef==0 || sqlite3_mutex_held(pShmNode->pShmMutex) );
+-  assert( pShmNode->nRef>0 || unixMutexHeld() );
++
++  /* Assert that the parameters are within expected range and that the
++  ** correct mutex or mutexes are held. */
++  assert( pShmNode->nRef>=0 );
++  assert( (ofst==UNIX_SHM_DMS && n==1)
++       || (ofst>=UNIX_SHM_BASE && ofst+n<=(UNIX_SHM_BASE+SQLITE_SHM_NLOCK))
++  );
++  if( ofst==UNIX_SHM_DMS ){
++    assert( pShmNode->nRef>0 || unixMutexHeld() );
++    assert( pShmNode->nRef==0 || sqlite3_mutex_held(pShmNode->pShmMutex) );
++  }else{
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++    int ii;
++    for(ii=ofst-UNIX_SHM_BASE; iiaMutex[ii]) );
++    }
++#else
++    assert( sqlite3_mutex_held(pShmNode->pShmMutex) );
++    assert( pShmNode->nRef>0 );
++#endif
++  }
+ 
+   /* Shared locks never span more than one byte */
+   assert( n==1 || lockType!=F_RDLCK );
+ 
+   /* Locks are within range */
+   assert( n>=1 && n<=SQLITE_SHM_NLOCK );
++  assert( ofst>=UNIX_SHM_BASE && ofst<=(UNIX_SHM_DMS+SQLITE_SHM_NLOCK) );
+ 
+   if( pShmNode->hShm>=0 ){
+     int res;
+@@ -39869,7 +42592,7 @@ static int unixShmSystemLock(
+     f.l_len = n;
+     res = osSetPosixAdvisoryLock(pShmNode->hShm, &f, pFile);
+     if( res==-1 ){
+-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && SQLITE_ENABLE_SETLK_TIMEOUT==1
+       rc = (pFile->iBusyTimeout ? SQLITE_BUSY_TIMEOUT : SQLITE_BUSY);
+ #else
+       rc = SQLITE_BUSY;
+@@ -39877,39 +42600,28 @@ static int unixShmSystemLock(
+     }
+   }
+ 
+-  /* Update the global lock state and do debug tracing */
++  /* Do debug tracing */
+ #ifdef SQLITE_DEBUG
+-  { u16 mask;
+   OSTRACE(("SHM-LOCK "));
+-  mask = ofst>31 ? 0xffff : (1<<(ofst+n)) - (1<exclMask &= ~mask;
+-      pShmNode->sharedMask &= ~mask;
++      OSTRACE(("unlock %d..%d ok\n", ofst, ofst+n-1));
+     }else if( lockType==F_RDLCK ){
+-      OSTRACE(("read-lock %d ok", ofst));
+-      pShmNode->exclMask &= ~mask;
+-      pShmNode->sharedMask |= mask;
++      OSTRACE(("read-lock %d..%d ok\n", ofst, ofst+n-1));
+     }else{
+       assert( lockType==F_WRLCK );
+-      OSTRACE(("write-lock %d ok", ofst));
+-      pShmNode->exclMask |= mask;
+-      pShmNode->sharedMask &= ~mask;
++      OSTRACE(("write-lock %d..%d ok\n", ofst, ofst+n-1));
+     }
+   }else{
+     if( lockType==F_UNLCK ){
+-      OSTRACE(("unlock %d failed", ofst));
++      OSTRACE(("unlock %d..%d failed\n", ofst, ofst+n-1));
+     }else if( lockType==F_RDLCK ){
+-      OSTRACE(("read-lock failed"));
++      OSTRACE(("read-lock %d..%d failed\n", ofst, ofst+n-1));
+     }else{
+       assert( lockType==F_WRLCK );
+-      OSTRACE(("write-lock %d failed", ofst));
++      OSTRACE(("write-lock %d..%d failed\n", ofst, ofst+n-1));
+     }
+   }
+-  OSTRACE((" - afterwards %03x,%03x\n",
+-           pShmNode->sharedMask, pShmNode->exclMask));
+-  }
+ #endif
+ 
+   return rc;
+@@ -39946,6 +42658,11 @@ static void unixShmPurge(unixFile *pFd){
+     int i;
+     assert( p->pInode==pFd->pInode );
+     sqlite3_mutex_free(p->pShmMutex);
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++    for(i=0; iaMutex[i]);
++    }
++#endif
+     for(i=0; inRegion; i+=nShmPerMap){
+       if( p->hShm>=0 ){
+         osMunmap(p->apRegion[i], p->szRegion);
+@@ -40005,7 +42722,20 @@ static int unixLockSharedMemory(unixFile *pDbFd, unixShmNode *pShmNode){
+       pShmNode->isUnlocked = 1;
+       rc = SQLITE_READONLY_CANTINIT;
+     }else{
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++      /* Do not use a blocking lock here. If the lock cannot be obtained
++      ** immediately, it means some other connection is truncating the
++      ** *-shm file. And after it has done so, it will not release its
++      ** lock, but only downgrade it to a shared lock. So no point in
++      ** blocking here. The call below to obtain the shared DMS lock may
++      ** use a blocking lock. */
++      int iSaveTimeout = pDbFd->iBusyTimeout;
++      pDbFd->iBusyTimeout = 0;
++#endif
+       rc = unixShmSystemLock(pDbFd, F_WRLCK, UNIX_SHM_DMS, 1);
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++      pDbFd->iBusyTimeout = iSaveTimeout;
++#endif
+       /* The first connection to attach must truncate the -shm file.  We
+       ** truncate to 3 bytes (an arbitrary small number, less than the
+       ** -shm header size) rather than 0 as a system debugging aid, to
+@@ -40126,6 +42856,18 @@ static int unixOpenSharedMemory(unixFile *pDbFd){
+         rc = SQLITE_NOMEM_BKPT;
+         goto shm_open_err;
+       }
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++      {
++        int ii;
++        for(ii=0; iiaMutex[ii] = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
++          if( pShmNode->aMutex[ii]==0 ){
++            rc = SQLITE_NOMEM_BKPT;
++            goto shm_open_err;
++          }
++        }
++      }
++#endif
+     }
+ 
+     if( pInode->bProcessLock==0 ){
+@@ -40347,9 +43089,11 @@ shmpage_out:
+ */
+ #ifdef SQLITE_DEBUG
+ static int assertLockingArrayOk(unixShmNode *pShmNode){
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++  return 1;
++#else
+   unixShm *pX;
+   int aLock[SQLITE_SHM_NLOCK];
+-  assert( sqlite3_mutex_held(pShmNode->pShmMutex) );
+ 
+   memset(aLock, 0, sizeof(aLock));
+   for(pX=pShmNode->pFirst; pX; pX=pX->pNext){
+@@ -40367,13 +43111,14 @@ static int assertLockingArrayOk(unixShmNode *pShmNode){
+ 
+   assert( 0==memcmp(pShmNode->aLock, aLock, sizeof(aLock)) );
+   return (memcmp(pShmNode->aLock, aLock, sizeof(aLock))==0);
++#endif
+ }
+ #endif
+ 
+ /*
+ ** Change the lock state for a shared-memory segment.
+ **
+-** Note that the relationship between SHAREd and EXCLUSIVE locks is a little
++** Note that the relationship between SHARED and EXCLUSIVE locks is a little
+ ** different here than in posix.  In xShmLock(), one can go from unlocked
+ ** to shared and back or from unlocked to exclusive and back.  But one may
+ ** not go from shared to exclusive or from exclusive to shared.
+@@ -40388,7 +43133,7 @@ static int unixShmLock(
+   unixShm *p;                           /* The shared memory being locked */
+   unixShmNode *pShmNode;                /* The underlying file iNode */
+   int rc = SQLITE_OK;                   /* Result code */
+-  u16 mask;                             /* Mask of locks to take or release */
++  u16 mask = (1<<(ofst+n)) - (1<pShm;
+@@ -40423,88 +43168,151 @@ static int unixShmLock(
+   ** It is not permitted to block on the RECOVER lock.
+   */
+ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
+-  assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
+-         (ofst!=2)                                   /* not RECOVER */
+-      && (ofst!=1 || (p->exclMask|p->sharedMask)==0)
+-      && (ofst!=0 || (p->exclMask|p->sharedMask)<3)
+-      && (ofst<3  || (p->exclMask|p->sharedMask)<(1<exclMask|p->sharedMask);
++    assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
++          (ofst!=2)                                   /* not RECOVER */
++       && (ofst!=1 || lockMask==0 || lockMask==2)
++       && (ofst!=0 || lockMask<3)
++       && (ofst<3  || lockMask<(1<1 || mask==(1<pShmMutex);
+-  assert( assertLockingArrayOk(pShmNode) );
+-  if( flags & SQLITE_SHM_UNLOCK ){
+-    if( (p->exclMask|p->sharedMask) & mask ){
+-      int ii;
+-      int bUnlock = 1;
++  /* Check if there is any work to do. There are three cases:
++  **
++  **    a) An unlock operation where there are locks to unlock,
++  **    b) An shared lock where the requested lock is not already held
++  **    c) An exclusive lock where the requested lock is not already held
++  **
++  ** The SQLite core never requests an exclusive lock that it already holds.
++  ** This is assert()ed below.
++  */
++  assert( flags!=(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK)
++       || 0==(p->exclMask & mask)
++  );
++  if( ((flags & SQLITE_SHM_UNLOCK) && ((p->exclMask|p->sharedMask) & mask))
++   || (flags==(SQLITE_SHM_SHARED|SQLITE_SHM_LOCK) && 0==(p->sharedMask & mask))
++   || (flags==(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK))
++  ){
+ 
+-      for(ii=ofst; ii((p->sharedMask & (1<aMutex[iMutex]);
++        if( rc!=SQLITE_OK ) goto leave_shmnode_mutexes;
++      }else{
++        sqlite3_mutex_enter(pShmNode->aMutex[iMutex]);
+       }
++    }
++#else
++    sqlite3_mutex_enter(pShmNode->pShmMutex);
++#endif
+ 
+-      if( bUnlock ){
+-        rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
+-        if( rc==SQLITE_OK ){
+-          memset(&aLock[ofst], 0, sizeof(int)*n);
++    if( ALWAYS(rc==SQLITE_OK) ){
++      if( flags & SQLITE_SHM_UNLOCK ){
++        /* Case (a) - unlock.  */
++        int bUnlock = 1;
++        assert( (p->exclMask & p->sharedMask)==0 );
++        assert( !(flags & SQLITE_SHM_EXCLUSIVE) || (p->exclMask & mask)==mask );
++        assert( !(flags & SQLITE_SHM_SHARED) || (p->sharedMask & mask)==mask );
++
++        /* If this is a SHARED lock being unlocked, it is possible that other
++        ** clients within this process are holding the same SHARED lock. In
++        ** this case, set bUnlock to 0 so that the posix lock is not removed
++        ** from the file-descriptor below.  */
++        if( flags & SQLITE_SHM_SHARED ){
++          assert( n==1 );
++          assert( aLock[ofst]>=1 );
++          if( aLock[ofst]>1 ){
++            bUnlock = 0;
++            aLock[ofst]--;
++            p->sharedMask &= ~mask;
++          }
+         }
+-      }else if( ALWAYS(p->sharedMask & (1<1 );
+-        aLock[ofst]--;
+-      }
+ 
+-      /* Undo the local locks */
+-      if( rc==SQLITE_OK ){
+-        p->exclMask &= ~mask;
+-        p->sharedMask &= ~mask;
+-      }
+-    }
+-  }else if( flags & SQLITE_SHM_SHARED ){
+-    assert( n==1 );
+-    assert( (p->exclMask & (1<sharedMask & mask)==0 ){
+-      if( aLock[ofst]<0 ){
+-        rc = SQLITE_BUSY;
+-      }else if( aLock[ofst]==0 ){
+-        rc = unixShmSystemLock(pDbFd, F_RDLCK, ofst+UNIX_SHM_BASE, n);
+-      }
++        if( bUnlock ){
++          rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
++          if( rc==SQLITE_OK ){
++            memset(&aLock[ofst], 0, sizeof(int)*n);
++            p->sharedMask &= ~mask;
++            p->exclMask &= ~mask;
++          }
++        }
++      }else if( flags & SQLITE_SHM_SHARED ){
++        /* Case (b) - a shared lock.  */
+ 
+-      /* Get the local shared locks */
+-      if( rc==SQLITE_OK ){
+-        p->sharedMask |= mask;
+-        aLock[ofst]++;
+-      }
+-    }
+-  }else{
+-    /* Make sure no sibling connections hold locks that will block this
+-    ** lock.  If any do, return SQLITE_BUSY right away.  */
+-    int ii;
+-    for(ii=ofst; iisharedMask & mask)==0 );
+-      if( ALWAYS((p->exclMask & (1<sharedMask |= mask;
++          aLock[ofst]++;
++        }
++      }else{
++        /* Case (c) - an exclusive lock.  */
++        int ii;
++
++        assert( flags==(SQLITE_SHM_LOCK|SQLITE_SHM_EXCLUSIVE) );
+         assert( (p->sharedMask & mask)==0 );
+-        p->exclMask |= mask;
++        assert( (p->exclMask & mask)==0 );
++
++        /* Make sure no sibling connections hold locks that will block this
++        ** lock.  If any do, return SQLITE_BUSY right away.  */
+         for(ii=ofst; iiexclMask |= mask;
++            for(ii=ofst; ii=ofst; iMutex--){
++      sqlite3_mutex_leave(pShmNode->aMutex[iMutex]);
+     }
++#else
++    sqlite3_mutex_leave(pShmNode->pShmMutex);
++#endif
+   }
+-  assert( assertLockingArrayOk(pShmNode) );
+-  sqlite3_mutex_leave(pShmNode->pShmMutex);
++
+   OSTRACE(("SHM-LOCK shmid-%d, pid-%d got %03x,%03x\n",
+            p->id, osGetpid(0), p->sharedMask, p->exclMask));
+   return rc;
+@@ -40754,11 +43562,16 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
+ 
+ #if SQLITE_MAX_MMAP_SIZE>0
+   if( pFd->mmapSizeMax>0 ){
++    /* Ensure that there is always at least a 256 byte buffer of addressable
++    ** memory following the returned page. If the database is corrupt,
++    ** SQLite may overread the page slightly (in practice only a few bytes,
++    ** but 256 is safe, round, number).  */
++    const int nEofBuffer = 256;
+     if( pFd->pMapRegion==0 ){
+       int rc = unixMapfile(pFd, -1);
+       if( rc!=SQLITE_OK ) return rc;
+     }
+-    if( pFd->mmapSize >= iOff+nAmt ){
++    if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){
+       *pp = &((u8 *)pFd->pMapRegion)[iOff];
+       pFd->nFetchOut++;
+     }
+@@ -41934,12 +44747,10 @@ static void appendOnePathElement(
+   if( zName[0]=='.' ){
+     if( nName==1 ) return;
+     if( zName[1]=='.' && nName==2 ){
+-      if( pPath->nUsed<=1 ){
+-        pPath->rc = SQLITE_ERROR;
+-        return;
++      if( pPath->nUsed>1 ){
++        assert( pPath->zOut[0]=='/' );
++        while( pPath->zOut[--pPath->nUsed]!='/' ){}
+       }
+-      assert( pPath->zOut[0]=='/' );
+-      while( pPath->zOut[--pPath->nUsed]!='/' ){}
+       return;
+     }
+   }
+@@ -42151,12 +44962,17 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nBuf, char *zBuf){
+ ** than the argument.
+ */
+ static int unixSleep(sqlite3_vfs *NotUsed, int microseconds){
+-#if OS_VXWORKS
++#if !defined(HAVE_NANOSLEEP) || HAVE_NANOSLEEP+0
+   struct timespec sp;
+-
+   sp.tv_sec = microseconds / 1000000;
+   sp.tv_nsec = (microseconds % 1000000) * 1000;
++
++  /* Almost all modern unix systems support nanosleep().  But if you are
++  ** compiling for one of the rare exceptions, you can use
++  ** -DHAVE_NANOSLEEP=0 (perhaps in conjuction with -DHAVE_USLEEP if
++  ** usleep() is available) in order to bypass the use of nanosleep() */
+   nanosleep(&sp, NULL);
++
+   UNUSED_PARAMETER(NotUsed);
+   return microseconds;
+ #elif defined(HAVE_USLEEP) && HAVE_USLEEP
+@@ -43533,8 +46349,16 @@ SQLITE_API int sqlite3_os_init(void){
+ 
+   /* Register all VFSes defined in the aVfs[] array */
+   for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){
++#ifdef SQLITE_DEFAULT_UNIX_VFS
++    sqlite3_vfs_register(&aVfs[i],
++           0==strcmp(aVfs[i].zName,SQLITE_DEFAULT_UNIX_VFS));
++#else
+     sqlite3_vfs_register(&aVfs[i], i==0);
++#endif
+   }
++#ifdef SQLITE_OS_KV_OPTIONAL
++  sqlite3KvvfsInit();
++#endif
+   unixBigLock = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
+ 
+ #ifndef SQLITE_OMIT_WAL
+@@ -44738,7 +47562,7 @@ static struct win_syscall {
+ 
+ /*
+ ** This is the xSetSystemCall() method of sqlite3_vfs for all of the
+-** "win32" VFSes.  Return SQLITE_OK opon successfully updating the
++** "win32" VFSes.  Return SQLITE_OK upon successfully updating the
+ ** system call pointer, or SQLITE_NOTFOUND if there is no configurable
+ ** system call named zName.
+ */
+@@ -46318,7 +49142,7 @@ static int winRead(
+            pFile->h, pBuf, amt, offset, pFile->locktype));
+ 
+ #if SQLITE_MAX_MMAP_SIZE>0
+-  /* Deal with as much of this read request as possible by transfering
++  /* Deal with as much of this read request as possible by transferring
+   ** data from the memory mapping using memcpy().  */
+   if( offsetmmapSize ){
+     if( offset+amt <= pFile->mmapSize ){
+@@ -46396,7 +49220,7 @@ static int winWrite(
+            pFile->h, pBuf, amt, offset, pFile->locktype));
+ 
+ #if defined(SQLITE_MMAP_READWRITE) && SQLITE_MAX_MMAP_SIZE>0
+-  /* Deal with as much of this write request as possible by transfering
++  /* Deal with as much of this write request as possible by transferring
+   ** data from the memory mapping using memcpy().  */
+   if( offsetmmapSize ){
+     if( offset+amt <= pFile->mmapSize ){
+@@ -46506,7 +49330,7 @@ static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
+     ** all references to memory-mapped content are closed.  That is doable,
+     ** but involves adding a few branches in the common write code path which
+     ** could slow down normal operations slightly.  Hence, we have decided for
+-    ** now to simply make trancations a no-op if there are pending reads.  We
++    ** now to simply make transactions a no-op if there are pending reads.  We
+     ** can maybe revisit this decision in the future.
+     */
+     return SQLITE_OK;
+@@ -46565,7 +49389,7 @@ static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
+ #ifdef SQLITE_TEST
+ /*
+ ** Count the number of fullsyncs and normal syncs.  This is used to test
+-** that syncs and fullsyncs are occuring at the right times.
++** that syncs and fullsyncs are occurring at the right times.
+ */
+ SQLITE_API int sqlite3_sync_count = 0;
+ SQLITE_API int sqlite3_fullsync_count = 0;
+@@ -46922,7 +49746,7 @@ static int winLock(sqlite3_file *id, int locktype){
+   */
+   if( locktype==EXCLUSIVE_LOCK && res ){
+     assert( pFile->locktype>=SHARED_LOCK );
+-    res = winUnlockReadLock(pFile);
++    (void)winUnlockReadLock(pFile);
+     res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, SHARED_FIRST, 0,
+                       SHARED_SIZE, 0);
+     if( res ){
+@@ -48100,6 +50924,11 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
+ 
+ #if SQLITE_MAX_MMAP_SIZE>0
+   if( pFd->mmapSizeMax>0 ){
++    /* Ensure that there is always at least a 256 byte buffer of addressable
++    ** memory following the returned page. If the database is corrupt,
++    ** SQLite may overread the page slightly (in practice only a few bytes,
++    ** but 256 is safe, round, number).  */
++    const int nEofBuffer = 256;
+     if( pFd->pMapRegion==0 ){
+       int rc = winMapfile(pFd, -1);
+       if( rc!=SQLITE_OK ){
+@@ -48108,7 +50937,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
+         return rc;
+       }
+     }
+-    if( pFd->mmapSize >= iOff+nAmt ){
++    if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){
+       assert( pFd->pMapRegion!=0 );
+       *pp = &((u8 *)pFd->pMapRegion)[iOff];
+       pFd->nFetchOut++;
+@@ -48304,9 +51133,10 @@ static int winMakeEndInDirSep(int nBuf, char *zBuf){
+ }
+ 
+ /*
+-** If sqlite3_temp_directory is not, take the mutex and return true.
++** If sqlite3_temp_directory is defined, take the mutex and return true.
+ **
+-** If sqlite3_temp_directory is NULL, omit the mutex and return false.
++** If sqlite3_temp_directory is NULL (undefined), omit the mutex and
++** return false.
+ */
+ static int winTempDirDefined(void){
+   sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR));
+@@ -48325,6 +51155,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
+     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+     "0123456789";
+   size_t i, j;
++  DWORD pid;
+   int nPre = sqlite3Strlen30(SQLITE_TEMP_FILE_PREFIX);
+   int nMax, nBuf, nDir, nLen;
+   char *zBuf;
+@@ -48537,7 +51368,10 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
+ 
+   j = sqlite3Strlen30(zBuf);
+   sqlite3_randomness(15, &zBuf[j]);
++  pid = osGetCurrentProcessId();
+   for(i=0; i<15; i++, j++){
++    zBuf[j] += pid & 0xff;
++    pid >>= 8;
+     zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
+   }
+   zBuf[j] = 0;
+@@ -48775,7 +51609,7 @@ static int winOpen(
+       if( isReadWrite ){
+         int rc2, isRO = 0;
+         sqlite3BeginBenignMalloc();
+-        rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
++        rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO);
+         sqlite3EndBenignMalloc();
+         if( rc2==SQLITE_OK && isRO ) break;
+       }
+@@ -48792,7 +51626,7 @@ static int winOpen(
+       if( isReadWrite ){
+         int rc2, isRO = 0;
+         sqlite3BeginBenignMalloc();
+-        rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
++        rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO);
+         sqlite3EndBenignMalloc();
+         if( rc2==SQLITE_OK && isRO ) break;
+       }
+@@ -48812,7 +51646,7 @@ static int winOpen(
+       if( isReadWrite ){
+         int rc2, isRO = 0;
+         sqlite3BeginBenignMalloc();
+-        rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
++        rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO);
+         sqlite3EndBenignMalloc();
+         if( rc2==SQLITE_OK && isRO ) break;
+       }
+@@ -49035,6 +51869,13 @@ static int winAccess(
+   OSTRACE(("ACCESS name=%s, flags=%x, pResOut=%p\n",
+            zFilename, flags, pResOut));
+ 
++  if( zFilename==0 ){
++    *pResOut = 0;
++    OSTRACE(("ACCESS name=%s, pResOut=%p, *pResOut=%d, rc=SQLITE_OK\n",
++             zFilename, pResOut, *pResOut));
++    return SQLITE_OK;
++  }
++
+   zConverted = winConvertFromUtf8Filename(zFilename);
+   if( zConverted==0 ){
+     OSTRACE(("ACCESS name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename));
+@@ -49342,7 +52183,8 @@ static int winFullPathname(
+   char *zFull                   /* Output buffer */
+ ){
+   int rc;
+-  sqlite3_mutex *pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR);
++  MUTEX_LOGIC( sqlite3_mutex *pMutex; )
++  MUTEX_LOGIC( pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR); )
+   sqlite3_mutex_enter(pMutex);
+   rc = winFullPathnameNoMutex(pVfs, zRelative, nFull, zFull);
+   sqlite3_mutex_leave(pMutex);
+@@ -49884,6 +52726,7 @@ static int memdbTruncate(sqlite3_file*, sqlite3_int64 size);
+ static int memdbSync(sqlite3_file*, int flags);
+ static int memdbFileSize(sqlite3_file*, sqlite3_int64 *pSize);
+ static int memdbLock(sqlite3_file*, int);
++static int memdbUnlock(sqlite3_file*, int);
+ /* static int memdbCheckReservedLock(sqlite3_file*, int *pResOut);// not used */
+ static int memdbFileControl(sqlite3_file*, int op, void *pArg);
+ /* static int memdbSectorSize(sqlite3_file*); // not used */
+@@ -49942,7 +52785,7 @@ static const sqlite3_io_methods memdb_io_methods = {
+   memdbSync,                       /* xSync */
+   memdbFileSize,                   /* xFileSize */
+   memdbLock,                       /* xLock */
+-  memdbLock,                       /* xUnlock - same as xLock in this case */
++  memdbUnlock,                     /* xUnlock */
+   0, /* memdbCheckReservedLock, */ /* xCheckReservedLock */
+   memdbFileControl,                /* xFileControl */
+   0, /* memdbSectorSize,*/         /* xSectorSize */
+@@ -50143,39 +52986,81 @@ static int memdbLock(sqlite3_file *pFile, int eLock){
+   MemFile *pThis = (MemFile*)pFile;
+   MemStore *p = pThis->pStore;
+   int rc = SQLITE_OK;
+-  if( eLock==pThis->eLock ) return SQLITE_OK;
++  if( eLock<=pThis->eLock ) return SQLITE_OK;
+   memdbEnter(p);
+-  if( eLock>SQLITE_LOCK_SHARED ){
+-    if( p->mFlags & SQLITE_DESERIALIZE_READONLY ){
+-      rc = SQLITE_READONLY;
+-    }else if( pThis->eLock<=SQLITE_LOCK_SHARED ){
+-      if( p->nWrLock ){
+-        rc = SQLITE_BUSY;
+-      }else{
+-        p->nWrLock = 1;
++
++  assert( p->nWrLock==0 || p->nWrLock==1 );
++  assert( pThis->eLock<=SQLITE_LOCK_SHARED || p->nWrLock==1 );
++  assert( pThis->eLock==SQLITE_LOCK_NONE || p->nRdLock>=1 );
++
++  if( eLock>SQLITE_LOCK_SHARED && (p->mFlags & SQLITE_DESERIALIZE_READONLY) ){
++    rc = SQLITE_READONLY;
++  }else{
++    switch( eLock ){
++      case SQLITE_LOCK_SHARED: {
++        assert( pThis->eLock==SQLITE_LOCK_NONE );
++        if( p->nWrLock>0 ){
++          rc = SQLITE_BUSY;
++        }else{
++          p->nRdLock++;
++        }
++        break;
++      };
++
++      case SQLITE_LOCK_RESERVED:
++      case SQLITE_LOCK_PENDING: {
++        assert( pThis->eLock>=SQLITE_LOCK_SHARED );
++        if( ALWAYS(pThis->eLock==SQLITE_LOCK_SHARED) ){
++          if( p->nWrLock>0 ){
++            rc = SQLITE_BUSY;
++          }else{
++            p->nWrLock = 1;
++          }
++        }
++        break;
++      }
++
++      default: {
++        assert(  eLock==SQLITE_LOCK_EXCLUSIVE );
++        assert( pThis->eLock>=SQLITE_LOCK_SHARED );
++        if( p->nRdLock>1 ){
++          rc = SQLITE_BUSY;
++        }else if( pThis->eLock==SQLITE_LOCK_SHARED ){
++          p->nWrLock = 1;
++        }
++        break;
+       }
+     }
+-  }else if( eLock==SQLITE_LOCK_SHARED ){
+-    if( pThis->eLock > SQLITE_LOCK_SHARED ){
+-      assert( p->nWrLock==1 );
+-      p->nWrLock = 0;
+-    }else if( p->nWrLock ){
+-      rc = SQLITE_BUSY;
+-    }else{
+-      p->nRdLock++;
++  }
++  if( rc==SQLITE_OK ) pThis->eLock = eLock;
++  memdbLeave(p);
++  return rc;
++}
++
++/*
++** Unlock an memdb-file.
++*/
++static int memdbUnlock(sqlite3_file *pFile, int eLock){
++  MemFile *pThis = (MemFile*)pFile;
++  MemStore *p = pThis->pStore;
++  if( eLock>=pThis->eLock ) return SQLITE_OK;
++  memdbEnter(p);
++
++  assert( eLock==SQLITE_LOCK_SHARED || eLock==SQLITE_LOCK_NONE );
++  if( eLock==SQLITE_LOCK_SHARED ){
++    if( ALWAYS(pThis->eLock>SQLITE_LOCK_SHARED) ){
++      p->nWrLock--;
+     }
+   }else{
+-    assert( eLock==SQLITE_LOCK_NONE );
+     if( pThis->eLock>SQLITE_LOCK_SHARED ){
+-      assert( p->nWrLock==1 );
+-      p->nWrLock = 0;
++      p->nWrLock--;
+     }
+-    assert( p->nRdLock>0 );
+     p->nRdLock--;
+   }
+-  if( rc==SQLITE_OK ) pThis->eLock = eLock;
++
++  pThis->eLock = eLock;
+   memdbLeave(p);
+-  return rc;
++  return SQLITE_OK;
+ }
+ 
+ #if 0
+@@ -50285,7 +53170,7 @@ static int memdbOpen(
+ 
+   memset(pFile, 0, sizeof(*pFile));
+   szName = sqlite3Strlen30(zName);
+-  if( szName>1 && zName[0]=='/' ){
++  if( szName>1 && (zName[0]=='/' || zName[0]=='\\') ){
+     int i;
+ #ifndef SQLITE_MUTEX_OMIT
+     sqlite3_mutex *pVfsMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
+@@ -50632,6 +53517,13 @@ end_deserialize:
+   return rc;
+ }
+ 
++/*
++** Return true if the VFS is the memvfs.
++*/
++SQLITE_PRIVATE int sqlite3IsMemdb(const sqlite3_vfs *pVfs){
++  return pVfs==&memdb_vfs;
++}
++
+ /*
+ ** This routine is called when the extension is loaded.
+ ** Register the new VFS.
+@@ -50844,7 +53736,7 @@ SQLITE_PRIVATE int sqlite3BitvecSet(Bitvec *p, u32 i){
+   h = BITVEC_HASH(i++);
+   /* if there wasn't a hash collision, and this doesn't */
+   /* completely fill the hash, then just add it without */
+-  /* worring about sub-dividing and re-hashing. */
++  /* worrying about sub-dividing and re-hashing. */
+   if( !p->u.aHash[h] ){
+     if (p->nSet<(BITVEC_NINT-1)) {
+       goto bitvec_set_end;
+@@ -51111,7 +54003,7 @@ bitvec_end:
+ struct PCache {
+   PgHdr *pDirty, *pDirtyTail;         /* List of dirty pages in LRU order */
+   PgHdr *pSynced;                     /* Last synced page in dirty page list */
+-  int nRefSum;                        /* Sum of ref counts over all pages */
++  i64 nRefSum;                        /* Sum of ref counts over all pages */
+   int szCache;                        /* Configured cache size */
+   int szSpill;                        /* Size before spilling occurs */
+   int szPage;                         /* Size of every page in this cache */
+@@ -51136,12 +54028,24 @@ struct PCache {
+   int sqlite3PcacheTrace = 2;       /* 0: off  1: simple  2: cache dumps */
+   int sqlite3PcacheMxDump = 9999;   /* Max cache entries for pcacheDump() */
+ # define pcacheTrace(X) if(sqlite3PcacheTrace){sqlite3DebugPrintf X;}
+-  void pcacheDump(PCache *pCache){
+-    int N;
+-    int i, j;
+-    sqlite3_pcache_page *pLower;
++  static void pcachePageTrace(int i, sqlite3_pcache_page *pLower){
+     PgHdr *pPg;
+     unsigned char *a;
++    int j;
++    if( pLower==0 ){
++      printf("%3d: NULL\n", i);
++    }else{
++      pPg = (PgHdr*)pLower->pExtra;
++      printf("%3d: nRef %2lld flgs %02x data ", i, pPg->nRef, pPg->flags);
++      a = (unsigned char *)pLower->pBuf;
++      for(j=0; j<12; j++) printf("%02x", a[j]);
++      printf(" ptr %p\n", pPg);
++    }
++  }
++  static void pcacheDump(PCache *pCache){
++    int N;
++    int i;
++    sqlite3_pcache_page *pLower;
+ 
+     if( sqlite3PcacheTrace<2 ) return;
+     if( pCache->pCache==0 ) return;
+@@ -51149,22 +54053,42 @@ struct PCache {
+     if( N>sqlite3PcacheMxDump ) N = sqlite3PcacheMxDump;
+     for(i=1; i<=N; i++){
+        pLower = sqlite3GlobalConfig.pcache2.xFetch(pCache->pCache, i, 0);
+-       if( pLower==0 ) continue;
+-       pPg = (PgHdr*)pLower->pExtra;
+-       printf("%3d: nRef %2d flgs %02x data ", i, pPg->nRef, pPg->flags);
+-       a = (unsigned char *)pLower->pBuf;
+-       for(j=0; j<12; j++) printf("%02x", a[j]);
+-       printf("\n");
+-       if( pPg->pPage==0 ){
++       pcachePageTrace(i, pLower);
++       if( pLower && ((PgHdr*)pLower)->pPage==0 ){
+          sqlite3GlobalConfig.pcache2.xUnpin(pCache->pCache, pLower, 0);
+        }
+     }
+   }
+-  #else
++#else
+ # define pcacheTrace(X)
++# define pcachePageTrace(PGNO, X)
+ # define pcacheDump(X)
+ #endif
+ 
++/*
++** Return 1 if pPg is on the dirty list for pCache.  Return 0 if not.
++** This routine runs inside of assert() statements only.
++*/
++#if defined(SQLITE_ENABLE_EXPENSIVE_ASSERT)
++static int pageOnDirtyList(PCache *pCache, PgHdr *pPg){
++  PgHdr *p;
++  for(p=pCache->pDirty; p; p=p->pDirtyNext){
++    if( p==pPg ) return 1;
++  }
++  return 0;
++}
++static int pageNotOnDirtyList(PCache *pCache, PgHdr *pPg){
++  PgHdr *p;
++  for(p=pCache->pDirty; p; p=p->pDirtyNext){
++    if( p==pPg ) return 0;
++  }
++  return 1;
++}
++#else
++# define pageOnDirtyList(A,B)    1
++# define pageNotOnDirtyList(A,B) 1
++#endif
++
+ /*
+ ** Check invariants on a PgHdr entry.  Return true if everything is OK.
+ ** Return false if any invariant is violated.
+@@ -51183,8 +54107,13 @@ SQLITE_PRIVATE int sqlite3PcachePageSanity(PgHdr *pPg){
+   assert( pCache!=0 );      /* Every page has an associated PCache */
+   if( pPg->flags & PGHDR_CLEAN ){
+     assert( (pPg->flags & PGHDR_DIRTY)==0 );/* Cannot be both CLEAN and DIRTY */
+-    assert( pCache->pDirty!=pPg );          /* CLEAN pages not on dirty list */
+-    assert( pCache->pDirtyTail!=pPg );
++    assert( pageNotOnDirtyList(pCache, pPg) );/* CLEAN pages not on dirtylist */
++  }else{
++    assert( (pPg->flags & PGHDR_DIRTY)!=0 );/* If not CLEAN must be DIRTY */
++    assert( pPg->pDirtyNext==0 || pPg->pDirtyNext->pDirtyPrev==pPg );
++    assert( pPg->pDirtyPrev==0 || pPg->pDirtyPrev->pDirtyNext==pPg );
++    assert( pPg->pDirtyPrev!=0 || pCache->pDirty==pPg );
++    assert( pageOnDirtyList(pCache, pPg) );
+   }
+   /* WRITEABLE pages must also be DIRTY */
+   if( pPg->flags & PGHDR_WRITEABLE ){
+@@ -51314,7 +54243,7 @@ static int numberOfCachePages(PCache *p){
+     return p->szCache;
+   }else{
+     i64 n;
+-    /* IMPLEMANTATION-OF: R-59858-46238 If the argument N is negative, then the
++    /* IMPLEMENTATION-OF: R-59858-46238 If the argument N is negative, then the
+     ** number of cache pages is adjusted to be a number of pages that would
+     ** use approximately abs(N*1024) bytes of memory based on the current
+     ** page size. */
+@@ -51458,8 +54387,9 @@ SQLITE_PRIVATE sqlite3_pcache_page *sqlite3PcacheFetch(
+   assert( createFlag==0 || pCache->eCreate==eCreate );
+   assert( createFlag==0 || eCreate==1+(!pCache->bPurgeable||!pCache->pDirty) );
+   pRes = sqlite3GlobalConfig.pcache2.xFetch(pCache->pCache, pgno, eCreate);
+-  pcacheTrace(("%p.FETCH %d%s (result: %p)\n",pCache,pgno,
++  pcacheTrace(("%p.FETCH %d%s (result: %p) ",pCache,pgno,
+                createFlag?" create":"",pRes));
++  pcachePageTrace(pgno, pRes);
+   return pRes;
+ }
+ 
+@@ -51587,6 +54517,7 @@ SQLITE_PRIVATE void SQLITE_NOINLINE sqlite3PcacheRelease(PgHdr *p){
+       pcacheUnpin(p);
+     }else{
+       pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
++      assert( sqlite3PcachePageSanity(p) );
+     }
+   }
+ }
+@@ -51630,6 +54561,7 @@ SQLITE_PRIVATE void sqlite3PcacheMakeDirty(PgHdr *p){
+       pcacheTrace(("%p.DIRTY %d\n",p->pCache,p->pgno));
+       assert( (p->flags & (PGHDR_DIRTY|PGHDR_CLEAN))==PGHDR_DIRTY );
+       pcacheManageDirtyList(p, PCACHE_DIRTYLIST_ADD);
++      assert( sqlite3PcachePageSanity(p) );
+     }
+     assert( sqlite3PcachePageSanity(p) );
+   }
+@@ -51799,7 +54731,7 @@ static PgHdr *pcacheMergeDirtyList(PgHdr *pA, PgHdr *pB){
+ }
+ 
+ /*
+-** Sort the list of pages in accending order by pgno.  Pages are
++** Sort the list of pages in ascending order by pgno.  Pages are
+ ** connected by pDirty pointers.  The pDirtyPrev pointers are
+ ** corrupted by this sort.
+ **
+@@ -51858,14 +54790,14 @@ SQLITE_PRIVATE PgHdr *sqlite3PcacheDirtyList(PCache *pCache){
+ ** This is not the total number of pages referenced, but the sum of the
+ ** reference count for all pages.
+ */
+-SQLITE_PRIVATE int sqlite3PcacheRefCount(PCache *pCache){
++SQLITE_PRIVATE i64 sqlite3PcacheRefCount(PCache *pCache){
+   return pCache->nRefSum;
+ }
+ 
+ /*
+ ** Return the number of references to the page supplied as an argument.
+ */
+-SQLITE_PRIVATE int sqlite3PcachePageRefcount(PgHdr *p){
++SQLITE_PRIVATE i64 sqlite3PcachePageRefcount(PgHdr *p){
+   return p->nRef;
+ }
+ 
+@@ -52007,12 +54939,13 @@ SQLITE_PRIVATE void sqlite3PcacheIterateDirty(PCache *pCache, void (*xIter)(PgHd
+ ** size can vary according to architecture, compile-time options, and
+ ** SQLite library version number.
+ **
+-** If SQLITE_PCACHE_SEPARATE_HEADER is defined, then the extension is obtained
+-** using a separate memory allocation from the database page content.  This
+-** seeks to overcome the "clownshoe" problem (also called "internal
+-** fragmentation" in academic literature) of allocating a few bytes more
+-** than a power of two with the memory allocator rounding up to the next
+-** power of two, and leaving the rounded-up space unused.
++** Historical note:  It used to be that if the SQLITE_PCACHE_SEPARATE_HEADER
++** was defined, then the page content would be held in a separate memory
++** allocation from the PgHdr1.  This was intended to avoid clownshoe memory
++** allocations.  However, the btree layer needs a small (16-byte) overrun
++** area after the page content buffer.  The header serves as that overrun
++** area.  Therefore SQLITE_PCACHE_SEPARATE_HEADER was discontinued to avoid
++** any possibility of a memory error.
+ **
+ ** This module tracks pointers to PgHdr1 objects.  Only pcache.c communicates
+ ** with this module.  Information is passed back and forth as PgHdr1 pointers.
+@@ -52038,7 +54971,7 @@ SQLITE_PRIVATE void sqlite3PcacheIterateDirty(PCache *pCache, void (*xIter)(PgHd
+ ** If N is positive, then N pages worth of memory are allocated using a single
+ ** sqlite3Malloc() call and that memory is used for the first N pages allocated.
+ ** Or if N is negative, then -1024*N bytes of memory are allocated and used
+-** for as many pages as can be accomodated.
++** for as many pages as can be accommodated.
+ **
+ ** Only one of (2) or (3) can be used.  Once the memory available to (2) or
+ ** (3) is exhausted, subsequent allocations fail over to the general-purpose
+@@ -52057,30 +54990,40 @@ typedef struct PGroup PGroup;
+ 
+ /*
+ ** Each cache entry is represented by an instance of the following
+-** structure. Unless SQLITE_PCACHE_SEPARATE_HEADER is defined, a buffer of
+-** PgHdr1.pCache->szPage bytes is allocated directly before this structure
+-** in memory.
++** structure. A buffer of PgHdr1.pCache->szPage bytes is allocated
++** directly before this structure and is used to cache the page content.
++**
++** When reading a corrupt database file, it is possible that SQLite might
++** read a few bytes (no more than 16 bytes) past the end of the page buffer.
++** It will only read past the end of the page buffer, never write.  This
++** object is positioned immediately after the page buffer to serve as an
++** overrun area, so that overreads are harmless.
+ **
+-** Note: Variables isBulkLocal and isAnchor were once type "u8". That works,
++** Variables isBulkLocal and isAnchor were once type "u8". That works,
+ ** but causes a 2-byte gap in the structure for most architectures (since
+ ** pointers must be either 4 or 8-byte aligned). As this structure is located
+ ** in memory directly after the associated page data, if the database is
+ ** corrupt, code at the b-tree layer may overread the page buffer and
+ ** read part of this structure before the corruption is detected. This
+-** can cause a valgrind error if the unitialized gap is accessed. Using u16
+-** ensures there is no such gap, and therefore no bytes of unitialized memory
+-** in the structure.
++** can cause a valgrind error if the uninitialized gap is accessed. Using u16
++** ensures there is no such gap, and therefore no bytes of uninitialized
++** memory in the structure.
++**
++** The pLruNext and pLruPrev pointers form a double-linked circular list
++** of all pages that are unpinned.  The PGroup.lru element (which should be
++** the only element on the list with PgHdr1.isAnchor set to 1) forms the
++** beginning and the end of the list.
+ */
+ struct PgHdr1 {
+-  sqlite3_pcache_page page;      /* Base class. Must be first. pBuf & pExtra */
+-  unsigned int iKey;             /* Key value (page number) */
+-  u16 isBulkLocal;               /* This page from bulk local storage */
+-  u16 isAnchor;                  /* This is the PGroup.lru element */
+-  PgHdr1 *pNext;                 /* Next in hash table chain */
+-  PCache1 *pCache;               /* Cache that currently owns this page */
+-  PgHdr1 *pLruNext;              /* Next in LRU list of unpinned pages */
+-  PgHdr1 *pLruPrev;              /* Previous in LRU list of unpinned pages */
+-                                 /* NB: pLruPrev is only valid if pLruNext!=0 */
++  sqlite3_pcache_page page; /* Base class. Must be first. pBuf & pExtra */
++  unsigned int iKey;        /* Key value (page number) */
++  u16 isBulkLocal;          /* This page from bulk local storage */
++  u16 isAnchor;             /* This is the PGroup.lru element */
++  PgHdr1 *pNext;            /* Next in hash table chain */
++  PCache1 *pCache;          /* Cache that currently owns this page */
++  PgHdr1 *pLruNext;         /* Next in circular LRU list of unpinned pages */
++  PgHdr1 *pLruPrev;         /* Previous in LRU list of unpinned pages */
++                            /* NB: pLruPrev is only valid if pLruNext!=0 */
+ };
+ 
+ /*
+@@ -52406,25 +55349,13 @@ static PgHdr1 *pcache1AllocPage(PCache1 *pCache, int benignMalloc){
+     pcache1LeaveMutex(pCache->pGroup);
+ #endif
+     if( benignMalloc ){ sqlite3BeginBenignMalloc(); }
+-#ifdef SQLITE_PCACHE_SEPARATE_HEADER
+-    pPg = pcache1Alloc(pCache->szPage);
+-    p = sqlite3Malloc(sizeof(PgHdr1) + pCache->szExtra);
+-    if( !pPg || !p ){
+-      pcache1Free(pPg);
+-      sqlite3_free(p);
+-      pPg = 0;
+-    }
+-#else
+     pPg = pcache1Alloc(pCache->szAlloc);
+-#endif
+     if( benignMalloc ){ sqlite3EndBenignMalloc(); }
+ #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
+     pcache1EnterMutex(pCache->pGroup);
+ #endif
+     if( pPg==0 ) return 0;
+-#ifndef SQLITE_PCACHE_SEPARATE_HEADER
+     p = (PgHdr1 *)&((u8 *)pPg)[pCache->szPage];
+-#endif
+     p->page.pBuf = pPg;
+     p->page.pExtra = &p[1];
+     p->isBulkLocal = 0;
+@@ -52448,9 +55379,6 @@ static void pcache1FreePage(PgHdr1 *p){
+     pCache->pFree = p;
+   }else{
+     pcache1Free(p->page.pBuf);
+-#ifdef SQLITE_PCACHE_SEPARATE_HEADER
+-    sqlite3_free(p);
+-#endif
+   }
+   (*pCache->pnPurgeable)--;
+ }
+@@ -53217,9 +56145,6 @@ SQLITE_PRIVATE int sqlite3PcacheReleaseMemory(int nReq){
+        &&  p->isAnchor==0
+     ){
+       nFree += pcache1MemSize(p->page.pBuf);
+-#ifdef SQLITE_PCACHE_SEPARATE_HEADER
+-      nFree += sqlite3MemSize(p);
+-#endif
+       assert( PAGE_IS_UNPINNED(p) );
+       pcache1PinPage(p);
+       pcache1RemoveFromHash(p, 1);
+@@ -53300,7 +56225,7 @@ SQLITE_PRIVATE void sqlite3PcacheStats(
+ ** The TEST primitive includes a "batch" number.  The TEST primitive
+ ** will only see elements that were inserted before the last change
+ ** in the batch number.  In other words, if an INSERT occurs between
+-** two TESTs where the TESTs have the same batch nubmer, then the
++** two TESTs where the TESTs have the same batch number, then the
+ ** value added by the INSERT will not be visible to the second TEST.
+ ** The initial batch number is zero, so if the very first TEST contains
+ ** a non-zero batch number, it will see all prior INSERTs.
+@@ -53832,6 +56757,7 @@ SQLITE_PRIVATE int sqlite3RowSetTest(RowSet *pRowSet, int iBatch, sqlite3_int64
+ # define sqlite3WalFramesize(z)                  0
+ # define sqlite3WalFindFrame(x,y,z)              0
+ # define sqlite3WalFile(x)                       0
++# undef SQLITE_USE_SEH
+ #else
+ 
+ #define WAL_SAVEPOINT_NDATA 4
+@@ -53938,6 +56864,10 @@ SQLITE_PRIVATE int sqlite3WalWriteLock(Wal *pWal, int bLock);
+ SQLITE_PRIVATE void sqlite3WalDb(Wal *pWal, sqlite3 *db);
+ #endif
+ 
++#ifdef SQLITE_USE_SEH
++SQLITE_PRIVATE int sqlite3WalSystemErrno(Wal*);
++#endif
++
+ #endif /* ifndef SQLITE_OMIT_WAL */
+ #endif /* SQLITE_WAL_H */
+ 
+@@ -54223,7 +57153,7 @@ int sqlite3PagerTrace=1;  /* True to enable tracing */
+ **    outstanding transactions have been abandoned, the pager is able to
+ **    transition back to OPEN state, discarding the contents of the
+ **    page-cache and any other in-memory state at the same time. Everything
+-**    is reloaded from disk (and, if necessary, hot-journal rollback peformed)
++**    is reloaded from disk (and, if necessary, hot-journal rollback performed)
+ **    when a read-transaction is next opened on the pager (transitioning
+ **    the pager into READER state). At that point the system has recovered
+ **    from the error.
+@@ -54610,7 +57540,7 @@ struct Pager {
+   char *zJournal;             /* Name of the journal file */
+   int (*xBusyHandler)(void*); /* Function to call when busy */
+   void *pBusyHandlerArg;      /* Context argument for xBusyHandler */
+-  int aStat[4];               /* Total cache hits, misses, writes, spills */
++  u32 aStat[4];               /* Total cache hits, misses, writes, spills */
+ #ifdef SQLITE_TEST
+   int nRead;                  /* Database pages read */
+ #endif
+@@ -54737,12 +57667,12 @@ static const unsigned char aJournalMagic[] = {
+ SQLITE_PRIVATE int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno){
+   if( pPager->fd->pMethods==0 ) return 0;
+   if( sqlite3PCacheIsDirty(pPager->pPCache) ) return 0;
++  if( sqlite3mcPagerHasCodec(pPager) != 0 ) return 0;
+ #ifndef SQLITE_OMIT_WAL
+   if( pPager->pWal ){
+     u32 iRead = 0;
+-    int rc;
+-    rc = sqlite3WalFindFrame(pPager->pWal, pgno, &iRead);
+-    return (rc==SQLITE_OK && iRead==0);
++    (void)sqlite3WalFindFrame(pPager->pWal, pgno, &iRead);
++    return iRead==0;
+   }
+ #endif
+   return 1;
+@@ -54970,7 +57900,7 @@ static void setGetterMethod(Pager *pPager){
+   if( pPager->errCode ){
+     pPager->xGet = getPageError;
+ #if SQLITE_MAX_MMAP_SIZE>0
+-  }else if( USEFETCH(pPager) ){
++  }else if( USEFETCH(pPager) && sqlite3mcPagerHasCodec(pPager) == 0 ){
+     pPager->xGet = getPageMMap;
+ #endif /* SQLITE_MAX_MMAP_SIZE>0 */
+   }else{
+@@ -55414,9 +58344,32 @@ static int writeJournalHdr(Pager *pPager){
+     memset(zHeader, 0, sizeof(aJournalMagic)+4);
+   }
+ 
++
++
+   /* The random check-hash initializer */
+-  sqlite3_randomness(sizeof(pPager->cksumInit), &pPager->cksumInit);
++  if( pPager->journalMode!=PAGER_JOURNALMODE_MEMORY ){
++    sqlite3_randomness(sizeof(pPager->cksumInit), &pPager->cksumInit);
++  }
++#ifdef SQLITE_DEBUG
++  else{
++    /* The Pager.cksumInit variable is usually randomized above to protect
++    ** against there being existing records in the journal file. This is
++    ** dangerous, as following a crash they may be mistaken for records
++    ** written by the current transaction and rolled back into the database
++    ** file, causing corruption. The following assert statements verify
++    ** that this is not required in "journal_mode=memory" mode, as in that
++    ** case the journal file is always 0 bytes in size at this point.
++    ** It is advantageous to avoid the sqlite3_randomness() call if possible
++    ** as it takes the global PRNG mutex.  */
++    i64 sz = 0;
++    sqlite3OsFileSize(pPager->jfd, &sz);
++    assert( sz==0 );
++    assert( pPager->journalOff==journalHdrOffset(pPager) );
++    assert( sqlite3JournalIsInMemory(pPager->jfd) );
++  }
++#endif
+   put32bits(&zHeader[sizeof(aJournalMagic)+4], pPager->cksumInit);
++
+   /* The initial database size */
+   put32bits(&zHeader[sizeof(aJournalMagic)+8], pPager->dbOrigSize);
+   /* The assumed sector size for this process */
+@@ -55596,7 +58549,7 @@ static int readJournalHdr(
+ **   + 4 bytes: super-journal name checksum.
+ **   + 8 bytes: aJournalMagic[].
+ **
+-** The super-journal page checksum is the sum of the bytes in thesuper-journal
++** The super-journal page checksum is the sum of the bytes in the super-journal
+ ** name, where each byte is interpreted as a signed 8-bit integer.
+ **
+ ** If zSuper is a NULL pointer (occurs for a single database transaction),
+@@ -55649,7 +58602,7 @@ static int writeSuperJournal(Pager *pPager, const char *zSuper){
+   }
+   pPager->journalOff += (nSuper+20);
+ 
+-  /* If the pager is in peristent-journal mode, then the physical
++  /* If the pager is in persistent-journal mode, then the physical
+   ** journal-file may extend past the end of the super-journal name
+   ** and 8 bytes of magic data just written to the file. This is
+   ** dangerous because the code to rollback a hot-journal file
+@@ -55819,7 +58772,7 @@ static void pager_unlock(Pager *pPager){
+ 
+ /*
+ ** This function is called whenever an IOERR or FULL error that requires
+-** the pager to transition into the ERROR state may ahve occurred.
++** the pager to transition into the ERROR state may have occurred.
+ ** The first argument is a pointer to the pager structure, the second
+ ** the error-code about to be returned by a pager API function. The
+ ** value returned is a copy of the second argument to this function.
+@@ -56060,6 +59013,9 @@ static int pager_end_transaction(Pager *pPager, int hasSuper, int bCommit){
+   return (rc==SQLITE_OK?rc2:rc);
+ }
+ 
++/* Forward reference */
++static int pager_playback(Pager *pPager, int isHot);
++
+ /*
+ ** Execute a rollback if a transaction is active and unlock the
+ ** database file.
+@@ -56088,13 +59044,28 @@ static void pagerUnlockAndRollback(Pager *pPager){
+       assert( pPager->eState==PAGER_READER );
+       pager_end_transaction(pPager, 0, 0);
+     }
++  }else if( pPager->eState==PAGER_ERROR
++         && pPager->journalMode==PAGER_JOURNALMODE_MEMORY
++         && isOpen(pPager->jfd)
++  ){
++    /* Special case for a ROLLBACK due to I/O error with an in-memory
++    ** journal:  We have to rollback immediately, before the journal is
++    ** closed, because once it is closed, all content is forgotten. */
++    int errCode = pPager->errCode;
++    u8 eLock = pPager->eLock;
++    pPager->eState = PAGER_OPEN;
++    pPager->errCode = SQLITE_OK;
++    pPager->eLock = EXCLUSIVE_LOCK;
++    pager_playback(pPager, 1);
++    pPager->errCode = errCode;
++    pPager->eLock = eLock;
+   }
+   pager_unlock(pPager);
+ }
+ 
+ /*
+ ** Parameter aData must point to a buffer of pPager->pageSize bytes
+-** of data. Compute and return a checksum based ont the contents of the
++** of data. Compute and return a checksum based on the contents of the
+ ** page of data and the current value of pPager->cksumInit.
+ **
+ ** This is not a real checksum. It is really just the sum of the
+@@ -56527,6 +59498,8 @@ static int pager_truncate(Pager *pPager, Pgno nPage){
+   int rc = SQLITE_OK;
+   assert( pPager->eState!=PAGER_ERROR );
+   assert( pPager->eState!=PAGER_READER );
++  PAGERTRACE(("Truncate %d npage %u\n", PAGERID(pPager), nPage));
++
+ 
+   if( isOpen(pPager->fd)
+    && (pPager->eState>=PAGER_WRITER_DBMOD || pPager->eState==PAGER_OPEN)
+@@ -56857,7 +59830,7 @@ end_playback:
+     ** see if it is possible to delete the super-journal.
+     */
+     assert( zSuper==&pPager->pTmpSpace[4] );
+-    memset(&zSuper[-4], 0, 4);
++    memset(pPager->pTmpSpace, 0, 4);
+     rc = pager_delsuper(pPager, zSuper);
+     testcase( rc!=SQLITE_OK );
+   }
+@@ -57058,7 +60031,7 @@ static int pagerWalFrames(
+   assert( pPager->pWal );
+   assert( pList );
+ #ifdef SQLITE_DEBUG
+-  /* Verify that the page list is in accending order */
++  /* Verify that the page list is in ascending order */
+   for(p=pList; p && p->pDirty; p=p->pDirty){
+     assert( p->pgno < p->pDirty->pgno );
+   }
+@@ -57189,7 +60162,7 @@ static int pagerPagecount(Pager *pPager, Pgno *pnPage){
+ #ifndef SQLITE_OMIT_WAL
+ /*
+ ** Check if the *-wal file that corresponds to the database opened by pPager
+-** exists if the database is not empy, or verify that the *-wal file does
++** exists if the database is not empty, or verify that the *-wal file does
+ ** not exist (by deleting it) if the database file is empty.
+ **
+ ** If the database is not empty and the *-wal file exists, open the pager
+@@ -57478,7 +60451,6 @@ SQLITE_PRIVATE void sqlite3PagerShrink(Pager *pPager){
+ ** Numeric values associated with these states are OFF==1, NORMAL=2,
+ ** and FULL=3.
+ */
+-#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+ SQLITE_PRIVATE void sqlite3PagerSetFlags(
+   Pager *pPager,        /* The pager to set safety level for */
+   unsigned pgFlags      /* Various flags */
+@@ -57513,7 +60485,6 @@ SQLITE_PRIVATE void sqlite3PagerSetFlags(
+     pPager->doNotSpill |= SPILLFLAG_OFF;
+   }
+ }
+-#endif
+ 
+ /*
+ ** The following global variable is incremented whenever the library
+@@ -58601,11 +61572,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+   int rc = SQLITE_OK;      /* Return code */
+   int tempFile = 0;        /* True for temp files (incl. in-memory files) */
+   int memDb = 0;           /* True if this is an in-memory file */
+-#ifndef SQLITE_OMIT_DESERIALIZE
+   int memJM = 0;           /* Memory journal mode */
+-#else
+-# define memJM 0
+-#endif
+   int readOnly = 0;        /* True if this is a read-only file */
+   int journalFileSize;     /* Bytes to allocate for each journal fd */
+   char *zPathname = 0;     /* Full path to database file */
+@@ -58615,7 +61582,6 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+   u32 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE;  /* Default page size */
+   const char *zUri = 0;    /* URI args to copy */
+   int nUriByte = 1;        /* Number of bytes of URI args at *zUri */
+-  int nUri = 0;            /* Number of URI parameters */
+ 
+   /* Figure out how much space is required for each journal file-handle
+   ** (there are two of them, the main journal and the sub-journal).  */
+@@ -58663,7 +61629,6 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+     while( *z ){
+       z += strlen(z)+1;
+       z += strlen(z)+1;
+-      nUri++;
+     }
+     nUriByte = (int)(&z[1] - zUri);
+     assert( nUriByte>=1 );
+@@ -58726,12 +61691,13 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+   ** specific formatting and order of the various filenames, so if the format
+   ** changes here, be sure to change it there as well.
+   */
++  assert( SQLITE_PTRSIZE==sizeof(Pager*) );
+   pPtr = (u8 *)sqlite3MallocZero(
+     ROUND8(sizeof(*pPager)) +            /* Pager structure */
+     ROUND8(pcacheSize) +                 /* PCache object */
+     ROUND8(pVfs->szOsFile) +             /* The main db file */
+     journalFileSize * 2 +                /* The two journal files */
+-    sizeof(pPager) +                     /* Space to hold a pointer */
++    SQLITE_PTRSIZE +                     /* Space to hold a pointer */
+     4 +                                  /* Database prefix */
+     nPathname + 1 +                      /* database filename */
+     nUriByte +                           /* query parameters */
+@@ -58752,7 +61718,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+   pPager->sjfd = (sqlite3_file*)pPtr;     pPtr += journalFileSize;
+   pPager->jfd =  (sqlite3_file*)pPtr;     pPtr += journalFileSize;
+   assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) );
+-  memcpy(pPtr, &pPager, sizeof(pPager));  pPtr += sizeof(pPager);
++  memcpy(pPtr, &pPager, SQLITE_PTRSIZE);  pPtr += SQLITE_PTRSIZE;
+ 
+   /* Fill in the Pager.zFilename and pPager.zQueryParam fields */
+                                           pPtr += 4;  /* Skip zero prefix */
+@@ -58806,9 +61772,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
+     int fout = 0;                    /* VFS flags returned by xOpen() */
+     rc = sqlite3OsOpen(pVfs, pPager->zFilename, pPager->fd, vfsFlags, &fout);
+     assert( !memDb );
+-#ifndef SQLITE_OMIT_DESERIALIZE
+     pPager->memVfs = memJM = (fout&SQLITE_OPEN_MEMORY)!=0;
+-#endif
+     readOnly = (fout&SQLITE_OPEN_READONLY)!=0;
+ 
+     /* If the file was successfully opened for read/write access,
+@@ -58919,18 +61883,7 @@ act_like_temp_file:
+   pPager->memDb = (u8)memDb;
+   pPager->readOnly = (u8)readOnly;
+   assert( useJournal || pPager->tempFile );
+-  pPager->noSync = pPager->tempFile;
+-  if( pPager->noSync ){
+-    assert( pPager->fullSync==0 );
+-    assert( pPager->extraSync==0 );
+-    assert( pPager->syncFlags==0 );
+-    assert( pPager->walSyncFlags==0 );
+-  }else{
+-    pPager->fullSync = 1;
+-    pPager->extraSync = 0;
+-    pPager->syncFlags = SQLITE_SYNC_NORMAL;
+-    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | (SQLITE_SYNC_NORMAL<<2);
+-  }
++  sqlite3PagerSetFlags(pPager, (SQLITE_DEFAULT_SYNCHRONOUS+1)|PAGER_CACHESPILL);
+   /* pPager->pFirst = 0; */
+   /* pPager->pFirstSynced = 0; */
+   /* pPager->pLast = 0; */
+@@ -58956,15 +61909,18 @@ act_like_temp_file:
+ 
+ /*
+ ** Return the sqlite3_file for the main database given the name
+-** of the corresonding WAL or Journal name as passed into
++** of the corresponding WAL or Journal name as passed into
+ ** xOpen.
+ */
+ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char *zName){
+   Pager *pPager;
++  const char *p;
+   while( zName[-1]!=0 || zName[-2]!=0 || zName[-3]!=0 || zName[-4]!=0 ){
+     zName--;
+   }
+-  pPager = *(Pager**)(zName - 4 - sizeof(Pager*));
++  p = zName - 4 - sizeof(Pager*);
++  assert( EIGHT_BYTE_ALIGNMENT(p) );
++  pPager = *(Pager**)p;
+   return pPager->fd;
+ }
+ 
+@@ -59459,6 +62415,10 @@ static int getPageNormal(
+     if( !isOpen(pPager->fd) || pPager->dbSizepPager->mxPgno ){
+         rc = SQLITE_FULL;
++        if( pgno<=pPager->dbSize ){
++          sqlite3PcacheRelease(pPg);
++          pPg = 0;
++        }
+         goto pager_acquire_err;
+       }
+       if( noContent ){
+@@ -59594,8 +62554,20 @@ SQLITE_PRIVATE int sqlite3PagerGet(
+   DbPage **ppPage,    /* Write a pointer to the page here */
+   int flags           /* PAGER_GET_XXX flags */
+ ){
+-  /* printf("PAGE %u\n", pgno); fflush(stdout); */
++#if 0   /* Trace page fetch by setting to 1 */
++  int rc;
++  printf("PAGE %u\n", pgno);
++  fflush(stdout);
++  rc = pPager->xGet(pPager, pgno, ppPage, flags);
++  if( rc ){
++    printf("PAGE %u failed with 0x%02x\n", pgno, rc);
++    fflush(stdout);
++  }
++  return rc;
++#else
++  /* Normal, high-speed version of sqlite3PagerGet() */
+   return pPager->xGet(pPager, pgno, ppPage, flags);
++#endif
+ }
+ 
+ /*
+@@ -59623,10 +62595,12 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
+ /*
+ ** Release a page reference.
+ **
+-** The sqlite3PagerUnref() and sqlite3PagerUnrefNotNull() may only be
+-** used if we know that the page being released is not the last page.
++** The sqlite3PagerUnref() and sqlite3PagerUnrefNotNull() may only be used
++** if we know that the page being released is not the last reference to page1.
+ ** The btree layer always holds page1 open until the end, so these first
+-** to routines can be used to release any page other than BtShared.pPage1.
++** two routines can be used to release any page other than BtShared.pPage1.
++** The assert() at tag-20230419-2 proves that this constraint is always
++** honored.
+ **
+ ** Use sqlite3PagerUnrefPageOne() to release page1.  This latter routine
+ ** checks the total number of outstanding pages and if the number of
+@@ -59642,7 +62616,7 @@ SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage *pPg){
+     sqlite3PcacheRelease(pPg);
+   }
+   /* Do not use this routine to release the last reference to page1 */
+-  assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
++  assert( sqlite3PcacheRefCount(pPager->pPCache)>0 ); /* tag-20230419-2 */
+ }
+ SQLITE_PRIVATE void sqlite3PagerUnref(DbPage *pPg){
+   if( pPg ) sqlite3PagerUnrefNotNull(pPg);
+@@ -59708,6 +62682,7 @@ static int pager_open_journal(Pager *pPager){
+ 
+         if( pPager->tempFile ){
+           flags |= (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL);
++          flags |= SQLITE_OPEN_EXCLUSIVE;
+           nSpill = sqlite3Config.nStmtSpill;
+         }else{
+           flags |= SQLITE_OPEN_MAIN_JOURNAL;
+@@ -60190,7 +63165,7 @@ static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
+ # define DIRECT_MODE isDirectMode
+ #endif
+ 
+-  if( !pPager->changeCountDone && ALWAYS(pPager->dbSize>0) ){
++  if( !pPager->changeCountDone && pPager->dbSize>0 ){
+     PgHdr *pPgHdr;                /* Reference to page 1 */
+ 
+     assert( !pPager->tempFile && isOpen(pPager->fd) );
+@@ -60468,6 +63443,13 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(
+         rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, 0);
+         if( rc==SQLITE_OK ){
+           rc = pager_write_pagelist(pPager, pList);
++          if( rc==SQLITE_OK && pPager->dbSize>pPager->dbFileSize ){
++            char *pTmp = pPager->pTmpSpace;
++            int szPage = (int)pPager->pageSize;
++            memset(pTmp, 0, szPage);
++            rc = sqlite3OsWrite(pPager->fd, pTmp, szPage,
++                      ((i64)pPager->dbSize*pPager->pageSize)-szPage);
++          }
+           if( rc==SQLITE_OK ){
+             rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, 0);
+           }
+@@ -60702,11 +63684,11 @@ SQLITE_PRIVATE int *sqlite3PagerStats(Pager *pPager){
+   a[3] = pPager->eState==PAGER_OPEN ? -1 : (int) pPager->dbSize;
+   a[4] = pPager->eState;
+   a[5] = pPager->errCode;
+-  a[6] = pPager->aStat[PAGER_STAT_HIT];
+-  a[7] = pPager->aStat[PAGER_STAT_MISS];
++  a[6] = (int)pPager->aStat[PAGER_STAT_HIT] & 0x7fffffff;
++  a[7] = (int)pPager->aStat[PAGER_STAT_MISS] & 0x7fffffff;
+   a[8] = 0;  /* Used to be pPager->nOvfl */
+   a[9] = pPager->nRead;
+-  a[10] = pPager->aStat[PAGER_STAT_WRITE];
++  a[10] = (int)pPager->aStat[PAGER_STAT_WRITE] & 0x7fffffff;
+   return a;
+ }
+ #endif
+@@ -60722,7 +63704,7 @@ SQLITE_PRIVATE int *sqlite3PagerStats(Pager *pPager){
+ ** reset parameter is non-zero, the cache hit or miss count is zeroed before
+ ** returning.
+ */
+-SQLITE_PRIVATE void sqlite3PagerCacheStat(Pager *pPager, int eStat, int reset, int *pnVal){
++SQLITE_PRIVATE void sqlite3PagerCacheStat(Pager *pPager, int eStat, int reset, u64 *pnVal){
+ 
+   assert( eStat==SQLITE_DBSTATUS_CACHE_HIT
+        || eStat==SQLITE_DBSTATUS_CACHE_MISS
+@@ -60930,7 +63912,11 @@ SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){
+ */
+ SQLITE_PRIVATE const char *sqlite3PagerFilename(const Pager *pPager, int nullIfMemDb){
+   static const char zFake[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+-  return (nullIfMemDb && pPager->memDb) ? &zFake[4] : pPager->zFilename;
++  if( nullIfMemDb && (pPager->memDb || sqlite3IsMemdb(pPager->pVfs)) ){
++    return &zFake[4];
++  }else{
++    return pPager->zFilename;
++  }
+ }
+ 
+ /*
+@@ -61230,7 +64216,7 @@ SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
+     assert( pPager->eState!=PAGER_ERROR );
+     pPager->journalMode = (u8)eMode;
+ 
+-    /* When transistioning from TRUNCATE or PERSIST to any other journal
++    /* When transitioning from TRUNCATE or PERSIST to any other journal
+     ** mode except WAL, unless the pager is in locking_mode=exclusive mode,
+     ** delete the journal file.
+     */
+@@ -61275,7 +64261,7 @@ SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
+         }
+         assert( state==pPager->eState );
+       }
+-    }else if( eMode==PAGER_JOURNALMODE_OFF ){
++    }else if( eMode==PAGER_JOURNALMODE_OFF || eMode==PAGER_JOURNALMODE_MEMORY ){
+       sqlite3OsClose(pPager->jfd);
+     }
+   }
+@@ -61299,7 +64285,7 @@ SQLITE_PRIVATE int sqlite3PagerGetJournalMode(Pager *pPager){
+ SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager *pPager){
+   assert( assert_pager_state(pPager) );
+   if( pPager->eState>=PAGER_WRITER_CACHEMOD ) return 0;
+-  if( isOpen(pPager->jfd) && pPager->journalOff>0 ) return 0;
++  if( NEVER(isOpen(pPager->jfd) && pPager->journalOff>0) ) return 0;
+   return 1;
+ }
+ 
+@@ -61397,13 +64383,15 @@ SQLITE_PRIVATE int sqlite3PagerWalSupported(Pager *pPager){
+ */
+ static int pagerExclusiveLock(Pager *pPager){
+   int rc;                         /* Return code */
++  u8 eOrigLock;                   /* Original lock */
+ 
+-  assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK );
++  assert( pPager->eLock>=SHARED_LOCK );
++  eOrigLock = pPager->eLock;
+   rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
+   if( rc!=SQLITE_OK ){
+     /* If the attempt to grab the exclusive lock failed, release the
+     ** pending lock that may have been obtained instead.  */
+-    pagerUnlockDb(pPager, SHARED_LOCK);
++    pagerUnlockDb(pPager, eOrigLock);
+   }
+ 
+   return rc;
+@@ -61656,6 +64644,12 @@ SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager){
+ }
+ #endif
+ 
++#if defined(SQLITE_USE_SEH) && !defined(SQLITE_OMIT_WAL)
++SQLITE_PRIVATE int sqlite3PagerWalSystemErrno(Pager *pPager){
++  return sqlite3WalSystemErrno(pPager->pWal);
++}
++#endif
++
+ #endif /* SQLITE_OMIT_DISKIO */
+ 
+ /************** End of pager.c ***********************************************/
+@@ -61946,7 +64940,7 @@ SQLITE_PRIVATE int sqlite3WalTrace = 0;
+ **
+ ** Technically, the various VFSes are free to implement these locks however
+ ** they see fit.  However, compatibility is encouraged so that VFSes can
+-** interoperate.  The standard implemention used on both unix and windows
++** interoperate.  The standard implementation used on both unix and windows
+ ** is for the index number to indicate a byte offset into the
+ ** WalCkptInfo.aLock[] array in the wal-index header.  In other words, all
+ ** locks are on the shm file.  The WALINDEX_LOCK_OFFSET constant (which
+@@ -62022,7 +65016,7 @@ struct WalIndexHdr {
+ ** the mxFrame for that reader.  The value READMARK_NOT_USED (0xffffffff)
+ ** for any aReadMark[] means that entry is unused.  aReadMark[0] is
+ ** a special case; its value is never used and it exists as a place-holder
+-** to avoid having to offset aReadMark[] indexs by one.  Readers holding
++** to avoid having to offset aReadMark[] indexes by one.  Readers holding
+ ** WAL_READ_LOCK(0) always ignore the entire WAL and read all content
+ ** directly from the database.
+ **
+@@ -62190,7 +65184,15 @@ struct Wal {
+   u32 iReCksum;              /* On commit, recalculate checksums from here */
+   const char *zWalName;      /* Name of WAL file */
+   u32 nCkpt;                 /* Checkpoint sequence counter in the wal-header */
++#ifdef SQLITE_USE_SEH
++  u32 lockMask;              /* Mask of locks held */
++  void *pFree;               /* Pointer to sqlite3_free() if exception thrown */
++  u32 *pWiValue;             /* Value to write into apWiData[iWiPg] */
++  int iWiPg;                 /* Write pWiValue into apWiData[iWiPg] */
++  int iSysErrno;             /* System error code following exception */
++#endif
+ #ifdef SQLITE_DEBUG
++  int nSehTry;               /* Number of nested SEH_TRY{} blocks */
+   u8 lockError;              /* True if a locking error has occurred */
+ #endif
+ #ifdef SQLITE_ENABLE_SNAPSHOT
+@@ -62272,6 +65274,113 @@ struct WalIterator {
+     sizeof(ht_slot)*HASHTABLE_NSLOT + HASHTABLE_NPAGE*sizeof(u32) \
+ )
+ 
++/*
++** Structured Exception Handling (SEH) is a Windows-specific technique
++** for catching exceptions raised while accessing memory-mapped files.
++**
++** The -DSQLITE_USE_SEH compile-time option means to use SEH to catch and
++** deal with system-level errors that arise during WAL -shm file processing.
++** Without this compile-time option, any system-level faults that appear
++** while accessing the memory-mapped -shm file will cause a process-wide
++** signal to be deliver, which will more than likely cause the entire
++** process to exit.
++*/
++#ifdef SQLITE_USE_SEH
++#include 
++
++/* Beginning of a block of code in which an exception might occur */
++# define SEH_TRY    __try { \
++   assert( walAssertLockmask(pWal) && pWal->nSehTry==0 ); \
++   VVA_ONLY(pWal->nSehTry++);
++
++/* The end of a block of code in which an exception might occur */
++# define SEH_EXCEPT(X) \
++   VVA_ONLY(pWal->nSehTry--); \
++   assert( pWal->nSehTry==0 ); \
++   } __except( sehExceptionFilter(pWal, GetExceptionCode(), GetExceptionInformation() ) ){ X }
++
++/* Simulate a memory-mapping fault in the -shm file for testing purposes */
++# define SEH_INJECT_FAULT sehInjectFault(pWal)
++
++/*
++** The second argument is the return value of GetExceptionCode() for the
++** current exception. Return EXCEPTION_EXECUTE_HANDLER if the exception code
++** indicates that the exception may have been caused by accessing the *-shm
++** file mapping. Or EXCEPTION_CONTINUE_SEARCH otherwise.
++*/
++static int sehExceptionFilter(Wal *pWal, int eCode, EXCEPTION_POINTERS *p){
++  VVA_ONLY(pWal->nSehTry--);
++  if( eCode==EXCEPTION_IN_PAGE_ERROR ){
++    if( p && p->ExceptionRecord && p->ExceptionRecord->NumberParameters>=3 ){
++      /* From MSDN: For this type of exception, the first element of the
++      ** ExceptionInformation[] array is a read-write flag - 0 if the exception
++      ** was thrown while reading, 1 if while writing. The second element is
++      ** the virtual address being accessed. The "third array element specifies
++      ** the underlying NTSTATUS code that resulted in the exception". */
++      pWal->iSysErrno = (int)p->ExceptionRecord->ExceptionInformation[2];
++    }
++    return EXCEPTION_EXECUTE_HANDLER;
++  }
++  return EXCEPTION_CONTINUE_SEARCH;
++}
++
++/*
++** If one is configured, invoke the xTestCallback callback with 650 as
++** the argument. If it returns true, throw the same exception that is
++** thrown by the system if the *-shm file mapping is accessed after it
++** has been invalidated.
++*/
++static void sehInjectFault(Wal *pWal){
++  int res;
++  assert( pWal->nSehTry>0 );
++
++  res = sqlite3FaultSim(650);
++  if( res!=0 ){
++    ULONG_PTR aArg[3];
++    aArg[0] = 0;
++    aArg[1] = 0;
++    aArg[2] = (ULONG_PTR)res;
++    RaiseException(EXCEPTION_IN_PAGE_ERROR, 0, 3, (const ULONG_PTR*)aArg);
++  }
++}
++
++/*
++** There are two ways to use this macro. To set a pointer to be freed
++** if an exception is thrown:
++**
++**   SEH_FREE_ON_ERROR(0, pPtr);
++**
++** and to cancel the same:
++**
++**   SEH_FREE_ON_ERROR(pPtr, 0);
++**
++** In the first case, there must not already be a pointer registered to
++** be freed. In the second case, pPtr must be the registered pointer.
++*/
++#define SEH_FREE_ON_ERROR(X,Y) \
++  assert( (X==0 || Y==0) && pWal->pFree==X ); pWal->pFree = Y
++
++/*
++** There are two ways to use this macro. To arrange for pWal->apWiData[iPg]
++** to be set to pValue if an exception is thrown:
++**
++**   SEH_SET_ON_ERROR(iPg, pValue);
++**
++** and to cancel the same:
++**
++**   SEH_SET_ON_ERROR(0, 0);
++*/
++#define SEH_SET_ON_ERROR(X,Y)  pWal->iWiPg = X; pWal->pWiValue = Y
++
++#else
++# define SEH_TRY          VVA_ONLY(pWal->nSehTry++);
++# define SEH_EXCEPT(X)    VVA_ONLY(pWal->nSehTry--); assert( pWal->nSehTry==0 );
++# define SEH_INJECT_FAULT assert( pWal->nSehTry>0 );
++# define SEH_FREE_ON_ERROR(X,Y)
++# define SEH_SET_ON_ERROR(X,Y)
++#endif /* ifdef SQLITE_USE_SEH */
++
++
+ /*
+ ** Obtain a pointer to the iPage'th page of the wal-index. The wal-index
+ ** is broken into pages of WALINDEX_PGSZ bytes. Wal-index pages are
+@@ -62344,6 +65453,7 @@ static int walIndexPage(
+   int iPage,               /* The page we seek */
+   volatile u32 **ppPage    /* Write the page pointer here */
+ ){
++  SEH_INJECT_FAULT;
+   if( pWal->nWiData<=iPage || (*ppPage = pWal->apWiData[iPage])==0 ){
+     return walIndexPageRealloc(pWal, iPage, ppPage);
+   }
+@@ -62355,6 +65465,7 @@ static int walIndexPage(
+ */
+ static volatile WalCkptInfo *walCkptInfo(Wal *pWal){
+   assert( pWal->nWiData>0 && pWal->apWiData[0] );
++  SEH_INJECT_FAULT;
+   return (volatile WalCkptInfo*)&(pWal->apWiData[0][sizeof(WalIndexHdr)/2]);
+ }
+ 
+@@ -62363,6 +65474,7 @@ static volatile WalCkptInfo *walCkptInfo(Wal *pWal){
+ */
+ static volatile WalIndexHdr *walIndexHdr(Wal *pWal){
+   assert( pWal->nWiData>0 && pWal->apWiData[0] );
++  SEH_INJECT_FAULT;
+   return (volatile WalIndexHdr*)pWal->apWiData[0];
+ }
+ 
+@@ -62408,19 +65520,40 @@ static void walChecksumBytes(
+   assert( nByte>=8 );
+   assert( (nByte&0x00000007)==0 );
+   assert( nByte<=65536 );
++  assert( nByte%4==0 );
+ 
+-  if( nativeCksum ){
++  if( !nativeCksum ){
++    do {
++      s1 += BYTESWAP32(aData[0]) + s2;
++      s2 += BYTESWAP32(aData[1]) + s1;
++      aData += 2;
++    }while( aDatalockError = (u8)(rc!=SQLITE_OK && (rc&0xFF)!=SQLITE_BUSY); )
++#ifdef SQLITE_USE_SEH
++  if( rc==SQLITE_OK ) pWal->lockMask |= (1 << lockIdx);
++#endif
+   return rc;
+ }
+ static void walUnlockShared(Wal *pWal, int lockIdx){
+   if( pWal->exclusiveMode ) return;
+   (void)sqlite3OsShmLock(pWal->pDbFd, lockIdx, 1,
+                          SQLITE_SHM_UNLOCK | SQLITE_SHM_SHARED);
++#ifdef SQLITE_USE_SEH
++  pWal->lockMask &= ~(1 << lockIdx);
++#endif
+   WALTRACE(("WAL%p: release SHARED-%s\n", pWal, walLockName(lockIdx)));
+ }
+ static int walLockExclusive(Wal *pWal, int lockIdx, int n){
+@@ -62615,12 +65754,20 @@ static int walLockExclusive(Wal *pWal, int lockIdx, int n){
+   WALTRACE(("WAL%p: acquire EXCLUSIVE-%s cnt=%d %s\n", pWal,
+             walLockName(lockIdx), n, rc ? "failed" : "ok"));
+   VVA_ONLY( pWal->lockError = (u8)(rc!=SQLITE_OK && (rc&0xFF)!=SQLITE_BUSY); )
++#ifdef SQLITE_USE_SEH
++  if( rc==SQLITE_OK ){
++    pWal->lockMask |= (((1<exclusiveMode ) return;
+   (void)sqlite3OsShmLock(pWal->pDbFd, lockIdx, n,
+                          SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE);
++#ifdef SQLITE_USE_SEH
++  pWal->lockMask &= ~(((1<apWiData[0][WALINDEX_HDR_SIZE/sizeof(u32) + iFrame - 1];
+   }
+@@ -62971,6 +66119,7 @@ static int walIndexRecover(Wal *pWal){
+     /* Malloc a buffer to read frames into. */
+     szFrame = szPage + WAL_FRAME_HDRSIZE;
+     aFrame = (u8 *)sqlite3_malloc64(szFrame + WALINDEX_PGSZ);
++    SEH_FREE_ON_ERROR(0, aFrame);
+     if( !aFrame ){
+       rc = SQLITE_NOMEM_BKPT;
+       goto recovery_error;
+@@ -62989,6 +66138,7 @@ static int walIndexRecover(Wal *pWal){
+       rc = walIndexPage(pWal, iPg, (volatile u32**)&aShare);
+       assert( aShare!=0 || rc!=SQLITE_OK );
+       if( aShare==0 ) break;
++      SEH_SET_ON_ERROR(iPg, aShare);
+       pWal->apWiData[iPg] = aPrivate;
+ 
+       for(iFrame=iFirst; iFrame<=iLast; iFrame++){
+@@ -63016,6 +66166,7 @@ static int walIndexRecover(Wal *pWal){
+         }
+       }
+       pWal->apWiData[iPg] = aShare;
++      SEH_SET_ON_ERROR(0,0);
+       nHdr = (iPg==0 ? WALINDEX_HDR_SIZE : 0);
+       nHdr32 = nHdr / sizeof(u32);
+ #ifndef SQLITE_SAFER_WALINDEX_RECOVERY
+@@ -63046,9 +66197,11 @@ static int walIndexRecover(Wal *pWal){
+         }
+       }
+ #endif
++      SEH_INJECT_FAULT;
+       if( iFrame<=iLast ) break;
+     }
+ 
++    SEH_FREE_ON_ERROR(aFrame, 0);
+     sqlite3_free(aFrame);
+   }
+ 
+@@ -63076,6 +66229,7 @@ finished:
+         }else{
+           pInfo->aReadMark[i] = READMARK_NOT_USED;
+         }
++        SEH_INJECT_FAULT;
+         walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
+       }else if( rc!=SQLITE_BUSY ){
+         goto recovery_error;
+@@ -63233,7 +66387,7 @@ SQLITE_PRIVATE int sqlite3WalOpen(
+ }
+ 
+ /*
+-** Change the size to which the WAL file is trucated on each reset.
++** Change the size to which the WAL file is truncated on each reset.
+ */
+ SQLITE_PRIVATE void sqlite3WalLimit(Wal *pWal, i64 iLimit){
+   if( pWal ) pWal->mxWalSize = iLimit;
+@@ -63459,23 +66613,16 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
+   nByte = sizeof(WalIterator)
+         + (nSegment-1)*sizeof(struct WalSegment)
+         + iLast*sizeof(ht_slot);
+-  p = (WalIterator *)sqlite3_malloc64(nByte);
++  p = (WalIterator *)sqlite3_malloc64(nByte
++      + sizeof(ht_slot) * (iLast>HASHTABLE_NPAGE?HASHTABLE_NPAGE:iLast)
++  );
+   if( !p ){
+     return SQLITE_NOMEM_BKPT;
+   }
+   memset(p, 0, nByte);
+   p->nSegment = nSegment;
+-
+-  /* Allocate temporary space used by the merge-sort routine. This block
+-  ** of memory will be freed before this function returns.
+-  */
+-  aTmp = (ht_slot *)sqlite3_malloc64(
+-      sizeof(ht_slot) * (iLast>HASHTABLE_NPAGE?HASHTABLE_NPAGE:iLast)
+-  );
+-  if( !aTmp ){
+-    rc = SQLITE_NOMEM_BKPT;
+-  }
+-
++  aTmp = (ht_slot*)&(((u8*)p)[nByte]);
++  SEH_FREE_ON_ERROR(0, p);
+   for(i=walFramePage(nBackfill+1); rc==SQLITE_OK && iaSegment[i].aPgno = (u32 *)sLoc.aPgno;
+     }
+   }
+-  sqlite3_free(aTmp);
+-
+   if( rc!=SQLITE_OK ){
++    SEH_FREE_ON_ERROR(p, 0);
+     walIteratorFree(p);
+     p = 0;
+   }
+@@ -63514,6 +66660,19 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
+ }
+ 
+ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++
++
++/*
++** Attempt to enable blocking locks that block for nMs ms. Return 1 if
++** blocking locks are successfully enabled, or 0 otherwise.
++*/
++static int walEnableBlockingMs(Wal *pWal, int nMs){
++  int rc = sqlite3OsFileControl(
++      pWal->pDbFd, SQLITE_FCNTL_LOCK_TIMEOUT, (void*)&nMs
++  );
++  return (rc==SQLITE_OK);
++}
++
+ /*
+ ** Attempt to enable blocking locks. Blocking locks are enabled only if (a)
+ ** they are supported by the VFS, and (b) the database handle is configured
+@@ -63525,11 +66684,7 @@ static int walEnableBlocking(Wal *pWal){
+   if( pWal->db ){
+     int tmout = pWal->db->busyTimeout;
+     if( tmout ){
+-      int rc;
+-      rc = sqlite3OsFileControl(
+-          pWal->pDbFd, SQLITE_FCNTL_LOCK_TIMEOUT, (void*)&tmout
+-      );
+-      res = (rc==SQLITE_OK);
++      res = walEnableBlockingMs(pWal, tmout);
+     }
+   }
+   return res;
+@@ -63578,20 +66733,10 @@ SQLITE_PRIVATE void sqlite3WalDb(Wal *pWal, sqlite3 *db){
+   pWal->db = db;
+ }
+ 
+-/*
+-** Take an exclusive WRITE lock. Blocking if so configured.
+-*/
+-static int walLockWriter(Wal *pWal){
+-  int rc;
+-  walEnableBlocking(pWal);
+-  rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1);
+-  walDisableBlocking(pWal);
+-  return rc;
+-}
+ #else
+ # define walEnableBlocking(x) 0
+ # define walDisableBlocking(x)
+-# define walLockWriter(pWal) walLockExclusive((pWal), WAL_WRITE_LOCK, 1)
++# define walEnableBlockingMs(pWal, ms) 0
+ # define sqlite3WalDb(pWal, db)
+ #endif   /* ifdef SQLITE_ENABLE_SETLK_TIMEOUT */
+ 
+@@ -63731,13 +66876,13 @@ static int walCheckpoint(
+     mxSafeFrame = pWal->hdr.mxFrame;
+     mxPage = pWal->hdr.nPage;
+     for(i=1; iaReadMark+i);
++      u32 y = AtomicLoad(pInfo->aReadMark+i); SEH_INJECT_FAULT;
+       if( mxSafeFrame>y ){
+         assert( y<=pWal->hdr.mxFrame );
+         rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(i), 1);
+         if( rc==SQLITE_OK ){
+           u32 iMark = (i==1 ? mxSafeFrame : READMARK_NOT_USED);
+-          AtomicStore(pInfo->aReadMark+i, iMark);
++          AtomicStore(pInfo->aReadMark+i, iMark); SEH_INJECT_FAULT;
+           walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
+         }else if( rc==SQLITE_BUSY ){
+           mxSafeFrame = y;
+@@ -63758,8 +66903,7 @@ static int walCheckpoint(
+      && (rc = walBusyLock(pWal,xBusy,pBusyArg,WAL_READ_LOCK(0),1))==SQLITE_OK
+     ){
+       u32 nBackfill = pInfo->nBackfill;
+-
+-      pInfo->nBackfillAttempted = mxSafeFrame;
++      pInfo->nBackfillAttempted = mxSafeFrame; SEH_INJECT_FAULT;
+ 
+       /* Sync the WAL to disk */
+       rc = sqlite3OsSync(pWal->pWalFd, CKPT_SYNC_FLAGS(sync_flags));
+@@ -63790,6 +66934,7 @@ static int walCheckpoint(
+       while( rc==SQLITE_OK && 0==walIteratorNext(pIter, &iDbpage, &iFrame) ){
+         i64 iOffset;
+         assert( walFramePgno(pWal, iFrame)==iDbpage );
++        SEH_INJECT_FAULT;
+         if( AtomicLoad(&db->u1.isInterrupted) ){
+           rc = db->mallocFailed ? SQLITE_NOMEM_BKPT : SQLITE_INTERRUPT;
+           break;
+@@ -63819,7 +66964,7 @@ static int walCheckpoint(
+           }
+         }
+         if( rc==SQLITE_OK ){
+-          AtomicStore(&pInfo->nBackfill, mxSafeFrame);
++          AtomicStore(&pInfo->nBackfill, mxSafeFrame); SEH_INJECT_FAULT;
+         }
+       }
+ 
+@@ -63841,6 +66986,7 @@ static int walCheckpoint(
+   */
+   if( rc==SQLITE_OK && eMode!=SQLITE_CHECKPOINT_PASSIVE ){
+     assert( pWal->writeLock );
++    SEH_INJECT_FAULT;
+     if( pInfo->nBackfillhdr.mxFrame ){
+       rc = SQLITE_BUSY;
+     }else if( eMode>=SQLITE_CHECKPOINT_RESTART ){
+@@ -63872,6 +67018,7 @@ static int walCheckpoint(
+   }
+ 
+  walcheckpoint_out:
++  SEH_FREE_ON_ERROR(pIter, 0);
+   walIteratorFree(pIter);
+   return rc;
+ }
+@@ -63894,6 +67041,93 @@ static void walLimitSize(Wal *pWal, i64 nMax){
+   }
+ }
+ 
++#ifdef SQLITE_USE_SEH
++/*
++** This is the "standard" exception handler used in a few places to handle
++** an exception thrown by reading from the *-shm mapping after it has become
++** invalid in SQLITE_USE_SEH builds. It is used as follows:
++**
++**   SEH_TRY { ... }
++**   SEH_EXCEPT( rc = walHandleException(pWal); )
++**
++** This function does three things:
++**
++**   1) Determines the locks that should be held, based on the contents of
++**      the Wal.readLock, Wal.writeLock and Wal.ckptLock variables. All other
++**      held locks are assumed to be transient locks that would have been
++**      released had the exception not been thrown and are dropped.
++**
++**   2) Frees the pointer at Wal.pFree, if any, using sqlite3_free().
++**
++**   3) Set pWal->apWiData[pWal->iWiPg] to pWal->pWiValue if not NULL
++**
++**   4) Returns SQLITE_IOERR.
++*/
++static int walHandleException(Wal *pWal){
++  if( pWal->exclusiveMode==0 ){
++    static const int S = 1;
++    static const int E = (1<lockMask & ~(
++        (pWal->readLock<0 ? 0 : (S << WAL_READ_LOCK(pWal->readLock)))
++        | (pWal->writeLock ? (E << WAL_WRITE_LOCK) : 0)
++        | (pWal->ckptLock ? (E << WAL_CKPT_LOCK) : 0)
++        );
++    for(ii=0; iipFree);
++  pWal->pFree = 0;
++  if( pWal->pWiValue ){
++    pWal->apWiData[pWal->iWiPg] = pWal->pWiValue;
++    pWal->pWiValue = 0;
++  }
++  return SQLITE_IOERR_IN_PAGE;
++}
++
++/*
++** Assert that the Wal.lockMask mask, which indicates the locks held
++** by the connenction, is consistent with the Wal.readLock, Wal.writeLock
++** and Wal.ckptLock variables. To be used as:
++**
++**   assert( walAssertLockmask(pWal) );
++*/
++static int walAssertLockmask(Wal *pWal){
++  if( pWal->exclusiveMode==0 ){
++    static const int S = 1;
++    static const int E = (1<readLock<0 ? 0 : (S << WAL_READ_LOCK(pWal->readLock)))
++      | (pWal->writeLock ? (E << WAL_WRITE_LOCK) : 0)
++      | (pWal->ckptLock ? (E << WAL_CKPT_LOCK) : 0)
++#ifdef SQLITE_ENABLE_SNAPSHOT
++      | (pWal->pSnapshot ? (pWal->lockMask & (1 << WAL_CKPT_LOCK)) : 0)
++#endif
++    );
++    assert( mExpect==pWal->lockMask );
++  }
++  return 1;
++}
++
++/*
++** Return and zero the "system error" field set when an
++** EXCEPTION_IN_PAGE_ERROR exception is caught.
++*/
++SQLITE_PRIVATE int sqlite3WalSystemErrno(Wal *pWal){
++  int iRet = 0;
++  if( pWal ){
++    iRet = pWal->iSysErrno;
++    pWal->iSysErrno = 0;
++  }
++  return iRet;
++}
++
++#else
++# define walAssertLockmask(x) 1
++#endif /* ifdef SQLITE_USE_SEH */
++
+ /*
+ ** Close a connection to a log file.
+ */
+@@ -63908,6 +67142,8 @@ SQLITE_PRIVATE int sqlite3WalClose(
+   if( pWal ){
+     int isDelete = 0;             /* True to unlink wal and wal-index files */
+ 
++    assert( walAssertLockmask(pWal) );
++
+     /* If an EXCLUSIVE lock can be obtained on the database file (using the
+     ** ordinary, rollback-mode locking methods, this guarantees that the
+     ** connection associated with this log file is the only connection to
+@@ -63932,7 +67168,7 @@ SQLITE_PRIVATE int sqlite3WalClose(
+         );
+         if( bPersist!=1 ){
+           /* Try to delete the WAL file if the checkpoint completed and
+-          ** fsyned (rc==SQLITE_OK) and if we are not in persistent-wal
++          ** fsynced (rc==SQLITE_OK) and if we are not in persistent-wal
+           ** mode (!bPersist) */
+           isDelete = 1;
+         }else if( pWal->mxWalSize>=0 ){
+@@ -63999,7 +67235,7 @@ static SQLITE_NO_TSAN int walIndexTryHdr(Wal *pWal, int *pChanged){
+   ** give false-positive warnings about these accesses because the tools do not
+   ** account for the double-read and the memory barrier. The use of mutexes
+   ** here would be problematic as the memory being accessed is potentially
+-  ** shared among multiple processes and not all mutex implementions work
++  ** shared among multiple processes and not all mutex implementations work
+   ** reliably in that environment.
+   */
+   aHdr = walIndexHdr(pWal);
+@@ -64101,7 +67337,9 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){
+       }
+     }else{
+       int bWriteLock = pWal->writeLock;
+-      if( bWriteLock || SQLITE_OK==(rc = walLockWriter(pWal)) ){
++      if( bWriteLock
++       || SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1))
++      ){
+         pWal->writeLock = 1;
+         if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){
+           badHdr = walIndexTryHdr(pWal, pChanged);
+@@ -64109,7 +67347,8 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){
+             /* If the wal-index header is still malformed even while holding
+             ** a WRITE lock, it can only mean that the header is corrupted and
+             ** needs to be reconstructed.  So run recovery to do exactly that.
+-            */
++            ** Disable blocking locks first.  */
++            walDisableBlocking(pWal);
+             rc = walIndexRecover(pWal);
+             *pChanged = 1;
+           }
+@@ -64319,6 +67558,37 @@ static int walBeginShmUnreliable(Wal *pWal, int *pChanged){
+   return rc;
+ }
+ 
++/*
++** The final argument passed to walTryBeginRead() is of type (int*). The
++** caller should invoke walTryBeginRead as follows:
++**
++**   int cnt = 0;
++**   do {
++**     rc = walTryBeginRead(..., &cnt);
++**   }while( rc==WAL_RETRY );
++**
++** The final value of "cnt" is of no use to the caller. It is used by
++** the implementation of walTryBeginRead() as follows:
++**
++**   + Each time walTryBeginRead() is called, it is incremented. Once
++**     it reaches WAL_RETRY_PROTOCOL_LIMIT - indicating that walTryBeginRead()
++**     has many times been invoked and failed with WAL_RETRY - walTryBeginRead()
++**     returns SQLITE_PROTOCOL.
++**
++**   + If SQLITE_ENABLE_SETLK_TIMEOUT is defined and walTryBeginRead() failed
++**     because a blocking lock timed out (SQLITE_BUSY_TIMEOUT from the OS
++**     layer), the WAL_RETRY_BLOCKED_MASK bit is set in "cnt". In this case
++**     the next invocation of walTryBeginRead() may omit an expected call to
++**     sqlite3OsSleep(). There has already been a delay when the previous call
++**     waited on a lock.
++*/
++#define WAL_RETRY_PROTOCOL_LIMIT 100
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++# define WAL_RETRY_BLOCKED_MASK    0x10000000
++#else
++# define WAL_RETRY_BLOCKED_MASK    0
++#endif
++
+ /*
+ ** Attempt to start a read transaction.  This might fail due to a race or
+ ** other transient condition.  When that happens, it returns WAL_RETRY to
+@@ -64369,13 +67639,16 @@ static int walBeginShmUnreliable(Wal *pWal, int *pChanged){
+ ** so it takes care to hold an exclusive lock on the corresponding
+ ** WAL_READ_LOCK() while changing values.
+ */
+-static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
++static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int *pCnt){
+   volatile WalCkptInfo *pInfo;    /* Checkpoint information in wal-index */
+   u32 mxReadMark;                 /* Largest aReadMark[] value */
+   int mxI;                        /* Index of largest aReadMark[] value */
+   int i;                          /* Loop counter */
+   int rc = SQLITE_OK;             /* Return code  */
+   u32 mxFrame;                    /* Wal frame to lock to */
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++  int nBlockTmout = 0;
++#endif
+ 
+   assert( pWal->readLock<0 );     /* Not currently locked */
+ 
+@@ -64399,14 +67672,34 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+   ** so that on the 100th (and last) RETRY we delay for 323 milliseconds.
+   ** The total delay time before giving up is less than 10 seconds.
+   */
+-  if( cnt>5 ){
++  (*pCnt)++;
++  if( *pCnt>5 ){
+     int nDelay = 1;                      /* Pause time in microseconds */
+-    if( cnt>100 ){
++    int cnt = (*pCnt & ~WAL_RETRY_BLOCKED_MASK);
++    if( cnt>WAL_RETRY_PROTOCOL_LIMIT ){
+       VVA_ONLY( pWal->lockError = 1; )
+       return SQLITE_PROTOCOL;
+     }
+-    if( cnt>=10 ) nDelay = (cnt-9)*(cnt-9)*39;
++    if( *pCnt>=10 ) nDelay = (cnt-9)*(cnt-9)*39;
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++    /* In SQLITE_ENABLE_SETLK_TIMEOUT builds, configure the file-descriptor
++    ** to block for locks for approximately nDelay us. This affects three
++    ** locks: (a) the shared lock taken on the DMS slot in os_unix.c (if
++    ** using os_unix.c), (b) the WRITER lock taken in walIndexReadHdr() if the
++    ** first attempted read fails, and (c) the shared lock taken on the
++    ** read-mark.
++    **
++    ** If the previous call failed due to an SQLITE_BUSY_TIMEOUT error,
++    ** then sleep for the minimum of 1us. The previous call already provided
++    ** an extra delay while it was blocking on the lock.
++    */
++    nBlockTmout = (nDelay+998) / 1000;
++    if( !useWal && walEnableBlockingMs(pWal, nBlockTmout) ){
++      if( *pCnt & WAL_RETRY_BLOCKED_MASK ) nDelay = 1;
++    }
++#endif
+     sqlite3OsSleep(pWal->pVfs, nDelay);
++    *pCnt &= ~WAL_RETRY_BLOCKED_MASK;
+   }
+ 
+   if( !useWal ){
+@@ -64414,6 +67707,13 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+     if( pWal->bShmUnreliable==0 ){
+       rc = walIndexReadHdr(pWal, pChanged);
+     }
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++    walDisableBlocking(pWal);
++    if( rc==SQLITE_BUSY_TIMEOUT ){
++      rc = SQLITE_BUSY;
++      *pCnt |= WAL_RETRY_BLOCKED_MASK;
++    }
++#endif
+     if( rc==SQLITE_BUSY ){
+       /* If there is not a recovery running in another thread or process
+       ** then convert BUSY errors to WAL_RETRY.  If recovery is known to
+@@ -64450,6 +67750,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+   assert( pWal->nWiData>0 );
+   assert( pWal->apWiData[0]!=0 );
+   pInfo = walCkptInfo(pWal);
++  SEH_INJECT_FAULT;
+   if( !useWal && AtomicLoad(&pInfo->nBackfill)==pWal->hdr.mxFrame
+ #ifdef SQLITE_ENABLE_SNAPSHOT
+    && (pWal->pSnapshot==0 || pWal->hdr.mxFrame==0)
+@@ -64499,7 +67800,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+   }
+ #endif
+   for(i=1; iaReadMark+i);
++    u32 thisMark = AtomicLoad(pInfo->aReadMark+i); SEH_INJECT_FAULT;
+     if( mxReadMark<=thisMark && thisMark<=mxFrame ){
+       assert( thisMark!=READMARK_NOT_USED );
+       mxReadMark = thisMark;
+@@ -64527,9 +67828,19 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+     return rc==SQLITE_BUSY ? WAL_RETRY : SQLITE_READONLY_CANTINIT;
+   }
+ 
++  (void)walEnableBlockingMs(pWal, nBlockTmout);
+   rc = walLockShared(pWal, WAL_READ_LOCK(mxI));
++  walDisableBlocking(pWal);
+   if( rc ){
+-    return rc==SQLITE_BUSY ? WAL_RETRY : rc;
++#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
++    if( rc==SQLITE_BUSY_TIMEOUT ){
++      *pCnt |= WAL_RETRY_BLOCKED_MASK;
++    }
++#else
++    assert( rc!=SQLITE_BUSY_TIMEOUT );
++#endif
++    assert( (rc&0xFF)!=SQLITE_BUSY||rc==SQLITE_BUSY||rc==SQLITE_BUSY_TIMEOUT );
++    return (rc&0xFF)==SQLITE_BUSY ? WAL_RETRY : rc;
+   }
+   /* Now that the read-lock has been obtained, check that neither the
+   ** value in the aReadMark[] array or the contents of the wal-index
+@@ -64565,7 +67876,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+   ** we can guarantee that the checkpointer that set nBackfill could not
+   ** see any pages past pWal->hdr.mxFrame, this problem does not come up.
+   */
+-  pWal->minFrame = AtomicLoad(&pInfo->nBackfill)+1;
++  pWal->minFrame = AtomicLoad(&pInfo->nBackfill)+1; SEH_INJECT_FAULT;
+   walShmBarrier(pWal);
+   if( AtomicLoad(pInfo->aReadMark+mxI)!=mxReadMark
+    || memcmp((void *)walIndexHdr(pWal), &pWal->hdr, sizeof(WalIndexHdr))
+@@ -64580,6 +67891,54 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
+ }
+ 
+ #ifdef SQLITE_ENABLE_SNAPSHOT
++/*
++** This function does the work of sqlite3WalSnapshotRecover().
++*/
++static int walSnapshotRecover(
++  Wal *pWal,                      /* WAL handle */
++  void *pBuf1,                    /* Temp buffer pWal->szPage bytes in size */
++  void *pBuf2                     /* Temp buffer pWal->szPage bytes in size */
++){
++  int szPage = (int)pWal->szPage;
++  int rc;
++  i64 szDb;                       /* Size of db file in bytes */
++
++  rc = sqlite3OsFileSize(pWal->pDbFd, &szDb);
++  if( rc==SQLITE_OK ){
++    volatile WalCkptInfo *pInfo = walCkptInfo(pWal);
++    u32 i = pInfo->nBackfillAttempted;
++    for(i=pInfo->nBackfillAttempted; i>AtomicLoad(&pInfo->nBackfill); i--){
++      WalHashLoc sLoc;          /* Hash table location */
++      u32 pgno;                 /* Page number in db file */
++      i64 iDbOff;               /* Offset of db file entry */
++      i64 iWalOff;              /* Offset of wal file entry */
++
++      rc = walHashGet(pWal, walFramePage(i), &sLoc);
++      if( rc!=SQLITE_OK ) break;
++      assert( i - sLoc.iZero - 1 >=0 );
++      pgno = sLoc.aPgno[i-sLoc.iZero-1];
++      iDbOff = (i64)(pgno-1) * szPage;
++
++      if( iDbOff+szPage<=szDb ){
++        iWalOff = walFrameOffset(i, szPage) + WAL_FRAME_HDRSIZE;
++        rc = sqlite3OsRead(pWal->pWalFd, pBuf1, szPage, iWalOff);
++
++        if( rc==SQLITE_OK ){
++          rc = sqlite3OsRead(pWal->pDbFd, pBuf2, szPage, iDbOff);
++        }
++
++        if( rc!=SQLITE_OK || 0==memcmp(pBuf1, pBuf2, szPage) ){
++          break;
++        }
++      }
++
++      pInfo->nBackfillAttempted = i-1;
++    }
++  }
++
++  return rc;
++}
++
+ /*
+ ** Attempt to reduce the value of the WalCkptInfo.nBackfillAttempted
+ ** variable so that older snapshots can be accessed. To do this, loop
+@@ -64605,50 +67964,21 @@ SQLITE_PRIVATE int sqlite3WalSnapshotRecover(Wal *pWal){
+   assert( pWal->readLock>=0 );
+   rc = walLockExclusive(pWal, WAL_CKPT_LOCK, 1);
+   if( rc==SQLITE_OK ){
+-    volatile WalCkptInfo *pInfo = walCkptInfo(pWal);
+-    int szPage = (int)pWal->szPage;
+-    i64 szDb;                   /* Size of db file in bytes */
+-
+-    rc = sqlite3OsFileSize(pWal->pDbFd, &szDb);
+-    if( rc==SQLITE_OK ){
+-      void *pBuf1 = sqlite3_malloc(szPage);
+-      void *pBuf2 = sqlite3_malloc(szPage);
+-      if( pBuf1==0 || pBuf2==0 ){
+-        rc = SQLITE_NOMEM;
+-      }else{
+-        u32 i = pInfo->nBackfillAttempted;
+-        for(i=pInfo->nBackfillAttempted; i>AtomicLoad(&pInfo->nBackfill); i--){
+-          WalHashLoc sLoc;          /* Hash table location */
+-          u32 pgno;                 /* Page number in db file */
+-          i64 iDbOff;               /* Offset of db file entry */
+-          i64 iWalOff;              /* Offset of wal file entry */
+-
+-          rc = walHashGet(pWal, walFramePage(i), &sLoc);
+-          if( rc!=SQLITE_OK ) break;
+-          assert( i - sLoc.iZero - 1 >=0 );
+-          pgno = sLoc.aPgno[i-sLoc.iZero-1];
+-          iDbOff = (i64)(pgno-1) * szPage;
+-
+-          if( iDbOff+szPage<=szDb ){
+-            iWalOff = walFrameOffset(i, szPage) + WAL_FRAME_HDRSIZE;
+-            rc = sqlite3OsRead(pWal->pWalFd, pBuf1, szPage, iWalOff);
+-
+-            if( rc==SQLITE_OK ){
+-              rc = sqlite3OsRead(pWal->pDbFd, pBuf2, szPage, iDbOff);
+-            }
+-
+-            if( rc!=SQLITE_OK || 0==memcmp(pBuf1, pBuf2, szPage) ){
+-              break;
+-            }
+-          }
+-
+-          pInfo->nBackfillAttempted = i-1;
+-        }
++    void *pBuf1 = sqlite3_malloc(pWal->szPage);
++    void *pBuf2 = sqlite3_malloc(pWal->szPage);
++    if( pBuf1==0 || pBuf2==0 ){
++      rc = SQLITE_NOMEM;
++    }else{
++      pWal->ckptLock = 1;
++      SEH_TRY {
++        rc = walSnapshotRecover(pWal, pBuf1, pBuf2);
+       }
+-
+-      sqlite3_free(pBuf1);
+-      sqlite3_free(pBuf2);
++      SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
++      pWal->ckptLock = 0;
+     }
++
++    sqlite3_free(pBuf1);
++    sqlite3_free(pBuf2);
+     walUnlockExclusive(pWal, WAL_CKPT_LOCK, 1);
+   }
+ 
+@@ -64657,28 +67987,20 @@ SQLITE_PRIVATE int sqlite3WalSnapshotRecover(Wal *pWal){
+ #endif /* SQLITE_ENABLE_SNAPSHOT */
+ 
+ /*
+-** Begin a read transaction on the database.
+-**
+-** This routine used to be called sqlite3OpenSnapshot() and with good reason:
+-** it takes a snapshot of the state of the WAL and wal-index for the current
+-** instant in time.  The current thread will continue to use this snapshot.
+-** Other threads might append new content to the WAL and wal-index but
+-** that extra content is ignored by the current thread.
+-**
+-** If the database contents have changes since the previous read
+-** transaction, then *pChanged is set to 1 before returning.  The
+-** Pager layer will use this to know that its cache is stale and
+-** needs to be flushed.
++** This function does the work of sqlite3WalBeginReadTransaction() (see
++** below). That function simply calls this one inside an SEH_TRY{...} block.
+ */
+-SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
++static int walBeginReadTransaction(Wal *pWal, int *pChanged){
+   int rc;                         /* Return code */
+   int cnt = 0;                    /* Number of TryBeginRead attempts */
+ #ifdef SQLITE_ENABLE_SNAPSHOT
++  int ckptLock = 0;
+   int bChanged = 0;
+   WalIndexHdr *pSnapshot = pWal->pSnapshot;
+ #endif
+ 
+   assert( pWal->ckptLock==0 );
++  assert( pWal->nSehTry>0 );
+ 
+ #ifdef SQLITE_ENABLE_SNAPSHOT
+   if( pSnapshot ){
+@@ -64701,12 +68023,12 @@ SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
+     if( rc!=SQLITE_OK ){
+       return rc;
+     }
+-    pWal->ckptLock = 1;
++    ckptLock = 1;
+   }
+ #endif
+ 
+   do{
+-    rc = walTryBeginRead(pWal, pChanged, 0, ++cnt);
++    rc = walTryBeginRead(pWal, pChanged, 0, &cnt);
+   }while( rc==WAL_RETRY );
+   testcase( (rc&0xff)==SQLITE_BUSY );
+   testcase( (rc&0xff)==SQLITE_IOERR );
+@@ -64765,15 +68087,37 @@ SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
+   }
+ 
+   /* Release the shared CKPT lock obtained above. */
+-  if( pWal->ckptLock ){
++  if( ckptLock ){
+     assert( pSnapshot );
+     walUnlockShared(pWal, WAL_CKPT_LOCK);
+-    pWal->ckptLock = 0;
+   }
+ #endif
+   return rc;
+ }
+ 
++/*
++** Begin a read transaction on the database.
++**
++** This routine used to be called sqlite3OpenSnapshot() and with good reason:
++** it takes a snapshot of the state of the WAL and wal-index for the current
++** instant in time.  The current thread will continue to use this snapshot.
++** Other threads might append new content to the WAL and wal-index but
++** that extra content is ignored by the current thread.
++**
++** If the database contents have changes since the previous read
++** transaction, then *pChanged is set to 1 before returning.  The
++** Pager layer will use this to know that its cache is stale and
++** needs to be flushed.
++*/
++SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
++  int rc;
++  SEH_TRY {
++    rc = walBeginReadTransaction(pWal, pChanged);
++  }
++  SEH_EXCEPT( rc = walHandleException(pWal); )
++  return rc;
++}
++
+ /*
+ ** Finish with a read transaction.  All this does is release the
+ ** read-lock.
+@@ -64794,7 +68138,7 @@ SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal){
+ ** Return SQLITE_OK if successful, or an error code if an error occurs. If an
+ ** error does occur, the final value of *piRead is undefined.
+ */
+-SQLITE_PRIVATE int sqlite3WalFindFrame(
++static int walFindFrame(
+   Wal *pWal,                      /* WAL handle */
+   Pgno pgno,                      /* Database page number to read data for */
+   u32 *piRead                     /* OUT: Frame number (or zero) */
+@@ -64857,6 +68201,7 @@ SQLITE_PRIVATE int sqlite3WalFindFrame(
+     }
+     nCollide = HASHTABLE_NSLOT;
+     iKey = walHash(pgno);
++    SEH_INJECT_FAULT;
+     while( (iH = AtomicLoad(&sLoc.aHash[iKey]))!=0 ){
+       u32 iFrame = iH + sLoc.iZero;
+       if( iFrame<=iLast && iFrame>=pWal->minFrame && sLoc.aPgno[iH-1]==pgno ){
+@@ -64864,6 +68209,7 @@ SQLITE_PRIVATE int sqlite3WalFindFrame(
+         iRead = iFrame;
+       }
+       if( (nCollide--)==0 ){
++        *piRead = 0;
+         return SQLITE_CORRUPT_BKPT;
+       }
+       iKey = walNextHash(iKey);
+@@ -64893,6 +68239,30 @@ SQLITE_PRIVATE int sqlite3WalFindFrame(
+   return SQLITE_OK;
+ }
+ 
++/*
++** Search the wal file for page pgno. If found, set *piRead to the frame that
++** contains the page. Otherwise, if pgno is not in the wal file, set *piRead
++** to zero.
++**
++** Return SQLITE_OK if successful, or an error code if an error occurs. If an
++** error does occur, the final value of *piRead is undefined.
++**
++** The difference between this function and walFindFrame() is that this
++** function wraps walFindFrame() in an SEH_TRY{...} block.
++*/
++SQLITE_PRIVATE int sqlite3WalFindFrame(
++  Wal *pWal,                      /* WAL handle */
++  Pgno pgno,                      /* Database page number to read data for */
++  u32 *piRead                     /* OUT: Frame number (or zero) */
++){
++  int rc;
++  SEH_TRY {
++    rc = walFindFrame(pWal, pgno, piRead);
++  }
++  SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
++  return rc;
++}
++
+ /*
+ ** Read the contents of frame iRead from the wal file into buffer pOut
+ ** (which is nOut bytes in size). Return SQLITE_OK if successful, or an
+@@ -64974,12 +68344,17 @@ SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal){
+   ** time the read transaction on this connection was started, then
+   ** the write is disallowed.
+   */
+-  if( memcmp(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr))!=0 ){
++  SEH_TRY {
++    if( memcmp(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr))!=0 ){
++      rc = SQLITE_BUSY_SNAPSHOT;
++    }
++  }
++  SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
++
++  if( rc!=SQLITE_OK ){
+     walUnlockExclusive(pWal, WAL_WRITE_LOCK, 1);
+     pWal->writeLock = 0;
+-    rc = SQLITE_BUSY_SNAPSHOT;
+   }
+-
+   return rc;
+ }
+ 
+@@ -65015,30 +68390,33 @@ SQLITE_PRIVATE int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *p
+     Pgno iMax = pWal->hdr.mxFrame;
+     Pgno iFrame;
+ 
+-    /* Restore the clients cache of the wal-index header to the state it
+-    ** was in before the client began writing to the database.
+-    */
+-    memcpy(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr));
+-
+-    for(iFrame=pWal->hdr.mxFrame+1;
+-        ALWAYS(rc==SQLITE_OK) && iFrame<=iMax;
+-        iFrame++
+-    ){
+-      /* This call cannot fail. Unless the page for which the page number
+-      ** is passed as the second argument is (a) in the cache and
+-      ** (b) has an outstanding reference, then xUndo is either a no-op
+-      ** (if (a) is false) or simply expels the page from the cache (if (b)
+-      ** is false).
+-      **
+-      ** If the upper layer is doing a rollback, it is guaranteed that there
+-      ** are no outstanding references to any page other than page 1. And
+-      ** page 1 is never written to the log until the transaction is
+-      ** committed. As a result, the call to xUndo may not fail.
++    SEH_TRY {
++      /* Restore the clients cache of the wal-index header to the state it
++      ** was in before the client began writing to the database.
+       */
+-      assert( walFramePgno(pWal, iFrame)!=1 );
+-      rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
++      memcpy(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr));
++
++      for(iFrame=pWal->hdr.mxFrame+1;
++          ALWAYS(rc==SQLITE_OK) && iFrame<=iMax;
++          iFrame++
++      ){
++        /* This call cannot fail. Unless the page for which the page number
++        ** is passed as the second argument is (a) in the cache and
++        ** (b) has an outstanding reference, then xUndo is either a no-op
++        ** (if (a) is false) or simply expels the page from the cache (if (b)
++        ** is false).
++        **
++        ** If the upper layer is doing a rollback, it is guaranteed that there
++        ** are no outstanding references to any page other than page 1. And
++        ** page 1 is never written to the log until the transaction is
++        ** committed. As a result, the call to xUndo may not fail.
++        */
++        assert( walFramePgno(pWal, iFrame)!=1 );
++        rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
++      }
++      if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
+     }
+-    if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
++    SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
+   }
+   return rc;
+ }
+@@ -65082,7 +68460,10 @@ SQLITE_PRIVATE int sqlite3WalSavepointUndo(Wal *pWal, u32 *aWalData){
+     pWal->hdr.mxFrame = aWalData[0];
+     pWal->hdr.aFrameCksum[0] = aWalData[1];
+     pWal->hdr.aFrameCksum[1] = aWalData[2];
+-    walCleanupHash(pWal);
++    SEH_TRY {
++      walCleanupHash(pWal);
++    }
++    SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
+   }
+ 
+   return rc;
+@@ -65132,7 +68513,7 @@ static int walRestartLog(Wal *pWal){
+     cnt = 0;
+     do{
+       int notUsed;
+-      rc = walTryBeginRead(pWal, ¬Used, 1, ++cnt);
++      rc = walTryBeginRead(pWal, ¬Used, 1, &cnt);
+     }while( rc==WAL_RETRY );
+     assert( (rc&0xff)!=SQLITE_BUSY ); /* BUSY not possible when useWal==1 */
+     testcase( (rc&0xff)==SQLITE_IOERR );
+@@ -65197,7 +68578,7 @@ static int walWriteOneFrame(
+   int rc;                         /* Result code from subfunctions */
+   void *pData;                    /* Data actually written */
+   u8 aFrame[WAL_FRAME_HDRSIZE];   /* Buffer to assemble frame-header in */
+-  pData = pPage->pData;
++  if( (pData = sqlite3mcPagerCodec(pPage))==0 ) return SQLITE_NOMEM_BKPT;
+   walEncodeFrame(p->pWal, pPage->pgno, nTruncate, pData, aFrame);
+   rc = walWriteToLog(p, aFrame, sizeof(aFrame), iOffset);
+   if( rc ) return rc;
+@@ -65263,7 +68644,7 @@ static int walRewriteChecksums(Wal *pWal, u32 iLast){
+ ** Write a set of frames to the log. The caller must hold the write-lock
+ ** on the log file (obtained using sqlite3WalBeginWriteTransaction()).
+ */
+-SQLITE_PRIVATE int sqlite3WalFrames(
++static int walFrames(
+   Wal *pWal,                      /* Wal handle to write to */
+   int szPage,                     /* Database page-size in bytes */
+   PgHdr *pList,                   /* List of dirty pages to write */
+@@ -65351,7 +68732,9 @@ SQLITE_PRIVATE int sqlite3WalFrames(
+       if( rc ) return rc;
+     }
+   }
+-  assert( (int)pWal->szPage==szPage );
++  if( (int)pWal->szPage!=szPage ){
++    return SQLITE_CORRUPT_BKPT;  /* TH3 test case: cov1/corrupt155.test */
++  }
+ 
+   /* Setup information needed to write frames into the WAL */
+   w.pWal = pWal;
+@@ -65372,7 +68755,7 @@ SQLITE_PRIVATE int sqlite3WalFrames(
+     ** checksums must be recomputed when the transaction is committed.  */
+     if( iFirst && (p->pDirty || isCommit==0) ){
+       u32 iWrite = 0;
+-      VVA_ONLY(rc =) sqlite3WalFindFrame(pWal, p->pgno, &iWrite);
++      VVA_ONLY(rc =) walFindFrame(pWal, p->pgno, &iWrite);
+       assert( rc==SQLITE_OK || iWrite==0 );
+       if( iWrite>=iFirst ){
+         i64 iOff = walFrameOffset(iWrite, szPage) + WAL_FRAME_HDRSIZE;
+@@ -65380,7 +68763,7 @@ SQLITE_PRIVATE int sqlite3WalFrames(
+         if( pWal->iReCksum==0 || iWriteiReCksum ){
+           pWal->iReCksum = iWrite;
+         }
+-        pData = p->pData;
++        if( (pData = sqlite3mcPagerCodec(p))==0 ) return SQLITE_NOMEM;
+         rc = sqlite3OsWrite(pWal->pWalFd, pData, szPage, iOff);
+         if( rc ) return rc;
+         p->flags &= ~PGHDR_WAL_APPEND;
+@@ -65491,6 +68874,29 @@ SQLITE_PRIVATE int sqlite3WalFrames(
+   return rc;
+ }
+ 
++/*
++** Write a set of frames to the log. The caller must hold the write-lock
++** on the log file (obtained using sqlite3WalBeginWriteTransaction()).
++**
++** The difference between this function and walFrames() is that this
++** function wraps walFrames() in an SEH_TRY{...} block.
++*/
++SQLITE_PRIVATE int sqlite3WalFrames(
++  Wal *pWal,                      /* Wal handle to write to */
++  int szPage,                     /* Database page-size in bytes */
++  PgHdr *pList,                   /* List of dirty pages to write */
++  Pgno nTruncate,                 /* Database size after this commit */
++  int isCommit,                   /* True if this is a commit */
++  int sync_flags                  /* Flags to pass to OsSync() (or 0) */
++){
++  int rc;
++  SEH_TRY {
++    rc = walFrames(pWal, szPage, pList, nTruncate, isCommit, sync_flags);
++  }
++  SEH_EXCEPT( rc = walHandleException(pWal); )
++  return rc;
++}
++
+ /*
+ ** This routine is called to implement sqlite3_wal_checkpoint() and
+ ** related interfaces.
+@@ -65528,10 +68934,9 @@ SQLITE_PRIVATE int sqlite3WalCheckpoint(
+   if( pWal->readOnly ) return SQLITE_READONLY;
+   WALTRACE(("WAL%p: checkpoint begins\n", pWal));
+ 
+-  /* Enable blocking locks, if possible. If blocking locks are successfully
+-  ** enabled, set xBusy2=0 so that the busy-handler is never invoked. */
++  /* Enable blocking locks, if possible. */
+   sqlite3WalDb(pWal, db);
+-  (void)walEnableBlocking(pWal);
++  if( xBusy2 ) (void)walEnableBlocking(pWal);
+ 
+   /* IMPLEMENTATION-OF: R-62028-47212 All calls obtain an exclusive
+   ** "checkpoint" lock on the database file.
+@@ -65570,30 +68975,38 @@ SQLITE_PRIVATE int sqlite3WalCheckpoint(
+ 
+ 
+   /* Read the wal-index header. */
+-  if( rc==SQLITE_OK ){
+-    walDisableBlocking(pWal);
+-    rc = walIndexReadHdr(pWal, &isChanged);
+-    (void)walEnableBlocking(pWal);
+-    if( isChanged && pWal->pDbFd->pMethods->iVersion>=3 ){
+-      sqlite3OsUnfetch(pWal->pDbFd, 0, 0);
++  SEH_TRY {
++    if( rc==SQLITE_OK ){
++      /* For a passive checkpoint, do not re-enable blocking locks after
++      ** reading the wal-index header. A passive checkpoint should not block
++      ** or invoke the busy handler. The only lock such a checkpoint may
++      ** attempt to obtain is a lock on a read-slot, and it should give up
++      ** immediately and do a partial checkpoint if it cannot obtain it. */
++      walDisableBlocking(pWal);
++      rc = walIndexReadHdr(pWal, &isChanged);
++      if( eMode2!=SQLITE_CHECKPOINT_PASSIVE ) (void)walEnableBlocking(pWal);
++      if( isChanged && pWal->pDbFd->pMethods->iVersion>=3 ){
++        sqlite3OsUnfetch(pWal->pDbFd, 0, 0);
++      }
+     }
+-  }
+-
+-  /* Copy data from the log to the database file. */
+-  if( rc==SQLITE_OK ){
+ 
+-    if( pWal->hdr.mxFrame && walPagesize(pWal)!=nBuf ){
+-      rc = SQLITE_CORRUPT_BKPT;
+-    }else{
+-      rc = walCheckpoint(pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf);
+-    }
++    /* Copy data from the log to the database file. */
++    if( rc==SQLITE_OK ){
++      if( pWal->hdr.mxFrame && walPagesize(pWal)!=nBuf ){
++        rc = SQLITE_CORRUPT_BKPT;
++      }else{
++        rc = walCheckpoint(pWal, db, eMode2, xBusy2, pBusyArg, sync_flags,zBuf);
++      }
+ 
+-    /* If no error occurred, set the output variables. */
+-    if( rc==SQLITE_OK || rc==SQLITE_BUSY ){
+-      if( pnLog ) *pnLog = (int)pWal->hdr.mxFrame;
+-      if( pnCkpt ) *pnCkpt = (int)(walCkptInfo(pWal)->nBackfill);
++      /* If no error occurred, set the output variables. */
++      if( rc==SQLITE_OK || rc==SQLITE_BUSY ){
++        if( pnLog ) *pnLog = (int)pWal->hdr.mxFrame;
++        SEH_INJECT_FAULT;
++        if( pnCkpt ) *pnCkpt = (int)(walCkptInfo(pWal)->nBackfill);
++      }
+     }
+   }
++  SEH_EXCEPT( rc = walHandleException(pWal); )
+ 
+   if( isChanged ){
+     /* If a new wal-index header was loaded before the checkpoint was
+@@ -65670,7 +69083,9 @@ SQLITE_PRIVATE int sqlite3WalExclusiveMode(Wal *pWal, int op){
+   ** locks are taken in this case). Nor should the pager attempt to
+   ** upgrade to exclusive-mode following such an error.
+   */
++#ifndef SQLITE_USE_SEH
+   assert( pWal->readLock>=0 || pWal->lockError );
++#endif
+   assert( pWal->readLock>=0 || (op<=0 && pWal->exclusiveMode==0) );
+ 
+   if( op==0 ){
+@@ -65771,16 +69186,19 @@ SQLITE_API int sqlite3_snapshot_cmp(sqlite3_snapshot *p1, sqlite3_snapshot *p2){
+ */
+ SQLITE_PRIVATE int sqlite3WalSnapshotCheck(Wal *pWal, sqlite3_snapshot *pSnapshot){
+   int rc;
+-  rc = walLockShared(pWal, WAL_CKPT_LOCK);
+-  if( rc==SQLITE_OK ){
+-    WalIndexHdr *pNew = (WalIndexHdr*)pSnapshot;
+-    if( memcmp(pNew->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt))
+-     || pNew->mxFramenBackfillAttempted
+-    ){
+-      rc = SQLITE_ERROR_SNAPSHOT;
+-      walUnlockShared(pWal, WAL_CKPT_LOCK);
++  SEH_TRY {
++    rc = walLockShared(pWal, WAL_CKPT_LOCK);
++    if( rc==SQLITE_OK ){
++      WalIndexHdr *pNew = (WalIndexHdr*)pSnapshot;
++      if( memcmp(pNew->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt))
++       || pNew->mxFramenBackfillAttempted
++      ){
++        rc = SQLITE_ERROR_SNAPSHOT;
++        walUnlockShared(pWal, WAL_CKPT_LOCK);
++      }
+     }
+   }
++  SEH_EXCEPT( rc = walHandleException(pWal); )
+   return rc;
+ }
+ 
+@@ -65903,7 +69321,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3WalFile(Wal *pWal){
+ **     22       1     Min embedded payload fraction (must be 32)
+ **     23       1     Min leaf payload fraction (must be 32)
+ **     24       4     File change counter
+-**     28       4     Reserved for future use
++**     28       4     The size of the database in pages
+ **     32       4     First freelist page
+ **     36       4     Number of freelist pages in the file
+ **     40      60     15 4-byte meta values passed to higher layers
+@@ -66011,7 +69429,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3WalFile(Wal *pWal){
+ ** byte are used.  The integer consists of all bytes that have bit 8 set and
+ ** the first byte with bit 8 clear.  The most significant byte of the integer
+ ** appears first.  A variable-length integer may not be more than 9 bytes long.
+-** As a special case, all 8 bytes of the 9th byte are used as data.  This
++** As a special case, all 8 bits of the 9th byte are used as data.  This
+ ** allows a 64-bit integer to be encoded in 9 bytes.
+ **
+ **    0x00                      becomes  0x00000000
+@@ -66019,7 +69437,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3WalFile(Wal *pWal){
+ **    0x81 0x00                 becomes  0x00000080
+ **    0x82 0x00                 becomes  0x00000100
+ **    0x80 0x7f                 becomes  0x0000007f
+-**    0x8a 0x91 0xd1 0xac 0x78  becomes  0x12345678
++**    0x81 0x91 0xd1 0xac 0x78  becomes  0x12345678
+ **    0x81 0x81 0x81 0x81 0x01  becomes  0x10204081
+ **
+ ** Variable length integers are used for rowids and to hold the number of
+@@ -66102,7 +69520,7 @@ typedef struct CellInfo CellInfo;
+ ** page that has been loaded into memory.  The information in this object
+ ** is derived from the raw on-disk page content.
+ **
+-** As each database page is loaded into memory, the pager allocats an
++** As each database page is loaded into memory, the pager allocates an
+ ** instance of this object and zeros the first 8 bytes.  (This is the
+ ** "extra" information associated with each page of the pager.)
+ **
+@@ -66395,7 +69813,7 @@ struct BtCursor {
+ #define BTCF_WriteFlag    0x01   /* True if a write cursor */
+ #define BTCF_ValidNKey    0x02   /* True if info.nKey is valid */
+ #define BTCF_ValidOvfl    0x04   /* True if aOverflow is valid */
+-#define BTCF_AtLast       0x08   /* Cursor is pointing ot the last entry */
++#define BTCF_AtLast       0x08   /* Cursor is pointing to the last entry */
+ #define BTCF_Incrblob     0x10   /* True if an incremental I/O handle */
+ #define BTCF_Multiple     0x20   /* Maybe another cursor on the same btree */
+ #define BTCF_Pinned       0x40   /* Cursor is busy and cannot be moved */
+@@ -66513,15 +69931,15 @@ struct BtCursor {
+ ** So, this macro is defined instead.
+ */
+ #ifndef SQLITE_OMIT_AUTOVACUUM
+-#define ISAUTOVACUUM (pBt->autoVacuum)
++#define ISAUTOVACUUM(pBt) (pBt->autoVacuum)
+ #else
+-#define ISAUTOVACUUM 0
++#define ISAUTOVACUUM(pBt) 0
+ #endif
+ 
+ 
+ /*
+-** This structure is passed around through all the sanity checking routines
+-** in order to keep track of some global state information.
++** This structure is passed around through all the PRAGMA integrity_check
++** checking routines in order to keep track of some global state information.
+ **
+ ** The aRef[] array is allocated so that there is 1 bit for each page in
+ ** the database. As the integrity-check proceeds, for each page used in
+@@ -66534,13 +69952,15 @@ struct IntegrityCk {
+   BtShared *pBt;    /* The tree being checked out */
+   Pager *pPager;    /* The associated pager.  Also accessible by pBt->pPager */
+   u8 *aPgRef;       /* 1 bit per page in the db (see above) */
+-  Pgno nPage;       /* Number of pages in the database */
++  Pgno nCkPage;     /* Pages in the database.  0 for partial check */
+   int mxErr;        /* Stop accumulating errors when this reaches zero */
+   int nErr;         /* Number of messages written to zErrMsg so far */
+-  int bOomFault;    /* A memory allocation error has occurred */
++  int rc;           /* SQLITE_OK, SQLITE_NOMEM, or SQLITE_INTERRUPT */
++  u32 nStep;        /* Number of steps into the integrity_check process */
+   const char *zPfx; /* Error message prefix */
+-  Pgno v1;          /* Value for first %u substitution in zPfx */
+-  int v2;           /* Value for second %d substitution in zPfx */
++  Pgno v0;          /* Value for first %u substitution in zPfx (root page) */
++  Pgno v1;          /* Value for second %u substitution in zPfx (current pg) */
++  int v2;           /* Value for third %d substitution in zPfx */
+   StrAccum errMsg;  /* Accumulate the error message text here */
+   u32 *heap;        /* Min-heap used for analyzing cell coverage */
+   sqlite3 *db;      /* Database connection running the check */
+@@ -66556,7 +69976,7 @@ struct IntegrityCk {
+ 
+ /*
+ ** get2byteAligned(), unlike get2byte(), requires that its argument point to a
+-** two-byte aligned address.  get2bytea() is only used for accessing the
++** two-byte aligned address.  get2byteAligned() is only used for accessing the
+ ** cell addresses in a btree header.
+ */
+ #if SQLITE_BYTEORDER==4321
+@@ -66733,7 +70153,7 @@ SQLITE_PRIVATE int sqlite3BtreeHoldsMutex(Btree *p){
+ **
+ ** There is a corresponding leave-all procedures.
+ **
+-** Enter the mutexes in accending order by BtShared pointer address
++** Enter the mutexes in ascending order by BtShared pointer address
+ ** to avoid the possibility of deadlock when two threads with
+ ** two or more btrees in common both try to lock all their btrees
+ ** at the same instant.
+@@ -66807,6 +70227,7 @@ SQLITE_PRIVATE int sqlite3BtreeHoldsAllMutexes(sqlite3 *db){
+ SQLITE_PRIVATE int sqlite3SchemaMutexHeld(sqlite3 *db, int iDb, Schema *pSchema){
+   Btree *p;
+   assert( db!=0 );
++  if( db->pVfs==0 && db->nDb==0 ) return 1;
+   if( pSchema ) iDb = sqlite3SchemaToIndex(db, pSchema);
+   assert( iDb>=0 && iDbnDb );
+   if( !sqlite3_mutex_held(db->mutex) ) return 0;
+@@ -67002,8 +70423,8 @@ SQLITE_PRIVATE sqlite3_uint64 sqlite3BtreeSeekCount(Btree *pBt){
+ int corruptPageError(int lineno, MemPage *p){
+   char *zMsg;
+   sqlite3BeginBenignMalloc();
+-  zMsg = sqlite3_mprintf("database corruption page %d of %s",
+-      (int)p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
++  zMsg = sqlite3_mprintf("database corruption page %u of %s",
++             p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
+   );
+   sqlite3EndBenignMalloc();
+   if( zMsg ){
+@@ -67812,8 +71233,25 @@ SQLITE_PRIVATE int sqlite3BtreeCursorRestore(BtCursor *pCur, int *pDifferentRow)
+ */
+ SQLITE_PRIVATE void sqlite3BtreeCursorHint(BtCursor *pCur, int eHintType, ...){
+   /* Used only by system that substitute their own storage engine */
++#ifdef SQLITE_DEBUG
++  if( ALWAYS(eHintType==BTREE_HINT_RANGE) ){
++    va_list ap;
++    Expr *pExpr;
++    Walker w;
++    memset(&w, 0, sizeof(w));
++    w.xExprCallback = sqlite3CursorRangeHintExprCheck;
++    va_start(ap, eHintType);
++    pExpr = va_arg(ap, Expr*);
++    w.u.aMem = va_arg(ap, Mem*);
++    va_end(ap);
++    assert( pExpr!=0 );
++    assert( w.u.aMem!=0 );
++    sqlite3WalkExpr(&w, pExpr);
++  }
++#endif /* SQLITE_DEBUG */
+ }
+-#endif
++#endif /* SQLITE_ENABLE_CURSOR_HINTS */
++
+ 
+ /*
+ ** Provide flag hints to the cursor.
+@@ -67898,7 +71336,7 @@ static void ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent, int *pRC){
+   pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
+ 
+   if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
+-    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
++    TRACE(("PTRMAP_UPDATE: %u->(%u,%u)\n", key, eType, parent));
+     *pRC= rc = sqlite3PagerWrite(pDbPage);
+     if( rc==SQLITE_OK ){
+       pPtrmap[offset] = eType;
+@@ -68097,27 +71535,31 @@ static void btreeParseCellPtr(
+   iKey = *pIter;
+   if( iKey>=0x80 ){
+     u8 x;
+-    iKey = ((iKey&0x7f)<<7) | ((x = *++pIter) & 0x7f);
++    iKey = (iKey<<7) ^ (x = *++pIter);
+     if( x>=0x80 ){
+-      iKey = (iKey<<7) | ((x =*++pIter) & 0x7f);
++      iKey = (iKey<<7) ^ (x = *++pIter);
+       if( x>=0x80 ){
+-        iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
++        iKey = (iKey<<7) ^ 0x10204000 ^ (x = *++pIter);
+         if( x>=0x80 ){
+-          iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
++          iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
+           if( x>=0x80 ){
+-            iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
++            iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
+             if( x>=0x80 ){
+-              iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
++              iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
+               if( x>=0x80 ){
+-                iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
++                iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
+                 if( x>=0x80 ){
+-                  iKey = (iKey<<8) | (*++pIter);
++                  iKey = (iKey<<8) ^ 0x8000 ^ (*++pIter);
+                 }
+               }
+             }
+           }
+         }
++      }else{
++        iKey ^= 0x204000;
+       }
++    }else{
++      iKey ^= 0x4000;
+     }
+   }
+   pIter++;
+@@ -68194,10 +71636,53 @@ static void btreeParseCell(
+ **
+ ** cellSizePtrNoPayload()    =>   table internal nodes
+ ** cellSizePtrTableLeaf()    =>   table leaf nodes
+-** cellSizePtr()             =>   all index nodes & table leaf nodes
++** cellSizePtr()             =>   index internal nodes
++** cellSizeIdxLeaf()         =>   index leaf nodes
+ */
+ static u16 cellSizePtr(MemPage *pPage, u8 *pCell){
+-  u8 *pIter = pCell + pPage->childPtrSize; /* For looping over bytes of pCell */
++  u8 *pIter = pCell + 4;                   /* For looping over bytes of pCell */
++  u8 *pEnd;                                /* End mark for a varint */
++  u32 nSize;                               /* Size value to return */
++
++#ifdef SQLITE_DEBUG
++  /* The value returned by this function should always be the same as
++  ** the (CellInfo.nSize) value found by doing a full parse of the
++  ** cell. If SQLITE_DEBUG is defined, an assert() at the bottom of
++  ** this function verifies that this invariant is not violated. */
++  CellInfo debuginfo;
++  pPage->xParseCell(pPage, pCell, &debuginfo);
++#endif
++
++  assert( pPage->childPtrSize==4 );
++  nSize = *pIter;
++  if( nSize>=0x80 ){
++    pEnd = &pIter[8];
++    nSize &= 0x7f;
++    do{
++      nSize = (nSize<<7) | (*++pIter & 0x7f);
++    }while( *(pIter)>=0x80 && pItermaxLocal );
++  testcase( nSize==(u32)pPage->maxLocal+1 );
++  if( nSize<=pPage->maxLocal ){
++    nSize += (u32)(pIter - pCell);
++    assert( nSize>4 );
++  }else{
++    int minLocal = pPage->minLocal;
++    nSize = minLocal + (nSize - minLocal) % (pPage->pBt->usableSize - 4);
++    testcase( nSize==pPage->maxLocal );
++    testcase( nSize==(u32)pPage->maxLocal+1 );
++    if( nSize>pPage->maxLocal ){
++      nSize = minLocal;
++    }
++    nSize += 4 + (u16)(pIter - pCell);
++  }
++  assert( nSize==debuginfo.nSize || CORRUPT_DB );
++  return (u16)nSize;
++}
++static u16 cellSizePtrIdxLeaf(MemPage *pPage, u8 *pCell){
++  u8 *pIter = pCell;                       /* For looping over bytes of pCell */
+   u8 *pEnd;                                /* End mark for a varint */
+   u32 nSize;                               /* Size value to return */
+ 
+@@ -68210,6 +71695,7 @@ static u16 cellSizePtr(MemPage *pPage, u8 *pCell){
+   pPage->xParseCell(pPage, pCell, &debuginfo);
+ #endif
+ 
++  assert( pPage->childPtrSize==0 );
+   nSize = *pIter;
+   if( nSize>=0x80 ){
+     pEnd = &pIter[8];
+@@ -68334,7 +71820,7 @@ static void ptrmapPutOvflPtr(MemPage *pPage, MemPage *pSrc, u8 *pCell,int *pRC){
+   pPage->xParseCell(pPage, pCell, &info);
+   if( info.nLocalaDataEnd, pCell, pCell+info.nLocal) ){
++    if( SQLITE_OVERFLOW(pSrc->aDataEnd, pCell, pCell+info.nLocal) ){
+       testcase( pSrc!=pPage );
+       *pRC = SQLITE_CORRUPT_BKPT;
+       return;
+@@ -68379,8 +71865,7 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
+   assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE );
+   assert( pPage->nOverflow==0 );
+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+-  temp = 0;
+-  src = data = pPage->aData;
++  data = pPage->aData;
+   hdr = pPage->hdrOffset;
+   cellOffset = pPage->cellOffset;
+   nCell = pPage->nCell;
+@@ -68434,39 +71919,38 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
+   cbrk = usableSize;
+   iCellLast = usableSize - 4;
+   iCellStart = get2byte(&data[hdr+5]);
+-  for(i=0; iiCellLast ){
+-      return SQLITE_CORRUPT_PAGE(pPage);
+-    }
+-    assert( pc>=iCellStart && pc<=iCellLast );
+-    size = pPage->xCellSize(pPage, &src[pc]);
+-    cbrk -= size;
+-    if( cbrkusableSize ){
+-      return SQLITE_CORRUPT_PAGE(pPage);
+-    }
+-    assert( cbrk+size<=usableSize && cbrk>=iCellStart );
+-    testcase( cbrk+size==usableSize );
+-    testcase( pc+size==usableSize );
+-    put2byte(pAddr, cbrk);
+-    if( temp==0 ){
+-      if( cbrk==pc ) continue;
+-      temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
+-      memcpy(&temp[iCellStart], &data[iCellStart], usableSize - iCellStart);
+-      src = temp;
++  if( nCell>0 ){
++    temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
++    memcpy(temp, data, usableSize);
++    src = temp;
++    for(i=0; iiCellLast ){
++        return SQLITE_CORRUPT_PAGE(pPage);
++      }
++      assert( pc>=0 && pc<=iCellLast );
++      size = pPage->xCellSize(pPage, &src[pc]);
++      cbrk -= size;
++      if( cbrkusableSize ){
++        return SQLITE_CORRUPT_PAGE(pPage);
++      }
++      assert( cbrk+size<=usableSize && cbrk>=iCellStart );
++      testcase( cbrk+size==usableSize );
++      testcase( pc+size==usableSize );
++      put2byte(pAddr, cbrk);
++      memcpy(&data[cbrk], &src[pc], size);
+     }
+-    memcpy(&data[cbrk], &src[pc], size);
+   }
+   data[hdr+7] = 0;
+ 
+- defragment_out:
++defragment_out:
+   assert( pPage->nFree>=0 );
+   if( data[hdr+7]+cbrk-iCellFirst!=pPage->nFree ){
+     return SQLITE_CORRUPT_PAGE(pPage);
+@@ -68523,7 +72007,6 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
+         ** fragmented bytes within the page. */
+         memcpy(&aData[iAddr], &aData[pc], 2);
+         aData[hdr+7] += (u8)x;
+-        testcase( pc+x>maxPC );
+         return &aData[pc];
+       }else if( x+pc > maxPC ){
+         /* This slot extends off the end of the usable part of the page */
+@@ -68539,9 +72022,9 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
+     iAddr = pc;
+     pTmp = &aData[pc];
+     pc = get2byte(pTmp);
+-    if( pc<=iAddr+size ){
++    if( pc<=iAddr ){
+       if( pc ){
+-        /* The next slot in the chain is not past the end of the current slot */
++        /* The next slot in the chain comes before the current slot */
+         *pRc = SQLITE_CORRUPT_PAGE(pPg);
+       }
+       return 0;
+@@ -68567,7 +72050,7 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
+ ** allocation is being made in order to insert a new cell, so we will
+ ** also end up needing a new cell pointer.
+ */
+-static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
++static SQLITE_INLINE int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
+   const int hdr = pPage->hdrOffset;    /* Local cache of pPage->hdrOffset */
+   u8 * const data = pPage->aData;      /* Local cache of pPage->aData */
+   int top;                             /* First byte of cell content area */
+@@ -68593,13 +72076,14 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
+   ** integer, so a value of 0 is used in its place. */
+   pTmp = &data[hdr+5];
+   top = get2byte(pTmp);
+-  assert( top<=(int)pPage->pBt->usableSize ); /* by btreeComputeFreeSpace() */
+   if( gap>top ){
+     if( top==0 && pPage->pBt->usableSize==65536 ){
+       top = 65536;
+     }else{
+       return SQLITE_CORRUPT_PAGE(pPage);
+     }
++  }else if( top>(int)pPage->pBt->usableSize ){
++    return SQLITE_CORRUPT_PAGE(pPage);
+   }
+ 
+   /* If there is enough space between gap and top for one more cell pointer,
+@@ -68661,7 +72145,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
+ **
+ ** Even though the freeblock list was checked by btreeComputeFreeSpace(),
+ ** that routine will not detect overlap between cells or freeblocks.  Nor
+-** does it detect cells or freeblocks that encrouch into the reserved bytes
++** does it detect cells or freeblocks that encroach into the reserved bytes
+ ** at the end of the page.  So do additional corruption checks inside this
+ ** routine and return SQLITE_CORRUPT if any problems are found.
+ */
+@@ -68682,7 +72166,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
+   assert( CORRUPT_DB || iEnd <= pPage->pBt->usableSize );
+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+   assert( iSize>=4 );   /* Minimum cell size is 4 */
+-  assert( iStart<=pPage->pBt->usableSize-4 );
++  assert( CORRUPT_DB || iStart<=pPage->pBt->usableSize-4 );
+ 
+   /* The list of freeblocks must be in ascending order.  Find the
+   ** spot on the list where iStart should be inserted.
+@@ -68693,7 +72177,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
+     iFreeBlk = 0;  /* Shortcut for the case when the freelist is empty */
+   }else{
+     while( (iFreeBlk = get2byte(&data[iPtr]))pBt->btsFlags & BTS_FAST_SECURE ){
++    /* Overwrite deleted information with zeros when the secure_delete
++    ** option is enabled */
++    memset(&data[iStart], 0, iSize);
++  }
+   if( iStart<=x ){
+     /* The new freeblock is at the beginning of the cell content area,
+     ** so just extend the cell content area rather than create another
+@@ -68750,14 +72239,9 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
+   }else{
+     /* Insert the new freeblock into the freelist */
+     put2byte(&data[iPtr], iStart);
++    put2byte(&data[iStart], iFreeBlk);
++    put2byte(&data[iStart+2], iSize);
+   }
+-  if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
+-    /* Overwrite deleted information with zeros when the secure_delete
+-    ** option is enabled */
+-    memset(&data[iStart], 0, iSize);
+-  }
+-  put2byte(&data[iStart], iFreeBlk);
+-  put2byte(&data[iStart+2], iSize);
+   pPage->nFree += iOrigSize;
+   return SQLITE_OK;
+ }
+@@ -68769,62 +72253,67 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
+ ** Only the following combinations are supported.  Anything different
+ ** indicates a corrupt database files:
+ **
+-**         PTF_ZERODATA
+-**         PTF_ZERODATA | PTF_LEAF
+-**         PTF_LEAFDATA | PTF_INTKEY
+-**         PTF_LEAFDATA | PTF_INTKEY | PTF_LEAF
++**         PTF_ZERODATA                             (0x02,  2)
++**         PTF_LEAFDATA | PTF_INTKEY                (0x05,  5)
++**         PTF_ZERODATA | PTF_LEAF                  (0x0a, 10)
++**         PTF_LEAFDATA | PTF_INTKEY | PTF_LEAF     (0x0d, 13)
+ */
+ static int decodeFlags(MemPage *pPage, int flagByte){
+   BtShared *pBt;     /* A copy of pPage->pBt */
+ 
+   assert( pPage->hdrOffset==(pPage->pgno==1 ? 100 : 0) );
+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+-  pPage->leaf = (u8)(flagByte>>3);  assert( PTF_LEAF == 1<<3 );
+-  flagByte &= ~PTF_LEAF;
+-  pPage->childPtrSize = 4-4*pPage->leaf;
+   pBt = pPage->pBt;
+-  if( flagByte==(PTF_LEAFDATA | PTF_INTKEY) ){
+-    /* EVIDENCE-OF: R-07291-35328 A value of 5 (0x05) means the page is an
+-    ** interior table b-tree page. */
+-    assert( (PTF_LEAFDATA|PTF_INTKEY)==5 );
+-    /* EVIDENCE-OF: R-26900-09176 A value of 13 (0x0d) means the page is a
+-    ** leaf table b-tree page. */
+-    assert( (PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF)==13 );
+-    pPage->intKey = 1;
+-    if( pPage->leaf ){
++  pPage->max1bytePayload = pBt->max1bytePayload;
++  if( flagByte>=(PTF_ZERODATA | PTF_LEAF) ){
++    pPage->childPtrSize = 0;
++    pPage->leaf = 1;
++    if( flagByte==(PTF_LEAFDATA | PTF_INTKEY | PTF_LEAF) ){
+       pPage->intKeyLeaf = 1;
+       pPage->xCellSize = cellSizePtrTableLeaf;
+       pPage->xParseCell = btreeParseCellPtr;
++      pPage->intKey = 1;
++      pPage->maxLocal = pBt->maxLeaf;
++      pPage->minLocal = pBt->minLeaf;
++    }else if( flagByte==(PTF_ZERODATA | PTF_LEAF) ){
++      pPage->intKey = 0;
++      pPage->intKeyLeaf = 0;
++      pPage->xCellSize = cellSizePtrIdxLeaf;
++      pPage->xParseCell = btreeParseCellPtrIndex;
++      pPage->maxLocal = pBt->maxLocal;
++      pPage->minLocal = pBt->minLocal;
+     }else{
++      pPage->intKey = 0;
++      pPage->intKeyLeaf = 0;
++      pPage->xCellSize = cellSizePtrIdxLeaf;
++      pPage->xParseCell = btreeParseCellPtrIndex;
++      return SQLITE_CORRUPT_PAGE(pPage);
++    }
++  }else{
++    pPage->childPtrSize = 4;
++    pPage->leaf = 0;
++    if( flagByte==(PTF_ZERODATA) ){
++      pPage->intKey = 0;
++      pPage->intKeyLeaf = 0;
++      pPage->xCellSize = cellSizePtr;
++      pPage->xParseCell = btreeParseCellPtrIndex;
++      pPage->maxLocal = pBt->maxLocal;
++      pPage->minLocal = pBt->minLocal;
++    }else if( flagByte==(PTF_LEAFDATA | PTF_INTKEY) ){
+       pPage->intKeyLeaf = 0;
+       pPage->xCellSize = cellSizePtrNoPayload;
+       pPage->xParseCell = btreeParseCellPtrNoPayload;
++      pPage->intKey = 1;
++      pPage->maxLocal = pBt->maxLeaf;
++      pPage->minLocal = pBt->minLeaf;
++    }else{
++      pPage->intKey = 0;
++      pPage->intKeyLeaf = 0;
++      pPage->xCellSize = cellSizePtr;
++      pPage->xParseCell = btreeParseCellPtrIndex;
++      return SQLITE_CORRUPT_PAGE(pPage);
+     }
+-    pPage->maxLocal = pBt->maxLeaf;
+-    pPage->minLocal = pBt->minLeaf;
+-  }else if( flagByte==PTF_ZERODATA ){
+-    /* EVIDENCE-OF: R-43316-37308 A value of 2 (0x02) means the page is an
+-    ** interior index b-tree page. */
+-    assert( (PTF_ZERODATA)==2 );
+-    /* EVIDENCE-OF: R-59615-42828 A value of 10 (0x0a) means the page is a
+-    ** leaf index b-tree page. */
+-    assert( (PTF_ZERODATA|PTF_LEAF)==10 );
+-    pPage->intKey = 0;
+-    pPage->intKeyLeaf = 0;
+-    pPage->xCellSize = cellSizePtr;
+-    pPage->xParseCell = btreeParseCellPtrIndex;
+-    pPage->maxLocal = pBt->maxLocal;
+-    pPage->minLocal = pBt->minLocal;
+-  }else{
+-    /* EVIDENCE-OF: R-47608-56469 Any other value for the b-tree page type is
+-    ** an error. */
+-    pPage->intKey = 0;
+-    pPage->intKeyLeaf = 0;
+-    pPage->xCellSize = cellSizePtr;
+-    pPage->xParseCell = btreeParseCellPtrIndex;
+-    return SQLITE_CORRUPT_PAGE(pPage);
+   }
+-  pPage->max1bytePayload = pBt->max1bytePayload;
+   return SQLITE_OK;
+ }
+ 
+@@ -69115,70 +72604,41 @@ SQLITE_PRIVATE Pgno sqlite3BtreeLastPage(Btree *p){
+ 
+ /*
+ ** Get a page from the pager and initialize it.
+-**
+-** If pCur!=0 then the page is being fetched as part of a moveToChild()
+-** call.  Do additional sanity checking on the page in this case.
+-** And if the fetch fails, this routine must decrement pCur->iPage.
+-**
+-** The page is fetched as read-write unless pCur is not NULL and is
+-** a read-only cursor.
+-**
+-** If an error occurs, then *ppPage is undefined. It
+-** may remain unchanged, or it may be set to an invalid value.
+ */
+ static int getAndInitPage(
+   BtShared *pBt,                  /* The database file */
+   Pgno pgno,                      /* Number of the page to get */
+   MemPage **ppPage,               /* Write the page pointer here */
+-  BtCursor *pCur,                 /* Cursor to receive the page, or NULL */
+   int bReadOnly                   /* True for a read-only page */
+ ){
+   int rc;
+   DbPage *pDbPage;
++  MemPage *pPage;
+   assert( sqlite3_mutex_held(pBt->mutex) );
+-  assert( pCur==0 || ppPage==&pCur->pPage );
+-  assert( pCur==0 || bReadOnly==pCur->curPagerFlags );
+-  assert( pCur==0 || pCur->iPage>0 );
+ 
+   if( pgno>btreePagecount(pBt) ){
+-    rc = SQLITE_CORRUPT_BKPT;
+-    goto getAndInitPage_error1;
++    *ppPage = 0;
++    return SQLITE_CORRUPT_BKPT;
+   }
+   rc = sqlite3PagerGet(pBt->pPager, pgno, (DbPage**)&pDbPage, bReadOnly);
+   if( rc ){
+-    goto getAndInitPage_error1;
++    *ppPage = 0;
++    return rc;
+   }
+-  *ppPage = (MemPage*)sqlite3PagerGetExtra(pDbPage);
+-  if( (*ppPage)->isInit==0 ){
++  pPage = (MemPage*)sqlite3PagerGetExtra(pDbPage);
++  if( pPage->isInit==0 ){
+     btreePageFromDbPage(pDbPage, pgno, pBt);
+-    rc = btreeInitPage(*ppPage);
++    rc = btreeInitPage(pPage);
+     if( rc!=SQLITE_OK ){
+-      goto getAndInitPage_error2;
++      releasePage(pPage);
++      *ppPage = 0;
++      return rc;
+     }
+   }
+-  assert( (*ppPage)->pgno==pgno || CORRUPT_DB );
+-  assert( (*ppPage)->aData==sqlite3PagerGetData(pDbPage) );
+-
+-  /* If obtaining a child page for a cursor, we must verify that the page is
+-  ** compatible with the root page. */
+-  if( pCur && ((*ppPage)->nCell<1 || (*ppPage)->intKey!=pCur->curIntKey) ){
+-    rc = SQLITE_CORRUPT_PGNO(pgno);
+-    goto getAndInitPage_error2;
+-  }
++  assert( pPage->pgno==pgno || CORRUPT_DB );
++  assert( pPage->aData==sqlite3PagerGetData(pDbPage) );
++  *ppPage = pPage;
+   return SQLITE_OK;
+-
+-getAndInitPage_error2:
+-  releasePage(*ppPage);
+-getAndInitPage_error1:
+-  if( pCur ){
+-    pCur->iPage--;
+-    pCur->pPage = pCur->apPage[pCur->iPage];
+-  }
+-  testcase( pgno==0 );
+-  assert( pgno!=0 || rc==SQLITE_CORRUPT
+-                  || rc==SQLITE_IOERR_NOMEM
+-                  || rc==SQLITE_NOMEM );
+-  return rc;
+ }
+ 
+ /*
+@@ -69261,7 +72721,7 @@ static void pageReinit(DbPage *pData){
+       ** call to btreeInitPage() will likely return SQLITE_CORRUPT.
+       ** But no harm is done by this.  And it is very important that
+       ** btreeInitPage() be called on every btree page so we make
+-      ** the call for every page that comes in for re-initing. */
++      ** the call for every page that comes in for re-initializing. */
+       btreeInitPage(pPage);
+     }
+   }
+@@ -69440,6 +72900,9 @@ SQLITE_PRIVATE int sqlite3BtreeOpen(
+     assert( sizeof(u16)==2 );
+     assert( sizeof(Pgno)==4 );
+ 
++    /* Suppress false-positive compiler warning from PVS-Studio */
++    memset(&zDbHeader[16], 0, 8);
++
+     pBt = sqlite3MallocZero( sizeof(*pBt) );
+     if( pBt==0 ){
+       rc = SQLITE_NOMEM_BKPT;
+@@ -69656,7 +73119,7 @@ static SQLITE_NOINLINE int allocateTempSpace(BtShared *pBt){
+   ** can mean that fillInCell() only initializes the first 2 or 3
+   ** bytes of pTmpSpace, but that the first 4 bytes are copied from
+   ** it into a database page. This is not actually a problem, but it
+-  ** does cause a valgrind error when the 1 or 2 bytes of unitialized
++  ** does cause a valgrind error when the 1 or 2 bytes of uninitialized
+   ** data is passed to system call write(). So to avoid this error,
+   ** zero the first 4 bytes of temp space here.
+   **
+@@ -69891,7 +73354,7 @@ SQLITE_PRIVATE int sqlite3BtreeGetReserveNoMutex(Btree *p){
+ 
+ /*
+ ** Return the number of bytes of space at the end of every page that
+-** are intentually left unused.  This is the "reserved" space that is
++** are intentionally left unused.  This is the "reserved" space that is
+ ** sometimes used by extensions.
+ **
+ ** The value returned is the larger of the current reserve size and
+@@ -70138,7 +73601,6 @@ static int lockBtree(BtShared *pBt){
+     ){
+       goto page1_init_failed;
+     }
+-    pBt->btsFlags |= BTS_PAGESIZE_FIXED;
+     assert( (pageSize & 7)==0 );
+     /* EVIDENCE-OF: R-59310-51205 The "reserved space" size in the 1-byte
+     ** integer at offset 20 is the number of bytes of space at the end of
+@@ -70158,6 +73620,7 @@ static int lockBtree(BtShared *pBt){
+       releasePageOne(pPage1);
+       pBt->usableSize = usableSize;
+       pBt->pageSize = pageSize;
++      pBt->btsFlags |= BTS_PAGESIZE_FIXED;
+       freeTempSpace(pBt);
+       rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
+                                    pageSize-usableSize);
+@@ -70177,6 +73640,7 @@ static int lockBtree(BtShared *pBt){
+     if( usableSize<480 ){
+       goto page1_init_failed;
+     }
++    pBt->btsFlags |= BTS_PAGESIZE_FIXED;
+     pBt->pageSize = pageSize;
+     pBt->usableSize = usableSize;
+ #ifndef SQLITE_OMIT_AUTOVACUUM
+@@ -70355,7 +73819,11 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p){
+ ** when A already has a read lock, we encourage A to give up and let B
+ ** proceed.
+ */
+-SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag, int *pSchemaVersion){
++static SQLITE_NOINLINE int btreeBeginTrans(
++  Btree *p,                 /* The btree in which to start the transaction */
++  int wrflag,               /* True to start a write transaction */
++  int *pSchemaVersion       /* Put schema version number here, if not NULL */
++){
+   BtShared *pBt = p->pBt;
+   Pager *pPager = pBt->pPager;
+   int rc = SQLITE_OK;
+@@ -70527,6 +73995,28 @@ trans_begun:
+   sqlite3BtreeLeave(p);
+   return rc;
+ }
++SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag, int *pSchemaVersion){
++  BtShared *pBt;
++  if( p->sharable
++   || p->inTrans==TRANS_NONE
++   || (p->inTrans==TRANS_READ && wrflag!=0)
++  ){
++    return btreeBeginTrans(p,wrflag,pSchemaVersion);
++  }
++  pBt = p->pBt;
++  if( pSchemaVersion ){
++    *pSchemaVersion = get4byte(&pBt->pPage1->aData[40]);
++  }
++  if( wrflag ){
++    /* This call makes sure that the pager has the correct number of
++    ** open savepoints. If the second parameter is greater than 0 and
++    ** the sub-journal is not already open, then it will be opened here.
++    */
++    return sqlite3PagerOpenSavepoint(pBt->pPager, p->db->nSavepoint);
++  }else{
++    return SQLITE_OK;
++  }
++}
+ 
+ #ifndef SQLITE_OMIT_AUTOVACUUM
+ 
+@@ -70613,6 +74103,9 @@ static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){
+           }
+         }
+       }else{
++        if( pCell+4 > pPage->aData+pPage->pBt->usableSize ){
++          return SQLITE_CORRUPT_PAGE(pPage);
++        }
+         if( get4byte(pCell)==iFrom ){
+           put4byte(pCell, iTo);
+           break;
+@@ -70661,7 +74154,7 @@ static int relocatePage(
+   if( iDbPage<3 ) return SQLITE_CORRUPT_BKPT;
+ 
+   /* Move page iDbPage from its current location to page number iFreePage */
+-  TRACE(("AUTOVACUUM: Moving %d to free page %d (ptr page %d type %d)\n",
++  TRACE(("AUTOVACUUM: Moving %u to free page %u (ptr page %u type %u)\n",
+       iDbPage, iFreePage, iPtrPage, eType));
+   rc = sqlite3PagerMovepage(pPager, pDbPage->pDbPage, iFreePage, isCommit);
+   if( rc!=SQLITE_OK ){
+@@ -71619,7 +75112,6 @@ SQLITE_PRIVATE void sqlite3BtreeCursorUnpin(BtCursor *pCur){
+   pCur->curFlags &= ~BTCF_Pinned;
+ }
+ 
+-#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
+ /*
+ ** Return the offset into the database file for the start of the
+ ** payload to which the cursor is pointing.
+@@ -71631,7 +75123,6 @@ SQLITE_PRIVATE i64 sqlite3BtreeOffset(BtCursor *pCur){
+   return (i64)pCur->pBt->pageSize*((i64)pCur->pPage->pgno - 1) +
+          (i64)(pCur->info.pPayload - pCur->pPage->aData);
+ }
+-#endif /* SQLITE_ENABLE_OFFSET_SQL_FUNC */
+ 
+ /*
+ ** Return the number of bytes of payload for the entry that pCur is
+@@ -71657,7 +75148,7 @@ SQLITE_PRIVATE u32 sqlite3BtreePayloadSize(BtCursor *pCur){
+ ** routine always returns 2147483647 (which is the largest record
+ ** that SQLite can handle) or more.  But returning a smaller value might
+ ** prevent large memory allocations when trying to interpret a
+-** corrupt datrabase.
++** corrupt database.
+ **
+ ** The current implementation merely returns the size of the underlying
+ ** database file.
+@@ -71957,7 +75448,6 @@ static int accessPayload(
+           assert( aWrite>=pBufStart );                         /* due to (6) */
+           memcpy(aSave, aWrite, 4);
+           rc = sqlite3OsRead(fd, aWrite, a+4, (i64)pBt->pageSize*(nextPage-1));
+-          if( rc && nextPage>pBt->nPage ) rc = SQLITE_CORRUPT_BKPT;
+           nextPage = get4byte(aWrite);
+           memcpy(aWrite, aSave, 4);
+         }else
+@@ -72119,8 +75609,7 @@ SQLITE_PRIVATE const void *sqlite3BtreePayloadFetch(BtCursor *pCur, u32 *pAmt){
+ ** vice-versa).
+ */
+ static int moveToChild(BtCursor *pCur, u32 newPgno){
+-  BtShared *pBt = pCur->pBt;
+-
++  int rc;
+   assert( cursorOwnsBtShared(pCur) );
+   assert( pCur->eState==CURSOR_VALID );
+   assert( pCur->iPageapPage[pCur->iPage] = pCur->pPage;
+   pCur->ix = 0;
+   pCur->iPage++;
+-  return getAndInitPage(pBt, newPgno, &pCur->pPage, pCur, pCur->curPagerFlags);
++  rc = getAndInitPage(pCur->pBt, newPgno, &pCur->pPage, pCur->curPagerFlags);
++  assert( pCur->pPage!=0 || rc!=SQLITE_OK );
++  if( rc==SQLITE_OK
++   && (pCur->pPage->nCell<1 || pCur->pPage->intKey!=pCur->curIntKey)
++  ){
++    releasePage(pCur->pPage);
++    rc = SQLITE_CORRUPT_PGNO(newPgno);
++  }
++  if( rc ){
++    pCur->pPage = pCur->apPage[--pCur->iPage];
++  }
++  return rc;
+ }
+ 
+ #ifdef SQLITE_DEBUG
+@@ -72240,8 +75740,8 @@ static int moveToRoot(BtCursor *pCur){
+       }
+       sqlite3BtreeClearCursor(pCur);
+     }
+-    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->pPage,
+-                        0, pCur->curPagerFlags);
++    rc = getAndInitPage(pCur->pBt, pCur->pgnoRoot, &pCur->pPage,
++                        pCur->curPagerFlags);
+     if( rc!=SQLITE_OK ){
+       pCur->eState = CURSOR_INVALID;
+       return rc;
+@@ -72353,7 +75853,7 @@ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){
+     *pRes = 0;
+     rc = moveToLeftmost(pCur);
+   }else if( rc==SQLITE_EMPTY ){
+-    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
++    assert( pCur->pgnoRoot==0 || (pCur->pPage!=0 && pCur->pPage->nCell==0) );
+     *pRes = 1;
+     rc = SQLITE_OK;
+   }
+@@ -72364,9 +75864,25 @@ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){
+ ** on success.  Set *pRes to 0 if the cursor actually points to something
+ ** or set *pRes to 1 if the table is empty.
+ */
++static SQLITE_NOINLINE int btreeLast(BtCursor *pCur, int *pRes){
++  int rc = moveToRoot(pCur);
++  if( rc==SQLITE_OK ){
++    assert( pCur->eState==CURSOR_VALID );
++    *pRes = 0;
++    rc = moveToRightmost(pCur);
++    if( rc==SQLITE_OK ){
++      pCur->curFlags |= BTCF_AtLast;
++    }else{
++      pCur->curFlags &= ~BTCF_AtLast;
++    }
++  }else if( rc==SQLITE_EMPTY ){
++    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
++    *pRes = 1;
++    rc = SQLITE_OK;
++  }
++  return rc;
++}
+ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
+-  int rc;
+-
+   assert( cursorOwnsBtShared(pCur) );
+   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
+ 
+@@ -72387,23 +75903,7 @@ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
+     *pRes = 0;
+     return SQLITE_OK;
+   }
+-
+-  rc = moveToRoot(pCur);
+-  if( rc==SQLITE_OK ){
+-    assert( pCur->eState==CURSOR_VALID );
+-    *pRes = 0;
+-    rc = moveToRightmost(pCur);
+-    if( rc==SQLITE_OK ){
+-      pCur->curFlags |= BTCF_AtLast;
+-    }else{
+-      pCur->curFlags &= ~BTCF_AtLast;
+-    }
+-  }else if( rc==SQLITE_EMPTY ){
+-    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
+-    *pRes = 1;
+-    rc = SQLITE_OK;
+-  }
+-  return rc;
++  return btreeLast(pCur, pRes);
+ }
+ 
+ /* Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
+@@ -72458,7 +75958,7 @@ SQLITE_PRIVATE int sqlite3BtreeTableMoveto(
+       /* If the requested key is one more than the previous key, then
+       ** try to get there using sqlite3BtreeNext() rather than a full
+       ** binary search.  This is an optimization only.  The correct answer
+-      ** is still obtained without this case, only a little more slowely */
++      ** is still obtained without this case, only a little more slowly. */
+       if( pCur->info.nKey+1==intKey ){
+         *pRes = 0;
+         rc = sqlite3BtreeNext(pCur, 0);
+@@ -72854,10 +76354,36 @@ bypass_moveto_root:
+     }else{
+       chldPg = get4byte(findCell(pPage, lwr));
+     }
+-    pCur->ix = (u16)lwr;
+-    rc = moveToChild(pCur, chldPg);
+-    if( rc ) break;
+-  }
++
++    /* This block is similar to an in-lined version of:
++    **
++    **    pCur->ix = (u16)lwr;
++    **    rc = moveToChild(pCur, chldPg);
++    **    if( rc ) break;
++    */
++    pCur->info.nSize = 0;
++    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
++    if( pCur->iPage>=(BTCURSOR_MAX_DEPTH-1) ){
++      return SQLITE_CORRUPT_BKPT;
++    }
++    pCur->aiIdx[pCur->iPage] = (u16)lwr;
++    pCur->apPage[pCur->iPage] = pCur->pPage;
++    pCur->ix = 0;
++    pCur->iPage++;
++    rc = getAndInitPage(pCur->pBt, chldPg, &pCur->pPage, pCur->curPagerFlags);
++    if( rc==SQLITE_OK
++     && (pCur->pPage->nCell<1 || pCur->pPage->intKey!=pCur->curIntKey)
++    ){
++      releasePage(pCur->pPage);
++      rc = SQLITE_CORRUPT_PGNO(chldPg);
++    }
++    if( rc ){
++      pCur->pPage = pCur->apPage[--pCur->iPage];
++      break;
++    }
++    /*
++    ***** End of in-lined moveToChild() call */
++ }
+ moveto_index_finish:
+   pCur->info.nSize = 0;
+   assert( (pCur->curFlags & BTCF_ValidOvfl)==0 );
+@@ -72948,14 +76474,8 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
+ 
+   pPage = pCur->pPage;
+   idx = ++pCur->ix;
+-  if( !pPage->isInit || sqlite3FaultSim(412) ){
+-    /* The only known way for this to happen is for there to be a
+-    ** recursive SQL function that does a DELETE operation as part of a
+-    ** SELECT which deletes content out from under an active cursor
+-    ** in a corrupt database file where the table being DELETE-ed from
+-    ** has pages in common with the table being queried.  See TH3
+-    ** module cov1/btree78.test testcase 220 (2018-06-08) for an
+-    ** example. */
++  if( sqlite3FaultSim(412) ) pPage->isInit = 0;
++  if( !pPage->isInit ){
+     return SQLITE_CORRUPT_BKPT;
+   }
+ 
+@@ -73047,7 +76567,10 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
+   }
+ 
+   pPage = pCur->pPage;
+-  assert( pPage->isInit );
++  if( sqlite3FaultSim(412) ) pPage->isInit = 0;
++  if( !pPage->isInit ){
++    return SQLITE_CORRUPT_BKPT;
++  }
+   if( !pPage->leaf ){
+     int idx = pCur->ix;
+     rc = moveToChild(pCur, get4byte(findCell(pPage, idx)));
+@@ -73131,8 +76654,8 @@ static int allocateBtreePage(
+   assert( eMode==BTALLOC_ANY || (nearby>0 && IfNotOmitAV(pBt->autoVacuum)) );
+   pPage1 = pBt->pPage1;
+   mxPage = btreePagecount(pBt);
+-  /* EVIDENCE-OF: R-05119-02637 The 4-byte big-endian integer at offset 36
+-  ** stores stores the total number of pages on the freelist. */
++  /* EVIDENCE-OF: R-21003-45125 The 4-byte big-endian integer at offset 36
++  ** stores the total number of pages on the freelist. */
+   n = get4byte(&pPage1->aData[36]);
+   testcase( n==mxPage-1 );
+   if( n>=mxPage ){
+@@ -73218,7 +76741,7 @@ static int allocateBtreePage(
+         memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
+         *ppPage = pTrunk;
+         pTrunk = 0;
+-        TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
++        TRACE(("ALLOCATE: %u trunk - %u free pages left\n", *pPgno, n-1));
+       }else if( k>(u32)(pBt->usableSize/4 - 2) ){
+         /* Value of k is out of range.  Database corruption */
+         rc = SQLITE_CORRUPT_PGNO(iTrunk);
+@@ -73284,7 +76807,7 @@ static int allocateBtreePage(
+           }
+         }
+         pTrunk = 0;
+-        TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
++        TRACE(("ALLOCATE: %u trunk - %u free pages left\n", *pPgno, n-1));
+ #endif
+       }else if( k>0 ){
+         /* Extract a leaf from the trunk */
+@@ -73329,8 +76852,8 @@ static int allocateBtreePage(
+         ){
+           int noContent;
+           *pPgno = iPage;
+-          TRACE(("ALLOCATE: %d was leaf %d of %d on trunk %d"
+-                 ": %d more free pages\n",
++          TRACE(("ALLOCATE: %u was leaf %u of %u on trunk %u"
++                 ": %u more free pages\n",
+                  *pPgno, closest+1, k, pTrunk->pgno, n-1));
+           rc = sqlite3PagerWrite(pTrunk->pDbPage);
+           if( rc ) goto end_allocate_page;
+@@ -73386,7 +76909,7 @@ static int allocateBtreePage(
+       ** becomes a new pointer-map page, the second is used by the caller.
+       */
+       MemPage *pPg = 0;
+-      TRACE(("ALLOCATE: %d from end of file (pointer-map page)\n", pBt->nPage));
++      TRACE(("ALLOCATE: %u from end of file (pointer-map page)\n", pBt->nPage));
+       assert( pBt->nPage!=PENDING_BYTE_PAGE(pBt) );
+       rc = btreeGetUnusedPage(pBt, pBt->nPage, &pPg, bNoContent);
+       if( rc==SQLITE_OK ){
+@@ -73409,7 +76932,7 @@ static int allocateBtreePage(
+       releasePage(*ppPage);
+       *ppPage = 0;
+     }
+-    TRACE(("ALLOCATE: %d from end of file\n", *pPgno));
++    TRACE(("ALLOCATE: %u from end of file\n", *pPgno));
+   }
+ 
+   assert( CORRUPT_DB || *pPgno!=PENDING_BYTE_PAGE(pBt) );
+@@ -73477,7 +77000,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
+   /* If the database supports auto-vacuum, write an entry in the pointer-map
+   ** to indicate that the page is free.
+   */
+-  if( ISAUTOVACUUM ){
++  if( ISAUTOVACUUM(pBt) ){
+     ptrmapPut(pBt, iPage, PTRMAP_FREEPAGE, 0, &rc);
+     if( rc ) goto freepage_out;
+   }
+@@ -73537,7 +77060,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
+         }
+         rc = btreeSetHasContent(pBt, iPage);
+       }
+-      TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno));
++      TRACE(("FREE-PAGE: %u leaf on trunk page %u\n",pPage->pgno,pTrunk->pgno));
+       goto freepage_out;
+     }
+   }
+@@ -73558,7 +77081,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
+   put4byte(pPage->aData, iTrunk);
+   put4byte(&pPage->aData[4], 0);
+   put4byte(&pPage1->aData[32], iPage);
+-  TRACE(("FREE-PAGE: %d new trunk page replacing %d\n", pPage->pgno, iTrunk));
++  TRACE(("FREE-PAGE: %u new trunk page replacing %u\n", pPage->pgno, iTrunk));
+ 
+ freepage_out:
+   if( pPage ){
+@@ -73647,7 +77170,7 @@ static SQLITE_NOINLINE int clearCellOverflow(
+ 
+ /* Call xParseCell to compute the size of a cell.  If the cell contains
+ ** overflow, then invoke cellClearOverflow to clear out that overflow.
+-** STore the result code (SQLITE_OK or some error code) in rc.
++** Store the result code (SQLITE_OK or some error code) in rc.
+ **
+ ** Implemented as macro to force inlining for performance.
+ */
+@@ -73881,12 +77404,6 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
+   assert( pPage->pBt->usableSize > (u32)(ptr-data) );
+   pc = get2byte(ptr);
+   hdr = pPage->hdrOffset;
+-#if 0  /* Not required.  Omit for efficiency */
+-  if( pcnCell*2 ){
+-    *pRC = SQLITE_CORRUPT_BKPT;
+-    return;
+-  }
+-#endif
+   testcase( pc==(u32)get2byte(&data[hdr+5]) );
+   testcase( pc+sz==pPage->pBt->usableSize );
+   if( pc+sz > pPage->pBt->usableSize ){
+@@ -73924,23 +77441,27 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
+ ** Allocating a new entry in pPage->aCell[] implies that
+ ** pPage->nOverflow is incremented.
+ **
+-** *pRC must be SQLITE_OK when this routine is called.
++** The insertCellFast() routine below works exactly the same as
++** insertCell() except that it lacks the pTemp and iChild parameters
++** which are assumed zero.  Other than that, the two routines are the
++** same.
++**
++** Fixes or enhancements to this routine should be reflected in
++** insertCellFast()!
+ */
+-static void insertCell(
++static int insertCell(
+   MemPage *pPage,   /* Page into which we are copying */
+   int i,            /* New cell becomes the i-th cell of the page */
+   u8 *pCell,        /* Content of the new cell */
+   int sz,           /* Bytes of content in pCell */
+   u8 *pTemp,        /* Temp storage space for pCell, if needed */
+-  Pgno iChild,      /* If non-zero, replace first 4 bytes with this value */
+-  int *pRC          /* Read and write return code from here */
++  Pgno iChild       /* If non-zero, replace first 4 bytes with this value */
+ ){
+   int idx = 0;      /* Where to write new cell content in data[] */
+   int j;            /* Loop counter */
+   u8 *data;         /* The content of the whole page */
+   u8 *pIns;         /* The point in pPage->aCellIdx[] where no cell inserted */
+ 
+-  assert( *pRC==SQLITE_OK );
+   assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
+   assert( MX_CELL(pPage->pBt)<=10921 );
+   assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB );
+@@ -73949,14 +77470,103 @@ static void insertCell(
+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
+   assert( sz==pPage->xCellSize(pPage, pCell) || CORRUPT_DB );
+   assert( pPage->nFree>=0 );
++  assert( iChild>0 );
+   if( pPage->nOverflow || sz+2>pPage->nFree ){
+     if( pTemp ){
+       memcpy(pTemp, pCell, sz);
+       pCell = pTemp;
+     }
+-    if( iChild ){
+-      put4byte(pCell, iChild);
++    put4byte(pCell, iChild);
++    j = pPage->nOverflow++;
++    /* Comparison against ArraySize-1 since we hold back one extra slot
++    ** as a contingency.  In other words, never need more than 3 overflow
++    ** slots but 4 are allocated, just to be safe. */
++    assert( j < ArraySize(pPage->apOvfl)-1 );
++    pPage->apOvfl[j] = pCell;
++    pPage->aiOvfl[j] = (u16)i;
++
++    /* When multiple overflows occur, they are always sequential and in
++    ** sorted order.  This invariants arise because multiple overflows can
++    ** only occur when inserting divider cells into the parent page during
++    ** balancing, and the dividers are adjacent and sorted.
++    */
++    assert( j==0 || pPage->aiOvfl[j-1]<(u16)i ); /* Overflows in sorted order */
++    assert( j==0 || i==pPage->aiOvfl[j-1]+1 );   /* Overflows are sequential */
++  }else{
++    int rc = sqlite3PagerWrite(pPage->pDbPage);
++    if( NEVER(rc!=SQLITE_OK) ){
++      return rc;
+     }
++    assert( sqlite3PagerIswriteable(pPage->pDbPage) );
++    data = pPage->aData;
++    assert( &data[pPage->cellOffset]==pPage->aCellIdx );
++    rc = allocateSpace(pPage, sz, &idx);
++    if( rc ){ return rc; }
++    /* The allocateSpace() routine guarantees the following properties
++    ** if it returns successfully */
++    assert( idx >= 0 );
++    assert( idx >= pPage->cellOffset+2*pPage->nCell+2 || CORRUPT_DB );
++    assert( idx+sz <= (int)pPage->pBt->usableSize );
++    pPage->nFree -= (u16)(2 + sz);
++    /* In a corrupt database where an entry in the cell index section of
++    ** a btree page has a value of 3 or less, the pCell value might point
++    ** as many as 4 bytes in front of the start of the aData buffer for
++    ** the source page.  Make sure this does not cause problems by not
++    ** reading the first 4 bytes */
++    memcpy(&data[idx+4], pCell+4, sz-4);
++    put4byte(&data[idx], iChild);
++    pIns = pPage->aCellIdx + i*2;
++    memmove(pIns+2, pIns, 2*(pPage->nCell - i));
++    put2byte(pIns, idx);
++    pPage->nCell++;
++    /* increment the cell count */
++    if( (++data[pPage->hdrOffset+4])==0 ) data[pPage->hdrOffset+3]++;
++    assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
++#ifndef SQLITE_OMIT_AUTOVACUUM
++    if( pPage->pBt->autoVacuum ){
++      int rc2 = SQLITE_OK;
++      /* The cell may contain a pointer to an overflow page. If so, write
++      ** the entry for the overflow page into the pointer map.
++      */
++      ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
++      if( rc2 ) return rc2;
++    }
++#endif
++  }
++  return SQLITE_OK;
++}
++
++/*
++** This variant of insertCell() assumes that the pTemp and iChild
++** parameters are both zero.  Use this variant in sqlite3BtreeInsert()
++** for performance improvement, and also so that this variant is only
++** called from that one place, and is thus inlined, and thus runs must
++** faster.
++**
++** Fixes or enhancements to this routine should be reflected into
++** the insertCell() routine.
++*/
++static int insertCellFast(
++  MemPage *pPage,   /* Page into which we are copying */
++  int i,            /* New cell becomes the i-th cell of the page */
++  u8 *pCell,        /* Content of the new cell */
++  int sz            /* Bytes of content in pCell */
++){
++  int idx = 0;      /* Where to write new cell content in data[] */
++  int j;            /* Loop counter */
++  u8 *data;         /* The content of the whole page */
++  u8 *pIns;         /* The point in pPage->aCellIdx[] where no cell inserted */
++
++  assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
++  assert( MX_CELL(pPage->pBt)<=10921 );
++  assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB );
++  assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) );
++  assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) );
++  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
++  assert( sz==pPage->xCellSize(pPage, pCell) || CORRUPT_DB );
++  assert( pPage->nFree>=0 );
++  assert( pPage->nOverflow==0 );
++  if( sz+2>pPage->nFree ){
+     j = pPage->nOverflow++;
+     /* Comparison against ArraySize-1 since we hold back one extra slot
+     ** as a contingency.  In other words, never need more than 3 overflow
+@@ -73975,31 +77585,20 @@ static void insertCell(
+   }else{
+     int rc = sqlite3PagerWrite(pPage->pDbPage);
+     if( rc!=SQLITE_OK ){
+-      *pRC = rc;
+-      return;
++      return rc;
+     }
+     assert( sqlite3PagerIswriteable(pPage->pDbPage) );
+     data = pPage->aData;
+     assert( &data[pPage->cellOffset]==pPage->aCellIdx );
+     rc = allocateSpace(pPage, sz, &idx);
+-    if( rc ){ *pRC = rc; return; }
++    if( rc ){ return rc; }
+     /* The allocateSpace() routine guarantees the following properties
+     ** if it returns successfully */
+     assert( idx >= 0 );
+     assert( idx >= pPage->cellOffset+2*pPage->nCell+2 || CORRUPT_DB );
+     assert( idx+sz <= (int)pPage->pBt->usableSize );
+     pPage->nFree -= (u16)(2 + sz);
+-    if( iChild ){
+-      /* In a corrupt database where an entry in the cell index section of
+-      ** a btree page has a value of 3 or less, the pCell value might point
+-      ** as many as 4 bytes in front of the start of the aData buffer for
+-      ** the source page.  Make sure this does not cause problems by not
+-      ** reading the first 4 bytes */
+-      memcpy(&data[idx+4], pCell+4, sz-4);
+-      put4byte(&data[idx], iChild);
+-    }else{
+-      memcpy(&data[idx], pCell, sz);
+-    }
++    memcpy(&data[idx], pCell, sz);
+     pIns = pPage->aCellIdx + i*2;
+     memmove(pIns+2, pIns, 2*(pPage->nCell - i));
+     put2byte(pIns, idx);
+@@ -74009,13 +77608,16 @@ static void insertCell(
+     assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
+ #ifndef SQLITE_OMIT_AUTOVACUUM
+     if( pPage->pBt->autoVacuum ){
++      int rc2 = SQLITE_OK;
+       /* The cell may contain a pointer to an overflow page. If so, write
+       ** the entry for the overflow page into the pointer map.
+       */
+-      ptrmapPutOvflPtr(pPage, pPage, pCell, pRC);
++      ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
++      if( rc2 ) return rc2;
+     }
+ #endif
+   }
++  return SQLITE_OK;
+ }
+ 
+ /*
+@@ -74116,14 +77718,16 @@ struct CellArray {
+ ** computed.
+ */
+ static void populateCellCache(CellArray *p, int idx, int N){
++  MemPage *pRef = p->pRef;
++  u16 *szCell = p->szCell;
+   assert( idx>=0 && idx+N<=p->nCell );
+   while( N>0 ){
+     assert( p->apCell[idx]!=0 );
+-    if( p->szCell[idx]==0 ){
+-      p->szCell[idx] = p->pRef->xCellSize(p->pRef, p->apCell[idx]);
++    if( szCell[idx]==0 ){
++      szCell[idx] = pRef->xCellSize(pRef, p->apCell[idx]);
+     }else{
+       assert( CORRUPT_DB ||
+-              p->szCell[idx]==p->pRef->xCellSize(p->pRef, p->apCell[idx]) );
++              szCell[idx]==pRef->xCellSize(pRef, p->apCell[idx]) );
+     }
+     idx++;
+     N--;
+@@ -74177,12 +77781,13 @@ static int rebuildPage(
+   int k;                          /* Current slot in pCArray->apEnd[] */
+   u8 *pSrcEnd;                    /* Current pCArray->apEnd[k] value */
+ 
++  assert( nCell>0 );
+   assert( i(u32)usableSize ){ j = 0; }
+   memcpy(&pTmp[j], &aData[j], usableSize - j);
+ 
+-  for(k=0; pCArray->ixNx[k]<=i && ALWAYS(kixNx[k]<=i; k++){}
+   pSrcEnd = pCArray->apEnd[k];
+ 
+   pData = pEnd;
+@@ -74245,7 +77850,7 @@ static int rebuildPage(
+ ** Finally, argument pBegin points to the byte immediately following the
+ ** end of the space required by this page for the cell-pointer area (for
+ ** all cells - not just those inserted by the current call). If the content
+-** area must be extended to before this point in order to accomodate all
++** area must be extended to before this point in order to accommodate all
+ ** cells in apCell[], then the cells do not fit and non-zero is returned.
+ */
+ static int pageInsertArray(
+@@ -74265,7 +77870,7 @@ static int pageInsertArray(
+   u8 *pEnd;                       /* Maximum extent of cell data */
+   assert( CORRUPT_DB || pPg->hdrOffset==0 );    /* Never called on page 1 */
+   if( iEnd<=iFirst ) return 0;
+-  for(k=0; pCArray->ixNx[k]<=i && ALWAYS(kixNx[k]<=i ; k++){}
+   pEnd = pCArray->apEnd[k];
+   while( 1 /*Exit by break*/ ){
+     int sz, rc;
+@@ -74323,39 +77928,50 @@ static int pageFreeArray(
+   u8 * const pEnd = &aData[pPg->pBt->usableSize];
+   u8 * const pStart = &aData[pPg->hdrOffset + 8 + pPg->childPtrSize];
+   int nRet = 0;
+-  int i;
++  int i, j;
+   int iEnd = iFirst + nCell;
+-  u8 *pFree = 0;
+-  int szFree = 0;
++  int nFree = 0;
++  int aOfst[10];
++  int aAfter[10];
+ 
+   for(i=iFirst; iapCell[i];
+     if( SQLITE_WITHIN(pCell, pStart, pEnd) ){
+       int sz;
++      int iAfter;
++      int iOfst;
+       /* No need to use cachedCellSize() here.  The sizes of all cells that
+       ** are to be freed have already been computing while deciding which
+       ** cells need freeing */
+       sz = pCArray->szCell[i];  assert( sz>0 );
+-      if( pFree!=(pCell + sz) ){
+-        if( pFree ){
+-          assert( pFree>aData && (pFree - aData)<65536 );
+-          freeSpace(pPg, (u16)(pFree - aData), szFree);
+-        }
+-        pFree = pCell;
+-        szFree = sz;
+-        if( pFree+sz>pEnd ){
+-          return 0;
++      iOfst = (u16)(pCell - aData);
++      iAfter = iOfst+sz;
++      for(j=0; j=nFree ){
++        if( nFree>=(int)(sizeof(aOfst)/sizeof(aOfst[0])) ){
++          for(j=0; jpEnd ) return 0;
++        nFree++;
+       }
+       nRet++;
+     }
+   }
+-  if( pFree ){
+-    assert( pFree>aData && (pFree - aData)<65536 );
+-    freeSpace(pPg, (u16)(pFree - aData), szFree);
++  for(j=0; jpPg->aDataEnd ) goto editpage_fail;
++  if( NEVER(pData>pPg->aDataEnd) ) goto editpage_fail;
+ 
+   /* Add cells to the start of the page */
+   if( iNewpgno, &rc);
+       if( szCell>pNew->minLocal ){
+         ptrmapPutOvflPtr(pNew, pNew, pCell, &rc);
+@@ -74582,8 +78199,8 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
+ 
+     /* Insert the new divider cell into pParent. */
+     if( rc==SQLITE_OK ){
+-      insertCell(pParent, pParent->nCell, pSpace, (int)(pOut-pSpace),
+-                   0, pPage->pgno, &rc);
++      rc = insertCell(pParent, pParent->nCell, pSpace, (int)(pOut-pSpace),
++                      0, pPage->pgno);
+     }
+ 
+     /* Set the right-child pointer of pParent to point to the new page. */
+@@ -74692,7 +78309,7 @@ static void copyNodeContent(MemPage *pFrom, MemPage *pTo, int *pRC){
+     /* If this is an auto-vacuum database, update the pointer-map entries
+     ** for any b-tree or overflow pages that pTo now contains the pointers to.
+     */
+-    if( ISAUTOVACUUM ){
++    if( ISAUTOVACUUM(pBt) ){
+       *pRC = setChildPtrmaps(pTo);
+     }
+   }
+@@ -74825,7 +78442,7 @@ static int balance_nonroot(
+   pgno = get4byte(pRight);
+   while( 1 ){
+     if( rc==SQLITE_OK ){
+-      rc = getAndInitPage(pBt, pgno, &apOld[i], 0, 0);
++      rc = getAndInitPage(pBt, pgno, &apOld[i], 0);
+     }
+     if( rc ){
+       memset(apOld, 0, (i+1)*sizeof(MemPage*));
+@@ -75116,15 +78733,17 @@ static int balance_nonroot(
+     d = r + 1 - leafData;
+     (void)cachedCellSize(&b, d);
+     do{
++      int szR, szD;
+       assert( d szLeft-(b.szCell[r]+(i==k-1?0:2)))){
++       && (bBulk || szRight+szD+2 > szLeft-(szR+(i==k-1?0:2)))){
+         break;
+       }
+-      szRight += b.szCell[d] + 2;
+-      szLeft -= b.szCell[r] + 2;
++      szRight += szD + 2;
++      szLeft -= szR + 2;
+       cntNew[i-1] = r;
+       r--;
+       d--;
+@@ -75137,7 +78756,7 @@ static int balance_nonroot(
+     }
+   }
+ 
+-  /* Sanity check:  For a non-corrupt database file one of the follwing
++  /* Sanity check:  For a non-corrupt database file one of the following
+   ** must be true:
+   **    (1) We found one or more cells (cntNew[0])>0), or
+   **    (2) pPage is a virtual root page.  A virtual root page is when
+@@ -75145,7 +78764,7 @@ static int balance_nonroot(
+   **        that page.
+   */
+   assert( cntNew[0]>0 || (pParent->pgno==1 && pParent->nCell==0) || CORRUPT_DB);
+-  TRACE(("BALANCE: old: %d(nc=%d) %d(nc=%d) %d(nc=%d)\n",
++  TRACE(("BALANCE: old: %u(nc=%u) %u(nc=%u) %u(nc=%u)\n",
+     apOld[0]->pgno, apOld[0]->nCell,
+     nOld>=2 ? apOld[1]->pgno : 0, nOld>=2 ? apOld[1]->nCell : 0,
+     nOld>=3 ? apOld[2]->pgno : 0, nOld>=3 ? apOld[2]->nCell : 0
+@@ -75178,7 +78797,7 @@ static int balance_nonroot(
+       cntOld[i] = b.nCell;
+ 
+       /* Set the pointer-map entry for the new sibling page. */
+-      if( ISAUTOVACUUM ){
++      if( ISAUTOVACUUM(pBt) ){
+         ptrmapPut(pBt, pNew->pgno, PTRMAP_BTREE, pParent->pgno, &rc);
+         if( rc!=SQLITE_OK ){
+           goto balance_cleanup;
+@@ -75229,8 +78848,8 @@ static int balance_nonroot(
+     }
+   }
+ 
+-  TRACE(("BALANCE: new: %d(%d nc=%d) %d(%d nc=%d) %d(%d nc=%d) "
+-         "%d(%d nc=%d) %d(%d nc=%d)\n",
++  TRACE(("BALANCE: new: %u(%u nc=%u) %u(%u nc=%u) %u(%u nc=%u) "
++         "%u(%u nc=%u) %u(%u nc=%u)\n",
+     apNew[0]->pgno, szNew[0], cntNew[0],
+     nNew>=2 ? apNew[1]->pgno : 0, nNew>=2 ? szNew[1] : 0,
+     nNew>=2 ? cntNew[1] - cntNew[0] - !leafData : 0,
+@@ -75271,7 +78890,7 @@ static int balance_nonroot(
+   ** updated. This happens below, after the sibling pages have been
+   ** populated, not here.
+   */
+-  if( ISAUTOVACUUM ){
++  if( ISAUTOVACUUM(pBt) ){
+     MemPage *pOld;
+     MemPage *pNew = pOld = apNew[0];
+     int cntOldNext = pNew->nCell + pNew->nOverflow;
+@@ -75362,13 +78981,13 @@ static int balance_nonroot(
+     iOvflSpace += sz;
+     assert( sz<=pBt->maxLocal+23 );
+     assert( iOvflSpace <= (int)pBt->pageSize );
+-    for(k=0; b.ixNx[k]<=j && ALWAYS(kpgno, &rc);
++    rc = insertCell(pParent, nxDiv+i, pCell, sz, pTemp, pNew->pgno);
+     if( rc!=SQLITE_OK ) goto balance_cleanup;
+     assert( sqlite3PagerIswriteable(pParent->pDbPage) );
+   }
+@@ -75398,6 +79017,8 @@ static int balance_nonroot(
+   for(i=1-nNew; i=0 && iPg=1 || i>=0 );
++    assert( iPg=0                            /* On the upwards pass, or... */
+      || cntOld[iPg-1]>=cntNew[iPg-1]    /* Condition (1) is true */
+@@ -75464,7 +79085,7 @@ static int balance_nonroot(
+     );
+     copyNodeContent(apNew[0], pParent, &rc);
+     freePage(apNew[0], &rc);
+-  }else if( ISAUTOVACUUM && !leafCorrection ){
++  }else if( ISAUTOVACUUM(pBt) && !leafCorrection ){
+     /* Fix the pointer map entries associated with the right-child of each
+     ** sibling page. All other pointer map entries have already been taken
+     ** care of.  */
+@@ -75475,7 +79096,7 @@ static int balance_nonroot(
+   }
+ 
+   assert( pParent->isInit );
+-  TRACE(("BALANCE: finished: old=%d new=%d cells=%d\n",
++  TRACE(("BALANCE: finished: old=%u new=%u cells=%u\n",
+           nOld, nNew, b.nCell));
+ 
+   /* Free any old pages that were not reused as new pages.
+@@ -75485,7 +79106,7 @@ static int balance_nonroot(
+   }
+ 
+ #if 0
+-  if( ISAUTOVACUUM && rc==SQLITE_OK && apNew[0]->isInit ){
++  if( ISAUTOVACUUM(pBt) && rc==SQLITE_OK && apNew[0]->isInit ){
+     /* The ptrmapCheckPages() contains assert() statements that verify that
+     ** all pointer map pages are set correctly. This is helpful while
+     ** debugging. This is usually disabled because a corrupt database may
+@@ -75547,7 +79168,7 @@ static int balance_deeper(MemPage *pRoot, MemPage **ppChild){
+   if( rc==SQLITE_OK ){
+     rc = allocateBtreePage(pBt,&pChild,&pgnoChild,pRoot->pgno,0);
+     copyNodeContent(pRoot, pChild, &rc);
+-    if( ISAUTOVACUUM ){
++    if( ISAUTOVACUUM(pBt) ){
+       ptrmapPut(pBt, pgnoChild, PTRMAP_BTREE, pRoot->pgno, &rc);
+     }
+   }
+@@ -75560,7 +79181,7 @@ static int balance_deeper(MemPage *pRoot, MemPage **ppChild){
+   assert( sqlite3PagerIswriteable(pRoot->pDbPage) );
+   assert( pChild->nCell==pRoot->nCell || CORRUPT_DB );
+ 
+-  TRACE(("BALANCE: copy root %d into %d\n", pRoot->pgno, pChild->pgno));
++  TRACE(("BALANCE: copy root %u into %u\n", pRoot->pgno, pChild->pgno));
+ 
+   /* Copy the overflow cells from pRoot to pChild */
+   memcpy(pChild->aiOvfl, pRoot->aiOvfl,
+@@ -75651,6 +79272,11 @@ static int balance(BtCursor *pCur){
+       }else{
+         break;
+       }
++    }else if( sqlite3PagerPageRefcount(pPage->pDbPage)>1 ){
++      /* The page being written is not a root page, and there is currently
++      ** more than one reference to it. This only happens if the page is one
++      ** of its own ancestor pages. Corruption. */
++      rc = SQLITE_CORRUPT_BKPT;
+     }else{
+       MemPage * const pParent = pCur->apPage[iPage-1];
+       int const iIdx = pCur->aiIdx[iPage-1];
+@@ -75749,7 +79375,7 @@ static int btreeOverwriteContent(
+ ){
+   int nData = pX->nData - iOffset;
+   if( nData<=0 ){
+-    /* Overwritting with zeros */
++    /* Overwriting with zeros */
+     int i;
+     for(i=0; ipData to write */
+   int nTotal = pX->nData + pX->nZero; /* Total bytes of to write */
+   int rc;                             /* Return code */
+@@ -75792,16 +79422,12 @@ static int btreeOverwriteCell(BtCursor *pCur, const BtreePayload *pX){
+   Pgno ovflPgno;                      /* Next overflow page to write */
+   u32 ovflPageSize;                   /* Size to write on overflow page */
+ 
+-  if( pCur->info.pPayload + pCur->info.nLocal > pPage->aDataEnd
+-   || pCur->info.pPayload < pPage->aData + pPage->cellOffset
+-  ){
+-    return SQLITE_CORRUPT_BKPT;
+-  }
++  assert( pCur->info.nLocalinfo.pPayload, pX,
+                              0, pCur->info.nLocal);
+   if( rc ) return rc;
+-  if( pCur->info.nLocal==nTotal ) return SQLITE_OK;
+ 
+   /* Now overwrite the overflow pages */
+   iOffset = pCur->info.nLocal;
+@@ -75831,6 +79457,29 @@ static int btreeOverwriteCell(BtCursor *pCur, const BtreePayload *pX){
+   return SQLITE_OK;
+ }
+ 
++/*
++** Overwrite the cell that cursor pCur is pointing to with fresh content
++** contained in pX.
++*/
++static int btreeOverwriteCell(BtCursor *pCur, const BtreePayload *pX){
++  int nTotal = pX->nData + pX->nZero; /* Total bytes of to write */
++  MemPage *pPage = pCur->pPage;       /* Page being written */
++
++  if( pCur->info.pPayload + pCur->info.nLocal > pPage->aDataEnd
++   || pCur->info.pPayload < pPage->aData + pPage->cellOffset
++  ){
++    return SQLITE_CORRUPT_BKPT;
++  }
++  if( pCur->info.nLocal==nTotal ){
++    /* The entire cell is local */
++    return btreeOverwriteContent(pPage, pCur->info.pPayload, pX,
++                                 0, pCur->info.nLocal);
++  }else{
++    /* The cell contains overflow content */
++    return btreeOverwriteOverflowCell(pCur, pX);
++  }
++}
++
+ 
+ /*
+ ** Insert a new record into the BTree.  The content of the new record
+@@ -75874,7 +79523,6 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+   int idx;
+   MemPage *pPage;
+   Btree *p = pCur->pBtree;
+-  BtShared *pBt = p->pBt;
+   unsigned char *oldCell;
+   unsigned char *newCell = 0;
+ 
+@@ -75893,7 +79541,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+   ** not to clear the cursor here.
+   */
+   if( pCur->curFlags & BTCF_Multiple ){
+-    rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur);
++    rc = saveAllCursors(p->pBt, pCur->pgnoRoot, pCur);
+     if( rc ) return rc;
+     if( loc && pCur->iPage<0 ){
+       /* This can only happen if the schema is corrupt such that there is more
+@@ -75917,8 +79565,8 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+ 
+   assert( cursorOwnsBtShared(pCur) );
+   assert( (pCur->curFlags & BTCF_WriteFlag)!=0
+-              && pBt->inTransaction==TRANS_WRITE
+-              && (pBt->btsFlags & BTS_READ_ONLY)==0 );
++              && p->pBt->inTransaction==TRANS_WRITE
++              && (p->pBt->btsFlags & BTS_READ_ONLY)==0 );
+   assert( hasSharedCacheTableLock(p, pCur->pgnoRoot, pCur->pKeyInfo!=0, 2) );
+ 
+   /* Assert that the caller has been consistent. If this cursor was opened
+@@ -76016,7 +79664,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+     }
+   }
+   assert( pCur->eState==CURSOR_VALID
+-       || (pCur->eState==CURSOR_INVALID && loc) );
++       || (pCur->eState==CURSOR_INVALID && loc) || CORRUPT_DB );
+ 
+   pPage = pCur->pPage;
+   assert( pPage->intKey || pX->nKey>=0 || (flags & BTREE_PREFORMAT) );
+@@ -76031,31 +79679,34 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+     if( rc ) return rc;
+   }
+ 
+-  TRACE(("INSERT: table=%d nkey=%lld ndata=%d page=%d %s\n",
++  TRACE(("INSERT: table=%u nkey=%lld ndata=%u page=%u %s\n",
+           pCur->pgnoRoot, pX->nKey, pX->nData, pPage->pgno,
+           loc==0 ? "overwrite" : "new entry"));
+   assert( pPage->isInit || CORRUPT_DB );
+-  newCell = pBt->pTmpSpace;
++  newCell = p->pBt->pTmpSpace;
+   assert( newCell!=0 );
++  assert( BTREE_PREFORMAT==OPFLAG_PREFORMAT );
+   if( flags & BTREE_PREFORMAT ){
+     rc = SQLITE_OK;
+-    szNew = pBt->nPreformatSize;
++    szNew = p->pBt->nPreformatSize;
+     if( szNew<4 ) szNew = 4;
+-    if( ISAUTOVACUUM && szNew>pPage->maxLocal ){
++    if( ISAUTOVACUUM(p->pBt) && szNew>pPage->maxLocal ){
+       CellInfo info;
+       pPage->xParseCell(pPage, newCell, &info);
+       if( info.nPayload!=info.nLocal ){
+         Pgno ovfl = get4byte(&newCell[szNew-4]);
+-        ptrmapPut(pBt, ovfl, PTRMAP_OVERFLOW1, pPage->pgno, &rc);
++        ptrmapPut(p->pBt, ovfl, PTRMAP_OVERFLOW1, pPage->pgno, &rc);
++        if( NEVER(rc) ) goto end_insert;
+       }
+     }
+   }else{
+     rc = fillInCell(pPage, newCell, pX, &szNew);
++    if( rc ) goto end_insert;
+   }
+-  if( rc ) goto end_insert;
+   assert( szNew==pPage->xCellSize(pPage, newCell) );
+-  assert( szNew <= MX_CELL_SIZE(pBt) );
++  assert( szNew <= MX_CELL_SIZE(p->pBt) );
+   idx = pCur->ix;
++  pCur->info.nSize = 0;
+   if( loc==0 ){
+     CellInfo info;
+     assert( idx>=0 );
+@@ -76074,7 +79725,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+     testcase( pCur->curFlags & BTCF_ValidOvfl );
+     invalidateOverflowCache(pCur);
+     if( info.nSize==szNew && info.nLocal==info.nPayload
+-     && (!ISAUTOVACUUM || szNewminLocal)
++     && (!ISAUTOVACUUM(p->pBt) || szNewminLocal)
+     ){
+       /* Overwrite the old cell with the new if they are the same size.
+       ** We could also try to do this if the old cell is smaller, then add
+@@ -76104,7 +79755,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+   }else{
+     assert( pPage->leaf );
+   }
+-  insertCell(pPage, idx, newCell, szNew, 0, 0, &rc);
++  rc = insertCellFast(pPage, idx, newCell, szNew);
+   assert( pPage->nOverflow==0 || rc==SQLITE_OK );
+   assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 );
+ 
+@@ -76128,7 +79779,6 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
+   ** larger than the largest existing key, it is possible to insert the
+   ** row without seeking the cursor. This can be a big performance boost.
+   */
+-  pCur->info.nSize = 0;
+   if( pPage->nOverflow ){
+     assert( rc==SQLITE_OK );
+     pCur->curFlags &= ~(BTCF_ValidNKey);
+@@ -76177,7 +79827,6 @@ end_insert:
+ ** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
+ */
+ SQLITE_PRIVATE int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){
+-  int rc = SQLITE_OK;
+   BtShared *pBt = pDest->pBt;
+   u8 *aOut = pBt->pTmpSpace;    /* Pointer to next output buffer */
+   const u8 *aIn;                /* Pointer to next input buffer */
+@@ -76200,7 +79849,9 @@ SQLITE_PRIVATE int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64
+   if( nIn==nRem && nInpPage->maxLocal ){
+     memcpy(aOut, aIn, nIn);
+     pBt->nPreformatSize = nIn + (aOut - pBt->pTmpSpace);
++    return SQLITE_OK;
+   }else{
++    int rc = SQLITE_OK;
+     Pager *pSrcPager = pSrc->pBt->pPager;
+     u8 *pPgnoOut = 0;
+     Pgno ovflIn = 0;
+@@ -76252,7 +79903,7 @@ SQLITE_PRIVATE int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64
+         MemPage *pNew = 0;
+         rc = allocateBtreePage(pBt, &pNew, &pgnoNew, 0, 0);
+         put4byte(pPgnoOut, pgnoNew);
+-        if( ISAUTOVACUUM && pPageOut ){
++        if( ISAUTOVACUUM(pBt) && pPageOut ){
+           ptrmapPut(pBt, pgnoNew, PTRMAP_OVERFLOW2, pPageOut->pgno, &rc);
+         }
+         releasePage(pPageOut);
+@@ -76268,9 +79919,8 @@ SQLITE_PRIVATE int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64
+ 
+     releasePage(pPageOut);
+     sqlite3PagerUnref(pPageIn);
++    return rc;
+   }
+-
+-  return rc;
+ }
+ 
+ /*
+@@ -76329,6 +79979,9 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
+   if( pPage->nFree<0 && btreeComputeFreeSpace(pPage) ){
+     return SQLITE_CORRUPT_BKPT;
+   }
++  if( pCell<&pPage->aCellIdx[pPage->nCell] ){
++    return SQLITE_CORRUPT_BKPT;
++  }
+ 
+   /* If the BTREE_SAVEPOSITION bit is on, then the cursor position must
+   ** be preserved following this delete operation. If the current delete
+@@ -76425,7 +80078,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
+     assert( pTmp!=0 );
+     rc = sqlite3PagerWrite(pLeaf->pDbPage);
+     if( rc==SQLITE_OK ){
+-      insertCell(pPage, iCellIdx, pCell-4, nCell+4, pTmp, n, &rc);
++      rc = insertCell(pPage, iCellIdx, pCell-4, nCell+4, pTmp, n);
+     }
+     dropCell(pLeaf, pLeaf->nCell-1, nCell, &rc);
+     if( rc ) return rc;
+@@ -76505,7 +80158,7 @@ static int btreeCreateTable(Btree *p, Pgno *piTable, int createTabFlags){
+   MemPage *pRoot;
+   Pgno pgnoRoot;
+   int rc;
+-  int ptfFlags;          /* Page-type flage for the root page of new table */
++  int ptfFlags;          /* Page-type flags for the root page of new table */
+ 
+   assert( sqlite3BtreeHoldsMutex(p) );
+   assert( pBt->inTransaction==TRANS_WRITE );
+@@ -76674,7 +80327,7 @@ static int clearDatabasePage(
+   if( pgno>btreePagecount(pBt) ){
+     return SQLITE_CORRUPT_BKPT;
+   }
+-  rc = getAndInitPage(pBt, pgno, &pPage, 0, 0);
++  rc = getAndInitPage(pBt, pgno, &pPage, 0);
+   if( rc ) return rc;
+   if( (pBt->openFlags & BTREE_SINGLE)==0
+    && sqlite3PagerPageRefcount(pPage->pDbPage) != (1 + (pgno==1))
+@@ -77024,6 +80677,41 @@ SQLITE_PRIVATE Pager *sqlite3BtreePager(Btree *p){
+ }
+ 
+ #ifndef SQLITE_OMIT_INTEGRITY_CHECK
++/*
++** Record an OOM error during integrity_check
++*/
++static void checkOom(IntegrityCk *pCheck){
++  pCheck->rc = SQLITE_NOMEM;
++  pCheck->mxErr = 0;  /* Causes integrity_check processing to stop */
++  if( pCheck->nErr==0 ) pCheck->nErr++;
++}
++
++/*
++** Invoke the progress handler, if appropriate.  Also check for an
++** interrupt.
++*/
++static void checkProgress(IntegrityCk *pCheck){
++  sqlite3 *db = pCheck->db;
++  if( AtomicLoad(&db->u1.isInterrupted) ){
++    pCheck->rc = SQLITE_INTERRUPT;
++    pCheck->nErr++;
++    pCheck->mxErr = 0;
++  }
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++  if( db->xProgress ){
++    assert( db->nProgressOps>0 );
++    pCheck->nStep++;
++    if( (pCheck->nStep % db->nProgressOps)==0
++     && db->xProgress(db->pProgressArg)
++    ){
++      pCheck->rc = SQLITE_INTERRUPT;
++      pCheck->nErr++;
++      pCheck->mxErr = 0;
++    }
++  }
++#endif
++}
++
+ /*
+ ** Append a message to the error message string.
+ */
+@@ -77033,6 +80721,7 @@ static void checkAppendMsg(
+   ...
+ ){
+   va_list ap;
++  checkProgress(pCheck);
+   if( !pCheck->mxErr ) return;
+   pCheck->mxErr--;
+   pCheck->nErr++;
+@@ -77041,12 +80730,13 @@ static void checkAppendMsg(
+     sqlite3_str_append(&pCheck->errMsg, "\n", 1);
+   }
+   if( pCheck->zPfx ){
+-    sqlite3_str_appendf(&pCheck->errMsg, pCheck->zPfx, pCheck->v1, pCheck->v2);
++    sqlite3_str_appendf(&pCheck->errMsg, pCheck->zPfx,
++                        pCheck->v0, pCheck->v1, pCheck->v2);
+   }
+   sqlite3_str_vappendf(&pCheck->errMsg, zFormat, ap);
+   va_end(ap);
+   if( pCheck->errMsg.accError==SQLITE_NOMEM ){
+-    pCheck->bOomFault = 1;
++    checkOom(pCheck);
+   }
+ }
+ #endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+@@ -77058,7 +80748,8 @@ static void checkAppendMsg(
+ ** corresponds to page iPg is already set.
+ */
+ static int getPageReferenced(IntegrityCk *pCheck, Pgno iPg){
+-  assert( iPg<=pCheck->nPage && sizeof(pCheck->aPgRef[0])==1 );
++  assert( pCheck->aPgRef!=0 );
++  assert( iPg<=pCheck->nCkPage && sizeof(pCheck->aPgRef[0])==1 );
+   return (pCheck->aPgRef[iPg/8] & (1 << (iPg & 0x07)));
+ }
+ 
+@@ -77066,7 +80757,8 @@ static int getPageReferenced(IntegrityCk *pCheck, Pgno iPg){
+ ** Set the bit in the IntegrityCk.aPgRef[] array that corresponds to page iPg.
+ */
+ static void setPageReferenced(IntegrityCk *pCheck, Pgno iPg){
+-  assert( iPg<=pCheck->nPage && sizeof(pCheck->aPgRef[0])==1 );
++  assert( pCheck->aPgRef!=0 );
++  assert( iPg<=pCheck->nCkPage && sizeof(pCheck->aPgRef[0])==1 );
+   pCheck->aPgRef[iPg/8] |= (1 << (iPg & 0x07));
+ }
+ 
+@@ -77080,15 +80772,14 @@ static void setPageReferenced(IntegrityCk *pCheck, Pgno iPg){
+ ** Also check that the page number is in bounds.
+ */
+ static int checkRef(IntegrityCk *pCheck, Pgno iPage){
+-  if( iPage>pCheck->nPage || iPage==0 ){
+-    checkAppendMsg(pCheck, "invalid page number %d", iPage);
++  if( iPage>pCheck->nCkPage || iPage==0 ){
++    checkAppendMsg(pCheck, "invalid page number %u", iPage);
+     return 1;
+   }
+   if( getPageReferenced(pCheck, iPage) ){
+-    checkAppendMsg(pCheck, "2nd reference to page %d", iPage);
++    checkAppendMsg(pCheck, "2nd reference to page %u", iPage);
+     return 1;
+   }
+-  if( AtomicLoad(&pCheck->db->u1.isInterrupted) ) return 1;
+   setPageReferenced(pCheck, iPage);
+   return 0;
+ }
+@@ -77111,14 +80802,14 @@ static void checkPtrmap(
+ 
+   rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent);
+   if( rc!=SQLITE_OK ){
+-    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) pCheck->bOomFault = 1;
+-    checkAppendMsg(pCheck, "Failed to read ptrmap key=%d", iChild);
++    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) checkOom(pCheck);
++    checkAppendMsg(pCheck, "Failed to read ptrmap key=%u", iChild);
+     return;
+   }
+ 
+   if( ePtrmapType!=eType || iPtrmapParent!=iParent ){
+     checkAppendMsg(pCheck,
+-      "Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)",
++      "Bad ptr map entry key=%u expected=(%u,%u) got=(%u,%u)",
+       iChild, eType, iParent, ePtrmapType, iPtrmapParent);
+   }
+ }
+@@ -77143,7 +80834,7 @@ static void checkList(
+     if( checkRef(pCheck, iPage) ) break;
+     N--;
+     if( sqlite3PagerGet(pCheck->pPager, (Pgno)iPage, &pOvflPage, 0) ){
+-      checkAppendMsg(pCheck, "failed to get page %d", iPage);
++      checkAppendMsg(pCheck, "failed to get page %u", iPage);
+       break;
+     }
+     pOvflData = (unsigned char *)sqlite3PagerGetData(pOvflPage);
+@@ -77156,7 +80847,7 @@ static void checkList(
+ #endif
+       if( n>pCheck->pBt->usableSize/4-2 ){
+         checkAppendMsg(pCheck,
+-           "freelist leaf count too big on page %d", iPage);
++           "freelist leaf count too big on page %u", iPage);
+         N--;
+       }else{
+         for(i=0; i<(int)n; i++){
+@@ -77188,7 +80879,7 @@ static void checkList(
+   }
+   if( N && nErrAtStart==pCheck->nErr ){
+     checkAppendMsg(pCheck,
+-      "%s is %d but should be %d",
++      "%s is %u but should be %u",
+       isFreeList ? "size" : "overflow list length",
+       expected-N, expected);
+   }
+@@ -77218,7 +80909,9 @@ static void checkList(
+ ** lower 16 bits are the index of the last byte of that range.
+ */
+ static void btreeHeapInsert(u32 *aHeap, u32 x){
+-  u32 j, i = ++aHeap[0];
++  u32 j, i;
++  assert( aHeap!=0 );
++  i = ++aHeap[0];
+   aHeap[i] = x;
+   while( (j = i/2)>0 && aHeap[j]>aHeap[i] ){
+     x = aHeap[j];
+@@ -77295,15 +80988,18 @@ static int checkTreePage(
+ 
+   /* Check that the page exists
+   */
++  checkProgress(pCheck);
++  if( pCheck->mxErr==0 ) goto end_of_check;
+   pBt = pCheck->pBt;
+   usableSize = pBt->usableSize;
+   if( iPage==0 ) return 0;
+   if( checkRef(pCheck, iPage) ) return 0;
+-  pCheck->zPfx = "Page %u: ";
++  pCheck->zPfx = "Tree %u page %u: ";
+   pCheck->v1 = iPage;
+   if( (rc = btreeGetPage(pBt, iPage, &pPage, 0))!=0 ){
+     checkAppendMsg(pCheck,
+        "unable to get the page. error code=%d", rc);
++    if( rc==SQLITE_IOERR_NOMEM ) pCheck->rc = SQLITE_NOMEM;
+     goto end_of_check;
+   }
+ 
+@@ -77326,7 +81022,7 @@ static int checkTreePage(
+   hdr = pPage->hdrOffset;
+ 
+   /* Set up for cell analysis */
+-  pCheck->zPfx = "On tree page %u cell %d: ";
++  pCheck->zPfx = "Tree %u page %u cell %u: ";
+   contentOffset = get2byteNotZero(&data[hdr+5]);
+   assert( contentOffset<=usableSize );  /* Enforced by btreeInitPage() */
+ 
+@@ -77346,7 +81042,7 @@ static int checkTreePage(
+     pgno = get4byte(&data[hdr+8]);
+ #ifndef SQLITE_OMIT_AUTOVACUUM
+     if( pBt->autoVacuum ){
+-      pCheck->zPfx = "On page %u at right child: ";
++      pCheck->zPfx = "Tree %u page %u right child: ";
+       checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage);
+     }
+ #endif
+@@ -77370,7 +81066,7 @@ static int checkTreePage(
+     pc = get2byteAligned(pCellIdx);
+     pCellIdx -= 2;
+     if( pcusableSize-4 ){
+-      checkAppendMsg(pCheck, "Offset %d out of range %d..%d",
++      checkAppendMsg(pCheck, "Offset %u out of range %u..%u",
+                              pc, contentOffset, usableSize-4);
+       doCoverageCheck = 0;
+       continue;
+@@ -77502,7 +81198,7 @@ static int checkTreePage(
+     */
+     if( heap[0]==0 && nFrag!=data[hdr+7] ){
+       checkAppendMsg(pCheck,
+-          "Fragmentation of %d bytes reported as %d on page %u",
++          "Fragmentation of %u bytes reported as %u on page %u",
+           nFrag, data[hdr+7], iPage);
+     }
+   }
+@@ -77540,13 +81236,14 @@ end_of_check:
+ ** the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
+ ** checks are still performed.
+ */
+-SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
++SQLITE_PRIVATE int sqlite3BtreeIntegrityCheck(
+   sqlite3 *db,  /* Database connection that is running the check */
+   Btree *p,     /* The btree to be checked */
+   Pgno *aRoot,  /* An array of root pages numbers for individual trees */
+   int nRoot,    /* Number of entries in aRoot[] */
+   int mxErr,    /* Stop reporting errors after this many */
+-  int *pnErr    /* Write number of errors seen to this variable */
++  int *pnErr,   /* OUT: Write number of errors seen to this variable */
++  char **pzOut  /* OUT: Write the error message string here */
+ ){
+   Pgno i;
+   IntegrityCk sCheck;
+@@ -77569,42 +81266,36 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+   assert( p->inTrans>TRANS_NONE && pBt->inTransaction>TRANS_NONE );
+   VVA_ONLY( nRef = sqlite3PagerRefcount(pBt->pPager) );
+   assert( nRef>=0 );
++  memset(&sCheck, 0, sizeof(sCheck));
+   sCheck.db = db;
+   sCheck.pBt = pBt;
+   sCheck.pPager = pBt->pPager;
+-  sCheck.nPage = btreePagecount(sCheck.pBt);
++  sCheck.nCkPage = btreePagecount(sCheck.pBt);
+   sCheck.mxErr = mxErr;
+-  sCheck.nErr = 0;
+-  sCheck.bOomFault = 0;
+-  sCheck.zPfx = 0;
+-  sCheck.v1 = 0;
+-  sCheck.v2 = 0;
+-  sCheck.aPgRef = 0;
+-  sCheck.heap = 0;
+   sqlite3StrAccumInit(&sCheck.errMsg, 0, zErr, sizeof(zErr), SQLITE_MAX_LENGTH);
+   sCheck.errMsg.printfFlags = SQLITE_PRINTF_INTERNAL;
+-  if( sCheck.nPage==0 ){
++  if( sCheck.nCkPage==0 ){
+     goto integrity_ck_cleanup;
+   }
+ 
+-  sCheck.aPgRef = sqlite3MallocZero((sCheck.nPage / 8)+ 1);
++  sCheck.aPgRef = sqlite3MallocZero((sCheck.nCkPage / 8)+ 1);
+   if( !sCheck.aPgRef ){
+-    sCheck.bOomFault = 1;
++    checkOom(&sCheck);
+     goto integrity_ck_cleanup;
+   }
+   sCheck.heap = (u32*)sqlite3PageMalloc( pBt->pageSize );
+   if( sCheck.heap==0 ){
+-    sCheck.bOomFault = 1;
++    checkOom(&sCheck);
+     goto integrity_ck_cleanup;
+   }
+ 
+   i = PENDING_BYTE_PAGE(pBt);
+-  if( i<=sCheck.nPage ) setPageReferenced(&sCheck, i);
++  if( i<=sCheck.nCkPage ) setPageReferenced(&sCheck, i);
+ 
+   /* Check the integrity of the freelist
+   */
+   if( bCkFreelist ){
+-    sCheck.zPfx = "Main freelist: ";
++    sCheck.zPfx = "Freelist: ";
+     checkList(&sCheck, 1, get4byte(&pBt->pPage1->aData[32]),
+               get4byte(&pBt->pPage1->aData[36]));
+     sCheck.zPfx = 0;
+@@ -77621,7 +81312,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+       mxInHdr = get4byte(&pBt->pPage1->aData[52]);
+       if( mx!=mxInHdr ){
+         checkAppendMsg(&sCheck,
+-          "max rootpage (%d) disagrees with header (%d)",
++          "max rootpage (%u) disagrees with header (%u)",
+           mx, mxInHdr
+         );
+       }
+@@ -77642,6 +81333,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+       checkPtrmap(&sCheck, aRoot[i], PTRMAP_ROOTPAGE, 0);
+     }
+ #endif
++    sCheck.v0 = aRoot[i];
+     checkTreePage(&sCheck, aRoot[i], ¬Used, LARGEST_INT64);
+   }
+   pBt->db->flags = savedDbFlags;
+@@ -77649,10 +81341,10 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+   /* Make sure every page in the file is referenced
+   */
+   if( !bPartial ){
+-    for(i=1; i<=sCheck.nPage && sCheck.mxErr; i++){
++    for(i=1; i<=sCheck.nCkPage && sCheck.mxErr; i++){
+ #ifdef SQLITE_OMIT_AUTOVACUUM
+       if( getPageReferenced(&sCheck, i)==0 ){
+-        checkAppendMsg(&sCheck, "Page %d is never used", i);
++        checkAppendMsg(&sCheck, "Page %u: never used", i);
+       }
+ #else
+       /* If the database supports auto-vacuum, make sure no tables contain
+@@ -77660,11 +81352,11 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+       */
+       if( getPageReferenced(&sCheck, i)==0 &&
+          (PTRMAP_PAGENO(pBt, i)!=i || !pBt->autoVacuum) ){
+-        checkAppendMsg(&sCheck, "Page %d is never used", i);
++        checkAppendMsg(&sCheck, "Page %u: never used", i);
+       }
+       if( getPageReferenced(&sCheck, i)!=0 &&
+          (PTRMAP_PAGENO(pBt, i)==i && pBt->autoVacuum) ){
+-        checkAppendMsg(&sCheck, "Pointer map page %d is referenced", i);
++        checkAppendMsg(&sCheck, "Page %u: pointer map referenced", i);
+       }
+ #endif
+     }
+@@ -77675,16 +81367,17 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(
+ integrity_ck_cleanup:
+   sqlite3PageFree(sCheck.heap);
+   sqlite3_free(sCheck.aPgRef);
+-  if( sCheck.bOomFault ){
++  *pnErr = sCheck.nErr;
++  if( sCheck.nErr==0 ){
+     sqlite3_str_reset(&sCheck.errMsg);
+-    sCheck.nErr++;
++    *pzOut = 0;
++  }else{
++    *pzOut = sqlite3StrAccumFinish(&sCheck.errMsg);
+   }
+-  *pnErr = sCheck.nErr;
+-  if( sCheck.nErr==0 ) sqlite3_str_reset(&sCheck.errMsg);
+   /* Make sure this analysis did not leave any unref() pages. */
+   assert( nRef==sqlite3PagerRefcount(pBt->pPager) );
+   sqlite3BtreeLeave(p);
+-  return sqlite3StrAccumFinish(&sCheck.errMsg);
++  return sCheck.rc;
+ }
+ #endif /* SQLITE_OMIT_INTEGRITY_CHECK */
+ 
+@@ -77949,6 +81642,17 @@ SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){
+ */
+ SQLITE_PRIVATE int sqlite3HeaderSizeBtree(void){ return ROUND8(sizeof(MemPage)); }
+ 
++/*
++** If no transaction is active and the database is not a temp-db, clear
++** the in-memory pager cache.
++*/
++SQLITE_PRIVATE void sqlite3BtreeClearCache(Btree *p){
++  BtShared *pBt = p->pBt;
++  if( pBt->inTransaction==TRANS_NONE ){
++    sqlite3PagerClearCache(pBt->pPager);
++  }
++}
++
+ #if !defined(SQLITE_OMIT_SHARED_CACHE)
+ /*
+ ** Return true if the Btree passed as the only argument is sharable.
+@@ -78214,13 +81918,7 @@ static int backupOnePage(
+   assert( !isFatalError(p->rc) );
+   assert( iSrcPg!=PENDING_BYTE_PAGE(p->pSrc->pBt) );
+   assert( zSrcData );
+-
+-  /* Catch the case where the destination is an in-memory database and the
+-  ** page sizes of the source and destination differ.
+-  */
+-  if( nSrcPgsz!=nDestPgsz && sqlite3PagerIsMemdb(pDestPager) ){
+-    rc = SQLITE_READONLY;
+-  }
++  assert( nSrcPgsz==nDestPgsz || sqlite3PagerIsMemdb(pDestPager)==0 );
+ 
+   /* This loop runs once for each destination page spanned by the source
+   ** page. For each iteration, variable iOff is set to the byte offset
+@@ -78353,7 +82051,10 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
+     pgszSrc = sqlite3BtreeGetPageSize(p->pSrc);
+     pgszDest = sqlite3BtreeGetPageSize(p->pDest);
+     destMode = sqlite3PagerGetJournalMode(sqlite3BtreePager(p->pDest));
+-    if( SQLITE_OK==rc && destMode==PAGER_JOURNALMODE_WAL && pgszSrc!=pgszDest ){
++    if( SQLITE_OK==rc
++     && (destMode==PAGER_JOURNALMODE_WAL || sqlite3PagerIsMemdb(pDestPager))
++     && pgszSrc!=pgszDest
++    ){
+       rc = SQLITE_READONLY;
+     }
+ 
+@@ -78859,9 +82560,9 @@ static void vdbeMemRenderNum(int sz, char *zBuf, Mem *p){
+     i64 x;
+     assert( (p->flags&MEM_Int)*2==sizeof(x) );
+     memcpy(&x, (char*)&p->u, (p->flags&MEM_Int)*2);
+-    sqlite3Int64ToText(x, zBuf);
++    p->n = sqlite3Int64ToText(x, zBuf);
+ #else
+-    sqlite3Int64ToText(p->u.i, zBuf);
++    p->n = sqlite3Int64ToText(p->u.i, zBuf);
+ #endif
+   }else{
+     sqlite3StrAccumInit(&acc, 0, zBuf, sz, 0);
+@@ -78869,6 +82570,7 @@ static void vdbeMemRenderNum(int sz, char *zBuf, Mem *p){
+          (p->flags & MEM_IntReal)!=0 ? (double)p->u.i : p->u.r);
+     assert( acc.zText==zBuf && acc.mxAlloc<=0 );
+     zBuf[acc.nChar] = 0; /* Fast version of sqlite3StrAccumFinish(&acc) */
++    p->n = acc.nChar;
+   }
+ }
+ 
+@@ -78896,10 +82598,12 @@ static void vdbeMemRenderNum(int sz, char *zBuf, Mem *p){
+ ** This routine is for use inside of assert() statements only.
+ */
+ SQLITE_PRIVATE int sqlite3VdbeMemValidStrRep(Mem *p){
++  Mem tmp;
+   char zBuf[100];
+   char *z;
+   int i, j, incr;
+   if( (p->flags & MEM_Str)==0 ) return 1;
++  if( p->db && p->db->mallocFailed ) return 1;
+   if( p->flags & MEM_Term ){
+     /* Insure that the string is properly zero-terminated.  Pay particular
+     ** attention to the case where p->n is odd */
+@@ -78912,7 +82616,8 @@ SQLITE_PRIVATE int sqlite3VdbeMemValidStrRep(Mem *p){
+     assert( p->enc==SQLITE_UTF8 || p->z[((p->n+1)&~1)+1]==0 );
+   }
+   if( (p->flags & (MEM_Int|MEM_Real|MEM_IntReal))==0 ) return 1;
+-  vdbeMemRenderNum(sizeof(zBuf), zBuf, p);
++  memcpy(&tmp, p, sizeof(tmp));
++  vdbeMemRenderNum(sizeof(zBuf), zBuf, &tmp);
+   z = p->z;
+   i = j = 0;
+   incr = 1;
+@@ -79055,6 +82760,40 @@ SQLITE_PRIVATE int sqlite3VdbeMemClearAndResize(Mem *pMem, int szNew){
+   return SQLITE_OK;
+ }
+ 
++/*
++** If pMem is already a string, detect if it is a zero-terminated
++** string, or make it into one if possible, and mark it as such.
++**
++** This is an optimization.  Correct operation continues even if
++** this routine is a no-op.
++*/
++SQLITE_PRIVATE void sqlite3VdbeMemZeroTerminateIfAble(Mem *pMem){
++  if( (pMem->flags & (MEM_Str|MEM_Term|MEM_Ephem|MEM_Static))!=MEM_Str ){
++    /* pMem must be a string, and it cannot be an ephemeral or static string */
++    return;
++  }
++  if( pMem->enc!=SQLITE_UTF8 ) return;
++  if( NEVER(pMem->z==0) ) return;
++  if( pMem->flags & MEM_Dyn ){
++    if( pMem->xDel==sqlite3_free
++     && sqlite3_msize(pMem->z) >= (u64)(pMem->n+1)
++    ){
++      pMem->z[pMem->n] = 0;
++      pMem->flags |= MEM_Term;
++      return;
++    }
++    if( pMem->xDel==sqlite3RCStrUnref ){
++      /* Blindly assume that all RCStr objects are zero-terminated */
++      pMem->flags |= MEM_Term;
++      return;
++    }
++  }else if( pMem->szMalloc >= pMem->n+1 ){
++    pMem->z[pMem->n] = 0;
++    pMem->flags |= MEM_Term;
++    return;
++  }
++}
++
+ /*
+ ** It is already known that pMem contains an unterminated string.
+ ** Add the zero terminator.
+@@ -79181,7 +82920,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem *pMem, u8 enc, u8 bForce){
+ 
+   vdbeMemRenderNum(nByte, pMem->z, pMem);
+   assert( pMem->z!=0 );
+-  pMem->n = sqlite3Strlen30NN(pMem->z);
++  assert( pMem->n==(int)sqlite3Strlen30NN(pMem->z) );
+   pMem->enc = SQLITE_UTF8;
+   pMem->flags |= MEM_Str|MEM_Term;
+   if( bForce ) pMem->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal);
+@@ -79316,36 +83055,6 @@ SQLITE_PRIVATE void sqlite3VdbeMemReleaseMalloc(Mem *p){
+   if( p->szMalloc ) vdbeMemClear(p);
+ }
+ 
+-/*
+-** Convert a 64-bit IEEE double into a 64-bit signed integer.
+-** If the double is out of range of a 64-bit signed integer then
+-** return the closest available 64-bit signed integer.
+-*/
+-static SQLITE_NOINLINE i64 doubleToInt64(double r){
+-#ifdef SQLITE_OMIT_FLOATING_POINT
+-  /* When floating-point is omitted, double and int64 are the same thing */
+-  return r;
+-#else
+-  /*
+-  ** Many compilers we encounter do not define constants for the
+-  ** minimum and maximum 64-bit integers, or they define them
+-  ** inconsistently.  And many do not understand the "LL" notation.
+-  ** So we define our own static constants here using nothing
+-  ** larger than a 32-bit integer constant.
+-  */
+-  static const i64 maxInt = LARGEST_INT64;
+-  static const i64 minInt = SMALLEST_INT64;
+-
+-  if( r<=(double)minInt ){
+-    return minInt;
+-  }else if( r>=(double)maxInt ){
+-    return maxInt;
+-  }else{
+-    return (i64)r;
+-  }
+-#endif
+-}
+-
+ /*
+ ** Return some kind of integer value which is the best we can do
+ ** at representing the value that *pMem describes as an integer.
+@@ -79372,7 +83081,7 @@ SQLITE_PRIVATE i64 sqlite3VdbeIntValue(const Mem *pMem){
+     testcase( flags & MEM_IntReal );
+     return pMem->u.i;
+   }else if( flags & MEM_Real ){
+-    return doubleToInt64(pMem->u.r);
++    return sqlite3RealToI64(pMem->u.r);
+   }else if( (flags & (MEM_Str|MEM_Blob))!=0 && pMem->z!=0 ){
+     return memIntValue(pMem);
+   }else{
+@@ -79421,32 +83130,35 @@ SQLITE_PRIVATE int sqlite3VdbeBooleanValue(Mem *pMem, int ifNull){
+ }
+ 
+ /*
+-** The MEM structure is already a MEM_Real.  Try to also make it a
+-** MEM_Int if we can.
++** The MEM structure is already a MEM_Real or MEM_IntReal. Try to
++** make it a MEM_Int if we can.
+ */
+ SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){
+-  i64 ix;
+   assert( pMem!=0 );
+-  assert( pMem->flags & MEM_Real );
++  assert( pMem->flags & (MEM_Real|MEM_IntReal) );
+   assert( !sqlite3VdbeMemIsRowSet(pMem) );
+   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+   assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+ 
+-  ix = doubleToInt64(pMem->u.r);
+-
+-  /* Only mark the value as an integer if
+-  **
+-  **    (1) the round-trip conversion real->int->real is a no-op, and
+-  **    (2) The integer is neither the largest nor the smallest
+-  **        possible integer (ticket #3922)
+-  **
+-  ** The second and third terms in the following conditional enforces
+-  ** the second condition under the assumption that addition overflow causes
+-  ** values to wrap around.
+-  */
+-  if( pMem->u.r==ix && ix>SMALLEST_INT64 && ixu.i = ix;
++  if( pMem->flags & MEM_IntReal ){
+     MemSetTypeFlag(pMem, MEM_Int);
++  }else{
++    i64 ix = sqlite3RealToI64(pMem->u.r);
++
++    /* Only mark the value as an integer if
++    **
++    **    (1) the round-trip conversion real->int->real is a no-op, and
++    **    (2) The integer is neither the largest nor the smallest
++    **        possible integer (ticket #3922)
++    **
++    ** The second and third terms in the following conditional enforces
++    ** the second condition under the assumption that addition overflow causes
++    ** values to wrap around.
++    */
++    if( pMem->u.r==ix && ix>SMALLEST_INT64 && ixu.i = ix;
++      MemSetTypeFlag(pMem, MEM_Int);
++    }
+   }
+ }
+ 
+@@ -79494,6 +83206,16 @@ SQLITE_PRIVATE int sqlite3RealSameAsInt(double r1, sqlite3_int64 i){
+           && i >= -2251799813685248LL && i < 2251799813685248LL);
+ }
+ 
++/* Convert a floating point value to its closest integer.  Do so in
++** a way that avoids 'outside the range of representable values' warnings
++** from UBSAN.
++*/
++SQLITE_PRIVATE i64 sqlite3RealToI64(double r){
++  if( r<-9223372036854774784.0 ) return SMALLEST_INT64;
++  if( r>+9223372036854774784.0 ) return LARGEST_INT64;
++  return (i64)r;
++}
++
+ /*
+ ** Convert pMem so that it has type MEM_Real or MEM_Int.
+ ** Invalidate any prior representations.
+@@ -79515,7 +83237,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem *pMem){
+     assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+     rc = sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc);
+     if( ((rc==0 || rc==1) && sqlite3Atoi64(pMem->z, &ix, pMem->n, pMem->enc)<=1)
+-     || sqlite3RealSameAsInt(pMem->u.r, (ix = (i64)pMem->u.r))
++     || sqlite3RealSameAsInt(pMem->u.r, (ix = sqlite3RealToI64(pMem->u.r)))
+     ){
+       pMem->u.i = ix;
+       MemSetTypeFlag(pMem, MEM_Int);
+@@ -79561,13 +83283,17 @@ SQLITE_PRIVATE int sqlite3VdbeMemCast(Mem *pMem, u8 aff, u8 encoding){
+       break;
+     }
+     default: {
++      int rc;
+       assert( aff==SQLITE_AFF_TEXT );
+       assert( MEM_Str==(MEM_Blob>>3) );
+       pMem->flags |= (pMem->flags&MEM_Blob)>>3;
+       sqlite3ValueApplyAffinity(pMem, SQLITE_AFF_TEXT, encoding);
+       assert( pMem->flags & MEM_Str || pMem->db->mallocFailed );
+       pMem->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal|MEM_Blob|MEM_Zero);
+-      return sqlite3VdbeChangeEncoding(pMem, encoding);
++      if( encoding!=SQLITE_UTF8 ) pMem->n &= ~1;
++      rc = sqlite3VdbeChangeEncoding(pMem, encoding);
++      if( rc ) return rc;
++      sqlite3VdbeMemZeroTerminateIfAble(pMem);
+     }
+   }
+   return SQLITE_OK;
+@@ -80091,6 +83817,24 @@ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
+   return valueToText(pVal, enc);
+ }
+ 
++/* Return true if sqlit3_value object pVal is a string or blob value
++** that uses the destructor specified in the second argument.
++**
++** TODO:  Maybe someday promote this interface into a published API so
++** that third-party extensions can get access to it?
++*/
++SQLITE_PRIVATE int sqlite3ValueIsOfClass(const sqlite3_value *pVal, void(*xFree)(void*)){
++  if( ALWAYS(pVal!=0)
++   && ALWAYS((pVal->flags & (MEM_Str|MEM_Blob))!=0)
++   && (pVal->flags & MEM_Dyn)!=0
++   && pVal->xDel==xFree
++  ){
++    return 1;
++  }else{
++    return 0;
++  }
++}
++
+ /*
+ ** Create a new sqlite3_value object.
+ */
+@@ -80158,6 +83902,7 @@ static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){
+     }
+ 
+     pRec->nField = p->iVal+1;
++    sqlite3VdbeMemSetNull(&pRec->aMem[p->iVal]);
+     return &pRec->aMem[p->iVal];
+   }
+ #else
+@@ -80211,9 +83956,12 @@ static int valueFromFunction(
+   if( pList ) nVal = pList->nExpr;
+   assert( !ExprHasProperty(p, EP_IntValue) );
+   pFunc = sqlite3FindFunction(db, p->u.zToken, nVal, enc, 0);
++#ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
++  if( pFunc==0 ) return SQLITE_OK;
++#endif
+   assert( pFunc );
+   if( (pFunc->funcFlags & (SQLITE_FUNC_CONSTANT|SQLITE_FUNC_SLOCHNG))==0
+-   || (pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL)
++   || (pFunc->funcFlags & (SQLITE_FUNC_NEEDCOLL|SQLITE_FUNC_RUNONLY))!=0
+   ){
+     return SQLITE_OK;
+   }
+@@ -80236,8 +83984,6 @@ static int valueFromFunction(
+     goto value_from_function_out;
+   }
+ 
+-  testcase( pCtx->pParse->rc==SQLITE_ERROR );
+-  testcase( pCtx->pParse->rc==SQLITE_OK );
+   memset(&ctx, 0, sizeof(ctx));
+   ctx.pOut = pVal;
+   ctx.pFunc = pFunc;
+@@ -80250,16 +83996,16 @@ static int valueFromFunction(
+     sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
+     assert( rc==SQLITE_OK );
+     rc = sqlite3VdbeChangeEncoding(pVal, enc);
+-    if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){
++    if( NEVER(rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal)) ){
+       rc = SQLITE_TOOBIG;
+       pCtx->pParse->nErr++;
+     }
+   }
+-  pCtx->pParse->rc = rc;
+ 
+  value_from_function_out:
+   if( rc!=SQLITE_OK ){
+     pVal = 0;
++    pCtx->pParse->rc = rc;
+   }
+   if( apVal ){
+     for(i=0; ipLeft, enc, aff, ppVal, pCtx);
+     testcase( rc!=SQLITE_OK );
+     if( *ppVal ){
++#ifdef SQLITE_ENABLE_STAT4
++      rc = ExpandBlob(*ppVal);
++#else
++      /* zero-blobs only come from functions, not literal values.  And
++      ** functions are only processed under STAT4 */
++      assert( (ppVal[0][0].flags & MEM_Zero)==0 );
++#endif
+       sqlite3VdbeMemCast(*ppVal, aff, enc);
+       sqlite3ValueApplyAffinity(*ppVal, affinity, enc);
+     }
+@@ -80409,6 +84162,7 @@ static int valueFromExpr(
+     if( pVal ){
+       pVal->flags = MEM_Int;
+       pVal->u.i = pExpr->u.zToken[4]==0;
++      sqlite3ValueApplyAffinity(pVal, affinity, enc);
+     }
+   }
+ 
+@@ -80702,6 +84456,9 @@ SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){
+   if( (p->flags & MEM_Str)!=0 && pVal->enc==enc ){
+     return p->n;
+   }
++  if( (p->flags & MEM_Str)!=0 && enc!=SQLITE_UTF8 && pVal->enc!=SQLITE_UTF8 ){
++    return p->n;
++  }
+   if( (p->flags & MEM_Blob)!=0 ){
+     if( p->flags & MEM_Zero ){
+       return p->n + p->u.nZero;
+@@ -80747,10 +84504,10 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(Parse *pParse){
+   memset(&p->aOp, 0, sizeof(Vdbe)-offsetof(Vdbe,aOp));
+   p->db = db;
+   if( db->pVdbe ){
+-    db->pVdbe->pPrev = p;
++    db->pVdbe->ppVPrev = &p->pVNext;
+   }
+-  p->pNext = db->pVdbe;
+-  p->pPrev = 0;
++  p->pVNext = db->pVdbe;
++  p->ppVPrev = &db->pVdbe;
+   db->pVdbe = p;
+   assert( p->eVdbeState==VDBE_INIT_STATE );
+   p->pParse = pParse;
+@@ -80832,21 +84589,28 @@ SQLITE_PRIVATE int sqlite3VdbeUsesDoubleQuotedString(
+ #endif
+ 
+ /*
+-** Swap all content between two VDBE structures.
++** Swap byte-code between two VDBE structures.
++**
++** This happens after pB was previously run and returned
++** SQLITE_SCHEMA.  The statement was then reprepared in pA.
++** This routine transfers the new bytecode in pA over to pB
++** so that pB can be run again.  The old pB byte code is
++** moved back to pA so that it will be cleaned up when pA is
++** finalized.
+ */
+ SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){
+-  Vdbe tmp, *pTmp;
++  Vdbe tmp, *pTmp, **ppTmp;
+   char *zTmp;
+   assert( pA->db==pB->db );
+   tmp = *pA;
+   *pA = *pB;
+   *pB = tmp;
+-  pTmp = pA->pNext;
+-  pA->pNext = pB->pNext;
+-  pB->pNext = pTmp;
+-  pTmp = pA->pPrev;
+-  pA->pPrev = pB->pPrev;
+-  pB->pPrev = pTmp;
++  pTmp = pA->pVNext;
++  pA->pVNext = pB->pVNext;
++  pB->pVNext = pTmp;
++  ppTmp = pA->ppVPrev;
++  pA->ppVPrev = pB->ppVPrev;
++  pB->ppVPrev = ppTmp;
+   zTmp = pA->zSql;
+   pA->zSql = pB->zSql;
+   pB->zSql = zTmp;
+@@ -80921,11 +84685,43 @@ static int growOpArray(Vdbe *v, int nOp){
+ **   sqlite3CantopenError(lineno)
+ */
+ static void test_addop_breakpoint(int pc, Op *pOp){
+-  static int n = 0;
++  static u64 n = 0;
++  (void)pc;
++  (void)pOp;
+   n++;
++  if( n==LARGEST_UINT64 ) abort(); /* so that n is used, preventing a warning */
+ }
+ #endif
+ 
++/*
++** Slow paths for sqlite3VdbeAddOp3() and sqlite3VdbeAddOp4Int() for the
++** unusual case when we need to increase the size of the Vdbe.aOp[] array
++** before adding the new opcode.
++*/
++static SQLITE_NOINLINE int growOp3(Vdbe *p, int op, int p1, int p2, int p3){
++  assert( p->nOpAlloc<=p->nOp );
++  if( growOpArray(p, 1) ) return 1;
++  assert( p->nOpAlloc>p->nOp );
++  return sqlite3VdbeAddOp3(p, op, p1, p2, p3);
++}
++static SQLITE_NOINLINE int addOp4IntSlow(
++  Vdbe *p,            /* Add the opcode to this VM */
++  int op,             /* The new opcode */
++  int p1,             /* The P1 operand */
++  int p2,             /* The P2 operand */
++  int p3,             /* The P3 operand */
++  int p4              /* The P4 operand as an integer */
++){
++  int addr = sqlite3VdbeAddOp3(p, op, p1, p2, p3);
++  if( p->db->mallocFailed==0 ){
++    VdbeOp *pOp = &p->aOp[addr];
++    pOp->p4type = P4_INT32;
++    pOp->p4.i = p4;
++  }
++  return addr;
++}
++
++
+ /*
+ ** Add a new instruction to the list of instructions current in the
+ ** VDBE.  Return the address of the new instruction.
+@@ -80936,17 +84732,16 @@ static void test_addop_breakpoint(int pc, Op *pOp){
+ **
+ **    op              The opcode for this instruction
+ **
+-**    p1, p2, p3      Operands
+-**
+-** Use the sqlite3VdbeResolveLabel() function to fix an address and
+-** the sqlite3VdbeChangeP4() function to change the value of the P4
+-** operand.
++**    p1, p2, p3, p4  Operands
+ */
+-static SQLITE_NOINLINE int growOp3(Vdbe *p, int op, int p1, int p2, int p3){
+-  assert( p->nOpAlloc<=p->nOp );
+-  if( growOpArray(p, 1) ) return 1;
+-  assert( p->nOpAlloc>p->nOp );
+-  return sqlite3VdbeAddOp3(p, op, p1, p2, p3);
++SQLITE_PRIVATE int sqlite3VdbeAddOp0(Vdbe *p, int op){
++  return sqlite3VdbeAddOp3(p, op, 0, 0, 0);
++}
++SQLITE_PRIVATE int sqlite3VdbeAddOp1(Vdbe *p, int op, int p1){
++  return sqlite3VdbeAddOp3(p, op, p1, 0, 0);
++}
++SQLITE_PRIVATE int sqlite3VdbeAddOp2(Vdbe *p, int op, int p1, int p2){
++  return sqlite3VdbeAddOp3(p, op, p1, p2, 0);
+ }
+ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
+   int i;
+@@ -80969,32 +84764,78 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
+   pOp->p3 = p3;
+   pOp->p4.p = 0;
+   pOp->p4type = P4_NOTUSED;
++
++  /* Replicate this logic in sqlite3VdbeAddOp4Int()
++  ** vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv   */
+ #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+   pOp->zComment = 0;
+ #endif
++#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
++  pOp->nExec = 0;
++  pOp->nCycle = 0;
++#endif
+ #ifdef SQLITE_DEBUG
+   if( p->db->flags & SQLITE_VdbeAddopTrace ){
+     sqlite3VdbePrintOp(0, i, &p->aOp[i]);
+     test_addop_breakpoint(i, &p->aOp[i]);
+   }
+ #endif
+-#ifdef VDBE_PROFILE
+-  pOp->cycles = 0;
+-  pOp->cnt = 0;
+-#endif
+ #ifdef SQLITE_VDBE_COVERAGE
+   pOp->iSrcLine = 0;
+ #endif
++  /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++  ** Replicate in sqlite3VdbeAddOp4Int() */
++
+   return i;
+ }
+-SQLITE_PRIVATE int sqlite3VdbeAddOp0(Vdbe *p, int op){
+-  return sqlite3VdbeAddOp3(p, op, 0, 0, 0);
+-}
+-SQLITE_PRIVATE int sqlite3VdbeAddOp1(Vdbe *p, int op, int p1){
+-  return sqlite3VdbeAddOp3(p, op, p1, 0, 0);
+-}
+-SQLITE_PRIVATE int sqlite3VdbeAddOp2(Vdbe *p, int op, int p1, int p2){
+-  return sqlite3VdbeAddOp3(p, op, p1, p2, 0);
++SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(
++  Vdbe *p,            /* Add the opcode to this VM */
++  int op,             /* The new opcode */
++  int p1,             /* The P1 operand */
++  int p2,             /* The P2 operand */
++  int p3,             /* The P3 operand */
++  int p4              /* The P4 operand as an integer */
++){
++  int i;
++  VdbeOp *pOp;
++
++  i = p->nOp;
++  if( p->nOpAlloc<=i ){
++    return addOp4IntSlow(p, op, p1, p2, p3, p4);
++  }
++  p->nOp++;
++  pOp = &p->aOp[i];
++  assert( pOp!=0 );
++  pOp->opcode = (u8)op;
++  pOp->p5 = 0;
++  pOp->p1 = p1;
++  pOp->p2 = p2;
++  pOp->p3 = p3;
++  pOp->p4.i = p4;
++  pOp->p4type = P4_INT32;
++
++  /* Replicate this logic in sqlite3VdbeAddOp3()
++  ** vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv   */
++#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
++  pOp->zComment = 0;
++#endif
++#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
++  pOp->nExec = 0;
++  pOp->nCycle = 0;
++#endif
++#ifdef SQLITE_DEBUG
++  if( p->db->flags & SQLITE_VdbeAddopTrace ){
++    sqlite3VdbePrintOp(0, i, &p->aOp[i]);
++    test_addop_breakpoint(i, &p->aOp[i]);
++  }
++#endif
++#ifdef SQLITE_VDBE_COVERAGE
++  pOp->iSrcLine = 0;
++#endif
++  /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++  ** Replicate in sqlite3VdbeAddOp3() */
++
++  return i;
+ }
+ 
+ /* Generate code for an unconditional jump to instruction iDest
+@@ -81149,11 +84990,12 @@ SQLITE_PRIVATE void sqlite3ExplainBreakpoint(const char *z1, const char *z2){
+ ** If the bPush flag is true, then make this opcode the parent for
+ ** subsequent Explains until sqlite3VdbeExplainPop() is called.
+ */
+-SQLITE_PRIVATE void sqlite3VdbeExplain(Parse *pParse, u8 bPush, const char *zFmt, ...){
+-#ifndef SQLITE_DEBUG
++SQLITE_PRIVATE int sqlite3VdbeExplain(Parse *pParse, u8 bPush, const char *zFmt, ...){
++  int addr = 0;
++#if !defined(SQLITE_DEBUG)
+   /* Always include the OP_Explain opcodes if SQLITE_DEBUG is defined.
+   ** But omit them (for performance) during production builds */
+-  if( pParse->explain==2 )
++  if( pParse->explain==2 || IS_STMT_SCANSTATUS(pParse->db) )
+ #endif
+   {
+     char *zMsg;
+@@ -81165,13 +85007,15 @@ SQLITE_PRIVATE void sqlite3VdbeExplain(Parse *pParse, u8 bPush, const char *zFmt
+     va_end(ap);
+     v = pParse->pVdbe;
+     iThis = v->nOp;
+-    sqlite3VdbeAddOp4(v, OP_Explain, iThis, pParse->addrExplain, 0,
++    addr = sqlite3VdbeAddOp4(v, OP_Explain, iThis, pParse->addrExplain, 0,
+                       zMsg, P4_DYNAMIC);
+-    sqlite3ExplainBreakpoint(bPush?"PUSH":"", sqlite3VdbeGetOp(v,-1)->p4.z);
++    sqlite3ExplainBreakpoint(bPush?"PUSH":"", sqlite3VdbeGetLastOp(v)->p4.z);
+     if( bPush){
+       pParse->addrExplain = iThis;
+     }
++    sqlite3VdbeScanStatus(v, iThis, -1, -1, 0, 0);
+   }
++  return addr;
+ }
+ 
+ /*
+@@ -81199,26 +85043,6 @@ SQLITE_PRIVATE void sqlite3VdbeAddParseSchemaOp(Vdbe *p, int iDb, char *zWhere,
+   sqlite3MayAbort(p->pParse);
+ }
+ 
+-/*
+-** Add an opcode that includes the p4 value as an integer.
+-*/
+-SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(
+-  Vdbe *p,            /* Add the opcode to this VM */
+-  int op,             /* The new opcode */
+-  int p1,             /* The P1 operand */
+-  int p2,             /* The P2 operand */
+-  int p3,             /* The P3 operand */
+-  int p4              /* The P4 operand as an integer */
+-){
+-  int addr = sqlite3VdbeAddOp3(p, op, p1, p2, p3);
+-  if( p->db->mallocFailed==0 ){
+-    VdbeOp *pOp = &p->aOp[addr];
+-    pOp->p4type = P4_INT32;
+-    pOp->p4.i = p4;
+-  }
+-  return addr;
+-}
+-
+ /* Insert the end of a co-routine
+ */
+ SQLITE_PRIVATE void sqlite3VdbeEndCoroutine(Vdbe *v, int regYield){
+@@ -81279,6 +85103,9 @@ static SQLITE_NOINLINE void resizeResolveLabel(Parse *p, Vdbe *v, int j){
+     int i;
+     for(i=p->nLabelAlloc; iaLabel[i] = -1;
+ #endif
++    if( nNewSize>=100 && (nNewSize/100)>(p->nLabelAlloc/100) ){
++      sqlite3ProgressCheck(p);
++    }
+     p->nLabelAlloc = nNewSize;
+     p->aLabel[j] = v->nOp;
+   }
+@@ -81522,11 +85349,13 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
+   Op *pOp;
+   Parse *pParse = p->pParse;
+   int *aLabel = pParse->aLabel;
++
++  assert( pParse->db->mallocFailed==0 ); /* tag-20230419-1 */
+   p->readOnly = 1;
+   p->bIsReader = 0;
+   pOp = &p->aOp[p->nOp-1];
+-  while(1){
+-
++  assert( p->aOp[0].opcode==OP_Init );
++  while( 1 /* Loop terminates when it reaches the OP_Init opcode */ ){
+     /* Only JUMP opcodes and the short list of special opcodes in the switch
+     ** below need to be considered.  The mkopcodeh.tcl generator script groups
+     ** all these opcodes together near the front of the opcode list.  Skip
+@@ -81555,6 +85384,10 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
+           p->bIsReader = 1;
+           break;
+         }
++        case OP_Init: {
++          assert( pOp->p2>=0 );
++          goto resolve_p2_values_loop_exit;
++        }
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+         case OP_VUpdate: {
+           if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
+@@ -81577,6 +85410,7 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
+             ** have non-negative values for P2. */
+             assert( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 );
+             assert( ADDR(pOp->p2)<-pParse->nLabel );
++            assert( aLabel!=0 );  /* True because of tag-20230419-1 */
+             pOp->p2 = aLabel[ADDR(pOp->p2)];
+           }
+           break;
+@@ -81587,11 +85421,12 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
+       ** have non-negative values for P2. */
+       assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 || pOp->p2>=0);
+     }
+-    if( pOp==p->aOp ) break;
++    assert( pOp>p->aOp );
+     pOp--;
+   }
++resolve_p2_values_loop_exit:
+   if( aLabel ){
+-    sqlite3DbFreeNN(p->db, pParse->aLabel);
++    sqlite3DbNNFreeNN(p->db, pParse->aLabel);
+     pParse->aLabel = 0;
+   }
+   pParse->nLabel = 0;
+@@ -81642,6 +85477,10 @@ SQLITE_PRIVATE void sqlite3VdbeNoJumpsOutsideSubrtn(
+       int iDest = pOp->p2;   /* Jump destination */
+       if( iDest==0 ) continue;
+       if( pOp->opcode==OP_Gosub ) continue;
++      if( pOp->p3==20230325 && pOp->opcode==OP_NotNull ){
++        /* This is a deliberately taken illegal branch.  tag-20230325-2 */
++        continue;
++      }
+       if( iDest<0 ){
+         int j = ADDR(iDest);
+         assert( j>=0 );
+@@ -81819,20 +85658,83 @@ SQLITE_PRIVATE void sqlite3VdbeScanStatus(
+   LogEst nEst,                    /* Estimated number of output rows */
+   const char *zName               /* Name of table or index being scanned */
+ ){
+-  sqlite3_int64 nByte = (p->nScan+1) * sizeof(ScanStatus);
+-  ScanStatus *aNew;
+-  aNew = (ScanStatus*)sqlite3DbRealloc(p->db, p->aScan, nByte);
+-  if( aNew ){
+-    ScanStatus *pNew = &aNew[p->nScan++];
+-    pNew->addrExplain = addrExplain;
+-    pNew->addrLoop = addrLoop;
+-    pNew->addrVisit = addrVisit;
+-    pNew->nEst = nEst;
+-    pNew->zName = sqlite3DbStrDup(p->db, zName);
+-    p->aScan = aNew;
++  if( IS_STMT_SCANSTATUS(p->db) ){
++    sqlite3_int64 nByte = (p->nScan+1) * sizeof(ScanStatus);
++    ScanStatus *aNew;
++    aNew = (ScanStatus*)sqlite3DbRealloc(p->db, p->aScan, nByte);
++    if( aNew ){
++      ScanStatus *pNew = &aNew[p->nScan++];
++      memset(pNew, 0, sizeof(ScanStatus));
++      pNew->addrExplain = addrExplain;
++      pNew->addrLoop = addrLoop;
++      pNew->addrVisit = addrVisit;
++      pNew->nEst = nEst;
++      pNew->zName = sqlite3DbStrDup(p->db, zName);
++      p->aScan = aNew;
++    }
+   }
+ }
+-#endif
++
++/*
++** Add the range of instructions from addrStart to addrEnd (inclusive) to
++** the set of those corresponding to the sqlite3_stmt_scanstatus() counters
++** associated with the OP_Explain instruction at addrExplain. The
++** sum of the sqlite3Hwtime() values for each of these instructions
++** will be returned for SQLITE_SCANSTAT_NCYCLE requests.
++*/
++SQLITE_PRIVATE void sqlite3VdbeScanStatusRange(
++  Vdbe *p,
++  int addrExplain,
++  int addrStart,
++  int addrEnd
++){
++  if( IS_STMT_SCANSTATUS(p->db) ){
++    ScanStatus *pScan = 0;
++    int ii;
++    for(ii=p->nScan-1; ii>=0; ii--){
++      pScan = &p->aScan[ii];
++      if( pScan->addrExplain==addrExplain ) break;
++      pScan = 0;
++    }
++    if( pScan ){
++      if( addrEnd<0 ) addrEnd = sqlite3VdbeCurrentAddr(p)-1;
++      for(ii=0; iiaAddrRange); ii+=2){
++        if( pScan->aAddrRange[ii]==0 ){
++          pScan->aAddrRange[ii] = addrStart;
++          pScan->aAddrRange[ii+1] = addrEnd;
++          break;
++        }
++      }
++    }
++  }
++}
++
++/*
++** Set the addresses for the SQLITE_SCANSTAT_NLOOP and SQLITE_SCANSTAT_NROW
++** counters for the query element associated with the OP_Explain at
++** addrExplain.
++*/
++SQLITE_PRIVATE void sqlite3VdbeScanStatusCounters(
++  Vdbe *p,
++  int addrExplain,
++  int addrLoop,
++  int addrVisit
++){
++  if( IS_STMT_SCANSTATUS(p->db) ){
++    ScanStatus *pScan = 0;
++    int ii;
++    for(ii=p->nScan-1; ii>=0; ii--){
++      pScan = &p->aScan[ii];
++      if( pScan->addrExplain==addrExplain ) break;
++      pScan = 0;
++    }
++    if( pScan ){
++      if( addrLoop>0 ) pScan->addrLoop = addrLoop;
++      if( addrVisit>0 ) pScan->addrVisit = addrVisit;
++    }
++  }
++}
++#endif /* defined(SQLITE_ENABLE_STMT_SCANSTATUS) */
+ 
+ 
+ /*
+@@ -81840,15 +85742,19 @@ SQLITE_PRIVATE void sqlite3VdbeScanStatus(
+ ** for a specific instruction.
+ */
+ SQLITE_PRIVATE void sqlite3VdbeChangeOpcode(Vdbe *p, int addr, u8 iNewOpcode){
++  assert( addr>=0 );
+   sqlite3VdbeGetOp(p,addr)->opcode = iNewOpcode;
+ }
+ SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){
++  assert( addr>=0 );
+   sqlite3VdbeGetOp(p,addr)->p1 = val;
+ }
+ SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){
++  assert( addr>=0 || p->db->mallocFailed );
+   sqlite3VdbeGetOp(p,addr)->p2 = val;
+ }
+ SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, int addr, int val){
++  assert( addr>=0 );
+   sqlite3VdbeGetOp(p,addr)->p3 = val;
+ }
+ SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe *p, u16 p5){
+@@ -81856,6 +85762,18 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe *p, u16 p5){
+   if( p->nOp>0 ) p->aOp[p->nOp-1].p5 = p5;
+ }
+ 
++/*
++** If the previous opcode is an OP_Column that delivers results
++** into register iDest, then add the OPFLAG_TYPEOFARG flag to that
++** opcode.
++*/
++SQLITE_PRIVATE void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
++  VdbeOp *pOp = sqlite3VdbeGetLastOp(p);
++  if( pOp->p3==iDest && pOp->opcode==OP_Column ){
++    pOp->p5 |= OPFLAG_TYPEOFARG;
++  }
++}
++
+ /*
+ ** Change the P2 operand of instruction addr so that it points to
+ ** the address of the next instruction to be coded.
+@@ -81884,7 +85802,7 @@ SQLITE_PRIVATE void sqlite3VdbeJumpHereOrPopInst(Vdbe *p, int addr){
+          || p->aOp[addr].opcode==OP_FkIfZero );
+     assert( p->aOp[addr].p4type==0 );
+ #ifdef SQLITE_VDBE_COVERAGE
+-    sqlite3VdbeGetOp(p,-1)->iSrcLine = 0;  /* Erase VdbeCoverage() macros */
++    sqlite3VdbeGetLastOp(p)->iSrcLine = 0;  /* Erase VdbeCoverage() macros */
+ #endif
+     p->nOp--;
+   }else{
+@@ -81895,11 +85813,12 @@ SQLITE_PRIVATE void sqlite3VdbeJumpHereOrPopInst(Vdbe *p, int addr){
+ 
+ /*
+ ** If the input FuncDef structure is ephemeral, then free it.  If
+-** the FuncDef is not ephermal, then do nothing.
++** the FuncDef is not ephemeral, then do nothing.
+ */
+ static void freeEphemeralFunction(sqlite3 *db, FuncDef *pDef){
++  assert( db!=0 );
+   if( (pDef->funcFlags & SQLITE_FUNC_EPHEM)!=0 ){
+-    sqlite3DbFreeNN(db, pDef);
++    sqlite3DbNNFreeNN(db, pDef);
+   }
+ }
+ 
+@@ -81908,11 +85827,12 @@ static void freeEphemeralFunction(sqlite3 *db, FuncDef *pDef){
+ */
+ static SQLITE_NOINLINE void freeP4Mem(sqlite3 *db, Mem *p){
+   if( p->szMalloc ) sqlite3DbFree(db, p->zMalloc);
+-  sqlite3DbFreeNN(db, p);
++  sqlite3DbNNFreeNN(db, p);
+ }
+ static SQLITE_NOINLINE void freeP4FuncCtx(sqlite3 *db, sqlite3_context *p){
++  assert( db!=0 );
+   freeEphemeralFunction(db, p->pFunc);
+-  sqlite3DbFreeNN(db, p);
++  sqlite3DbNNFreeNN(db, p);
+ }
+ static void freeP4(sqlite3 *db, int p4type, void *p4){
+   assert( db );
+@@ -81925,7 +85845,7 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
+     case P4_INT64:
+     case P4_DYNAMIC:
+     case P4_INTARRAY: {
+-      sqlite3DbFree(db, p4);
++      if( p4 ) sqlite3DbNNFreeNN(db, p4);
+       break;
+     }
+     case P4_KEYINFO: {
+@@ -81954,6 +85874,10 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
+       if( db->pnBytesFreed==0 ) sqlite3VtabUnlock((VTable *)p4);
+       break;
+     }
++    case P4_TABLEREF: {
++      if( db->pnBytesFreed==0 ) sqlite3DeleteTable(db, (Table*)p4);
++      break;
++    }
+   }
+ }
+ 
+@@ -81964,6 +85888,7 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
+ */
+ static void vdbeFreeOpArray(sqlite3 *db, Op *aOp, int nOp){
+   assert( nOp>=0 );
++  assert( db!=0 );
+   if( aOp ){
+     Op *pOp = &aOp[nOp-1];
+     while(1){  /* Exit via break */
+@@ -81974,7 +85899,7 @@ static void vdbeFreeOpArray(sqlite3 *db, Op *aOp, int nOp){
+       if( pOp==aOp ) break;
+       pOp--;
+     }
+-    sqlite3DbFreeNN(db, aOp);
++    sqlite3DbNNFreeNN(db, aOp);
+   }
+ }
+ 
+@@ -82056,7 +85981,6 @@ SQLITE_PRIVATE void sqlite3VdbeReleaseRegisters(
+ }
+ #endif /* SQLITE_DEBUG */
+ 
+-
+ /*
+ ** Change the value of the P4 operand for a specific instruction.
+ ** This routine is useful when a large program is loaded from a
+@@ -82081,7 +86005,7 @@ static void SQLITE_NOINLINE vdbeChangeP4Full(
+   int n
+ ){
+   if( pOp->p4type ){
+-    freeP4(p->db, pOp->p4type, pOp->p4.p);
++    assert( pOp->p4type > P4_FREE_IF_LE );
+     pOp->p4type = 0;
+     pOp->p4.p = 0;
+   }
+@@ -82143,7 +86067,7 @@ SQLITE_PRIVATE void sqlite3VdbeAppendP4(Vdbe *p, void *pP4, int n){
+   if( p->db->mallocFailed ){
+     freeP4(p->db, n, pP4);
+   }else{
+-    assert( pP4!=0 );
++    assert( pP4!=0 || n==P4_DYNAMIC );
+     assert( p->nOp>0 );
+     pOp = &p->aOp[p->nOp-1];
+     assert( pOp->p4type==P4_NOTUSED );
+@@ -82205,13 +86129,13 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
+ ** Set the value if the iSrcLine field for the previously coded instruction.
+ */
+ SQLITE_PRIVATE void sqlite3VdbeSetLineNumber(Vdbe *v, int iLine){
+-  sqlite3VdbeGetOp(v,-1)->iSrcLine = iLine;
++  sqlite3VdbeGetLastOp(v)->iSrcLine = iLine;
+ }
+ #endif /* SQLITE_VDBE_COVERAGE */
+ 
+ /*
+-** Return the opcode for a given address.  If the address is -1, then
+-** return the most recently inserted opcode.
++** Return the opcode for a given address.  The address must be non-negative.
++** See sqlite3VdbeGetLastOp() to get the most recently added opcode.
+ **
+ ** If a memory allocation error has occurred prior to the calling of this
+ ** routine, then a pointer to a dummy VdbeOp will be returned.  That opcode
+@@ -82227,9 +86151,6 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
+   ** zeros, which is correct.  MSVC generates a warning, nevertheless. */
+   static VdbeOp dummy;  /* Ignore the MSVC warning about no initializer */
+   assert( p->eVdbeState==VDBE_INIT_STATE );
+-  if( addr<0 ){
+-    addr = p->nOp - 1;
+-  }
+   assert( (addr>=0 && addrnOp) || p->db->mallocFailed );
+   if( p->db->mallocFailed ){
+     return (VdbeOp*)&dummy;
+@@ -82238,6 +86159,12 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
+   }
+ }
+ 
++/* Return the most recently added opcode
++*/
++SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetLastOp(Vdbe *p){
++  return sqlite3VdbeGetOp(p, p->nOp - 1);
++}
++
+ #if defined(SQLITE_ENABLE_EXPLAIN_COMMENTS)
+ /*
+ ** Return an integer value for one of the parameters to the opcode pOp
+@@ -82725,7 +86652,7 @@ static void releaseMemArray(Mem *p, int N){
+         sqlite3VdbeMemRelease(p);
+         p->flags = MEM_Undefined;
+       }else if( p->szMalloc ){
+-        sqlite3DbFreeNN(db, p->zMalloc);
++        sqlite3DbNNFreeNN(db, p->zMalloc);
+         p->szMalloc = 0;
+         p->flags = MEM_Undefined;
+       }
+@@ -82939,7 +86866,6 @@ SQLITE_PRIVATE int sqlite3VdbeList(
+   ** sqlite3_column_text16(), causing a translation to UTF-16 encoding.
+   */
+   releaseMemArray(pMem, 8);
+-  p->pResultSet = 0;
+ 
+   if( p->rc==SQLITE_NOMEM ){
+     /* This happens if a malloc() inside a call to sqlite3_column_text() or
+@@ -82975,7 +86901,7 @@ SQLITE_PRIVATE int sqlite3VdbeList(
+         sqlite3VdbeMemSetInt64(pMem+1, pOp->p2);
+         sqlite3VdbeMemSetInt64(pMem+2, pOp->p3);
+         sqlite3VdbeMemSetStr(pMem+3, zP4, -1, SQLITE_UTF8, sqlite3_free);
+-        p->nResColumn = 4;
++        assert( p->nResColumn==4 );
+       }else{
+         sqlite3VdbeMemSetInt64(pMem+0, i);
+         sqlite3VdbeMemSetStr(pMem+1, (char*)sqlite3OpcodeName(pOp->opcode),
+@@ -82994,9 +86920,9 @@ SQLITE_PRIVATE int sqlite3VdbeList(
+         sqlite3VdbeMemSetNull(pMem+7);
+ #endif
+         sqlite3VdbeMemSetStr(pMem+5, zP4, -1, SQLITE_UTF8, sqlite3_free);
+-        p->nResColumn = 8;
++        assert( p->nResColumn==8 );
+       }
+-      p->pResultSet = pMem;
++      p->pResultRow = pMem;
+       if( db->mallocFailed ){
+         p->rc = SQLITE_NOMEM;
+         rc = SQLITE_ERROR;
+@@ -83107,7 +87033,7 @@ static void *allocSpace(
+ ** running it.
+ */
+ SQLITE_PRIVATE void sqlite3VdbeRewind(Vdbe *p){
+-#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
++#if defined(SQLITE_DEBUG)
+   int i;
+ #endif
+   assert( p!=0 );
+@@ -83136,8 +87062,8 @@ SQLITE_PRIVATE void sqlite3VdbeRewind(Vdbe *p){
+   p->nFkConstraint = 0;
+ #ifdef VDBE_PROFILE
+   for(i=0; inOp; i++){
+-    p->aOp[i].cnt = 0;
+-    p->aOp[i].cycles = 0;
++    p->aOp[i].nExec = 0;
++    p->aOp[i].nCycle = 0;
+   }
+ #endif
+ }
+@@ -83208,26 +87134,9 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
+   resolveP2Values(p, &nArg);
+   p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort);
+   if( pParse->explain ){
+-    static const char * const azColName[] = {
+-       "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment",
+-       "id", "parent", "notused", "detail"
+-    };
+-    int iFirst, mx, i;
+     if( nMem<10 ) nMem = 10;
+     p->explain = pParse->explain;
+-    if( pParse->explain==2 ){
+-      sqlite3VdbeSetNumCols(p, 4);
+-      iFirst = 8;
+-      mx = 12;
+-    }else{
+-      sqlite3VdbeSetNumCols(p, 8);
+-      iFirst = 0;
+-      mx = 8;
+-    }
+-    for(i=iFirst; inResColumn = 12 - 4*p->explain;
+   }
+   p->expired = 0;
+ 
+@@ -83246,9 +87155,6 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
+   p->aVar = allocSpace(&x, 0, nVar*sizeof(Mem));
+   p->apArg = allocSpace(&x, 0, nArg*sizeof(Mem*));
+   p->apCsr = allocSpace(&x, 0, nCursor*sizeof(VdbeCursor*));
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-  p->anExec = allocSpace(&x, 0, p->nOp*sizeof(i64));
+-#endif
+   if( x.nNeeded ){
+     x.pSpace = p->pFree = sqlite3DbMallocRawNN(db, x.nNeeded);
+     x.nFree = x.nNeeded;
+@@ -83257,9 +87163,6 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
+       p->aVar = allocSpace(&x, p->aVar, nVar*sizeof(Mem));
+       p->apArg = allocSpace(&x, p->apArg, nArg*sizeof(Mem*));
+       p->apCsr = allocSpace(&x, p->apCsr, nCursor*sizeof(VdbeCursor*));
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-      p->anExec = allocSpace(&x, p->anExec, p->nOp*sizeof(i64));
+-#endif
+     }
+   }
+ 
+@@ -83274,9 +87177,6 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
+     p->nMem = nMem;
+     initMemArray(p->aMem, nMem, db, MEM_Undefined);
+     memset(p->apCsr, 0, nCursor*sizeof(VdbeCursor*));
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-    memset(p->anExec, 0, p->nOp*sizeof(i64));
+-#endif
+   }
+   sqlite3VdbeRewind(p);
+ }
+@@ -83288,7 +87188,23 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
+ SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, VdbeCursor *pCx){
+   if( pCx ) sqlite3VdbeFreeCursorNN(p,pCx);
+ }
++static SQLITE_NOINLINE void freeCursorWithCache(Vdbe *p, VdbeCursor *pCx){
++  VdbeTxtBlbCache *pCache = pCx->pCache;
++  assert( pCx->colCache );
++  pCx->colCache = 0;
++  pCx->pCache = 0;
++  if( pCache->pCValue ){
++    sqlite3RCStrUnref(pCache->pCValue);
++    pCache->pCValue = 0;
++  }
++  sqlite3DbFree(p->db, pCache);
++  sqlite3VdbeFreeCursorNN(p, pCx);
++}
+ SQLITE_PRIVATE void sqlite3VdbeFreeCursorNN(Vdbe *p, VdbeCursor *pCx){
++  if( pCx->colCache ){
++    freeCursorWithCache(p, pCx);
++    return;
++  }
+   switch( pCx->eCurType ){
+     case CURTYPE_SORTER: {
+       sqlite3VdbeSorterClose(p->db, pCx);
+@@ -83334,9 +87250,6 @@ static void closeCursorsInFrame(Vdbe *p){
+ SQLITE_PRIVATE int sqlite3VdbeFrameRestore(VdbeFrame *pFrame){
+   Vdbe *v = pFrame->v;
+   closeCursorsInFrame(v);
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-  v->anExec = pFrame->anExec;
+-#endif
+   v->aOp = pFrame->aOp;
+   v->nOp = pFrame->nOp;
+   v->aMem = pFrame->aMem;
+@@ -83392,12 +87305,12 @@ SQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){
+   int n;
+   sqlite3 *db = p->db;
+ 
+-  if( p->nResColumn ){
+-    releaseMemArray(p->aColName, p->nResColumn*COLNAME_N);
++  if( p->nResAlloc ){
++    releaseMemArray(p->aColName, p->nResAlloc*COLNAME_N);
+     sqlite3DbFree(db, p->aColName);
+   }
+   n = nResColumn*COLNAME_N;
+-  p->nResColumn = (u16)nResColumn;
++  p->nResColumn = p->nResAlloc = (u16)nResColumn;
+   p->aColName = (Mem*)sqlite3DbMallocRawNN(db, sizeof(Mem)*n );
+   if( p->aColName==0 ) return;
+   initMemArray(p->aColName, n, db, MEM_Null);
+@@ -83422,14 +87335,14 @@ SQLITE_PRIVATE int sqlite3VdbeSetColName(
+ ){
+   int rc;
+   Mem *pColName;
+-  assert( idxnResColumn );
++  assert( idxnResAlloc );
+   assert( vardb->mallocFailed ){
+     assert( !zName || xDel!=SQLITE_DYNAMIC );
+     return SQLITE_NOMEM_BKPT;
+   }
+   assert( p->aColName!=0 );
+-  pColName = &(p->aColName[idx+var*p->nResColumn]);
++  pColName = &(p->aColName[idx+var*p->nResAlloc]);
+   rc = sqlite3VdbeMemSetStr(pColName, zName, -1, SQLITE_UTF8, xDel);
+   assert( rc!=0 || !zName || (pColName->flags&MEM_Term)!=0 );
+   return rc;
+@@ -83717,7 +87630,7 @@ static void checkActiveVdbeCnt(sqlite3 *db){
+       if( p->readOnly==0 ) nWrite++;
+       if( p->bIsReader ) nRead++;
+     }
+-    p = p->pNext;
++    p = p->pVNext;
+   }
+   assert( cnt==db->nVdbeActive );
+   assert( nWrite==db->nVdbeWrite );
+@@ -83942,6 +87855,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
+           sqlite3VdbeLeave(p);
+           return SQLITE_BUSY;
+         }else if( rc!=SQLITE_OK ){
++          sqlite3SystemError(db, rc);
+           p->rc = rc;
+           sqlite3RollbackAll(db, SQLITE_OK);
+           p->nChange = 0;
+@@ -83951,6 +87865,8 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
+           db->flags &= ~(u64)SQLITE_DeferFKs;
+           sqlite3CommitInternalChanges(db);
+         }
++      }else if( p->rc==SQLITE_SCHEMA && db->nVdbeActive>1 ){
++        p->nChange = 0;
+       }else{
+         sqlite3RollbackAll(db, SQLITE_OK);
+         p->nChange = 0;
+@@ -84140,7 +88056,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
+     sqlite3DbFree(db, p->zErrMsg);
+     p->zErrMsg = 0;
+   }
+-  p->pResultSet = 0;
++  p->pResultRow = 0;
+ #ifdef SQLITE_DEBUG
+   p->nWrite = 0;
+ #endif
+@@ -84168,10 +88084,12 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
+       }
+       for(i=0; inOp; i++){
+         char zHdr[100];
++        i64 cnt = p->aOp[i].nExec;
++        i64 cycles = p->aOp[i].nCycle;
+         sqlite3_snprintf(sizeof(zHdr), zHdr, "%6u %12llu %8llu ",
+-           p->aOp[i].cnt,
+-           p->aOp[i].cycles,
+-           p->aOp[i].cnt>0 ? p->aOp[i].cycles/p->aOp[i].cnt : 0
++           cnt,
++           cycles,
++           cnt>0 ? cycles/cnt : 0
+         );
+         fprintf(out, "%s", zHdr);
+         sqlite3VdbePrintOp(out, i, &p->aOp[i]);
+@@ -84246,10 +88164,11 @@ SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(sqlite3 *db, AuxData **pp, int iOp,
+ */
+ static void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){
+   SubProgram *pSub, *pNext;
++  assert( db!=0 );
+   assert( p->db==0 || p->db==db );
+   if( p->aColName ){
+-    releaseMemArray(p->aColName, p->nResColumn*COLNAME_N);
+-    sqlite3DbFreeNN(db, p->aColName);
++    releaseMemArray(p->aColName, p->nResAlloc*COLNAME_N);
++    sqlite3DbNNFreeNN(db, p->aColName);
+   }
+   for(pSub=p->pProgram; pSub; pSub=pNext){
+     pNext = pSub->pNext;
+@@ -84258,17 +88177,17 @@ static void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){
+   }
+   if( p->eVdbeState!=VDBE_INIT_STATE ){
+     releaseMemArray(p->aVar, p->nVar);
+-    if( p->pVList ) sqlite3DbFreeNN(db, p->pVList);
+-    if( p->pFree ) sqlite3DbFreeNN(db, p->pFree);
++    if( p->pVList ) sqlite3DbNNFreeNN(db, p->pVList);
++    if( p->pFree ) sqlite3DbNNFreeNN(db, p->pFree);
+   }
+   vdbeFreeOpArray(db, p->aOp, p->nOp);
+-  sqlite3DbFree(db, p->zSql);
++  if( p->zSql ) sqlite3DbNNFreeNN(db, p->zSql);
+ #ifdef SQLITE_ENABLE_NORMALIZE
+   sqlite3DbFree(db, p->zNormSql);
+   {
+-    DblquoteStr *pThis, *pNext;
+-    for(pThis=p->pDblStr; pThis; pThis=pNext){
+-      pNext = pThis->pNextStr;
++    DblquoteStr *pThis, *pNxt;
++    for(pThis=p->pDblStr; pThis; pThis=pNxt){
++      pNxt = pThis->pNextStr;
+       sqlite3DbFree(db, pThis);
+     }
+   }
+@@ -84292,20 +88211,17 @@ SQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe *p){
+ 
+   assert( p!=0 );
+   db = p->db;
++  assert( db!=0 );
+   assert( sqlite3_mutex_held(db->mutex) );
+   sqlite3VdbeClearObject(db, p);
+   if( db->pnBytesFreed==0 ){
+-    if( p->pPrev ){
+-      p->pPrev->pNext = p->pNext;
+-    }else{
+-      assert( db->pVdbe==p );
+-      db->pVdbe = p->pNext;
+-    }
+-    if( p->pNext ){
+-      p->pNext->pPrev = p->pPrev;
++    assert( p->ppVPrev!=0 );
++    *p->ppVPrev = p->pVNext;
++    if( p->pVNext ){
++      p->pVNext->ppVPrev = p->ppVPrev;
+     }
+   }
+-  sqlite3DbFreeNN(db, p);
++  sqlite3DbNNFreeNN(db, p);
+ }
+ 
+ /*
+@@ -84851,6 +88767,15 @@ static int vdbeRecordCompareDebug(
+     if( d1+(u64)serial_type1+2>(u64)nKey1
+      && d1+(u64)sqlite3VdbeSerialTypeLen(serial_type1)>(u64)nKey1
+     ){
++      if( serial_type1>=1
++       && serial_type1<=7
++       && d1+(u64)sqlite3VdbeSerialTypeLen(serial_type1)<=(u64)nKey1+8
++       && CORRUPT_DB
++      ){
++        return 1;  /* corrupt record not detected by
++                   ** sqlite3VdbeRecordCompareWithSkip().  Return true
++                   ** to avoid firing the assert() */
++      }
+       break;
+     }
+ 
+@@ -85019,20 +88944,33 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3BlobCompare(const Mem *pB1, const Mem
+   return n1 - n2;
+ }
+ 
++/* The following two functions are used only within testcase() to prove
++** test coverage.  These functions do no exist for production builds.
++** We must use separate SQLITE_NOINLINE functions here, since otherwise
++** optimizer code movement causes gcov to become very confused.
++*/
++#if  defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_DEBUG)
++static int SQLITE_NOINLINE doubleLt(double a, double b){ return a8 ){
++  if( sqlite3IsNaN(r) ){
++    /* SQLite considers NaN to be a NULL. And all integer values are greater
++    ** than NULL */
++    return 1;
++  }
++  if( sqlite3Config.bUseLongDouble ){
+     LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i;
+     testcase( xr );
+     testcase( x==r );
+-    if( xr ) return +1;  /*NO_TEST*/ /* work around bugs in gcov */
+-    return 0;             /*NO_TEST*/ /* work around bugs in gcov */
++    return (xr);
+   }else{
+     i64 y;
+     double s;
+@@ -85042,9 +88980,10 @@ SQLITE_PRIVATE int sqlite3IntFloatCompare(i64 i, double r){
+     if( iy ) return +1;
+     s = (double)i;
+-    if( sr ) return +1;
+-    return 0;
++    testcase( doubleLt(s,r) );
++    testcase( doubleLt(r,s) );
++    testcase( doubleEq(r,s) );
++    return (sr);
+   }
+ }
+ 
+@@ -85260,7 +89199,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
+   assert( pPKey2->pKeyInfo->aSortFlags!=0 );
+   assert( pPKey2->pKeyInfo->nKeyField>0 );
+   assert( idx1<=szHdr1 || CORRUPT_DB );
+-  do{
++  while( 1 /*exit-by-break*/ ){
+     u32 serial_type;
+ 
+     /* RHS is an integer */
+@@ -85270,7 +89209,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
+       serial_type = aKey1[idx1];
+       testcase( serial_type==12 );
+       if( serial_type>=10 ){
+-        rc = +1;
++        rc = serial_type==10 ? -1 : +1;
+       }else if( serial_type==0 ){
+         rc = -1;
+       }else if( serial_type==7 ){
+@@ -85294,8 +89233,8 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
+         /* Serial types 12 or greater are strings and blobs (greater than
+         ** numbers). Types 10 and 11 are currently "reserved for future
+         ** use", so it doesn't really matter what the results of comparing
+-        ** them to numberic values are.  */
+-        rc = +1;
++        ** them to numeric values are.  */
++        rc = serial_type==10 ? -1 : +1;
+       }else if( serial_type==0 ){
+         rc = -1;
+       }else{
+@@ -85376,7 +89315,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
+     /* RHS is null */
+     else{
+       serial_type = aKey1[idx1];
+-      rc = (serial_type!=0);
++      rc = (serial_type!=0 && serial_type!=10);
+     }
+ 
+     if( rc!=0 ){
+@@ -85398,8 +89337,13 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
+     if( i==pPKey2->nField ) break;
+     pRhs++;
+     d1 += sqlite3VdbeSerialTypeLen(serial_type);
++    if( d1>(unsigned)nKey1 ) break;
+     idx1 += sqlite3VarintLen(serial_type);
+-  }while( idx1<(unsigned)szHdr1 && d1<=(unsigned)nKey1 );
++    if( idx1>=(unsigned)szHdr1 ){
++      pPKey2->errCode = (u8)SQLITE_CORRUPT_BKPT;
++      return 0;  /* Corrupt index */
++    }
++  }
+ 
+   /* No memory allocation is ever used on mem1.  Prove this using
+   ** the following assert().  If the assert() fails, it indicates a
+@@ -85800,7 +89744,7 @@ SQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe *v){
+ */
+ SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3 *db, int iCode){
+   Vdbe *p;
+-  for(p = db->pVdbe; p; p=p->pNext){
++  for(p = db->pVdbe; p; p=p->pVNext){
+     p->expired = iCode+1;
+   }
+ }
+@@ -85893,6 +89837,20 @@ SQLITE_PRIVATE int sqlite3NotPureFunc(sqlite3_context *pCtx){
+   return 1;
+ }
+ 
++#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
++/*
++** This Walker callback is used to help verify that calls to
++** sqlite3BtreeCursorHint() with opcode BTREE_HINT_RANGE have
++** byte-code register values correctly initialized.
++*/
++SQLITE_PRIVATE int sqlite3CursorRangeHintExprCheck(Walker *pWalker, Expr *pExpr){
++  if( pExpr->op==TK_REGISTER ){
++    assert( (pWalker->u.aMem[pExpr->iTable].flags & MEM_Undefined)==0 );
++  }
++  return WRC_Continue;
++}
++#endif /* SQLITE_ENABLE_CURSOR_HINTS && SQLITE_DEBUG */
++
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ /*
+ ** Transfer error message text from an sqlite3_vtab.zErrMsg (text stored
+@@ -85921,13 +89879,14 @@ SQLITE_PRIVATE void sqlite3VtabImportErrmsg(Vdbe *p, sqlite3_vtab *pVtab){
+ ** the vdbeUnpackRecord() function found in vdbeapi.c.
+ */
+ static void vdbeFreeUnpacked(sqlite3 *db, int nField, UnpackedRecord *p){
++  assert( db!=0 );
+   if( p ){
+     int i;
+     for(i=0; iaMem[i];
+       if( pMem->zMalloc ) sqlite3VdbeMemReleaseMalloc(pMem);
+     }
+-    sqlite3DbFreeNN(db, p);
++    sqlite3DbNNFreeNN(db, p);
+   }
+ }
+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
+@@ -85954,6 +89913,16 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
+   PreUpdate preupdate;
+   const char *zTbl = pTab->zName;
+   static const u8 fakeSortOrder = 0;
++#ifdef SQLITE_DEBUG
++  int nRealCol;
++  if( pTab->tabFlags & TF_WithoutRowid ){
++    nRealCol = sqlite3PrimaryKeyIndex(pTab)->nColumn;
++  }else if( pTab->tabFlags & TF_HasVirtual ){
++    nRealCol = pTab->nNVCol;
++  }else{
++    nRealCol = pTab->nCol;
++  }
++#endif
+ 
+   assert( db->pPreUpdate==0 );
+   memset(&preupdate, 0, sizeof(PreUpdate));
+@@ -85970,8 +89939,8 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
+ 
+   assert( pCsr!=0 );
+   assert( pCsr->eCurType==CURTYPE_BTREE );
+-  assert( pCsr->nField==pTab->nCol
+-       || (pCsr->nField==pTab->nCol+1 && op==SQLITE_DELETE && iReg==-1)
++  assert( pCsr->nField==nRealCol
++       || (pCsr->nField==nRealCol+1 && op==SQLITE_DELETE && iReg==-1)
+   );
+ 
+   preupdate.v = v;
+@@ -85998,7 +89967,7 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
+     for(i=0; inField; i++){
+       sqlite3VdbeMemRelease(&preupdate.aNew[i]);
+     }
+-    sqlite3DbFreeNN(db, preupdate.aNew);
++    sqlite3DbNNFreeNN(db, preupdate.aNew);
+   }
+ }
+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
+@@ -86022,6 +89991,7 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
+ */
+ /* #include "sqliteInt.h" */
+ /* #include "vdbeInt.h" */
++/* #include "opcodes.h" */
+ 
+ #ifndef SQLITE_OMIT_DEPRECATED
+ /*
+@@ -86115,7 +90085,9 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt){
+     if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
+     sqlite3_mutex_enter(db->mutex);
+     checkProfileCallback(db, v);
+-    rc = sqlite3VdbeFinalize(v);
++    assert( v->eVdbeState>=VDBE_READY_STATE );
++    rc = sqlite3VdbeReset(v);
++    sqlite3VdbeDelete(v);
+     rc = sqlite3ApiExit(db, rc);
+     sqlite3LeaveMutexAndCloseZombie(db);
+   }
+@@ -86156,7 +90128,15 @@ SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt *pStmt){
+   int rc = SQLITE_OK;
+   Vdbe *p = (Vdbe*)pStmt;
+ #if SQLITE_THREADSAFE
+-  sqlite3_mutex *mutex = ((Vdbe*)pStmt)->db->mutex;
++  sqlite3_mutex *mutex;
++#endif
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pStmt==0 ){
++    return SQLITE_MISUSE_BKPT;
++  }
++#endif
++#if SQLITE_THREADSAFE
++  mutex = p->db->mutex;
+ #endif
+   sqlite3_mutex_enter(mutex);
+   for(i=0; inVar; i++){
+@@ -86275,7 +90255,7 @@ SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
+      SQLITE_NULL,     /* 0x1f (not possible) */
+      SQLITE_FLOAT,    /* 0x20 INTREAL */
+      SQLITE_NULL,     /* 0x21 (not possible) */
+-     SQLITE_TEXT,     /* 0x22 INTREAL + TEXT */
++     SQLITE_FLOAT,    /* 0x22 INTREAL + TEXT */
+      SQLITE_NULL,     /* 0x23 (not possible) */
+      SQLITE_FLOAT,    /* 0x24 (not possible) */
+      SQLITE_NULL,     /* 0x25 (not possible) */
+@@ -86323,6 +90303,9 @@ SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
+ #endif
+   return aType[pVal->flags&MEM_AffMask];
+ }
++SQLITE_API int sqlite3_value_encoding(sqlite3_value *pVal){
++  return pVal->enc;
++}
+ 
+ /* Return true if a parameter to xUpdate represents an unchanged column */
+ SQLITE_API int sqlite3_value_nochange(sqlite3_value *pVal){
+@@ -86376,7 +90359,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value *pOld){
+ ** is too big or if an OOM occurs.
+ **
+ ** The invokeValueDestructor(P,X) routine invokes destructor function X()
+-** on value P is not going to be used and need to be destroyed.
++** on value P if P is not going to be used and need to be destroyed.
+ */
+ static void setResultStrOrError(
+   sqlite3_context *pCtx,  /* Function context */
+@@ -86406,7 +90389,7 @@ static void setResultStrOrError(
+ static int invokeValueDestructor(
+   const void *p,             /* Value to destroy */
+   void (*xDel)(void*),       /* The destructor */
+-  sqlite3_context *pCtx      /* Set a SQLITE_TOOBIG error if no NULL */
++  sqlite3_context *pCtx      /* Set a SQLITE_TOOBIG error if not NULL */
+ ){
+   assert( xDel!=SQLITE_DYNAMIC );
+   if( xDel==0 ){
+@@ -86416,7 +90399,14 @@ static int invokeValueDestructor(
+   }else{
+     xDel((void*)p);
+   }
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx!=0 ){
++    sqlite3_result_error_toobig(pCtx);
++  }
++#else
++  assert( pCtx!=0 );
+   sqlite3_result_error_toobig(pCtx);
++#endif
+   return SQLITE_TOOBIG;
+ }
+ SQLITE_API void sqlite3_result_blob(
+@@ -86425,6 +90415,12 @@ SQLITE_API void sqlite3_result_blob(
+   int n,
+   void (*xDel)(void *)
+ ){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 || n<0 ){
++    invokeValueDestructor(z, xDel, pCtx);
++    return;
++  }
++#endif
+   assert( n>=0 );
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   setResultStrOrError(pCtx, z, n, 0, xDel);
+@@ -86435,8 +90431,14 @@ SQLITE_API void sqlite3_result_blob64(
+   sqlite3_uint64 n,
+   void (*xDel)(void *)
+ ){
+-  assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   assert( xDel!=SQLITE_DYNAMIC );
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ){
++    invokeValueDestructor(z, xDel, 0);
++    return;
++  }
++#endif
++  assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   if( n>0x7fffffff ){
+     (void)invokeValueDestructor(z, xDel, pCtx);
+   }else{
+@@ -86444,30 +90446,48 @@ SQLITE_API void sqlite3_result_blob64(
+   }
+ }
+ SQLITE_API void sqlite3_result_double(sqlite3_context *pCtx, double rVal){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemSetDouble(pCtx->pOut, rVal);
+ }
+ SQLITE_API void sqlite3_result_error(sqlite3_context *pCtx, const char *z, int n){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   pCtx->isError = SQLITE_ERROR;
+   sqlite3VdbeMemSetStr(pCtx->pOut, z, n, SQLITE_UTF8, SQLITE_TRANSIENT);
+ }
+ #ifndef SQLITE_OMIT_UTF16
+ SQLITE_API void sqlite3_result_error16(sqlite3_context *pCtx, const void *z, int n){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   pCtx->isError = SQLITE_ERROR;
+   sqlite3VdbeMemSetStr(pCtx->pOut, z, n, SQLITE_UTF16NATIVE, SQLITE_TRANSIENT);
+ }
+ #endif
+ SQLITE_API void sqlite3_result_int(sqlite3_context *pCtx, int iVal){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemSetInt64(pCtx->pOut, (i64)iVal);
+ }
+ SQLITE_API void sqlite3_result_int64(sqlite3_context *pCtx, i64 iVal){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemSetInt64(pCtx->pOut, iVal);
+ }
+ SQLITE_API void sqlite3_result_null(sqlite3_context *pCtx){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemSetNull(pCtx->pOut);
+ }
+@@ -86477,14 +90497,37 @@ SQLITE_API void sqlite3_result_pointer(
+   const char *zPType,
+   void (*xDestructor)(void*)
+ ){
+-  Mem *pOut = pCtx->pOut;
++  Mem *pOut;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ){
++    invokeValueDestructor(pPtr, xDestructor, 0);
++    return;
++  }
++#endif
++  pOut = pCtx->pOut;
+   assert( sqlite3_mutex_held(pOut->db->mutex) );
+   sqlite3VdbeMemRelease(pOut);
+   pOut->flags = MEM_Null;
+   sqlite3VdbeMemSetPointer(pOut, pPtr, zPType, xDestructor);
+ }
+ SQLITE_API void sqlite3_result_subtype(sqlite3_context *pCtx, unsigned int eSubtype){
+-  Mem *pOut = pCtx->pOut;
++  Mem *pOut;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
++#if defined(SQLITE_STRICT_SUBTYPE) && SQLITE_STRICT_SUBTYPE+0!=0
++  if( pCtx->pFunc!=0
++   && (pCtx->pFunc->funcFlags & SQLITE_RESULT_SUBTYPE)==0
++  ){
++    char zErr[200];
++    sqlite3_snprintf(sizeof(zErr), zErr,
++                     "misuse of sqlite3_result_subtype() by %s()",
++                     pCtx->pFunc->zName);
++    sqlite3_result_error(pCtx, zErr, -1);
++    return;
++  }
++#endif /* SQLITE_STRICT_SUBTYPE */
++  pOut = pCtx->pOut;
+   assert( sqlite3_mutex_held(pOut->db->mutex) );
+   pOut->eSubtype = eSubtype & 0xff;
+   pOut->flags |= MEM_Subtype;
+@@ -86495,6 +90538,12 @@ SQLITE_API void sqlite3_result_text(
+   int n,
+   void (*xDel)(void *)
+ ){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ){
++    invokeValueDestructor(z, xDel, 0);
++    return;
++  }
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   setResultStrOrError(pCtx, z, n, SQLITE_UTF8, xDel);
+ }
+@@ -86505,13 +90554,23 @@ SQLITE_API void sqlite3_result_text64(
+   void (*xDel)(void *),
+   unsigned char enc
+ ){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ){
++    invokeValueDestructor(z, xDel, 0);
++    return;
++  }
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   assert( xDel!=SQLITE_DYNAMIC );
+-  if( enc==SQLITE_UTF16 ) enc = SQLITE_UTF16NATIVE;
++  if( enc!=SQLITE_UTF8 ){
++    if( enc==SQLITE_UTF16 ) enc = SQLITE_UTF16NATIVE;
++    n &= ~(u64)1;
++  }
+   if( n>0x7fffffff ){
+     (void)invokeValueDestructor(z, xDel, pCtx);
+   }else{
+     setResultStrOrError(pCtx, z, (int)n, enc, xDel);
++    sqlite3VdbeMemZeroTerminateIfAble(pCtx->pOut);
+   }
+ }
+ #ifndef SQLITE_OMIT_UTF16
+@@ -86522,7 +90581,7 @@ SQLITE_API void sqlite3_result_text16(
+   void (*xDel)(void *)
+ ){
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+-  setResultStrOrError(pCtx, z, n, SQLITE_UTF16NATIVE, xDel);
++  setResultStrOrError(pCtx, z, n & ~(u64)1, SQLITE_UTF16NATIVE, xDel);
+ }
+ SQLITE_API void sqlite3_result_text16be(
+   sqlite3_context *pCtx,
+@@ -86531,7 +90590,7 @@ SQLITE_API void sqlite3_result_text16be(
+   void (*xDel)(void *)
+ ){
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+-  setResultStrOrError(pCtx, z, n, SQLITE_UTF16BE, xDel);
++  setResultStrOrError(pCtx, z, n & ~(u64)1, SQLITE_UTF16BE, xDel);
+ }
+ SQLITE_API void sqlite3_result_text16le(
+   sqlite3_context *pCtx,
+@@ -86540,11 +90599,20 @@ SQLITE_API void sqlite3_result_text16le(
+   void (*xDel)(void *)
+ ){
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+-  setResultStrOrError(pCtx, z, n, SQLITE_UTF16LE, xDel);
++  setResultStrOrError(pCtx, z, n & ~(u64)1, SQLITE_UTF16LE, xDel);
+ }
+ #endif /* SQLITE_OMIT_UTF16 */
+ SQLITE_API void sqlite3_result_value(sqlite3_context *pCtx, sqlite3_value *pValue){
+-  Mem *pOut = pCtx->pOut;
++  Mem *pOut;
++
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++  if( pValue==0 ){
++    sqlite3_result_null(pCtx);
++    return;
++  }
++#endif
++  pOut = pCtx->pOut;
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemCopy(pOut, pValue);
+   sqlite3VdbeChangeEncoding(pOut, pCtx->enc);
+@@ -86556,7 +90624,12 @@ SQLITE_API void sqlite3_result_zeroblob(sqlite3_context *pCtx, int n){
+   sqlite3_result_zeroblob64(pCtx, n>0 ? n : 0);
+ }
+ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context *pCtx, u64 n){
+-  Mem *pOut = pCtx->pOut;
++  Mem *pOut;
++
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return SQLITE_MISUSE_BKPT;
++#endif
++  pOut = pCtx->pOut;
+   assert( sqlite3_mutex_held(pOut->db->mutex) );
+   if( n>(u64)pOut->db->aLimit[SQLITE_LIMIT_LENGTH] ){
+     sqlite3_result_error_toobig(pCtx);
+@@ -86570,6 +90643,9 @@ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context *pCtx, u64 n){
+ #endif
+ }
+ SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   pCtx->isError = errCode ? errCode : -1;
+ #ifdef SQLITE_DEBUG
+   if( pCtx->pVdbe ) pCtx->pVdbe->rcApp = errCode;
+@@ -86582,6 +90658,9 @@ SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
+ 
+ /* Force an SQLITE_TOOBIG error. */
+ SQLITE_API void sqlite3_result_error_toobig(sqlite3_context *pCtx){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   pCtx->isError = SQLITE_TOOBIG;
+   sqlite3VdbeMemSetStr(pCtx->pOut, "string or blob too big", -1,
+@@ -86590,6 +90669,9 @@ SQLITE_API void sqlite3_result_error_toobig(sqlite3_context *pCtx){
+ 
+ /* An SQLITE_NOMEM error. */
+ SQLITE_API void sqlite3_result_error_nomem(sqlite3_context *pCtx){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+   sqlite3VdbeMemSetNull(pCtx->pOut);
+   pCtx->isError = SQLITE_NOMEM_BKPT;
+@@ -86751,7 +90833,7 @@ static int sqlite3Step(Vdbe *p){
+     /* If the statement completed successfully, invoke the profile callback */
+     checkProfileCallback(db, p);
+ #endif
+-
++    p->pResultRow = 0;
+     if( rc==SQLITE_DONE && db->autoCommit ){
+       assert( p->rc==SQLITE_OK );
+       p->rc = doWalCallbacks(db);
+@@ -86842,6 +90924,9 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
+ ** pointer to it.
+ */
+ SQLITE_API void *sqlite3_user_data(sqlite3_context *p){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( p==0 ) return 0;
++#endif
+   assert( p && p->pFunc );
+   return p->pFunc->pUserData;
+ }
+@@ -86857,7 +90942,11 @@ SQLITE_API void *sqlite3_user_data(sqlite3_context *p){
+ ** application defined function.
+ */
+ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context *p){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( p==0 ) return 0;
++#else
+   assert( p && p->pOut );
++#endif
+   return p->pOut->db;
+ }
+ 
+@@ -86876,10 +90965,25 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context *p){
+ ** value, as a signal to the xUpdate routine that the column is unchanged.
+ */
+ SQLITE_API int sqlite3_vtab_nochange(sqlite3_context *p){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( p==0 ) return 0;
++#else
+   assert( p );
++#endif
+   return sqlite3_value_nochange(p->pOut);
+ }
+ 
++/*
++** The destructor function for a ValueList object.  This needs to be
++** a separate function, unknowable to the application, to ensure that
++** calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
++** preceded by activation of IN processing via sqlite3_vtab_int() do not
++** try to access a fake ValueList object inserted by a hostile extension.
++*/
++SQLITE_PRIVATE void sqlite3VdbeValueListFree(void *pToDelete){
++  sqlite3_free(pToDelete);
++}
++
+ /*
+ ** Implementation of sqlite3_vtab_in_first() (if bNext==0) and
+ ** sqlite3_vtab_in_next() (if bNext!=0).
+@@ -86893,9 +90997,16 @@ static int valueFromValueList(
+   ValueList *pRhs;
+ 
+   *ppOut = 0;
+-  if( pVal==0 ) return SQLITE_MISUSE;
+-  pRhs = (ValueList*)sqlite3_value_pointer(pVal, "ValueList");
+-  if( pRhs==0 ) return SQLITE_MISUSE;
++  if( pVal==0 ) return SQLITE_MISUSE_BKPT;
++  if( (pVal->flags & MEM_Dyn)==0 || pVal->xDel!=sqlite3VdbeValueListFree ){
++    return SQLITE_ERROR;
++  }else{
++    assert( (pVal->flags&(MEM_TypeMask|MEM_Term|MEM_Subtype)) ==
++                 (MEM_Null|MEM_Term|MEM_Subtype) );
++    assert( pVal->eSubtype=='p' );
++    assert( pVal->u.zPType!=0 && strcmp(pVal->u.zPType,"ValueList")==0 );
++    pRhs = (ValueList*)pVal->z;
++  }
+   if( bNext ){
+     rc = sqlite3BtreeNext(pRhs->pCsr, 0);
+   }else{
+@@ -87017,6 +91128,9 @@ SQLITE_API void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
+ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
+   AuxData *pAuxData;
+ 
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return 0;
++#endif
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+ #if SQLITE_ENABLE_STAT4
+   if( pCtx->pVdbe==0 ) return 0;
+@@ -87049,8 +91163,12 @@ SQLITE_API void sqlite3_set_auxdata(
+   void (*xDelete)(void*)
+ ){
+   AuxData *pAuxData;
+-  Vdbe *pVdbe = pCtx->pVdbe;
++  Vdbe *pVdbe;
+ 
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pCtx==0 ) return;
++#endif
++  pVdbe= pCtx->pVdbe;
+   assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
+ #ifdef SQLITE_ENABLE_STAT4
+   if( pVdbe==0 ) goto failed;
+@@ -87106,7 +91224,8 @@ SQLITE_API int sqlite3_aggregate_count(sqlite3_context *p){
+ */
+ SQLITE_API int sqlite3_column_count(sqlite3_stmt *pStmt){
+   Vdbe *pVm = (Vdbe *)pStmt;
+-  return pVm ? pVm->nResColumn : 0;
++  if( pVm==0 ) return 0;
++  return pVm->nResColumn;
+ }
+ 
+ /*
+@@ -87115,7 +91234,7 @@ SQLITE_API int sqlite3_column_count(sqlite3_stmt *pStmt){
+ */
+ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt){
+   Vdbe *pVm = (Vdbe *)pStmt;
+-  if( pVm==0 || pVm->pResultSet==0 ) return 0;
++  if( pVm==0 || pVm->pResultRow==0 ) return 0;
+   return pVm->nResColumn;
+ }
+ 
+@@ -87170,8 +91289,8 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){
+   if( pVm==0 ) return (Mem*)columnNullValue();
+   assert( pVm->db );
+   sqlite3_mutex_enter(pVm->db->mutex);
+-  if( pVm->pResultSet!=0 && inResColumn && i>=0 ){
+-    pOut = &pVm->pResultSet[i];
++  if( pVm->pResultRow!=0 && inResColumn && i>=0 ){
++    pOut = &pVm->pResultRow[i];
+   }else{
+     sqlite3Error(pVm->db, SQLITE_RANGE);
+     pOut = (Mem*)columnNullValue();
+@@ -87195,7 +91314,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){
+ **     sqlite3_column_real()
+ **     sqlite3_column_bytes()
+ **     sqlite3_column_bytes16()
+-**     sqiite3_column_blob()
++**     sqlite3_column_blob()
+ */
+ static void columnMallocFailure(sqlite3_stmt *pStmt)
+ {
+@@ -87279,6 +91398,32 @@ SQLITE_API int sqlite3_column_type(sqlite3_stmt *pStmt, int i){
+   return iType;
+ }
+ 
++/*
++** Column names appropriate for EXPLAIN or EXPLAIN QUERY PLAN.
++*/
++static const char * const azExplainColNames8[] = {
++   "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment",  /* EXPLAIN */
++   "id", "parent", "notused", "detail"                         /* EQP */
++};
++static const u16 azExplainColNames16data[] = {
++  /*   0 */  'a', 'd', 'd', 'r',                0,
++  /*   5 */  'o', 'p', 'c', 'o', 'd', 'e',      0,
++  /*  12 */  'p', '1',                          0,
++  /*  15 */  'p', '2',                          0,
++  /*  18 */  'p', '3',                          0,
++  /*  21 */  'p', '4',                          0,
++  /*  24 */  'p', '5',                          0,
++  /*  27 */  'c', 'o', 'm', 'm', 'e', 'n', 't', 0,
++  /*  35 */  'i', 'd',                          0,
++  /*  38 */  'p', 'a', 'r', 'e', 'n', 't',      0,
++  /*  45 */  'n', 'o', 't', 'u', 's', 'e', 'd', 0,
++  /*  53 */  'd', 'e', 't', 'a', 'i', 'l',      0
++};
++static const u8 iExplainColNames16[] = {
++  0, 5, 12, 15, 18, 21, 24, 27,
++  35, 38, 45, 53
++};
++
+ /*
+ ** Convert the N-th element of pStmt->pColName[] into a string using
+ ** xFunc() then return that string.  If N is out of range, return 0.
+@@ -87311,15 +91456,29 @@ static const void *columnName(
+     return 0;
+   }
+ #endif
++  if( N<0 ) return 0;
+   ret = 0;
+   p = (Vdbe *)pStmt;
+   db = p->db;
+   assert( db!=0 );
+-  n = sqlite3_column_count(pStmt);
+-  if( N=0 ){
++  sqlite3_mutex_enter(db->mutex);
++
++  if( p->explain ){
++    if( useType>0 ) goto columnName_end;
++    n = p->explain==1 ? 8 : 4;
++    if( N>=n ) goto columnName_end;
++    if( useUtf16 ){
++      int i = iExplainColNames16[N + 8*p->explain - 8];
++      ret = (void*)&azExplainColNames16data[i];
++    }else{
++      ret = (void*)azExplainColNames8[N + 8*p->explain - 8];
++    }
++    goto columnName_end;
++  }
++  n = p->nResColumn;
++  if( NmallocFailed;
+     N += useType*n;
+-    sqlite3_mutex_enter(db->mutex);
+-    assert( db->mallocFailed==0 );
+ #ifndef SQLITE_OMIT_UTF16
+     if( useUtf16 ){
+       ret = sqlite3_value_text16((sqlite3_value*)&p->aColName[N]);
+@@ -87331,12 +91490,14 @@ static const void *columnName(
+     /* A malloc may have failed inside of the _text() call. If this
+     ** is the case, clear the mallocFailed flag and return NULL.
+     */
+-    if( db->mallocFailed ){
++    assert( db->mallocFailed==0 || db->mallocFailed==1 );
++    if( db->mallocFailed > prior_mallocFailed ){
+       sqlite3OomClear(db);
+       ret = 0;
+     }
+-    sqlite3_mutex_leave(db->mutex);
+   }
++columnName_end:
++  sqlite3_mutex_leave(db->mutex);
+   return ret;
+ }
+ 
+@@ -87429,7 +91590,7 @@ SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){
+ /*
+ ** Unbind the value bound to variable i in virtual machine p. This is the
+ ** the same as binding a NULL value to the column. If the "i" parameter is
+-** out of range, then SQLITE_RANGE is returned. Othewise SQLITE_OK.
++** out of range, then SQLITE_RANGE is returned. Otherwise SQLITE_OK.
+ **
+ ** A successful evaluation of this routine acquires the mutex on p.
+ ** the mutex is released if any kind of error occurs.
+@@ -87437,25 +91598,24 @@ SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){
+ ** The error code stored in database p->db is overwritten with the return
+ ** value in any case.
+ */
+-static int vdbeUnbind(Vdbe *p, int i){
++static int vdbeUnbind(Vdbe *p, unsigned int i){
+   Mem *pVar;
+   if( vdbeSafetyNotNull(p) ){
+     return SQLITE_MISUSE_BKPT;
+   }
+   sqlite3_mutex_enter(p->db->mutex);
+   if( p->eVdbeState!=VDBE_READY_STATE ){
+-    sqlite3Error(p->db, SQLITE_MISUSE);
++    sqlite3Error(p->db, SQLITE_MISUSE_BKPT);
+     sqlite3_mutex_leave(p->db->mutex);
+     sqlite3_log(SQLITE_MISUSE,
+         "bind on a busy prepared statement: [%s]", p->zSql);
+     return SQLITE_MISUSE_BKPT;
+   }
+-  if( i<1 || i>p->nVar ){
++  if( i>=(unsigned int)p->nVar ){
+     sqlite3Error(p->db, SQLITE_RANGE);
+     sqlite3_mutex_leave(p->db->mutex);
+     return SQLITE_RANGE;
+   }
+-  i--;
+   pVar = &p->aVar[i];
+   sqlite3VdbeMemRelease(pVar);
+   pVar->flags = MEM_Null;
+@@ -87492,7 +91652,7 @@ static int bindText(
+   Mem *pVar;
+   int rc;
+ 
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+     if( zData!=0 ){
+       pVar = &p->aVar[i-1];
+@@ -87541,7 +91701,7 @@ SQLITE_API int sqlite3_bind_blob64(
+ SQLITE_API int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){
+   int rc;
+   Vdbe *p = (Vdbe *)pStmt;
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+     sqlite3VdbeMemSetDouble(&p->aVar[i-1], rValue);
+     sqlite3_mutex_leave(p->db->mutex);
+@@ -87554,7 +91714,7 @@ SQLITE_API int sqlite3_bind_int(sqlite3_stmt *p, int i, int iValue){
+ SQLITE_API int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValue){
+   int rc;
+   Vdbe *p = (Vdbe *)pStmt;
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+     sqlite3VdbeMemSetInt64(&p->aVar[i-1], iValue);
+     sqlite3_mutex_leave(p->db->mutex);
+@@ -87564,7 +91724,7 @@ SQLITE_API int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValu
+ SQLITE_API int sqlite3_bind_null(sqlite3_stmt *pStmt, int i){
+   int rc;
+   Vdbe *p = (Vdbe*)pStmt;
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+     sqlite3_mutex_leave(p->db->mutex);
+   }
+@@ -87579,7 +91739,7 @@ SQLITE_API int sqlite3_bind_pointer(
+ ){
+   int rc;
+   Vdbe *p = (Vdbe*)pStmt;
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+     sqlite3VdbeMemSetPointer(&p->aVar[i-1], pPtr, zPTtype, xDestructor);
+     sqlite3_mutex_leave(p->db->mutex);
+@@ -87606,7 +91766,10 @@ SQLITE_API int sqlite3_bind_text64(
+   unsigned char enc
+ ){
+   assert( xDel!=SQLITE_DYNAMIC );
+-  if( enc==SQLITE_UTF16 ) enc = SQLITE_UTF16NATIVE;
++  if( enc!=SQLITE_UTF8 ){
++    if( enc==SQLITE_UTF16 ) enc = SQLITE_UTF16NATIVE;
++    nData &= ~(u16)1;
++  }
+   return bindText(pStmt, i, zData, nData, xDel, enc);
+ }
+ #ifndef SQLITE_OMIT_UTF16
+@@ -87614,10 +91777,10 @@ SQLITE_API int sqlite3_bind_text16(
+   sqlite3_stmt *pStmt,
+   int i,
+   const void *zData,
+-  int nData,
++  int n,
+   void (*xDel)(void*)
+ ){
+-  return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF16NATIVE);
++  return bindText(pStmt, i, zData, n & ~(u64)1, xDel, SQLITE_UTF16NATIVE);
+ }
+ #endif /* SQLITE_OMIT_UTF16 */
+ SQLITE_API int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){
+@@ -87657,7 +91820,7 @@ SQLITE_API int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_valu
+ SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){
+   int rc;
+   Vdbe *p = (Vdbe *)pStmt;
+-  rc = vdbeUnbind(p, i);
++  rc = vdbeUnbind(p, (u32)(i-1));
+   if( rc==SQLITE_OK ){
+ #ifndef SQLITE_OMIT_INCRBLOB
+     sqlite3VdbeMemSetZeroBlob(&p->aVar[i-1], n);
+@@ -87671,6 +91834,9 @@ SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){
+ SQLITE_API int sqlite3_bind_zeroblob64(sqlite3_stmt *pStmt, int i, sqlite3_uint64 n){
+   int rc;
+   Vdbe *p = (Vdbe *)pStmt;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( p==0 ) return SQLITE_MISUSE_BKPT;
++#endif
+   sqlite3_mutex_enter(p->db->mutex);
+   if( n>(u64)p->db->aLimit[SQLITE_LIMIT_LENGTH] ){
+     rc = SQLITE_TOOBIG;
+@@ -87791,6 +91957,42 @@ SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt){
+   return pStmt ? ((Vdbe*)pStmt)->explain : 0;
+ }
+ 
++/*
++** Set the explain mode for a statement.
++*/
++SQLITE_API int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode){
++  Vdbe *v = (Vdbe*)pStmt;
++  int rc;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( pStmt==0 ) return SQLITE_MISUSE_BKPT;
++#endif
++  sqlite3_mutex_enter(v->db->mutex);
++  if( ((int)v->explain)==eMode ){
++    rc = SQLITE_OK;
++  }else if( eMode<0 || eMode>2 ){
++    rc = SQLITE_ERROR;
++  }else if( (v->prepFlags & SQLITE_PREPARE_SAVESQL)==0 ){
++    rc = SQLITE_ERROR;
++  }else if( v->eVdbeState!=VDBE_READY_STATE ){
++    rc = SQLITE_BUSY;
++  }else if( v->nMem>=10 && (eMode!=2 || v->haveEqpOps) ){
++    /* No reprepare necessary */
++    v->explain = eMode;
++    rc = SQLITE_OK;
++  }else{
++    v->explain = eMode;
++    rc = sqlite3Reprepare(v);
++    v->haveEqpOps = eMode==2;
++  }
++  if( v->explain ){
++    v->nResColumn = 12 - 4*v->explain;
++  }else{
++    v->nResColumn = v->nResAlloc;
++  }
++  sqlite3_mutex_leave(v->db->mutex);
++  return rc;
++}
++
+ /*
+ ** Return true if the prepared statement is in need of being reset.
+ */
+@@ -87817,7 +92019,7 @@ SQLITE_API sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt){
+   if( pStmt==0 ){
+     pNext = (sqlite3_stmt*)pDb->pVdbe;
+   }else{
+-    pNext = (sqlite3_stmt*)((Vdbe*)pStmt)->pNext;
++    pNext = (sqlite3_stmt*)((Vdbe*)pStmt)->pVNext;
+   }
+   sqlite3_mutex_leave(pDb->mutex);
+   return pNext;
+@@ -87842,8 +92044,11 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt *pStmt, int op, int resetFlag){
+     sqlite3_mutex_enter(db->mutex);
+     v = 0;
+     db->pnBytesFreed = (int*)&v;
++    assert( db->lookaside.pEnd==db->lookaside.pTrueEnd );
++    db->lookaside.pEnd = db->lookaside.pStart;
+     sqlite3VdbeDelete(pVdbe);
+     db->pnBytesFreed = 0;
++    db->lookaside.pEnd = db->lookaside.pTrueEnd;
+     sqlite3_mutex_leave(db->mutex);
+   }else{
+     v = pVdbe->aCounter[op];
+@@ -87927,10 +92132,16 @@ static UnpackedRecord *vdbeUnpackRecord(
+ ** a field of the row currently being updated or deleted.
+ */
+ SQLITE_API int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){
+-  PreUpdate *p = db->pPreUpdate;
++  PreUpdate *p;
+   Mem *pMem;
+   int rc = SQLITE_OK;
+ 
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( db==0 || ppValue==0 ){
++    return SQLITE_MISUSE_BKPT;
++  }
++#endif
++  p = db->pPreUpdate;
+   /* Test that this call is being made from within an SQLITE_DELETE or
+   ** SQLITE_UPDATE pre-update callback, and that iIdx is within range. */
+   if( !p || p->op==SQLITE_INSERT ){
+@@ -87991,7 +92202,12 @@ SQLITE_API int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppVa
+ ** the number of columns in the row being updated, deleted or inserted.
+ */
+ SQLITE_API int sqlite3_preupdate_count(sqlite3 *db){
+-  PreUpdate *p = db->pPreUpdate;
++  PreUpdate *p;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  p = db!=0 ? db->pPreUpdate : 0;
++#else
++  p = db->pPreUpdate;
++#endif
+   return (p ? p->keyinfo.nKeyField : 0);
+ }
+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
+@@ -88009,7 +92225,12 @@ SQLITE_API int sqlite3_preupdate_count(sqlite3 *db){
+ ** or SET DEFAULT action is considered a trigger.
+ */
+ SQLITE_API int sqlite3_preupdate_depth(sqlite3 *db){
+-  PreUpdate *p = db->pPreUpdate;
++  PreUpdate *p;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  p = db!=0 ? db->pPreUpdate : 0;
++#else
++  p = db->pPreUpdate;
++#endif
+   return (p ? p->v->nFrame : 0);
+ }
+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
+@@ -88020,7 +92241,12 @@ SQLITE_API int sqlite3_preupdate_depth(sqlite3 *db){
+ ** only.
+ */
+ SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3 *db){
+-  PreUpdate *p = db->pPreUpdate;
++  PreUpdate *p;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  p = db!=0 ? db->pPreUpdate : 0;
++#else
++  p = db->pPreUpdate;
++#endif
+   return (p ? p->iBlobWrite : -1);
+ }
+ #endif
+@@ -88031,10 +92257,16 @@ SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3 *db){
+ ** a field of the row currently being updated or inserted.
+ */
+ SQLITE_API int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){
+-  PreUpdate *p = db->pPreUpdate;
++  PreUpdate *p;
+   int rc = SQLITE_OK;
+   Mem *pMem;
+ 
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( db==0 || ppValue==0 ){
++    return SQLITE_MISUSE_BKPT;
++  }
++#endif
++  p = db->pPreUpdate;
+   if( !p || p->op==SQLITE_DELETE ){
+     rc = SQLITE_MISUSE_BKPT;
+     goto preupdate_new_out;
+@@ -88105,23 +92337,78 @@ SQLITE_API int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppVa
+ /*
+ ** Return status data for a single loop within query pStmt.
+ */
+-SQLITE_API int sqlite3_stmt_scanstatus(
++SQLITE_API int sqlite3_stmt_scanstatus_v2(
+   sqlite3_stmt *pStmt,            /* Prepared statement being queried */
+-  int idx,                        /* Index of loop to report on */
++  int iScan,                      /* Index of loop to report on */
+   int iScanStatusOp,              /* Which metric to return */
++  int flags,
+   void *pOut                      /* OUT: Write the answer here */
+ ){
+   Vdbe *p = (Vdbe*)pStmt;
+-  ScanStatus *pScan;
+-  if( idx<0 || idx>=p->nScan ) return 1;
+-  pScan = &p->aScan[idx];
++  VdbeOp *aOp;
++  int nOp;
++  ScanStatus *pScan = 0;
++  int idx;
++
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( p==0 || pOut==0
++      || iScanStatusOpSQLITE_SCANSTAT_NCYCLE ){
++    return 1;
++  }
++#endif
++  aOp = p->aOp;
++  nOp = p->nOp;
++  if( p->pFrame ){
++    VdbeFrame *pFrame;
++    for(pFrame=p->pFrame; pFrame->pParent; pFrame=pFrame->pParent);
++    aOp = pFrame->aOp;
++    nOp = pFrame->nOp;
++  }
++
++  if( iScan<0 ){
++    int ii;
++    if( iScanStatusOp==SQLITE_SCANSTAT_NCYCLE ){
++      i64 res = 0;
++      for(ii=0; iiaScan[idx];
++  }else{
++    /* If the COMPLEX flag is clear, then this function must ignore any
++    ** ScanStatus structures with ScanStatus.addrLoop set to 0. */
++    for(idx=0; idxnScan; idx++){
++      pScan = &p->aScan[idx];
++      if( pScan->zName ){
++        iScan--;
++        if( iScan<0 ) break;
++      }
++    }
++  }
++  if( idx>=p->nScan ) return 1;
++
+   switch( iScanStatusOp ){
+     case SQLITE_SCANSTAT_NLOOP: {
+-      *(sqlite3_int64*)pOut = p->anExec[pScan->addrLoop];
++      if( pScan->addrLoop>0 ){
++        *(sqlite3_int64*)pOut = aOp[pScan->addrLoop].nExec;
++      }else{
++        *(sqlite3_int64*)pOut = -1;
++      }
+       break;
+     }
+     case SQLITE_SCANSTAT_NVISIT: {
+-      *(sqlite3_int64*)pOut = p->anExec[pScan->addrVisit];
++      if( pScan->addrVisit>0 ){
++        *(sqlite3_int64*)pOut = aOp[pScan->addrVisit].nExec;
++      }else{
++        *(sqlite3_int64*)pOut = -1;
++      }
+       break;
+     }
+     case SQLITE_SCANSTAT_EST: {
+@@ -88140,7 +92427,7 @@ SQLITE_API int sqlite3_stmt_scanstatus(
+     }
+     case SQLITE_SCANSTAT_EXPLAIN: {
+       if( pScan->addrExplain ){
+-        *(const char**)pOut = p->aOp[ pScan->addrExplain ].p4.z;
++        *(const char**)pOut = aOp[ pScan->addrExplain ].p4.z;
+       }else{
+         *(const char**)pOut = 0;
+       }
+@@ -88148,12 +92435,51 @@ SQLITE_API int sqlite3_stmt_scanstatus(
+     }
+     case SQLITE_SCANSTAT_SELECTID: {
+       if( pScan->addrExplain ){
+-        *(int*)pOut = p->aOp[ pScan->addrExplain ].p1;
++        *(int*)pOut = aOp[ pScan->addrExplain ].p1;
++      }else{
++        *(int*)pOut = -1;
++      }
++      break;
++    }
++    case SQLITE_SCANSTAT_PARENTID: {
++      if( pScan->addrExplain ){
++        *(int*)pOut = aOp[ pScan->addrExplain ].p2;
+       }else{
+         *(int*)pOut = -1;
+       }
+       break;
+     }
++    case SQLITE_SCANSTAT_NCYCLE: {
++      i64 res = 0;
++      if( pScan->aAddrRange[0]==0 ){
++        res = -1;
++      }else{
++        int ii;
++        for(ii=0; iiaAddrRange); ii+=2){
++          int iIns = pScan->aAddrRange[ii];
++          int iEnd = pScan->aAddrRange[ii+1];
++          if( iIns==0 ) break;
++          if( iIns>0 ){
++            while( iIns<=iEnd ){
++              res += aOp[iIns].nCycle;
++              iIns++;
++            }
++          }else{
++            int iOp;
++            for(iOp=0; iOpp1!=iEnd ) continue;
++              if( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_NCYCLE)==0 ){
++                continue;
++              }
++              res += aOp[iOp].nCycle;
++            }
++          }
++        }
++      }
++      *(i64*)pOut = res;
++      break;
++    }
+     default: {
+       return 1;
+     }
+@@ -88161,12 +92487,29 @@ SQLITE_API int sqlite3_stmt_scanstatus(
+   return 0;
+ }
+ 
++/*
++** Return status data for a single loop within query pStmt.
++*/
++SQLITE_API int sqlite3_stmt_scanstatus(
++  sqlite3_stmt *pStmt,            /* Prepared statement being queried */
++  int iScan,                      /* Index of loop to report on */
++  int iScanStatusOp,              /* Which metric to return */
++  void *pOut                      /* OUT: Write the answer here */
++){
++  return sqlite3_stmt_scanstatus_v2(pStmt, iScan, iScanStatusOp, 0, pOut);
++}
++
+ /*
+ ** Zero all counters associated with the sqlite3_stmt_scanstatus() data.
+ */
+ SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt *pStmt){
+   Vdbe *p = (Vdbe*)pStmt;
+-  memset(p->anExec, 0, p->nOp * sizeof(i64));
++  int ii;
++  for(ii=0; p!=0 && iinOp; ii++){
++    Op *pOp = &p->aOp[ii];
++    pOp->nExec = 0;
++    pOp->nCycle = 0;
++  }
+ }
+ #endif /* SQLITE_ENABLE_STMT_SCANSTATUS */
+ 
+@@ -88501,8 +92844,12 @@ SQLITE_API int sqlite3_found_count = 0;
+ **   sqlite3CantopenError(lineno)
+ */
+ static void test_trace_breakpoint(int pc, Op *pOp, Vdbe *v){
+-  static int n = 0;
++  static u64 n = 0;
++  (void)pc;
++  (void)pOp;
++  (void)v;
+   n++;
++  if( n==LARGEST_UINT64 ) abort(); /* So that n is used, preventing a warning */
+ }
+ #endif
+ 
+@@ -88683,7 +93030,8 @@ static VdbeCursor *allocateCursor(
+ ** return false.
+ */
+ static int alsoAnInt(Mem *pRec, double rValue, i64 *piValue){
+-  i64 iValue = (double)rValue;
++  i64 iValue;
++  iValue = sqlite3RealToI64(rValue);
+   if( sqlite3RealSameAsInt(rValue,iValue) ){
+     *piValue = iValue;
+     return 1;
+@@ -88739,6 +93087,10 @@ static void applyNumericAffinity(Mem *pRec, int bTryForInt){
+ **    always preferred, even if the affinity is REAL, because
+ **    an integer representation is more space efficient on disk.
+ **
++** SQLITE_AFF_FLEXNUM:
++**    If the value is text, then try to convert it into a number of
++**    some kind (integer or real) but do not make any other changes.
++**
+ ** SQLITE_AFF_TEXT:
+ **    Convert pRec to a text representation.
+ **
+@@ -88753,11 +93105,11 @@ static void applyAffinity(
+ ){
+   if( affinity>=SQLITE_AFF_NUMERIC ){
+     assert( affinity==SQLITE_AFF_INTEGER || affinity==SQLITE_AFF_REAL
+-             || affinity==SQLITE_AFF_NUMERIC );
++             || affinity==SQLITE_AFF_NUMERIC || affinity==SQLITE_AFF_FLEXNUM );
+     if( (pRec->flags & MEM_Int)==0 ){ /*OPTIMIZATION-IF-FALSE*/
+-      if( (pRec->flags & MEM_Real)==0 ){
++      if( (pRec->flags & (MEM_Real|MEM_IntReal))==0 ){
+         if( pRec->flags & MEM_Str ) applyNumericAffinity(pRec,1);
+-      }else{
++      }else if( affinity<=SQLITE_AFF_REAL ){
+         sqlite3VdbeIntegerAffinity(pRec);
+       }
+     }
+@@ -88845,17 +93197,18 @@ static u16 SQLITE_NOINLINE computeNumericType(Mem *pMem){
+ ** But it does set pMem->u.r and pMem->u.i appropriately.
+ */
+ static u16 numericType(Mem *pMem){
+-  if( pMem->flags & (MEM_Int|MEM_Real|MEM_IntReal) ){
++  assert( (pMem->flags & MEM_Null)==0
++       || pMem->db==0 || pMem->db->mallocFailed );
++  if( pMem->flags & (MEM_Int|MEM_Real|MEM_IntReal|MEM_Null) ){
+     testcase( pMem->flags & MEM_Int );
+     testcase( pMem->flags & MEM_Real );
+     testcase( pMem->flags & MEM_IntReal );
+-    return pMem->flags & (MEM_Int|MEM_Real|MEM_IntReal);
+-  }
+-  if( pMem->flags & (MEM_Str|MEM_Blob) ){
+-    testcase( pMem->flags & MEM_Str );
+-    testcase( pMem->flags & MEM_Blob );
+-    return computeNumericType(pMem);
++    return pMem->flags & (MEM_Int|MEM_Real|MEM_IntReal|MEM_Null);
+   }
++  assert( pMem->flags & (MEM_Str|MEM_Blob) );
++  testcase( pMem->flags & MEM_Str );
++  testcase( pMem->flags & MEM_Blob );
++  return computeNumericType(pMem);
+   return 0;
+ }
+ 
+@@ -88916,6 +93269,9 @@ SQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, StrAccum *pStr){
+       sqlite3_str_appendchar(pStr, 1, (c>=0x20&&c<=0x7f) ? c : '.');
+     }
+     sqlite3_str_appendf(pStr, "]%s", encnames[pMem->enc]);
++    if( f & MEM_Term ){
++      sqlite3_str_appendf(pStr, "(0-term)");
++    }
+   }
+ }
+ #endif
+@@ -88984,17 +93340,6 @@ SQLITE_PRIVATE void sqlite3VdbeRegisterDump(Vdbe *v){
+ #  define REGISTER_TRACE(R,M)
+ #endif
+ 
+-
+-#ifdef VDBE_PROFILE
+-
+-/*
+-** hwtime.h contains inline assembler code for implementing
+-** high-performance timing routines.
+-*/
+-/* #include "hwtime.h" */
+-
+-#endif
+-
+ #ifndef NDEBUG
+ /*
+ ** This function is only called from within an assert() expression. It
+@@ -89054,13 +93399,102 @@ static u64 filterHash(const Mem *aMem, const Op *pOp){
+     }else if( p->flags & MEM_Real ){
+       h += sqlite3VdbeIntValue(p);
+     }else if( p->flags & (MEM_Str|MEM_Blob) ){
+-      h += p->n;
+-      if( p->flags & MEM_Zero ) h += p->u.nZero;
++      /* All strings have the same hash and all blobs have the same hash,
++      ** though, at least, those hashes are different from each other and
++      ** from NULL. */
++      h += 4093 + (p->flags & (MEM_Str|MEM_Blob));
+     }
+   }
+   return h;
+ }
+ 
++
++/*
++** For OP_Column, factor out the case where content is loaded from
++** overflow pages, so that the code to implement this case is separate
++** the common case where all content fits on the page.  Factoring out
++** the code reduces register pressure and helps the common case
++** to run faster.
++*/
++static SQLITE_NOINLINE int vdbeColumnFromOverflow(
++  VdbeCursor *pC,       /* The BTree cursor from which we are reading */
++  int iCol,             /* The column to read */
++  int t,                /* The serial-type code for the column value */
++  i64 iOffset,          /* Offset to the start of the content value */
++  u32 cacheStatus,      /* Current Vdbe.cacheCtr value */
++  u32 colCacheCtr,      /* Current value of the column cache counter */
++  Mem *pDest            /* Store the value into this register. */
++){
++  int rc;
++  sqlite3 *db = pDest->db;
++  int encoding = pDest->enc;
++  int len = sqlite3VdbeSerialTypeLen(t);
++  assert( pC->eCurType==CURTYPE_BTREE );
++  if( len>db->aLimit[SQLITE_LIMIT_LENGTH] ) return SQLITE_TOOBIG;
++  if( len > 4000 && pC->pKeyInfo==0 ){
++    /* Cache large column values that are on overflow pages using
++    ** an RCStr (reference counted string) so that if they are reloaded,
++    ** that do not have to be copied a second time.  The overhead of
++    ** creating and managing the cache is such that this is only
++    ** profitable for larger TEXT and BLOB values.
++    **
++    ** Only do this on table-btrees so that writes to index-btrees do not
++    ** need to clear the cache.  This buys performance in the common case
++    ** in exchange for generality.
++    */
++    VdbeTxtBlbCache *pCache;
++    char *pBuf;
++    if( pC->colCache==0 ){
++      pC->pCache = sqlite3DbMallocZero(db, sizeof(VdbeTxtBlbCache) );
++      if( pC->pCache==0 ) return SQLITE_NOMEM;
++      pC->colCache = 1;
++    }
++    pCache = pC->pCache;
++    if( pCache->pCValue==0
++     || pCache->iCol!=iCol
++     || pCache->cacheStatus!=cacheStatus
++     || pCache->colCacheCtr!=colCacheCtr
++     || pCache->iOffset!=sqlite3BtreeOffset(pC->uc.pCursor)
++    ){
++      if( pCache->pCValue ) sqlite3RCStrUnref(pCache->pCValue);
++      pBuf = pCache->pCValue = sqlite3RCStrNew( len+3 );
++      if( pBuf==0 ) return SQLITE_NOMEM;
++      rc = sqlite3BtreePayload(pC->uc.pCursor, iOffset, len, pBuf);
++      if( rc ) return rc;
++      pBuf[len] = 0;
++      pBuf[len+1] = 0;
++      pBuf[len+2] = 0;
++      pCache->iCol = iCol;
++      pCache->cacheStatus = cacheStatus;
++      pCache->colCacheCtr = colCacheCtr;
++      pCache->iOffset = sqlite3BtreeOffset(pC->uc.pCursor);
++    }else{
++      pBuf = pCache->pCValue;
++    }
++    assert( t>=12 );
++    sqlite3RCStrRef(pBuf);
++    if( t&1 ){
++      rc = sqlite3VdbeMemSetStr(pDest, pBuf, len, encoding,
++                                sqlite3RCStrUnref);
++      pDest->flags |= MEM_Term;
++    }else{
++      rc = sqlite3VdbeMemSetStr(pDest, pBuf, len, 0,
++                                sqlite3RCStrUnref);
++    }
++  }else{
++    rc = sqlite3VdbeMemFromBtree(pC->uc.pCursor, iOffset, len, pDest);
++    if( rc ) return rc;
++    sqlite3VdbeSerialGet((const u8*)pDest->z, t, pDest);
++    if( (t&1)!=0 && encoding==SQLITE_UTF8 ){
++      pDest->z[len] = 0;
++      pDest->flags |= MEM_Term;
++    }
++  }
++  pDest->flags &= ~MEM_Ephem;
++  return rc;
++}
++
++
+ /*
+ ** Return the symbolic name for the data type of a pMem
+ */
+@@ -89084,11 +93518,10 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+ ){
+   Op *aOp = p->aOp;          /* Copy of p->aOp */
+   Op *pOp = aOp;             /* Current operation */
+-#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
+-  Op *pOrigOp;               /* Value of pOp at the top of the loop */
+-#endif
+ #ifdef SQLITE_DEBUG
++  Op *pOrigOp;               /* Value of pOp at the top of the loop */
+   int nExtraDelete = 0;      /* Verifies FORDELETE and AUXDELETE flags */
++  u8 iCompareIsInit = 0;     /* iCompare is initialized */
+ #endif
+   int rc = SQLITE_OK;        /* Value to return */
+   sqlite3 *db = p->db;       /* The database */
+@@ -89104,13 +93537,17 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+   Mem *pIn2 = 0;             /* 2nd input operand */
+   Mem *pIn3 = 0;             /* 3rd input operand */
+   Mem *pOut = 0;             /* Output operand */
+-#ifdef VDBE_PROFILE
+-  u64 start;                 /* CPU clock count at start of opcode */
++  u32 colCacheCtr = 0;       /* Column cache counter */
++#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
++  u64 *pnCycle = 0;
++  int bStmtScanStatus = IS_STMT_SCANSTATUS(db)!=0;
+ #endif
+   /*** INSERT STACK UNION HERE ***/
+ 
+   assert( p->eVdbeState==VDBE_RUN_STATE );  /* sqlite3_step() verifies this */
+-  sqlite3VdbeEnter(p);
++  if( DbMaskNonZero(p->lockMask) ){
++    sqlite3VdbeEnter(p);
++  }
+ #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+   if( db->xProgress ){
+     u32 iPrior = p->aCounter[SQLITE_STMTSTATUS_VM_STEP];
+@@ -89131,7 +93568,6 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+   assert( p->bIsReader || p->readOnly!=0 );
+   p->iCurrentTime = 0;
+   assert( p->explain==0 );
+-  p->pResultSet = 0;
+   db->busyHandler.nBusy = 0;
+   if( AtomicLoad(&db->u1.isInterrupted) ) goto abort_due_to_interrupt;
+   sqlite3VdbeIOTraceSql(p);
+@@ -89168,12 +93604,18 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+     assert( rc==SQLITE_OK );
+ 
+     assert( pOp>=aOp && pOp<&aOp[p->nOp]);
+-#ifdef VDBE_PROFILE
+-    start = sqlite3NProfileCnt ? sqlite3NProfileCnt : sqlite3Hwtime();
+-#endif
+     nVmStep++;
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-    if( p->anExec ) p->anExec[(int)(pOp-aOp)]++;
++
++#if defined(VDBE_PROFILE)
++    pOp->nExec++;
++    pnCycle = &pOp->nCycle;
++    if( sqlite3NProfileCnt==0 ) *pnCycle -= sqlite3Hwtime();
++#elif defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++    if( bStmtScanStatus ){
++      pOp->nExec++;
++      pnCycle = &pOp->nCycle;
++      *pnCycle -= sqlite3Hwtime();
++    }
+ #endif
+ 
+     /* Only allow tracing if SQLITE_DEBUG is defined.
+@@ -89235,7 +93677,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+       }
+     }
+ #endif
+-#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
++#ifdef SQLITE_DEBUG
+     pOrigOp = pOp;
+ #endif
+ 
+@@ -89291,8 +93733,8 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
+ case OP_Goto: {             /* jump */
+ 
+ #ifdef SQLITE_DEBUG
+-  /* In debuggging mode, when the p5 flags is set on an OP_Goto, that
+-  ** means we should really jump back to the preceeding OP_ReleaseReg
++  /* In debugging mode, when the p5 flags is set on an OP_Goto, that
++  ** means we should really jump back to the preceding OP_ReleaseReg
+   ** instruction. */
+   if( pOp->p5 ){
+     assert( pOp->p2 < (int)(pOp - aOp) );
+@@ -89500,7 +93942,7 @@ case OP_HaltIfNull: {      /* in3 */
+ ** P5 is a value between 0 and 4, inclusive, that modifies the P4 string.
+ **
+ **    0:  (no change)
+-**    1:  NOT NULL contraint failed: P4
++**    1:  NOT NULL constraint failed: P4
+ **    2:  UNIQUE constraint failed: P4
+ **    3:  CHECK constraint failed: P4
+ **    4:  FOREIGN KEY constraint failed: P4
+@@ -89519,6 +93961,12 @@ case OP_Halt: {
+ #ifdef SQLITE_DEBUG
+   if( pOp->p2==OE_Abort ){ sqlite3VdbeAssertAbortable(p); }
+ #endif
++
++  /* A deliberately coded "OP_Halt SQLITE_INTERNAL * * * *" opcode indicates
++  ** something is wrong with the code generator.  Raise an assertion in order
++  ** to bring this to the attention of fuzzers and other testing tools. */
++  assert( pOp->p1!=SQLITE_INTERNAL );
++
+   if( p->pFrame && pOp->p1==SQLITE_OK ){
+     /* Halt the sub-program. Return control to the parent frame. */
+     pFrame = p->pFrame;
+@@ -89960,10 +94408,10 @@ case OP_ResultRow: {
+   assert( pOp->p1+pOp->p2<=(p->nMem+1 - p->nCursor)+1 );
+ 
+   p->cacheCtr = (p->cacheCtr + 2)|1;
+-  p->pResultSet = &aMem[pOp->p1];
++  p->pResultRow = &aMem[pOp->p1];
+ #ifdef SQLITE_DEBUG
+   {
+-    Mem *pMem = p->pResultSet;
++    Mem *pMem = p->pResultRow;
+     int i;
+     for(i=0; ip2; i++){
+       assert( memIsValid(&pMem[i]) );
+@@ -90100,7 +94548,6 @@ case OP_Subtract:              /* same as TK_MINUS, in1, in2, out3 */
+ case OP_Multiply:              /* same as TK_STAR, in1, in2, out3 */
+ case OP_Divide:                /* same as TK_SLASH, in1, in2, out3 */
+ case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
+-  u16 flags;      /* Combined MEM_* flags from both inputs */
+   u16 type1;      /* Numeric type of left operand */
+   u16 type2;      /* Numeric type of right operand */
+   i64 iA;         /* Integer value of left operand */
+@@ -90109,12 +94556,12 @@ case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
+   double rB;      /* Real value of right operand */
+ 
+   pIn1 = &aMem[pOp->p1];
+-  type1 = numericType(pIn1);
++  type1 = pIn1->flags;
+   pIn2 = &aMem[pOp->p2];
+-  type2 = numericType(pIn2);
++  type2 = pIn2->flags;
+   pOut = &aMem[pOp->p3];
+-  flags = pIn1->flags | pIn2->flags;
+   if( (type1 & type2 & MEM_Int)!=0 ){
++int_math:
+     iA = pIn1->u.i;
+     iB = pIn2->u.i;
+     switch( pOp->opcode ){
+@@ -90136,9 +94583,12 @@ case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
+     }
+     pOut->u.i = iB;
+     MemSetTypeFlag(pOut, MEM_Int);
+-  }else if( (flags & MEM_Null)!=0 ){
++  }else if( ((type1 | type2) & MEM_Null)!=0 ){
+     goto arithmetic_result_is_null;
+   }else{
++    type1 = numericType(pIn1);
++    type2 = numericType(pIn2);
++    if( (type1 & type2 & MEM_Int)!=0 ) goto int_math;
+ fp_math:
+     rA = sqlite3VdbeRealValue(pIn1);
+     rB = sqlite3VdbeRealValue(pIn2);
+@@ -90296,7 +94746,7 @@ case OP_AddImm: {            /* in1 */
+   pIn1 = &aMem[pOp->p1];
+   memAboutToChange(p, pIn1);
+   sqlite3VdbeMemIntegerify(pIn1);
+-  pIn1->u.i += pOp->p2;
++  *(u64*)&pIn1->u.i += (u64)pOp->p2;
+   break;
+ }
+ 
+@@ -90491,7 +94941,6 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+   flags1 = pIn1->flags;
+   flags3 = pIn3->flags;
+   if( (flags1 & flags3 & MEM_Int)!=0 ){
+-    assert( (pOp->p5 & SQLITE_AFF_MASK)!=SQLITE_AFF_TEXT || CORRUPT_DB );
+     /* Common case of comparison of two integers */
+     if( pIn3->u.i > pIn1->u.i ){
+       if( sqlite3aGTb[pOp->opcode] ){
+@@ -90499,18 +94948,21 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+         goto jump_to_p2;
+       }
+       iCompare = +1;
++      VVA_ONLY( iCompareIsInit = 1; )
+     }else if( pIn3->u.i < pIn1->u.i ){
+       if( sqlite3aLTb[pOp->opcode] ){
+         VdbeBranchTaken(1, (pOp->p5 & SQLITE_NULLEQ)?2:3);
+         goto jump_to_p2;
+       }
+       iCompare = -1;
++      VVA_ONLY( iCompareIsInit = 1; )
+     }else{
+       if( sqlite3aEQb[pOp->opcode] ){
+         VdbeBranchTaken(1, (pOp->p5 & SQLITE_NULLEQ)?2:3);
+         goto jump_to_p2;
+       }
+       iCompare = 0;
++      VVA_ONLY( iCompareIsInit = 1; )
+     }
+     VdbeBranchTaken(0, (pOp->p5 & SQLITE_NULLEQ)?2:3);
+     break;
+@@ -90542,6 +94994,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+         goto jump_to_p2;
+       }
+       iCompare = 1;    /* Operands are not equal */
++      VVA_ONLY( iCompareIsInit = 1; )
+       break;
+     }
+   }else{
+@@ -90552,14 +95005,14 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+       if( (flags1 | flags3)&MEM_Str ){
+         if( (flags1 & (MEM_Int|MEM_IntReal|MEM_Real|MEM_Str))==MEM_Str ){
+           applyNumericAffinity(pIn1,0);
+-          testcase( flags3==pIn3->flags );
++          assert( flags3==pIn3->flags || CORRUPT_DB );
+           flags3 = pIn3->flags;
+         }
+         if( (flags3 & (MEM_Int|MEM_IntReal|MEM_Real|MEM_Str))==MEM_Str ){
+           applyNumericAffinity(pIn3,0);
+         }
+       }
+-    }else if( affinity==SQLITE_AFF_TEXT ){
++    }else if( affinity==SQLITE_AFF_TEXT && ((flags1 | flags3) & MEM_Str)!=0 ){
+       if( (flags1 & MEM_Str)==0 && (flags1&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
+         testcase( pIn1->flags & MEM_Int );
+         testcase( pIn1->flags & MEM_Real );
+@@ -90567,7 +95020,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+         sqlite3VdbeMemStringify(pIn1, encoding, 1);
+         testcase( (flags1&MEM_Dyn) != (pIn1->flags&MEM_Dyn) );
+         flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask);
+-        if( pIn1==pIn3 ) flags3 = flags1 | MEM_Str;
++        if( NEVER(pIn1==pIn3) ) flags3 = flags1 | MEM_Str;
+       }
+       if( (flags3 & MEM_Str)==0 && (flags3&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){
+         testcase( pIn3->flags & MEM_Int );
+@@ -90598,6 +95051,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+     res2 = sqlite3aGTb[pOp->opcode];
+   }
+   iCompare = res;
++  VVA_ONLY( iCompareIsInit = 1; )
+ 
+   /* Undo any changes made by applyAffinity() to the input registers. */
+   assert( (pIn3->flags & MEM_Dyn) == (flags3 & MEM_Dyn) );
+@@ -90619,10 +95073,10 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
+ ** opcodes are allowed to occur between this instruction and the previous
+ ** OP_Lt or OP_Gt.
+ **
+-** If result of an OP_Eq comparison on the same two operands as the
+-** prior OP_Lt or OP_Gt would have been true, then jump to P2.
+-** If the result of an OP_Eq comparison on the two previous
+-** operands would have been false or NULL, then fall through.
++** If the result of an OP_Eq comparison on the same two operands as
++** the prior OP_Lt or OP_Gt would have been true, then jump to P2.  If
++** the result of an OP_Eq comparison on the two previous operands
++** would have been false or NULL, then fall through.
+ */
+ case OP_ElseEq: {       /* same as TK_ESCAPE, jump */
+ 
+@@ -90636,6 +95090,7 @@ case OP_ElseEq: {       /* same as TK_ESCAPE, jump */
+     break;
+   }
+ #endif /* SQLITE_DEBUG */
++  assert( iCompareIsInit );
+   VdbeBranchTaken(iCompare==0, 2);
+   if( iCompare==0 ) goto jump_to_p2;
+   break;
+@@ -90730,6 +95185,7 @@ case OP_Compare: {
+     pColl = pKeyInfo->aColl[i];
+     bRev = (pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_DESC);
+     iCompare = sqlite3MemCompare(&aMem[p1+idx], &aMem[p2+idx], pColl);
++    VVA_ONLY( iCompareIsInit = 1; )
+     if( iCompare ){
+       if( (pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_BIGNULL)
+        && ((aMem[p1+idx].flags & MEM_Null) || (aMem[p2+idx].flags & MEM_Null))
+@@ -90747,13 +95203,14 @@ case OP_Compare: {
+ /* Opcode: Jump P1 P2 P3 * *
+ **
+ ** Jump to the instruction at address P1, P2, or P3 depending on whether
+-** in the most recent OP_Compare instruction the P1 vector was less than
++** in the most recent OP_Compare instruction the P1 vector was less than,
+ ** equal to, or greater than the P2 vector, respectively.
+ **
+ ** This opcode must immediately follow an OP_Compare opcode.
+ */
+ case OP_Jump: {             /* jump */
+   assert( pOp>aOp && pOp[-1].opcode==OP_Compare );
++  assert( iCompareIsInit );
+   if( iCompare<0 ){
+     VdbeBranchTaken(0,4); pOp = &aOp[pOp->p1 - 1];
+   }else if( iCompare==0 ){
+@@ -90953,26 +95410,103 @@ case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
+   break;
+ }
+ 
+-/* Opcode: IsNullOrType P1 P2 P3 * *
+-** Synopsis: if typeof(r[P1]) IN (P3,5) goto P2
++/* Opcode: IsType P1 P2 P3 P4 P5
++** Synopsis: if typeof(P1.P3) in P5 goto P2
++**
++** Jump to P2 if the type of a column in a btree is one of the types specified
++** by the P5 bitmask.
++**
++** P1 is normally a cursor on a btree for which the row decode cache is
++** valid through at least column P3.  In other words, there should have been
++** a prior OP_Column for column P3 or greater.  If the cursor is not valid,
++** then this opcode might give spurious results.
++** The the btree row has fewer than P3 columns, then use P4 as the
++** datatype.
++**
++** If P1 is -1, then P3 is a register number and the datatype is taken
++** from the value in that register.
++**
++** P5 is a bitmask of data types.  SQLITE_INTEGER is the least significant
++** (0x01) bit. SQLITE_FLOAT is the 0x02 bit. SQLITE_TEXT is 0x04.
++** SQLITE_BLOB is 0x08.  SQLITE_NULL is 0x10.
++**
++** WARNING: This opcode does not reliably distinguish between NULL and REAL
++** when P1>=0.  If the database contains a NaN value, this opcode will think
++** that the datatype is REAL when it should be NULL.  When P1<0 and the value
++** is already stored in register P3, then this opcode does reliably
++** distinguish between NULL and REAL.  The problem only arises then P1>=0.
++**
++** Take the jump to address P2 if and only if the datatype of the
++** value determined by P1 and P3 corresponds to one of the bits in the
++** P5 bitmask.
+ **
+-** Jump to P2 if the value in register P1 is NULL or has a datatype P3.
+-** P3 is an integer which should be one of SQLITE_INTEGER, SQLITE_FLOAT,
+-** SQLITE_BLOB, SQLITE_NULL, or SQLITE_TEXT.
+ */
+-case OP_IsNullOrType: {      /* jump, in1 */
+-  int doTheJump;
+-  pIn1 = &aMem[pOp->p1];
+-  doTheJump = (pIn1->flags & MEM_Null)!=0 || sqlite3_value_type(pIn1)==pOp->p3;
+-  VdbeBranchTaken( doTheJump, 2);
+-  if( doTheJump ) goto jump_to_p2;
++case OP_IsType: {        /* jump */
++  VdbeCursor *pC;
++  u16 typeMask;
++  u32 serialType;
++
++  assert( pOp->p1>=(-1) && pOp->p1nCursor );
++  assert( pOp->p1>=0 || (pOp->p3>=0 && pOp->p3<=(p->nMem+1 - p->nCursor)) );
++  if( pOp->p1>=0 ){
++    pC = p->apCsr[pOp->p1];
++    assert( pC!=0 );
++    assert( pOp->p3>=0 );
++    if( pOp->p3nHdrParsed ){
++      serialType = pC->aType[pOp->p3];
++      if( serialType>=12 ){
++        if( serialType&1 ){
++          typeMask = 0x04;   /* SQLITE_TEXT */
++        }else{
++          typeMask = 0x08;   /* SQLITE_BLOB */
++        }
++      }else{
++        static const unsigned char aMask[] = {
++           0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x2,
++           0x01, 0x01, 0x10, 0x10
++        };
++        testcase( serialType==0 );
++        testcase( serialType==1 );
++        testcase( serialType==2 );
++        testcase( serialType==3 );
++        testcase( serialType==4 );
++        testcase( serialType==5 );
++        testcase( serialType==6 );
++        testcase( serialType==7 );
++        testcase( serialType==8 );
++        testcase( serialType==9 );
++        testcase( serialType==10 );
++        testcase( serialType==11 );
++        typeMask = aMask[serialType];
++      }
++    }else{
++      typeMask = 1 << (pOp->p4.i - 1);
++      testcase( typeMask==0x01 );
++      testcase( typeMask==0x02 );
++      testcase( typeMask==0x04 );
++      testcase( typeMask==0x08 );
++      testcase( typeMask==0x10 );
++    }
++  }else{
++    assert( memIsValid(&aMem[pOp->p3]) );
++    typeMask = 1 << (sqlite3_value_type((sqlite3_value*)&aMem[pOp->p3])-1);
++    testcase( typeMask==0x01 );
++    testcase( typeMask==0x02 );
++    testcase( typeMask==0x04 );
++    testcase( typeMask==0x08 );
++    testcase( typeMask==0x10 );
++  }
++  VdbeBranchTaken( (typeMask & pOp->p5)!=0, 2);
++  if( typeMask & pOp->p5 ){
++    goto jump_to_p2;
++  }
+   break;
+ }
+ 
+ /* Opcode: ZeroOrNull P1 P2 P3 * *
+ ** Synopsis: r[P2] = 0 OR NULL
+ **
+-** If all both registers P1 and P3 are NOT NULL, then store a zero in
++** If both registers P1 and P3 are NOT NULL, then store a zero in
+ ** register P2.  If either registers P1 or P3 are NULL then put
+ ** a NULL in register P2.
+ */
+@@ -91008,11 +95542,14 @@ case OP_NotNull: {            /* same as TK_NOTNULL, jump, in1 */
+ ** If it is, then set register P3 to NULL and jump immediately to P2.
+ ** If P1 is not on a NULL row, then fall through without making any
+ ** changes.
++**
++** If P1 is not an open cursor, then this opcode is a no-op.
+ */
+ case OP_IfNullRow: {         /* jump */
++  VdbeCursor *pC;
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+-  assert( p->apCsr[pOp->p1]!=0 );
+-  if( p->apCsr[pOp->p1]->nullRow ){
++  pC = p->apCsr[pOp->p1];
++  if( pC && pC->nullRow ){
+     sqlite3VdbeMemSetNull(aMem + pOp->p3);
+     goto jump_to_p2;
+   }
+@@ -91063,7 +95600,7 @@ case OP_Offset: {          /* out3 */
+ ** Interpret the data that cursor P1 points to as a structure built using
+ ** the MakeRecord instruction.  (See the MakeRecord opcode for additional
+ ** information about the format of the data.)  Extract the P2-th column
+-** from this record.  If there are less that (P2+1)
++** from this record.  If there are less than (P2+1)
+ ** values in the record, extract a NULL.
+ **
+ ** The value extracted is stored in register P3.
+@@ -91072,12 +95609,14 @@ case OP_Offset: {          /* out3 */
+ ** if the P4 argument is a P4_MEM use the value of the P4 argument as
+ ** the result.
+ **
+-** If the OPFLAG_LENGTHARG and OPFLAG_TYPEOFARG bits are set on P5 then
+-** the result is guaranteed to only be used as the argument of a length()
+-** or typeof() function, respectively.  The loading of large blobs can be
+-** skipped for length() and all content loading can be skipped for typeof().
++** If the OPFLAG_LENGTHARG bit is set in P5 then the result is guaranteed
++** to only be used by the length() function or the equivalent.  The content
++** of large blobs is not loaded, thus saving CPU cycles.  If the
++** OPFLAG_TYPEOFARG bit is set then the result will only be used by the
++** typeof() function or the IS NULL or IS NOT NULL operators or the
++** equivalent.  In this case, all content loading can be omitted.
+ */
+-case OP_Column: {
++case OP_Column: {            /* ncycle */
+   u32 p2;            /* column number to retrieve */
+   VdbeCursor *pC;    /* The VDBE cursor */
+   BtCursor *pCrsr;   /* The B-Tree cursor corresponding to pC */
+@@ -91321,11 +95860,16 @@ op_column_restart:
+       pDest->flags = aFlag[t&1];
+     }
+   }else{
++    u8 p5;
+     pDest->enc = encoding;
++    assert( pDest->db==db );
+     /* This branch happens only when content is on overflow pages */
+-    if( ((pOp->p5 & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))!=0
+-          && ((t>=12 && (t&1)==0) || (pOp->p5 & OPFLAG_TYPEOFARG)!=0))
+-     || (len = sqlite3VdbeSerialTypeLen(t))==0
++    if( ((p5 = (pOp->p5 & OPFLAG_BYTELENARG))!=0
++          && (p5==OPFLAG_TYPEOFARG
++              || (t>=12 && ((t&1)==0 || p5==OPFLAG_BYTELENARG))
++             )
++        )
++     || sqlite3VdbeSerialTypeLen(t)==0
+     ){
+       /* Content is irrelevant for
+       **    1. the typeof() function,
+@@ -91342,11 +95886,13 @@ op_column_restart:
+       */
+       sqlite3VdbeSerialGet((u8*)sqlite3CtypeMap, t, pDest);
+     }else{
+-      if( len>db->aLimit[SQLITE_LIMIT_LENGTH] ) goto too_big;
+-      rc = sqlite3VdbeMemFromBtree(pC->uc.pCursor, aOffset[p2], len, pDest);
+-      if( rc!=SQLITE_OK ) goto abort_due_to_error;
+-      sqlite3VdbeSerialGet((const u8*)pDest->z, t, pDest);
+-      pDest->flags &= ~MEM_Ephem;
++      rc = vdbeColumnFromOverflow(pC, p2, t, aOffset[p2],
++                p->cacheCtr, colCacheCtr, pDest);
++      if( rc ){
++        if( rc==SQLITE_NOMEM ) goto no_mem;
++        if( rc==SQLITE_TOOBIG ) goto too_big;
++        goto abort_due_to_error;
++      }
+     }
+   }
+ 
+@@ -91426,7 +95972,7 @@ case OP_TypeCheck: {
+         }
+         case COLTYPE_REAL: {
+           testcase( (pIn1->flags & (MEM_Real|MEM_IntReal))==MEM_Real );
+-          testcase( (pIn1->flags & (MEM_Real|MEM_IntReal))==MEM_IntReal );
++          assert( (pIn1->flags & MEM_IntReal)==0 );
+           if( pIn1->flags & MEM_Int ){
+             /* When applying REAL affinity, if the result is still an MEM_Int
+             ** that will fit in 6 bytes, then change the type to MEM_IntReal
+@@ -91505,7 +96051,7 @@ case OP_Affinity: {
+       }else{
+         pIn1->u.r = (double)pIn1->u.i;
+         pIn1->flags |= MEM_Real;
+-        pIn1->flags &= ~MEM_Int;
++        pIn1->flags &= ~(MEM_Int|MEM_Str);
+       }
+     }
+     REGISTER_TRACE((int)(pIn1-aMem), pIn1);
+@@ -91808,7 +96354,6 @@ case OP_MakeRecord: {
+         /* NULL value.  No change in zPayload */
+       }else{
+         u64 v;
+-        u32 i;
+         if( serial_type==7 ){
+           assert( sizeof(v)==sizeof(pRec->u.r) );
+           memcpy(&v, &pRec->u.r, sizeof(v));
+@@ -91816,12 +96361,17 @@ case OP_MakeRecord: {
+         }else{
+           v = pRec->u.i;
+         }
+-        len = i = sqlite3SmallTypeSizes[serial_type];
+-        assert( i>0 );
+-        while( 1 /*exit-by-break*/ ){
+-          zPayload[--i] = (u8)(v&0xFF);
+-          if( i==0 ) break;
+-          v >>= 8;
++        len = sqlite3SmallTypeSizes[serial_type];
++        assert( len>=1 && len<=8 && len!=5 && len!=7 );
++        switch( len ){
++          default: zPayload[7] = (u8)(v&0xff); v >>= 8;
++                   zPayload[6] = (u8)(v&0xff); v >>= 8;
++          case 6:  zPayload[5] = (u8)(v&0xff); v >>= 8;
++                   zPayload[4] = (u8)(v&0xff); v >>= 8;
++          case 4:  zPayload[3] = (u8)(v&0xff); v >>= 8;
++          case 3:  zPayload[2] = (u8)(v&0xff); v >>= 8;
++          case 2:  zPayload[1] = (u8)(v&0xff); v >>= 8;
++          case 1:  zPayload[0] = (u8)(v&0xff);
+         }
+         zPayload += len;
+       }
+@@ -92429,7 +96979,7 @@ case OP_SetCookie: {
+ **
+ ** See also: OP_OpenRead, OP_ReopenIdx
+ */
+-case OP_ReopenIdx: {
++case OP_ReopenIdx: {         /* ncycle */
+   int nField;
+   KeyInfo *pKeyInfo;
+   u32 p2;
+@@ -92450,7 +97000,7 @@ case OP_ReopenIdx: {
+   }
+   /* If the cursor is not currently open or is open on a different
+   ** index, then fall through into OP_OpenRead to force a reopen */
+-case OP_OpenRead:
++case OP_OpenRead:            /* ncycle */
+ case OP_OpenWrite:
+ 
+   assert( pOp->opcode==OP_OpenWrite || pOp->p5==0 || pOp->p5==OPFLAG_SEEKEQ );
+@@ -92544,7 +97094,7 @@ open_cursor_set_hints:
+ **
+ ** Duplicate ephemeral cursors are used for self-joins of materialized views.
+ */
+-case OP_OpenDup: {
++case OP_OpenDup: {           /* ncycle */
+   VdbeCursor *pOrig;    /* The original cursor to be duplicated */
+   VdbeCursor *pCx;      /* The new cursor */
+ 
+@@ -92606,8 +97156,8 @@ case OP_OpenDup: {
+ ** by this opcode will be used for automatically created transient
+ ** indices in joins.
+ */
+-case OP_OpenAutoindex:
+-case OP_OpenEphemeral: {
++case OP_OpenAutoindex:       /* ncycle */
++case OP_OpenEphemeral: {     /* ncycle */
+   VdbeCursor *pCx;
+   KeyInfo *pKeyInfo;
+ 
+@@ -92630,7 +97180,7 @@ case OP_OpenEphemeral: {
+   }
+   pCx = p->apCsr[pOp->p1];
+   if( pCx && !pCx->noReuse &&  ALWAYS(pOp->p2<=pCx->nField) ){
+-    /* If the ephermeral table is already open and has no duplicates from
++    /* If the ephemeral table is already open and has no duplicates from
+     ** OP_OpenDup, then erase all existing content so that the table is
+     ** empty again, rather than creating a new table. */
+     assert( pCx->isEphemeral );
+@@ -92765,7 +97315,7 @@ case OP_OpenPseudo: {
+ ** Close a cursor previously opened as P1.  If P1 is not
+ ** currently open, this instruction is a no-op.
+ */
+-case OP_Close: {
++case OP_Close: {             /* ncycle */
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+   sqlite3VdbeFreeCursor(p, p->apCsr[pOp->p1]);
+   p->apCsr[pOp->p1] = 0;
+@@ -92882,10 +97432,10 @@ case OP_ColumnsUsed: {
+ **
+ ** See also: Found, NotFound, SeekGt, SeekGe, SeekLt
+ */
+-case OP_SeekLT:         /* jump, in3, group */
+-case OP_SeekLE:         /* jump, in3, group */
+-case OP_SeekGE:         /* jump, in3, group */
+-case OP_SeekGT: {       /* jump, in3, group */
++case OP_SeekLT:         /* jump, in3, group, ncycle */
++case OP_SeekLE:         /* jump, in3, group, ncycle */
++case OP_SeekGE:         /* jump, in3, group, ncycle */
++case OP_SeekGT: {       /* jump, in3, group, ncycle */
+   int res;           /* Comparison result */
+   int oc;            /* Opcode */
+   VdbeCursor *pC;    /* The cursor to seek */
+@@ -93014,7 +97564,13 @@ case OP_SeekGT: {       /* jump, in3, group */
+ 
+     r.aMem = &aMem[pOp->p3];
+ #ifdef SQLITE_DEBUG
+-    { int i; for(i=0; i0 ) REGISTER_TRACE(pOp->p3+i, &r.aMem[i]);
++      }
++    }
+ #endif
+     r.eqSeen = 0;
+     rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, &r, &res);
+@@ -93077,7 +97633,7 @@ seek_not_found:
+ }
+ 
+ 
+-/* Opcode: SeekScan  P1 P2 * * *
++/* Opcode: SeekScan  P1 P2 * * P5
+ ** Synopsis: Scan-ahead up to P1 rows
+ **
+ ** This opcode is a prefix opcode to OP_SeekGE.  In other words, this
+@@ -93087,8 +97643,8 @@ seek_not_found:
+ ** This opcode uses the P1 through P4 operands of the subsequent
+ ** OP_SeekGE.  In the text that follows, the operands of the subsequent
+ ** OP_SeekGE opcode are denoted as SeekOP.P1 through SeekOP.P4.   Only
+-** the P1 and P2 operands of this opcode are also used, and  are called
+-** This.P1 and This.P2.
++** the P1, P2 and P5 operands of this opcode are also used, and  are called
++** This.P1, This.P2 and This.P5.
+ **
+ ** This opcode helps to optimize IN operators on a multi-column index
+ ** where the IN operator is on the later terms of the index by avoiding
+@@ -93098,32 +97654,54 @@ seek_not_found:
+ **
+ ** The SeekGE.P3 and SeekGE.P4 operands identify an unpacked key which
+ ** is the desired entry that we want the cursor SeekGE.P1 to be pointing
+-** to.  Call this SeekGE.P4/P5 row the "target".
++** to.  Call this SeekGE.P3/P4 row the "target".
+ **
+ ** If the SeekGE.P1 cursor is not currently pointing to a valid row,
+ ** then this opcode is a no-op and control passes through into the OP_SeekGE.
+ **
+ ** If the SeekGE.P1 cursor is pointing to a valid row, then that row
+ ** might be the target row, or it might be near and slightly before the
+-** target row.  This opcode attempts to position the cursor on the target
+-** row by, perhaps by invoking sqlite3BtreeStep() on the cursor
+-** between 0 and This.P1 times.
+-**
+-** There are three possible outcomes from this opcode:
      
+-**
+-** 
    1.  If after This.P1 steps, the cursor is still pointing to a place that
+-**      is earlier in the btree than the target row, then fall through
+-**      into the subsquence OP_SeekGE opcode.
+-**
+-** 
    2.  If the cursor is successfully moved to the target row by 0 or more
+-**      sqlite3BtreeNext() calls, then jump to This.P2, which will land just
+-**      past the OP_IdxGT or OP_IdxGE opcode that follows the OP_SeekGE.
+-**
+-** 
    3.  If the cursor ends up past the target row (indicating the the target
+-**      row does not exist in the btree) then jump to SeekOP.P2.
++** target row, or it might be after the target row.  If the cursor is
++** currently before the target row, then this opcode attempts to position
++** the cursor on or after the target row by invoking sqlite3BtreeStep()
++** on the cursor between 1 and This.P1 times.
++**
++** The This.P5 parameter is a flag that indicates what to do if the
++** cursor ends up pointing at a valid row that is past the target
++** row.  If This.P5 is false (0) then a jump is made to SeekGE.P2.  If
++** This.P5 is true (non-zero) then a jump is made to This.P2.  The P5==0
++** case occurs when there are no inequality constraints to the right of
++** the IN constraint.  The jump to SeekGE.P2 ends the loop.  The P5!=0 case
++** occurs when there are inequality constraints to the right of the IN
++** operator.  In that case, the This.P2 will point either directly to or
++** to setup code prior to the OP_IdxGT or OP_IdxGE opcode that checks for
++** loop terminate.
++**
++** Possible outcomes from this opcode:
        
++**
++** 
      1.  If the cursor is initially not pointed to any valid row, then
++**      fall through into the subsequent OP_SeekGE opcode.
++**
++** 
      2.  If the cursor is left pointing to a row that is before the target
++**      row, even after making as many as This.P1 calls to
++**      sqlite3BtreeNext(), then also fall through into OP_SeekGE.
++**
++** 
      3.  If the cursor is left pointing at the target row, either because it
++**      was at the target row to begin with or because one or more
++**      sqlite3BtreeNext() calls moved the cursor to the target row,
++**      then jump to This.P2..,
++**
++** 
      4.  If the cursor started out before the target row and a call to
++**      to sqlite3BtreeNext() moved the cursor off the end of the index
++**      (indicating that the target row definitely does not exist in the
++**      btree) then jump to SeekGE.P2, ending the loop.
++**
++** 
      5.  If the cursor ends up on a valid row that is past the target row
++**      (indicating that the target row does not exist in the btree) then
++**      jump to SeekOP.P2 if This.P5==0 or to This.P2 if This.P5>0.
+ ** 
      
+ */
+-case OP_SeekScan: {
++case OP_SeekScan: {          /* ncycle */
+   VdbeCursor *pC;
+   int res;
+   int nStep;
+@@ -93131,14 +97709,25 @@ case OP_SeekScan: {
+ 
+   assert( pOp[1].opcode==OP_SeekGE );
+ 
+-  /* pOp->p2 points to the first instruction past the OP_IdxGT that
+-  ** follows the OP_SeekGE.  */
++  /* If pOp->p5 is clear, then pOp->p2 points to the first instruction past the
++  ** OP_IdxGT that follows the OP_SeekGE. Otherwise, it points to the first
++  ** opcode past the OP_SeekGE itself.  */
+   assert( pOp->p2>=(int)(pOp-aOp)+2 );
+-  assert( aOp[pOp->p2-1].opcode==OP_IdxGT || aOp[pOp->p2-1].opcode==OP_IdxGE );
+-  testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
+-  assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
+-  assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
+-  assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
++#ifdef SQLITE_DEBUG
++  if( pOp->p5==0 ){
++    /* There are no inequality constraints following the IN constraint. */
++    assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
++    assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
++    assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
++    assert( aOp[pOp->p2-1].opcode==OP_IdxGT
++         || aOp[pOp->p2-1].opcode==OP_IdxGE );
++    testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
++  }else{
++    /* There are inequality constraints.  */
++    assert( pOp->p2==(int)(pOp-aOp)+2 );
++    assert( aOp[pOp->p2-1].opcode==OP_SeekGE );
++  }
++#endif
+ 
+   assert( pOp->p1>0 );
+   pC = p->apCsr[pOp[1].p1];
+@@ -93172,8 +97761,9 @@ case OP_SeekScan: {
+   while(1){
+     rc = sqlite3VdbeIdxKeyCompare(db, pC, &r, &res);
+     if( rc ) goto abort_due_to_error;
+-    if( res>0 ){
++    if( res>0 && pOp->p5==0 ){
+       seekscan_search_fail:
++      /* Jump to SeekGE.P2, ending the loop */
+ #ifdef SQLITE_DEBUG
+       if( db->flags&SQLITE_VdbeTrace ){
+         printf("... %d steps and then skip\n", pOp->p1 - nStep);
+@@ -93183,7 +97773,8 @@ case OP_SeekScan: {
+       pOp++;
+       goto jump_to_p2;
+     }
+-    if( res==0 ){
++    if( res>=0 ){
++      /* Jump to This.P2, bypassing the OP_SeekGE opcode */
+ #ifdef SQLITE_DEBUG
+       if( db->flags&SQLITE_VdbeTrace ){
+         printf("... %d steps and then success\n", pOp->p1 - nStep);
+@@ -93203,6 +97794,7 @@ case OP_SeekScan: {
+       break;
+     }
+     nStep--;
++    pC->cacheStatus = CACHE_STALE;
+     rc = sqlite3BtreeNext(pC->uc.pCursor, 0);
+     if( rc ){
+       if( rc==SQLITE_DONE ){
+@@ -93232,7 +97824,7 @@ case OP_SeekScan: {
+ **
+ ** P1 must be a valid b-tree cursor.
+ */
+-case OP_SeekHit: {
++case OP_SeekHit: {           /* ncycle */
+   VdbeCursor *pC;
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+   pC = p->apCsr[pOp->p1];
+@@ -93259,12 +97851,16 @@ case OP_SeekHit: {
+ /* Opcode: IfNotOpen P1 P2 * * *
+ ** Synopsis: if( !csr[P1] ) goto P2
+ **
+-** If cursor P1 is not open, jump to instruction P2. Otherwise, fall through.
++** If cursor P1 is not open or if P1 is set to a NULL row using the
++** OP_NullRow opcode, then jump to instruction P2. Otherwise, fall through.
+ */
+ case OP_IfNotOpen: {        /* jump */
++  VdbeCursor *pCur;
++
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+-  VdbeBranchTaken(p->apCsr[pOp->p1]==0, 2);
+-  if( !p->apCsr[pOp->p1] ){
++  pCur = p->apCsr[pOp->p1];
++  VdbeBranchTaken(pCur==0 || pCur->nullRow, 2);
++  if( pCur==0 || pCur->nullRow ){
+     goto jump_to_p2_and_check_for_interrupt;
+   }
+   break;
+@@ -93315,13 +97911,13 @@ case OP_IfNotOpen: {        /* jump */
+ ** operands to OP_NotFound and OP_IdxGT.
+ **
+ ** This opcode is an optimization attempt only.  If this opcode always
+-** falls through, the correct answer is still obtained, but extra works
++** falls through, the correct answer is still obtained, but extra work
+ ** is performed.
+ **
+ ** A value of N in the seekHit flag of cursor P1 means that there exists
+ ** a key P3:N that will match some record in the index.  We want to know
+ ** if it is possible for a record P3:P4 to match some record in the
+-** index.  If it is not possible, we can skips some work.  So if seekHit
++** index.  If it is not possible, we can skip some work.  So if seekHit
+ ** is less than P4, attempt to find out if a match is possible by running
+ ** OP_NotFound.
+ **
+@@ -93360,7 +97956,7 @@ case OP_IfNotOpen: {        /* jump */
+ **
+ ** See also: NotFound, Found, NotExists
+ */
+-case OP_IfNoHope: {     /* jump, in3 */
++case OP_IfNoHope: {     /* jump, in3, ncycle */
+   VdbeCursor *pC;
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+   pC = p->apCsr[pOp->p1];
+@@ -93374,9 +97970,9 @@ case OP_IfNoHope: {     /* jump, in3 */
+   /* Fall through into OP_NotFound */
+   /* no break */ deliberate_fall_through
+ }
+-case OP_NoConflict:     /* jump, in3 */
+-case OP_NotFound:       /* jump, in3 */
+-case OP_Found: {        /* jump, in3 */
++case OP_NoConflict:     /* jump, in3, ncycle */
++case OP_NotFound:       /* jump, in3, ncycle */
++case OP_Found: {        /* jump, in3, ncycle */
+   int alreadyExists;
+   int ii;
+   VdbeCursor *pC;
+@@ -93506,7 +98102,7 @@ case OP_Found: {        /* jump, in3 */
+ **
+ ** See also: Found, NotFound, NoConflict, SeekRowid
+ */
+-case OP_SeekRowid: {        /* jump, in3 */
++case OP_SeekRowid: {        /* jump, in3, ncycle */
+   VdbeCursor *pC;
+   BtCursor *pCrsr;
+   int res;
+@@ -93531,7 +98127,7 @@ case OP_SeekRowid: {        /* jump, in3 */
+   }
+   /* Fall through into OP_NotExists */
+   /* no break */ deliberate_fall_through
+-case OP_NotExists:          /* jump, in3 */
++case OP_NotExists:          /* jump, in3, ncycle */
+   pIn3 = &aMem[pOp->p3];
+   assert( (pIn3->flags & MEM_Int)!=0 || pOp->opcode==OP_SeekRowid );
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+@@ -93811,8 +98407,11 @@ case OP_Insert: {
+   if( pOp->p5 & OPFLAG_ISNOOP ) break;
+ #endif
+ 
+-  if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
+-  if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
++  assert( (pOp->p5 & OPFLAG_LASTROWID)==0 || (pOp->p5 & OPFLAG_NCHANGE)!=0 );
++  if( pOp->p5 & OPFLAG_NCHANGE ){
++    p->nChange++;
++    if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
++  }
+   assert( (pData->flags & (MEM_Blob|MEM_Str))!=0 || pData->n==0 );
+   x.pData = pData->z;
+   x.nData = pData->n;
+@@ -93823,12 +98422,14 @@ case OP_Insert: {
+     x.nZero = 0;
+   }
+   x.pKey = 0;
++  assert( BTREE_PREFORMAT==OPFLAG_PREFORMAT );
+   rc = sqlite3BtreeInsert(pC->uc.pCursor, &x,
+       (pOp->p5 & (OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT)),
+       seekResult
+   );
+   pC->deferredMoveto = 0;
+   pC->cacheStatus = CACHE_STALE;
++  colCacheCtr++;
+ 
+   /* Invoke the update-hook if required. */
+   if( rc ) goto abort_due_to_error;
+@@ -93882,13 +98483,18 @@ case OP_RowCell: {
+ ** left in an undefined state.
+ **
+ ** If the OPFLAG_AUXDELETE bit is set on P5, that indicates that this
+-** delete one of several associated with deleting a table row and all its
+-** associated index entries.  Exactly one of those deletes is the "primary"
+-** delete.  The others are all on OPFLAG_FORDELETE cursors or else are
+-** marked with the AUXDELETE flag.
++** delete is one of several associated with deleting a table row and
++** all its associated index entries.  Exactly one of those deletes is
++** the "primary" delete.  The others are all on OPFLAG_FORDELETE
++** cursors or else are marked with the AUXDELETE flag.
++**
++** If the OPFLAG_NCHANGE (0x01) flag of P2 (NB: P2 not P5) is set, then
++** the row change count is incremented (otherwise not).
+ **
+-** If the OPFLAG_NCHANGE flag of P2 (NB: P2 not P5) is set, then the row
+-** change count is incremented (otherwise not).
++** If the OPFLAG_ISNOOP (0x40) flag of P2 (not P5!) is set, then the
++** pre-update-hook for deletes is run, but the btree is otherwise unchanged.
++** This happens when the OP_Delete is to be shortly followed by an OP_Insert
++** with the same key, causing the btree entry to be overwritten.
+ **
+ ** P1 must not be pseudo-table.  It has to be a real table with
+ ** multiple rows.
+@@ -93989,6 +98595,7 @@ case OP_Delete: {
+ 
+   rc = sqlite3BtreeDelete(pC->uc.pCursor, pOp->p5);
+   pC->cacheStatus = CACHE_STALE;
++  colCacheCtr++;
+   pC->seekResult = 0;
+   if( rc ) goto abort_due_to_error;
+ 
+@@ -94056,13 +98663,13 @@ case OP_SorterCompare: {
+ ** Write into register P2 the current sorter data for sorter cursor P1.
+ ** Then clear the column header cache on cursor P3.
+ **
+-** This opcode is normally use to move a record out of the sorter and into
++** This opcode is normally used to move a record out of the sorter and into
+ ** a register that is the source for a pseudo-table cursor created using
+ ** OpenPseudo.  That pseudo-table cursor is the one that is identified by
+ ** parameter P3.  Clearing the P3 column cache as part of this opcode saves
+ ** us from having to issue a separate NullRow instruction to clear that cache.
+ */
+-case OP_SorterData: {
++case OP_SorterData: {       /* ncycle */
+   VdbeCursor *pC;
+ 
+   pOut = &aMem[pOp->p2];
+@@ -94154,7 +98761,7 @@ case OP_RowData: {
+ ** be a separate OP_VRowid opcode for use with virtual tables, but this
+ ** one opcode now works for both table types.
+ */
+-case OP_Rowid: {                 /* out2 */
++case OP_Rowid: {                 /* out2, ncycle */
+   VdbeCursor *pC;
+   i64 v;
+   sqlite3_vtab *pVtab;
+@@ -94253,8 +98860,8 @@ case OP_NullRow: {
+ ** from the end toward the beginning.  In other words, the cursor is
+ ** configured to use Prev, not Next.
+ */
+-case OP_SeekEnd:
+-case OP_Last: {        /* jump */
++case OP_SeekEnd:             /* ncycle */
++case OP_Last: {              /* jump, ncycle */
+   VdbeCursor *pC;
+   BtCursor *pCrsr;
+   int res;
+@@ -94337,8 +98944,8 @@ case OP_IfSmaller: {        /* jump */
+ ** regression tests can determine whether or not the optimizer is
+ ** correctly optimizing out sorts.
+ */
+-case OP_SorterSort:    /* jump */
+-case OP_Sort: {        /* jump */
++case OP_SorterSort:    /* jump ncycle */
++case OP_Sort: {        /* jump ncycle */
+ #ifdef SQLITE_TEST
+   sqlite3_sort_count++;
+   sqlite3_search_count--;
+@@ -94355,17 +98962,22 @@ case OP_Sort: {        /* jump */
+ ** If the table or index is not empty, fall through to the following
+ ** instruction.
+ **
++** If P2 is zero, that is an assertion that the P1 table is never
++** empty and hence the jump will never be taken.
++**
+ ** This opcode leaves the cursor configured to move in forward order,
+ ** from the beginning toward the end.  In other words, the cursor is
+ ** configured to use Next, not Prev.
+ */
+-case OP_Rewind: {        /* jump */
++case OP_Rewind: {        /* jump, ncycle */
+   VdbeCursor *pC;
+   BtCursor *pCrsr;
+   int res;
+ 
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+   assert( pOp->p5==0 );
++  assert( pOp->p2>=0 && pOp->p2nOp );
++
+   pC = p->apCsr[pOp->p1];
+   assert( pC!=0 );
+   assert( isSorter(pC)==(pOp->opcode==OP_SorterSort) );
+@@ -94385,9 +98997,10 @@ case OP_Rewind: {        /* jump */
+   }
+   if( rc ) goto abort_due_to_error;
+   pC->nullRow = (u8)res;
+-  assert( pOp->p2>0 && pOp->p2nOp );
+-  VdbeBranchTaken(res!=0,2);
+-  if( res ) goto jump_to_p2;
++  if( pOp->p2>0 ){
++    VdbeBranchTaken(res!=0,2);
++    if( res ) goto jump_to_p2;
++  }
+   break;
+ }
+ 
+@@ -94453,9 +99066,11 @@ case OP_SorterNext: {  /* jump */
+   rc = sqlite3VdbeSorterNext(db, pC);
+   goto next_tail;
+ 
+-case OP_Prev:          /* jump */
++case OP_Prev:          /* jump, ncycle */
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+-  assert( pOp->p5aCounter) );
++  assert( pOp->p5==0
++       || pOp->p5==SQLITE_STMTSTATUS_FULLSCAN_STEP
++       || pOp->p5==SQLITE_STMTSTATUS_AUTOINDEX);
+   pC = p->apCsr[pOp->p1];
+   assert( pC!=0 );
+   assert( pC->deferredMoveto==0 );
+@@ -94466,9 +99081,11 @@ case OP_Prev:          /* jump */
+   rc = sqlite3BtreePrevious(pC->uc.pCursor, pOp->p3);
+   goto next_tail;
+ 
+-case OP_Next:          /* jump */
++case OP_Next:          /* jump, ncycle */
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+-  assert( pOp->p5aCounter) );
++  assert( pOp->p5==0
++       || pOp->p5==SQLITE_STMTSTATUS_FULLSCAN_STEP
++       || pOp->p5==SQLITE_STMTSTATUS_AUTOINDEX);
+   pC = p->apCsr[pOp->p1];
+   assert( pC!=0 );
+   assert( pC->deferredMoveto==0 );
+@@ -94656,8 +99273,8 @@ case OP_IdxDelete: {
+ **
+ ** See also: Rowid, MakeRecord.
+ */
+-case OP_DeferredSeek:
+-case OP_IdxRowid: {           /* out2 */
++case OP_DeferredSeek:         /* ncycle */
++case OP_IdxRowid: {           /* out2, ncycle */
+   VdbeCursor *pC;             /* The P1 index cursor */
+   VdbeCursor *pTabCur;        /* The P2 table cursor (OP_DeferredSeek only) */
+   i64 rowid;                  /* Rowid that P1 current points to */
+@@ -94675,10 +99292,10 @@ case OP_IdxRowid: {           /* out2 */
+   ** of sqlite3VdbeCursorRestore() and sqlite3VdbeIdxRowid(). */
+   rc = sqlite3VdbeCursorRestore(pC);
+ 
+-  /* sqlite3VbeCursorRestore() can only fail if the record has been deleted
+-  ** out from under the cursor.  That will never happens for an IdxRowid
+-  ** or Seek opcode */
+-  if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error;
++  /* sqlite3VdbeCursorRestore() may fail if the cursor has been disturbed
++  ** since it was last positioned and an error (e.g. OOM or an IO error)
++  ** occurs while trying to reposition it. */
++  if( rc!=SQLITE_OK ) goto abort_due_to_error;
+ 
+   if( !pC->nullRow ){
+     rowid = 0;  /* Not needed.  Only used to silence a warning. */
+@@ -94719,8 +99336,8 @@ case OP_IdxRowid: {           /* out2 */
+ ** seek operation now, without further delay.  If the cursor seek has
+ ** already occurred, this instruction is a no-op.
+ */
+-case OP_FinishSeek: {
+-  VdbeCursor *pC;             /* The P1 index cursor */
++case OP_FinishSeek: {        /* ncycle */
++  VdbeCursor *pC;            /* The P1 index cursor */
+ 
+   assert( pOp->p1>=0 && pOp->p1nCursor );
+   pC = p->apCsr[pOp->p1];
+@@ -94775,10 +99392,10 @@ case OP_FinishSeek: {
+ ** If the P1 index entry is less than or equal to the key value then jump
+ ** to P2. Otherwise fall through to the next instruction.
+ */
+-case OP_IdxLE:          /* jump */
+-case OP_IdxGT:          /* jump */
+-case OP_IdxLT:          /* jump */
+-case OP_IdxGE:  {       /* jump */
++case OP_IdxLE:          /* jump, ncycle */
++case OP_IdxGT:          /* jump, ncycle */
++case OP_IdxLT:          /* jump, ncycle */
++case OP_IdxGE:  {       /* jump, ncycle */
+   VdbeCursor *pC;
+   int res;
+   UnpackedRecord r;
+@@ -94855,7 +99472,7 @@ case OP_IdxGE:  {       /* jump */
+ ** file is given by P1.
+ **
+ ** The table being destroyed is in the main database file if P3==0.  If
+-** P3==1 then the table to be clear is in the auxiliary database file
++** P3==1 then the table to be destroyed is in the auxiliary database file
+ ** that is used to store tables create using CREATE TEMPORARY TABLE.
+ **
+ ** If AUTOVACUUM is enabled then it is possible that another root page
+@@ -94915,8 +99532,8 @@ case OP_Destroy: {     /* out2 */
+ ** in the database file is given by P1.  But, unlike Destroy, do not
+ ** remove the table or index from the database file.
+ **
+-** The table being clear is in the main database file if P2==0.  If
+-** P2==1 then the table to be clear is in the auxiliary database file
++** The table being cleared is in the main database file if P2==0.  If
++** P2==1 then the table to be cleared is in the auxiliary database file
+ ** that is used to store tables create using CREATE TEMPORARY TABLE.
+ **
+ ** If the P3 value is non-zero, then the row change count is incremented
+@@ -95002,13 +99619,41 @@ case OP_CreateBtree: {          /* out2 */
+ /* Opcode: SqlExec * * * P4 *
+ **
+ ** Run the SQL statement or statements specified in the P4 string.
++** Disable Auth and Trace callbacks while those statements are running if
++** P1 is true.
+ */
+ case OP_SqlExec: {
++  char *zErr;
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  sqlite3_xauth xAuth;
++#endif
++  u8 mTrace;
++
+   sqlite3VdbeIncrWriteCounter(p, 0);
+   db->nSqlExec++;
+-  rc = sqlite3_exec(db, pOp->p4.z, 0, 0, 0);
++  zErr = 0;
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  xAuth = db->xAuth;
++#endif
++  mTrace = db->mTrace;
++  if( pOp->p1 ){
++#ifndef SQLITE_OMIT_AUTHORIZATION
++    db->xAuth = 0;
++#endif
++    db->mTrace = 0;
++  }
++  rc = sqlite3_exec(db, pOp->p4.z, 0, 0, &zErr);
+   db->nSqlExec--;
+-  if( rc ) goto abort_due_to_error;
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  db->xAuth = xAuth;
++#endif
++  db->mTrace = mTrace;
++  if( zErr || rc ){
++    sqlite3VdbeError(p, "%s", zErr);
++    sqlite3_free(zErr);
++    if( rc==SQLITE_NOMEM ) goto no_mem;
++    goto abort_due_to_error;
++  }
+   break;
+ }
+ 
+@@ -95189,13 +99834,14 @@ case OP_IntegrityCk: {
+   pIn1 = &aMem[pOp->p1];
+   assert( pOp->p5nDb );
+   assert( DbMaskTest(p->btreeMask, pOp->p5) );
+-  z = sqlite3BtreeIntegrityCheck(db, db->aDb[pOp->p5].pBt, &aRoot[1], nRoot,
+-                                 (int)pnErr->u.i+1, &nErr);
++  rc = sqlite3BtreeIntegrityCheck(db, db->aDb[pOp->p5].pBt, &aRoot[1], nRoot,
++                                 (int)pnErr->u.i+1, &nErr, &z);
+   sqlite3VdbeMemSetNull(pIn1);
+   if( nErr==0 ){
+     assert( z==0 );
+-  }else if( z==0 ){
+-    goto no_mem;
++  }else if( rc ){
++    sqlite3_free(z);
++    goto abort_due_to_error;
+   }else{
+     pnErr->u.i -= nErr-1;
+     sqlite3VdbeMemSetStr(pIn1, z, -1, SQLITE_UTF8, sqlite3_free);
+@@ -95399,9 +100045,6 @@ case OP_Program: {        /* jump */
+     pFrame->aOp = p->aOp;
+     pFrame->nOp = p->nOp;
+     pFrame->token = pProgram->token;
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-    pFrame->anExec = p->anExec;
+-#endif
+ #ifdef SQLITE_DEBUG
+     pFrame->iFrameMagic = SQLITE_FRAME_MAGIC;
+ #endif
+@@ -95438,9 +100081,6 @@ case OP_Program: {        /* jump */
+   memset(pFrame->aOnce, 0, (pProgram->nOp + 7)/8);
+   p->aOp = aOp = pProgram->aOp;
+   p->nOp = pProgram->nOp;
+-#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
+-  p->anExec = 0;
+-#endif
+ #ifdef SQLITE_DEBUG
+   /* Verify that second and subsequent executions of the same trigger do not
+   ** try to reuse register values from the first use. */
+@@ -95580,7 +100220,7 @@ case OP_IfPos: {        /* jump, in1 */
+ ** Synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)
+ **
+ ** This opcode performs a commonly used computation associated with
+-** LIMIT and OFFSET process.  r[P1] holds the limit counter.  r[P3]
++** LIMIT and OFFSET processing.  r[P1] holds the limit counter.  r[P3]
+ ** holds the offset counter.  The opcode computes the combined value
+ ** of the LIMIT and OFFSET and stores that value in r[P2].  The r[P2]
+ ** value computed is the total number of rows that will need to be
+@@ -95747,7 +100387,7 @@ case OP_AggStep1: {
+   /* If this function is inside of a trigger, the register array in aMem[]
+   ** might change from one evaluation to the next.  The next block of code
+   ** checks to see if the register array has changed, and if so it
+-  ** reinitializes the relavant parts of the sqlite3_context object */
++  ** reinitializes the relevant parts of the sqlite3_context object */
+   if( pCtx->pMem != pMem ){
+     pCtx->pMem = pMem;
+     for(i=pCtx->argc-1; i>=0; i--) pCtx->argv[i] = &aMem[pOp->p2+i];
+@@ -95842,6 +100482,7 @@ case OP_AggFinal: {
+   }
+   sqlite3VdbeChangeEncoding(pMem, encoding);
+   UPDATE_MAX_BLOBSIZE(pMem);
++  REGISTER_TRACE((int)(pMem-aMem), pMem);
+   break;
+ }
+ 
+@@ -96197,7 +100838,7 @@ case OP_VDestroy: {
+ ** P1 is a cursor number.  This opcode opens a cursor to the virtual
+ ** table and stores that cursor in P1.
+ */
+-case OP_VOpen: {
++case OP_VOpen: {             /* ncycle */
+   VdbeCursor *pCur;
+   sqlite3_vtab_cursor *pVCur;
+   sqlite3_vtab *pVtab;
+@@ -96233,6 +100874,52 @@ case OP_VOpen: {
+ }
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+ 
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++/* Opcode: VCheck P1 P2 P3 P4 *
++**
++** P4 is a pointer to a Table object that is a virtual table in schema P1
++** that supports the xIntegrity() method.  This opcode runs the xIntegrity()
++** method for that virtual table, using P3 as the integer argument.  If
++** an error is reported back, the table name is prepended to the error
++** message and that message is stored in P2.  If no errors are seen,
++** register P2 is set to NULL.
++*/
++case OP_VCheck: {             /* out2 */
++  Table *pTab;
++  sqlite3_vtab *pVtab;
++  const sqlite3_module *pModule;
++  char *zErr = 0;
++
++  pOut = &aMem[pOp->p2];
++  sqlite3VdbeMemSetNull(pOut);  /* Innocent until proven guilty */
++  assert( pOp->p4type==P4_TABLEREF );
++  pTab = pOp->p4.pTab;
++  assert( pTab!=0 );
++  assert( pTab->nTabRef>0 );
++  assert( IsVirtual(pTab) );
++  if( pTab->u.vtab.p==0 ) break;
++  pVtab = pTab->u.vtab.p->pVtab;
++  assert( pVtab!=0 );
++  pModule = pVtab->pModule;
++  assert( pModule!=0 );
++  assert( pModule->iVersion>=4 );
++  assert( pModule->xIntegrity!=0 );
++  sqlite3VtabLock(pTab->u.vtab.p);
++  assert( pOp->p1>=0 && pOp->p1nDb );
++  rc = pModule->xIntegrity(pVtab, db->aDb[pOp->p1].zDbSName, pTab->zName,
++                           pOp->p3, &zErr);
++  sqlite3VtabUnlock(pTab->u.vtab.p);
++  if( rc ){
++    sqlite3_free(zErr);
++    goto abort_due_to_error;
++  }
++  if( zErr ){
++    sqlite3VdbeMemSetStr(pOut, zErr, -1, SQLITE_UTF8, sqlite3_free);
++  }
++  break;
++}
++#endif /* SQLITE_OMIT_VIRTUALTABLE */
++
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ /* Opcode: VInitIn P1 P2 P3 * *
+ ** Synopsis: r[P2]=ValueList(P1,P3)
+@@ -96244,7 +100931,7 @@ case OP_VOpen: {
+ ** cursor.  Register P3 is used to hold the values returned by
+ ** sqlite3_vtab_in_first() and sqlite3_vtab_in_next().
+ */
+-case OP_VInitIn: {        /* out2 */
++case OP_VInitIn: {        /* out2, ncycle */
+   VdbeCursor *pC;         /* The cursor containing the RHS values */
+   ValueList *pRhs;        /* New ValueList object to put in reg[P2] */
+ 
+@@ -96255,7 +100942,7 @@ case OP_VInitIn: {        /* out2 */
+   pRhs->pOut = &aMem[pOp->p3];
+   pOut = out2Prerelease(p, pOp);
+   pOut->flags = MEM_Null;
+-  sqlite3VdbeMemSetPointer(pOut, pRhs, "ValueList", sqlite3_free);
++  sqlite3VdbeMemSetPointer(pOut, pRhs, "ValueList", sqlite3VdbeValueListFree);
+   break;
+ }
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+@@ -96281,7 +100968,7 @@ case OP_VInitIn: {        /* out2 */
+ **
+ ** A jump is made to P2 if the result set after filtering would be empty.
+ */
+-case OP_VFilter: {   /* jump */
++case OP_VFilter: {   /* jump, ncycle */
+   int nArg;
+   int iQuery;
+   const sqlite3_module *pModule;
+@@ -96341,11 +101028,12 @@ case OP_VFilter: {   /* jump */
+ ** bits (OPFLAG_LENGTHARG or OPFLAG_TYPEOFARG) but those bits are
+ ** unused by OP_VColumn.
+ */
+-case OP_VColumn: {
++case OP_VColumn: {           /* ncycle */
+   sqlite3_vtab *pVtab;
+   const sqlite3_module *pModule;
+   Mem *pDest;
+   sqlite3_context sContext;
++  FuncDef nullFunc;
+ 
+   VdbeCursor *pCur = p->apCsr[pOp->p1];
+   assert( pCur!=0 );
+@@ -96363,6 +101051,9 @@ case OP_VColumn: {
+   memset(&sContext, 0, sizeof(sContext));
+   sContext.pOut = pDest;
+   sContext.enc = encoding;
++  nullFunc.pUserData = 0;
++  nullFunc.funcFlags = SQLITE_RESULT_SUBTYPE;
++  sContext.pFunc = &nullFunc;
+   assert( pOp->p5==OPFLAG_NOCHNG || pOp->p5==0 );
+   if( pOp->p5 & OPFLAG_NOCHNG ){
+     sqlite3VdbeMemSetNull(pDest);
+@@ -96393,7 +101084,7 @@ case OP_VColumn: {
+ ** jump to instruction P2.  Or, if the virtual table has reached
+ ** the end of its result set, then fall through to the next instruction.
+ */
+-case OP_VNext: {   /* jump */
++case OP_VNext: {   /* jump, ncycle */
+   sqlite3_vtab *pVtab;
+   const sqlite3_module *pModule;
+   int res;
+@@ -96624,7 +101315,7 @@ case OP_MaxPgcnt: {            /* out2 */
+ ** This opcode works exactly like OP_Function.  The only difference is in
+ ** its name.  This opcode is used in places where the function must be
+ ** purely non-deterministic.  Some built-in date/time functions can be
+-** either determinitic of non-deterministic, depending on their arguments.
++** either deterministic of non-deterministic, depending on their arguments.
+ ** When those function are used in a non-deterministic way, they will check
+ ** to see if they were called using OP_PureFunc instead of OP_Function, and
+ ** if they were, they throw an error.
+@@ -96642,7 +101333,7 @@ case OP_Function: {            /* group */
+   /* If this function is inside of a trigger, the register array in aMem[]
+   ** might change from one evaluation to the next.  The next block of code
+   ** checks to see if the register array has changed, and if so it
+-  ** reinitializes the relavant parts of the sqlite3_context object */
++  ** reinitializes the relevant parts of the sqlite3_context object */
+   pOut = &aMem[pOp->p3];
+   if( pCtx->pOut != pOut ){
+     pCtx->pVdbe = p;
+@@ -96695,6 +101386,42 @@ case OP_ClrSubtype: {   /* in1 */
+   break;
+ }
+ 
++/* Opcode: GetSubtype P1 P2 * * *
++** Synopsis:  r[P2] = r[P1].subtype
++**
++** Extract the subtype value from register P1 and write that subtype
++** into register P2.  If P1 has no subtype, then P1 gets a NULL.
++*/
++case OP_GetSubtype: {   /* in1 out2 */
++  pIn1 = &aMem[pOp->p1];
++  pOut = &aMem[pOp->p2];
++  if( pIn1->flags & MEM_Subtype ){
++    sqlite3VdbeMemSetInt64(pOut, pIn1->eSubtype);
++  }else{
++    sqlite3VdbeMemSetNull(pOut);
++  }
++  break;
++}
++
++/* Opcode: SetSubtype P1 P2 * * *
++** Synopsis:  r[P2].subtype = r[P1]
++**
++** Set the subtype value of register P2 to the integer from register P1.
++** If P1 is NULL, clear the subtype from p2.
++*/
++case OP_SetSubtype: {   /* in1 out2 */
++  pIn1 = &aMem[pOp->p1];
++  pOut = &aMem[pOp->p2];
++  if( pIn1->flags & MEM_Null ){
++    pOut->flags &= ~MEM_Subtype;
++  }else{
++    assert( pIn1->flags & MEM_Int );
++    pOut->flags |= MEM_Subtype;
++    pOut->eSubtype = (u8)(pIn1->u.i & 0xff);
++  }
++  break;
++}
++
+ /* Opcode: FilterAdd P1 * P3 P4 *
+ ** Synopsis: filter(P1) += key(P3@P4)
+ **
+@@ -96718,7 +101445,7 @@ case OP_FilterAdd: {
+     printf("hash: %llu modulo %d -> %u\n", h, pIn1->n, (int)(h%pIn1->n));
+   }
+ #endif
+-  h %= pIn1->n;
++  h %= (pIn1->n*8);
+   pIn1->z[h/8] |= 1<<(h&7);
+   break;
+ }
+@@ -96754,7 +101481,7 @@ case OP_Filter: {          /* jump */
+     printf("hash: %llu modulo %d -> %u\n", h, pIn1->n, (int)(h%pIn1->n));
+   }
+ #endif
+-  h %= pIn1->n;
++  h %= (pIn1->n*8);
+   if( (pIn1->z[h/8] & (1<<(h&7)))==0 ){
+     VdbeBranchTaken(1, 2);
+     p->aCounter[SQLITE_STMTSTATUS_FILTER_HIT]++;
+@@ -96976,11 +101703,13 @@ default: {          /* This is really OP_Noop, OP_Explain */
+ *****************************************************************************/
+     }
+ 
+-#ifdef VDBE_PROFILE
+-    {
+-      u64 endTime = sqlite3NProfileCnt ? sqlite3NProfileCnt : sqlite3Hwtime();
+-      if( endTime>start ) pOrigOp->cycles += endTime - start;
+-      pOrigOp->cnt++;
++#if defined(VDBE_PROFILE)
++    *pnCycle += sqlite3NProfileCnt ? sqlite3NProfileCnt : sqlite3Hwtime();
++    pnCycle = 0;
++#elif defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++    if( pnCycle ){
++      *pnCycle += sqlite3Hwtime();
++      pnCycle = 0;
+     }
+ #endif
+ 
+@@ -97004,7 +101733,7 @@ default: {          /* This is really OP_Noop, OP_Explain */
+       }
+       if( opProperty==0xff ){
+         /* Never happens.  This code exists to avoid a harmless linkage
+-        ** warning aboud sqlite3VdbeRegisterDump() being defined but not
++        ** warning about sqlite3VdbeRegisterDump() being defined but not
+         ** used. */
+         sqlite3VdbeRegisterDump(p);
+       }
+@@ -97057,6 +101786,18 @@ abort_due_to_error:
+   ** release the mutexes on btrees that were acquired at the
+   ** top. */
+ vdbe_return:
++#if defined(VDBE_PROFILE)
++  if( pnCycle ){
++    *pnCycle += sqlite3NProfileCnt ? sqlite3NProfileCnt : sqlite3Hwtime();
++    pnCycle = 0;
++  }
++#elif defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++  if( pnCycle ){
++    *pnCycle += sqlite3Hwtime();
++    pnCycle = 0;
++  }
++#endif
++
+ #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+   while( nVmStep>=nProgressLimit && db->xProgress!=0 ){
+     nProgressLimit += db->nProgressOps;
+@@ -97068,7 +101809,9 @@ vdbe_return:
+   }
+ #endif
+   p->aCounter[SQLITE_STMTSTATUS_VM_STEP] += (int)nVmStep;
+-  sqlite3VdbeLeave(p);
++  if( DbMaskNonZero(p->lockMask) ){
++    sqlite3VdbeLeave(p);
++  }
+   assert( rc!=SQLITE_OK || nExtraDelete==0
+        || sqlite3_strlike("DELETE%",p->zSql,0)!=0
+   );
+@@ -97163,8 +101906,7 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
+   /* Set the value of register r[1] in the SQL statement to integer iRow.
+   ** This is done directly as a performance optimization
+   */
+-  v->aMem[1].flags = MEM_Int;
+-  v->aMem[1].u.i = iRow;
++  sqlite3VdbeMemSetInt64(&v->aMem[1], iRow);
+ 
+   /* If the statement has been run before (and is paused at the OP_ResultRow)
+   ** then back it up to the point where it does the OP_NotExists.  This could
+@@ -97247,7 +101989,7 @@ SQLITE_API int sqlite3_blob_open(
+ #endif
+   *ppBlob = 0;
+ #ifdef SQLITE_ENABLE_API_ARMOR
+-  if( !sqlite3SafetyCheckOk(db) || zTable==0 ){
++  if( !sqlite3SafetyCheckOk(db) || zTable==0 || zColumn==0 ){
+     return SQLITE_MISUSE_BKPT;
+   }
+ #endif
+@@ -97446,7 +102188,7 @@ blob_open_out:
+     if( pBlob && pBlob->pStmt ) sqlite3VdbeFinalize((Vdbe *)pBlob->pStmt);
+     sqlite3DbFree(db, pBlob);
+   }
+-  sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
++  sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : (char*)0), zErr);
+   sqlite3DbFree(db, zErr);
+   sqlite3ParseObjectReset(&sParse);
+   rc = sqlite3ApiExit(db, rc);
+@@ -97605,7 +102347,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *pBlob, sqlite3_int64 iRow){
+     ((Vdbe*)p->pStmt)->rc = SQLITE_OK;
+     rc = blobSeekToRow(p, iRow, &zErr);
+     if( rc!=SQLITE_OK ){
+-      sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
++      sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : (char*)0), zErr);
+       sqlite3DbFree(db, zErr);
+     }
+     assert( rc!=SQLITE_SCHEMA );
+@@ -97708,7 +102450,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *pBlob, sqlite3_int64 iRow){
+ ** The threshold for the amount of main memory to use before flushing
+ ** records to a PMA is roughly the same as the limit configured for the
+ ** page-cache of the main database. Specifically, the threshold is set to
+-** the value returned by "PRAGMA main.page_size" multipled by
++** the value returned by "PRAGMA main.page_size" multiplied by
+ ** that returned by "PRAGMA main.cache_size", in bytes.
+ **
+ ** If the sorter is running in single-threaded mode, then all PMAs generated
+@@ -97731,7 +102473,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *pBlob, sqlite3_int64 iRow){
+ **
+ ** If there are fewer than SORTER_MAX_MERGE_COUNT PMAs in total and the
+ ** sorter is running in single-threaded mode, then these PMAs are merged
+-** incrementally as keys are retreived from the sorter by the VDBE.  The
++** incrementally as keys are retrieved from the sorter by the VDBE.  The
+ ** MergeEngine object, described in further detail below, performs this
+ ** merge.
+ **
+@@ -97809,7 +102551,7 @@ struct SorterFile {
+ struct SorterList {
+   SorterRecord *pList;            /* Linked list of records */
+   u8 *aMemory;                    /* If non-NULL, bulk memory to hold pList */
+-  int szPMA;                      /* Size of pList as PMA in bytes */
++  i64 szPMA;                      /* Size of pList as PMA in bytes */
+ };
+ 
+ /*
+@@ -97894,7 +102636,7 @@ struct MergeEngine {
+ **
+ ** Essentially, this structure contains all those fields of the VdbeSorter
+ ** structure for which each thread requires a separate instance. For example,
+-** each thread requries its own UnpackedRecord object to unpack records in
++** each thread requeries its own UnpackedRecord object to unpack records in
+ ** as part of comparison operations.
+ **
+ ** Before a background thread is launched, variable bDone is set to 0. Then,
+@@ -97918,10 +102660,10 @@ typedef int (*SorterCompare)(SortSubtask*,int*,const void*,int,const void*,int);
+ struct SortSubtask {
+   SQLiteThread *pThread;          /* Background thread, if any */
+   int bDone;                      /* Set if thread is finished but not joined */
++  int nPMA;                       /* Number of PMAs currently in file */
+   VdbeSorter *pSorter;            /* Sorter that owns this sub-task */
+   UnpackedRecord *pUnpacked;      /* Space to unpack a record */
+   SorterList list;                /* List for thread to write to a PMA */
+-  int nPMA;                       /* Number of PMAs currently in file */
+   SorterCompare xCompare;         /* Compare function to use */
+   SorterFile file;                /* Temp file for level-0 PMAs */
+   SorterFile file2;               /* Space for other PMAs */
+@@ -97966,7 +102708,7 @@ struct VdbeSorter {
+ ** PMA, in sorted order.  The next key to be read is cached in nKey/aKey.
+ ** aKey might point into aMap or into aBuffer.  If neither of those locations
+ ** contain a contiguous representation of the key, then aAlloc is allocated
+-** and the key is copied into aAlloc and aKey is made to poitn to aAlloc.
++** and the key is copied into aAlloc and aKey is made to point to aAlloc.
+ **
+ ** pFd==0 at EOF.
+ */
+@@ -99337,7 +104079,7 @@ static int vdbeSorterFlushPMA(VdbeSorter *pSorter){
+   ** the background thread from a sub-tasks previous turn is still running,
+   ** skip it. If the first (pSorter->nTask-1) sub-tasks are all still busy,
+   ** fall back to using the final sub-task. The first (pSorter->nTask-1)
+-  ** sub-tasks are prefered as they use background threads - the final
++  ** sub-tasks are preferred as they use background threads - the final
+   ** sub-task uses the main thread. */
+   for(i=0; iiPrev + i + 1) % nWorker;
+@@ -99395,8 +104137,8 @@ SQLITE_PRIVATE int sqlite3VdbeSorterWrite(
+   int rc = SQLITE_OK;             /* Return Code */
+   SorterRecord *pNew;             /* New list element */
+   int bFlush;                     /* True to flush contents of memory to PMA */
+-  int nReq;                       /* Bytes of memory required */
+-  int nPMA;                       /* Bytes of PMA space required */
++  i64 nReq;                       /* Bytes of memory required */
++  i64 nPMA;                       /* Bytes of PMA space required */
+   int t;                          /* serial type of first record field */
+ 
+   assert( pCsr->eCurType==CURTYPE_SORTER );
+@@ -99821,7 +104563,7 @@ static int vdbePmaReaderIncrMergeInit(PmaReader *pReadr, int eMode){
+ 
+   rc = vdbeMergeEngineInit(pTask, pIncr->pMerger, eMode);
+ 
+-  /* Set up the required files for pIncr. A multi-theaded IncrMerge object
++  /* Set up the required files for pIncr. A multi-threaded IncrMerge object
+   ** requires two temp files to itself, whereas a single-threaded object
+   ** only requires a region of pTask->file2. */
+   if( rc==SQLITE_OK ){
+@@ -100461,6 +105203,8 @@ static int bytecodevtabConnect(
+       "p5 INT,"
+       "comment TEXT,"
+       "subprog TEXT,"
++      "nexec INT,"
++      "ncycle INT,"
+       "stmt HIDDEN"
+     ");",
+ 
+@@ -100475,6 +105219,9 @@ static int bytecodevtabConnect(
+    ");"
+   };
+ 
++  (void)argc;
++  (void)argv;
++  (void)pzErr;
+   rc = sqlite3_declare_vtab(db, azSchema[isTabUsed]);
+   if( rc==SQLITE_OK ){
+     pNew = sqlite3_malloc( sizeof(*pNew) );
+@@ -100620,7 +105367,7 @@ static int bytecodevtabColumn(
+           }
+         }
+       }
+-      i += 10;
++      i += 20;
+     }
+   }
+   switch( i ){
+@@ -100670,16 +105417,31 @@ static int bytecodevtabColumn(
+       }
+       break;
+     }
+-    case 10:  /* tables_used.type */
++
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++    case 9:     /* nexec */
++      sqlite3_result_int(ctx, pOp->nExec);
++      break;
++    case 10:    /* ncycle */
++      sqlite3_result_int(ctx, pOp->nCycle);
++      break;
++#else
++    case 9:     /* nexec */
++    case 10:    /* ncycle */
++      sqlite3_result_int(ctx, 0);
++      break;
++#endif
++
++    case 20:  /* tables_used.type */
+       sqlite3_result_text(ctx, pCur->zType, -1, SQLITE_STATIC);
+       break;
+-    case 11:  /* tables_used.schema */
++    case 21:  /* tables_used.schema */
+       sqlite3_result_text(ctx, pCur->zSchema, -1, SQLITE_STATIC);
+       break;
+-    case 12:  /* tables_used.name */
++    case 22:  /* tables_used.name */
+       sqlite3_result_text(ctx, pCur->zName, -1, SQLITE_STATIC);
+       break;
+-    case 13:  /* tables_used.wr */
++    case 23:  /* tables_used.wr */
+       sqlite3_result_int(ctx, pOp->opcode==OP_OpenWrite);
+       break;
+   }
+@@ -100710,6 +105472,7 @@ static int bytecodevtabFilter(
+   bytecodevtab_cursor *pCur = (bytecodevtab_cursor *)pVtabCursor;
+   bytecodevtab *pVTab = (bytecodevtab *)pVtabCursor->pVtab;
+   int rc = SQLITE_OK;
++  (void)idxStr;
+ 
+   bytecodevtabCursorClear(pCur);
+   pCur->iRowid = 0;
+@@ -100752,7 +105515,7 @@ static int bytecodevtabBestIndex(
+   int rc = SQLITE_CONSTRAINT;
+   struct sqlite3_index_constraint *p;
+   bytecodevtab *pVTab = (bytecodevtab*)tab;
+-  int iBaseCol = pVTab->bTablesUsed ? 4 : 8;
++  int iBaseCol = pVTab->bTablesUsed ? 4 : 10;
+   pIdxInfo->estimatedCost = (double)100;
+   pIdxInfo->estimatedRows = 100;
+   pIdxInfo->idxNum = 0;
+@@ -100799,7 +105562,8 @@ static sqlite3_module bytecodevtabModule = {
+   /* xSavepoint  */ 0,
+   /* xRelease    */ 0,
+   /* xRollbackTo */ 0,
+-  /* xShadowName */ 0
++  /* xShadowName */ 0,
++  /* xIntegrity  */ 0
+ };
+ 
+ 
+@@ -101178,6 +105942,8 @@ SQLITE_PRIVATE int sqlite3JournalOpen(
+ ){
+   MemJournal *p = (MemJournal*)pJfd;
+ 
++  assert( zName || nSpill<0 || (flags & SQLITE_OPEN_EXCLUSIVE) );
++
+   /* Zero the file-handle object. If nSpill was passed zero, initialize
+   ** it using the sqlite3OsOpen() function of the underlying VFS. In this
+   ** case none of the code in this module is executed as a result of calls
+@@ -101321,7 +106087,7 @@ static int walkWindowList(Walker *pWalker, Window *pList, int bOneOnly){
+ ** The return value from this routine is WRC_Abort to abandon the tree walk
+ ** and WRC_Continue to continue.
+ */
+-static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
++SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3WalkExprNN(Walker *pWalker, Expr *pExpr){
+   int rc;
+   testcase( ExprHasProperty(pExpr, EP_TokenOnly) );
+   testcase( ExprHasProperty(pExpr, EP_Reduced) );
+@@ -101330,7 +106096,9 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
+     if( rc ) return rc & WRC_Abort;
+     if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
+       assert( pExpr->x.pList==0 || pExpr->pRight==0 );
+-      if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
++      if( pExpr->pLeft && sqlite3WalkExprNN(pWalker, pExpr->pLeft) ){
++        return WRC_Abort;
++      }
+       if( pExpr->pRight ){
+         assert( !ExprHasProperty(pExpr, EP_WinFunc) );
+         pExpr = pExpr->pRight;
+@@ -101354,7 +106122,7 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
+   return WRC_Continue;
+ }
+ SQLITE_PRIVATE int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){
+-  return pExpr ? walkExpr(pWalker,pExpr) : WRC_Continue;
++  return pExpr ? sqlite3WalkExprNN(pWalker,pExpr) : WRC_Continue;
+ }
+ 
+ /*
+@@ -101480,7 +106248,7 @@ SQLITE_PRIVATE int sqlite3WalkSelect(Walker *pWalker, Select *p){
+ }
+ 
+ /* Increase the walkerDepth when entering a subquery, and
+-** descrease when leaving the subquery.
++** decrease when leaving the subquery.
+ */
+ SQLITE_PRIVATE int sqlite3WalkerDepthIncrease(Walker *pWalker, Select *pSelect){
+   UNUSED_PARAMETER(pSelect);
+@@ -101619,28 +106387,41 @@ static void resolveAlias(
+         pExpr->y.pWin->pOwner = pExpr;
+       }
+     }
+-    sqlite3ParserAddCleanup(pParse,
+-      (void(*)(sqlite3*,void*))sqlite3ExprDelete,
+-      pDup);
++    sqlite3ExprDeferredDelete(pParse, pDup);
+   }
+ }
+ 
+ /*
+-** Subqueries stores the original database, table and column names for their
+-** result sets in ExprList.a[].zSpan, in the form "DATABASE.TABLE.COLUMN".
+-** Check to see if the zSpan given to this routine matches the zDb, zTab,
+-** and zCol.  If any of zDb, zTab, and zCol are NULL then those fields will
+-** match anything.
++** Subqueries store the original database, table and column names for their
++** result sets in ExprList.a[].zSpan, in the form "DATABASE.TABLE.COLUMN",
++** and mark the expression-list item by setting ExprList.a[].fg.eEName
++** to ENAME_TAB.
++**
++** Check to see if the zSpan/eEName of the expression-list item passed to this
++** routine matches the zDb, zTab, and zCol.  If any of zDb, zTab, and zCol are
++** NULL then those fields will match anything. Return true if there is a match,
++** or false otherwise.
++**
++** SF_NestedFrom subqueries also store an entry for the implicit rowid (or
++** _rowid_, or oid) column by setting ExprList.a[].fg.eEName to ENAME_ROWID,
++** and setting zSpan to "DATABASE.TABLE.". This type of pItem
++** argument matches if zCol is a rowid alias. If it is not NULL, (*pbRowid)
++** is set to 1 if there is this kind of match.
+ */
+ SQLITE_PRIVATE int sqlite3MatchEName(
+   const struct ExprList_item *pItem,
+   const char *zCol,
+   const char *zTab,
+-  const char *zDb
++  const char *zDb,
++  int *pbRowid
+ ){
+   int n;
+   const char *zSpan;
+-  if( pItem->fg.eEName!=ENAME_TAB ) return 0;
++  int eEName = pItem->fg.eEName;
++  if( eEName!=ENAME_TAB && (eEName!=ENAME_ROWID || NEVER(pbRowid==0)) ){
++    return 0;
++  }
++  assert( pbRowid==0 || *pbRowid==0 );
+   zSpan = pItem->zEName;
+   for(n=0; ALWAYS(zSpan[n]) && zSpan[n]!='.'; n++){}
+   if( zDb && (sqlite3StrNICmp(zSpan, zDb, n)!=0 || zDb[n]!=0) ){
+@@ -101652,9 +106433,11 @@ SQLITE_PRIVATE int sqlite3MatchEName(
+     return 0;
+   }
+   zSpan += n+1;
+-  if( zCol && sqlite3StrICmp(zSpan, zCol)!=0 ){
+-    return 0;
++  if( zCol ){
++    if( eEName==ENAME_TAB && sqlite3StrICmp(zSpan, zCol)!=0 ) return 0;
++    if( eEName==ENAME_ROWID && sqlite3IsRowid(zCol)==0 ) return 0;
+   }
++  if( eEName==ENAME_ROWID ) *pbRowid = 1;
+   return 1;
+ }
+ 
+@@ -101687,6 +106470,7 @@ SQLITE_PRIVATE Bitmask sqlite3ExprColUsed(Expr *pExpr){
+   assert( ExprUseYTab(pExpr) );
+   pExTab = pExpr->y.pTab;
+   assert( pExTab!=0 );
++  assert( n < pExTab->nCol );
+   if( (pExTab->tabFlags & TF_HasGenerated)!=0
+    && (pExTab->aCol[n].colFlags & COLFLAG_GENERATED)!=0
+   ){
+@@ -101724,6 +106508,32 @@ static void extendFJMatch(
+   }
+ }
+ 
++/*
++** Return TRUE (non-zero) if zTab is a valid name for the schema table pTab.
++*/
++static SQLITE_NOINLINE int isValidSchemaTableName(
++  const char *zTab,         /* Name as it appears in the SQL */
++  Table *pTab,              /* The schema table we are trying to match */
++  Schema *pSchema           /* non-NULL if a database qualifier is present */
++){
++  const char *zLegacy;
++  assert( pTab!=0 );
++  assert( pTab->tnum==1 );
++  if( sqlite3StrNICmp(zTab, "sqlite_", 7)!=0 ) return 0;
++  zLegacy = pTab->zName;
++  if( strcmp(zLegacy+7, &LEGACY_TEMP_SCHEMA_TABLE[7])==0 ){
++    if( sqlite3StrICmp(zTab+7, &PREFERRED_TEMP_SCHEMA_TABLE[7])==0 ){
++      return 1;
++    }
++    if( pSchema==0 ) return 0;
++    if( sqlite3StrICmp(zTab+7, &LEGACY_SCHEMA_TABLE[7])==0 ) return 1;
++    if( sqlite3StrICmp(zTab+7, &PREFERRED_SCHEMA_TABLE[7])==0 ) return 1;
++  }else{
++    if( sqlite3StrICmp(zTab+7, &PREFERRED_SCHEMA_TABLE[7])==0 ) return 1;
++  }
++  return 0;
++}
++
+ /*
+ ** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
+ ** that name in the set of source tables in pSrcList and make the pExpr
+@@ -101761,7 +106571,7 @@ static int lookupName(
+ ){
+   int i, j;                         /* Loop counters */
+   int cnt = 0;                      /* Number of matching column names */
+-  int cntTab = 0;                   /* Number of matching table names */
++  int cntTab = 0;                   /* Number of potential "rowid" matches */
+   int nSubquery = 0;                /* How many levels of subquery */
+   sqlite3 *db = pParse->db;         /* The database connection */
+   SrcItem *pItem;                   /* Use for looping over pSrcList items */
+@@ -101838,54 +106648,66 @@ static int lookupName(
+           assert( pEList!=0 );
+           assert( pEList->nExpr==pTab->nCol );
+           for(j=0; jnExpr; j++){
+-            if( !sqlite3MatchEName(&pEList->a[j], zCol, zTab, zDb) ){
++            int bRowid = 0;       /* True if possible rowid match */
++            if( !sqlite3MatchEName(&pEList->a[j], zCol, zTab, zDb, &bRowid) ){
+               continue;
+             }
+-            if( cnt>0 ){
+-              if( pItem->fg.isUsing==0
+-               || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0
+-              ){
+-                /* Two or more tables have the same column name which is
+-                ** not joined by USING.  This is an error.  Signal as much
+-                ** by clearing pFJMatch and letting cnt go above 1. */
+-                sqlite3ExprListDelete(db, pFJMatch);
+-                pFJMatch = 0;
+-              }else
+-              if( (pItem->fg.jointype & JT_RIGHT)==0 ){
+-                /* An INNER or LEFT JOIN.  Use the left-most table */
+-                continue;
+-              }else
+-              if( (pItem->fg.jointype & JT_LEFT)==0 ){
+-                /* A RIGHT JOIN.  Use the right-most table */
+-                cnt = 0;
+-                sqlite3ExprListDelete(db, pFJMatch);
+-                pFJMatch = 0;
+-              }else{
+-                /* For a FULL JOIN, we must construct a coalesce() func */
+-                extendFJMatch(pParse, &pFJMatch, pMatch, pExpr->iColumn);
++            if( bRowid==0 ){
++              if( cnt>0 ){
++                if( pItem->fg.isUsing==0
++                 || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0
++                ){
++                  /* Two or more tables have the same column name which is
++                  ** not joined by USING.  This is an error.  Signal as much
++                  ** by clearing pFJMatch and letting cnt go above 1. */
++                  sqlite3ExprListDelete(db, pFJMatch);
++                  pFJMatch = 0;
++                }else
++                if( (pItem->fg.jointype & JT_RIGHT)==0 ){
++                  /* An INNER or LEFT JOIN.  Use the left-most table */
++                  continue;
++                }else
++                if( (pItem->fg.jointype & JT_LEFT)==0 ){
++                  /* A RIGHT JOIN.  Use the right-most table */
++                  cnt = 0;
++                  sqlite3ExprListDelete(db, pFJMatch);
++                  pFJMatch = 0;
++                }else{
++                  /* For a FULL JOIN, we must construct a coalesce() func */
++                  extendFJMatch(pParse, &pFJMatch, pMatch, pExpr->iColumn);
++                }
+               }
++              cnt++;
++              hit = 1;
++            }else if( cnt>0 ){
++              /* This is a potential rowid match, but there has already been
++              ** a real match found. So this can be ignored.  */
++              continue;
+             }
+-            cnt++;
+-            cntTab = 2;
++            cntTab++;
+             pMatch = pItem;
+             pExpr->iColumn = j;
+             pEList->a[j].fg.bUsed = 1;
+-            hit = 1;
++
++            /* rowid cannot be part of a USING clause - assert() this. */
++            assert( bRowid==0 || pEList->a[j].fg.bUsingTerm==0 );
+             if( pEList->a[j].fg.bUsingTerm ) break;
+           }
+           if( hit || zTab==0 ) continue;
+         }
+         assert( zDb==0 || zTab!=0 );
+         if( zTab ){
+-          const char *zTabName;
+           if( zDb ){
+             if( pTab->pSchema!=pSchema ) continue;
+             if( pSchema==0 && strcmp(zDb,"*")!=0 ) continue;
+           }
+-          zTabName = pItem->zAlias ? pItem->zAlias : pTab->zName;
+-          assert( zTabName!=0 );
+-          if( sqlite3StrICmp(zTabName, zTab)!=0 ){
+-            continue;
++          if( pItem->zAlias!=0 ){
++            if( sqlite3StrICmp(zTab, pItem->zAlias)!=0 ){
++              continue;
++            }
++          }else if( sqlite3StrICmp(zTab, pTab->zName)!=0 ){
++            if( pTab->tnum!=1 ) continue;
++            if( !isValidSchemaTableName(zTab, pTab, pSchema) ) continue;
+           }
+           assert( ExprUseYTab(pExpr) );
+           if( IN_RENAME_OBJECT && pItem->zAlias ){
+@@ -101961,7 +106783,8 @@ static int lookupName(
+         assert( op==TK_DELETE || op==TK_UPDATE || op==TK_INSERT );
+         if( pParse->bReturning ){
+           if( (pNC->ncFlags & NC_UBaseReg)!=0
+-           && (zTab==0 || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0)
++           && ALWAYS(zTab==0
++                     || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0)
+           ){
+             pExpr->iTable = op!=TK_DELETE;
+             pTab = pParse->pTriggerTab;
+@@ -102028,6 +106851,7 @@ static int lookupName(
+             if( pParse->bReturning ){
+               eNewExprOp = TK_REGISTER;
+               pExpr->op2 = TK_COLUMN;
++              pExpr->iColumn = iCol;
+               pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable +
+                  sqlite3TableColumnToStorage(pTab, iCol) + 1;
+             }else{
+@@ -102061,10 +106885,10 @@ static int lookupName(
+      && pMatch
+      && (pNC->ncFlags & (NC_IdxExpr|NC_GenCol))==0
+      && sqlite3IsRowid(zCol)
+-     && ALWAYS(VisibleRowid(pMatch->pTab))
++     && ALWAYS(VisibleRowid(pMatch->pTab) || pMatch->fg.isNestedFrom)
+     ){
+       cnt = 1;
+-      pExpr->iColumn = -1;
++      if( pMatch->fg.isNestedFrom==0 ) pExpr->iColumn = -1;
+       pExpr->affExpr = SQLITE_AFF_INTEGER;
+     }
+ 
+@@ -102223,6 +107047,7 @@ static int lookupName(
+     sqlite3RecordErrorOffsetOfExpr(pParse->db, pExpr);
+     pParse->checkSchema = 1;
+     pTopNC->nNcErr++;
++    eNewExprOp = TK_NULL;
+   }
+   assert( pFJMatch==0 );
+ 
+@@ -102249,7 +107074,7 @@ static int lookupName(
+   ** If a generated column is referenced, set bits for every column
+   ** of the table.
+   */
+-  if( pExpr->iColumn>=0 && pMatch!=0 ){
++  if( pExpr->iColumn>=0 && cnt==1 && pMatch!=0 ){
+     pMatch->colUsed |= sqlite3ExprColUsed(pExpr);
+   }
+ 
+@@ -102440,14 +107265,10 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+       if( 0==sqlite3ExprCanBeNull(pExpr->pLeft) && !IN_RENAME_OBJECT ){
+         testcase( ExprHasProperty(pExpr, EP_OuterON) );
+         assert( !ExprHasProperty(pExpr, EP_IntValue) );
+-        if( pExpr->op==TK_NOTNULL ){
+-          pExpr->u.zToken = "true";
+-          ExprSetProperty(pExpr, EP_IsTrue);
+-        }else{
+-          pExpr->u.zToken = "false";
+-          ExprSetProperty(pExpr, EP_IsFalse);
+-        }
+-        pExpr->op = TK_TRUEFALSE;
++        pExpr->u.iValue = (pExpr->op==TK_NOTNULL);
++        pExpr->flags |= EP_IntValue;
++        pExpr->op = TK_INTEGER;
++
+         for(i=0, p=pNC; p && ipNext, i++){
+           p->nRef = anRef[i];
+         }
+@@ -102521,6 +107342,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+       Window *pWin = (IsWindowFunc(pExpr) ? pExpr->y.pWin : 0);
+ #endif
+       assert( !ExprHasProperty(pExpr, EP_xIsSelect|EP_IntValue) );
++      assert( pExpr->pLeft==0 || pExpr->pLeft->op==TK_ORDER );
+       zId = pExpr->u.zToken;
+       pDef = sqlite3FindFunction(pParse->db, zId, n, enc, 0);
+       if( pDef==0 ){
+@@ -102662,6 +107484,10 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+           pNC->nNcErr++;
+         }
+ #endif
++        else if( is_agg==0 && pExpr->pLeft ){
++          sqlite3ExprOrderByAggregateError(pParse, pExpr);
++          pNC->nNcErr++;
++        }
+         if( is_agg ){
+           /* Window functions may not be arguments of aggregate functions.
+           ** Or arguments of other window functions. But aggregate functions
+@@ -102680,6 +107506,11 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+ #endif
+       sqlite3WalkExprList(pWalker, pList);
+       if( is_agg ){
++        if( pExpr->pLeft ){
++          assert( pExpr->pLeft->op==TK_ORDER );
++          assert( ExprUseXList(pExpr->pLeft) );
++          sqlite3WalkExprList(pWalker, pExpr->pLeft->x.pList);
++        }
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+         if( pWin ){
+           Select *pSel = pNC->pWinSelect;
+@@ -102708,11 +107539,12 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+           while( pNC2
+               && sqlite3ReferencesSrcList(pParse, pExpr, pNC2->pSrcList)==0
+           ){
+-            pExpr->op2++;
++            pExpr->op2 += (1 + pNC2->nNestedSelect);
+             pNC2 = pNC2->pNext;
+           }
+           assert( pDef!=0 || IN_RENAME_OBJECT );
+           if( pNC2 && pDef ){
++            pExpr->op2 += pNC2->nNestedSelect;
+             assert( SQLITE_FUNC_MINMAX==NC_MinMaxAgg );
+             assert( SQLITE_FUNC_ANYORDER==NC_OrderAgg );
+             testcase( (pDef->funcFlags & SQLITE_FUNC_MINMAX)!=0 );
+@@ -102749,8 +107581,8 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
+         assert( pNC->nRef>=nRef );
+         if( nRef!=pNC->nRef ){
+           ExprSetProperty(pExpr, EP_VarSelect);
+-          pNC->ncFlags |= NC_VarSelect;
+         }
++        pNC->ncFlags |= NC_Subquery;
+       }
+       break;
+     }
+@@ -103190,7 +108022,7 @@ static int resolveOrderGroupBy(
+     }
+     for(j=0; jpEList->nExpr; j++){
+       if( sqlite3ExprCompare(0, pE, pSelect->pEList->a[j].pExpr, -1)==0 ){
+-        /* Since this expresion is being changed into a reference
++        /* Since this expression is being changed into a reference
+         ** to an identical expression in the result set, remove all Window
+         ** objects belonging to the expression from the Select.pWin list. */
+         windowRemoveExprFromSelect(pSelect, pE);
+@@ -103243,10 +108075,8 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
+   while( p ){
+     assert( (p->selFlags & SF_Expanded)!=0 );
+     assert( (p->selFlags & SF_Resolved)==0 );
+-    assert( db->suppressErr==0 ); /* SF_Resolved not set if errors suppressed */
+     p->selFlags |= SF_Resolved;
+ 
+-
+     /* Resolve the expressions in the LIMIT and OFFSET clauses. These
+     ** are not allowed to refer to any names, so pass an empty NameContext.
+     */
+@@ -103273,6 +108103,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
+ 
+     /* Recursively resolve names in all subqueries in the FROM clause
+     */
++    if( pOuterNC ) pOuterNC->nNestedSelect++;
+     for(i=0; ipSrc->nSrc; i++){
+       SrcItem *pItem = &p->pSrc->a[i];
+       if( pItem->pSelect && (pItem->pSelect->selFlags & SF_Resolved)==0 ){
+@@ -103297,6 +108128,9 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
+         }
+       }
+     }
++    if( pOuterNC && ALWAYS(pOuterNC->nNestedSelect>0) ){
++      pOuterNC->nNestedSelect--;
++    }
+ 
+     /* Set up the local name-context to pass to sqlite3ResolveExprNames() to
+     ** resolve the result-set expression list.
+@@ -103513,7 +108347,8 @@ SQLITE_PRIVATE int sqlite3ResolveExprNames(
+     return SQLITE_ERROR;
+   }
+ #endif
+-  sqlite3WalkExpr(&w, pExpr);
++  assert( pExpr!=0 );
++  sqlite3WalkExprNN(&w, pExpr);
+ #if SQLITE_MAX_EXPR_DEPTH>0
+   w.pParse->nHeight -= pExpr->nHeight;
+ #endif
+@@ -103555,7 +108390,7 @@ SQLITE_PRIVATE int sqlite3ResolveExprListNames(
+       return WRC_Abort;
+     }
+ #endif
+-    sqlite3WalkExpr(&w, pExpr);
++    sqlite3WalkExprNN(&w, pExpr);
+ #if SQLITE_MAX_EXPR_DEPTH>0
+     w.pParse->nHeight -= pExpr->nHeight;
+ #endif
+@@ -103577,7 +108412,7 @@ SQLITE_PRIVATE int sqlite3ResolveExprListNames(
+ 
+ /*
+ ** Resolve all names in all expressions of a SELECT and in all
+-** decendents of the SELECT, including compounds off of p->pPrior,
++** descendants of the SELECT, including compounds off of p->pPrior,
+ ** subqueries in expressions, and subqueries used as FROM clause
+ ** terms.
+ **
+@@ -103704,49 +108539,122 @@ SQLITE_PRIVATE char sqlite3TableColumnAffinity(const Table *pTab, int iCol){
+ */
+ SQLITE_PRIVATE char sqlite3ExprAffinity(const Expr *pExpr){
+   int op;
+-  while( ExprHasProperty(pExpr, EP_Skip|EP_IfNullRow) ){
+-    assert( pExpr->op==TK_COLLATE
+-         || pExpr->op==TK_IF_NULL_ROW
+-         || (pExpr->op==TK_REGISTER && pExpr->op2==TK_IF_NULL_ROW) );
+-    pExpr = pExpr->pLeft;
+-    assert( pExpr!=0 );
+-  }
+   op = pExpr->op;
+-  if( op==TK_REGISTER ) op = pExpr->op2;
+-  if( op==TK_COLUMN || op==TK_AGG_COLUMN ){
+-    assert( ExprUseYTab(pExpr) );
+-    if( pExpr->y.pTab ){
++  while( 1 /* exit-by-break */ ){
++    if( op==TK_COLUMN || (op==TK_AGG_COLUMN && pExpr->y.pTab!=0) ){
++      assert( ExprUseYTab(pExpr) );
++      assert( pExpr->y.pTab!=0 );
+       return sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
+     }
+-  }
+-  if( op==TK_SELECT ){
+-    assert( ExprUseXSelect(pExpr) );
+-    assert( pExpr->x.pSelect!=0 );
+-    assert( pExpr->x.pSelect->pEList!=0 );
+-    assert( pExpr->x.pSelect->pEList->a[0].pExpr!=0 );
+-    return sqlite3ExprAffinity(pExpr->x.pSelect->pEList->a[0].pExpr);
+-  }
++    if( op==TK_SELECT ){
++      assert( ExprUseXSelect(pExpr) );
++      assert( pExpr->x.pSelect!=0 );
++      assert( pExpr->x.pSelect->pEList!=0 );
++      assert( pExpr->x.pSelect->pEList->a[0].pExpr!=0 );
++      return sqlite3ExprAffinity(pExpr->x.pSelect->pEList->a[0].pExpr);
++    }
+ #ifndef SQLITE_OMIT_CAST
+-  if( op==TK_CAST ){
+-    assert( !ExprHasProperty(pExpr, EP_IntValue) );
+-    return sqlite3AffinityType(pExpr->u.zToken, 0);
+-  }
++    if( op==TK_CAST ){
++      assert( !ExprHasProperty(pExpr, EP_IntValue) );
++      return sqlite3AffinityType(pExpr->u.zToken, 0);
++    }
+ #endif
+-  if( op==TK_SELECT_COLUMN ){
+-    assert( pExpr->pLeft!=0 && ExprUseXSelect(pExpr->pLeft) );
+-    assert( pExpr->iColumn < pExpr->iTable );
+-    assert( pExpr->iTable==pExpr->pLeft->x.pSelect->pEList->nExpr );
+-    return sqlite3ExprAffinity(
+-        pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
+-    );
+-  }
+-  if( op==TK_VECTOR ){
+-    assert( ExprUseXList(pExpr) );
+-    return sqlite3ExprAffinity(pExpr->x.pList->a[0].pExpr);
++    if( op==TK_SELECT_COLUMN ){
++      assert( pExpr->pLeft!=0 && ExprUseXSelect(pExpr->pLeft) );
++      assert( pExpr->iColumn < pExpr->iTable );
++      assert( pExpr->iColumn >= 0 );
++      assert( pExpr->iTable==pExpr->pLeft->x.pSelect->pEList->nExpr );
++      return sqlite3ExprAffinity(
++          pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
++      );
++    }
++    if( op==TK_VECTOR ){
++      assert( ExprUseXList(pExpr) );
++      return sqlite3ExprAffinity(pExpr->x.pList->a[0].pExpr);
++    }
++    if( ExprHasProperty(pExpr, EP_Skip|EP_IfNullRow) ){
++      assert( pExpr->op==TK_COLLATE
++           || pExpr->op==TK_IF_NULL_ROW
++           || (pExpr->op==TK_REGISTER && pExpr->op2==TK_IF_NULL_ROW) );
++      pExpr = pExpr->pLeft;
++      op = pExpr->op;
++      continue;
++    }
++    if( op!=TK_REGISTER || (op = pExpr->op2)==TK_REGISTER ) break;
+   }
+   return pExpr->affExpr;
+ }
+ 
++/*
++** Make a guess at all the possible datatypes of the result that could
++** be returned by an expression.  Return a bitmask indicating the answer:
++**
++**     0x01         Numeric
++**     0x02         Text
++**     0x04         Blob
++**
++** If the expression must return NULL, then 0x00 is returned.
++*/
++SQLITE_PRIVATE int sqlite3ExprDataType(const Expr *pExpr){
++  while( pExpr ){
++    switch( pExpr->op ){
++      case TK_COLLATE:
++      case TK_IF_NULL_ROW:
++      case TK_UPLUS:  {
++        pExpr = pExpr->pLeft;
++        break;
++      }
++      case TK_NULL: {
++        pExpr = 0;
++        break;
++      }
++      case TK_STRING: {
++        return 0x02;
++      }
++      case TK_BLOB: {
++        return 0x04;
++      }
++      case TK_CONCAT: {
++        return 0x06;
++      }
++      case TK_VARIABLE:
++      case TK_AGG_FUNCTION:
++      case TK_FUNCTION: {
++        return 0x07;
++      }
++      case TK_COLUMN:
++      case TK_AGG_COLUMN:
++      case TK_SELECT:
++      case TK_CAST:
++      case TK_SELECT_COLUMN:
++      case TK_VECTOR:  {
++        int aff = sqlite3ExprAffinity(pExpr);
++        if( aff>=SQLITE_AFF_NUMERIC ) return 0x05;
++        if( aff==SQLITE_AFF_TEXT )    return 0x06;
++        return 0x07;
++      }
++      case TK_CASE: {
++        int res = 0;
++        int ii;
++        ExprList *pList = pExpr->x.pList;
++        assert( ExprUseXList(pExpr) && pList!=0 );
++        assert( pList->nExpr > 0);
++        for(ii=1; iinExpr; ii+=2){
++          res |= sqlite3ExprDataType(pList->a[ii].pExpr);
++        }
++        if( pList->nExpr % 2 ){
++          res |= sqlite3ExprDataType(pList->a[pList->nExpr-1].pExpr);
++        }
++        return res;
++      }
++      default: {
++        return 0x01;
++      }
++    } /* End of switch(op) */
++  } /* End of while(pExpr) */
++  return 0x00;
++}
++
+ /*
+ ** Set the collating sequence for expression pExpr to be the collating
+ ** sequence named by pToken.   Return a pointer to a new Expr node that
+@@ -103834,18 +108742,17 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
+   while( p ){
+     int op = p->op;
+     if( op==TK_REGISTER ) op = p->op2;
+-    if( op==TK_AGG_COLUMN || op==TK_COLUMN || op==TK_TRIGGER ){
++    if( (op==TK_AGG_COLUMN && p->y.pTab!=0)
++     || op==TK_COLUMN || op==TK_TRIGGER
++    ){
++      int j;
+       assert( ExprUseYTab(p) );
+-      if( p->y.pTab!=0 ){
+-        /* op==TK_REGISTER && p->y.pTab!=0 happens when pExpr was originally
+-        ** a TK_COLUMN but was previously evaluated and cached in a register */
+-        int j = p->iColumn;
+-        if( j>=0 ){
+-          const char *zColl = sqlite3ColumnColl(&p->y.pTab->aCol[j]);
+-          pColl = sqlite3FindCollSeq(db, ENC(db), zColl, 0);
+-        }
+-        break;
++      assert( p->y.pTab!=0 );
++      if( (j = p->iColumn)>=0 ){
++        const char *zColl = sqlite3ColumnColl(&p->y.pTab->aCol[j]);
++        pColl = sqlite3FindCollSeq(db, ENC(db), zColl, 0);
+       }
++      break;
+     }
+     if( op==TK_CAST || op==TK_UPLUS ){
+       p = p->pLeft;
+@@ -103867,11 +108774,10 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
+       }else{
+         Expr *pNext  = p->pRight;
+         /* The Expr.x union is never used at the same time as Expr.pRight */
+-        assert( ExprUseXList(p) );
+-        assert( p->x.pList==0 || p->pRight==0 );
+-        if( p->x.pList!=0 && !db->mallocFailed ){
++        assert( !ExprUseXList(p) || p->x.pList==0 || p->pRight==0 );
++        if( ExprUseXList(p) && p->x.pList!=0 && !db->mallocFailed ){
+           int i;
+-          for(i=0; ALWAYS(ix.pList->nExpr); i++){
++          for(i=0; ix.pList->nExpr; i++){
+             if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){
+               pNext = p->x.pList->a[i].pExpr;
+               break;
+@@ -103893,7 +108799,7 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
+ /*
+ ** Return the collation sequence for the expression pExpr. If
+ ** there is no defined collating sequence, return a pointer to the
+-** defautl collation sequence.
++** default collation sequence.
+ **
+ ** See also: sqlite3ExprCollSeq()
+ **
+@@ -104023,7 +108929,7 @@ SQLITE_PRIVATE CollSeq *sqlite3BinaryCompareCollSeq(
+   return pColl;
+ }
+ 
+-/* Expresssion p is a comparison operator.  Return a collation sequence
++/* Expression p is a comparison operator.  Return a collation sequence
+ ** appropriate for the comparison operator.
+ **
+ ** This is normally just a wrapper around sqlite3BinaryCompareCollSeq().
+@@ -104180,6 +109086,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprForVectorField(
+     */
+     pRet = sqlite3PExpr(pParse, TK_SELECT_COLUMN, 0, 0);
+     if( pRet ){
++      ExprSetProperty(pRet, EP_FullSize);
+       pRet->iTable = nField;
+       pRet->iColumn = iField;
+       pRet->pLeft = pVector;
+@@ -104430,7 +109337,9 @@ static void heightOfSelect(const Select *pSelect, int *pnHeight){
+ */
+ static void exprSetHeight(Expr *p){
+   int nHeight = p->pLeft ? p->pLeft->nHeight : 0;
+-  if( p->pRight && p->pRight->nHeight>nHeight ) nHeight = p->pRight->nHeight;
++  if( NEVER(p->pRight) && p->pRight->nHeight>nHeight ){
++    nHeight = p->pRight->nHeight;
++  }
+   if( ExprUseXSelect(p) ){
+     heightOfSelect(p->x.pSelect, &nHeight);
+   }else if( p->x.pList ){
+@@ -104477,6 +109386,15 @@ SQLITE_PRIVATE void sqlite3ExprSetHeightAndFlags(Parse *pParse, Expr *p){
+ #define exprSetHeight(y)
+ #endif /* SQLITE_MAX_EXPR_DEPTH>0 */
+ 
++/*
++** Set the error offset for an Expr node, if possible.
++*/
++SQLITE_PRIVATE void sqlite3ExprSetErrorOffset(Expr *pExpr, int iOfst){
++  if( pExpr==0 ) return;
++  if( NEVER(ExprUseWJoin(pExpr)) ) return;
++  pExpr->w.iOfst = iOfst;
++}
++
+ /*
+ ** This routine is the core allocator for Expr nodes.
+ **
+@@ -104573,15 +109491,26 @@ SQLITE_PRIVATE void sqlite3ExprAttachSubtrees(
+     sqlite3ExprDelete(db, pLeft);
+     sqlite3ExprDelete(db, pRight);
+   }else{
++    assert( ExprUseXList(pRoot) );
++    assert( pRoot->x.pSelect==0 );
+     if( pRight ){
+       pRoot->pRight = pRight;
+       pRoot->flags |= EP_Propagate & pRight->flags;
++#if SQLITE_MAX_EXPR_DEPTH>0
++      pRoot->nHeight = pRight->nHeight+1;
++    }else{
++      pRoot->nHeight = 1;
++#endif
+     }
+     if( pLeft ){
+       pRoot->pLeft = pLeft;
+       pRoot->flags |= EP_Propagate & pLeft->flags;
++#if SQLITE_MAX_EXPR_DEPTH>0
++      if( pLeft->nHeight>=pRoot->nHeight ){
++        pRoot->nHeight = pLeft->nHeight+1;
++      }
++#endif
+     }
+-    exprSetHeight(pRoot);
+   }
+ }
+ 
+@@ -104690,9 +109619,9 @@ SQLITE_PRIVATE Select *sqlite3ExprListToValues(Parse *pParse, int nElem, ExprLis
+ ** Join two expressions using an AND operator.  If either expression is
+ ** NULL, then just return the other expression.
+ **
+-** If one side or the other of the AND is known to be false, then instead
+-** of returning an AND expression, just return a constant expression with
+-** a value of false.
++** If one side or the other of the AND is known to be false, and neither side
++** is part of an ON clause, then instead of returning an AND expression,
++** just return a constant expression with a value of false.
+ */
+ SQLITE_PRIVATE Expr *sqlite3ExprAnd(Parse *pParse, Expr *pLeft, Expr *pRight){
+   sqlite3 *db = pParse->db;
+@@ -104700,14 +109629,17 @@ SQLITE_PRIVATE Expr *sqlite3ExprAnd(Parse *pParse, Expr *pLeft, Expr *pRight){
+     return pRight;
+   }else if( pRight==0 ){
+     return pLeft;
+-  }else if( (ExprAlwaysFalse(pLeft) || ExprAlwaysFalse(pRight))
+-         && !IN_RENAME_OBJECT
+-  ){
+-    sqlite3ExprDeferredDelete(pParse, pLeft);
+-    sqlite3ExprDeferredDelete(pParse, pRight);
+-    return sqlite3Expr(db, TK_INTEGER, "0");
+   }else{
+-    return sqlite3PExpr(pParse, TK_AND, pLeft, pRight);
++    u32 f = pLeft->flags | pRight->flags;
++    if( (f&(EP_OuterON|EP_InnerON|EP_IsFalse))==EP_IsFalse
++     && !IN_RENAME_OBJECT
++    ){
++      sqlite3ExprDeferredDelete(pParse, pLeft);
++      sqlite3ExprDeferredDelete(pParse, pRight);
++      return sqlite3Expr(db, TK_INTEGER, "0");
++    }else{
++      return sqlite3PExpr(pParse, TK_AND, pLeft, pRight);
++    }
+   }
+ }
+ 
+@@ -104745,6 +109677,67 @@ SQLITE_PRIVATE Expr *sqlite3ExprFunction(
+   return pNew;
+ }
+ 
++/*
++** Report an error when attempting to use an ORDER BY clause within
++** the arguments of a non-aggregate function.
++*/
++SQLITE_PRIVATE void sqlite3ExprOrderByAggregateError(Parse *pParse, Expr *p){
++  sqlite3ErrorMsg(pParse,
++     "ORDER BY may not be used with non-aggregate %#T()", p
++  );
++}
++
++/*
++** Attach an ORDER BY clause to a function call.
++**
++**     functionname( arguments ORDER BY sortlist )
++**     \_____________________/          \______/
++**             pExpr                    pOrderBy
++**
++** The ORDER BY clause is inserted into a new Expr node of type TK_ORDER
++** and added to the Expr.pLeft field of the parent TK_FUNCTION node.
++*/
++SQLITE_PRIVATE void sqlite3ExprAddFunctionOrderBy(
++  Parse *pParse,        /* Parsing context */
++  Expr *pExpr,          /* The function call to which ORDER BY is to be added */
++  ExprList *pOrderBy    /* The ORDER BY clause to add */
++){
++  Expr *pOB;
++  sqlite3 *db = pParse->db;
++  if( NEVER(pOrderBy==0) ){
++    assert( db->mallocFailed );
++    return;
++  }
++  if( pExpr==0 ){
++    assert( db->mallocFailed );
++    sqlite3ExprListDelete(db, pOrderBy);
++    return;
++  }
++  assert( pExpr->op==TK_FUNCTION );
++  assert( pExpr->pLeft==0 );
++  assert( ExprUseXList(pExpr) );
++  if( pExpr->x.pList==0 || NEVER(pExpr->x.pList->nExpr==0) ){
++    /* Ignore ORDER BY on zero-argument aggregates */
++    sqlite3ParserAddCleanup(pParse, sqlite3ExprListDeleteGeneric, pOrderBy);
++    return;
++  }
++  if( IsWindowFunc(pExpr) ){
++    sqlite3ExprOrderByAggregateError(pParse, pExpr);
++    sqlite3ExprListDelete(db, pOrderBy);
++    return;
++  }
++
++  pOB = sqlite3ExprAlloc(db, TK_ORDER, 0, 0);
++  if( pOB==0 ){
++    sqlite3ExprListDelete(db, pOrderBy);
++    return;
++  }
++  pOB->x.pList = pOrderBy;
++  assert( ExprUseXList(pOB) );
++  pExpr->pLeft = pOB;
++  ExprSetProperty(pOB, EP_FullSize);
++}
++
+ /*
+ ** Check to see if a function is usable according to current access
+ ** rules:
+@@ -104867,6 +109860,7 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr, u32 n
+ */
+ static SQLITE_NOINLINE void sqlite3ExprDeleteNN(sqlite3 *db, Expr *p){
+   assert( p!=0 );
++  assert( db!=0 );
+   assert( !ExprUseUValue(p) || p->u.iValue>=0 );
+   assert( !ExprUseYWin(p) || !ExprUseYSub(p) );
+   assert( !ExprUseYWin(p) || p->y.pWin!=0 || db->mallocFailed );
+@@ -104898,17 +109892,16 @@ static SQLITE_NOINLINE void sqlite3ExprDeleteNN(sqlite3 *db, Expr *p){
+ #endif
+     }
+   }
+-  if( ExprHasProperty(p, EP_MemToken) ){
+-    assert( !ExprHasProperty(p, EP_IntValue) );
+-    sqlite3DbFree(db, p->u.zToken);
+-  }
+   if( !ExprHasProperty(p, EP_Static) ){
+-    sqlite3DbFreeNN(db, p);
++    sqlite3DbNNFreeNN(db, p);
+   }
+ }
+ SQLITE_PRIVATE void sqlite3ExprDelete(sqlite3 *db, Expr *p){
+   if( p ) sqlite3ExprDeleteNN(db, p);
+ }
++SQLITE_PRIVATE void sqlite3ExprDeleteGeneric(sqlite3 *db, void *p){
++  if( ALWAYS(p) ) sqlite3ExprDeleteNN(db, (Expr*)p);
++}
+ 
+ /*
+ ** Clear both elements of an OnOrUsing object
+@@ -104926,7 +109919,7 @@ SQLITE_PRIVATE void sqlite3ClearOnOrUsing(sqlite3 *db, OnOrUsing *p){
+ /*
+ ** Arrange to cause pExpr to be deleted when the pParse is deleted.
+ ** This is similar to sqlite3ExprDelete() except that the delete is
+-** deferred untilthe pParse is deleted.
++** deferred until the pParse is deleted.
+ **
+ ** The pExpr might be deleted immediately on an OOM error.
+ **
+@@ -104934,8 +109927,7 @@ SQLITE_PRIVATE void sqlite3ClearOnOrUsing(sqlite3 *db, OnOrUsing *p){
+ ** pExpr to the pParse->pConstExpr list with a register number of 0.
+ */
+ SQLITE_PRIVATE void sqlite3ExprDeferredDelete(Parse *pParse, Expr *pExpr){
+-  pParse->pConstExpr =
+-      sqlite3ExprListAppend(pParse, pParse->pConstExpr, pExpr);
++  sqlite3ParserAddCleanup(pParse, sqlite3ExprDeleteGeneric, pExpr);
+ }
+ 
+ /* Invoke sqlite3RenameExprUnmap() and sqlite3ExprDelete() on the
+@@ -105000,16 +109992,11 @@ static int dupedExprStructSize(const Expr *p, int flags){
+   assert( flags==EXPRDUP_REDUCE || flags==0 ); /* Only one flag value allowed */
+   assert( EXPR_FULLSIZE<=0xfff );
+   assert( (0xfff & (EP_Reduced|EP_TokenOnly))==0 );
+-  if( 0==flags || p->op==TK_SELECT_COLUMN
+-#ifndef SQLITE_OMIT_WINDOWFUNC
+-   || ExprHasProperty(p, EP_WinFunc)
+-#endif
+-  ){
++  if( 0==flags || ExprHasProperty(p, EP_FullSize) ){
+     nSize = EXPR_FULLSIZE;
+   }else{
+     assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
+     assert( !ExprHasProperty(p, EP_OuterON) );
+-    assert( !ExprHasProperty(p, EP_MemToken) );
+     assert( !ExprHasVVAProperty(p, EP_NoReduce) );
+     if( p->pLeft || p->x.pList ){
+       nSize = EXPR_REDUCEDSIZE | EP_Reduced;
+@@ -105036,56 +110023,93 @@ static int dupedExprNodeSize(const Expr *p, int flags){
+ 
+ /*
+ ** Return the number of bytes required to create a duplicate of the
+-** expression passed as the first argument. The second argument is a
+-** mask containing EXPRDUP_XXX flags.
++** expression passed as the first argument.
+ **
+ ** The value returned includes space to create a copy of the Expr struct
+ ** itself and the buffer referred to by Expr.u.zToken, if any.
+ **
+-** If the EXPRDUP_REDUCE flag is set, then the return value includes
+-** space to duplicate all Expr nodes in the tree formed by Expr.pLeft
+-** and Expr.pRight variables (but not for any structures pointed to or
+-** descended from the Expr.x.pList or Expr.x.pSelect variables).
++** The return value includes space to duplicate all Expr nodes in the
++** tree formed by Expr.pLeft and Expr.pRight, but not any other
++** substructure such as Expr.x.pList, Expr.x.pSelect, and Expr.y.pWin.
+ */
+-static int dupedExprSize(const Expr *p, int flags){
+-  int nByte = 0;
+-  if( p ){
+-    nByte = dupedExprNodeSize(p, flags);
+-    if( flags&EXPRDUP_REDUCE ){
+-      nByte += dupedExprSize(p->pLeft, flags) + dupedExprSize(p->pRight, flags);
+-    }
+-  }
++static int dupedExprSize(const Expr *p){
++  int nByte;
++  assert( p!=0 );
++  nByte = dupedExprNodeSize(p, EXPRDUP_REDUCE);
++  if( p->pLeft ) nByte += dupedExprSize(p->pLeft);
++  if( p->pRight ) nByte += dupedExprSize(p->pRight);
++  assert( nByte==ROUND8(nByte) );
+   return nByte;
+ }
+ 
+ /*
+-** This function is similar to sqlite3ExprDup(), except that if pzBuffer
+-** is not NULL then *pzBuffer is assumed to point to a buffer large enough
+-** to store the copy of expression p, the copies of p->u.zToken
+-** (if applicable), and the copies of the p->pLeft and p->pRight expressions,
+-** if any. Before returning, *pzBuffer is set to the first byte past the
+-** portion of the buffer copied into by this function.
++** An EdupBuf is a memory allocation used to stored multiple Expr objects
++** together with their Expr.zToken content.  This is used to help implement
++** compression while doing sqlite3ExprDup().  The top-level Expr does the
++** allocation for itself and many of its decendents, then passes an instance
++** of the structure down into exprDup() so that they decendents can have
++** access to that memory.
+ */
+-static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
++typedef struct EdupBuf EdupBuf;
++struct EdupBuf {
++  u8 *zAlloc;          /* Memory space available for storage */
++#ifdef SQLITE_DEBUG
++  u8 *zEnd;            /* First byte past the end of memory */
++#endif
++};
++
++/*
++** This function is similar to sqlite3ExprDup(), except that if pEdupBuf
++** is not NULL then it points to memory that can be used to store a copy
++** of the input Expr p together with its p->u.zToken (if any).  pEdupBuf
++** is updated with the new buffer tail prior to returning.
++*/
++static Expr *exprDup(
++  sqlite3 *db,          /* Database connection (for memory allocation) */
++  const Expr *p,        /* Expr tree to be duplicated */
++  int dupFlags,         /* EXPRDUP_REDUCE for compression.  0 if not */
++  EdupBuf *pEdupBuf     /* Preallocated storage space, or NULL */
++){
+   Expr *pNew;           /* Value to return */
+-  u8 *zAlloc;           /* Memory space from which to build Expr object */
++  EdupBuf sEdupBuf;     /* Memory space from which to build Expr object */
+   u32 staticFlag;       /* EP_Static if space not obtained from malloc */
++  int nToken = -1;       /* Space needed for p->u.zToken.  -1 means unknown */
+ 
+   assert( db!=0 );
+   assert( p );
+   assert( dupFlags==0 || dupFlags==EXPRDUP_REDUCE );
+-  assert( pzBuffer==0 || dupFlags==EXPRDUP_REDUCE );
++  assert( pEdupBuf==0 || dupFlags==EXPRDUP_REDUCE );
+ 
+   /* Figure out where to write the new Expr structure. */
+-  if( pzBuffer ){
+-    zAlloc = *pzBuffer;
++  if( pEdupBuf ){
++    sEdupBuf.zAlloc = pEdupBuf->zAlloc;
++#ifdef SQLITE_DEBUG
++    sEdupBuf.zEnd = pEdupBuf->zEnd;
++#endif
+     staticFlag = EP_Static;
+-    assert( zAlloc!=0 );
++    assert( sEdupBuf.zAlloc!=0 );
++    assert( dupFlags==EXPRDUP_REDUCE );
+   }else{
+-    zAlloc = sqlite3DbMallocRawNN(db, dupedExprSize(p, dupFlags));
++    int nAlloc;
++    if( dupFlags ){
++      nAlloc = dupedExprSize(p);
++    }else if( !ExprHasProperty(p, EP_IntValue) && p->u.zToken ){
++      nToken = sqlite3Strlen30NN(p->u.zToken)+1;
++      nAlloc = ROUND8(EXPR_FULLSIZE + nToken);
++    }else{
++      nToken = 0;
++      nAlloc = ROUND8(EXPR_FULLSIZE);
++    }
++    assert( nAlloc==ROUND8(nAlloc) );
++    sEdupBuf.zAlloc = sqlite3DbMallocRawNN(db, nAlloc);
++#ifdef SQLITE_DEBUG
++    sEdupBuf.zEnd = sEdupBuf.zAlloc ? sEdupBuf.zAlloc+nAlloc : 0;
++#endif
++
+     staticFlag = 0;
+   }
+-  pNew = (Expr *)zAlloc;
++  pNew = (Expr *)sEdupBuf.zAlloc;
++  assert( EIGHT_BYTE_ALIGNMENT(pNew) );
+ 
+   if( pNew ){
+     /* Set nNewSize to the size allocated for the structure pointed to
+@@ -105094,26 +110118,31 @@ static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
+     ** by the copy of the p->u.zToken string (if any).
+     */
+     const unsigned nStructSize = dupedExprStructSize(p, dupFlags);
+-    const int nNewSize = nStructSize & 0xfff;
+-    int nToken;
+-    if( !ExprHasProperty(p, EP_IntValue) && p->u.zToken ){
+-      nToken = sqlite3Strlen30(p->u.zToken) + 1;
+-    }else{
+-      nToken = 0;
++    int nNewSize = nStructSize & 0xfff;
++    if( nToken<0 ){
++      if( !ExprHasProperty(p, EP_IntValue) && p->u.zToken ){
++        nToken = sqlite3Strlen30(p->u.zToken) + 1;
++      }else{
++        nToken = 0;
++      }
+     }
+     if( dupFlags ){
++      assert( (int)(sEdupBuf.zEnd - sEdupBuf.zAlloc) >= nNewSize+nToken );
+       assert( ExprHasProperty(p, EP_Reduced)==0 );
+-      memcpy(zAlloc, p, nNewSize);
++      memcpy(sEdupBuf.zAlloc, p, nNewSize);
+     }else{
+       u32 nSize = (u32)exprStructSize(p);
+-      memcpy(zAlloc, p, nSize);
++      assert( (int)(sEdupBuf.zEnd - sEdupBuf.zAlloc) >=
++                                                   (int)EXPR_FULLSIZE+nToken );
++      memcpy(sEdupBuf.zAlloc, p, nSize);
+       if( nSizeflags &= ~(EP_Reduced|EP_TokenOnly|EP_Static|EP_MemToken);
++    pNew->flags &= ~(EP_Reduced|EP_TokenOnly|EP_Static);
+     pNew->flags |= nStructSize & (EP_Reduced|EP_TokenOnly);
+     pNew->flags |= staticFlag;
+     ExprClearVVAProperties(pNew);
+@@ -105122,44 +110151,50 @@ static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
+     }
+ 
+     /* Copy the p->u.zToken string, if any. */
+-    if( nToken ){
+-      char *zToken = pNew->u.zToken = (char*)&zAlloc[nNewSize];
++    assert( nToken>=0 );
++    if( nToken>0 ){
++      char *zToken = pNew->u.zToken = (char*)&sEdupBuf.zAlloc[nNewSize];
+       memcpy(zToken, p->u.zToken, nToken);
++      nNewSize += nToken;
+     }
++    sEdupBuf.zAlloc += ROUND8(nNewSize);
++
++    if( ((p->flags|pNew->flags)&(EP_TokenOnly|EP_Leaf))==0 ){
+ 
+-    if( 0==((p->flags|pNew->flags) & (EP_TokenOnly|EP_Leaf)) ){
+       /* Fill in the pNew->x.pSelect or pNew->x.pList member. */
+       if( ExprUseXSelect(p) ){
+         pNew->x.pSelect = sqlite3SelectDup(db, p->x.pSelect, dupFlags);
+       }else{
+-        pNew->x.pList = sqlite3ExprListDup(db, p->x.pList, dupFlags);
++        pNew->x.pList = sqlite3ExprListDup(db, p->x.pList,
++                           p->op!=TK_ORDER ? dupFlags : 0);
+       }
+-    }
+ 
+-    /* Fill in pNew->pLeft and pNew->pRight. */
+-    if( ExprHasProperty(pNew, EP_Reduced|EP_TokenOnly|EP_WinFunc) ){
+-      zAlloc += dupedExprNodeSize(p, dupFlags);
+-      if( !ExprHasProperty(pNew, EP_TokenOnly|EP_Leaf) ){
+-        pNew->pLeft = p->pLeft ?
+-                      exprDup(db, p->pLeft, EXPRDUP_REDUCE, &zAlloc) : 0;
+-        pNew->pRight = p->pRight ?
+-                       exprDup(db, p->pRight, EXPRDUP_REDUCE, &zAlloc) : 0;
+-      }
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+       if( ExprHasProperty(p, EP_WinFunc) ){
+         pNew->y.pWin = sqlite3WindowDup(db, pNew, p->y.pWin);
+         assert( ExprHasProperty(pNew, EP_WinFunc) );
+       }
+ #endif /* SQLITE_OMIT_WINDOWFUNC */
+-      if( pzBuffer ){
+-        *pzBuffer = zAlloc;
+-      }
+-    }else{
+-      if( !ExprHasProperty(p, EP_TokenOnly|EP_Leaf) ){
+-        if( pNew->op==TK_SELECT_COLUMN ){
++
++      /* Fill in pNew->pLeft and pNew->pRight. */
++      if( dupFlags ){
++        if( p->op==TK_SELECT_COLUMN ){
+           pNew->pLeft = p->pLeft;
+-          assert( p->pRight==0  || p->pRight==p->pLeft
+-                                || ExprHasProperty(p->pLeft, EP_Subquery) );
++          assert( p->pRight==0
++               || p->pRight==p->pLeft
++               || ExprHasProperty(p->pLeft, EP_Subquery) );
++        }else{
++          pNew->pLeft = p->pLeft ?
++                      exprDup(db, p->pLeft, EXPRDUP_REDUCE, &sEdupBuf) : 0;
++        }
++        pNew->pRight = p->pRight ?
++                       exprDup(db, p->pRight, EXPRDUP_REDUCE, &sEdupBuf) : 0;
++      }else{
++        if( p->op==TK_SELECT_COLUMN ){
++          pNew->pLeft = p->pLeft;
++          assert( p->pRight==0
++               || p->pRight==p->pLeft
++               || ExprHasProperty(p->pLeft, EP_Subquery) );
+         }else{
+           pNew->pLeft = sqlite3ExprDup(db, p->pLeft, 0);
+         }
+@@ -105167,6 +110202,8 @@ static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
+       }
+     }
+   }
++  if( pEdupBuf ) memcpy(pEdupBuf, &sEdupBuf, sizeof(sEdupBuf));
++  assert( sEdupBuf.zAlloc <= sEdupBuf.zEnd );
+   return pNew;
+ }
+ 
+@@ -105431,11 +110468,7 @@ SQLITE_PRIVATE Select *sqlite3SelectDup(sqlite3 *db, const Select *p, int flags)
+ ** initially NULL, then create a new expression list.
+ **
+ ** The pList argument must be either NULL or a pointer to an ExprList
+-** obtained from a prior call to sqlite3ExprListAppend().  This routine
+-** may not be used with an ExprList obtained from sqlite3ExprListDup().
+-** Reason:  This routine assumes that the number of slots in pList->a[]
+-** is a power of two.  That is true for sqlite3ExprListAppend() returns
+-** but is not necessarily true from the return value of sqlite3ExprListDup().
++** obtained from a prior call to sqlite3ExprListAppend().
+ **
+ ** If a memory allocation error occurs, the entire list is freed and
+ ** NULL is returned.  If non-NULL is returned, then it is guaranteed
+@@ -105689,16 +110722,20 @@ static SQLITE_NOINLINE void exprListDeleteNN(sqlite3 *db, ExprList *pList){
+   int i = pList->nExpr;
+   struct ExprList_item *pItem =  pList->a;
+   assert( pList->nExpr>0 );
++  assert( db!=0 );
+   do{
+     sqlite3ExprDelete(db, pItem->pExpr);
+-    sqlite3DbFree(db, pItem->zEName);
++    if( pItem->zEName ) sqlite3DbNNFreeNN(db, pItem->zEName);
+     pItem++;
+   }while( --i>0 );
+-  sqlite3DbFreeNN(db, pList);
++  sqlite3DbNNFreeNN(db, pList);
+ }
+ SQLITE_PRIVATE void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
+   if( pList ) exprListDeleteNN(db, pList);
+ }
++SQLITE_PRIVATE void sqlite3ExprListDeleteGeneric(sqlite3 *db, void *pList){
++  if( ALWAYS(pList) ) exprListDeleteNN(db, (ExprList*)pList);
++}
+ 
+ /*
+ ** Return the bitwise-OR of all Expr.flags fields in the given
+@@ -105767,7 +110804,7 @@ SQLITE_PRIVATE int sqlite3ExprIdToTrueFalse(Expr *pExpr){
+ ** and 0 if it is FALSE.
+ */
+ SQLITE_PRIVATE int sqlite3ExprTruthValue(const Expr *pExpr){
+-  pExpr = sqlite3ExprSkipCollate((Expr*)pExpr);
++  pExpr = sqlite3ExprSkipCollateAndLikely((Expr*)pExpr);
+   assert( pExpr->op==TK_TRUEFALSE );
+   assert( !ExprHasProperty(pExpr, EP_IntValue) );
+   assert( sqlite3StrICmp(pExpr->u.zToken,"true")==0
+@@ -105954,12 +110991,17 @@ SQLITE_PRIVATE int sqlite3ExprIsTableConstant(Expr *p, int iCur){
+ }
+ 
+ /*
+-** Check pExpr to see if it is an invariant constraint on data source pSrc.
++** Check pExpr to see if it is an constraint on the single data source
++** pSrc = &pSrcList->a[iSrc].  In other words, check to see if pExpr
++** constrains pSrc but does not depend on any other tables or data
++** sources anywhere else in the query.  Return true (non-zero) if pExpr
++** is a constraint on pSrc only.
++**
+ ** This is an optimization.  False negatives will perhaps cause slower
+ ** queries, but false positives will yield incorrect answers.  So when in
+ ** doubt, return 0.
+ **
+-** To be an invariant constraint, the following must be true:
++** To be an single-source constraint, the following must be true:
+ **
+ **   (1)  pExpr cannot refer to any table other than pSrc->iCursor.
+ **
+@@ -105970,13 +111012,31 @@ SQLITE_PRIVATE int sqlite3ExprIsTableConstant(Expr *p, int iCur){
+ **
+ **   (4)  If pSrc is the right operand of a LEFT JOIN, then...
+ **         (4a)  pExpr must come from an ON clause..
+-           (4b)  and specifically the ON clause associated with the LEFT JOIN.
++**         (4b)  and specifically the ON clause associated with the LEFT JOIN.
+ **
+ **   (5)  If pSrc is not the right operand of a LEFT JOIN or the left
+ **        operand of a RIGHT JOIN, then pExpr must be from the WHERE
+ **        clause, not an ON clause.
++**
++**   (6) Either:
++**
++**       (6a) pExpr does not originate in an ON or USING clause, or
++**
++**       (6b) The ON or USING clause from which pExpr is derived is
++**            not to the left of a RIGHT JOIN (or FULL JOIN).
++**
++**       Without this restriction, accepting pExpr as a single-table
++**       constraint might move the the ON/USING filter expression
++**       from the left side of a RIGHT JOIN over to the right side,
++**       which leads to incorrect answers.  See also restriction (9)
++**       on push-down.
+ */
+-SQLITE_PRIVATE int sqlite3ExprIsTableConstraint(Expr *pExpr, const SrcItem *pSrc){
++SQLITE_PRIVATE int sqlite3ExprIsSingleTableConstraint(
++  Expr *pExpr,                 /* The constraint */
++  const SrcList *pSrcList,     /* Complete FROM clause */
++  int iSrc                     /* Which element of pSrcList to use */
++){
++  const SrcItem *pSrc = &pSrcList->a[iSrc];
+   if( pSrc->fg.jointype & JT_LTORJ ){
+     return 0;  /* rule (3) */
+   }
+@@ -105986,6 +111046,19 @@ SQLITE_PRIVATE int sqlite3ExprIsTableConstraint(Expr *pExpr, const SrcItem *pSrc
+   }else{
+     if( ExprHasProperty(pExpr, EP_OuterON) ) return 0;    /* rule (5) */
+   }
++  if( ExprHasProperty(pExpr, EP_OuterON|EP_InnerON)  /* (6a) */
++   && (pSrcList->a[0].fg.jointype & JT_LTORJ)!=0     /* Fast pre-test of (6b) */
++  ){
++    int jj;
++    for(jj=0; jjw.iJoin==pSrcList->a[jj].iCursor ){
++        if( (pSrcList->a[jj].fg.jointype & JT_LTORJ)!=0 ){
++          return 0;  /* restriction (6) */
++        }
++        break;
++      }
++    }
++  }
+   return sqlite3ExprIsTableConstant(pExpr, pSrc->iCursor); /* rules (1), (2) */
+ }
+ 
+@@ -106162,9 +111235,10 @@ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr *p){
+     case TK_COLUMN:
+       assert( ExprUseYTab(p) );
+       return ExprHasProperty(p, EP_CanBeNull) ||
+-             p->y.pTab==0 ||  /* Reference to column of index on expression */
++             NEVER(p->y.pTab==0) ||  /* Reference to column of index on expr */
+              (p->iColumn>=0
+               && p->y.pTab->aCol!=0 /* Possible due to prior error */
++              && ALWAYS(p->iColumny.pTab->nCol)
+               && p->y.pTab->aCol[p->iColumn].notNull==0);
+     default:
+       return 1;
+@@ -106224,11 +111298,32 @@ SQLITE_PRIVATE int sqlite3IsRowid(const char *z){
+   return 0;
+ }
+ 
++/*
++** Return a pointer to a buffer containing a usable rowid alias for table
++** pTab. An alias is usable if there is not an explicit user-defined column
++** of the same name.
++*/
++SQLITE_PRIVATE const char *sqlite3RowidAlias(Table *pTab){
++  const char *azOpt[] = {"_ROWID_", "ROWID", "OID"};
++  int ii;
++  assert( VisibleRowid(pTab) );
++  for(ii=0; iinCol; iCol++){
++      if( sqlite3_stricmp(azOpt[ii], pTab->aCol[iCol].zCnName)==0 ) break;
++    }
++    if( iCol==pTab->nCol ){
++      return azOpt[ii];
++    }
++  }
++  return 0;
++}
++
+ /*
+ ** pX is the RHS of an IN operator.  If pX is a SELECT statement
+ ** that can be simplified to a direct table access, then return
+ ** a pointer to the SELECT statement.  If pX is not a SELECT statement,
+-** or if the SELECT statement needs to be manifested into a transient
++** or if the SELECT statement needs to be materialized into a transient
+ ** table, then return NULL.
+ */
+ #ifndef SQLITE_OMIT_SUBQUERY
+@@ -106324,7 +111419,7 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
+ **   IN_INDEX_INDEX_ASC  - The cursor was opened on an ascending index.
+ **   IN_INDEX_INDEX_DESC - The cursor was opened on a descending index.
+ **   IN_INDEX_EPH        - The cursor was opened on a specially created and
+-**                         populated epheremal table.
++**                         populated ephemeral table.
+ **   IN_INDEX_NOOP       - No cursor was allocated.  The IN operator must be
+ **                         implemented as a sequence of comparisons.
+ **
+@@ -106337,7 +111432,7 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
+ ** an ephemeral table might need to be generated from the RHS and then
+ ** pX->iTable made to point to the ephemeral table instead of an
+ ** existing table.  In this case, the creation and initialization of the
+-** ephmeral table might be put inside of a subroutine, the EP_Subrtn flag
++** ephemeral table might be put inside of a subroutine, the EP_Subrtn flag
+ ** will be set on pX and the pX->y.sub fields will be set to show where
+ ** the subroutine is coded.
+ **
+@@ -106349,12 +111444,12 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
+ **
+ ** When IN_INDEX_LOOP is used (and the b-tree will be used to iterate
+ ** through the set members) then the b-tree must not contain duplicates.
+-** An epheremal table will be created unless the selected columns are guaranteed
++** An ephemeral table will be created unless the selected columns are guaranteed
+ ** to be unique - either because it is an INTEGER PRIMARY KEY or due to
+ ** a UNIQUE constraint or index.
+ **
+ ** When IN_INDEX_MEMBERSHIP is used (and the b-tree will be used
+-** for fast set membership tests) then an epheremal table must
++** for fast set membership tests) then an ephemeral table must
+ ** be used unless  is a single INTEGER PRIMARY KEY column or an
+ ** index can be found with the specified  as its left-most.
+ **
+@@ -106514,7 +111609,6 @@ SQLITE_PRIVATE int sqlite3FindInIndex(
+             CollSeq *pReq = sqlite3BinaryCompareCollSeq(pParse, pLhs, pRhs);
+             int j;
+ 
+-            assert( pReq!=0 || pRhs->iColumn==XN_ROWID || pParse->nErr );
+             for(j=0; jaiColumn[j]!=pRhs->iColumn ) continue;
+               assert( pIdx->azColl[j] );
+@@ -106688,7 +111782,7 @@ SQLITE_PRIVATE void sqlite3VectorErrorMsg(Parse *pParse, Expr *pExpr){
+ **     x IN (SELECT a FROM b)     -- IN operator with subquery on the right
+ **
+ ** The pExpr parameter is the IN operator.  The cursor number for the
+-** constructed ephermeral table is returned.  The first time the ephemeral
++** constructed ephemeral table is returned.  The first time the ephemeral
+ ** table is computed, the cursor number is also stored in pExpr->iTable,
+ ** however the cursor number returned might not be the same, as it might
+ ** have been duplicated using OP_OpenDup.
+@@ -106872,6 +111966,7 @@ SQLITE_PRIVATE void sqlite3CodeRhsOfIN(
+     sqlite3VdbeChangeP4(v, addr, (void *)pKeyInfo, P4_KEYINFO);
+   }
+   if( addrOnce ){
++    sqlite3VdbeAddOp1(v, OP_NullRow, iTab);
+     sqlite3VdbeJumpHere(v, addrOnce);
+     /* Subroutine return */
+     assert( ExprUseYSub(pExpr) );
+@@ -106907,6 +112002,9 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
+   SelectDest dest;            /* How to deal with SELECT result */
+   int nReg;                   /* Registers to allocate */
+   Expr *pLimit;               /* New limit expression */
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  int addrExplain;            /* Address of OP_Explain instruction */
++#endif
+ 
+   Vdbe *v = pParse->pVdbe;
+   assert( v!=0 );
+@@ -106959,8 +112057,9 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
+   ** In both cases, the query is augmented with "LIMIT 1".  Any
+   ** preexisting limit is discarded in place of the new LIMIT 1.
+   */
+-  ExplainQueryPlan((pParse, 1, "%sSCALAR SUBQUERY %d",
++  ExplainQueryPlan2(addrExplain, (pParse, 1, "%sSCALAR SUBQUERY %d",
+         addrOnce?"":"CORRELATED ", pSel->selId));
++  sqlite3VdbeScanStatusCounters(v, addrExplain, addrExplain, -1);
+   nReg = pExpr->op==TK_SELECT ? pSel->pEList->nExpr : 1;
+   sqlite3SelectDestInit(&dest, 0, pParse->nMem+1);
+   pParse->nMem += nReg;
+@@ -106985,7 +112084,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
+       pLimit = sqlite3PExpr(pParse, TK_NE,
+                             sqlite3ExprDup(db, pSel->pLimit->pLeft, 0), pLimit);
+     }
+-    sqlite3ExprDelete(db, pSel->pLimit->pLeft);
++    sqlite3ExprDeferredDelete(pParse, pSel->pLimit->pLeft);
+     pSel->pLimit->pLeft = pLimit;
+   }else{
+     /* If there is no pre-existing limit add a limit of 1 */
+@@ -107003,6 +112102,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
+   if( addrOnce ){
+     sqlite3VdbeJumpHere(v, addrOnce);
+   }
++  sqlite3VdbeScanStatusRange(v, addrExplain, addrExplain, -1);
+ 
+   /* Subroutine return */
+   assert( ExprUseYSub(pExpr) );
+@@ -107411,6 +112511,7 @@ SQLITE_PRIVATE void sqlite3ExprCodeGeneratedColumn(
+ ){
+   int iAddr;
+   Vdbe *v = pParse->pVdbe;
++  int nErr = pParse->nErr;
+   assert( v!=0 );
+   assert( pParse->iSelfTab!=0 );
+   if( pParse->iSelfTab>0 ){
+@@ -107423,6 +112524,7 @@ SQLITE_PRIVATE void sqlite3ExprCodeGeneratedColumn(
+     sqlite3VdbeAddOp4(v, OP_Affinity, regOut, 1, 0, &pCol->affinity, 1);
+   }
+   if( iAddr ) sqlite3VdbeJumpHere(v, iAddr);
++  if( pParse->nErr>nErr ) pParse->db->errByteOffset = -1;
+ }
+ #endif /* SQLITE_OMIT_GENERATED_COLUMNS */
+ 
+@@ -107438,10 +112540,8 @@ SQLITE_PRIVATE void sqlite3ExprCodeGetColumnOfTable(
+ ){
+   Column *pCol;
+   assert( v!=0 );
+-  if( pTab==0 ){
+-    sqlite3VdbeAddOp3(v, OP_Column, iTabCur, iCol, regOut);
+-    return;
+-  }
++  assert( pTab!=0 );
++  assert( iCol!=XN_EXPR );
+   if( iCol<0 || iCol==pTab->iPKey ){
+     sqlite3VdbeAddOp2(v, OP_Rowid, iTabCur, regOut);
+     VdbeComment((v, "%s.rowid", pTab->zName));
+@@ -107497,10 +112597,13 @@ SQLITE_PRIVATE int sqlite3ExprCodeGetColumn(
+   u8 p5            /* P5 value for OP_Column + FLAGS */
+ ){
+   assert( pParse->pVdbe!=0 );
++  assert( (p5 & (OPFLAG_NOCHNG|OPFLAG_TYPEOFARG|OPFLAG_LENGTHARG))==p5 );
++  assert( IsVirtual(pTab) || (p5 & OPFLAG_NOCHNG)==0 );
+   sqlite3ExprCodeGetColumnOfTable(pParse->pVdbe, pTab, iTable, iColumn, iReg);
+   if( p5 ){
+-    VdbeOp *pOp = sqlite3VdbeGetOp(pParse->pVdbe,-1);
++    VdbeOp *pOp = sqlite3VdbeGetLastOp(pParse->pVdbe);
+     if( pOp->opcode==OP_Column ) pOp->p5 = p5;
++    if( pOp->opcode==OP_VColumn ) pOp->p5 = (p5 & OPFLAG_NOCHNG);
+   }
+   return iReg;
+ }
+@@ -107529,7 +112632,7 @@ static void exprToRegister(Expr *pExpr, int iReg){
+ 
+ /*
+ ** Evaluate an expression (either a vector or a scalar expression) and store
+-** the result in continguous temporary registers.  Return the index of
++** the result in contiguous temporary registers.  Return the index of
+ ** the first register used to store the result.
+ **
+ ** If the returned result register is a temporary scalar, then also write
+@@ -107568,8 +112671,8 @@ static int exprCodeVector(Parse *pParse, Expr *p, int *piFreeable){
+ ** so that a subsequent copy will not be merged into this one.
+ */
+ static void setDoNotMergeFlagOnCopy(Vdbe *v){
+-  if( sqlite3VdbeGetOp(v, -1)->opcode==OP_Copy ){
+-    sqlite3VdbeChangeP5(v, 1);  /* Tag trailing OP_Copy as not mergable */
++  if( sqlite3VdbeGetLastOp(v)->opcode==OP_Copy ){
++    sqlite3VdbeChangeP5(v, 1);  /* Tag trailing OP_Copy as not mergeable */
+   }
+ }
+ 
+@@ -107659,13 +112762,13 @@ static int exprCodeInlineFunction(
+     }
+ 
+     case INLINEFUNC_implies_nonnull_row: {
+-      /* REsult of sqlite3ExprImpliesNonNullRow() */
++      /* Result of sqlite3ExprImpliesNonNullRow() */
+       Expr *pA1;
+       assert( nFarg==2 );
+       pA1 = pFarg->a[1].pExpr;
+       if( pA1->op==TK_COLUMN ){
+         sqlite3VdbeAddOp2(v, OP_Integer,
+-           sqlite3ExprImpliesNonNullRow(pFarg->a[0].pExpr,pA1->iTable),
++           sqlite3ExprImpliesNonNullRow(pFarg->a[0].pExpr,pA1->iTable,1),
+            target);
+       }else{
+         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+@@ -107678,10 +112781,13 @@ static int exprCodeInlineFunction(
+       ** the type affinity of the argument.  This is used for testing of
+       ** the SQLite type logic.
+       */
+-      const char *azAff[] = { "blob", "text", "numeric", "integer", "real" };
++      const char *azAff[] = { "blob", "text", "numeric", "integer",
++                              "real", "flexnum" };
+       char aff;
+       assert( nFarg==1 );
+       aff = sqlite3ExprAffinity(pFarg->a[0].pExpr);
++      assert( aff<=SQLITE_AFF_NONE
++           || (aff>=SQLITE_AFF_BLOB && aff<=SQLITE_AFF_FLEXNUM) );
+       sqlite3VdbeLoadString(v, target,
+               (aff<=SQLITE_AFF_NONE) ? "none" : azAff[aff-SQLITE_AFF_BLOB]);
+       break;
+@@ -107691,6 +112797,99 @@ static int exprCodeInlineFunction(
+   return target;
+ }
+ 
++/*
++** Check to see if pExpr is one of the indexed expressions on pParse->pIdxEpr.
++** If it is, then resolve the expression by reading from the index and
++** return the register into which the value has been read.  If pExpr is
++** not an indexed expression, then return negative.
++*/
++static SQLITE_NOINLINE int sqlite3IndexedExprLookup(
++  Parse *pParse,   /* The parsing context */
++  Expr *pExpr,     /* The expression to potentially bypass */
++  int target       /* Where to store the result of the expression */
++){
++  IndexedExpr *p;
++  Vdbe *v;
++  for(p=pParse->pIdxEpr; p; p=p->pIENext){
++    u8 exprAff;
++    int iDataCur = p->iDataCur;
++    if( iDataCur<0 ) continue;
++    if( pParse->iSelfTab ){
++      if( p->iDataCur!=pParse->iSelfTab-1 ) continue;
++      iDataCur = -1;
++    }
++    if( sqlite3ExprCompare(0, pExpr, p->pExpr, iDataCur)!=0 ) continue;
++    assert( p->aff>=SQLITE_AFF_BLOB && p->aff<=SQLITE_AFF_NUMERIC );
++    exprAff = sqlite3ExprAffinity(pExpr);
++    if( (exprAff<=SQLITE_AFF_BLOB && p->aff!=SQLITE_AFF_BLOB)
++     || (exprAff==SQLITE_AFF_TEXT && p->aff!=SQLITE_AFF_TEXT)
++     || (exprAff>=SQLITE_AFF_NUMERIC && p->aff!=SQLITE_AFF_NUMERIC)
++    ){
++      /* Affinity mismatch on a generated column */
++      continue;
++    }
++
++    v = pParse->pVdbe;
++    assert( v!=0 );
++    if( p->bMaybeNullRow ){
++      /* If the index is on a NULL row due to an outer join, then we
++      ** cannot extract the value from the index.  The value must be
++      ** computed using the original expression. */
++      int addr = sqlite3VdbeCurrentAddr(v);
++      sqlite3VdbeAddOp3(v, OP_IfNullRow, p->iIdxCur, addr+3, target);
++      VdbeCoverage(v);
++      sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
++      VdbeComment((v, "%s expr-column %d", p->zIdxName, p->iIdxCol));
++      sqlite3VdbeGoto(v, 0);
++      p = pParse->pIdxEpr;
++      pParse->pIdxEpr = 0;
++      sqlite3ExprCode(pParse, pExpr, target);
++      pParse->pIdxEpr = p;
++      sqlite3VdbeJumpHere(v, addr+2);
++    }else{
++      sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
++      VdbeComment((v, "%s expr-column %d", p->zIdxName, p->iIdxCol));
++    }
++    return target;
++  }
++  return -1;  /* Not found */
++}
++
++
++/*
++** Expresion pExpr is guaranteed to be a TK_COLUMN or equivalent. This
++** function checks the Parse.pIdxPartExpr list to see if this column
++** can be replaced with a constant value. If so, it generates code to
++** put the constant value in a register (ideally, but not necessarily,
++** register iTarget) and returns the register number.
++**
++** Or, if the TK_COLUMN cannot be replaced by a constant, zero is
++** returned.
++*/
++static int exprPartidxExprLookup(Parse *pParse, Expr *pExpr, int iTarget){
++  IndexedExpr *p;
++  for(p=pParse->pIdxPartExpr; p; p=p->pIENext){
++    if( pExpr->iColumn==p->iIdxCol && pExpr->iTable==p->iDataCur ){
++      Vdbe *v = pParse->pVdbe;
++      int addr = 0;
++      int ret;
++
++      if( p->bMaybeNullRow ){
++        addr = sqlite3VdbeAddOp1(v, OP_IfNullRow, p->iIdxCur);
++      }
++      ret = sqlite3ExprCodeTarget(pParse, p->pExpr, iTarget);
++      sqlite3VdbeAddOp4(pParse->pVdbe, OP_Affinity, ret, 1, 0,
++                        (const char*)&p->aff, 1);
++      if( addr ){
++        sqlite3VdbeJumpHere(v, addr);
++        sqlite3VdbeChangeP3(v, addr, ret);
++      }
++      return ret;
++    }
++  }
++  return 0;
++}
++
+ 
+ /*
+ ** Generate code into the current Vdbe to evaluate the given
+@@ -107719,25 +112918,44 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
+ expr_code_doover:
+   if( pExpr==0 ){
+     op = TK_NULL;
++  }else if( pParse->pIdxEpr!=0
++   && !ExprHasProperty(pExpr, EP_Leaf)
++   && (r1 = sqlite3IndexedExprLookup(pParse, pExpr, target))>=0
++  ){
++    return r1;
+   }else{
+     assert( !ExprHasVVAProperty(pExpr,EP_Immutable) );
+     op = pExpr->op;
+   }
++  assert( op!=TK_ORDER );
+   switch( op ){
+     case TK_AGG_COLUMN: {
+       AggInfo *pAggInfo = pExpr->pAggInfo;
+       struct AggInfo_col *pCol;
+       assert( pAggInfo!=0 );
+-      assert( pExpr->iAgg>=0 && pExpr->iAggnColumn );
++      assert( pExpr->iAgg>=0 );
++      if( pExpr->iAgg>=pAggInfo->nColumn ){
++        /* Happens when the left table of a RIGHT JOIN is null and
++        ** is using an expression index */
++        sqlite3VdbeAddOp2(v, OP_Null, 0, target);
++#ifdef SQLITE_VDBE_COVERAGE
++        /* Verify that the OP_Null above is exercised by tests
++        ** tag-20230325-2 */
++        sqlite3VdbeAddOp3(v, OP_NotNull, target, 1, 20230325);
++        VdbeCoverageNeverTaken(v);
++#endif
++        break;
++      }
+       pCol = &pAggInfo->aCol[pExpr->iAgg];
+       if( !pAggInfo->directMode ){
+-        assert( pCol->iMem>0 );
+-        return pCol->iMem;
++        return AggInfoColumnReg(pAggInfo, pExpr->iAgg);
+       }else if( pAggInfo->useSortingIdx ){
+         Table *pTab = pCol->pTab;
+         sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab,
+                               pCol->iSorterColumn, target);
+-        if( pCol->iColumn<0 ){
++        if( pTab==0 ){
++          /* No comment added */
++        }else if( pCol->iColumn<0 ){
+           VdbeComment((v,"%s.rowid",pTab->zName));
+         }else{
+           VdbeComment((v,"%s.%s",
+@@ -107747,6 +112965,11 @@ expr_code_doover:
+           }
+         }
+         return target;
++      }else if( pExpr->y.pTab==0 ){
++        /* This case happens when the argument to an aggregate function
++        ** is rewritten by aggregateConvertIndexedExprRefToColumn() */
++        sqlite3VdbeAddOp3(v, OP_Column, pExpr->iTable, pExpr->iColumn, target);
++        return target;
+       }
+       /* Otherwise, fall thru into the TK_COLUMN case */
+       /* no break */ deliberate_fall_through
+@@ -107757,20 +112980,17 @@ expr_code_doover:
+       if( ExprHasProperty(pExpr, EP_FixedCol) ){
+         /* This COLUMN expression is really a constant due to WHERE clause
+         ** constraints, and that constant is coded by the pExpr->pLeft
+-        ** expresssion.  However, make sure the constant has the correct
++        ** expression.  However, make sure the constant has the correct
+         ** datatype by applying the Affinity of the table column to the
+         ** constant.
+         */
+         int aff;
+         iReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft,target);
+         assert( ExprUseYTab(pExpr) );
+-        if( pExpr->y.pTab ){
+-          aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
+-        }else{
+-          aff = pExpr->affExpr;
+-        }
++        assert( pExpr->y.pTab!=0 );
++        aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
+         if( aff>SQLITE_AFF_BLOB ){
+-          static const char zAff[] = "B\000C\000D\000E";
++          static const char zAff[] = "B\000C\000D\000E\000F";
+           assert( SQLITE_AFF_BLOB=='A' );
+           assert( SQLITE_AFF_TEXT=='B' );
+           sqlite3VdbeAddOp4(v, OP_Affinity, iReg, 1, 0,
+@@ -107829,13 +113049,16 @@ expr_code_doover:
+           iTab = pParse->iSelfTab - 1;
+         }
+       }
++      else if( pParse->pIdxPartExpr
++       && 0!=(r1 = exprPartidxExprLookup(pParse, pExpr, target))
++      ){
++        return r1;
++      }
+       assert( ExprUseYTab(pExpr) );
++      assert( pExpr->y.pTab!=0 );
+       iReg = sqlite3ExprCodeGetColumn(pParse, pExpr->y.pTab,
+                                pExpr->iColumn, iTab, target,
+                                pExpr->op2);
+-      if( pExpr->y.pTab==0 && pExpr->affExpr==SQLITE_AFF_REAL ){
+-        sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
+-      }
+       return iReg;
+     }
+     case TK_INTEGER: {
+@@ -107902,11 +113125,8 @@ expr_code_doover:
+ #ifndef SQLITE_OMIT_CAST
+     case TK_CAST: {
+       /* Expressions of the form:   CAST(pLeft AS token) */
+-      inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+-      if( inReg!=target ){
+-        sqlite3VdbeAddOp2(v, OP_SCopy, inReg, target);
+-        inReg = target;
+-      }
++      sqlite3ExprCode(pParse, pExpr->pLeft, target);
++      assert( inReg==target );
+       assert( !ExprHasProperty(pExpr, EP_IntValue) );
+       sqlite3VdbeAddOp2(v, OP_Cast, target,
+                         sqlite3AffinityType(pExpr->u.zToken, 0));
+@@ -108049,7 +113269,7 @@ expr_code_doover:
+         assert( !ExprHasProperty(pExpr, EP_IntValue) );
+         sqlite3ErrorMsg(pParse, "misuse of aggregate: %#T()", pExpr);
+       }else{
+-        return pInfo->aFunc[pExpr->iAgg].iMem;
++        return AggInfoFuncReg(pInfo, pExpr->iAgg);
+       }
+       break;
+     }
+@@ -108091,7 +113311,7 @@ expr_code_doover:
+         sqlite3ErrorMsg(pParse, "unknown function: %#T()", pExpr);
+         break;
+       }
+-      if( pDef->funcFlags & SQLITE_FUNC_INLINE ){
++      if( (pDef->funcFlags & SQLITE_FUNC_INLINE)!=0 && ALWAYS(pFarg!=0) ){
+         assert( (pDef->funcFlags & SQLITE_FUNC_UNSAFE)==0 );
+         assert( (pDef->funcFlags & SQLITE_FUNC_DIRECT)==0 );
+         return exprCodeInlineFunction(pParse, pFarg,
+@@ -108117,10 +113337,10 @@ expr_code_doover:
+           r1 = sqlite3GetTempRange(pParse, nFarg);
+         }
+ 
+-        /* For length() and typeof() functions with a column argument,
++        /* For length() and typeof() and octet_length() functions,
+         ** set the P5 parameter to the OP_Column opcode to OPFLAG_LENGTHARG
+-        ** or OPFLAG_TYPEOFARG respectively, to avoid unnecessary data
+-        ** loading.
++        ** or OPFLAG_TYPEOFARG or OPFLAG_BYTELENARG respectively, to avoid
++        ** unnecessary data loading.
+         */
+         if( (pDef->funcFlags & (SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF))!=0 ){
+           u8 exprOp;
+@@ -108130,14 +113350,16 @@ expr_code_doover:
+           if( exprOp==TK_COLUMN || exprOp==TK_AGG_COLUMN ){
+             assert( SQLITE_FUNC_LENGTH==OPFLAG_LENGTHARG );
+             assert( SQLITE_FUNC_TYPEOF==OPFLAG_TYPEOFARG );
+-            testcase( pDef->funcFlags & OPFLAG_LENGTHARG );
+-            pFarg->a[0].pExpr->op2 =
+-                  pDef->funcFlags & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG);
++            assert( SQLITE_FUNC_BYTELEN==OPFLAG_BYTELENARG );
++            assert( (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG)==OPFLAG_BYTELENARG );
++            testcase( (pDef->funcFlags & OPFLAG_BYTELENARG)==OPFLAG_LENGTHARG );
++            testcase( (pDef->funcFlags & OPFLAG_BYTELENARG)==OPFLAG_TYPEOFARG );
++            testcase( (pDef->funcFlags & OPFLAG_BYTELENARG)==OPFLAG_BYTELENARG);
++            pFarg->a[0].pExpr->op2 = pDef->funcFlags & OPFLAG_BYTELENARG;
+           }
+         }
+ 
+-        sqlite3ExprCodeExprList(pParse, pFarg, r1, 0,
+-                                SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR);
++        sqlite3ExprCodeExprList(pParse, pFarg, r1, 0, SQLITE_ECEL_FACTOR);
+       }else{
+         r1 = 0;
+       }
+@@ -108238,17 +113460,16 @@ expr_code_doover:
+       return target;
+     }
+     case TK_COLLATE: {
+-      if( !ExprHasProperty(pExpr, EP_Collate)
+-       && ALWAYS(pExpr->pLeft)
+-       && pExpr->pLeft->op==TK_FUNCTION
+-      ){
+-        inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
+-        if( inReg!=target ){
+-          sqlite3VdbeAddOp2(v, OP_SCopy, inReg, target);
+-          inReg = target;
+-        }
+-        sqlite3VdbeAddOp1(v, OP_ClrSubtype, inReg);
+-        return inReg;
++      if( !ExprHasProperty(pExpr, EP_Collate) ){
++        /* A TK_COLLATE Expr node without the EP_Collate tag is a so-called
++        ** "SOFT-COLLATE" that is added to constraints that are pushed down
++        ** from outer queries into sub-queries by the push-down optimization.
++        ** Clear subtypes as subtypes may not cross a subquery boundary.
++        */
++        assert( pExpr->pLeft );
++        sqlite3ExprCode(pParse, pExpr->pLeft, target);
++        sqlite3VdbeAddOp1(v, OP_ClrSubtype, target);
++        return target;
+       }else{
+         pExpr = pExpr->pLeft;
+         goto expr_code_doover; /* 2018-04-28: Prevent deep recursion. */
+@@ -108334,16 +113555,34 @@ expr_code_doover:
+     case TK_IF_NULL_ROW: {
+       int addrINR;
+       u8 okConstFactor = pParse->okConstFactor;
+-      addrINR = sqlite3VdbeAddOp1(v, OP_IfNullRow, pExpr->iTable);
+-      /* Temporarily disable factoring of constant expressions, since
+-      ** even though expressions may appear to be constant, they are not
+-      ** really constant because they originate from the right-hand side
+-      ** of a LEFT JOIN. */
+-      pParse->okConstFactor = 0;
+-      inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
++      AggInfo *pAggInfo = pExpr->pAggInfo;
++      if( pAggInfo ){
++        assert( pExpr->iAgg>=0 && pExpr->iAggnColumn );
++        if( !pAggInfo->directMode ){
++          inReg = AggInfoColumnReg(pAggInfo, pExpr->iAgg);
++          break;
++        }
++        if( pExpr->pAggInfo->useSortingIdx ){
++          sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab,
++                            pAggInfo->aCol[pExpr->iAgg].iSorterColumn,
++                            target);
++          inReg = target;
++          break;
++        }
++      }
++      addrINR = sqlite3VdbeAddOp3(v, OP_IfNullRow, pExpr->iTable, 0, target);
++      /* The OP_IfNullRow opcode above can overwrite the result register with
++      ** NULL.  So we have to ensure that the result register is not a value
++      ** that is suppose to be a constant.  Two defenses are needed:
++      **   (1)  Temporarily disable factoring of constant expressions
++      **   (2)  Make sure the computed value really is stored in register
++      **        "target" and not someplace else.
++      */
++      pParse->okConstFactor = 0;   /* note (1) above */
++      sqlite3ExprCode(pParse, pExpr->pLeft, target);
++      assert( target==inReg );
+       pParse->okConstFactor = okConstFactor;
+       sqlite3VdbeJumpHere(v, addrINR);
+-      sqlite3VdbeChangeP3(v, addrINR, inReg);
+       break;
+     }
+ 
+@@ -108475,9 +113714,9 @@ expr_code_doover:
+ ** once. If no functions are involved, then factor the code out and put it at
+ ** the end of the prepared statement in the initialization section.
+ **
+-** If regDest>=0 then the result is always stored in that register and the
++** If regDest>0 then the result is always stored in that register and the
+ ** result is not reusable.  If regDest<0 then this routine is free to
+-** store the value whereever it wants.  The register where the expression
++** store the value wherever it wants.  The register where the expression
+ ** is stored is returned.  When regDest<0, two identical expressions might
+ ** code to the same register, if they do not contain function calls and hence
+ ** are factored out into the initialization section at the end of the
+@@ -108490,6 +113729,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeRunJustOnce(
+ ){
+   ExprList *p;
+   assert( ConstFactorOk(pParse) );
++  assert( regDest!=0 );
+   p = pParse->pConstExpr;
+   if( regDest<0 && p ){
+     struct ExprList_item *pItem;
+@@ -108580,7 +113820,11 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
+   inReg = sqlite3ExprCodeTarget(pParse, pExpr, target);
+   if( inReg!=target ){
+     u8 op;
+-    if( ALWAYS(pExpr) && ExprHasProperty(pExpr,EP_Subquery) ){
++    Expr *pX = sqlite3ExprSkipCollateAndLikely(pExpr);
++    testcase( pX!=pExpr );
++    if( ALWAYS(pX)
++     && (ExprHasProperty(pX,EP_Subquery) || pX->op==TK_REGISTER)
++    ){
+       op = OP_Copy;
+     }else{
+       op = OP_SCopy;
+@@ -108675,7 +113919,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeExprList(
+       if( inReg!=target+i ){
+         VdbeOp *pOp;
+         if( copyOp==OP_Copy
+-         && (pOp=sqlite3VdbeGetOp(v, -1))->opcode==OP_Copy
++         && (pOp=sqlite3VdbeGetLastOp(v))->opcode==OP_Copy
+          && pOp->p1+pOp->p3+1==inReg
+          && pOp->p2+pOp->p3+1==target+i
+          && pOp->p5==0  /* The do-not-merge flag must be clear */
+@@ -108874,6 +114118,7 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
+       assert( TK_ISNULL==OP_IsNull );   testcase( op==TK_ISNULL );
+       assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
+       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
++      sqlite3VdbeTypeofColumn(v, r1);
+       sqlite3VdbeAddOp2(v, op, r1, dest);
+       VdbeCoverageIf(v, op==TK_ISNULL);
+       VdbeCoverageIf(v, op==TK_NOTNULL);
+@@ -109048,6 +114293,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
+     case TK_ISNULL:
+     case TK_NOTNULL: {
+       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
++      sqlite3VdbeTypeofColumn(v, r1);
+       sqlite3VdbeAddOp2(v, op, r1, dest);
+       testcase( op==TK_ISNULL );   VdbeCoverageIf(v, op==TK_ISNULL);
+       testcase( op==TK_NOTNULL );  VdbeCoverageIf(v, op==TK_NOTNULL);
+@@ -109201,7 +114447,13 @@ SQLITE_PRIVATE int sqlite3ExprCompare(
+     if( pB->op==TK_COLLATE && sqlite3ExprCompare(pParse, pA,pB->pLeft,iTab)<2 ){
+       return 1;
+     }
+-    return 2;
++    if( pA->op==TK_AGG_COLUMN && pB->op==TK_COLUMN
++     && pB->iTable<0 && pA->iTable==iTab
++    ){
++      /* fall through */
++    }else{
++      return 2;
++    }
+   }
+   assert( !ExprHasProperty(pA, EP_IntValue) );
+   assert( !ExprHasProperty(pB, EP_IntValue) );
+@@ -109291,8 +114543,8 @@ SQLITE_PRIVATE int sqlite3ExprListCompare(const ExprList *pA, const ExprList *pB
+ */
+ SQLITE_PRIVATE int sqlite3ExprCompareSkip(Expr *pA,Expr *pB, int iTab){
+   return sqlite3ExprCompare(0,
+-             sqlite3ExprSkipCollateAndLikely(pA),
+-             sqlite3ExprSkipCollateAndLikely(pB),
++             sqlite3ExprSkipCollate(pA),
++             sqlite3ExprSkipCollate(pB),
+              iTab);
+ }
+ 
+@@ -109385,7 +114637,7 @@ static int exprImpliesNotNull(
+ **     pE1: x!=123     pE2: x IS NOT NULL    Result: true
+ **     pE1: x!=?1      pE2: x IS NOT NULL    Result: true
+ **     pE1: x IS NULL  pE2: x IS NOT NULL    Result: false
+-**     pE1: x IS ?2    pE2: x IS NOT NULL    Reuslt: false
++**     pE1: x IS ?2    pE2: x IS NOT NULL    Result: false
+ **
+ ** When comparing TK_COLUMN nodes between pE1 and pE2, if pE2 has
+ ** Expr.iTable<0 then assume a table number given by iTab.
+@@ -109422,11 +114674,29 @@ SQLITE_PRIVATE int sqlite3ExprImpliesExpr(
+   return 0;
+ }
+ 
++/* This is a helper function to impliesNotNullRow().  In this routine,
++** set pWalker->eCode to one only if *both* of the input expressions
++** separately have the implies-not-null-row property.
++*/
++static void bothImplyNotNullRow(Walker *pWalker, Expr *pE1, Expr *pE2){
++  if( pWalker->eCode==0 ){
++    sqlite3WalkExpr(pWalker, pE1);
++    if( pWalker->eCode ){
++      pWalker->eCode = 0;
++      sqlite3WalkExpr(pWalker, pE2);
++    }
++  }
++}
++
+ /*
+ ** This is the Expr node callback for sqlite3ExprImpliesNonNullRow().
+ ** If the expression node requires that the table at pWalker->iCur
+ ** have one or more non-NULL column, then set pWalker->eCode to 1 and abort.
+ **
++** pWalker->mWFlags is non-zero if this inquiry is being undertaking on
++** behalf of a RIGHT JOIN (or FULL JOIN).  That makes a difference when
++** evaluating terms in the ON clause of an inner join.
++**
+ ** This routine controls an optimization.  False positives (setting
+ ** pWalker->eCode to 1 when it should not be) are deadly, but false-negatives
+ ** (never setting pWalker->eCode) is a harmless missed optimization.
+@@ -109435,28 +114705,33 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
+   testcase( pExpr->op==TK_AGG_COLUMN );
+   testcase( pExpr->op==TK_AGG_FUNCTION );
+   if( ExprHasProperty(pExpr, EP_OuterON) ) return WRC_Prune;
++  if( ExprHasProperty(pExpr, EP_InnerON) && pWalker->mWFlags ){
++    /* If iCur is used in an inner-join ON clause to the left of a
++    ** RIGHT JOIN, that does *not* mean that the table must be non-null.
++    ** But it is difficult to check for that condition precisely.
++    ** To keep things simple, any use of iCur from any inner-join is
++    ** ignored while attempting to simplify a RIGHT JOIN. */
++    return WRC_Prune;
++  }
+   switch( pExpr->op ){
+     case TK_ISNOT:
+     case TK_ISNULL:
+     case TK_NOTNULL:
+     case TK_IS:
+-    case TK_OR:
+     case TK_VECTOR:
+-    case TK_CASE:
+-    case TK_IN:
+     case TK_FUNCTION:
+     case TK_TRUTH:
++    case TK_CASE:
+       testcase( pExpr->op==TK_ISNOT );
+       testcase( pExpr->op==TK_ISNULL );
+       testcase( pExpr->op==TK_NOTNULL );
+       testcase( pExpr->op==TK_IS );
+-      testcase( pExpr->op==TK_OR );
+       testcase( pExpr->op==TK_VECTOR );
+-      testcase( pExpr->op==TK_CASE );
+-      testcase( pExpr->op==TK_IN );
+       testcase( pExpr->op==TK_FUNCTION );
+       testcase( pExpr->op==TK_TRUTH );
++      testcase( pExpr->op==TK_CASE );
+       return WRC_Prune;
++
+     case TK_COLUMN:
+       if( pWalker->u.iCur==pExpr->iTable ){
+         pWalker->eCode = 1;
+@@ -109464,21 +114739,38 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
+       }
+       return WRC_Prune;
+ 
++    case TK_OR:
+     case TK_AND:
+-      if( pWalker->eCode==0 ){
++      /* Both sides of an AND or OR must separately imply non-null-row.
++      ** Consider these cases:
++      **    1.  NOT (x AND y)
++      **    2.  x OR y
++      ** If only one of x or y is non-null-row, then the overall expression
++      ** can be true if the other arm is false (case 1) or true (case 2).
++      */
++      testcase( pExpr->op==TK_OR );
++      testcase( pExpr->op==TK_AND );
++      bothImplyNotNullRow(pWalker, pExpr->pLeft, pExpr->pRight);
++      return WRC_Prune;
++
++    case TK_IN:
++      /* Beware of "x NOT IN ()" and "x NOT IN (SELECT 1 WHERE false)",
++      ** both of which can be true.  But apart from these cases, if
++      ** the left-hand side of the IN is NULL then the IN itself will be
++      ** NULL. */
++      if( ExprUseXList(pExpr) && ALWAYS(pExpr->x.pList->nExpr>0) ){
+         sqlite3WalkExpr(pWalker, pExpr->pLeft);
+-        if( pWalker->eCode ){
+-          pWalker->eCode = 0;
+-          sqlite3WalkExpr(pWalker, pExpr->pRight);
+-        }
+       }
+       return WRC_Prune;
+ 
+     case TK_BETWEEN:
+-      if( sqlite3WalkExpr(pWalker, pExpr->pLeft)==WRC_Abort ){
+-        assert( pWalker->eCode );
+-        return WRC_Abort;
+-      }
++      /* In "x NOT BETWEEN y AND z" either x must be non-null-row or else
++      ** both y and z must be non-null row */
++      assert( ExprUseXList(pExpr) );
++      assert( pExpr->x.pList->nExpr==2 );
++      sqlite3WalkExpr(pWalker, pExpr->pLeft);
++      bothImplyNotNullRow(pWalker, pExpr->x.pList->a[0].pExpr,
++                                   pExpr->x.pList->a[1].pExpr);
+       return WRC_Prune;
+ 
+     /* Virtual tables are allowed to use constraints like x=NULL.  So
+@@ -109503,10 +114795,10 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
+       assert( pLeft->op!=TK_COLUMN || ExprUseYTab(pLeft) );
+       assert( pRight->op!=TK_COLUMN || ExprUseYTab(pRight) );
+       if( (pLeft->op==TK_COLUMN
+-           && pLeft->y.pTab!=0
++           && ALWAYS(pLeft->y.pTab!=0)
+            && IsVirtual(pLeft->y.pTab))
+        || (pRight->op==TK_COLUMN
+-           && pRight->y.pTab!=0
++           && ALWAYS(pRight->y.pTab!=0)
+            && IsVirtual(pRight->y.pTab))
+       ){
+         return WRC_Prune;
+@@ -109540,7 +114832,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
+ ** be non-NULL, then the LEFT JOIN can be safely converted into an
+ ** ordinary join.
+ */
+-SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr *p, int iTab){
++SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr *p, int iTab, int isRJ){
+   Walker w;
+   p = sqlite3ExprSkipCollateAndLikely(p);
+   if( p==0 ) return 0;
+@@ -109548,7 +114840,7 @@ SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr *p, int iTab){
+     p = p->pLeft;
+   }else{
+     while( p->op==TK_AND ){
+-      if( sqlite3ExprImpliesNonNullRow(p->pLeft, iTab) ) return 1;
++      if( sqlite3ExprImpliesNonNullRow(p->pLeft, iTab, isRJ) ) return 1;
+       p = p->pRight;
+     }
+   }
+@@ -109556,6 +114848,7 @@ SQLITE_PRIVATE int sqlite3ExprImpliesNonNullRow(Expr *p, int iTab){
+   w.xSelectCallback = 0;
+   w.xSelectCallback2 = 0;
+   w.eCode = 0;
++  w.mWFlags = isRJ!=0;
+   w.u.iCur = iTab;
+   sqlite3WalkExpr(&w, p);
+   return w.eCode;
+@@ -109616,7 +114909,7 @@ SQLITE_PRIVATE int sqlite3ExprCoveredByIndex(
+ }
+ 
+ 
+-/* Structure used to pass information throught the Walker in order to
++/* Structure used to pass information throughout the Walker in order to
+ ** implement sqlite3ReferencesSrcList().
+ */
+ struct RefSrcList {
+@@ -109711,6 +115004,7 @@ static int exprRefToSrcList(Walker *pWalker, Expr *pExpr){
+ SQLITE_PRIVATE int sqlite3ReferencesSrcList(Parse *pParse, Expr *pExpr, SrcList *pSrcList){
+   Walker w;
+   struct RefSrcList x;
++  assert( pParse->db!=0 );
+   memset(&w, 0, sizeof(w));
+   memset(&x, 0, sizeof(x));
+   w.xExprCallback = exprRefToSrcList;
+@@ -109722,12 +115016,18 @@ SQLITE_PRIVATE int sqlite3ReferencesSrcList(Parse *pParse, Expr *pExpr, SrcList
+   assert( pExpr->op==TK_AGG_FUNCTION );
+   assert( ExprUseXList(pExpr) );
+   sqlite3WalkExprList(&w, pExpr->x.pList);
++  if( pExpr->pLeft ){
++    assert( pExpr->pLeft->op==TK_ORDER );
++    assert( ExprUseXList(pExpr->pLeft) );
++    assert( pExpr->pLeft->x.pList!=0 );
++    sqlite3WalkExprList(&w, pExpr->pLeft->x.pList);
++  }
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+   if( ExprHasProperty(pExpr, EP_WinFunc) ){
+     sqlite3WalkExpr(&w, pExpr->y.pWin->pFilter);
+   }
+ #endif
+-  sqlite3DbFree(pParse->db, x.aiExclude);
++  if( x.aiExclude ) sqlite3DbNNFreeNN(pParse->db, x.aiExclude);
+   if( w.eCode & 0x01 ){
+     return 1;
+   }else if( w.eCode ){
+@@ -109745,10 +115045,8 @@ SQLITE_PRIVATE int sqlite3ReferencesSrcList(Parse *pParse, Expr *pExpr, SrcList
+ ** it does, make a copy.  This is done because the pExpr argument is
+ ** subject to change.
+ **
+-** The copy is stored on pParse->pConstExpr with a register number of 0.
+-** This will cause the expression to be deleted automatically when the
+-** Parse object is destroyed, but the zero register number means that it
+-** will not generate any code in the preamble.
++** The copy is scheduled for deletion using the sqlite3ExprDeferredDelete()
++** which builds on the sqlite3ParserAddCleanup() mechanism.
+ */
+ static int agginfoPersistExprCb(Walker *pWalker, Expr *pExpr){
+   if( ALWAYS(!ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced))
+@@ -109758,10 +115056,11 @@ static int agginfoPersistExprCb(Walker *pWalker, Expr *pExpr){
+     int iAgg = pExpr->iAgg;
+     Parse *pParse = pWalker->pParse;
+     sqlite3 *db = pParse->db;
+-    assert( pExpr->op==TK_AGG_COLUMN || pExpr->op==TK_AGG_FUNCTION );
+-    if( pExpr->op==TK_AGG_COLUMN ){
+-      assert( iAgg>=0 && iAggnColumn );
+-      if( pAggInfo->aCol[iAgg].pCExpr==pExpr ){
++    assert( iAgg>=0 );
++    if( pExpr->op!=TK_AGG_FUNCTION ){
++      if( iAggnColumn
++       && pAggInfo->aCol[iAgg].pCExpr==pExpr
++      ){
+         pExpr = sqlite3ExprDup(db, pExpr, 0);
+         if( pExpr ){
+           pAggInfo->aCol[iAgg].pCExpr = pExpr;
+@@ -109769,8 +115068,10 @@ static int agginfoPersistExprCb(Walker *pWalker, Expr *pExpr){
+         }
+       }
+     }else{
+-      assert( iAgg>=0 && iAggnFunc );
+-      if( pAggInfo->aFunc[iAgg].pFExpr==pExpr ){
++      assert( pExpr->op==TK_AGG_FUNCTION );
++      if( ALWAYS(iAggnFunc)
++       && pAggInfo->aFunc[iAgg].pFExpr==pExpr
++      ){
+         pExpr = sqlite3ExprDup(db, pExpr, 0);
+         if( pExpr ){
+           pAggInfo->aFunc[iAgg].pFExpr = pExpr;
+@@ -109825,6 +115126,74 @@ static int addAggInfoFunc(sqlite3 *db, AggInfo *pInfo){
+   return i;
+ }
+ 
++/*
++** Search the AggInfo object for an aCol[] entry that has iTable and iColumn.
++** Return the index in aCol[] of the entry that describes that column.
++**
++** If no prior entry is found, create a new one and return -1.  The
++** new column will have an index of pAggInfo->nColumn-1.
++*/
++static void findOrCreateAggInfoColumn(
++  Parse *pParse,       /* Parsing context */
++  AggInfo *pAggInfo,   /* The AggInfo object to search and/or modify */
++  Expr *pExpr          /* Expr describing the column to find or insert */
++){
++  struct AggInfo_col *pCol;
++  int k;
++
++  assert( pAggInfo->iFirstReg==0 );
++  pCol = pAggInfo->aCol;
++  for(k=0; knColumn; k++, pCol++){
++    if( pCol->pCExpr==pExpr ) return;
++    if( pCol->iTable==pExpr->iTable
++     && pCol->iColumn==pExpr->iColumn
++     && pExpr->op!=TK_IF_NULL_ROW
++    ){
++      goto fix_up_expr;
++    }
++  }
++  k = addAggInfoColumn(pParse->db, pAggInfo);
++  if( k<0 ){
++    /* OOM on resize */
++    assert( pParse->db->mallocFailed );
++    return;
++  }
++  pCol = &pAggInfo->aCol[k];
++  assert( ExprUseYTab(pExpr) );
++  pCol->pTab = pExpr->y.pTab;
++  pCol->iTable = pExpr->iTable;
++  pCol->iColumn = pExpr->iColumn;
++  pCol->iSorterColumn = -1;
++  pCol->pCExpr = pExpr;
++  if( pAggInfo->pGroupBy && pExpr->op!=TK_IF_NULL_ROW ){
++    int j, n;
++    ExprList *pGB = pAggInfo->pGroupBy;
++    struct ExprList_item *pTerm = pGB->a;
++    n = pGB->nExpr;
++    for(j=0; jpExpr;
++      if( pE->op==TK_COLUMN
++       && pE->iTable==pExpr->iTable
++       && pE->iColumn==pExpr->iColumn
++      ){
++        pCol->iSorterColumn = j;
++        break;
++      }
++    }
++  }
++  if( pCol->iSorterColumn<0 ){
++    pCol->iSorterColumn = pAggInfo->nSortingColumn++;
++  }
++fix_up_expr:
++  ExprSetVVAProperty(pExpr, EP_NoReduce);
++  assert( pExpr->pAggInfo==0 || pExpr->pAggInfo==pAggInfo );
++  pExpr->pAggInfo = pAggInfo;
++  if( pExpr->op==TK_COLUMN ){
++    pExpr->op = TK_AGG_COLUMN;
++  }
++  pExpr->iAgg = (i16)k;
++}
++
+ /*
+ ** This is the xExprCallback for a tree walker.  It is used to
+ ** implement sqlite3ExprAnalyzeAggregates().  See sqlite3ExprAnalyzeAggregates
+@@ -109838,87 +115207,76 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
+   AggInfo *pAggInfo = pNC->uNC.pAggInfo;
+ 
+   assert( pNC->ncFlags & NC_UAggInfo );
++  assert( pAggInfo->iFirstReg==0 );
+   switch( pExpr->op ){
++    default: {
++      IndexedExpr *pIEpr;
++      Expr tmp;
++      assert( pParse->iSelfTab==0 );
++      if( (pNC->ncFlags & NC_InAggFunc)==0 ) break;
++      if( pParse->pIdxEpr==0 ) break;
++      for(pIEpr=pParse->pIdxEpr; pIEpr; pIEpr=pIEpr->pIENext){
++        int iDataCur = pIEpr->iDataCur;
++        if( iDataCur<0 ) continue;
++        if( sqlite3ExprCompare(0, pExpr, pIEpr->pExpr, iDataCur)==0 ) break;
++      }
++      if( pIEpr==0 ) break;
++      if( NEVER(!ExprUseYTab(pExpr)) ) break;
++      for(i=0; inSrc; i++){
++         if( pSrcList->a[0].iCursor==pIEpr->iDataCur ) break;
++      }
++      if( i>=pSrcList->nSrc ) break;
++      if( NEVER(pExpr->pAggInfo!=0) ) break; /* Resolved by outer context */
++      if( pParse->nErr ){ return WRC_Abort; }
++
++      /* If we reach this point, it means that expression pExpr can be
++      ** translated into a reference to an index column as described by
++      ** pIEpr.
++      */
++      memset(&tmp, 0, sizeof(tmp));
++      tmp.op = TK_AGG_COLUMN;
++      tmp.iTable = pIEpr->iIdxCur;
++      tmp.iColumn = pIEpr->iIdxCol;
++      findOrCreateAggInfoColumn(pParse, pAggInfo, &tmp);
++      if( pParse->nErr ){ return WRC_Abort; }
++      assert( pAggInfo->aCol!=0 );
++      assert( tmp.iAggnColumn );
++      pAggInfo->aCol[tmp.iAgg].pCExpr = pExpr;
++      pExpr->pAggInfo = pAggInfo;
++      pExpr->iAgg = tmp.iAgg;
++      return WRC_Prune;
++    }
++    case TK_IF_NULL_ROW:
+     case TK_AGG_COLUMN:
+     case TK_COLUMN: {
+       testcase( pExpr->op==TK_AGG_COLUMN );
+       testcase( pExpr->op==TK_COLUMN );
++      testcase( pExpr->op==TK_IF_NULL_ROW );
+       /* Check to see if the column is in one of the tables in the FROM
+       ** clause of the aggregate query */
+       if( ALWAYS(pSrcList!=0) ){
+         SrcItem *pItem = pSrcList->a;
+         for(i=0; inSrc; i++, pItem++){
+-          struct AggInfo_col *pCol;
+           assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
+           if( pExpr->iTable==pItem->iCursor ){
+-            /* If we reach this point, it means that pExpr refers to a table
+-            ** that is in the FROM clause of the aggregate query.
+-            **
+-            ** Make an entry for the column in pAggInfo->aCol[] if there
+-            ** is not an entry there already.
+-            */
+-            int k;
+-            pCol = pAggInfo->aCol;
+-            for(k=0; knColumn; k++, pCol++){
+-              if( pCol->iTable==pExpr->iTable &&
+-                  pCol->iColumn==pExpr->iColumn ){
+-                break;
+-              }
+-            }
+-            if( (k>=pAggInfo->nColumn)
+-             && (k = addAggInfoColumn(pParse->db, pAggInfo))>=0
+-            ){
+-              pCol = &pAggInfo->aCol[k];
+-              assert( ExprUseYTab(pExpr) );
+-              pCol->pTab = pExpr->y.pTab;
+-              pCol->iTable = pExpr->iTable;
+-              pCol->iColumn = pExpr->iColumn;
+-              pCol->iMem = ++pParse->nMem;
+-              pCol->iSorterColumn = -1;
+-              pCol->pCExpr = pExpr;
+-              if( pAggInfo->pGroupBy ){
+-                int j, n;
+-                ExprList *pGB = pAggInfo->pGroupBy;
+-                struct ExprList_item *pTerm = pGB->a;
+-                n = pGB->nExpr;
+-                for(j=0; jpExpr;
+-                  if( pE->op==TK_COLUMN && pE->iTable==pExpr->iTable &&
+-                      pE->iColumn==pExpr->iColumn ){
+-                    pCol->iSorterColumn = j;
+-                    break;
+-                  }
+-                }
+-              }
+-              if( pCol->iSorterColumn<0 ){
+-                pCol->iSorterColumn = pAggInfo->nSortingColumn++;
+-              }
+-            }
+-            /* There is now an entry for pExpr in pAggInfo->aCol[] (either
+-            ** because it was there before or because we just created it).
+-            ** Convert the pExpr to be a TK_AGG_COLUMN referring to that
+-            ** pAggInfo->aCol[] entry.
+-            */
+-            ExprSetVVAProperty(pExpr, EP_NoReduce);
+-            pExpr->pAggInfo = pAggInfo;
+-            pExpr->op = TK_AGG_COLUMN;
+-            pExpr->iAgg = (i16)k;
++            findOrCreateAggInfoColumn(pParse, pAggInfo, pExpr);
+             break;
+           } /* endif pExpr->iTable==pItem->iCursor */
+         } /* end loop over pSrcList */
+       }
+-      return WRC_Prune;
++      return WRC_Continue;
+     }
+     case TK_AGG_FUNCTION: {
+       if( (pNC->ncFlags & NC_InAggFunc)==0
+        && pWalker->walkerDepth==pExpr->op2
++       && pExpr->pAggInfo==0
+       ){
+         /* Check to see if pExpr is a duplicate of another aggregate
+         ** function that is already in the pAggInfo structure
+         */
+         struct AggInfo_func *pItem = pAggInfo->aFunc;
+         for(i=0; inFunc; i++, pItem++){
+-          if( pItem->pFExpr==pExpr ) break;
++          if( NEVER(pItem->pFExpr==pExpr) ) break;
+           if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
+             break;
+           }
+@@ -109929,15 +115287,44 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
+           u8 enc = ENC(pParse->db);
+           i = addAggInfoFunc(pParse->db, pAggInfo);
+           if( i>=0 ){
++            int nArg;
+             assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
+             pItem = &pAggInfo->aFunc[i];
+             pItem->pFExpr = pExpr;
+-            pItem->iMem = ++pParse->nMem;
+             assert( ExprUseUToken(pExpr) );
++            nArg = pExpr->x.pList ? pExpr->x.pList->nExpr : 0;
+             pItem->pFunc = sqlite3FindFunction(pParse->db,
+-                   pExpr->u.zToken,
+-                   pExpr->x.pList ? pExpr->x.pList->nExpr : 0, enc, 0);
+-            if( pExpr->flags & EP_Distinct ){
++                                         pExpr->u.zToken, nArg, enc, 0);
++            assert( pItem->bOBUnique==0 );
++            if( pExpr->pLeft
++             && (pItem->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL)==0
++            ){
++              /* The NEEDCOLL test above causes any ORDER BY clause on
++              ** aggregate min() or max() to be ignored. */
++              ExprList *pOBList;
++              assert( nArg>0 );
++              assert( pExpr->pLeft->op==TK_ORDER );
++              assert( ExprUseXList(pExpr->pLeft) );
++              pItem->iOBTab = pParse->nTab++;
++              pOBList = pExpr->pLeft->x.pList;
++              assert( pOBList->nExpr>0 );
++              assert( pItem->bOBUnique==0 );
++              if( pOBList->nExpr==1
++               && nArg==1
++               && sqlite3ExprCompare(0,pOBList->a[0].pExpr,
++                               pExpr->x.pList->a[0].pExpr,0)==0
++              ){
++                pItem->bOBPayload = 0;
++                pItem->bOBUnique = ExprHasProperty(pExpr, EP_Distinct);
++              }else{
++                pItem->bOBPayload = 1;
++              }
++              pItem->bUseSubtype =
++                    (pItem->pFunc->funcFlags & SQLITE_SUBTYPE)!=0;
++            }else{
++              pItem->iOBTab = -1;
++            }
++            if( ExprHasProperty(pExpr, EP_Distinct) && !pItem->bOBUnique ){
+               pItem->iDistinct = pParse->nTab++;
+             }else{
+               pItem->iDistinct = -1;
+@@ -110061,6 +115448,37 @@ SQLITE_PRIVATE void sqlite3ClearTempRegCache(Parse *pParse){
+   pParse->nRangeReg = 0;
+ }
+ 
++/*
++** Make sure sufficient registers have been allocated so that
++** iReg is a valid register number.
++*/
++SQLITE_PRIVATE void sqlite3TouchRegister(Parse *pParse, int iReg){
++  if( pParse->nMemnMem = iReg;
++}
++
++#if defined(SQLITE_ENABLE_STAT4) || defined(SQLITE_DEBUG)
++/*
++** Return the latest reusable register in the set of all registers.
++** The value returned is no less than iMin.  If any register iMin or
++** greater is in permanent use, then return one more than that last
++** permanent register.
++*/
++SQLITE_PRIVATE int sqlite3FirstAvailableRegister(Parse *pParse, int iMin){
++  const ExprList *pList = pParse->pConstExpr;
++  if( pList ){
++    int i;
++    for(i=0; inExpr; i++){
++      if( pList->a[i].u.iConstExprReg>=iMin ){
++        iMin = pList->a[i].u.iConstExprReg + 1;
++      }
++    }
++  }
++  pParse->nTempReg = 0;
++  pParse->nRangeReg = 0;
++  return iMin;
++}
++#endif /* SQLITE_ENABLE_STAT4 || SQLITE_DEBUG */
++
+ /*
+ ** Validate that no temporary register falls within the range of
+ ** iFirst..iLast, inclusive.  This routine is only call from within assert()
+@@ -110080,6 +115498,14 @@ SQLITE_PRIVATE int sqlite3NoTempsInRange(Parse *pParse, int iFirst, int iLast){
+       return 0;
+     }
+   }
++  if( pParse->pConstExpr ){
++    ExprList *pList = pParse->pConstExpr;
++    for(i=0; inExpr; i++){
++      int iReg = pList->a[i].u.iConstExprReg;
++      if( iReg==0 ) continue;
++      if( iReg>=iFirst && iReg<=iLast ) return 0;
++    }
++  }
+   return 1;
+ }
+ #endif /* SQLITE_DEBUG */
+@@ -110534,14 +115960,19 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
+     /* Verify that constraints are still satisfied */
+     if( pNew->pCheck!=0
+      || (pCol->notNull && (pCol->colFlags & COLFLAG_GENERATED)!=0)
++     || (pTab->tabFlags & TF_Strict)!=0
+     ){
+       sqlite3NestedParse(pParse,
+         "SELECT CASE WHEN quick_check GLOB 'CHECK*'"
+         " THEN raise(ABORT,'CHECK constraint failed')"
++        " WHEN quick_check GLOB 'non-* value in*'"
++        " THEN raise(ABORT,'type mismatch on DEFAULT')"
+         " ELSE raise(ABORT,'NOT NULL constraint failed')"
+         " END"
+         "  FROM pragma_quick_check(%Q,%Q)"
+-        " WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'",
++        " WHERE quick_check GLOB 'CHECK*'"
++        " OR quick_check GLOB 'NULL*'"
++        " OR quick_check GLOB 'non-* value in*'",
+         zTab, zDb
+       );
+     }
+@@ -110630,7 +116061,7 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
+   pNew->u.tab.pDfltList = sqlite3ExprListDup(db, pTab->u.tab.pDfltList, 0);
+   pNew->pSchema = db->aDb[iDb].pSchema;
+   pNew->u.tab.addColOffset = pTab->u.tab.addColOffset;
+-  pNew->nTabRef = 1;
++  assert( pNew->nTabRef==1 );
+ 
+ exit_begin_add_column:
+   sqlite3SrcListDelete(db, pSrc);
+@@ -110829,13 +116260,14 @@ static void renameTokenCheckAll(Parse *pParse, const void *pPtr){
+   assert( pParse->db->mallocFailed==0 || pParse->nErr!=0 );
+   if( pParse->nErr==0 ){
+     const RenameToken *p;
+-    u8 i = 0;
++    u32 i = 1;
+     for(p=pParse->pRename; p; p=p->pNext){
+       if( p->p ){
+         assert( p->p!=pPtr );
+-        i += *(u8*)(p->p);
++        i += *(u8*)(p->p) | 1;
+       }
+     }
++    assert( i>0 );
+   }
+ }
+ #else
+@@ -111134,7 +116566,7 @@ static RenameToken *renameColumnTokenNext(RenameCtx *pCtx){
+ }
+ 
+ /*
+-** An error occured while parsing or otherwise processing a database
++** An error occurred while parsing or otherwise processing a database
+ ** object (either pParse->pNewTable, pNewIndex or pNewTrigger) as part of an
+ ** ALTER TABLE RENAME COLUMN program. The error message emitted by the
+ ** sub-routine is currently stored in pParse->zErrMsg. This function
+@@ -111366,6 +116798,19 @@ static int renameEditSql(
+   return rc;
+ }
+ 
++/*
++** Set all pEList->a[].fg.eEName fields in the expression-list to val.
++*/
++static void renameSetENames(ExprList *pEList, int val){
++  if( pEList ){
++    int i;
++    for(i=0; inExpr; i++){
++      assert( val==ENAME_NAME || pEList->a[i].fg.eEName==ENAME_NAME );
++      pEList->a[i].fg.eEName = val;
++    }
++  }
++}
++
+ /*
+ ** Resolve all symbols in the trigger at pParse->pNewTrigger, assuming
+ ** it was read from the schema of database zDb. Return SQLITE_OK if
+@@ -111413,7 +116858,17 @@ static int renameResolveTrigger(Parse *pParse){
+           pSrc = 0;
+           rc = SQLITE_NOMEM;
+         }else{
++          /* pStep->pExprList contains an expression-list used for an UPDATE
++          ** statement. So the a[].zEName values are the RHS of the
++          ** " = " clauses of the UPDATE statement. So, before
++          ** running SelectPrep(), change all the eEName values in
++          ** pStep->pExprList to ENAME_SPAN (from their current value of
++          ** ENAME_NAME). This is to prevent any ids in ON() clauses that are
++          ** part of pSrc from being incorrectly resolved against the
++          ** a[].zEName values as if they were column aliases.  */
++          renameSetENames(pStep->pExprList, ENAME_SPAN);
+           sqlite3SelectPrep(pParse, pSel, 0);
++          renameSetENames(pStep->pExprList, ENAME_NAME);
+           rc = pParse->nErr ? SQLITE_ERROR : SQLITE_OK;
+           assert( pStep->pExprList==0 || pStep->pExprList==pSel->pEList );
+           assert( pSrc==pSel->pSrc );
+@@ -112632,9 +118087,9 @@ static void openStatTable(
+ typedef struct StatAccum StatAccum;
+ typedef struct StatSample StatSample;
+ struct StatSample {
+-  tRowcnt *anEq;                  /* sqlite_stat4.nEq */
+   tRowcnt *anDLt;                 /* sqlite_stat4.nDLt */
+ #ifdef SQLITE_ENABLE_STAT4
++  tRowcnt *anEq;                  /* sqlite_stat4.nEq */
+   tRowcnt *anLt;                  /* sqlite_stat4.nLt */
+   union {
+     i64 iRowid;                     /* Rowid in main table of the key */
+@@ -112792,9 +118247,9 @@ static void statInit(
+ 
+   /* Allocate the space required for the StatAccum object */
+   n = sizeof(*p)
+-    + sizeof(tRowcnt)*nColUp                  /* StatAccum.anEq */
+-    + sizeof(tRowcnt)*nColUp;                 /* StatAccum.anDLt */
++    + sizeof(tRowcnt)*nColUp;                    /* StatAccum.anDLt */
+ #ifdef SQLITE_ENABLE_STAT4
++  n += sizeof(tRowcnt)*nColUp;                   /* StatAccum.anEq */
+   if( mxSample ){
+     n += sizeof(tRowcnt)*nColUp                  /* StatAccum.anLt */
+       + sizeof(StatSample)*(nCol+mxSample)       /* StatAccum.aBest[], a[] */
+@@ -112815,9 +118270,9 @@ static void statInit(
+   p->nKeyCol = nKeyCol;
+   p->nSkipAhead = 0;
+   p->current.anDLt = (tRowcnt*)&p[1];
+-  p->current.anEq = &p->current.anDLt[nColUp];
+ 
+ #ifdef SQLITE_ENABLE_STAT4
++  p->current.anEq = &p->current.anDLt[nColUp];
+   p->mxSample = p->nLimit==0 ? mxSample : 0;
+   if( mxSample ){
+     u8 *pSpace;                     /* Allocated space not yet assigned */
+@@ -113084,7 +118539,9 @@ static void statPush(
+ 
+   if( p->nRow==0 ){
+     /* This is the first call to this function. Do initialization. */
++#ifdef SQLITE_ENABLE_STAT4
+     for(i=0; inCol; i++) p->current.anEq[i] = 1;
++#endif
+   }else{
+     /* Second and subsequent calls get processed here */
+ #ifdef SQLITE_ENABLE_STAT4
+@@ -113093,15 +118550,17 @@ static void statPush(
+ 
+     /* Update anDLt[], anLt[] and anEq[] to reflect the values that apply
+     ** to the current row of the index. */
++#ifdef SQLITE_ENABLE_STAT4
+     for(i=0; icurrent.anEq[i]++;
+     }
++#endif
+     for(i=iChng; inCol; i++){
+       p->current.anDLt[i]++;
+ #ifdef SQLITE_ENABLE_STAT4
+       if( p->mxSample ) p->current.anLt[i] += p->current.anEq[i];
+-#endif
+       p->current.anEq[i] = 1;
++#endif
+     }
+   }
+ 
+@@ -113235,7 +118694,9 @@ static void statGet(
+       u64 iVal = (p->nRow + nDistinct - 1) / nDistinct;
+       if( iVal==2 && p->nRow*10 <= nDistinct*11 ) iVal = 1;
+       sqlite3_str_appendf(&sStat, " %llu", iVal);
++#ifdef SQLITE_ENABLE_STAT4
+       assert( p->current.anEq[i] );
++#endif
+     }
+     sqlite3ResultStrAccum(context, &sStat);
+   }
+@@ -113321,6 +118782,7 @@ static void analyzeVdbeCommentIndexWithColumnName(
+   if( NEVER(i==XN_ROWID) ){
+     VdbeComment((v,"%s.rowid",pIdx->zName));
+   }else if( i==XN_EXPR ){
++    assert( pIdx->bHasExpr );
+     VdbeComment((v,"%s.expr(%d)",pIdx->zName, k));
+   }else{
+     VdbeComment((v,"%s.%s", pIdx->zName, pIdx->pTable->aCol[i].zCnName));
+@@ -113361,11 +118823,15 @@ static void analyzeOneTable(
+   int regIdxname = iMem++;     /* Register containing index name */
+   int regStat1 = iMem++;       /* Value for the stat column of sqlite_stat1 */
+   int regPrev = iMem;          /* MUST BE LAST (see below) */
++#ifdef SQLITE_ENABLE_STAT4
++  int doOnce = 1;              /* Flag for a one-time computation */
++#endif
+ #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
+   Table *pStat1 = 0;
+ #endif
+ 
+-  pParse->nMem = MAX(pParse->nMem, iMem);
++  sqlite3TouchRegister(pParse, iMem);
++  assert( sqlite3NoTempsInRange(pParse, regNewRowid, iMem) );
+   v = sqlite3GetVdbe(pParse);
+   if( v==0 || NEVER(pTab==0) ){
+     return;
+@@ -113471,7 +118937,7 @@ static void analyzeOneTable(
+     ** the regPrev array and a trailing rowid (the rowid slot is required
+     ** when building a record to insert into the sample column of
+     ** the sqlite_stat4 table.  */
+-    pParse->nMem = MAX(pParse->nMem, regPrev+nColTest);
++    sqlite3TouchRegister(pParse, regPrev+nColTest);
+ 
+     /* Open a read-only cursor on the index being analyzed. */
+     assert( iDb==sqlite3SchemaToIndex(db, pIdx->pSchema) );
+@@ -113643,7 +119109,35 @@ static void analyzeOneTable(
+       int addrIsNull;
+       u8 seekOp = HasRowid(pTab) ? OP_NotExists : OP_NotFound;
+ 
+-      pParse->nMem = MAX(pParse->nMem, regCol+nCol);
++      if( doOnce ){
++        int mxCol = nCol;
++        Index *pX;
++
++        /* Compute the maximum number of columns in any index */
++        for(pX=pTab->pIndex; pX; pX=pX->pNext){
++          int nColX;                     /* Number of columns in pX */
++          if( !HasRowid(pTab) && IsPrimaryKeyIndex(pX) ){
++            nColX = pX->nKeyCol;
++          }else{
++            nColX = pX->nColumn;
++          }
++          if( nColX>mxCol ) mxCol = nColX;
++        }
++
++        /* Allocate space to compute results for the largest index */
++        sqlite3TouchRegister(pParse, regCol+mxCol);
++        doOnce = 0;
++#ifdef SQLITE_DEBUG
++        /* Verify that the call to sqlite3ClearTempRegCache() below
++        ** really is needed.
++        ** https://sqlite.org/forum/forumpost/83cb4a95a0 (2023-03-25)
++        */
++        testcase( !sqlite3NoTempsInRange(pParse, regEq, regCol+mxCol) );
++#endif
++        sqlite3ClearTempRegCache(pParse);  /* tag-20230325-1 */
++        assert( sqlite3NoTempsInRange(pParse, regEq, regCol+mxCol) );
++      }
++      assert( sqlite3NoTempsInRange(pParse, regEq, regCol+nCol) );
+ 
+       addrNext = sqlite3VdbeCurrentAddr(v);
+       callStatGet(pParse, regStat, STAT_GET_ROWID, regSampleRowid);
+@@ -113724,6 +119218,11 @@ static void analyzeDatabase(Parse *pParse, int iDb){
+   for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
+     Table *pTab = (Table*)sqliteHashData(k);
+     analyzeOneTable(pParse, pTab, 0, iStatCur, iMem, iTab);
++#ifdef SQLITE_ENABLE_STAT4
++    iMem = sqlite3FirstAvailableRegister(pParse, iMem);
++#else
++    assert( iMem==sqlite3FirstAvailableRegister(pParse,iMem) );
++#endif
+   }
+   loadAnalysis(pParse, iDb);
+ }
+@@ -113886,6 +119385,16 @@ static void decodeIntArray(
+       while( z[0]!=0 && z[0]!=' ' ) z++;
+       while( z[0]==' ' ) z++;
+     }
++
++    /* Set the bLowQual flag if the peak number of rows obtained
++    ** from a full equality match is so large that a full table scan
++    ** seems likely to be faster than using the index.
++    */
++    if( aLog[0] > 66              /* Index has more than 100 rows */
++     && aLog[0] <= aLog[nOut-1]   /* And only a single value seen */
++    ){
++      pIndex->bLowQual = 1;
++    }
+   }
+ }
+ 
+@@ -113964,6 +119473,8 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
+ ** and its contents.
+ */
+ SQLITE_PRIVATE void sqlite3DeleteIndexSamples(sqlite3 *db, Index *pIdx){
++  assert( db!=0 );
++  assert( pIdx!=0 );
+ #ifdef SQLITE_ENABLE_STAT4
+   if( pIdx->aSample ){
+     int j;
+@@ -113973,7 +119484,7 @@ SQLITE_PRIVATE void sqlite3DeleteIndexSamples(sqlite3 *db, Index *pIdx){
+     }
+     sqlite3DbFree(db, pIdx->aSample);
+   }
+-  if( db && db->pnBytesFreed==0 ){
++  if( db->pnBytesFreed==0 ){
+     pIdx->nSample = 0;
+     pIdx->aSample = 0;
+   }
+@@ -114109,6 +119620,10 @@ static int loadStatTbl(
+     pIdx = findIndexOrPrimaryKey(db, zIndex, zDb);
+     assert( pIdx==0 || pIdx->nSample==0 );
+     if( pIdx==0 ) continue;
++    if( pIdx->aSample!=0 ){
++      /* The same index appears in sqlite_stat4 under multiple names */
++      continue;
++    }
+     assert( !HasRowid(pIdx->pTable) || pIdx->nColumn==pIdx->nKeyCol+1 );
+     if( !HasRowid(pIdx->pTable) && IsPrimaryKeyIndex(pIdx) ){
+       nIdxCol = pIdx->nKeyCol;
+@@ -114116,6 +119631,7 @@ static int loadStatTbl(
+       nIdxCol = pIdx->nColumn;
+     }
+     pIdx->nSampleCol = nIdxCol;
++    pIdx->mxSample = nSample;
+     nByte = sizeof(IndexSample) * nSample;
+     nByte += sizeof(tRowcnt) * nIdxCol * 3 * nSample;
+     nByte += nIdxCol * sizeof(tRowcnt);     /* Space for Index.aAvgEq[] */
+@@ -114155,6 +119671,11 @@ static int loadStatTbl(
+     if( zIndex==0 ) continue;
+     pIdx = findIndexOrPrimaryKey(db, zIndex, zDb);
+     if( pIdx==0 ) continue;
++    if( pIdx->nSample>=pIdx->mxSample ){
++      /* Too many slots used because the same index appears in
++      ** sqlite_stat4 using multiple names */
++      continue;
++    }
+     /* This next condition is true if data has already been loaded from
+     ** the sqlite_stat4 table. */
+     nCol = pIdx->nSampleCol;
+@@ -114167,14 +119688,15 @@ static int loadStatTbl(
+     decodeIntArray((char*)sqlite3_column_text(pStmt,2),nCol,pSample->anLt,0,0);
+     decodeIntArray((char*)sqlite3_column_text(pStmt,3),nCol,pSample->anDLt,0,0);
+ 
+-    /* Take a copy of the sample. Add two 0x00 bytes the end of the buffer.
++    /* Take a copy of the sample. Add 8 extra 0x00 bytes the end of the buffer.
+     ** This is in case the sample record is corrupted. In that case, the
+     ** sqlite3VdbeRecordCompare() may read up to two varints past the
+     ** end of the allocated buffer before it realizes it is dealing with
+-    ** a corrupt record. Adding the two 0x00 bytes prevents this from causing
++    ** a corrupt record.  Or it might try to read a large integer from the
++    ** buffer.  In any case, eight 0x00 bytes prevents this from causing
+     ** a buffer overread.  */
+     pSample->n = sqlite3_column_bytes(pStmt, 4);
+-    pSample->p = sqlite3DbMallocZero(db, pSample->n + 2);
++    pSample->p = sqlite3DbMallocZero(db, pSample->n + 8);
+     if( pSample->p==0 ){
+       sqlite3_finalize(pStmt);
+       return SQLITE_NOMEM_BKPT;
+@@ -114198,11 +119720,12 @@ static int loadStat4(sqlite3 *db, const char *zDb){
+   const Table *pStat4;
+ 
+   assert( db->lookaside.bDisable );
+-  if( (pStat4 = sqlite3FindTable(db, "sqlite_stat4", zDb))!=0
++  if( OptimizationEnabled(db, SQLITE_Stat4)
++   && (pStat4 = sqlite3FindTable(db, "sqlite_stat4", zDb))!=0
+    && IsOrdinaryTable(pStat4)
+   ){
+     rc = loadStatTbl(db,
+-      "SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx",
++      "SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx COLLATE nocase",
+       "SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4",
+       zDb
+     );
+@@ -114392,7 +119915,7 @@ static void attachFunc(
+   char *zErr = 0;
+   unsigned int flags;
+   Db *aNew;                 /* New array of Db pointers */
+-  Db *pNew;                 /* Db object for the newly attached database */
++  Db *pNew = 0;             /* Db object for the newly attached database */
+   char *zErrDyn = 0;
+   sqlite3_vfs *pVfs;
+ 
+@@ -114412,13 +119935,26 @@ static void attachFunc(
+     /* This is not a real ATTACH.  Instead, this routine is being called
+     ** from sqlite3_deserialize() to close database db->init.iDb and
+     ** reopen it as a MemDB */
++    Btree *pNewBt = 0;
+     pVfs = sqlite3_vfs_find("memdb");
+     if( pVfs==0 ) return;
+-    pNew = &db->aDb[db->init.iDb];
+-    if( pNew->pBt ) sqlite3BtreeClose(pNew->pBt);
+-    pNew->pBt = 0;
+-    pNew->pSchema = 0;
+-    rc = sqlite3BtreeOpen(pVfs, "x\0", db, &pNew->pBt, 0, SQLITE_OPEN_MAIN_DB);
++    rc = sqlite3BtreeOpen(pVfs, "x\0", db, &pNewBt, 0, SQLITE_OPEN_MAIN_DB);
++    if( rc==SQLITE_OK ){
++      Schema *pNewSchema = sqlite3SchemaGet(db, pNewBt);
++      if( pNewSchema ){
++        /* Both the Btree and the new Schema were allocated successfully.
++        ** Close the old db and update the aDb[] slot with the new memdb
++        ** values.  */
++        pNew = &db->aDb[db->init.iDb];
++        if( ALWAYS(pNew->pBt) ) sqlite3BtreeClose(pNew->pBt);
++        pNew->pBt = pNewBt;
++        pNew->pSchema = pNewSchema;
++      }else{
++        sqlite3BtreeClose(pNewBt);
++        rc = SQLITE_NOMEM;
++      }
++    }
++    if( rc ) goto attach_error;
+   }else{
+     /* This is a real ATTACH
+     **
+@@ -114504,6 +120040,11 @@ static void attachFunc(
+   if( rc==SQLITE_OK && pNew->zDbSName==0 ){
+     rc = SQLITE_NOMEM_BKPT;
+   }
++
++  /* Handle KEY parameter. */
++  if( rc==SQLITE_OK ){
++    rc = sqlite3mcHandleAttachKey(db, zName, zPath, argv[2], &zErrDyn);
++  }
+   sqlite3_free_filename( zPath );
+ 
+   /* If the file was opened successfully, read the schema for the new database.
+@@ -114531,7 +120072,7 @@ static void attachFunc(
+   }
+ #endif
+   if( rc ){
+-    if( !REOPEN_AS_MEMDB(db) ){
++    if( ALWAYS(!REOPEN_AS_MEMDB(db)) ){
+       int iDb = db->nDb - 1;
+       assert( iDb>=2 );
+       if( db->aDb[iDb].pBt ){
+@@ -114648,6 +120189,8 @@ static void codeAttach(
+   sqlite3* db = pParse->db;
+   int regArgs;
+ 
++  if( SQLITE_OK!=sqlite3ReadSchema(pParse) ) goto attach_end;
++
+   if( pParse->nErr ) goto attach_end;
+   memset(&sName, 0, sizeof(NameContext));
+   sName.pParse = pParse;
+@@ -115116,7 +120659,7 @@ SQLITE_PRIVATE int sqlite3AuthCheck(
+   sqlite3 *db = pParse->db;
+   int rc;
+ 
+-  /* Don't do any authorization checks if the database is initialising
++  /* Don't do any authorization checks if the database is initializing
+   ** or if the parser is being invoked from within sqlite3_declare_vtab.
+   */
+   assert( !IN_RENAME_OBJECT || db->xAuth==0 );
+@@ -115323,6 +120866,7 @@ SQLITE_PRIVATE int sqlite3DbMaskAllZero(yDbMask m){
+ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
+   sqlite3 *db;
+   Vdbe *v;
++  int iDb, i;
+ 
+   assert( pParse->pToplevel==0 );
+   db = pParse->db;
+@@ -115352,7 +120896,6 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
+     if( pParse->bReturning ){
+       Returning *pReturning = pParse->u1.pReturning;
+       int addrRewind;
+-      int i;
+       int reg;
+ 
+       if( pReturning->nRetCol ){
+@@ -115389,76 +120932,66 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
+     ** transaction on each used database and to verify the schema cookie
+     ** on each used database.
+     */
+-    if( db->mallocFailed==0
+-     && (DbMaskNonZero(pParse->cookieMask) || pParse->pConstExpr)
+-    ){
+-      int iDb, i;
+-      assert( sqlite3VdbeGetOp(v, 0)->opcode==OP_Init );
+-      sqlite3VdbeJumpHere(v, 0);
+-      assert( db->nDb>0 );
+-      iDb = 0;
+-      do{
+-        Schema *pSchema;
+-        if( DbMaskTest(pParse->cookieMask, iDb)==0 ) continue;
+-        sqlite3VdbeUsesBtree(v, iDb);
+-        pSchema = db->aDb[iDb].pSchema;
+-        sqlite3VdbeAddOp4Int(v,
+-          OP_Transaction,                    /* Opcode */
+-          iDb,                               /* P1 */
+-          DbMaskTest(pParse->writeMask,iDb), /* P2 */
+-          pSchema->schema_cookie,            /* P3 */
+-          pSchema->iGeneration               /* P4 */
+-        );
+-        if( db->init.busy==0 ) sqlite3VdbeChangeP5(v, 1);
+-        VdbeComment((v,
+-              "usesStmtJournal=%d", pParse->mayAbort && pParse->isMultiWrite));
+-      }while( ++iDbnDb );
++    assert( pParse->nErr>0 || sqlite3VdbeGetOp(v, 0)->opcode==OP_Init );
++    sqlite3VdbeJumpHere(v, 0);
++    assert( db->nDb>0 );
++    iDb = 0;
++    do{
++      Schema *pSchema;
++      if( DbMaskTest(pParse->cookieMask, iDb)==0 ) continue;
++      sqlite3VdbeUsesBtree(v, iDb);
++      pSchema = db->aDb[iDb].pSchema;
++      sqlite3VdbeAddOp4Int(v,
++        OP_Transaction,                    /* Opcode */
++        iDb,                               /* P1 */
++        DbMaskTest(pParse->writeMask,iDb), /* P2 */
++        pSchema->schema_cookie,            /* P3 */
++        pSchema->iGeneration               /* P4 */
++      );
++      if( db->init.busy==0 ) sqlite3VdbeChangeP5(v, 1);
++      VdbeComment((v,
++            "usesStmtJournal=%d", pParse->mayAbort && pParse->isMultiWrite));
++    }while( ++iDbnDb );
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+-      for(i=0; inVtabLock; i++){
+-        char *vtab = (char *)sqlite3GetVTable(db, pParse->apVtabLock[i]);
+-        sqlite3VdbeAddOp4(v, OP_VBegin, 0, 0, 0, vtab, P4_VTAB);
+-      }
+-      pParse->nVtabLock = 0;
++    for(i=0; inVtabLock; i++){
++      char *vtab = (char *)sqlite3GetVTable(db, pParse->apVtabLock[i]);
++      sqlite3VdbeAddOp4(v, OP_VBegin, 0, 0, 0, vtab, P4_VTAB);
++    }
++    pParse->nVtabLock = 0;
+ #endif
+ 
+-      /* Once all the cookies have been verified and transactions opened,
+-      ** obtain the required table-locks. This is a no-op unless the
+-      ** shared-cache feature is enabled.
+-      */
+-      codeTableLocks(pParse);
++#ifndef SQLITE_OMIT_SHARED_CACHE
++    /* Once all the cookies have been verified and transactions opened,
++    ** obtain the required table-locks. This is a no-op unless the
++    ** shared-cache feature is enabled.
++    */
++    if( pParse->nTableLock ) codeTableLocks(pParse);
++#endif
+ 
+-      /* Initialize any AUTOINCREMENT data structures required.
+-      */
+-      sqlite3AutoincrementBegin(pParse);
++    /* Initialize any AUTOINCREMENT data structures required.
++    */
++    if( pParse->pAinc ) sqlite3AutoincrementBegin(pParse);
+ 
+-      /* Code constant expressions that where factored out of inner loops.
+-      **
+-      ** The pConstExpr list might also contain expressions that we simply
+-      ** want to keep around until the Parse object is deleted.  Such
+-      ** expressions have iConstExprReg==0.  Do not generate code for
+-      ** those expressions, of course.
+-      */
+-      if( pParse->pConstExpr ){
+-        ExprList *pEL = pParse->pConstExpr;
+-        pParse->okConstFactor = 0;
+-        for(i=0; inExpr; i++){
+-          int iReg = pEL->a[i].u.iConstExprReg;
+-          if( iReg>0 ){
+-            sqlite3ExprCode(pParse, pEL->a[i].pExpr, iReg);
+-          }
+-        }
++    /* Code constant expressions that were factored out of inner loops.
++    */
++    if( pParse->pConstExpr ){
++      ExprList *pEL = pParse->pConstExpr;
++      pParse->okConstFactor = 0;
++      for(i=0; inExpr; i++){
++        assert( pEL->a[i].u.iConstExprReg>0 );
++        sqlite3ExprCode(pParse, pEL->a[i].pExpr, pEL->a[i].u.iConstExprReg);
+       }
++    }
+ 
+-      if( pParse->bReturning ){
+-        Returning *pRet = pParse->u1.pReturning;
+-        if( pRet->nRetCol ){
+-          sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pRet->iRetCur, pRet->nRetCol);
+-        }
++    if( pParse->bReturning ){
++      Returning *pRet = pParse->u1.pReturning;
++      if( pRet->nRetCol ){
++        sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pRet->iRetCur, pRet->nRetCol);
+       }
+-
+-      /* Finally, jump back to the beginning of the executable code. */
+-      sqlite3VdbeGoto(v, 1);
+     }
++
++    /* Finally, jump back to the beginning of the executable code. */
++    sqlite3VdbeGoto(v, 1);
+   }
+ 
+   /* Get the VDBE program ready for execution
+@@ -115497,6 +121030,7 @@ SQLITE_PRIVATE void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){
+   char saveBuf[PARSE_TAIL_SZ];
+ 
+   if( pParse->nErr ) return;
++  if( pParse->eParseMode ) return;
+   assert( pParse->nested<10 );  /* Nesting should only be of limited depth */
+   va_start(ap, zFormat);
+   zSql = sqlite3VMPrintf(db, zFormat, ap);
+@@ -115643,7 +121177,7 @@ SQLITE_PRIVATE Table *sqlite3LocateTable(
+     /* If zName is the not the name of a table in the schema created using
+     ** CREATE, then check to see if it is the name of an virtual table that
+     ** can be an eponymous virtual table. */
+-    if( pParse->disableVtab==0 && db->init.busy==0 ){
++    if( (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)==0 && db->init.busy==0 ){
+       Module *pMod = (Module*)sqlite3HashFind(&db->aModule, zName);
+       if( pMod==0 && sqlite3_strnicmp(zName, "pragma_", 7)==0 ){
+         pMod = sqlite3PragmaVtabRegister(db, zName);
+@@ -115656,7 +121190,7 @@ SQLITE_PRIVATE Table *sqlite3LocateTable(
+ #endif
+     if( flags & LOCATE_NOERR ) return 0;
+     pParse->checkSchema = 1;
+-  }else if( IsVirtual(p) && pParse->disableVtab ){
++  }else if( IsVirtual(p) && (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)!=0 ){
+     p = 0;
+   }
+ 
+@@ -115912,7 +121446,7 @@ SQLITE_PRIVATE void sqlite3ColumnSetExpr(
+ */
+ SQLITE_PRIVATE Expr *sqlite3ColumnExpr(Table *pTab, Column *pCol){
+   if( pCol->iDflt==0 ) return 0;
+-  if( NEVER(!IsOrdinaryTable(pTab)) ) return 0;
++  if( !IsOrdinaryTable(pTab) ) return 0;
+   if( NEVER(pTab->u.tab.pDfltList==0) ) return 0;
+   if( NEVER(pTab->u.tab.pDfltList->nExpriDflt) ) return 0;
+   return pTab->u.tab.pDfltList->a[pCol->iDflt-1].pExpr;
+@@ -115944,7 +121478,7 @@ SQLITE_PRIVATE void sqlite3ColumnSetColl(
+ }
+ 
+ /*
+-** Return the collating squence name for a column
++** Return the collating sequence name for a column
+ */
+ SQLITE_PRIVATE const char *sqlite3ColumnColl(Column *pCol){
+   const char *z;
+@@ -115965,16 +121499,17 @@ SQLITE_PRIVATE void sqlite3DeleteColumnNames(sqlite3 *db, Table *pTable){
+   int i;
+   Column *pCol;
+   assert( pTable!=0 );
++  assert( db!=0 );
+   if( (pCol = pTable->aCol)!=0 ){
+     for(i=0; inCol; i++, pCol++){
+       assert( pCol->zCnName==0 || pCol->hName==sqlite3StrIHash(pCol->zCnName) );
+       sqlite3DbFree(db, pCol->zCnName);
+     }
+-    sqlite3DbFree(db, pTable->aCol);
++    sqlite3DbNNFreeNN(db, pTable->aCol);
+     if( IsOrdinaryTable(pTable) ){
+       sqlite3ExprListDelete(db, pTable->u.tab.pDfltList);
+     }
+-    if( db==0 || db->pnBytesFreed==0 ){
++    if( db->pnBytesFreed==0 ){
+       pTable->aCol = 0;
+       pTable->nCol = 0;
+       if( IsOrdinaryTable(pTable) ){
+@@ -116011,7 +121546,8 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
+   ** a Table object that was going to be marked ephemeral. So do not check
+   ** that no lookaside memory is used in this case either. */
+   int nLookaside = 0;
+-  if( db && !db->mallocFailed && (pTable->tabFlags & TF_Ephemeral)==0 ){
++  assert( db!=0 );
++  if( !db->mallocFailed && (pTable->tabFlags & TF_Ephemeral)==0 ){
+     nLookaside = sqlite3LookasideUsed(db, 0);
+   }
+ #endif
+@@ -116021,7 +121557,7 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
+     pNext = pIndex->pNext;
+     assert( pIndex->pSchema==pTable->pSchema
+          || (IsVirtual(pTable) && pIndex->idxType!=SQLITE_IDXTYPE_APPDEF) );
+-    if( (db==0 || db->pnBytesFreed==0) && !IsVirtual(pTable) ){
++    if( db->pnBytesFreed==0 && !IsVirtual(pTable) ){
+       char *zName = pIndex->zName;
+       TESTONLY ( Index *pOld = ) sqlite3HashInsert(
+          &pIndex->pSchema->idxHash, zName, 0
+@@ -116035,7 +121571,7 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
+   if( IsOrdinaryTable(pTable) ){
+     sqlite3FkDelete(db, pTable);
+   }
+-#ifndef SQLITE_OMIT_VIRTUAL_TABLE
++#ifndef SQLITE_OMIT_VIRTUALTABLE
+   else if( IsVirtual(pTable) ){
+     sqlite3VtabClear(db, pTable);
+   }
+@@ -116058,10 +121594,14 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
+ }
+ SQLITE_PRIVATE void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
+   /* Do not delete the table until the reference count reaches zero. */
++  assert( db!=0 );
+   if( !pTable ) return;
+-  if( ((!db || db->pnBytesFreed==0) && (--pTable->nTabRef)>0) ) return;
++  if( db->pnBytesFreed==0 && (--pTable->nTabRef)>0 ) return;
+   deleteTable(db, pTable);
+ }
++SQLITE_PRIVATE void sqlite3DeleteTableGeneric(sqlite3 *db, void *pTable){
++  sqlite3DeleteTable(db, (Table*)pTable);
++}
+ 
+ 
+ /*
+@@ -116596,20 +122136,14 @@ SQLITE_PRIVATE void sqlite3ColumnPropertiesFromName(Table *pTab, Column *pCol){
+ }
+ #endif
+ 
+-/*
+-** Name of the special TEMP trigger used to implement RETURNING.  The
+-** name begins with "sqlite_" so that it is guaranteed not to collide
+-** with any application-generated triggers.
+-*/
+-#define RETURNING_TRIGGER_NAME  "sqlite_returning"
+-
+ /*
+ ** Clean up the data structures associated with the RETURNING clause.
+ */
+-static void sqlite3DeleteReturning(sqlite3 *db, Returning *pRet){
++static void sqlite3DeleteReturning(sqlite3 *db, void *pArg){
++  Returning *pRet = (Returning*)pArg;
+   Hash *pHash;
+   pHash = &(db->aDb[1].pSchema->trigHash);
+-  sqlite3HashInsert(pHash, RETURNING_TRIGGER_NAME, 0);
++  sqlite3HashInsert(pHash, pRet->zName, 0);
+   sqlite3ExprListDelete(db, pRet->pReturnEL);
+   sqlite3DbFree(db, pRet);
+ }
+@@ -116637,7 +122171,7 @@ SQLITE_PRIVATE void sqlite3AddReturning(Parse *pParse, ExprList *pList){
+   if( pParse->pNewTrigger ){
+     sqlite3ErrorMsg(pParse, "cannot use RETURNING in a trigger");
+   }else{
+-    assert( pParse->bReturning==0 );
++    assert( pParse->bReturning==0 || pParse->ifNotExists );
+   }
+   pParse->bReturning = 1;
+   pRet = sqlite3DbMallocZero(db, sizeof(*pRet));
+@@ -116648,11 +122182,12 @@ SQLITE_PRIVATE void sqlite3AddReturning(Parse *pParse, ExprList *pList){
+   pParse->u1.pReturning = pRet;
+   pRet->pParse = pParse;
+   pRet->pReturnEL = pList;
+-  sqlite3ParserAddCleanup(pParse,
+-     (void(*)(sqlite3*,void*))sqlite3DeleteReturning, pRet);
++  sqlite3ParserAddCleanup(pParse, sqlite3DeleteReturning, pRet);
+   testcase( pParse->earlyCleanup );
+   if( db->mallocFailed ) return;
+-  pRet->retTrig.zName = RETURNING_TRIGGER_NAME;
++  sqlite3_snprintf(sizeof(pRet->zName), pRet->zName,
++                   "sqlite_returning_%p", pParse);
++  pRet->retTrig.zName = pRet->zName;
+   pRet->retTrig.op = TK_RETURNING;
+   pRet->retTrig.tr_tm = TRIGGER_AFTER;
+   pRet->retTrig.bReturning = 1;
+@@ -116663,8 +122198,9 @@ SQLITE_PRIVATE void sqlite3AddReturning(Parse *pParse, ExprList *pList){
+   pRet->retTStep.pTrig = &pRet->retTrig;
+   pRet->retTStep.pExprList = pList;
+   pHash = &(db->aDb[1].pSchema->trigHash);
+-  assert( sqlite3HashFind(pHash, RETURNING_TRIGGER_NAME)==0 || pParse->nErr );
+-  if( sqlite3HashInsert(pHash, RETURNING_TRIGGER_NAME, &pRet->retTrig)
++  assert( sqlite3HashFind(pHash, pRet->zName)==0
++          || pParse->nErr  || pParse->ifNotExists );
++  if( sqlite3HashInsert(pHash, pRet->zName, &pRet->retTrig)
+           ==&pRet->retTrig ){
+     sqlite3OomFault(db);
+   }
+@@ -116698,7 +122234,7 @@ SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){
+   }
+   if( !IN_RENAME_OBJECT ) sqlite3DequoteToken(&sName);
+ 
+-  /* Because keywords GENERATE ALWAYS can be converted into indentifiers
++  /* Because keywords GENERATE ALWAYS can be converted into identifiers
+   ** by the parser, we can sometimes end up with a typename that ends
+   ** with "generated always".  Check for this case and omit the surplus
+   ** text. */
+@@ -116845,7 +122381,8 @@ SQLITE_PRIVATE char sqlite3AffinityType(const char *zIn, Column *pCol){
+ 
+   assert( zIn!=0 );
+   while( zIn[0] ){
+-    h = (h<<8) + sqlite3UpperToLower[(*zIn)&0xff];
++    u8 x = *(u8*)zIn;
++    h = (h<<8) + sqlite3UpperToLower[x];
+     zIn++;
+     if( h==(('c'<<24)+('h'<<16)+('a'<<8)+'r') ){             /* CHAR */
+       aff = SQLITE_AFF_TEXT;
+@@ -116919,7 +122456,7 @@ SQLITE_PRIVATE void sqlite3AddDefaultValue(
+   Parse *pParse,           /* Parsing context */
+   Expr *pExpr,             /* The parsed expression of the default value */
+   const char *zStart,      /* Start of the default value text */
+-  const char *zEnd         /* First character past end of defaut value text */
++  const char *zEnd         /* First character past end of default value text */
+ ){
+   Table *p;
+   Column *pCol;
+@@ -117191,6 +122728,14 @@ SQLITE_PRIVATE void sqlite3AddGenerated(Parse *pParse, Expr *pExpr, Token *pType
+   if( pCol->colFlags & COLFLAG_PRIMKEY ){
+     makeColumnPartOfPrimaryKey(pParse, pCol); /* For the error message */
+   }
++  if( ALWAYS(pExpr) && pExpr->op==TK_ID ){
++    /* The value of a generated column needs to be a real expression, not
++    ** just a reference to another column, in order for covering index
++    ** optimizations to work correctly.  So if the value is not an expression,
++    ** turn it into one by adding a unary "+" operator. */
++    pExpr = sqlite3PExpr(pParse, TK_UPLUS, pExpr, 0);
++  }
++  if( pExpr && pExpr->op!=TK_RAISE ) pExpr->affExpr = pCol->affinity;
+   sqlite3ColumnSetExpr(pParse, pTab, pCol, pExpr);
+   pExpr = 0;
+   goto generated_done;
+@@ -117259,7 +122804,7 @@ static int identLength(const char *z){
+ ** to the specified offset in the buffer and updates *pIdx to refer
+ ** to the first byte after the last byte written before returning.
+ **
+-** If the string zSignedIdent consists entirely of alpha-numeric
++** If the string zSignedIdent consists entirely of alphanumeric
+ ** characters, does not begin with a digit and is not an SQL keyword,
+ ** then it is copied to the output buffer exactly as it is. Otherwise,
+ ** it is quoted using double-quotes.
+@@ -117327,7 +122872,8 @@ static char *createTableStmt(sqlite3 *db, Table *p){
+         /* SQLITE_AFF_TEXT    */ " TEXT",
+         /* SQLITE_AFF_NUMERIC */ " NUM",
+         /* SQLITE_AFF_INTEGER */ " INT",
+-        /* SQLITE_AFF_REAL    */ " REAL"
++        /* SQLITE_AFF_REAL    */ " REAL",
++        /* SQLITE_AFF_FLEXNUM */ " NUM",
+     };
+     int len;
+     const char *zType;
+@@ -117343,10 +122889,12 @@ static char *createTableStmt(sqlite3 *db, Table *p){
+     testcase( pCol->affinity==SQLITE_AFF_NUMERIC );
+     testcase( pCol->affinity==SQLITE_AFF_INTEGER );
+     testcase( pCol->affinity==SQLITE_AFF_REAL );
++    testcase( pCol->affinity==SQLITE_AFF_FLEXNUM );
+ 
+     zType = azType[pCol->affinity - SQLITE_AFF_BLOB];
+     len = sqlite3Strlen30(zType);
+     assert( pCol->affinity==SQLITE_AFF_BLOB
++            || pCol->affinity==SQLITE_AFF_FLEXNUM
+             || pCol->affinity==sqlite3AffinityType(zType, 0) );
+     memcpy(&zStmt[k], zType, len);
+     k += len;
+@@ -117408,7 +122956,7 @@ static void estimateIndexWidth(Index *pIdx){
+   for(i=0; inColumn; i++){
+     i16 x = pIdx->aiColumn[i];
+     assert( xpTable->nCol );
+-    wIndex += x<0 ? 1 : aCol[pIdx->aiColumn[i]].szEst;
++    wIndex += x<0 ? 1 : aCol[x].szEst;
+   }
+   pIdx->szIdxRow = sqlite3LogEst(wIndex*4);
+ }
+@@ -117463,7 +123011,8 @@ static int isDupColumn(Index *pIdx, int nKey, Index *pPk, int iCol){
+ /* Recompute the colNotIdxed field of the Index.
+ **
+ ** colNotIdxed is a bitmask that has a 0 bit representing each indexed
+-** columns that are within the first 63 columns of the table.  The
++** columns that are within the first 63 columns of the table and a 1 for
++** all other bits (all columns that are not in the index).  The
+ ** high-order bit of colNotIdxed is always 1.  All unindexed columns
+ ** of the table have a 1.
+ **
+@@ -117491,7 +123040,7 @@ static void recomputeColumnsNotIndexed(Index *pIdx){
+     }
+   }
+   pIdx->colNotIdxed = ~m;
+-  assert( (pIdx->colNotIdxed>>63)==1 );
++  assert( (pIdx->colNotIdxed>>63)==1 );  /* See note-20221022-a */
+ }
+ 
+ /*
+@@ -117760,6 +123309,7 @@ SQLITE_PRIVATE int sqlite3ShadowTableName(sqlite3 *db, const char *zName){
+ ** not pass them into code generator routines by mistake.
+ */
+ static int markImmutableExprStep(Walker *pWalker, Expr *pExpr){
++  (void)pWalker;
+   ExprSetVVAProperty(pExpr, EP_Immutable);
+   return WRC_Continue;
+ }
+@@ -118095,6 +123645,17 @@ SQLITE_PRIVATE void sqlite3EndTable(
+     /* Reparse everything to update our internal data structures */
+     sqlite3VdbeAddParseSchemaOp(v, iDb,
+            sqlite3MPrintf(db, "tbl_name='%q' AND type!='trigger'", p->zName),0);
++
++    /* Test for cycles in generated columns and illegal expressions
++    ** in CHECK constraints and in DEFAULT clauses. */
++    if( p->tabFlags & TF_HasGenerated ){
++      sqlite3VdbeAddOp4(v, OP_SqlExec, 1, 0, 0,
++             sqlite3MPrintf(db, "SELECT*FROM\"%w\".\"%w\"",
++                   db->aDb[iDb].zDbSName, p->zName), P4_DYNAMIC);
++    }
++    sqlite3VdbeAddOp4(v, OP_SqlExec, 1, 0, 0,
++           sqlite3MPrintf(db, "PRAGMA \"%w\".integrity_check(%Q)",
++                 db->aDb[iDb].zDbSName, p->zName), P4_DYNAMIC);
+   }
+ 
+   /* Add the table to the in-memory representation of the database.
+@@ -118232,7 +123793,7 @@ create_view_fail:
+ ** the columns of the view in the pTable structure.  Return the number
+ ** of errors.  If an error is seen leave an error message in pParse->zErrMsg.
+ */
+-SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
++static SQLITE_NOINLINE int viewGetColumnNames(Parse *pParse, Table *pTable){
+   Table *pSelTab;   /* A fake table from which we get the result set */
+   Select *pSel;     /* Copy of the SELECT that implements the view */
+   int nErr = 0;     /* Number of errors encountered */
+@@ -118257,9 +123818,10 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
+ 
+ #ifndef SQLITE_OMIT_VIEW
+   /* A positive nCol means the columns names for this view are
+-  ** already known.
++  ** already known.  This routine is not called unless either the
++  ** table is virtual or nCol is zero.
+   */
+-  if( pTable->nCol>0 ) return 0;
++  assert( pTable->nCol<=0 );
+ 
+   /* A negative nCol is a special marker meaning that we are currently
+   ** trying to compute the column names.  If we enter this routine with
+@@ -118325,8 +123887,7 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
+        && pTable->nCol==pSel->pEList->nExpr
+       ){
+         assert( db->mallocFailed==0 );
+-        sqlite3SelectAddColumnTypeAndCollation(pParse, pTable, pSel,
+-                                               SQLITE_AFF_NONE);
++        sqlite3SubqueryColumnTypes(pParse, pTable, pSel, SQLITE_AFF_NONE);
+       }
+     }else{
+       /* CREATE VIEW name AS...  without an argument list.  Construct
+@@ -118355,6 +123916,11 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
+ #endif /* SQLITE_OMIT_VIEW */
+   return nErr;
+ }
++SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
++  assert( pTable!=0 );
++  if( !IsVirtual(pTable) && pTable->nCol>0 ) return 0;
++  return viewGetColumnNames(pParse, pTable);
++}
+ #endif /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */
+ 
+ #ifndef SQLITE_OMIT_VIEW
+@@ -119139,7 +124705,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
+ #ifndef SQLITE_OMIT_TEMPDB
+     /* If the index name was unqualified, check if the table
+     ** is a temp table. If so, set the database to 1. Do not do this
+-    ** if initialising a database schema.
++    ** if initializing a database schema.
+     */
+     if( !db->init.busy ){
+       pTab = sqlite3SrcListLookup(pParse, pTblName);
+@@ -119220,7 +124786,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
+     }
+     if( !IN_RENAME_OBJECT ){
+       if( !db->init.busy ){
+-        if( sqlite3FindTable(db, zName, 0)!=0 ){
++        if( sqlite3FindTable(db, zName, pDb->zDbSName)!=0 ){
+           sqlite3ErrorMsg(pParse, "there is already a table named %s", zName);
+           goto exit_create_index;
+         }
+@@ -119373,6 +124939,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
+       j = XN_EXPR;
+       pIndex->aiColumn[i] = XN_EXPR;
+       pIndex->uniqNotNull = 0;
++      pIndex->bHasExpr = 1;
+     }else{
+       j = pCExpr->iColumn;
+       assert( j<=0x7fff );
+@@ -119384,6 +124951,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
+         }
+         if( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ){
+           pIndex->bHasVCol = 1;
++          pIndex->bHasExpr = 1;
+         }
+       }
+       pIndex->aiColumn[i] = (i16)j;
+@@ -119873,12 +125441,13 @@ SQLITE_PRIVATE IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *
+ */
+ SQLITE_PRIVATE void sqlite3IdListDelete(sqlite3 *db, IdList *pList){
+   int i;
++  assert( db!=0 );
+   if( pList==0 ) return;
+   assert( pList->eU4!=EU4_EXPR ); /* EU4_EXPR mode is not currently used */
+   for(i=0; inId; i++){
+     sqlite3DbFree(db, pList->a[i].zName);
+   }
+-  sqlite3DbFreeNN(db, pList);
++  sqlite3DbNNFreeNN(db, pList);
+ }
+ 
+ /*
+@@ -120081,11 +125650,12 @@ SQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){
+ SQLITE_PRIVATE void sqlite3SrcListDelete(sqlite3 *db, SrcList *pList){
+   int i;
+   SrcItem *pItem;
++  assert( db!=0 );
+   if( pList==0 ) return;
+   for(pItem=pList->a, i=0; inSrc; i++, pItem++){
+-    if( pItem->zDatabase ) sqlite3DbFreeNN(db, pItem->zDatabase);
+-    sqlite3DbFree(db, pItem->zName);
+-    if( pItem->zAlias ) sqlite3DbFreeNN(db, pItem->zAlias);
++    if( pItem->zDatabase ) sqlite3DbNNFreeNN(db, pItem->zDatabase);
++    if( pItem->zName ) sqlite3DbNNFreeNN(db, pItem->zName);
++    if( pItem->zAlias ) sqlite3DbNNFreeNN(db, pItem->zAlias);
+     if( pItem->fg.isIndexedBy ) sqlite3DbFree(db, pItem->u1.zIndexedBy);
+     if( pItem->fg.isTabFunc ) sqlite3ExprListDelete(db, pItem->u1.pFuncArg);
+     sqlite3DeleteTable(db, pItem->pTab);
+@@ -120096,7 +125666,7 @@ SQLITE_PRIVATE void sqlite3SrcListDelete(sqlite3 *db, SrcList *pList){
+       sqlite3ExprDelete(db, pItem->u3.pOn);
+     }
+   }
+-  sqlite3DbFreeNN(db, pList);
++  sqlite3DbNNFreeNN(db, pList);
+ }
+ 
+ /*
+@@ -120677,7 +126247,7 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){
+   if( iDb<0 ) return;
+   z = sqlite3NameFromToken(db, pObjName);
+   if( z==0 ) return;
+-  zDb = db->aDb[iDb].zDbSName;
++  zDb = pName2->n ? db->aDb[iDb].zDbSName : 0;
+   pTab = sqlite3FindTable(db, z, zDb);
+   if( pTab ){
+     reindexTable(pParse, pTab, 0);
+@@ -120687,6 +126257,7 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){
+   pIndex = sqlite3FindIndex(db, z, zDb);
+   sqlite3DbFree(db, z);
+   if( pIndex ){
++    iDb = sqlite3SchemaToIndex(db, pIndex->pTable->pSchema);
+     sqlite3BeginWriteOperation(pParse, 0, iDb);
+     sqlite3RefillIndex(pParse, pIndex, -1);
+     return;
+@@ -120792,7 +126363,7 @@ SQLITE_PRIVATE void sqlite3CteDelete(sqlite3 *db, Cte *pCte){
+ 
+ /*
+ ** This routine is invoked once per CTE by the parser while parsing a
+-** WITH clause.  The CTE described by teh third argument is added to
++** WITH clause.  The CTE described by the third argument is added to
+ ** the WITH clause of the second argument.  If the second argument is
+ ** NULL, then a new WITH argument is created.
+ */
+@@ -120852,6 +126423,9 @@ SQLITE_PRIVATE void sqlite3WithDelete(sqlite3 *db, With *pWith){
+     sqlite3DbFree(db, pWith);
+   }
+ }
++SQLITE_PRIVATE void sqlite3WithDeleteGeneric(sqlite3 *db, void *pWith){
++  sqlite3WithDelete(db, (With*)pWith);
++}
+ #endif /* !defined(SQLITE_OMIT_CTE) */
+ 
+ /************** End of build.c ***********************************************/
+@@ -121043,6 +126617,7 @@ SQLITE_PRIVATE void sqlite3SetTextEncoding(sqlite3 *db, u8 enc){
+   ** strings is BINARY.
+   */
+   db->pDfltColl = sqlite3FindCollSeq(db, enc, sqlite3StrBINARY, 0);
++  sqlite3ExpirePreparedStatements(db, 1);
+ }
+ 
+ /*
+@@ -121348,19 +126923,21 @@ SQLITE_PRIVATE void sqlite3SchemaClear(void *p){
+   Hash temp2;
+   HashElem *pElem;
+   Schema *pSchema = (Schema *)p;
++  sqlite3 xdb;
+ 
++  memset(&xdb, 0, sizeof(xdb));
+   temp1 = pSchema->tblHash;
+   temp2 = pSchema->trigHash;
+   sqlite3HashInit(&pSchema->trigHash);
+   sqlite3HashClear(&pSchema->idxHash);
+   for(pElem=sqliteHashFirst(&temp2); pElem; pElem=sqliteHashNext(pElem)){
+-    sqlite3DeleteTrigger(0, (Trigger*)sqliteHashData(pElem));
++    sqlite3DeleteTrigger(&xdb, (Trigger*)sqliteHashData(pElem));
+   }
+   sqlite3HashClear(&temp2);
+   sqlite3HashInit(&pSchema->tblHash);
+   for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){
+     Table *pTab = sqliteHashData(pElem);
+-    sqlite3DeleteTable(0, pTab);
++    sqlite3DeleteTable(&xdb, pTab);
+   }
+   sqlite3HashClear(&temp1);
+   sqlite3HashClear(&pSchema->fkeyHash);
+@@ -121431,8 +127008,9 @@ SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse *pParse, SrcList *pSrc){
+   Table *pTab;
+   assert( pItem && pSrc->nSrc>=1 );
+   pTab = sqlite3LocateTableItem(pParse, 0, pItem);
+-  sqlite3DeleteTable(pParse->db, pItem->pTab);
++  if( pItem->pTab ) sqlite3DeleteTable(pParse->db, pItem->pTab);
+   pItem->pTab = pTab;
++  pItem->fg.notCte = 1;
+   if( pTab ){
+     pTab->nTabRef++;
+     if( pItem->fg.isIndexedBy && sqlite3IndexedByLookup(pParse, pItem) ){
+@@ -121459,18 +127037,42 @@ SQLITE_PRIVATE void sqlite3CodeChangeCount(Vdbe *v, int regCounter, const char *
+ **   1) It is a virtual table and no implementation of the xUpdate method
+ **      has been provided
+ **
+-**   2) It is a system table (i.e. sqlite_schema), this call is not
++**   2) A trigger is currently being coded and the table is a virtual table
++**      that is SQLITE_VTAB_DIRECTONLY or if PRAGMA trusted_schema=OFF and
++**      the table is not SQLITE_VTAB_INNOCUOUS.
++**
++**   3) It is a system table (i.e. sqlite_schema), this call is not
+ **      part of a nested parse and writable_schema pragma has not
+ **      been specified
+ **
+-**   3) The table is a shadow table, the database connection is in
++**   4) The table is a shadow table, the database connection is in
+ **      defensive mode, and the current sqlite3_prepare()
+ **      is for a top-level SQL statement.
+ */
++static int vtabIsReadOnly(Parse *pParse, Table *pTab){
++  if( sqlite3GetVTable(pParse->db, pTab)->pMod->pModule->xUpdate==0 ){
++    return 1;
++  }
++
++  /* Within triggers:
++  **   *  Do not allow DELETE, INSERT, or UPDATE of SQLITE_VTAB_DIRECTONLY
++  **      virtual tables
++  **   *  Only allow DELETE, INSERT, or UPDATE of non-SQLITE_VTAB_INNOCUOUS
++  **      virtual tables if PRAGMA trusted_schema=ON.
++  */
++  if( pParse->pToplevel!=0
++   && pTab->u.vtab.p->eVtabRisk >
++           ((pParse->db->flags & SQLITE_TrustedSchema)!=0)
++  ){
++    sqlite3ErrorMsg(pParse, "unsafe use of virtual table \"%s\"",
++      pTab->zName);
++  }
++  return 0;
++}
+ static int tabIsReadOnly(Parse *pParse, Table *pTab){
+   sqlite3 *db;
+   if( IsVirtual(pTab) ){
+-    return sqlite3GetVTable(pParse->db, pTab)->pMod->pModule->xUpdate==0;
++    return vtabIsReadOnly(pParse, pTab);
+   }
+   if( (pTab->tabFlags & (TF_Readonly|TF_Shadow))==0 ) return 0;
+   db = pParse->db;
+@@ -121482,17 +127084,21 @@ static int tabIsReadOnly(Parse *pParse, Table *pTab){
+ }
+ 
+ /*
+-** Check to make sure the given table is writable.  If it is not
+-** writable, generate an error message and return 1.  If it is
+-** writable return 0;
++** Check to make sure the given table is writable.
++**
++** If pTab is not writable  ->  generate an error message and return 1.
++** If pTab is writable but other errors have occurred -> return 1.
++** If pTab is writable and no prior errors -> return 0;
+ */
+-SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){
++SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, Trigger *pTrigger){
+   if( tabIsReadOnly(pParse, pTab) ){
+     sqlite3ErrorMsg(pParse, "table %s may not be modified", pTab->zName);
+     return 1;
+   }
+ #ifndef SQLITE_OMIT_VIEW
+-  if( !viewOk && IsView(pTab) ){
++  if( IsView(pTab)
++   && (pTrigger==0 || (pTrigger->bReturning && pTrigger->pNext==0))
++  ){
+     sqlite3ErrorMsg(pParse,"cannot modify %s because it is a view",pTab->zName);
+     return 1;
+   }
+@@ -121557,7 +127163,7 @@ SQLITE_PRIVATE Expr *sqlite3LimitWhere(
+   sqlite3 *db = pParse->db;
+   Expr *pLhs = NULL;           /* LHS of IN(SELECT...) operator */
+   Expr *pInClause = NULL;      /* WHERE rowid IN ( select ) */
+-  ExprList *pEList = NULL;     /* Expression list contaning only pSelectRowid */
++  ExprList *pEList = NULL;     /* Expression list containing only pSelectRowid*/
+   SrcList *pSelectSrc = NULL;  /* SELECT rowid FROM x ... (dup of pSrc) */
+   Select *pSelect = NULL;      /* Complete SELECT tree */
+   Table *pTab;
+@@ -121595,14 +127201,20 @@ SQLITE_PRIVATE Expr *sqlite3LimitWhere(
+     );
+   }else{
+     Index *pPk = sqlite3PrimaryKeyIndex(pTab);
++    assert( pPk!=0 );
++    assert( pPk->nKeyCol>=1 );
+     if( pPk->nKeyCol==1 ){
+-      const char *zName = pTab->aCol[pPk->aiColumn[0]].zCnName;
++      const char *zName;
++      assert( pPk->aiColumn[0]>=0 && pPk->aiColumn[0]nCol );
++      zName = pTab->aCol[pPk->aiColumn[0]].zCnName;
+       pLhs = sqlite3Expr(db, TK_ID, zName);
+       pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(db, TK_ID, zName));
+     }else{
+       int i;
+       for(i=0; inKeyCol; i++){
+-        Expr *p = sqlite3Expr(db, TK_ID, pTab->aCol[pPk->aiColumn[i]].zCnName);
++        Expr *p;
++        assert( pPk->aiColumn[i]>=0 && pPk->aiColumn[i]nCol );
++        p = sqlite3Expr(db, TK_ID, pTab->aCol[pPk->aiColumn[i]].zCnName);
+         pEList = sqlite3ExprListAppend(pParse, pEList, p);
+       }
+       pLhs = sqlite3PExpr(pParse, TK_VECTOR, 0, 0);
+@@ -121631,7 +127243,7 @@ SQLITE_PRIVATE Expr *sqlite3LimitWhere(
+       pOrderBy,0,pLimit
+   );
+ 
+-  /* now generate the new WHERE rowid IN clause for the DELETE/UDPATE */
++  /* now generate the new WHERE rowid IN clause for the DELETE/UPDATE */
+   pInClause = sqlite3PExpr(pParse, TK_IN, pLhs, 0);
+   sqlite3PExprAddSelect(pParse, pInClause, pSelect);
+   return pInClause;
+@@ -121746,7 +127358,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
+     goto delete_from_cleanup;
+   }
+ 
+-  if( sqlite3IsReadOnly(pParse, pTab, (pTrigger?1:0)) ){
++  if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
+     goto delete_from_cleanup;
+   }
+   iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+@@ -121845,21 +127457,22 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
+     }
+     for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+       assert( pIdx->pSchema==pTab->pSchema );
+-      sqlite3VdbeAddOp2(v, OP_Clear, pIdx->tnum, iDb);
+       if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){
+-        sqlite3VdbeChangeP3(v, -1, memCnt ? memCnt : -1);
++        sqlite3VdbeAddOp3(v, OP_Clear, pIdx->tnum, iDb, memCnt ? memCnt : -1);
++      }else{
++        sqlite3VdbeAddOp2(v, OP_Clear, pIdx->tnum, iDb);
+       }
+     }
+   }else
+ #endif /* SQLITE_OMIT_TRUNCATE_OPTIMIZATION */
+   {
+     u16 wcf = WHERE_ONEPASS_DESIRED|WHERE_DUPLICATES_OK;
+-    if( sNC.ncFlags & NC_VarSelect ) bComplex = 1;
++    if( sNC.ncFlags & NC_Subquery ) bComplex = 1;
+     wcf |= (bComplex ? 0 : WHERE_ONEPASS_MULTIROW);
+     if( HasRowid(pTab) ){
+       /* For a rowid table, initialize the RowSet to an empty set */
+       pPk = 0;
+-      nPk = 1;
++      assert( nPk==1 );
+       iRowSet = ++pParse->nMem;
+       sqlite3VdbeAddOp2(v, OP_Null, 0, iRowSet);
+     }else{
+@@ -121887,7 +127500,8 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
+     if( pWInfo==0 ) goto delete_from_cleanup;
+     eOnePass = sqlite3WhereOkOnePass(pWInfo, aiCurOnePass);
+     assert( IsVirtual(pTab)==0 || eOnePass!=ONEPASS_MULTI );
+-    assert( IsVirtual(pTab) || bComplex || eOnePass!=ONEPASS_OFF );
++    assert( IsVirtual(pTab) || bComplex || eOnePass!=ONEPASS_OFF
++            || OptimizationDisabled(db, SQLITE_OnePass) );
+     if( eOnePass!=ONEPASS_SINGLE ) sqlite3MultiWrite(pParse);
+     if( sqlite3WhereUsesDeferredSeek(pWInfo) ){
+       sqlite3VdbeAddOp1(v, OP_FinishSeek, iTabCur);
+@@ -122047,7 +127661,7 @@ delete_from_cleanup:
+   sqlite3ExprListDelete(db, pOrderBy);
+   sqlite3ExprDelete(db, pLimit);
+ #endif
+-  sqlite3DbFree(db, aToOpen);
++  if( aToOpen ) sqlite3DbNNFreeNN(db, aToOpen);
+   return;
+ }
+ /* Make sure "isView" and other macros defined above are undefined. Otherwise
+@@ -122224,9 +127838,11 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete(
+   sqlite3FkActions(pParse, pTab, 0, iOld, 0, 0);
+ 
+   /* Invoke AFTER DELETE trigger programs. */
+-  sqlite3CodeRowTrigger(pParse, pTrigger,
+-      TK_DELETE, 0, TRIGGER_AFTER, pTab, iOld, onconf, iLabel
+-  );
++  if( pTrigger ){
++    sqlite3CodeRowTrigger(pParse, pTrigger,
++        TK_DELETE, 0, TRIGGER_AFTER, pTab, iOld, onconf, iLabel
++    );
++  }
+ 
+   /* Jump here if the row had already been deleted before any BEFORE
+   ** trigger programs were invoked. Or if a trigger program throws a
+@@ -122539,6 +128155,42 @@ static void lengthFunc(
+   }
+ }
+ 
++/*
++** Implementation of the octet_length() function
++*/
++static void bytelengthFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  assert( argc==1 );
++  UNUSED_PARAMETER(argc);
++  switch( sqlite3_value_type(argv[0]) ){
++    case SQLITE_BLOB: {
++      sqlite3_result_int(context, sqlite3_value_bytes(argv[0]));
++      break;
++    }
++    case SQLITE_INTEGER:
++    case SQLITE_FLOAT: {
++      i64 m = sqlite3_context_db_handle(context)->enc<=SQLITE_UTF8 ? 1 : 2;
++      sqlite3_result_int64(context, sqlite3_value_bytes(argv[0])*m);
++      break;
++    }
++    case SQLITE_TEXT: {
++      if( sqlite3_value_encoding(argv[0])<=SQLITE_UTF8 ){
++        sqlite3_result_int(context, sqlite3_value_bytes(argv[0]));
++      }else{
++        sqlite3_result_int(context, sqlite3_value_bytes16(argv[0]));
++      }
++      break;
++    }
++    default: {
++      sqlite3_result_null(context);
++      break;
++    }
++  }
++}
++
+ /*
+ ** Implementation of the abs() function.
+ **
+@@ -122815,7 +128467,7 @@ static void roundFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
+   }else if( n==0 ){
+     r = (double)((sqlite_int64)(r+(r<0?-0.5:+0.5)));
+   }else{
+-    zBuf = sqlite3_mprintf("%.*f",n,r);
++    zBuf = sqlite3_mprintf("%!.*f",n,r);
+     if( zBuf==0 ){
+       sqlite3_result_error_nomem(context);
+       return;
+@@ -123015,7 +128667,7 @@ struct compareInfo {
+ 
+ /*
+ ** For LIKE and GLOB matching on EBCDIC machines, assume that every
+-** character is exactly one byte in size.  Also, provde the Utf8Read()
++** character is exactly one byte in size.  Also, provide the Utf8Read()
+ ** macro for fast reading of the next character in the common case where
+ ** the next character is ASCII.
+ */
+@@ -123130,7 +128782,7 @@ static int patternCompare(
+       ** c but in the other case and search the input string for either
+       ** c or cx.
+       */
+-      if( c<=0x80 ){
++      if( c<0x80 ){
+         char zStop[3];
+         int bMatch;
+         if( noCase ){
+@@ -123213,7 +128865,13 @@ static int patternCompare(
+ ** non-zero if there is no match.
+ */
+ SQLITE_API int sqlite3_strglob(const char *zGlobPattern, const char *zString){
+-  return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, '[');
++  if( zString==0 ){
++    return zGlobPattern!=0;
++  }else if( zGlobPattern==0 ){
++    return 1;
++  }else {
++    return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, '[');
++  }
+ }
+ 
+ /*
+@@ -123221,7 +128879,13 @@ SQLITE_API int sqlite3_strglob(const char *zGlobPattern, const char *zString){
+ ** a miss - like strcmp().
+ */
+ SQLITE_API int sqlite3_strlike(const char *zPattern, const char *zStr, unsigned int esc){
+-  return patternCompare((u8*)zPattern, (u8*)zStr, &likeInfoNorm, esc);
++  if( zStr==0 ){
++    return zPattern!=0;
++  }else if( zPattern==0 ){
++    return 1;
++  }else{
++    return patternCompare((u8*)zPattern, (u8*)zStr, &likeInfoNorm, esc);
++  }
+ }
+ 
+ /*
+@@ -123236,7 +128900,7 @@ SQLITE_API int sqlite3_like_count = 0;
+ 
+ /*
+ ** Implementation of the like() SQL function.  This function implements
+-** the build-in LIKE operator.  The first argument to the function is the
++** the built-in LIKE operator.  The first argument to the function is the
+ ** pattern and the second argument is the string.  So, the SQL statements:
+ **
+ **       A LIKE B
+@@ -123460,7 +129124,7 @@ SQLITE_PRIVATE void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){
+     }
+     case SQLITE_BLOB: {
+       char const *zBlob = sqlite3_value_blob(pValue);
+-      int nBlob = sqlite3_value_bytes(pValue);
++      i64 nBlob = sqlite3_value_bytes(pValue);
+       assert( zBlob==sqlite3_value_blob(pValue) ); /* No encoding change */
+       sqlite3StrAccumEnlarge(pStr, nBlob*2 + 4);
+       if( pStr->accError==0 ){
+@@ -123569,6 +129233,7 @@ static void charFunc(
+       *zOut++ = 0x80 + (u8)(c & 0x3F);
+     }                                                    \
+   }
++  *zOut = 0;
+   sqlite3_result_text64(context, (char*)z, zOut-z, sqlite3_free, SQLITE_UTF8);
+ }
+ 
+@@ -123597,10 +129262,101 @@ static void hexFunc(
+       *(z++) = hexdigits[c&0xf];
+     }
+     *z = 0;
+-    sqlite3_result_text(context, zHex, n*2, sqlite3_free);
++    sqlite3_result_text64(context, zHex, (u64)(z-zHex),
++                          sqlite3_free, SQLITE_UTF8);
+   }
+ }
+ 
++/*
++** Buffer zStr contains nStr bytes of utf-8 encoded text. Return 1 if zStr
++** contains character ch, or 0 if it does not.
++*/
++static int strContainsChar(const u8 *zStr, int nStr, u32 ch){
++  const u8 *zEnd = &zStr[nStr];
++  const u8 *z = zStr;
++  while( z0 ){
++      const char *v = (const char*)sqlite3_value_text(argv[i]);
++      if( v!=0 ){
++        if( j>0 && nSep>0 ){
++          memcpy(&z[j], zSep, nSep);
++          j += nSep;
++        }
++        memcpy(&z[j], v, k);
++        j += k;
++      }
++    }
++  }
++  z[j] = 0;
++  assert( j<=n );
++  sqlite3_result_text64(context, z, j, sqlite3_free, SQLITE_UTF8);
++}
++
++/*
++** The CONCAT(...) function.  Generate a string result that is the
++** concatentation of all non-null arguments.
++*/
++static void concatFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  concatFuncCore(context, argc, argv, 0, "");
++}
++
++/*
++** The CONCAT_WS(separator, ...) function.
++**
++** Generate a string that is the concatenation of 2nd through the Nth
++** argument.  Use the first argument (which must be non-NULL) as the
++** separator.
++*/
++static void concatwsFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  int nSep = sqlite3_value_bytes(argv[0]);
++  const char *zSep = (const char*)sqlite3_value_text(argv[0]);
++  if( zSep==0 ) return;
++  concatFuncCore(context, argc-1, argv+1, nSep, zSep);
++}
++
+ 
+ #ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+ /*
+ ** The "unknown" function is automatically substituted in place of
+ ** any unrecognized function name when doing an EXPLAIN or EXPLAIN QUERY PLAN
+-** when the SQLITE_ENABLE_UNKNOWN_FUNCTION compile-time option is used.
++** when the SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION compile-time option is used.
+ ** When the "sqlite3" command-line shell is built using this functionality,
+ ** that allows an EXPLAIN or EXPLAIN QUERY PLAN for complex queries
+ ** involving application-defined functions to be examined in a generic
+@@ -123818,6 +129649,9 @@ static void unknownFunc(
+   sqlite3_value **argv
+ ){
+   /* no-op */
++  (void)context;
++  (void)argc;
++  (void)argv;
+ }
+ #endif /*SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION*/
+ 
+@@ -123919,13 +129753,68 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){
+ */
+ typedef struct SumCtx SumCtx;
+ struct SumCtx {
+-  double rSum;      /* Floating point sum */
+-  i64 iSum;         /* Integer sum */
++  double rSum;      /* Running sum as as a double */
++  double rErr;      /* Error term for Kahan-Babushka-Neumaier summation */
++  i64 iSum;         /* Running sum as a signed integer */
+   i64 cnt;          /* Number of elements summed */
+-  u8 overflow;      /* True if integer overflow seen */
+-  u8 approx;        /* True if non-integer value was input to the sum */
++  u8 approx;        /* True if any non-integer value was input to the sum */
++  u8 ovrfl;         /* Integer overflow seen */
+ };
+ 
++/*
++** Do one step of the Kahan-Babushka-Neumaier summation.
++**
++** https://en.wikipedia.org/wiki/Kahan_summation_algorithm
++**
++** Variables are marked "volatile" to defeat c89 x86 floating point
++** optimizations can mess up this algorithm.
++*/
++static void kahanBabuskaNeumaierStep(
++  volatile SumCtx *pSum,
++  volatile double r
++){
++  volatile double s = pSum->rSum;
++  volatile double t = s + r;
++  if( fabs(s) > fabs(r) ){
++    pSum->rErr += (s - t) + r;
++  }else{
++    pSum->rErr += (r - t) + s;
++  }
++  pSum->rSum = t;
++}
++
++/*
++** Add a (possibly large) integer to the running sum.
++*/
++static void kahanBabuskaNeumaierStepInt64(volatile SumCtx *pSum, i64 iVal){
++  if( iVal<=-4503599627370496LL || iVal>=+4503599627370496LL ){
++    i64 iBig, iSm;
++    iSm = iVal % 16384;
++    iBig = iVal - iSm;
++    kahanBabuskaNeumaierStep(pSum, iBig);
++    kahanBabuskaNeumaierStep(pSum, iSm);
++  }else{
++    kahanBabuskaNeumaierStep(pSum, (double)iVal);
++  }
++}
++
++/*
++** Initialize the Kahan-Babaska-Neumaier sum from a 64-bit integer
++*/
++static void kahanBabuskaNeumaierInit(
++  volatile SumCtx *p,
++  i64 iVal
++){
++  if( iVal<=-4503599627370496LL || iVal>=+4503599627370496LL ){
++    i64 iSm = iVal % 16384;
++    p->rSum = (double)(iVal - iSm);
++    p->rErr = (double)iSm;
++  }else{
++    p->rSum = (double)iVal;
++    p->rErr = 0.0;
++  }
++}
++
+ /*
+ ** Routines used to compute the sum, average, and total.
+ **
+@@ -123945,15 +129834,29 @@ static void sumStep(sqlite3_context *context, int argc, sqlite3_value **argv){
+   type = sqlite3_value_numeric_type(argv[0]);
+   if( p && type!=SQLITE_NULL ){
+     p->cnt++;
+-    if( type==SQLITE_INTEGER ){
+-      i64 v = sqlite3_value_int64(argv[0]);
+-      p->rSum += v;
+-      if( (p->approx|p->overflow)==0 && sqlite3AddInt64(&p->iSum, v) ){
+-        p->approx = p->overflow = 1;
++    if( p->approx==0 ){
++      if( type!=SQLITE_INTEGER ){
++        kahanBabuskaNeumaierInit(p, p->iSum);
++        p->approx = 1;
++        kahanBabuskaNeumaierStep(p, sqlite3_value_double(argv[0]));
++      }else{
++        i64 x = p->iSum;
++        if( sqlite3AddInt64(&x, sqlite3_value_int64(argv[0]))==0 ){
++          p->iSum = x;
++        }else{
++          p->ovrfl = 1;
++          kahanBabuskaNeumaierInit(p, p->iSum);
++          p->approx = 1;
++          kahanBabuskaNeumaierStepInt64(p, sqlite3_value_int64(argv[0]));
++        }
+       }
+     }else{
+-      p->rSum += sqlite3_value_double(argv[0]);
+-      p->approx = 1;
++      if( type==SQLITE_INTEGER ){
++        kahanBabuskaNeumaierStepInt64(p, sqlite3_value_int64(argv[0]));
++      }else{
++        p->ovrfl = 0;
++        kahanBabuskaNeumaierStep(p, sqlite3_value_double(argv[0]));
++      }
+     }
+   }
+ }
+@@ -123970,13 +129873,18 @@ static void sumInverse(sqlite3_context *context, int argc, sqlite3_value**argv){
+   if( ALWAYS(p) && type!=SQLITE_NULL ){
+     assert( p->cnt>0 );
+     p->cnt--;
+-    assert( type==SQLITE_INTEGER || p->approx );
+-    if( type==SQLITE_INTEGER && p->approx==0 ){
+-      i64 v = sqlite3_value_int64(argv[0]);
+-      p->rSum -= v;
+-      p->iSum -= v;
++    if( !p->approx ){
++      p->iSum -= sqlite3_value_int64(argv[0]);
++    }else if( type==SQLITE_INTEGER ){
++      i64 iVal = sqlite3_value_int64(argv[0]);
++      if( iVal!=SMALLEST_INT64 ){
++        kahanBabuskaNeumaierStepInt64(p, -iVal);
++      }else{
++        kahanBabuskaNeumaierStepInt64(p, LARGEST_INT64);
++        kahanBabuskaNeumaierStepInt64(p, 1);
++      }
+     }else{
+-      p->rSum -= sqlite3_value_double(argv[0]);
++      kahanBabuskaNeumaierStep(p, -sqlite3_value_double(argv[0]));
+     }
+   }
+ }
+@@ -123987,10 +129895,14 @@ static void sumFinalize(sqlite3_context *context){
+   SumCtx *p;
+   p = sqlite3_aggregate_context(context, 0);
+   if( p && p->cnt>0 ){
+-    if( p->overflow ){
+-      sqlite3_result_error(context,"integer overflow",-1);
+-    }else if( p->approx ){
+-      sqlite3_result_double(context, p->rSum);
++    if( p->approx ){
++      if( p->ovrfl ){
++        sqlite3_result_error(context,"integer overflow",-1);
++      }else if( !sqlite3IsNaN(p->rErr) ){
++        sqlite3_result_double(context, p->rSum+p->rErr);
++      }else{
++        sqlite3_result_double(context, p->rSum);
++      }
+     }else{
+       sqlite3_result_int64(context, p->iSum);
+     }
+@@ -124000,14 +129912,29 @@ static void avgFinalize(sqlite3_context *context){
+   SumCtx *p;
+   p = sqlite3_aggregate_context(context, 0);
+   if( p && p->cnt>0 ){
+-    sqlite3_result_double(context, p->rSum/(double)p->cnt);
++    double r;
++    if( p->approx ){
++      r = p->rSum;
++      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
++    }else{
++      r = (double)(p->iSum);
++    }
++    sqlite3_result_double(context, r/(double)p->cnt);
+   }
+ }
+ static void totalFinalize(sqlite3_context *context){
+   SumCtx *p;
++  double r = 0.0;
+   p = sqlite3_aggregate_context(context, 0);
+-  /* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
+-  sqlite3_result_double(context, p ? p->rSum : (double)0);
++  if( p ){
++    if( p->approx ){
++      r = p->rSum;
++      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
++    }else{
++      r = (double)(p->iSum);
++    }
++  }
++  sqlite3_result_double(context, r);
+ }
+ 
+ /*
+@@ -124126,6 +130053,7 @@ static void minMaxFinalize(sqlite3_context *context){
+ 
+ /*
+ ** group_concat(EXPR, ?SEPARATOR?)
++** string_agg(EXPR, SEPARATOR)
+ **
+ ** The SEPARATOR goes before the EXPR string.  This is tragic.  The
+ ** groupConcatInverse() implementation would have been easier if the
+@@ -124229,7 +130157,7 @@ static void groupConcatInverse(
+   if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
+   pGCC = (GroupConcatCtx*)sqlite3_aggregate_context(context, sizeof(*pGCC));
+   /* pGCC is always non-NULL since groupConcatStep() will have always
+-  ** run frist to initialize it */
++  ** run first to initialize it */
+   if( ALWAYS(pGCC) ){
+     int nVS;
+     /* Must call sqlite3_value_text() to convert the argument into text prior
+@@ -124313,8 +130241,10 @@ SQLITE_PRIVATE void sqlite3RegisterPerConnectionBuiltinFunctions(sqlite3 *db){
+ ** sensitive.
+ */
+ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){
++  FuncDef *pDef;
+   struct compareInfo *pInfo;
+   int flags;
++  int nArg;
+   if( caseSensitive ){
+     pInfo = (struct compareInfo*)&likeInfoAlt;
+     flags = SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE;
+@@ -124322,10 +130252,13 @@ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive)
+     pInfo = (struct compareInfo*)&likeInfoNorm;
+     flags = SQLITE_FUNC_LIKE;
+   }
+-  sqlite3CreateFunc(db, "like", 2, SQLITE_UTF8, pInfo, likeFunc, 0, 0, 0, 0, 0);
+-  sqlite3CreateFunc(db, "like", 3, SQLITE_UTF8, pInfo, likeFunc, 0, 0, 0, 0, 0);
+-  sqlite3FindFunction(db, "like", 2, SQLITE_UTF8, 0)->funcFlags |= flags;
+-  sqlite3FindFunction(db, "like", 3, SQLITE_UTF8, 0)->funcFlags |= flags;
++  for(nArg=2; nArg<=3; nArg++){
++    sqlite3CreateFunc(db, "like", nArg, SQLITE_UTF8, pInfo, likeFunc,
++                      0, 0, 0, 0, 0);
++    pDef = sqlite3FindFunction(db, "like", nArg, SQLITE_UTF8, 0);
++    pDef->funcFlags |= flags;
++    pDef->funcFlags &= ~SQLITE_FUNC_UNSAFE;
++  }
+ }
+ 
+ /*
+@@ -124446,6 +130379,18 @@ static void ceilingFunc(
+ static double xCeil(double x){ return ceil(x); }
+ static double xFloor(double x){ return floor(x); }
+ 
++/*
++** Some systems do not have log2() and log10() in their standard math
++** libraries.
++*/
++#if defined(HAVE_LOG10) && HAVE_LOG10==0
++# define log10(X) (0.4342944819032517867*log(X))
++#endif
++#if defined(HAVE_LOG2) && HAVE_LOG2==0
++# define log2(X) (1.442695040888963456*log(X))
++#endif
++
++
+ /*
+ ** Implementation of SQL functions:
+ **
+@@ -124484,17 +130429,15 @@ static void logFunc(
+     }
+     ans = log(x)/b;
+   }else{
+-    ans = log(x);
+     switch( SQLITE_PTR_TO_INT(sqlite3_user_data(context)) ){
+       case 1:
+-        /* Convert from natural logarithm to log base 10 */
+-        ans /= M_LN10;
++        ans = log10(x);
+         break;
+       case 2:
+-        /* Convert from natural logarithm to log base 2 */
+-        ans /= M_LN2;
++        ans = log2(x);
+         break;
+       default:
++        ans = log(x);
+         break;
+     }
+   }
+@@ -124563,6 +130506,7 @@ static void piFunc(
+   sqlite3_value **argv
+ ){
+   assert( argc==0 );
++  (void)argv;
+   sqlite3_result_double(context, M_PI);
+ }
+ 
+@@ -124586,6 +130530,37 @@ static void signFunc(
+   sqlite3_result_int(context, x<0.0 ? -1 : x>0.0 ? +1 : 0);
+ }
+ 
++#ifdef SQLITE_DEBUG
++/*
++** Implementation of fpdecode(x,y,z) function.
++**
++** x is a real number that is to be decoded.  y is the precision.
++** z is the maximum real precision.
++*/
++static void fpdecodeFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  FpDecode s;
++  double x;
++  int y, z;
++  char zBuf[100];
++  UNUSED_PARAMETER(argc);
++  assert( argc==3 );
++  x = sqlite3_value_double(argv[0]);
++  y = sqlite3_value_int(argv[1]);
++  z = sqlite3_value_int(argv[2]);
++  sqlite3FpDecode(&s, x, y, z);
++  if( s.isSpecial==2 ){
++    sqlite3_snprintf(sizeof(zBuf), zBuf, "NaN");
++  }else{
++    sqlite3_snprintf(sizeof(zBuf), zBuf, "%c%.*s/%d", s.sign, s.n, s.z, s.iDP);
++  }
++  sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
++}
++#endif /* SQLITE_DEBUG */
++
+ /*
+ ** All of the FuncDef structures in the aBuiltinFunc[] array above
+ ** to the global function hash table.  This occurs at start-time (as
+@@ -124650,12 +130625,16 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(void){
+     FUNCTION2(typeof,            1, 0, 0, typeofFunc,  SQLITE_FUNC_TYPEOF),
+     FUNCTION2(subtype,           1, 0, 0, subtypeFunc, SQLITE_FUNC_TYPEOF),
+     FUNCTION2(length,            1, 0, 0, lengthFunc,  SQLITE_FUNC_LENGTH),
++    FUNCTION2(octet_length,      1, 0, 0, bytelengthFunc,SQLITE_FUNC_BYTELEN),
+     FUNCTION(instr,              2, 0, 0, instrFunc        ),
+     FUNCTION(printf,            -1, 0, 0, printfFunc       ),
+     FUNCTION(format,            -1, 0, 0, printfFunc       ),
+     FUNCTION(unicode,            1, 0, 0, unicodeFunc      ),
+     FUNCTION(char,              -1, 0, 0, charFunc         ),
+     FUNCTION(abs,                1, 0, 0, absFunc          ),
++#ifdef SQLITE_DEBUG
++    FUNCTION(fpdecode,           3, 0, 0, fpdecodeFunc     ),
++#endif
+ #ifndef SQLITE_OMIT_FLOATING_POINT
+     FUNCTION(round,              1, 0, 0, roundFunc        ),
+     FUNCTION(round,              2, 0, 0, roundFunc        ),
+@@ -124663,6 +130642,13 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(void){
+     FUNCTION(upper,              1, 0, 0, upperFunc        ),
+     FUNCTION(lower,              1, 0, 0, lowerFunc        ),
+     FUNCTION(hex,                1, 0, 0, hexFunc          ),
++    FUNCTION(unhex,              1, 0, 0, unhexFunc        ),
++    FUNCTION(unhex,              2, 0, 0, unhexFunc        ),
++    FUNCTION(concat,            -1, 0, 0, concatFunc       ),
++    FUNCTION(concat,             0, 0, 0, 0                ),
++    FUNCTION(concat_ws,         -1, 0, 0, concatwsFunc     ),
++    FUNCTION(concat_ws,          0, 0, 0, 0                ),
++    FUNCTION(concat_ws,          1, 0, 0, 0                ),
+     INLINE_FUNC(ifnull,          2, INLINEFUNC_coalesce, 0 ),
+     VFUNCTION(random,            0, 0, 0, randomFunc       ),
+     VFUNCTION(randomblob,        1, 0, 0, randomBlob       ),
+@@ -124692,6 +130678,8 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(void){
+         groupConcatFinalize, groupConcatValue, groupConcatInverse, 0),
+     WAGGREGATE(group_concat, 2, 0, 0, groupConcatStep,
+         groupConcatFinalize, groupConcatValue, groupConcatInverse, 0),
++    WAGGREGATE(string_agg,   2, 0, 0, groupConcatStep,
++        groupConcatFinalize, groupConcatValue, groupConcatInverse, 0),
+ 
+     LIKEFUNC(glob, 2, &globInfo, SQLITE_FUNC_LIKE|SQLITE_FUNC_CASE),
+ #ifdef SQLITE_CASE_SENSITIVE_LIKE
+@@ -125634,6 +131622,7 @@ static int isSetNullAction(Parse *pParse, FKey *pFKey){
+     if( (p==pFKey->apTrigger[0] && pFKey->aAction[0]==OE_SetNull)
+      || (p==pFKey->apTrigger[1] && pFKey->aAction[1]==OE_SetNull)
+     ){
++      assert( (pTop->db->flags & SQLITE_FkNoAction)==0 );
+       return 1;
+     }
+   }
+@@ -125828,6 +131817,8 @@ SQLITE_PRIVATE void sqlite3FkCheck(
+       }
+       if( regOld!=0 ){
+         int eAction = pFKey->aAction[aChange!=0];
++        if( (db->flags & SQLITE_FkNoAction) ) eAction = OE_None;
++
+         fkScanChildren(pParse, pSrc, pTab, pIdx, pFKey, aiCol, regOld, 1);
+         /* If this is a deferred FK constraint, or a CASCADE or SET NULL
+         ** action applies, then any foreign key violations caused by
+@@ -125943,7 +131934,11 @@ SQLITE_PRIVATE int sqlite3FkRequired(
+       /* Check if any parent key columns are being modified. */
+       for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
+         if( fkParentIsModified(pTab, p, aChange, chngRowid) ){
+-          if( p->aAction[1]!=OE_None ) return 2;
++          if( (pParse->db->flags & SQLITE_FkNoAction)==0
++           && p->aAction[1]!=OE_None
++          ){
++            return 2;
++          }
+           bHaveFK = 1;
+         }
+       }
+@@ -125993,6 +131988,7 @@ static Trigger *fkActionTrigger(
+   int iAction = (pChanges!=0);    /* 1 for UPDATE, 0 for DELETE */
+ 
+   action = pFKey->aAction[iAction];
++  if( (db->flags & SQLITE_FkNoAction) ) action = OE_None;
+   if( action==OE_Restrict && (db->flags & SQLITE_DeferFKs) ){
+     return 0;
+   }
+@@ -126093,22 +132089,22 @@ static Trigger *fkActionTrigger(
+ 
+     if( action==OE_Restrict ){
+       int iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+-      Token tFrom;
+-      Token tDb;
++      SrcList *pSrc;
+       Expr *pRaise;
+ 
+-      tFrom.z = zFrom;
+-      tFrom.n = nFrom;
+-      tDb.z = db->aDb[iDb].zDbSName;
+-      tDb.n = sqlite3Strlen30(tDb.z);
+-
+       pRaise = sqlite3Expr(db, TK_RAISE, "FOREIGN KEY constraint failed");
+       if( pRaise ){
+         pRaise->affExpr = OE_Abort;
+       }
++      pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
++      if( pSrc ){
++        assert( pSrc->nSrc==1 );
++        pSrc->a[0].zName = sqlite3DbStrDup(db, zFrom);
++        pSrc->a[0].zDatabase = sqlite3DbStrDup(db, db->aDb[iDb].zDbSName);
++      }
+       pSelect = sqlite3SelectNew(pParse,
+           sqlite3ExprListAppend(pParse, 0, pRaise),
+-          sqlite3SrcListAppend(pParse, 0, &tDb, &tFrom),
++          pSrc,
+           pWhere,
+           0, 0, 0, 0, 0
+       );
+@@ -126215,17 +132211,17 @@ SQLITE_PRIVATE void sqlite3FkDelete(sqlite3 *db, Table *pTab){
+   FKey *pNext;                    /* Copy of pFKey->pNextFrom */
+ 
+   assert( IsOrdinaryTable(pTab) );
++  assert( db!=0 );
+   for(pFKey=pTab->u.tab.pFKey; pFKey; pFKey=pNext){
+     assert( db==0 || sqlite3SchemaMutexHeld(db, 0, pTab->pSchema) );
+ 
+     /* Remove the FK from the fkeyHash hash table. */
+-    if( !db || db->pnBytesFreed==0 ){
++    if( db->pnBytesFreed==0 ){
+       if( pFKey->pPrevTo ){
+         pFKey->pPrevTo->pNextTo = pFKey->pNextTo;
+       }else{
+-        void *p = (void *)pFKey->pNextTo;
+-        const char *z = (p ? pFKey->pNextTo->zTo : pFKey->zTo);
+-        sqlite3HashInsert(&pTab->pSchema->fkeyHash, z, p);
++        const char *z = (pFKey->pNextTo ? pFKey->pNextTo->zTo : pFKey->zTo);
++        sqlite3HashInsert(&pTab->pSchema->fkeyHash, z, pFKey->pNextTo);
+       }
+       if( pFKey->pNextTo ){
+         pFKey->pNextTo->pPrevTo = pFKey->pPrevTo;
+@@ -126288,8 +132284,10 @@ SQLITE_PRIVATE void sqlite3OpenTable(
+   assert( pParse->pVdbe!=0 );
+   v = pParse->pVdbe;
+   assert( opcode==OP_OpenWrite || opcode==OP_OpenRead );
+-  sqlite3TableLock(pParse, iDb, pTab->tnum,
+-                   (opcode==OP_OpenWrite)?1:0, pTab->zName);
++  if( !pParse->db->noSharedCache ){
++    sqlite3TableLock(pParse, iDb, pTab->tnum,
++                     (opcode==OP_OpenWrite)?1:0, pTab->zName);
++  }
+   if( HasRowid(pTab) ){
+     sqlite3VdbeAddOp4Int(v, opcode, iCur, pTab->tnum, iDb, pTab->nNVCol);
+     VdbeComment((v, "%s", pTab->zName));
+@@ -126323,43 +132321,68 @@ SQLITE_PRIVATE void sqlite3OpenTable(
+ ** is managed along with the rest of the Index structure. It will be
+ ** released when sqlite3DeleteIndex() is called.
+ */
+-SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
++static SQLITE_NOINLINE const char *computeIndexAffStr(sqlite3 *db, Index *pIdx){
++  /* The first time a column affinity string for a particular index is
++  ** required, it is allocated and populated here. It is then stored as
++  ** a member of the Index structure for subsequent use.
++  **
++  ** The column affinity string will eventually be deleted by
++  ** sqliteDeleteIndex() when the Index structure itself is cleaned
++  ** up.
++  */
++  int n;
++  Table *pTab = pIdx->pTable;
++  pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1);
+   if( !pIdx->zColAff ){
+-    /* The first time a column affinity string for a particular index is
+-    ** required, it is allocated and populated here. It is then stored as
+-    ** a member of the Index structure for subsequent use.
+-    **
+-    ** The column affinity string will eventually be deleted by
+-    ** sqliteDeleteIndex() when the Index structure itself is cleaned
+-    ** up.
+-    */
+-    int n;
+-    Table *pTab = pIdx->pTable;
+-    pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1);
+-    if( !pIdx->zColAff ){
+-      sqlite3OomFault(db);
+-      return 0;
++    sqlite3OomFault(db);
++    return 0;
++  }
++  for(n=0; nnColumn; n++){
++    i16 x = pIdx->aiColumn[n];
++    char aff;
++    if( x>=0 ){
++      aff = pTab->aCol[x].affinity;
++    }else if( x==XN_ROWID ){
++      aff = SQLITE_AFF_INTEGER;
++    }else{
++      assert( x==XN_EXPR );
++      assert( pIdx->bHasExpr );
++      assert( pIdx->aColExpr!=0 );
++      aff = sqlite3ExprAffinity(pIdx->aColExpr->a[n].pExpr);
+     }
+-    for(n=0; nnColumn; n++){
+-      i16 x = pIdx->aiColumn[n];
+-      char aff;
+-      if( x>=0 ){
+-        aff = pTab->aCol[x].affinity;
+-      }else if( x==XN_ROWID ){
+-        aff = SQLITE_AFF_INTEGER;
+-      }else{
+-        assert( x==XN_EXPR );
+-        assert( pIdx->aColExpr!=0 );
+-        aff = sqlite3ExprAffinity(pIdx->aColExpr->a[n].pExpr);
++    if( affSQLITE_AFF_NUMERIC) aff = SQLITE_AFF_NUMERIC;
++    pIdx->zColAff[n] = aff;
++  }
++  pIdx->zColAff[n] = 0;
++  return pIdx->zColAff;
++}
++SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
++  if( !pIdx->zColAff ) return computeIndexAffStr(db, pIdx);
++  return pIdx->zColAff;
++}
++
++
++/*
++** Compute an affinity string for a table.   Space is obtained
++** from sqlite3DbMalloc().  The caller is responsible for freeing
++** the space when done.
++*/
++SQLITE_PRIVATE char *sqlite3TableAffinityStr(sqlite3 *db, const Table *pTab){
++  char *zColAff;
++  zColAff = (char *)sqlite3DbMallocRaw(db, pTab->nCol+1);
++  if( zColAff ){
++    int i, j;
++    for(i=j=0; inCol; i++){
++      if( (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
++        zColAff[j++] = pTab->aCol[i].affinity;
+       }
+-      if( affSQLITE_AFF_NUMERIC) aff = SQLITE_AFF_NUMERIC;
+-      pIdx->zColAff[n] = aff;
+     }
+-    pIdx->zColAff[n] = 0;
++    do{
++      zColAff[j--] = 0;
++    }while( j>=0 && zColAff[j]<=SQLITE_AFF_BLOB );
+   }
+-
+-  return pIdx->zColAff;
++  return zColAff;
+ }
+ 
+ /*
+@@ -126393,7 +132416,7 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
+ ** For STRICT tables:
+ ** ------------------
+ **
+-** Generate an appropropriate OP_TypeCheck opcode that will verify the
++** Generate an appropriate OP_TypeCheck opcode that will verify the
+ ** datatypes against the column definitions in pTab.  If iReg==0, that
+ ** means an OP_MakeRecord opcode has already been generated and should be
+ ** the last opcode generated.  The new OP_TypeCheck needs to be inserted
+@@ -126403,7 +132426,7 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
+ ** Apply the type checking to that array of registers.
+ */
+ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
+-  int i, j;
++  int i;
+   char *zColAff;
+   if( pTab->tabFlags & TF_Strict ){
+     if( iReg==0 ){
+@@ -126412,7 +132435,7 @@ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
+       ** OP_MakeRecord is found */
+       VdbeOp *pPrev;
+       sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
+-      pPrev = sqlite3VdbeGetOp(v, -1);
++      pPrev = sqlite3VdbeGetLastOp(v);
+       assert( pPrev!=0 );
+       assert( pPrev->opcode==OP_MakeRecord || sqlite3VdbeDb(v)->mallocFailed );
+       pPrev->opcode = OP_TypeCheck;
+@@ -126426,22 +132449,11 @@ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
+   }
+   zColAff = pTab->zColAff;
+   if( zColAff==0 ){
+-    sqlite3 *db = sqlite3VdbeDb(v);
+-    zColAff = (char *)sqlite3DbMallocRaw(0, pTab->nCol+1);
++    zColAff = sqlite3TableAffinityStr(0, pTab);
+     if( !zColAff ){
+-      sqlite3OomFault(db);
++      sqlite3OomFault(sqlite3VdbeDb(v));
+       return;
+     }
+-
+-    for(i=j=0; inCol; i++){
+-      assert( pTab->aCol[i].affinity!=0 || sqlite3VdbeParser(v)->nErr>0 );
+-      if( (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
+-        zColAff[j++] = pTab->aCol[i].affinity;
+-      }
+-    }
+-    do{
+-      zColAff[j--] = 0;
+-    }while( j>=0 && zColAff[j]<=SQLITE_AFF_BLOB );
+     pTab->zColAff = zColAff;
+   }
+   assert( zColAff!=0 );
+@@ -126450,7 +132462,7 @@ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
+     if( iReg ){
+       sqlite3VdbeAddOp4(v, OP_Affinity, iReg, i, 0, zColAff, i);
+     }else{
+-      assert( sqlite3VdbeGetOp(v, -1)->opcode==OP_MakeRecord
++      assert( sqlite3VdbeGetLastOp(v)->opcode==OP_MakeRecord
+               || sqlite3VdbeDb(v)->mallocFailed );
+       sqlite3VdbeChangeP4(v, -1, zColAff, i);
+     }
+@@ -126536,7 +132548,7 @@ SQLITE_PRIVATE void sqlite3ComputeGeneratedColumns(
+   */
+   sqlite3TableAffinity(pParse->pVdbe, pTab, iRegStore);
+   if( (pTab->tabFlags & TF_HasStored)!=0 ){
+-    pOp = sqlite3VdbeGetOp(pParse->pVdbe,-1);
++    pOp = sqlite3VdbeGetLastOp(pParse->pVdbe);
+     if( pOp->opcode==OP_Affinity ){
+       /* Change the OP_Affinity argument to '@' (NONE) for all stored
+       ** columns.  '@' is the no-op affinity and those columns have not
+@@ -127035,7 +133047,7 @@ SQLITE_PRIVATE void sqlite3Insert(
+ 
+   /* Cannot insert into a read-only table.
+   */
+-  if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
++  if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
+     goto insert_cleanup;
+   }
+ 
+@@ -127442,7 +133454,12 @@ SQLITE_PRIVATE void sqlite3Insert(
+         sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+k, iRegStore);
+       }
+     }else{
+-      sqlite3ExprCode(pParse, pList->a[k].pExpr, iRegStore);
++      Expr *pX = pList->a[k].pExpr;
++      int y = sqlite3ExprCodeTarget(pParse, pX, iRegStore);
++      if( y!=iRegStore ){
++        sqlite3VdbeAddOp2(v,
++          ExprHasProperty(pX, EP_Subquery) ? OP_Copy : OP_SCopy, y, iRegStore);
++      }
+     }
+   }
+ 
+@@ -127477,7 +133494,7 @@ SQLITE_PRIVATE void sqlite3Insert(
+     }
+ 
+     /* Copy the new data already generated. */
+-    assert( pTab->nNVCol>0 );
++    assert( pTab->nNVCol>0 || pParse->nErr>0 );
+     sqlite3VdbeAddOp3(v, OP_Copy, regRowid+1, regCols+1, pTab->nNVCol-1);
+ 
+ #ifndef SQLITE_OMIT_GENERATED_COLUMNS
+@@ -127579,7 +133596,9 @@ SQLITE_PRIVATE void sqlite3Insert(
+       sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur,
+           regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace, 0, pUpsert
+       );
+-      sqlite3FkCheck(pParse, pTab, 0, regIns, 0, 0);
++      if( db->flags & SQLITE_ForeignKeys ){
++        sqlite3FkCheck(pParse, pTab, 0, regIns, 0, 0);
++      }
+ 
+       /* Set the OPFLAG_USESEEKRESULT flag if either (a) there are no REPLACE
+       ** constraints or (b) there are no triggers and this table is not a
+@@ -127663,7 +133682,7 @@ insert_cleanup:
+   sqlite3UpsertDelete(db, pUpsert);
+   sqlite3SelectDelete(db, pSelect);
+   sqlite3IdListDelete(db, pColumn);
+-  sqlite3DbFree(db, aRegIdx);
++  if( aRegIdx ) sqlite3DbNNFreeNN(db, aRegIdx);
+ }
+ 
+ /* Make sure "isView" and other macros defined above are undefined. Otherwise
+@@ -127689,7 +133708,7 @@ insert_cleanup:
+ /* This is the Walker callback from sqlite3ExprReferencesUpdatedColumn().
+ *  Set bit 0x01 of pWalker->eCode if pWalker->eCode to 0 and if this
+ ** expression node references any of the
+-** columns that are being modifed by an UPDATE statement.
++** columns that are being modified by an UPDATE statement.
+ */
+ static int checkConstraintExprNode(Walker *pWalker, Expr *pExpr){
+   if( pExpr->op==TK_COLUMN ){
+@@ -127912,7 +133931,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
+   int *aiChng,         /* column i is unchanged if aiChng[i]<0 */
+   Upsert *pUpsert      /* ON CONFLICT clauses, if any.  NULL otherwise */
+ ){
+-  Vdbe *v;             /* VDBE under constrution */
++  Vdbe *v;             /* VDBE under construction */
+   Index *pIdx;         /* Pointer to one of the indices */
+   Index *pPk = 0;      /* The PRIMARY KEY index for WITHOUT ROWID tables */
+   sqlite3 *db;         /* Database connection */
+@@ -128027,6 +134046,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
+           case OE_Fail: {
+             char *zMsg = sqlite3MPrintf(db, "%s.%s", pTab->zName,
+                                         pCol->zCnName);
++            testcase( zMsg==0 && db->mallocFailed==0 );
+             sqlite3VdbeAddOp3(v, OP_HaltIfNull, SQLITE_CONSTRAINT_NOTNULL,
+                               onError, iReg);
+             sqlite3VdbeAppendP4(v, zMsg, P4_DYNAMIC);
+@@ -128394,7 +134414,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
+       pIdx;
+       pIdx = indexIteratorNext(&sIdxIter, &ix)
+   ){
+-    int regIdx;          /* Range of registers hold conent for pIdx */
++    int regIdx;          /* Range of registers holding content for pIdx */
+     int regR;            /* Range of registers holding conflicting PK */
+     int iThisCur;        /* Cursor for this UNIQUE index */
+     int addrUniqueOk;    /* Jump here if the UNIQUE constraint is satisfied */
+@@ -128889,6 +134909,8 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices(
+ 
+   assert( op==OP_OpenRead || op==OP_OpenWrite );
+   assert( op==OP_OpenWrite || p5==0 );
++  assert( piDataCur!=0 );
++  assert( piIdxCur!=0 );
+   if( IsVirtual(pTab) ){
+     /* This routine is a no-op for virtual tables. Leave the output
+     ** variables *piDataCur and *piIdxCur set to illegal cursor numbers
+@@ -128901,18 +134923,18 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices(
+   assert( v!=0 );
+   if( iBase<0 ) iBase = pParse->nTab;
+   iDataCur = iBase++;
+-  if( piDataCur ) *piDataCur = iDataCur;
++  *piDataCur = iDataCur;
+   if( HasRowid(pTab) && (aToOpen==0 || aToOpen[0]) ){
+     sqlite3OpenTable(pParse, iDataCur, iDb, pTab, op);
+-  }else{
++  }else if( pParse->db->noSharedCache==0 ){
+     sqlite3TableLock(pParse, iDb, pTab->tnum, op==OP_OpenWrite, pTab->zName);
+   }
+-  if( piIdxCur ) *piIdxCur = iBase;
++  *piIdxCur = iBase;
+   for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
+     int iIdxCur = iBase++;
+     assert( pIdx->pSchema==pTab->pSchema );
+     if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){
+-      if( piDataCur ) *piDataCur = iIdxCur;
++      *piDataCur = iIdxCur;
+       p5 = 0;
+     }
+     if( aToOpen==0 || aToOpen[i+1] ){
+@@ -129210,7 +135232,7 @@ static int xferOptimization(
+   }
+ #endif
+ #ifndef SQLITE_OMIT_FOREIGN_KEY
+-  /* Disallow the transfer optimization if the destination table constains
++  /* Disallow the transfer optimization if the destination table contains
+   ** any foreign key constraints.  This is more restrictive than necessary.
+   ** But the main beneficiary of the transfer optimization is the VACUUM
+   ** command, and the VACUUM command disables foreign key constraints.  So
+@@ -129890,9 +135912,9 @@ struct sqlite3_api_routines {
+   const char *(*filename_journal)(const char*);
+   const char *(*filename_wal)(const char*);
+   /* Version 3.32.0 and later */
+-  char *(*create_filename)(const char*,const char*,const char*,
++  const char *(*create_filename)(const char*,const char*,const char*,
+                            int,const char**);
+-  void (*free_filename)(char*);
++  void (*free_filename)(const char*);
+   sqlite3_file *(*database_file_object)(const char*);
+   /* Version 3.34.0 and later */
+   int (*txn_state)(sqlite3*,const char*);
+@@ -129916,6 +135938,15 @@ struct sqlite3_api_routines {
+   unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
+                               unsigned int);
+   const char *(*db_name)(sqlite3*,int);
++  /* Version 3.40.0 and later */
++  int (*value_encoding)(sqlite3_value*);
++  /* Version 3.41.0 and later */
++  int (*is_interrupted)(sqlite3*);
++  /* Version 3.43.0 and later */
++  int (*stmt_explain)(sqlite3_stmt*,int);
++  /* Version 3.44.0 and later */
++  void *(*get_clientdata)(sqlite3*,const char*);
++  int (*set_clientdata)(sqlite3*, const char*, void*, void(*)(void*));
+ };
+ 
+ /*
+@@ -130240,6 +136271,15 @@ typedef int (*sqlite3_loadext_entry)(
+ #define sqlite3_serialize              sqlite3_api->serialize
+ #endif
+ #define sqlite3_db_name                sqlite3_api->db_name
++/* Version 3.40.0 and later */
++#define sqlite3_value_encoding         sqlite3_api->value_encoding
++/* Version 3.41.0 and later */
++#define sqlite3_is_interrupted         sqlite3_api->is_interrupted
++/* Version 3.43.0 and later */
++#define sqlite3_stmt_explain           sqlite3_api->stmt_explain
++/* Version 3.44.0 and later */
++#define sqlite3_get_clientdata         sqlite3_api->get_clientdata
++#define sqlite3_set_clientdata         sqlite3_api->set_clientdata
+ #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
+ 
+ #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
+@@ -130752,7 +136792,16 @@ static const sqlite3_api_routines sqlite3Apis = {
+   0,
+   0,
+ #endif
+-  sqlite3_db_name
++  sqlite3_db_name,
++  /* Version 3.40.0 and later */
++  sqlite3_value_encoding,
++  /* Version 3.41.0 and later */
++  sqlite3_is_interrupted,
++  /* Version 3.43.0 and later */
++  sqlite3_stmt_explain,
++  /* Version 3.44.0 and later */
++  sqlite3_get_clientdata,
++  sqlite3_set_clientdata
+ };
+ 
+ /* True if x is the directory separator character
+@@ -130825,15 +136874,25 @@ static int sqlite3LoadExtension(
+   /* tag-20210611-1.  Some dlopen() implementations will segfault if given
+   ** an oversize filename.  Most filesystems have a pathname limit of 4K,
+   ** so limit the extension filename length to about twice that.
+-  ** https://sqlite.org/forum/forumpost/08a0d6d9bf */
++  ** https://sqlite.org/forum/forumpost/08a0d6d9bf
++  **
++  ** Later (2023-03-25): Save an extra 6 bytes for the filename suffix.
++  ** See https://sqlite.org/forum/forumpost/24083b579d.
++  */
+   if( nMsg>SQLITE_MAX_PATHLEN ) goto extension_not_found;
+ 
++  /* Do not allow sqlite3_load_extension() to link to a copy of the
++  ** running application, by passing in an empty filename. */
++  if( nMsg==0 ) goto extension_not_found;
++
+   handle = sqlite3OsDlOpen(pVfs, zFile);
+ #if SQLITE_OS_UNIX || SQLITE_OS_WIN
+   for(ii=0; iimutex);
+   if( onoff ){
+     db->flags |= SQLITE_LoadExtension|SQLITE_LoadExtFunc;
+@@ -131007,6 +137069,9 @@ SQLITE_API int sqlite3_auto_extension(
+   void (*xInit)(void)
+ ){
+   int rc = SQLITE_OK;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( xInit==0 ) return SQLITE_MISUSE_BKPT;
++#endif
+ #ifndef SQLITE_OMIT_AUTOINIT
+   rc = sqlite3_initialize();
+   if( rc ){
+@@ -131059,6 +137124,9 @@ SQLITE_API int sqlite3_cancel_auto_extension(
+   int i;
+   int n = 0;
+   wsdAutoextInit;
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( xInit==0 ) return 0;
++#endif
+   sqlite3_mutex_enter(mutex);
+   for(i=(int)wsdAutoext.nExt-1; i>=0; i--){
+     if( wsdAutoext.aExt[i]==xInit ){
+@@ -132252,7 +138320,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+   aFcntl[2] = zRight;
+   aFcntl[3] = 0;
+   db->busyHandler.nBusy = 0;
+-  rc = sqlite3_file_control(db, zDb, SQLITE_FCNTL_PRAGMA, (void*)aFcntl);
++  rc = sqlite3mcFileControlPragma(db, zDb, SQLITE_FCNTL_PRAGMA, (void*)aFcntl);
+   if( rc==SQLITE_OK ){
+     sqlite3VdbeSetNumCols(v, 1);
+     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, aFcntl[0], SQLITE_TRANSIENT);
+@@ -132658,7 +138726,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+   **
+   ** The first form reports the current local setting for the
+   ** page cache spill size. The second form turns cache spill on
+-  ** or off.  When turnning cache spill on, the size is set to the
++  ** or off.  When turning cache spill on, the size is set to the
+   ** current cache_size.  The third form sets a spill size that
+   ** may be different form the cache size.
+   ** If N is positive then that is the
+@@ -132928,7 +138996,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
+ #endif
+ 
+       if( sqlite3GetBoolean(zRight, 0) ){
+-        db->flags |= mask;
++        if( (mask & SQLITE_WriteSchema)==0
++         || (db->flags & SQLITE_Defensive)==0
++        ){
++          db->flags |= mask;
++        }
+       }else{
+         db->flags &= ~mask;
+         if( mask==SQLITE_DeferFKs ) db->nDeferredImmCons = 0;
+@@ -133328,7 +139400,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+       zDb = db->aDb[iDb].zDbSName;
+       sqlite3CodeVerifySchema(pParse, iDb);
+       sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
+-      if( pTab->nCol+regRow>pParse->nMem ) pParse->nMem = pTab->nCol + regRow;
++      sqlite3TouchRegister(pParse, pTab->nCol+regRow);
+       sqlite3OpenTable(pParse, 0, iDb, pTab, OP_OpenRead);
+       sqlite3VdbeLoadString(v, regResult, pTab->zName);
+       assert( IsOrdinaryTable(pTab) );
+@@ -133369,7 +139441,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+         ** regRow..regRow+n. If any of the child key values are NULL, this
+         ** row cannot cause an FK violation. Jump directly to addrOk in
+         ** this case. */
+-        if( regRow+pFK->nCol>pParse->nMem ) pParse->nMem = regRow+pFK->nCol;
++        sqlite3TouchRegister(pParse, regRow + pFK->nCol);
+         for(j=0; jnCol; j++){
+           int iCol = aiCols ? aiCols[j] : pFK->aCol[j].iFrom;
+           sqlite3ExprCodeGetColumnOfTable(v, pTab, 0, iCol, regRow+j);
+@@ -133436,9 +139508,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
+   ** The "quick_check" is reduced version of
+   ** integrity_check designed to detect most database corruption
+   ** without the overhead of cross-checking indexes.  Quick_check
+-  ** is linear time wherease integrity_check is O(NlogN).
++  ** is linear time whereas integrity_check is O(NlogN).
+   **
+-  ** The maximum nubmer of errors is 100 by default.  A different default
++  ** The maximum number of errors is 100 by default.  A different default
+   ** can be specified using a numeric parameter N.
+   **
+   ** Or, the parameter N can be the name of a table.  In that case, only
+@@ -133498,6 +139570,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+       if( iDb>=0 && i!=iDb ) continue;
+ 
+       sqlite3CodeVerifySchema(pParse, i);
++      pParse->okConstFactor = 0;  /* tag-20230327-1 */
+ 
+       /* Do an integrity check of the B-Tree
+       **
+@@ -133533,7 +139606,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+       aRoot[0] = cnt;
+ 
+       /* Make sure sufficient number of registers have been allocated */
+-      pParse->nMem = MAX( pParse->nMem, 8+mxIdx );
++      sqlite3TouchRegister(pParse, 8+mxIdx);
+       sqlite3ClearTempRegCache(pParse);
+ 
+       /* Do the b-tree integrity checks */
+@@ -133552,15 +139625,48 @@ SQLITE_PRIVATE void sqlite3Pragma(
+       for(x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
+         Table *pTab = sqliteHashData(x);
+         Index *pIdx, *pPk;
+-        Index *pPrior = 0;
++        Index *pPrior = 0;      /* Previous index */
+         int loopTop;
+         int iDataCur, iIdxCur;
+         int r1 = -1;
+-        int bStrict;
++        int bStrict;            /* True for a STRICT table */
++        int r2;                 /* Previous key for WITHOUT ROWID tables */
++        int mxCol;              /* Maximum non-virtual column number */
+ 
+-        if( !IsOrdinaryTable(pTab) ) continue;
+         if( pObjTab && pObjTab!=pTab ) continue;
+-        pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
++        if( !IsOrdinaryTable(pTab) ){
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++          sqlite3_vtab *pVTab;
++          int a1;
++          if( !IsVirtual(pTab) ) continue;
++          if( pTab->nCol<=0 ){
++            const char *zMod = pTab->u.vtab.azArg[0];
++            if( sqlite3HashFind(&db->aModule, zMod)==0 ) continue;
++          }
++          sqlite3ViewGetColumnNames(pParse, pTab);
++          if( pTab->u.vtab.p==0 ) continue;
++          pVTab = pTab->u.vtab.p->pVtab;
++          if( NEVER(pVTab==0) ) continue;
++          if( NEVER(pVTab->pModule==0) ) continue;
++          if( pVTab->pModule->iVersion<4 ) continue;
++          if( pVTab->pModule->xIntegrity==0 ) continue;
++          sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick);
++          pTab->nTabRef++;
++          sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF);
++          a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v);
++          integrityCheckResultRow(v);
++          sqlite3VdbeJumpHere(v, a1);
++#endif
++          continue;
++        }
++        if( isQuick || HasRowid(pTab) ){
++          pPk = 0;
++          r2 = 0;
++        }else{
++          pPk = sqlite3PrimaryKeyIndex(pTab);
++          r2 = sqlite3GetTempRange(pParse, pPk->nKeyCol);
++          sqlite3VdbeAddOp3(v, OP_Null, 1, r2, r2+pPk->nKeyCol-1);
++        }
+         sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenRead, 0,
+                                    1, 0, &iDataCur, &iIdxCur);
+         /* reg[7] counts the number of entries in the table.
+@@ -133574,52 +139680,180 @@ SQLITE_PRIVATE void sqlite3Pragma(
+         assert( sqlite3NoTempsInRange(pParse,1,7+j) );
+         sqlite3VdbeAddOp2(v, OP_Rewind, iDataCur, 0); VdbeCoverage(v);
+         loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
++
++        /* Fetch the right-most column from the table.  This will cause
++        ** the entire record header to be parsed and sanity checked.  It
++        ** will also prepopulate the cursor column cache that is used
++        ** by the OP_IsType code, so it is a required step.
++        */
++        assert( !IsVirtual(pTab) );
++        if( HasRowid(pTab) ){
++          mxCol = -1;
++          for(j=0; jnCol; j++){
++            if( (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)==0 ) mxCol++;
++          }
++          if( mxCol==pTab->iPKey ) mxCol--;
++        }else{
++          /* COLFLAG_VIRTUAL columns are not included in the WITHOUT ROWID
++          ** PK index column-count, so there is no need to account for them
++          ** in this case. */
++          mxCol = sqlite3PrimaryKeyIndex(pTab)->nColumn-1;
++        }
++        if( mxCol>=0 ){
++          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, mxCol, 3);
++          sqlite3VdbeTypeofColumn(v, 3);
++        }
++
+         if( !isQuick ){
+-          /* Sanity check on record header decoding */
+-          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nNVCol-1,3);
+-          sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
+-          VdbeComment((v, "(right-most column)"));
++          if( pPk ){
++            /* Verify WITHOUT ROWID keys are in ascending order */
++            int a1;
++            char *zErr;
++            a1 = sqlite3VdbeAddOp4Int(v, OP_IdxGT, iDataCur, 0,r2,pPk->nKeyCol);
++            VdbeCoverage(v);
++            sqlite3VdbeAddOp1(v, OP_IsNull, r2); VdbeCoverage(v);
++            zErr = sqlite3MPrintf(db,
++                   "row not in PRIMARY KEY order for %s",
++                    pTab->zName);
++            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
++            integrityCheckResultRow(v);
++            sqlite3VdbeJumpHere(v, a1);
++            sqlite3VdbeJumpHere(v, a1+1);
++            for(j=0; jnKeyCol; j++){
++              sqlite3ExprCodeLoadIndexColumn(pParse, pPk, iDataCur, j, r2+j);
++            }
++          }
+         }
+-        /* Verify that all NOT NULL columns really are NOT NULL.  At the
+-        ** same time verify the type of the content of STRICT tables */
++        /* Verify datatypes for all columns:
++        **
++        **   (1) NOT NULL columns may not contain a NULL
++        **   (2) Datatype must be exact for non-ANY columns in STRICT tables
++        **   (3) Datatype for TEXT columns in non-STRICT tables must be
++        **       NULL, TEXT, or BLOB.
++        **   (4) Datatype for numeric columns in non-STRICT tables must not
++        **       be a TEXT value that can be losslessly converted to numeric.
++        */
+         bStrict = (pTab->tabFlags & TF_Strict)!=0;
+         for(j=0; jnCol; j++){
+           char *zErr;
+-          Column *pCol = pTab->aCol + j;
+-          int doError, jmp2;
++          Column *pCol = pTab->aCol + j;  /* The column to be checked */
++          int labelError;               /* Jump here to report an error */
++          int labelOk;                  /* Jump here if all looks ok */
++          int p1, p3, p4;               /* Operands to the OP_IsType opcode */
++          int doTypeCheck;              /* Check datatypes (besides NOT NULL) */
++
+           if( j==pTab->iPKey ) continue;
+-          if( pCol->notNull==0 && !bStrict ) continue;
+-          doError = bStrict ? sqlite3VdbeMakeLabel(pParse) : 0;
+-          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
+-          if( sqlite3VdbeGetOp(v,-1)->opcode==OP_Column ){
+-            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
++          if( bStrict ){
++            doTypeCheck = pCol->eCType>COLTYPE_ANY;
++          }else{
++            doTypeCheck = pCol->affinity>SQLITE_AFF_BLOB;
+           }
++          if( pCol->notNull==0 && !doTypeCheck ) continue;
++
++          /* Compute the operands that will be needed for OP_IsType */
++          p4 = SQLITE_NULL;
++          if( pCol->colFlags & COLFLAG_VIRTUAL ){
++            sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
++            p1 = -1;
++            p3 = 3;
++          }else{
++            if( pCol->iDflt ){
++              sqlite3_value *pDfltValue = 0;
++              sqlite3ValueFromExpr(db, sqlite3ColumnExpr(pTab,pCol), ENC(db),
++                                   pCol->affinity, &pDfltValue);
++              if( pDfltValue ){
++                p4 = sqlite3_value_type(pDfltValue);
++                sqlite3ValueFree(pDfltValue);
++              }
++            }
++            p1 = iDataCur;
++            if( !HasRowid(pTab) ){
++              testcase( j!=sqlite3TableColumnToStorage(pTab, j) );
++              p3 = sqlite3TableColumnToIndex(sqlite3PrimaryKeyIndex(pTab), j);
++            }else{
++              p3 = sqlite3TableColumnToStorage(pTab,j);
++              testcase( p3!=j);
++            }
++          }
++
++          labelError = sqlite3VdbeMakeLabel(pParse);
++          labelOk = sqlite3VdbeMakeLabel(pParse);
+           if( pCol->notNull ){
+-            jmp2 = sqlite3VdbeAddOp1(v, OP_NotNull, 3); VdbeCoverage(v);
++            /* (1) NOT NULL columns may not contain a NULL */
++            int jmp3;
++            int jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
++            VdbeCoverage(v);
++            if( p1<0 ){
++              sqlite3VdbeChangeP5(v, 0x0f); /* INT, REAL, TEXT, or BLOB */
++              jmp3 = jmp2;
++            }else{
++              sqlite3VdbeChangeP5(v, 0x0d); /* INT, TEXT, or BLOB */
++              /* OP_IsType does not detect NaN values in the database file
++              ** which should be treated as a NULL.  So if the header type
++              ** is REAL, we have to load the actual data using OP_Column
++              ** to reliably determine if the value is a NULL. */
++              sqlite3VdbeAddOp3(v, OP_Column, p1, p3, 3);
++              jmp3 = sqlite3VdbeAddOp2(v, OP_NotNull, 3, labelOk);
++              VdbeCoverage(v);
++            }
+             zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
+                                 pCol->zCnName);
+             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+-            if( bStrict && pCol->eCType!=COLTYPE_ANY ){
+-              sqlite3VdbeGoto(v, doError);
++            if( doTypeCheck ){
++              sqlite3VdbeGoto(v, labelError);
++              sqlite3VdbeJumpHere(v, jmp2);
++              sqlite3VdbeJumpHere(v, jmp3);
+             }else{
+-              integrityCheckResultRow(v);
++              /* VDBE byte code will fall thru */
+             }
+-            sqlite3VdbeJumpHere(v, jmp2);
+           }
+-          if( (pTab->tabFlags & TF_Strict)!=0
+-           && pCol->eCType!=COLTYPE_ANY
+-          ){
+-            jmp2 = sqlite3VdbeAddOp3(v, OP_IsNullOrType, 3, 0,
+-                                     sqlite3StdTypeMap[pCol->eCType-1]);
++          if( bStrict && doTypeCheck ){
++            /* (2) Datatype must be exact for non-ANY columns in STRICT tables*/
++            static unsigned char aStdTypeMask[] = {
++               0x1f,    /* ANY */
++               0x18,    /* BLOB */
++               0x11,    /* INT */
++               0x11,    /* INTEGER */
++               0x13,    /* REAL */
++               0x14     /* TEXT */
++            };
++            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
++            assert( pCol->eCType>=1 && pCol->eCType<=sizeof(aStdTypeMask) );
++            sqlite3VdbeChangeP5(v, aStdTypeMask[pCol->eCType-1]);
+             VdbeCoverage(v);
+             zErr = sqlite3MPrintf(db, "non-%s value in %s.%s",
+                                   sqlite3StdType[pCol->eCType-1],
+                                   pTab->zName, pTab->aCol[j].zCnName);
+             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+-            sqlite3VdbeResolveLabel(v, doError);
+-            integrityCheckResultRow(v);
+-            sqlite3VdbeJumpHere(v, jmp2);
++          }else if( !bStrict && pCol->affinity==SQLITE_AFF_TEXT ){
++            /* (3) Datatype for TEXT columns in non-STRICT tables must be
++            **     NULL, TEXT, or BLOB. */
++            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
++            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
++            VdbeCoverage(v);
++            zErr = sqlite3MPrintf(db, "NUMERIC value in %s.%s",
++                                  pTab->zName, pTab->aCol[j].zCnName);
++            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
++          }else if( !bStrict && pCol->affinity>=SQLITE_AFF_NUMERIC ){
++            /* (4) Datatype for numeric columns in non-STRICT tables must not
++            **     be a TEXT value that can be converted to numeric. */
++            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
++            sqlite3VdbeChangeP5(v, 0x1b); /* NULL, INT, FLOAT, or BLOB */
++            VdbeCoverage(v);
++            if( p1>=0 ){
++              sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
++            }
++            sqlite3VdbeAddOp4(v, OP_Affinity, 3, 1, 0, "C", P4_STATIC);
++            sqlite3VdbeAddOp4Int(v, OP_IsType, -1, labelOk, 3, p4);
++            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
++            VdbeCoverage(v);
++            zErr = sqlite3MPrintf(db, "TEXT value in %s.%s",
++                                  pTab->zName, pTab->aCol[j].zCnName);
++            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+           }
++          sqlite3VdbeResolveLabel(v, labelError);
++          integrityCheckResultRow(v);
++          sqlite3VdbeResolveLabel(v, labelOk);
+         }
+         /* Verify CHECK constraints */
+         if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){
+@@ -133648,7 +139882,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
+         if( !isQuick ){ /* Omit the remaining tests for quick_check */
+           /* Validate index entries for the current row */
+           for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+-            int jmp2, jmp3, jmp4, jmp5;
++            int jmp2, jmp3, jmp4, jmp5, label6;
++            int kk;
+             int ckUniq = sqlite3VdbeMakeLabel(pParse);
+             if( pPk==pIdx ) continue;
+             r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
+@@ -133666,13 +139901,49 @@ SQLITE_PRIVATE void sqlite3Pragma(
+             sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
+             jmp4 = integrityCheckResultRow(v);
+             sqlite3VdbeJumpHere(v, jmp2);
++
++            /* The OP_IdxRowid opcode is an optimized version of OP_Column
++            ** that extracts the rowid off the end of the index record.
++            ** But it only works correctly if index record does not have
++            ** any extra bytes at the end.  Verify that this is the case. */
++            if( HasRowid(pTab) ){
++              int jmp7;
++              sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur+j, 3);
++              jmp7 = sqlite3VdbeAddOp3(v, OP_Eq, 3, 0, r1+pIdx->nColumn-1);
++              VdbeCoverageNeverNull(v);
++              sqlite3VdbeLoadString(v, 3,
++                 "rowid not at end-of-record for row ");
++              sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
++              sqlite3VdbeLoadString(v, 4, " of index ");
++              sqlite3VdbeGoto(v, jmp5-1);
++              sqlite3VdbeJumpHere(v, jmp7);
++            }
++
++            /* Any indexed columns with non-BINARY collations must still hold
++            ** the exact same text value as the table. */
++            label6 = 0;
++            for(kk=0; kknKeyCol; kk++){
++              if( pIdx->azColl[kk]==sqlite3StrBINARY ) continue;
++              if( label6==0 ) label6 = sqlite3VdbeMakeLabel(pParse);
++              sqlite3VdbeAddOp3(v, OP_Column, iIdxCur+j, kk, 3);
++              sqlite3VdbeAddOp3(v, OP_Ne, 3, label6, r1+kk); VdbeCoverage(v);
++            }
++            if( label6 ){
++              int jmp6 = sqlite3VdbeAddOp0(v, OP_Goto);
++              sqlite3VdbeResolveLabel(v, label6);
++              sqlite3VdbeLoadString(v, 3, "row ");
++              sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
++              sqlite3VdbeLoadString(v, 4, " values differ from index ");
++              sqlite3VdbeGoto(v, jmp5-1);
++              sqlite3VdbeJumpHere(v, jmp6);
++            }
++
+             /* For UNIQUE indexes, verify that only one entry exists with the
+             ** current key.  The entry is unique if (1) any column is NULL
+             ** or (2) the next entry has a different key */
+             if( IsUniqueIndex(pIdx) ){
+               int uniqOk = sqlite3VdbeMakeLabel(pParse);
+               int jmp6;
+-              int kk;
+               for(kk=0; kknKeyCol; kk++){
+                 int iCol = pIdx->aiColumn[kk];
+                 assert( iCol!=XN_ROWID && iColnCol );
+@@ -133707,6 +139978,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
+             integrityCheckResultRow(v);
+             sqlite3VdbeJumpHere(v, addr);
+           }
++          if( pPk ){
++            sqlite3ReleaseTempRange(pParse, r2, pPk->nKeyCol);
++          }
+         }
+       }
+     }
+@@ -133857,6 +140131,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
+       aOp[1].p2 = iCookie;
+       aOp[1].p3 = sqlite3Atoi(zRight);
+       aOp[1].p5 = 1;
++      if( iCookie==BTREE_SCHEMA_VERSION && (db->flags & SQLITE_Defensive)!=0 ){
++        /* Do not allow the use of PRAGMA schema_version=VALUE in defensive
++        ** mode.  Change the OP_SetCookie opcode into a no-op.  */
++        aOp[1].opcode = OP_Noop;
++      }
+     }else{
+       /* Read the specified cookie value */
+       static const VdbeOpList readCookie[] = {
+@@ -134013,7 +140292,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
+     Schema *pSchema;       /* The current schema */
+     Table *pTab;           /* A table in the schema */
+     Index *pIdx;           /* An index of the table */
+-    LogEst szThreshold;    /* Size threshold above which reanalysis is needd */
++    LogEst szThreshold;    /* Size threshold above which reanalysis needed */
+     char *zSubSql;         /* SQL statement for the OP_SqlExec opcode */
+     u32 opMask;            /* Mask of operations to perform */
+ 
+@@ -134505,7 +140784,8 @@ static const sqlite3_module pragmaVtabModule = {
+   0,                           /* xSavepoint */
+   0,                           /* xRelease */
+   0,                           /* xRollbackTo */
+-  0                            /* xShadowName */
++  0,                           /* xShadowName */
++  0                            /* xIntegrity */
+ };
+ 
+ /*
+@@ -134837,7 +141117,14 @@ SQLITE_PRIVATE int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg, u32 mFl
+ #else
+       encoding = SQLITE_UTF8;
+ #endif
+-      sqlite3SetTextEncoding(db, encoding);
++      if( db->nVdbeActive>0 && encoding!=ENC(db)
++       && (db->mDbFlags & DBFLAG_Vacuum)==0
++      ){
++        rc = SQLITE_LOCKED;
++        goto initone_error_out;
++      }else{
++        sqlite3SetTextEncoding(db, encoding);
++      }
+     }else{
+       /* If opening an attached database, the encoding much match ENC(db) */
+       if( (meta[BTREE_TEXT_ENCODING-1] & 3)!=ENC(db) ){
+@@ -135051,8 +141338,8 @@ static void schemaIsValid(Parse *pParse){
+     sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&cookie);
+     assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
+     if( cookie!=db->aDb[iDb].pSchema->schema_cookie ){
++      if( DbHasProperty(db, iDb, DB_SchemaLoaded) ) pParse->rc = SQLITE_SCHEMA;
+       sqlite3ResetOneSchema(db, iDb);
+-      pParse->rc = SQLITE_SCHEMA;
+     }
+ 
+     /* Close the transaction, if one was opened. */
+@@ -135105,15 +141392,15 @@ SQLITE_PRIVATE void sqlite3ParseObjectReset(Parse *pParse){
+   assert( db->pParse==pParse );
+   assert( pParse->nested==0 );
+ #ifndef SQLITE_OMIT_SHARED_CACHE
+-  sqlite3DbFree(db, pParse->aTableLock);
++  if( pParse->aTableLock ) sqlite3DbNNFreeNN(db, pParse->aTableLock);
+ #endif
+   while( pParse->pCleanup ){
+     ParseCleanup *pCleanup = pParse->pCleanup;
+     pParse->pCleanup = pCleanup->pNext;
+     pCleanup->xCleanup(db, pCleanup->pPtr);
+-    sqlite3DbFreeNN(db, pCleanup);
++    sqlite3DbNNFreeNN(db, pCleanup);
+   }
+-  sqlite3DbFree(db, pParse->aLabel);
++  if( pParse->aLabel ) sqlite3DbNNFreeNN(db, pParse->aLabel);
+   if( pParse->pConstExpr ){
+     sqlite3ExprListDelete(db, pParse->pConstExpr);
+   }
+@@ -135122,8 +141409,6 @@ SQLITE_PRIVATE void sqlite3ParseObjectReset(Parse *pParse){
+   db->lookaside.sz = db->lookaside.bDisable ? 0 : db->lookaside.szTrue;
+   assert( pParse->db->pParse==pParse );
+   db->pParse = pParse->pOuterParse;
+-  pParse->db = 0;
+-  pParse->disableLookaside = 0;
+ }
+ 
+ /*
+@@ -135132,7 +141417,7 @@ SQLITE_PRIVATE void sqlite3ParseObjectReset(Parse *pParse){
+ ** immediately.
+ **
+ ** Use this mechanism for uncommon cleanups.  There is a higher setup
+-** cost for this mechansim (an extra malloc), so it should not be used
++** cost for this mechanism (an extra malloc), so it should not be used
+ ** for common cleanups that happen on most calls.  But for less
+ ** common cleanups, we save a single NULL-pointer comparison in
+ ** sqlite3ParseObjectReset(), which reduces the total CPU cycle count.
+@@ -135224,9 +141509,18 @@ static int sqlite3Prepare(
+   sParse.pOuterParse = db->pParse;
+   db->pParse = &sParse;
+   sParse.db = db;
+-  sParse.pReprepare = pReprepare;
++  if( pReprepare ){
++    sParse.pReprepare = pReprepare;
++    sParse.explain = sqlite3_stmt_isexplain((sqlite3_stmt*)pReprepare);
++  }else{
++    assert( sParse.pReprepare==0 );
++  }
+   assert( ppStmt && *ppStmt==0 );
+-  if( db->mallocFailed ) sqlite3ErrorMsg(&sParse, "out of memory");
++  if( db->mallocFailed ){
++    sqlite3ErrorMsg(&sParse, "out of memory");
++    db->errCode = rc = SQLITE_NOMEM;
++    goto end_prepare;
++  }
+   assert( sqlite3_mutex_held(db->mutex) );
+ 
+   /* For a long-term use prepared statement avoid the use of
+@@ -135236,7 +141530,7 @@ static int sqlite3Prepare(
+     sParse.disableLookaside++;
+     DisableLookaside;
+   }
+-  sParse.disableVtab = (prepFlags & SQLITE_PREPARE_NO_VTAB)!=0;
++  sParse.prepFlags = prepFlags & 0xff;
+ 
+   /* Check to verify that it is possible to get a read lock on all
+   ** database schemas.  The inability to get a read lock indicates that
+@@ -135277,7 +141571,9 @@ static int sqlite3Prepare(
+     }
+   }
+ 
+-  sqlite3VtabUnlockList(db);
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++  if( db->pDisconnect ) sqlite3VtabUnlockList(db);
++#endif
+ 
+   if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
+     char *zSqlCopy;
+@@ -135383,6 +141679,7 @@ static int sqlite3LockAndPrepare(
+   assert( (rc&db->errMask)==rc );
+   db->busyHandler.nBusy = 0;
+   sqlite3_mutex_leave(db->mutex);
++  assert( rc==SQLITE_OK || (*ppStmt)==0 );
+   return rc;
+ }
+ 
+@@ -135661,6 +141958,10 @@ struct SortCtx {
+   } aDefer[4];
+ #endif
+   struct RowLoadInfo *pDeferredRowLoad;  /* Deferred row loading info or NULL */
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  int addrPush;         /* First instruction to push data into sorter */
++  int addrPushEnd;      /* Last instruction that pushes data into sorter */
++#endif
+ };
+ #define SORTFLAG_UseSorter  0x01   /* Use SorterOpen instead of OpenEphemeral */
+ 
+@@ -135672,6 +141973,7 @@ struct SortCtx {
+ ** If bFree==0, Leave the first Select object unfreed
+ */
+ static void clearSelect(sqlite3 *db, Select *p, int bFree){
++  assert( db!=0 );
+   while( p ){
+     Select *pPrior = p->pPrior;
+     sqlite3ExprListDelete(db, p->pEList);
+@@ -135691,7 +141993,7 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
+       sqlite3WindowUnlinkFromSelect(p->pWin);
+     }
+ #endif
+-    if( bFree ) sqlite3DbFreeNN(db, p);
++    if( bFree ) sqlite3DbNNFreeNN(db, p);
+     p = pPrior;
+     bFree = 1;
+   }
+@@ -135775,6 +142077,9 @@ SQLITE_PRIVATE Select *sqlite3SelectNew(
+ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){
+   if( OK_IF_ALWAYS_TRUE(p) ) clearSelect(db, p, 1);
+ }
++SQLITE_PRIVATE void sqlite3SelectDeleteGeneric(sqlite3 *db, void *p){
++  if( ALWAYS(p) ) clearSelect(db, (Select*)p, 1);
++}
+ 
+ /*
+ ** Return a pointer to the right-most SELECT statement in a compound.
+@@ -135823,7 +142128,7 @@ static Select *findRightmost(Select *p){
+ **     NATURAL  FULL     OUTER               JT_NATRUAL|JT_LEFT|JT_RIGHT
+ **
+ ** To preserve historical compatibly, SQLite also accepts a variety
+-** of other non-standard and in many cases non-sensical join types.
++** of other non-standard and in many cases nonsensical join types.
+ ** This routine makes as much sense at it can from the nonsense join
+ ** type and returns a result.  Examples of accepted nonsense join types
+ ** include but are not limited to:
+@@ -136045,6 +142350,7 @@ static void unsetJoinExpr(Expr *p, int iTable, int nullable){
+     }
+     if( p->op==TK_FUNCTION ){
+       assert( ExprUseXList(p) );
++      assert( p->pLeft==0 );
+       if( p->x.pList ){
+         int i;
+         for(i=0; ix.pList->nExpr; i++){
+@@ -136094,7 +142400,7 @@ static int sqlite3ProcessJoin(Parse *pParse, Select *p){
+     if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue;
+     joinType = (pRight->fg.jointype & JT_OUTER)!=0 ? EP_OuterON : EP_InnerON;
+ 
+-    /* If this is a NATURAL join, synthesize an approprate USING clause
++    /* If this is a NATURAL join, synthesize an appropriate USING clause
+     ** to specify which columns should be joined.
+     */
+     if( pRight->fg.jointype & JT_NATURAL ){
+@@ -136308,14 +142614,18 @@ static void pushOntoSorter(
+   **   (2) All output columns are included in the sort record.  In that
+   **       case regData==regOrigData.
+   **   (3) Some output columns are omitted from the sort record due to
+-  **       the SQLITE_ENABLE_SORTER_REFERENCE optimization, or due to the
++  **       the SQLITE_ENABLE_SORTER_REFERENCES optimization, or due to the
+   **       SQLITE_ECEL_OMITREF optimization, or due to the
+-  **       SortCtx.pDeferredRowLoad optimiation.  In any of these cases
++  **       SortCtx.pDeferredRowLoad optimization.  In any of these cases
+   **       regOrigData is 0 to prevent this routine from trying to copy
+   **       values that might not yet exist.
+   */
+   assert( nData==1 || regData==regOrigData || regOrigData==0 );
+ 
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  pSort->addrPush = sqlite3VdbeCurrentAddr(v);
++#endif
++
+   if( nPrefixReg ){
+     assert( nPrefixReg==nExpr+bSeq );
+     regBase = regData - nPrefixReg;
+@@ -136362,7 +142672,7 @@ static void pushOntoSorter(
+     testcase( pKI->nAllField > pKI->nKeyField+2 );
+     pOp->p4.pKeyInfo = sqlite3KeyInfoFromExprList(pParse,pSort->pOrderBy,nOBSat,
+                                            pKI->nAllField-pKI->nKeyField-1);
+-    pOp = 0; /* Ensure pOp not used after sqltie3VdbeAddOp3() */
++    pOp = 0; /* Ensure pOp not used after sqlite3VdbeAddOp3() */
+     addrJmp = sqlite3VdbeCurrentAddr(v);
+     sqlite3VdbeAddOp3(v, OP_Jump, addrJmp+1, 0, addrJmp+1); VdbeCoverage(v);
+     pSort->labelBkOut = sqlite3VdbeMakeLabel(pParse);
+@@ -136416,6 +142726,9 @@ static void pushOntoSorter(
+     sqlite3VdbeChangeP2(v, iSkip,
+          pSort->labelOBLopt ? pSort->labelOBLopt : sqlite3VdbeCurrentAddr(v));
+   }
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  pSort->addrPushEnd = sqlite3VdbeCurrentAddr(v)-1;
++#endif
+ }
+ 
+ /*
+@@ -136453,7 +142766,7 @@ static void codeOffset(
+ **     The returned value in this case is a copy of parameter iTab.
+ **
+ **   WHERE_DISTINCT_ORDERED:
+-**     In this case rows are being delivered sorted order. The ephermal
++**     In this case rows are being delivered sorted order. The ephemeral
+ **     table is not required. Instead, the current set of values
+ **     is compared against previous row. If they match, the new row
+ **     is not distinct and control jumps to VM address addrRepeat. Otherwise,
+@@ -136882,6 +143195,16 @@ static void selectInnerLoop(
+       testcase( eDest==SRT_Fifo );
+       testcase( eDest==SRT_DistFifo );
+       sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg);
++#if !defined(SQLITE_ENABLE_NULL_TRIM) && defined(SQLITE_DEBUG)
++      /* A destination of SRT_Table and a non-zero iSDParm2 parameter means
++      ** that this is an "UPDATE ... FROM" on a virtual table or view. In this
++      ** case set the p5 parameter of the OP_MakeRecord to OPFLAG_NOCHNG_MAGIC.
++      ** This does not affect operation in any way - it just allows MakeRecord
++      ** to process OPFLAG_NOCHANGE values without an assert() failing. */
++      if( eDest==SRT_Table && pDest->iSDParm2 ){
++        sqlite3VdbeChangeP5(v, OPFLAG_NOCHNG_MAGIC);
++      }
++#endif
+ #ifndef SQLITE_OMIT_CTE
+       if( eDest==SRT_DistFifo ){
+         /* If the destination is DistFifo, then cursor (iParm+1) is open
+@@ -137097,9 +143420,10 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){
+ */
+ SQLITE_PRIVATE void sqlite3KeyInfoUnref(KeyInfo *p){
+   if( p ){
++    assert( p->db!=0 );
+     assert( p->nRef>0 );
+     p->nRef--;
+-    if( p->nRef==0 ) sqlite3DbFreeNN(p->db, p);
++    if( p->nRef==0 ) sqlite3DbNNFreeNN(p->db, p);
+   }
+ }
+ 
+@@ -137238,6 +143562,16 @@ static void generateSortTail(
+   int bSeq;                       /* True if sorter record includes seq. no. */
+   int nRefKey = 0;
+   struct ExprList_item *aOutEx = p->pEList->a;
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  int addrExplain;                /* Address of OP_Explain instruction */
++#endif
++
++  ExplainQueryPlan2(addrExplain, (pParse, 0,
++        "USE TEMP B-TREE FOR %sORDER BY", pSort->nOBSat>0?"RIGHT PART OF ":"")
++  );
++  sqlite3VdbeScanStatusRange(v, addrExplain,pSort->addrPush,pSort->addrPushEnd);
++  sqlite3VdbeScanStatusCounters(v, addrExplain, addrExplain, pSort->addrPush);
++
+ 
+   assert( addrBreak<0 );
+   if( pSort->labelBkOut ){
+@@ -137350,6 +143684,7 @@ static void generateSortTail(
+       VdbeComment((v, "%s", aOutEx[i].zEName));
+     }
+   }
++  sqlite3VdbeScanStatusRange(v, addrExplain, addrExplain, -1);
+   switch( eDest ){
+     case SRT_Table:
+     case SRT_EphemTab: {
+@@ -137411,6 +143746,7 @@ static void generateSortTail(
+   }else{
+     sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); VdbeCoverage(v);
+   }
++  sqlite3VdbeScanStatusRange(v, addrExplain, sqlite3VdbeCurrentAddr(v)-1, -1);
+   if( pSort->regReturn ) sqlite3VdbeAddOp1(v, OP_Return, pSort->regReturn);
+   sqlite3VdbeResolveLabel(v, addrBreak);
+ }
+@@ -137419,9 +143755,6 @@ static void generateSortTail(
+ ** Return a pointer to a string containing the 'declaration type' of the
+ ** expression pExpr. The string may be treated as static by the caller.
+ **
+-** Also try to estimate the size of the returned value and return that
+-** result in *pEstWidth.
+-**
+ ** The declaration type is the exact datatype definition extracted from the
+ ** original CREATE TABLE statement if the expression is a column. The
+ ** declaration type for a ROWID field is INTEGER. Exactly when an expression
+@@ -137675,17 +144008,10 @@ SQLITE_PRIVATE void sqlite3GenerateColumnNames(
+   int fullName;    /* TABLE.COLUMN if no AS clause and is a direct table ref */
+   int srcName;     /* COLUMN or TABLE.COLUMN if no AS clause and is direct */
+ 
+-#ifndef SQLITE_OMIT_EXPLAIN
+-  /* If this is an EXPLAIN, skip this step */
+-  if( pParse->explain ){
+-    return;
+-  }
+-#endif
+-
+   if( pParse->colNamesSet ) return;
+   /* Column names are determined by the left-most term of a compound select */
+   while( pSelect->pPrior ) pSelect = pSelect->pPrior;
+-  SELECTTRACE(1,pParse,pSelect,("generating column names\n"));
++  TREETRACE(0x80,pParse,pSelect,("generating column names\n"));
+   pTabList = pSelect->pSrc;
+   pEList = pSelect->pEList;
+   assert( v!=0 );
+@@ -137785,7 +144111,7 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(
+   *pnCol = nCol;
+   *paCol = aCol;
+ 
+-  for(i=0, pCol=aCol; imallocFailed; i++, pCol++){
++  for(i=0, pCol=aCol; inErr; i++, pCol++){
+     struct ExprList_item *pX = &pEList->a[i];
+     struct ExprList_item *pCollide;
+     /* Get an appropriate name for the column
+@@ -137835,7 +144161,10 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(
+         if( zName[j]==':' ) nName = j;
+       }
+       zName = sqlite3MPrintf(db, "%.*z:%u", nName, zName, ++cnt);
+-      if( cnt>3 ) sqlite3_randomness(sizeof(cnt), &cnt);
++      sqlite3ProgressCheck(pParse);
++      if( cnt>3 ){
++        sqlite3_randomness(sizeof(cnt), &cnt);
++      }
+     }
+     pCol->zCnName = zName;
+     pCol->hName = sqlite3StrIHash(zName);
+@@ -137848,71 +144177,105 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(
+     }
+   }
+   sqlite3HashClear(&ht);
+-  if( db->mallocFailed ){
++  if( pParse->nErr ){
+     for(j=0; jrc;
+   }
+   return SQLITE_OK;
+ }
+ 
+ /*
+-** Add type and collation information to a column list based on
+-** a SELECT statement.
+-**
+-** The column list presumably came from selectColumnNamesFromExprList().
+-** The column list has only names, not types or collations.  This
+-** routine goes through and adds the types and collations.
++** pTab is a transient Table object that represents a subquery of some
++** kind (maybe a parenthesized subquery in the FROM clause of a larger
++** query, or a VIEW, or a CTE).  This routine computes type information
++** for that Table object based on the Select object that implements the
++** subquery.  For the purposes of this routine, "type information" means:
+ **
+-** This routine requires that all identifiers in the SELECT
+-** statement be resolved.
++**    *   The datatype name, as it might appear in a CREATE TABLE statement
++**    *   Which collating sequence to use for the column
++**    *   The affinity of the column
+ */
+-SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(
+-  Parse *pParse,        /* Parsing contexts */
+-  Table *pTab,          /* Add column type information to this table */
+-  Select *pSelect,      /* SELECT used to determine types and collations */
+-  char aff              /* Default affinity for columns */
++SQLITE_PRIVATE void sqlite3SubqueryColumnTypes(
++  Parse *pParse,      /* Parsing contexts */
++  Table *pTab,        /* Add column type information to this table */
++  Select *pSelect,    /* SELECT used to determine types and collations */
++  char aff            /* Default affinity. */
+ ){
+   sqlite3 *db = pParse->db;
+-  NameContext sNC;
+   Column *pCol;
+   CollSeq *pColl;
+-  int i;
++  int i,j;
+   Expr *p;
+   struct ExprList_item *a;
++  NameContext sNC;
+ 
+   assert( pSelect!=0 );
+-  assert( (pSelect->selFlags & SF_Resolved)!=0 );
+-  assert( pTab->nCol==pSelect->pEList->nExpr || db->mallocFailed );
+-  if( db->mallocFailed ) return;
++  testcase( (pSelect->selFlags & SF_Resolved)==0 );
++  assert( (pSelect->selFlags & SF_Resolved)!=0 || IN_RENAME_OBJECT );
++  assert( pTab->nCol==pSelect->pEList->nExpr || pParse->nErr>0 );
++  assert( aff==SQLITE_AFF_NONE || aff==SQLITE_AFF_BLOB );
++  if( db->mallocFailed || IN_RENAME_OBJECT ) return;
++  while( pSelect->pPrior ) pSelect = pSelect->pPrior;
++  a = pSelect->pEList->a;
+   memset(&sNC, 0, sizeof(sNC));
+   sNC.pSrcList = pSelect->pSrc;
+-  a = pSelect->pEList->a;
+   for(i=0, pCol=pTab->aCol; inCol; i++, pCol++){
+     const char *zType;
+-    i64 n, m;
++    i64 n;
+     pTab->tabFlags |= (pCol->colFlags & COLFLAG_NOINSERT);
+     p = a[i].pExpr;
+-    zType = columnType(&sNC, p, 0, 0, 0);
+     /* pCol->szEst = ... // Column size est for SELECT tables never used */
+     pCol->affinity = sqlite3ExprAffinity(p);
++    if( pCol->affinity<=SQLITE_AFF_NONE ){
++      pCol->affinity = aff;
++    }
++    if( pCol->affinity>=SQLITE_AFF_TEXT && pSelect->pNext ){
++      int m = 0;
++      Select *pS2;
++      for(m=0, pS2=pSelect->pNext; pS2; pS2=pS2->pNext){
++        m |= sqlite3ExprDataType(pS2->pEList->a[i].pExpr);
++      }
++      if( pCol->affinity==SQLITE_AFF_TEXT && (m&0x01)!=0 ){
++        pCol->affinity = SQLITE_AFF_BLOB;
++      }else
++      if( pCol->affinity>=SQLITE_AFF_NUMERIC && (m&0x02)!=0 ){
++        pCol->affinity = SQLITE_AFF_BLOB;
++      }
++      if( pCol->affinity>=SQLITE_AFF_NUMERIC && p->op==TK_CAST ){
++        pCol->affinity = SQLITE_AFF_FLEXNUM;
++      }
++    }
++    zType = columnType(&sNC, p, 0, 0, 0);
++    if( zType==0 || pCol->affinity!=sqlite3AffinityType(zType, 0) ){
++      if( pCol->affinity==SQLITE_AFF_NUMERIC
++       || pCol->affinity==SQLITE_AFF_FLEXNUM
++      ){
++        zType = "NUM";
++      }else{
++        zType = 0;
++        for(j=1; jaffinity ){
++            zType = sqlite3StdType[j];
++            break;
++          }
++        }
++      }
++    }
+     if( zType ){
+-      m = sqlite3Strlen30(zType);
++      i64 m = sqlite3Strlen30(zType);
+       n = sqlite3Strlen30(pCol->zCnName);
+       pCol->zCnName = sqlite3DbReallocOrFree(db, pCol->zCnName, n+m+2);
++      pCol->colFlags &= ~(COLFLAG_HASTYPE|COLFLAG_HASCOLL);
+       if( pCol->zCnName ){
+         memcpy(&pCol->zCnName[n+1], zType, m+1);
+         pCol->colFlags |= COLFLAG_HASTYPE;
+-      }else{
+-        testcase( pCol->colFlags & COLFLAG_HASTYPE );
+-        pCol->colFlags &= ~(COLFLAG_HASTYPE|COLFLAG_HASCOLL);
+       }
+     }
+-    if( pCol->affinity<=SQLITE_AFF_NONE ) pCol->affinity = aff;
+     pColl = sqlite3ExprCollSeq(pParse, p);
+     if( pColl ){
+       assert( pTab->pIndex==0 );
+@@ -137946,7 +144309,7 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect, c
+   pTab->zName = 0;
+   pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
+   sqlite3ColumnsFromExprList(pParse, pSelect->pEList, &pTab->nCol, &pTab->aCol);
+-  sqlite3SelectAddColumnTypeAndCollation(pParse, pTab, pSelect, aff);
++  sqlite3SubqueryColumnTypes(pParse, pTab, pSelect, aff);
+   pTab->iPKey = -1;
+   if( db->mallocFailed ){
+     sqlite3DeleteTable(db, pTab);
+@@ -138161,7 +144524,7 @@ static void generateWithRecursiveQuery(
+   int iQueue;                   /* The Queue table */
+   int iDistinct = 0;            /* To ensure unique results if UNION */
+   int eDest = SRT_Fifo;         /* How to write to Queue */
+-  SelectDest destQueue;         /* SelectDest targetting the Queue table */
++  SelectDest destQueue;         /* SelectDest targeting the Queue table */
+   int i;                        /* Loop counter */
+   int rc;                       /* Result code */
+   ExprList *pOrderBy;           /* The ORDER BY clause */
+@@ -138471,7 +144834,7 @@ static int multiSelect(
+         pPrior->iLimit = p->iLimit;
+         pPrior->iOffset = p->iOffset;
+         pPrior->pLimit = p->pLimit;
+-        SELECTTRACE(1, pParse, p, ("multiSelect UNION ALL left...\n"));
++        TREETRACE(0x200, pParse, p, ("multiSelect UNION ALL left...\n"));
+         rc = sqlite3Select(pParse, pPrior, &dest);
+         pPrior->pLimit = 0;
+         if( rc ){
+@@ -138489,7 +144852,7 @@ static int multiSelect(
+           }
+         }
+         ExplainQueryPlan((pParse, 1, "UNION ALL"));
+-        SELECTTRACE(1, pParse, p, ("multiSelect UNION ALL right...\n"));
++        TREETRACE(0x200, pParse, p, ("multiSelect UNION ALL right...\n"));
+         rc = sqlite3Select(pParse, p, &dest);
+         testcase( rc!=SQLITE_OK );
+         pDelete = p->pPrior;
+@@ -138542,7 +144905,7 @@ static int multiSelect(
+         */
+         assert( !pPrior->pOrderBy );
+         sqlite3SelectDestInit(&uniondest, priorOp, unionTab);
+-        SELECTTRACE(1, pParse, p, ("multiSelect EXCEPT/UNION left...\n"));
++        TREETRACE(0x200, pParse, p, ("multiSelect EXCEPT/UNION left...\n"));
+         rc = sqlite3Select(pParse, pPrior, &uniondest);
+         if( rc ){
+           goto multi_select_end;
+@@ -138562,7 +144925,7 @@ static int multiSelect(
+         uniondest.eDest = op;
+         ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
+                           sqlite3SelectOpName(p->op)));
+-        SELECTTRACE(1, pParse, p, ("multiSelect EXCEPT/UNION right...\n"));
++        TREETRACE(0x200, pParse, p, ("multiSelect EXCEPT/UNION right...\n"));
+         rc = sqlite3Select(pParse, p, &uniondest);
+         testcase( rc!=SQLITE_OK );
+         assert( p->pOrderBy==0 );
+@@ -138623,7 +144986,7 @@ static int multiSelect(
+         /* Code the SELECTs to our left into temporary table "tab1".
+         */
+         sqlite3SelectDestInit(&intersectdest, SRT_Union, tab1);
+-        SELECTTRACE(1, pParse, p, ("multiSelect INTERSECT left...\n"));
++        TREETRACE(0x400, pParse, p, ("multiSelect INTERSECT left...\n"));
+         rc = sqlite3Select(pParse, pPrior, &intersectdest);
+         if( rc ){
+           goto multi_select_end;
+@@ -138640,7 +145003,7 @@ static int multiSelect(
+         intersectdest.iSDParm = tab2;
+         ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
+                           sqlite3SelectOpName(p->op)));
+-        SELECTTRACE(1, pParse, p, ("multiSelect INTERSECT right...\n"));
++        TREETRACE(0x400, pParse, p, ("multiSelect INTERSECT right...\n"));
+         rc = sqlite3Select(pParse, p, &intersectdest);
+         testcase( rc!=SQLITE_OK );
+         pDelete = p->pPrior;
+@@ -138737,9 +145100,7 @@ multi_select_end:
+   pDest->iSdst = dest.iSdst;
+   pDest->nSdst = dest.nSdst;
+   if( pDelete ){
+-    sqlite3ParserAddCleanup(pParse,
+-        (void(*)(sqlite3*,void*))sqlite3SelectDelete,
+-        pDelete);
++    sqlite3ParserAddCleanup(pParse, sqlite3SelectDeleteGeneric, pDelete);
+   }
+   return rc;
+ }
+@@ -138761,7 +145122,7 @@ SQLITE_PRIVATE void sqlite3SelectWrongNumTermsError(Parse *pParse, Select *p){
+ 
+ /*
+ ** Code an output subroutine for a coroutine implementation of a
+-** SELECT statment.
++** SELECT statement.
+ **
+ ** The data to be output is contained in pIn->iSdst.  There are
+ ** pIn->nSdst columns to be output.  pDest is where the output should
+@@ -138983,7 +145344,7 @@ static int generateOutputSubroutine(
+ **
+ ** We call AltB, AeqB, AgtB, EofA, and EofB "subroutines" but they are not
+ ** actually called using Gosub and they do not Return.  EofA and EofB loop
+-** until all data is exhausted then jump to the "end" labe.  AltB, AeqB,
++** until all data is exhausted then jump to the "end" label.  AltB, AeqB,
+ ** and AgtB jump to either L2 or to one of EofA or EofB.
+ */
+ #ifndef SQLITE_OMIT_COMPOUND_SELECT
+@@ -139020,7 +145381,7 @@ static int multiSelectOrderBy(
+   int savedOffset;      /* Saved value of p->iOffset */
+   int labelCmpr;        /* Label for the start of the merge algorithm */
+   int labelEnd;         /* Label for the end of the overall SELECT stmt */
+-  int addr1;            /* Jump instructions that get retargetted */
++  int addr1;            /* Jump instructions that get retargeted */
+   int op;               /* One of TK_ALL, TK_UNION, TK_EXCEPT, TK_INTERSECT */
+   KeyInfo *pKeyDup = 0; /* Comparison information for duplicate removal */
+   KeyInfo *pKeyMerge;   /* Comparison information for merging rows */
+@@ -139287,11 +145648,10 @@ static int multiSelectOrderBy(
+   */
+   sqlite3VdbeResolveLabel(v, labelEnd);
+ 
+-  /* Reassemble the compound query so that it will be freed correctly
+-  ** by the calling function */
++  /* Make arrangements to free the 2nd and subsequent arms of the compound
++  ** after the parse has finished */
+   if( pSplit->pPrior ){
+-    sqlite3ParserAddCleanup(pParse,
+-       (void(*)(sqlite3*,void*))sqlite3SelectDelete, pSplit->pPrior);
++    sqlite3ParserAddCleanup(pParse, sqlite3SelectDeleteGeneric, pSplit->pPrior);
+   }
+   pSplit->pPrior = pPrior;
+   pPrior->pNext = pSplit;
+@@ -139321,7 +145681,7 @@ static int multiSelectOrderBy(
+ ** the left operands of a RIGHT JOIN.  In either case, we need to potentially
+ ** bypass the substituted expression with OP_IfNullRow.
+ **
+-** Suppose the original expression integer constant.  Even though the table
++** Suppose the original expression is an integer constant. Even though the table
+ ** has the nullRow flag set, because the expression is an integer constant,
+ ** it will not be NULLed out.  So instead, we insert an OP_IfNullRow opcode
+ ** that checks to see if the nullRow flag is set on the table.  If the nullRow
+@@ -139347,6 +145707,7 @@ typedef struct SubstContext {
+   int iNewTable;            /* New table number */
+   int isOuterJoin;          /* Add TK_IF_NULL_ROW opcodes on each replacement */
+   ExprList *pEList;         /* Replacement expressions */
++  ExprList *pCList;         /* Collation sequences for replacement expr */
+ } SubstContext;
+ 
+ /* Forward Declarations */
+@@ -139388,19 +145749,26 @@ static Expr *substExpr(
+ #endif
+     {
+       Expr *pNew;
+-      Expr *pCopy = pSubst->pEList->a[pExpr->iColumn].pExpr;
++      int iColumn;
++      Expr *pCopy;
+       Expr ifNullRow;
+-      assert( pSubst->pEList!=0 && pExpr->iColumnpEList->nExpr );
++      iColumn = pExpr->iColumn;
++      assert( iColumn>=0 );
++      assert( pSubst->pEList!=0 && iColumnpEList->nExpr );
+       assert( pExpr->pRight==0 );
++      pCopy = pSubst->pEList->a[iColumn].pExpr;
+       if( sqlite3ExprIsVector(pCopy) ){
+         sqlite3VectorErrorMsg(pSubst->pParse, pCopy);
+       }else{
+         sqlite3 *db = pSubst->pParse->db;
+-        if( pSubst->isOuterJoin && pCopy->op!=TK_COLUMN ){
++        if( pSubst->isOuterJoin
++         && (pCopy->op!=TK_COLUMN || pCopy->iTable!=pSubst->iNewTable)
++        ){
+           memset(&ifNullRow, 0, sizeof(ifNullRow));
+           ifNullRow.op = TK_IF_NULL_ROW;
+           ifNullRow.pLeft = pCopy;
+           ifNullRow.iTable = pSubst->iNewTable;
++          ifNullRow.iColumn = -99;
+           ifNullRow.flags = EP_IfNullRow;
+           pCopy = &ifNullRow;
+         }
+@@ -139427,11 +145795,16 @@ static Expr *substExpr(
+ 
+         /* Ensure that the expression now has an implicit collation sequence,
+         ** just as it did when it was a column of a view or sub-query. */
+-        if( pExpr->op!=TK_COLUMN && pExpr->op!=TK_COLLATE ){
+-          CollSeq *pColl = sqlite3ExprCollSeq(pSubst->pParse, pExpr);
+-          pExpr = sqlite3ExprAddCollateString(pSubst->pParse, pExpr,
+-              (pColl ? pColl->zName : "BINARY")
++        {
++          CollSeq *pNat = sqlite3ExprCollSeq(pSubst->pParse, pExpr);
++          CollSeq *pColl = sqlite3ExprCollSeq(pSubst->pParse,
++                pSubst->pCList->a[iColumn].pExpr
+           );
++          if( pNat!=pColl || (pExpr->op!=TK_COLUMN && pExpr->op!=TK_COLLATE) ){
++            pExpr = sqlite3ExprAddCollateString(pSubst->pParse, pExpr,
++                (pColl ? pColl->zName : "BINARY")
++            );
++          }
+         }
+         ExprClearProperty(pExpr, EP_Collate);
+       }
+@@ -139624,6 +145997,46 @@ static void renumberCursors(
+ }
+ #endif /* !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) */
+ 
++/*
++** If pSel is not part of a compound SELECT, return a pointer to its
++** expression list. Otherwise, return a pointer to the expression list
++** of the leftmost SELECT in the compound.
++*/
++static ExprList *findLeftmostExprlist(Select *pSel){
++  while( pSel->pPrior ){
++    pSel = pSel->pPrior;
++  }
++  return pSel->pEList;
++}
++
++/*
++** Return true if any of the result-set columns in the compound query
++** have incompatible affinities on one or more arms of the compound.
++*/
++static int compoundHasDifferentAffinities(Select *p){
++  int ii;
++  ExprList *pList;
++  assert( p!=0 );
++  assert( p->pEList!=0 );
++  assert( p->pPrior!=0 );
++  pList = p->pEList;
++  for(ii=0; iinExpr; ii++){
++    char aff;
++    Select *pSub1;
++    assert( pList->a[ii].pExpr!=0 );
++    aff = sqlite3ExprAffinity(pList->a[ii].pExpr);
++    for(pSub1=p->pPrior; pSub1; pSub1=pSub1->pPrior){
++      assert( pSub1->pEList!=0 );
++      assert( pSub1->pEList->nExpr>ii );
++      assert( pSub1->pEList->a[ii].pExpr!=0 );
++      if( sqlite3ExprAffinity(pSub1->pEList->a[ii].pExpr)!=aff ){
++        return 1;
++      }
++    }
++  }
++  return 0;
++}
++
+ #if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW)
+ /*
+ ** This routine attempts to flatten subqueries as a performance optimization.
+@@ -139668,7 +146081,8 @@ static void renumberCursors(
+ **        (3a) the subquery may not be a join and
+ **        (3b) the FROM clause of the subquery may not contain a virtual
+ **             table and
+-**        (3c) the outer query may not be an aggregate.
++**        (**) Was: "The outer query may not have a GROUP BY." This case
++**             is now managed correctly
+ **        (3d) the outer query may not be DISTINCT.
+ **        See also (26) for restrictions on RIGHT JOIN.
+ **
+@@ -139691,7 +146105,7 @@ static void renumberCursors(
+ **   (9)  If the subquery uses LIMIT then the outer query may not be aggregate.
+ **
+ **  (**)  Restriction (10) was removed from the code on 2005-02-05 but we
+-**        accidently carried the comment forward until 2014-09-15.  Original
++**        accidentally carried the comment forward until 2014-09-15.  Original
+ **        constraint: "If the subquery is aggregate then the outer query
+ **        may not use LIMIT."
+ **
+@@ -139725,6 +146139,8 @@ static void renumberCursors(
+ **        (17g) either the subquery is the first element of the outer
+ **              query or there are no RIGHT or FULL JOINs in any arm
+ **              of the subquery.  (This is a duplicate of condition (27b).)
++**        (17h) The corresponding result set expressions in all arms of the
++**              compound must have the same affinity.
+ **
+ **        The parent and sub-query may contain WHERE clauses. Subject to
+ **        rules (11), (13) and (14), they may also contain ORDER BY,
+@@ -139776,18 +146192,13 @@ static void renumberCursors(
+ **        See also (3) for restrictions on LEFT JOIN.
+ **
+ **  (27)  The subquery may not contain a FULL or RIGHT JOIN unless it
+-**        is the first element of the parent query.  This must be the
+-**        the case if:
+-**        (27a) the subquery is not compound query, and
++**        is the first element of the parent query.  Two subcases:
++**        (27a) the subquery is not a compound query.
+ **        (27b) the subquery is a compound query and the RIGHT JOIN occurs
+ **              in any arm of the compound query.  (See also (17g).)
+ **
+-**  (28)  The subquery is not a MATERIALIZED CTE.
+-**
+-**  (29)  Either the subquery is not the right-hand operand of a join with an
+-**        ON or USING clause nor the right-hand operand of a NATURAL JOIN, or
+-**        the right-most table within the FROM clause of the subquery
+-**        is not part of an outer join.
++**  (28)  The subquery is not a MATERIALIZED CTE.  (This is handled
++**        in the caller before ever reaching this routine.)
+ **
+ **
+ ** In this routine, the "p" parameter is a pointer to the outer query.
+@@ -139880,16 +146291,10 @@ static int flattenSubquery(
+   **
+   ** which is not at all the same thing.
+   **
+-  ** If the subquery is the right operand of a LEFT JOIN, then the outer
+-  ** query cannot be an aggregate. (3c)  This is an artifact of the way
+-  ** aggregates are processed - there is no mechanism to determine if
+-  ** the LEFT JOIN table should be all-NULL.
+-  **
+   ** See also tickets #306, #350, and #3300.
+   */
+   if( (pSubitem->fg.jointype & (JT_OUTER|JT_LTORJ))!=0 ){
+     if( pSubSrc->nSrc>1                        /* (3a) */
+-     || isAgg                                  /* (3c) */
+      || IsVirtual(pSubSrc->a[0].pTab)          /* (3b) */
+      || (p->selFlags & SF_Distinct)!=0         /* (3d) */
+      || (pSubitem->fg.jointype & JT_RIGHT)!=0  /* (26) */
+@@ -139898,52 +146303,14 @@ static int flattenSubquery(
+     }
+     isOuterJoin = 1;
+   }
+-#ifdef SQLITE_EXTRA_IFNULLROW
+-  else if( iFrom>0 && !isAgg ){
+-    /* Setting isOuterJoin to -1 causes OP_IfNullRow opcodes to be generated for
+-    ** every reference to any result column from subquery in a join, even
+-    ** though they are not necessary.  This will stress-test the OP_IfNullRow
+-    ** opcode. */
+-    isOuterJoin = -1;
+-  }
+-#endif
+ 
+   assert( pSubSrc->nSrc>0 );  /* True by restriction (7) */
+   if( iFrom>0 && (pSubSrc->a[0].fg.jointype & JT_LTORJ)!=0 ){
+     return 0;   /* Restriction (27a) */
+   }
+-  if( pSubitem->fg.isCte && pSubitem->u2.pCteUse->eM10d==M10d_Yes ){
+-    return 0;       /* (28) */
+-  }
+ 
+-  /* Restriction (29):
+-  **
+-  ** We do not want two constraints on the same term of the flattened
+-  ** query where one constraint has EP_InnerON and the other is EP_OuterON.
+-  ** To prevent this, one or the other of the following conditions must be
+-  ** false:
+-  **
+-  **   (29a)  The right-most entry in the FROM clause of the subquery
+-  **          must not be part of an outer join.
+-  **
+-  **   (29b)  The subquery itself must not be the right operand of a
+-  **          NATURAL join or a join that as an ON or USING clause.
+-  **
+-  ** These conditions are sufficient to keep an EP_OuterON from being
+-  ** flattened into an EP_InnerON.  Restrictions (3a) and (27a) prevent
+-  ** an EP_InnerON from being flattened into an EP_OuterON.
+-  */
+-  if( pSubSrc->nSrc>=2
+-   && (pSubSrc->a[pSubSrc->nSrc-1].fg.jointype & JT_OUTER)!=0
+-  ){
+-    if( (pSubitem->fg.jointype & JT_NATURAL)!=0
+-     || pSubitem->fg.isUsing
+-     || NEVER(pSubitem->u3.pOn!=0) /* ON clause already shifted into WHERE */
+-     || pSubitem->fg.isOn
+-    ){
+-      return 0;
+-    }
+-  }
++  /* Condition (28) is blocked by the caller */
++  assert( !pSubitem->fg.isCte || pSubitem->u2.pCteUse->eM10d!=M10d_Yes );
+ 
+   /* Restriction (17): If the sub-query is a compound SELECT, then it must
+   ** use only the UNION ALL operator. And none of the simple select queries
+@@ -139951,6 +146318,7 @@ static int flattenSubquery(
+   ** queries.
+   */
+   if( pSub->pPrior ){
++    int ii;
+     if( pSub->pOrderBy ){
+       return 0;  /* Restriction (20) */
+     }
+@@ -139983,7 +146351,6 @@ static int flattenSubquery(
+ 
+     /* Restriction (18). */
+     if( p->pOrderBy ){
+-      int ii;
+       for(ii=0; iipOrderBy->nExpr; ii++){
+         if( p->pOrderBy->a[ii].u.x.iOrderByCol==0 ) return 0;
+       }
+@@ -139992,6 +146359,9 @@ static int flattenSubquery(
+     /* Restriction (23) */
+     if( (p->selFlags & SF_Recursive) ) return 0;
+ 
++    /* Restriction (17h) */
++    if( compoundHasDifferentAffinities(pSub) ) return 0;
++
+     if( pSrc->nSrc>1 ){
+       if( pParse->nSelect>500 ) return 0;
+       if( OptimizationDisabled(db, SQLITE_FlttnUnionAll) ) return 0;
+@@ -140001,7 +146371,7 @@ static int flattenSubquery(
+   }
+ 
+   /***** If we reach this point, flattening is permitted. *****/
+-  SELECTTRACE(1,pParse,p,("flatten %u.%p from term %d\n",
++  TREETRACE(0x4,pParse,p,("flatten %u.%p from term %d\n",
+                    pSub->selId, pSub, iFrom));
+ 
+   /* Authorize the subquery */
+@@ -140010,7 +146380,7 @@ static int flattenSubquery(
+   testcase( i==SQLITE_DENY );
+   pParse->zAuthContext = zSavedAuthContext;
+ 
+-  /* Delete the transient structures associated with thesubquery */
++  /* Delete the transient structures associated with the subquery */
+   pSub1 = pSubitem->pSelect;
+   sqlite3DbFree(db, pSubitem->zDatabase);
+   sqlite3DbFree(db, pSubitem->zName);
+@@ -140080,7 +146450,7 @@ static int flattenSubquery(
+       if( pPrior ) pPrior->pNext = pNew;
+       pNew->pNext = p;
+       p->pPrior = pNew;
+-      SELECTTRACE(2,pParse,p,("compound-subquery flattener"
++      TREETRACE(0x4,pParse,p,("compound-subquery flattener"
+                               " creates %u as peer\n",pNew->selId));
+     }
+     assert( pSubitem->pSelect==0 );
+@@ -140102,9 +146472,7 @@ static int flattenSubquery(
+     Table *pTabToDel = pSubitem->pTab;
+     if( pTabToDel->nTabRef==1 ){
+       Parse *pToplevel = sqlite3ParseToplevel(pParse);
+-      sqlite3ParserAddCleanup(pToplevel,
+-         (void(*)(sqlite3*,void*))sqlite3DeleteTable,
+-         pTabToDel);
++      sqlite3ParserAddCleanup(pToplevel, sqlite3DeleteTableGeneric, pTabToDel);
+       testcase( pToplevel->earlyCleanup );
+     }else{
+       pTabToDel->nTabRef--;
+@@ -140192,7 +146560,7 @@ static int flattenSubquery(
+       ** ORDER BY column expression is identical to the iOrderByCol'th
+       ** expression returned by SELECT statement pSub. Since these values
+       ** do not necessarily correspond to columns in SELECT statement pParent,
+-      ** zero them before transfering the ORDER BY clause.
++      ** zero them before transferring the ORDER BY clause.
+       **
+       ** Not doing this may cause an error if a subsequent call to this
+       ** function attempts to flatten a compound sub-query into pParent
+@@ -140225,6 +146593,7 @@ static int flattenSubquery(
+       x.iNewTable = iNewParent;
+       x.isOuterJoin = isOuterJoin;
+       x.pEList = pSub->pEList;
++      x.pCList = findLeftmostExprlist(pSub);
+       substSelect(&x, pParent, 0);
+     }
+ 
+@@ -140244,23 +146613,22 @@ static int flattenSubquery(
+       pSub->pLimit = 0;
+     }
+ 
+-    /* Recompute the SrcList_item.colUsed masks for the flattened
++    /* Recompute the SrcItem.colUsed masks for the flattened
+     ** tables. */
+     for(i=0; ia[i+iFrom]);
+     }
+   }
+ 
+-  /* Finially, delete what is left of the subquery and return
+-  ** success.
++  /* Finally, delete what is left of the subquery and return success.
+   */
+   sqlite3AggInfoPersistWalkerInit(&w, pParse);
+   sqlite3WalkSelect(&w,pSub1);
+   sqlite3SelectDelete(db, pSub1);
+ 
+ #if TREETRACE_ENABLED
+-  if( sqlite3TreeTrace & 0x100 ){
+-    SELECTTRACE(0x100,pParse,p,("After flattening:\n"));
++  if( sqlite3TreeTrace & 0x4 ){
++    TREETRACE(0x4,pParse,p,("After flattening:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -140287,7 +146655,7 @@ struct WhereConst {
+ 
+ /*
+ ** Add a new entry to the pConst object.  Except, do not add duplicate
+-** pColumn entires.  Also, do not add if doing so would not be appropriate.
++** pColumn entries.  Also, do not add if doing so would not be appropriate.
+ **
+ ** The caller guarantees the pColumn is a column and pValue is a constant.
+ ** This routine has to do some additional checks before completing the
+@@ -140473,7 +146841,7 @@ static int propagateConstantExprRewrite(Walker *pWalker, Expr *pExpr){
+ **    SELECT * FROM t1 WHERE a=123 AND b=123;
+ **
+ ** The two SELECT statements above should return different answers.  b=a
+-** is alway true because the comparison uses numeric affinity, but b=123
++** is always true because the comparison uses numeric affinity, but b=123
+ ** is false because it uses text affinity and '0123' is not the same as '123'.
+ ** To work around this, the expression tree is not actually changed from
+ ** "b=a" to "b=123" but rather the "a" in "b=a" is tagged with EP_FixedCol
+@@ -140557,7 +146925,7 @@ static int propagateConstants(
+ ** At the time this function is called it is guaranteed that
+ **
+ **   * the sub-query uses only one distinct window frame, and
+-**   * that the window frame has a PARTITION BY clase.
++**   * that the window frame has a PARTITION BY clause.
+ */
+ static int pushDownWindowCheck(Parse *pParse, Select *pSubq, Expr *pExpr){
+   assert( pSubq->pWin->pPartition );
+@@ -140634,6 +147002,29 @@ static int pushDownWindowCheck(Parse *pParse, Select *pSubq, Expr *pExpr){
+ **       be materialized.  (This restriction is implemented in the calling
+ **       routine.)
+ **
++**   (8) If the subquery is a compound that uses UNION, INTERSECT,
++**       or EXCEPT, then all of the result set columns for all arms of
++**       the compound must use the BINARY collating sequence.
++**
++**   (9) All three of the following are true:
++**
++**       (9a) The WHERE clause expression originates in the ON or USING clause
++**            of a join (either an INNER or an OUTER join), and
++**
++**       (9b) The subquery is to the right of the ON/USING clause
++**
++**       (9c) There is a RIGHT JOIN (or FULL JOIN) in between the ON/USING
++**            clause and the subquery.
++**
++**       Without this restriction, the push-down optimization might move
++**       the ON/USING filter expression from the left side of a RIGHT JOIN
++**       over to the right side, which leads to incorrect answers.  See
++**       also restriction (6) in sqlite3ExprIsSingleTableConstraint().
++**
++**  (10) The inner query is not the right-hand table of a RIGHT JOIN.
++**
++**  (11) The subquery is not a VALUES clause
++**
+ ** Return 0 if no changes are made and non-zero if one or more WHERE clause
+ ** terms are duplicated into the subquery.
+ */
+@@ -140641,24 +147032,56 @@ static int pushDownWhereTerms(
+   Parse *pParse,        /* Parse context (for malloc() and error reporting) */
+   Select *pSubq,        /* The subquery whose WHERE clause is to be augmented */
+   Expr *pWhere,         /* The WHERE clause of the outer query */
+-  SrcItem *pSrc         /* The subquery term of the outer FROM clause */
++  SrcList *pSrcList,    /* The complete from clause of the outer query */
++  int iSrc              /* Which FROM clause term to try to push into  */
+ ){
+   Expr *pNew;
++  SrcItem *pSrc;        /* The subquery FROM term into which WHERE is pushed */
+   int nChng = 0;
++  pSrc = &pSrcList->a[iSrc];
+   if( pWhere==0 ) return 0;
+-  if( pSubq->selFlags & (SF_Recursive|SF_MultiPart) ) return 0;
+-  if( pSrc->fg.jointype & (JT_LTORJ|JT_RIGHT) ) return 0;
++  if( pSubq->selFlags & (SF_Recursive|SF_MultiPart) ){
++    return 0;           /* restrictions (2) and (11) */
++  }
++  if( pSrc->fg.jointype & (JT_LTORJ|JT_RIGHT) ){
++    return 0;           /* restrictions (10) */
++  }
+ 
+-#ifndef SQLITE_OMIT_WINDOWFUNC
+   if( pSubq->pPrior ){
+     Select *pSel;
++    int notUnionAll = 0;
+     for(pSel=pSubq; pSel; pSel=pSel->pPrior){
++      u8 op = pSel->op;
++      assert( op==TK_ALL || op==TK_SELECT
++           || op==TK_UNION || op==TK_INTERSECT || op==TK_EXCEPT );
++      if( op!=TK_ALL && op!=TK_SELECT ){
++        notUnionAll = 1;
++      }
++#ifndef SQLITE_OMIT_WINDOWFUNC
+       if( pSel->pWin ) return 0;    /* restriction (6b) */
++#endif
++    }
++    if( notUnionAll ){
++      /* If any of the compound arms are connected using UNION, INTERSECT,
++      ** or EXCEPT, then we must ensure that none of the columns use a
++      ** non-BINARY collating sequence. */
++      for(pSel=pSubq; pSel; pSel=pSel->pPrior){
++        int ii;
++        const ExprList *pList = pSel->pEList;
++        assert( pList!=0 );
++        for(ii=0; iinExpr; ii++){
++          CollSeq *pColl = sqlite3ExprCollSeq(pParse, pList->a[ii].pExpr);
++          if( !sqlite3IsBinary(pColl) ){
++            return 0;  /* Restriction (8) */
++          }
++        }
++      }
+     }
+   }else{
++#ifndef SQLITE_OMIT_WINDOWFUNC
+     if( pSubq->pWin && pSubq->pWin->pPartition==0 ) return 0;
+-  }
+ #endif
++  }
+ 
+ #ifdef SQLITE_DEBUG
+   /* Only the first term of a compound can have a WITH clause.  But make
+@@ -140677,11 +147100,28 @@ static int pushDownWhereTerms(
+     return 0; /* restriction (3) */
+   }
+   while( pWhere->op==TK_AND ){
+-    nChng += pushDownWhereTerms(pParse, pSubq, pWhere->pRight, pSrc);
++    nChng += pushDownWhereTerms(pParse, pSubq, pWhere->pRight, pSrcList, iSrc);
+     pWhere = pWhere->pLeft;
+   }
+ 
+-#if 0  /* Legacy code. Checks now done by sqlite3ExprIsTableConstraint() */
++#if 0 /* These checks now done by sqlite3ExprIsSingleTableConstraint() */
++  if( ExprHasProperty(pWhere, EP_OuterON|EP_InnerON) /* (9a) */
++   && (pSrcList->a[0].fg.jointype & JT_LTORJ)!=0     /* Fast pre-test of (9c) */
++  ){
++    int jj;
++    for(jj=0; jjw.iJoin==pSrcList->a[jj].iCursor ){
++        /* If we reach this point, both (9a) and (9b) are satisfied.
++        ** The following loop checks (9c):
++        */
++        for(jj++; jja[jj].fg.jointype & JT_RIGHT)!=0 ){
++            return 0;  /* restriction (9) */
++          }
++        }
++      }
++    }
++  }
+   if( isLeftJoin
+    && (ExprHasProperty(pWhere,EP_OuterON)==0
+          || pWhere->w.iJoin!=iCursor)
+@@ -140695,7 +147135,7 @@ static int pushDownWhereTerms(
+   }
+ #endif
+ 
+-  if( sqlite3ExprIsTableConstraint(pWhere, pSrc) ){
++  if( sqlite3ExprIsSingleTableConstraint(pWhere, pSrcList, iSrc) ){
+     nChng++;
+     pSubq->selFlags |= SF_PushDown;
+     while( pSubq ){
+@@ -140707,6 +147147,7 @@ static int pushDownWhereTerms(
+       x.iNewTable = pSrc->iCursor;
+       x.isOuterJoin = 0;
+       x.pEList = pSubq->pEList;
++      x.pCList = findLeftmostExprlist(pSubq);
+       pNew = substExpr(&x, pNew);
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+       if( pSubq->pWin && 0==pushDownWindowCheck(pParse, pSubq, pNew) ){
+@@ -140728,6 +147169,78 @@ static int pushDownWhereTerms(
+ }
+ #endif /* !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) */
+ 
++/*
++** Check to see if a subquery contains result-set columns that are
++** never used.  If it does, change the value of those result-set columns
++** to NULL so that they do not cause unnecessary work to compute.
++**
++** Return the number of column that were changed to NULL.
++*/
++static int disableUnusedSubqueryResultColumns(SrcItem *pItem){
++  int nCol;
++  Select *pSub;      /* The subquery to be simplified */
++  Select *pX;        /* For looping over compound elements of pSub */
++  Table *pTab;       /* The table that describes the subquery */
++  int j;             /* Column number */
++  int nChng = 0;     /* Number of columns converted to NULL */
++  Bitmask colUsed;   /* Columns that may not be NULLed out */
++
++  assert( pItem!=0 );
++  if( pItem->fg.isCorrelated || pItem->fg.isCte ){
++    return 0;
++  }
++  assert( pItem->pTab!=0 );
++  pTab = pItem->pTab;
++  assert( pItem->pSelect!=0 );
++  pSub = pItem->pSelect;
++  assert( pSub->pEList->nExpr==pTab->nCol );
++  for(pX=pSub; pX; pX=pX->pPrior){
++    if( (pX->selFlags & (SF_Distinct|SF_Aggregate))!=0 ){
++      testcase( pX->selFlags & SF_Distinct );
++      testcase( pX->selFlags & SF_Aggregate );
++      return 0;
++    }
++    if( pX->pPrior && pX->op!=TK_ALL ){
++      /* This optimization does not work for compound subqueries that
++      ** use UNION, INTERSECT, or EXCEPT.  Only UNION ALL is allowed. */
++      return 0;
++    }
++#ifndef SQLITE_OMIT_WINDOWFUNC
++    if( pX->pWin ){
++      /* This optimization does not work for subqueries that use window
++      ** functions. */
++      return 0;
++    }
++#endif
++  }
++  colUsed = pItem->colUsed;
++  if( pSub->pOrderBy ){
++    ExprList *pList = pSub->pOrderBy;
++    for(j=0; jnExpr; j++){
++      u16 iCol = pList->a[j].u.x.iOrderByCol;
++      if( iCol>0 ){
++        iCol--;
++        colUsed |= ((Bitmask)1)<<(iCol>=BMS ? BMS-1 : iCol);
++      }
++    }
++  }
++  nCol = pTab->nCol;
++  for(j=0; jpPrior) {
++      Expr *pY = pX->pEList->a[j].pExpr;
++      if( pY->op==TK_NULL ) continue;
++      pY->op = TK_NULL;
++      ExprClearProperty(pY, EP_Skip|EP_Unlikely);
++      pX->selFlags |= SF_PushDown;
++      nChng++;
++    }
++  }
++  return nChng;
++}
++
++
+ /*
+ ** The pFunc is the only aggregate function in the query.  Check to see
+ ** if the query is a candidate for the min/max optimization.
+@@ -141006,8 +147519,7 @@ static struct Cte *searchWith(
+ SQLITE_PRIVATE With *sqlite3WithPush(Parse *pParse, With *pWith, u8 bFree){
+   if( pWith ){
+     if( bFree ){
+-      pWith = (With*)sqlite3ParserAddCleanup(pParse,
+-                      (void(*)(sqlite3*,void*))sqlite3WithDelete,
++      pWith = (With*)sqlite3ParserAddCleanup(pParse, sqlite3WithDeleteGeneric,
+                       pWith);
+       if( pWith==0 ) return 0;
+     }
+@@ -141119,9 +147631,6 @@ static int resolveFromTermToCte(
+     pFrom->fg.isCte = 1;
+     pFrom->u2.pCteUse = pCteUse;
+     pCteUse->nUse++;
+-    if( pCteUse->nUse>=2 && pCteUse->eM10d==M10d_Any ){
+-      pCteUse->eM10d = M10d_Yes;
+-    }
+ 
+     /* Check if this is a recursive CTE. */
+     pRecTerm = pSel = pFrom->pSelect;
+@@ -141231,9 +147740,9 @@ SQLITE_PRIVATE void sqlite3SelectPopWith(Walker *pWalker, Select *p){
+ #endif
+ 
+ /*
+-** The SrcList_item structure passed as the second argument represents a
++** The SrcItem structure passed as the second argument represents a
+ ** sub-query in the FROM clause of a SELECT statement. This function
+-** allocates and populates the SrcList_item.pTab object. If successful,
++** allocates and populates the SrcItem.pTab object. If successful,
+ ** SQLITE_OK is returned. Otherwise, if an OOM error is encountered,
+ ** SQLITE_NOMEM.
+ */
+@@ -141495,12 +148004,20 @@ static int selectExpander(Walker *pWalker, Select *p){
+         ** expanded. */
+         int tableSeen = 0;      /* Set to 1 when TABLE matches */
+         char *zTName = 0;       /* text of name of TABLE */
++        int iErrOfst;
+         if( pE->op==TK_DOT ){
++          assert( (selFlags & SF_NestedFrom)==0 );
+           assert( pE->pLeft!=0 );
+           assert( !ExprHasProperty(pE->pLeft, EP_IntValue) );
+           zTName = pE->pLeft->u.zToken;
++          assert( ExprUseWOfst(pE->pLeft) );
++          iErrOfst = pE->pRight->w.iOfst;
++        }else{
++          assert( ExprUseWOfst(pE) );
++          iErrOfst = pE->w.iOfst;
+         }
+         for(i=0, pFrom=pTabList->a; inSrc; i++, pFrom++){
++          int nAdd;                    /* Number of cols including rowid */
+           Table *pTab = pFrom->pTab;   /* Table for this data source */
+           ExprList *pNestedFrom;       /* Result-set of a nested FROM clause */
+           char *zTabName;              /* AS name for this data source */
+@@ -141518,6 +148035,7 @@ static int selectExpander(Walker *pWalker, Select *p){
+             pNestedFrom = pFrom->pSelect->pEList;
+             assert( pNestedFrom!=0 );
+             assert( pNestedFrom->nExpr==pTab->nCol );
++            assert( VisibleRowid(pTab)==0 );
+           }else{
+             if( zTName && sqlite3StrICmp(zTName, zTabName)!=0 ){
+               continue;
+@@ -141535,6 +148053,7 @@ static int selectExpander(Walker *pWalker, Select *p){
+             for(ii=0; iinId; ii++){
+               const char *zUName = pUsing->a[ii].zName;
+               pRight = sqlite3Expr(db, TK_ID, zUName);
++              sqlite3ExprSetErrorOffset(pRight, iErrOfst);
+               pNew = sqlite3ExprListAppend(pParse, pNew, pRight);
+               if( pNew ){
+                 struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
+@@ -141547,33 +148066,48 @@ static int selectExpander(Walker *pWalker, Select *p){
+           }else{
+             pUsing = 0;
+           }
+-          for(j=0; jnCol; j++){
+-            char *zName = pTab->aCol[j].zCnName;
++
++          nAdd = pTab->nCol + (VisibleRowid(pTab) && (selFlags&SF_NestedFrom));
++          for(j=0; ja[j], 0, zTName, 0)==0
+-            ){
+-              continue;
+-            }
++            if( j==pTab->nCol ){
++              zName = sqlite3RowidAlias(pTab);
++              if( zName==0 ) continue;
++            }else{
++              zName = pTab->aCol[j].zCnName;
+ 
+-            /* If a column is marked as 'hidden', omit it from the expanded
+-            ** result-set list unless the SELECT has the SF_IncludeHidden
+-            ** bit set.
+-            */
+-            if( (p->selFlags & SF_IncludeHidden)==0
+-             && IsHiddenColumn(&pTab->aCol[j])
+-            ){
+-              continue;
+-            }
+-            if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
+-             && zTName==0
+-             && (selFlags & (SF_NestedFrom))==0
+-            ){
+-              continue;
++              /* If pTab is actually an SF_NestedFrom sub-select, do not
++              ** expand any ENAME_ROWID columns.  */
++              if( pNestedFrom && pNestedFrom->a[j].fg.eEName==ENAME_ROWID ){
++                continue;
++              }
++
++              if( zTName
++               && pNestedFrom
++               && sqlite3MatchEName(&pNestedFrom->a[j], 0, zTName, 0, 0)==0
++              ){
++                continue;
++              }
++
++              /* If a column is marked as 'hidden', omit it from the expanded
++              ** result-set list unless the SELECT has the SF_IncludeHidden
++              ** bit set.
++              */
++              if( (p->selFlags & SF_IncludeHidden)==0
++                && IsHiddenColumn(&pTab->aCol[j])
++              ){
++                continue;
++              }
++              if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
++               && zTName==0
++               && (selFlags & (SF_NestedFrom))==0
++              ){
++                continue;
++              }
+             }
++            assert( zName );
+             tableSeen = 1;
+ 
+             if( i>0 && zTName==0 && (selFlags & SF_NestedFrom)==0 ){
+@@ -141607,6 +148141,7 @@ static int selectExpander(Walker *pWalker, Select *p){
+             }else{
+               pExpr = pRight;
+             }
++            sqlite3ExprSetErrorOffset(pExpr, iErrOfst);
+             pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
+             if( pNew==0 ){
+               break;  /* OOM */
+@@ -141622,11 +148157,11 @@ static int selectExpander(Walker *pWalker, Select *p){
+                                            zSchemaName, zTabName, zName);
+                 testcase( pX->zEName==0 );
+               }
+-              pX->fg.eEName = ENAME_TAB;
++              pX->fg.eEName = (j==pTab->nCol ? ENAME_ROWID : ENAME_TAB);
+               if( (pFrom->fg.isUsing
+                    && sqlite3IdListIndex(pFrom->u3.pUsing, zName)>=0)
+                || (pUsing && sqlite3IdListIndex(pUsing, zName)>=0)
+-               || (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
++               || (jnCol && (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND))
+               ){
+                 pX->fg.bNoExpand = 1;
+               }
+@@ -141661,8 +148196,8 @@ static int selectExpander(Walker *pWalker, Select *p){
+     }
+   }
+ #if TREETRACE_ENABLED
+-  if( sqlite3TreeTrace & 0x100 ){
+-    SELECTTRACE(0x100,pParse,p,("After result-set wildcard expansion:\n"));
++  if( sqlite3TreeTrace & 0x8 ){
++    TREETRACE(0x8,pParse,p,("After result-set wildcard expansion:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -141713,14 +148248,14 @@ static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
+ ** This is a Walker.xSelectCallback callback for the sqlite3SelectTypeInfo()
+ ** interface.
+ **
+-** For each FROM-clause subquery, add Column.zType and Column.zColl
+-** information to the Table structure that represents the result set
+-** of that subquery.
++** For each FROM-clause subquery, add Column.zType, Column.zColl, and
++** Column.affinity information to the Table structure that represents
++** the result set of that subquery.
+ **
+ ** The Table structure that represents the result set was constructed
+-** by selectExpander() but the type and collation information was omitted
+-** at that point because identifiers had not yet been resolved.  This
+-** routine is called after identifier resolution.
++** by selectExpander() but the type and collation and affinity information
++** was omitted at that point because identifiers had not yet been resolved.
++** This routine is called after identifier resolution.
+ */
+ static void selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
+   Parse *pParse;
+@@ -141728,10 +148263,11 @@ static void selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
+   SrcList *pTabList;
+   SrcItem *pFrom;
+ 
+-  assert( p->selFlags & SF_Resolved );
+   if( p->selFlags & SF_HasTypeInfo ) return;
+   p->selFlags |= SF_HasTypeInfo;
+   pParse = pWalker->pParse;
++  testcase( (p->selFlags & SF_Resolved)==0 );
++  assert( (p->selFlags & SF_Resolved) || IN_RENAME_OBJECT );
+   pTabList = p->pSrc;
+   for(i=0, pFrom=pTabList->a; inSrc; i++, pFrom++){
+     Table *pTab = pFrom->pTab;
+@@ -141740,9 +148276,7 @@ static void selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
+       /* A sub-query in the FROM clause of a SELECT */
+       Select *pSel = pFrom->pSelect;
+       if( pSel ){
+-        while( pSel->pPrior ) pSel = pSel->pPrior;
+-        sqlite3SelectAddColumnTypeAndCollation(pParse, pTab, pSel,
+-                                               SQLITE_AFF_NONE);
++        sqlite3SubqueryColumnTypes(pParse, pTab, pSel, SQLITE_AFF_NONE);
+       }
+     }
+   }
+@@ -141797,6 +148331,184 @@ SQLITE_PRIVATE void sqlite3SelectPrep(
+   sqlite3SelectAddTypeInfo(pParse, p);
+ }
+ 
++#if TREETRACE_ENABLED
++/*
++** Display all information about an AggInfo object
++*/
++static void printAggInfo(AggInfo *pAggInfo){
++  int ii;
++  for(ii=0; iinColumn; ii++){
++    struct AggInfo_col *pCol = &pAggInfo->aCol[ii];
++    sqlite3DebugPrintf(
++       "agg-column[%d] pTab=%s iTable=%d iColumn=%d iMem=%d"
++       " iSorterColumn=%d %s\n",
++       ii, pCol->pTab ? pCol->pTab->zName : "NULL",
++       pCol->iTable, pCol->iColumn, pAggInfo->iFirstReg+ii,
++       pCol->iSorterColumn,
++       ii>=pAggInfo->nAccumulator ? "" : " Accumulator");
++    sqlite3TreeViewExpr(0, pAggInfo->aCol[ii].pCExpr, 0);
++  }
++  for(ii=0; iinFunc; ii++){
++    sqlite3DebugPrintf("agg-func[%d]: iMem=%d\n",
++        ii, pAggInfo->iFirstReg+pAggInfo->nColumn+ii);
++    sqlite3TreeViewExpr(0, pAggInfo->aFunc[ii].pFExpr, 0);
++  }
++}
++#endif /* TREETRACE_ENABLED */
++
++/*
++** Analyze the arguments to aggregate functions.  Create new pAggInfo->aCol[]
++** entries for columns that are arguments to aggregate functions but which
++** are not otherwise used.
++**
++** The aCol[] entries in AggInfo prior to nAccumulator are columns that
++** are referenced outside of aggregate functions.  These might be columns
++** that are part of the GROUP by clause, for example.  Other database engines
++** would throw an error if there is a column reference that is not in the
++** GROUP BY clause and that is not part of an aggregate function argument.
++** But SQLite allows this.
++**
++** The aCol[] entries beginning with the aCol[nAccumulator] and following
++** are column references that are used exclusively as arguments to
++** aggregate functions.  This routine is responsible for computing
++** (or recomputing) those aCol[] entries.
++*/
++static void analyzeAggFuncArgs(
++  AggInfo *pAggInfo,
++  NameContext *pNC
++){
++  int i;
++  assert( pAggInfo!=0 );
++  assert( pAggInfo->iFirstReg==0 );
++  pNC->ncFlags |= NC_InAggFunc;
++  for(i=0; inFunc; i++){
++    Expr *pExpr = pAggInfo->aFunc[i].pFExpr;
++    assert( pExpr->op==TK_FUNCTION || pExpr->op==TK_AGG_FUNCTION );
++    assert( ExprUseXList(pExpr) );
++    sqlite3ExprAnalyzeAggList(pNC, pExpr->x.pList);
++    if( pExpr->pLeft ){
++      assert( pExpr->pLeft->op==TK_ORDER );
++      assert( ExprUseXList(pExpr->pLeft) );
++      sqlite3ExprAnalyzeAggList(pNC, pExpr->pLeft->x.pList);
++    }
++#ifndef SQLITE_OMIT_WINDOWFUNC
++    assert( !IsWindowFunc(pExpr) );
++    if( ExprHasProperty(pExpr, EP_WinFunc) ){
++      sqlite3ExprAnalyzeAggregates(pNC, pExpr->y.pWin->pFilter);
++    }
++#endif
++  }
++  pNC->ncFlags &= ~NC_InAggFunc;
++}
++
++/*
++** An index on expressions is being used in the inner loop of an
++** aggregate query with a GROUP BY clause.  This routine attempts
++** to adjust the AggInfo object to take advantage of index and to
++** perhaps use the index as a covering index.
++**
++*/
++static void optimizeAggregateUseOfIndexedExpr(
++  Parse *pParse,          /* Parsing context */
++  Select *pSelect,        /* The SELECT statement being processed */
++  AggInfo *pAggInfo,      /* The aggregate info */
++  NameContext *pNC        /* Name context used to resolve agg-func args */
++){
++  assert( pAggInfo->iFirstReg==0 );
++  assert( pSelect!=0 );
++  assert( pSelect->pGroupBy!=0 );
++  pAggInfo->nColumn = pAggInfo->nAccumulator;
++  if( ALWAYS(pAggInfo->nSortingColumn>0) ){
++    int mx = pSelect->pGroupBy->nExpr - 1;
++    int j, k;
++    for(j=0; jnColumn; j++){
++      k = pAggInfo->aCol[j].iSorterColumn;
++      if( k>mx ) mx = k;
++    }
++    pAggInfo->nSortingColumn = mx+1;
++  }
++  analyzeAggFuncArgs(pAggInfo, pNC);
++#if TREETRACE_ENABLED
++  if( sqlite3TreeTrace & 0x20 ){
++    IndexedExpr *pIEpr;
++    TREETRACE(0x20, pParse, pSelect,
++        ("AggInfo (possibly) adjusted for Indexed Exprs\n"));
++    sqlite3TreeViewSelect(0, pSelect, 0);
++    for(pIEpr=pParse->pIdxEpr; pIEpr; pIEpr=pIEpr->pIENext){
++      printf("data-cursor=%d index={%d,%d}\n",
++          pIEpr->iDataCur, pIEpr->iIdxCur, pIEpr->iIdxCol);
++      sqlite3TreeViewExpr(0, pIEpr->pExpr, 0);
++    }
++    printAggInfo(pAggInfo);
++  }
++#else
++  UNUSED_PARAMETER(pSelect);
++  UNUSED_PARAMETER(pParse);
++#endif
++}
++
++/*
++** Walker callback for aggregateConvertIndexedExprRefToColumn().
++*/
++static int aggregateIdxEprRefToColCallback(Walker *pWalker, Expr *pExpr){
++  AggInfo *pAggInfo;
++  struct AggInfo_col *pCol;
++  UNUSED_PARAMETER(pWalker);
++  if( pExpr->pAggInfo==0 ) return WRC_Continue;
++  if( pExpr->op==TK_AGG_COLUMN ) return WRC_Continue;
++  if( pExpr->op==TK_AGG_FUNCTION ) return WRC_Continue;
++  if( pExpr->op==TK_IF_NULL_ROW ) return WRC_Continue;
++  pAggInfo = pExpr->pAggInfo;
++  if( NEVER(pExpr->iAgg>=pAggInfo->nColumn) ) return WRC_Continue;
++  assert( pExpr->iAgg>=0 );
++  pCol = &pAggInfo->aCol[pExpr->iAgg];
++  pExpr->op = TK_AGG_COLUMN;
++  pExpr->iTable = pCol->iTable;
++  pExpr->iColumn = pCol->iColumn;
++  ExprClearProperty(pExpr, EP_Skip|EP_Collate|EP_Unlikely);
++  return WRC_Prune;
++}
++
++/*
++** Convert every pAggInfo->aFunc[].pExpr such that any node within
++** those expressions that has pAppInfo set is changed into a TK_AGG_COLUMN
++** opcode.
++*/
++static void aggregateConvertIndexedExprRefToColumn(AggInfo *pAggInfo){
++  int i;
++  Walker w;
++  memset(&w, 0, sizeof(w));
++  w.xExprCallback = aggregateIdxEprRefToColCallback;
++  for(i=0; inFunc; i++){
++    sqlite3WalkExpr(&w, pAggInfo->aFunc[i].pFExpr);
++  }
++}
++
++
++/*
++** Allocate a block of registers so that there is one register for each
++** pAggInfo->aCol[] and pAggInfo->aFunc[] entry in pAggInfo.  The first
++** register in this block is stored in pAggInfo->iFirstReg.
++**
++** This routine may only be called once for each AggInfo object.  Prior
++** to calling this routine:
++**
++**     *  The aCol[] and aFunc[] arrays may be modified
++**     *  The AggInfoColumnReg() and AggInfoFuncReg() macros may not be used
++**
++** After calling this routine:
++**
++**     *  The aCol[] and aFunc[] arrays are fixed
++**     *  The AggInfoColumnReg() and AggInfoFuncReg() macros may be used
++**
++*/
++static void assignAggregateRegisters(Parse *pParse, AggInfo *pAggInfo){
++  assert( pAggInfo!=0 );
++  assert( pAggInfo->iFirstReg==0 );
++  pAggInfo->iFirstReg = pParse->nMem + 1;
++  pParse->nMem += pAggInfo->nColumn + pAggInfo->nFunc;
++}
++
+ /*
+ ** Reset the aggregate accumulator.
+ **
+@@ -141810,24 +148522,13 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
+   int i;
+   struct AggInfo_func *pFunc;
+   int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
++  assert( pAggInfo->iFirstReg>0 );
+   assert( pParse->db->pParse==pParse );
+   assert( pParse->db->mallocFailed==0 || pParse->nErr!=0 );
+   if( nReg==0 ) return;
+   if( pParse->nErr ) return;
+-#ifdef SQLITE_DEBUG
+-  /* Verify that all AggInfo registers are within the range specified by
+-  ** AggInfo.mnReg..AggInfo.mxReg */
+-  assert( nReg==pAggInfo->mxReg-pAggInfo->mnReg+1 );
+-  for(i=0; inColumn; i++){
+-    assert( pAggInfo->aCol[i].iMem>=pAggInfo->mnReg
+-         && pAggInfo->aCol[i].iMem<=pAggInfo->mxReg );
+-  }
+-  for(i=0; inFunc; i++){
+-    assert( pAggInfo->aFunc[i].iMem>=pAggInfo->mnReg
+-         && pAggInfo->aFunc[i].iMem<=pAggInfo->mxReg );
+-  }
+-#endif
+-  sqlite3VdbeAddOp3(v, OP_Null, 0, pAggInfo->mnReg, pAggInfo->mxReg);
++  sqlite3VdbeAddOp3(v, OP_Null, 0, pAggInfo->iFirstReg,
++                    pAggInfo->iFirstReg+nReg-1);
+   for(pFunc=pAggInfo->aFunc, i=0; inFunc; i++, pFunc++){
+     if( pFunc->iDistinct>=0 ){
+       Expr *pE = pFunc->pFExpr;
+@@ -141844,6 +148545,36 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
+                           pFunc->pFunc->zName));
+       }
+     }
++    if( pFunc->iOBTab>=0 ){
++      ExprList *pOBList;
++      KeyInfo *pKeyInfo;
++      int nExtra = 0;
++      assert( pFunc->pFExpr->pLeft!=0 );
++      assert( pFunc->pFExpr->pLeft->op==TK_ORDER );
++      assert( ExprUseXList(pFunc->pFExpr->pLeft) );
++      assert( pFunc->pFunc!=0 );
++      pOBList = pFunc->pFExpr->pLeft->x.pList;
++      if( !pFunc->bOBUnique ){
++        nExtra++;  /* One extra column for the OP_Sequence */
++      }
++      if( pFunc->bOBPayload ){
++        /* extra columns for the function arguments */
++        assert( ExprUseXList(pFunc->pFExpr) );
++        nExtra += pFunc->pFExpr->x.pList->nExpr;
++      }
++      if( pFunc->bUseSubtype ){
++        nExtra += pFunc->pFExpr->x.pList->nExpr;
++      }
++      pKeyInfo = sqlite3KeyInfoFromExprList(pParse, pOBList, 0, nExtra);
++      if( !pFunc->bOBUnique && pParse->nErr==0 ){
++        pKeyInfo->nKeyField++;
++      }
++      sqlite3VdbeAddOp4(v, OP_OpenEphemeral,
++            pFunc->iOBTab, pOBList->nExpr+nExtra, 0,
++            (char*)pKeyInfo, P4_KEYINFO);
++      ExplainQueryPlan((pParse, 0, "USE TEMP B-TREE FOR %s(ORDER BY)",
++                          pFunc->pFunc->zName));
++    }
+   }
+ }
+ 
+@@ -141859,20 +148590,71 @@ static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){
+     ExprList *pList;
+     assert( ExprUseXList(pF->pFExpr) );
+     pList = pF->pFExpr->x.pList;
+-    sqlite3VdbeAddOp2(v, OP_AggFinal, pF->iMem, pList ? pList->nExpr : 0);
++    if( pF->iOBTab>=0 ){
++      /* For an ORDER BY aggregate, calls to OP_AggStep were deferred.  Inputs
++      ** were stored in emphermal table pF->iOBTab.  Here, we extract those
++      ** inputs (in ORDER BY order) and make all calls to OP_AggStep
++      ** before doing the OP_AggFinal call. */
++      int iTop;        /* Start of loop for extracting columns */
++      int nArg;        /* Number of columns to extract */
++      int nKey;        /* Key columns to be skipped */
++      int regAgg;      /* Extract into this array */
++      int j;           /* Loop counter */
++
++      assert( pF->pFunc!=0 );
++      nArg = pList->nExpr;
++      regAgg = sqlite3GetTempRange(pParse, nArg);
++
++      if( pF->bOBPayload==0 ){
++        nKey = 0;
++      }else{
++        assert( pF->pFExpr->pLeft!=0 );
++        assert( ExprUseXList(pF->pFExpr->pLeft) );
++        assert( pF->pFExpr->pLeft->x.pList!=0 );
++        nKey = pF->pFExpr->pLeft->x.pList->nExpr;
++        if( ALWAYS(!pF->bOBUnique) ) nKey++;
++      }
++      iTop = sqlite3VdbeAddOp1(v, OP_Rewind, pF->iOBTab); VdbeCoverage(v);
++      for(j=nArg-1; j>=0; j--){
++        sqlite3VdbeAddOp3(v, OP_Column, pF->iOBTab, nKey+j, regAgg+j);
++      }
++      if( pF->bUseSubtype ){
++        int regSubtype = sqlite3GetTempReg(pParse);
++        int iBaseCol = nKey + nArg + (pF->bOBPayload==0 && pF->bOBUnique==0);
++        for(j=nArg-1; j>=0; j--){
++          sqlite3VdbeAddOp3(v, OP_Column, pF->iOBTab, iBaseCol+j, regSubtype);
++          sqlite3VdbeAddOp2(v, OP_SetSubtype, regSubtype, regAgg+j);
++        }
++        sqlite3ReleaseTempReg(pParse, regSubtype);
++      }
++      sqlite3VdbeAddOp3(v, OP_AggStep, 0, regAgg, AggInfoFuncReg(pAggInfo,i));
++      sqlite3VdbeAppendP4(v, pF->pFunc, P4_FUNCDEF);
++      sqlite3VdbeChangeP5(v, (u8)nArg);
++      sqlite3VdbeAddOp2(v, OP_Next, pF->iOBTab, iTop+1); VdbeCoverage(v);
++      sqlite3VdbeJumpHere(v, iTop);
++      sqlite3ReleaseTempRange(pParse, regAgg, nArg);
++    }
++    sqlite3VdbeAddOp2(v, OP_AggFinal, AggInfoFuncReg(pAggInfo,i),
++                      pList ? pList->nExpr : 0);
+     sqlite3VdbeAppendP4(v, pF->pFunc, P4_FUNCDEF);
+   }
+ }
+ 
+-
+ /*
+-** Update the accumulator memory cells for an aggregate based on
+-** the current cursor position.
++** Generate code that will update the accumulator memory cells for an
++** aggregate based on the current cursor position.
+ **
+ ** If regAcc is non-zero and there are no min() or max() aggregates
+ ** in pAggInfo, then only populate the pAggInfo->nAccumulator accumulator
+ ** registers if register regAcc contains 0. The caller will take care
+ ** of setting and clearing regAcc.
++**
++** For an ORDER BY aggregate, the actual accumulator memory cell update
++** is deferred until after all input rows have been received, so that they
++** can be run in the requested order.  In that case, instead of invoking
++** OP_AggStep to update the accumulator, just add the arguments that would
++** have been passed into OP_AggStep into the sorting ephemeral table
++** (along with the appropriate sort key).
+ */
+ static void updateAccumulator(
+   Parse *pParse,
+@@ -141887,14 +148669,19 @@ static void updateAccumulator(
+   struct AggInfo_func *pF;
+   struct AggInfo_col *pC;
+ 
++  assert( pAggInfo->iFirstReg>0 );
++  if( pParse->nErr ) return;
+   pAggInfo->directMode = 1;
+   for(i=0, pF=pAggInfo->aFunc; inFunc; i++, pF++){
+     int nArg;
+     int addrNext = 0;
+     int regAgg;
++    int regAggSz = 0;
++    int regDistinct = 0;
+     ExprList *pList;
+     assert( ExprUseXList(pF->pFExpr) );
+     assert( !IsWindowFunc(pF->pFExpr) );
++    assert( pF->pFunc!=0 );
+     pList = pF->pFExpr->x.pList;
+     if( ExprHasProperty(pF->pFExpr, EP_WinFunc) ){
+       Expr *pFilter = pF->pFExpr->y.pWin->pFilter;
+@@ -141918,9 +148705,55 @@ static void updateAccumulator(
+       addrNext = sqlite3VdbeMakeLabel(pParse);
+       sqlite3ExprIfFalse(pParse, pFilter, addrNext, SQLITE_JUMPIFNULL);
+     }
+-    if( pList ){
++    if( pF->iOBTab>=0 ){
++      /* Instead of invoking AggStep, we must push the arguments that would
++      ** have been passed to AggStep onto the sorting table. */
++      int jj;                /* Registered used so far in building the record */
++      ExprList *pOBList;     /* The ORDER BY clause */
++      assert( pList!=0 );
++      nArg = pList->nExpr;
++      assert( nArg>0 );
++      assert( pF->pFExpr->pLeft!=0 );
++      assert( pF->pFExpr->pLeft->op==TK_ORDER );
++      assert( ExprUseXList(pF->pFExpr->pLeft) );
++      pOBList = pF->pFExpr->pLeft->x.pList;
++      assert( pOBList!=0 );
++      assert( pOBList->nExpr>0 );
++      regAggSz = pOBList->nExpr;
++      if( !pF->bOBUnique ){
++        regAggSz++;   /* One register for OP_Sequence */
++      }
++      if( pF->bOBPayload ){
++        regAggSz += nArg;
++      }
++      if( pF->bUseSubtype ){
++        regAggSz += nArg;
++      }
++      regAggSz++;  /* One extra register to hold result of MakeRecord */
++      regAgg = sqlite3GetTempRange(pParse, regAggSz);
++      regDistinct = regAgg;
++      sqlite3ExprCodeExprList(pParse, pOBList, regAgg, 0, SQLITE_ECEL_DUP);
++      jj = pOBList->nExpr;
++      if( !pF->bOBUnique ){
++        sqlite3VdbeAddOp2(v, OP_Sequence, pF->iOBTab, regAgg+jj);
++        jj++;
++      }
++      if( pF->bOBPayload ){
++        regDistinct = regAgg+jj;
++        sqlite3ExprCodeExprList(pParse, pList, regDistinct, 0, SQLITE_ECEL_DUP);
++        jj += nArg;
++      }
++      if( pF->bUseSubtype ){
++        int kk;
++        int regBase = pF->bOBPayload ? regDistinct : regAgg;
++        for(kk=0; kknExpr;
+       regAgg = sqlite3GetTempRange(pParse, nArg);
++      regDistinct = regAgg;
+       sqlite3ExprCodeExprList(pParse, pList, regAgg, 0, SQLITE_ECEL_DUP);
+     }else{
+       nArg = 0;
+@@ -141931,26 +148764,37 @@ static void updateAccumulator(
+         addrNext = sqlite3VdbeMakeLabel(pParse);
+       }
+       pF->iDistinct = codeDistinct(pParse, eDistinctType,
+-          pF->iDistinct, addrNext, pList, regAgg);
+-    }
+-    if( pF->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
+-      CollSeq *pColl = 0;
+-      struct ExprList_item *pItem;
+-      int j;
+-      assert( pList!=0 );  /* pList!=0 if pF->pFunc has NEEDCOLL */
+-      for(j=0, pItem=pList->a; !pColl && jpExpr);
+-      }
+-      if( !pColl ){
+-        pColl = pParse->db->pDfltColl;
++          pF->iDistinct, addrNext, pList, regDistinct);
++    }
++    if( pF->iOBTab>=0 ){
++      /* Insert a new record into the ORDER BY table */
++      sqlite3VdbeAddOp3(v, OP_MakeRecord, regAgg, regAggSz-1,
++                        regAgg+regAggSz-1);
++      sqlite3VdbeAddOp4Int(v, OP_IdxInsert, pF->iOBTab, regAgg+regAggSz-1,
++                           regAgg, regAggSz-1);
++      sqlite3ReleaseTempRange(pParse, regAgg, regAggSz);
++    }else{
++      /* Invoke the AggStep function */
++      if( pF->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
++        CollSeq *pColl = 0;
++        struct ExprList_item *pItem;
++        int j;
++        assert( pList!=0 );  /* pList!=0 if pF->pFunc has NEEDCOLL */
++        for(j=0, pItem=pList->a; !pColl && jpExpr);
++        }
++        if( !pColl ){
++          pColl = pParse->db->pDfltColl;
++        }
++        if( regHit==0 && pAggInfo->nAccumulator ) regHit = ++pParse->nMem;
++        sqlite3VdbeAddOp4(v, OP_CollSeq, regHit, 0, 0,
++                         (char *)pColl, P4_COLLSEQ);
+       }
+-      if( regHit==0 && pAggInfo->nAccumulator ) regHit = ++pParse->nMem;
+-      sqlite3VdbeAddOp4(v, OP_CollSeq, regHit, 0, 0, (char *)pColl, P4_COLLSEQ);
++      sqlite3VdbeAddOp3(v, OP_AggStep, 0, regAgg, AggInfoFuncReg(pAggInfo,i));
++      sqlite3VdbeAppendP4(v, pF->pFunc, P4_FUNCDEF);
++      sqlite3VdbeChangeP5(v, (u8)nArg);
++      sqlite3ReleaseTempRange(pParse, regAgg, nArg);
+     }
+-    sqlite3VdbeAddOp3(v, OP_AggStep, 0, regAgg, pF->iMem);
+-    sqlite3VdbeAppendP4(v, pF->pFunc, P4_FUNCDEF);
+-    sqlite3VdbeChangeP5(v, (u8)nArg);
+-    sqlite3ReleaseTempRange(pParse, regAgg, nArg);
+     if( addrNext ){
+       sqlite3VdbeResolveLabel(v, addrNext);
+     }
+@@ -141962,7 +148806,7 @@ static void updateAccumulator(
+     addrHitTest = sqlite3VdbeAddOp1(v, OP_If, regHit); VdbeCoverage(v);
+   }
+   for(i=0, pC=pAggInfo->aCol; inAccumulator; i++, pC++){
+-    sqlite3ExprCode(pParse, pC->pCExpr, pC->iMem);
++    sqlite3ExprCode(pParse, pC->pCExpr, AggInfoColumnReg(pAggInfo,i));
+   }
+ 
+   pAggInfo->directMode = 0;
+@@ -142058,26 +148902,31 @@ static void havingToWhere(Parse *pParse, Select *p){
+   sqlite3WalkExpr(&sWalker, p->pHaving);
+ #if TREETRACE_ENABLED
+   if( sWalker.eCode && (sqlite3TreeTrace & 0x100)!=0 ){
+-    SELECTTRACE(0x100,pParse,p,("Move HAVING terms into WHERE:\n"));
++    TREETRACE(0x100,pParse,p,("Move HAVING terms into WHERE:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+ }
+ 
+ /*
+-** Check to see if the pThis entry of pTabList is a self-join of a prior view.
+-** If it is, then return the SrcList_item for the prior view.  If it is not,
+-** then return 0.
++** Check to see if the pThis entry of pTabList is a self-join of another view.
++** Search FROM-clause entries in the range of iFirst..iEnd, including iFirst
++** but stopping before iEnd.
++**
++** If pThis is a self-join, then return the SrcItem for the first other
++** instance of that view found.  If pThis is not a self-join then return 0.
+ */
+ static SrcItem *isSelfJoinView(
+   SrcList *pTabList,           /* Search for self-joins in this FROM clause */
+-  SrcItem *pThis               /* Search for prior reference to this subquery */
++  SrcItem *pThis,              /* Search for prior reference to this subquery */
++  int iFirst, int iEnd        /* Range of FROM-clause entries to search. */
+ ){
+   SrcItem *pItem;
+   assert( pThis->pSelect!=0 );
+   if( pThis->pSelect->selFlags & SF_PushDown ) return 0;
+-  for(pItem = pTabList->a; pItema[iFirst++];
+     if( pItem->pSelect==0 ) continue;
+     if( pItem->fg.viaCoroutine ) continue;
+     if( pItem->zName==0 ) continue;
+@@ -142104,13 +148953,13 @@ static SrcItem *isSelfJoinView(
+ /*
+ ** Deallocate a single AggInfo object
+ */
+-static void agginfoFree(sqlite3 *db, AggInfo *p){
++static void agginfoFree(sqlite3 *db, void *pArg){
++  AggInfo *p = (AggInfo*)pArg;
+   sqlite3DbFree(db, p->aCol);
+   sqlite3DbFree(db, p->aFunc);
+   sqlite3DbFreeNN(db, p);
+ }
+ 
+-#ifdef SQLITE_COUNTOFVIEW_OPTIMIZATION
+ /*
+ ** Attempt to transform a query of the form
+ **
+@@ -142138,7 +148987,9 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
+   if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate */
+   if( p->pEList->nExpr!=1 ) return 0;               /* Single result column */
+   if( p->pWhere ) return 0;
++  if( p->pHaving ) return 0;
+   if( p->pGroupBy ) return 0;
++  if( p->pOrderBy ) return 0;
+   pExpr = p->pEList->a[0].pExpr;
+   if( pExpr->op!=TK_AGG_FUNCTION ) return 0;        /* Result is an aggregate */
+   assert( ExprUseUToken(pExpr) );
+@@ -142146,15 +148997,18 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
+   assert( ExprUseXList(pExpr) );
+   if( pExpr->x.pList!=0 ) return 0;                 /* Must be count(*) */
+   if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in FROM  */
++  if( ExprHasProperty(pExpr, EP_WinFunc) ) return 0;/* Not a window function */
+   pSub = p->pSrc->a[0].pSelect;
+   if( pSub==0 ) return 0;                           /* The FROM is a subquery */
+-  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound ry */
++  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound */
++  if( pSub->selFlags & SF_CopyCte ) return 0;       /* Not a CTE */
+   do{
+     if( pSub->op!=TK_ALL && pSub->pPrior ) return 0;  /* Must be UNION ALL */
+     if( pSub->pWhere ) return 0;                      /* No WHERE clause */
+     if( pSub->pLimit ) return 0;                      /* No LIMIT clause */
+     if( pSub->selFlags & SF_Aggregate ) return 0;     /* Not an aggregate */
+-    pSub = pSub->pPrior;                              /* Repeat over compound */
++    assert( pSub->pHaving==0 );  /* Due to the previous */
++   pSub = pSub->pPrior;                              /* Repeat over compound */
+   }while( pSub );
+ 
+   /* If we reach this point then it is OK to perform the transformation */
+@@ -142174,7 +149028,7 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
+     pSub->selFlags |= SF_Aggregate;
+     pSub->selFlags &= ~SF_Compound;
+     pSub->nSelectRow = 0;
+-    sqlite3ExprListDelete(db, pSub->pEList);
++    sqlite3ParserAddCleanup(pParse, sqlite3ExprListDeleteGeneric, pSub->pEList);
+     pTerm = pPrior ? sqlite3ExprDup(db, pCount, 0) : pCount;
+     pSub->pEList = sqlite3ExprListAppend(pParse, 0, pTerm);
+     pTerm = sqlite3PExpr(pParse, TK_SELECT, 0, 0);
+@@ -142190,14 +149044,13 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
+   p->selFlags &= ~SF_Aggregate;
+ 
+ #if TREETRACE_ENABLED
+-  if( sqlite3TreeTrace & 0x400 ){
+-    SELECTTRACE(0x400,pParse,p,("After count-of-view optimization:\n"));
++  if( sqlite3TreeTrace & 0x200 ){
++    TREETRACE(0x200,pParse,p,("After count-of-view optimization:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+   return 1;
+ }
+-#endif /* SQLITE_COUNTOFVIEW_OPTIMIZATION */
+ 
+ /*
+ ** If any term of pSrc, or any SF_NestedFrom sub-query, is not the same
+@@ -142222,6 +149075,68 @@ static int sameSrcAlias(SrcItem *p0, SrcList *pSrc){
+   return 0;
+ }
+ 
++/*
++** Return TRUE (non-zero) if the i-th entry in the pTabList SrcList can
++** be implemented as a co-routine.  The i-th entry is guaranteed to be
++** a subquery.
++**
++** The subquery is implemented as a co-routine if all of the following are
++** true:
++**
++**    (1)  The subquery will likely be implemented in the outer loop of
++**         the query.  This will be the case if any one of the following
++**         conditions hold:
++**         (a)  The subquery is the only term in the FROM clause
++**         (b)  The subquery is the left-most term and a CROSS JOIN or similar
++**              requires it to be the outer loop
++**         (c)  All of the following are true:
++**                (i) The subquery is the left-most subquery in the FROM clause
++**               (ii) There is nothing that would prevent the subquery from
++**                    being used as the outer loop if the sqlite3WhereBegin()
++**                    routine nominates it to that position.
++**              (iii) The query is not a UPDATE ... FROM
++**    (2)  The subquery is not a CTE that should be materialized because
++**         (a) the AS MATERIALIZED keyword is used, or
++**         (b) the CTE is used multiple times and does not have the
++**             NOT MATERIALIZED keyword
++**    (3)  The subquery is not part of a left operand for a RIGHT JOIN
++**    (4)  The SQLITE_Coroutine optimization disable flag is not set
++**    (5)  The subquery is not self-joined
++*/
++static int fromClauseTermCanBeCoroutine(
++  Parse *pParse,          /* Parsing context */
++  SrcList *pTabList,      /* FROM clause */
++  int i,                  /* Which term of the FROM clause holds the subquery */
++  int selFlags            /* Flags on the SELECT statement */
++){
++  SrcItem *pItem = &pTabList->a[i];
++  if( pItem->fg.isCte ){
++    const CteUse *pCteUse = pItem->u2.pCteUse;
++    if( pCteUse->eM10d==M10d_Yes ) return 0;                          /* (2a) */
++    if( pCteUse->nUse>=2 && pCteUse->eM10d!=M10d_No ) return 0;       /* (2b) */
++  }
++  if( pTabList->a[0].fg.jointype & JT_LTORJ ) return 0;               /* (3)  */
++  if( OptimizationDisabled(pParse->db, SQLITE_Coroutines) ) return 0; /* (4)  */
++  if( isSelfJoinView(pTabList, pItem, i+1, pTabList->nSrc)!=0 ){
++    return 0;                                                          /* (5) */
++  }
++  if( i==0 ){
++    if( pTabList->nSrc==1 ) return 1;                             /* (1a) */
++    if( pTabList->a[1].fg.jointype & JT_CROSS ) return 1;         /* (1b) */
++    if( selFlags & SF_UpdateFrom )              return 0;         /* (1c-iii) */
++    return 1;
++  }
++  if( selFlags & SF_UpdateFrom ) return 0;                        /* (1c-iii) */
++  while( 1 /*exit-by-break*/ ){
++    if( pItem->fg.jointype & (JT_OUTER|JT_CROSS)  ) return 0;     /* (1c-ii) */
++    if( i==0 ) break;
++    i--;
++    pItem--;
++    if( pItem->pSelect!=0 ) return 0;                             /* (1c-i) */
++  }
++  return 1;
++}
++
+ /*
+ ** Generate code for the SELECT statement given in the p argument.
+ **
+@@ -142267,8 +149182,8 @@ SQLITE_PRIVATE int sqlite3Select(
+   assert( db->mallocFailed==0 );
+   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
+ #if TREETRACE_ENABLED
+-  SELECTTRACE(1,pParse,p, ("begin processing:\n", pParse->addrExplain));
+-  if( sqlite3TreeTrace & 0x10100 ){
++  TREETRACE(0x1,pParse,p, ("begin processing:\n", pParse->addrExplain));
++  if( sqlite3TreeTrace & 0x10000 ){
+     if( (sqlite3TreeTrace & 0x10001)==0x10000 ){
+       sqlite3TreeViewLine(0, "In sqlite3Select() at %s:%d",
+                            __FILE__, __LINE__);
+@@ -142288,14 +149203,13 @@ SQLITE_PRIVATE int sqlite3Select(
+     /* All of these destinations are also able to ignore the ORDER BY clause */
+     if( p->pOrderBy ){
+ #if TREETRACE_ENABLED
+-      SELECTTRACE(1,pParse,p, ("dropping superfluous ORDER BY:\n"));
+-      if( sqlite3TreeTrace & 0x100 ){
++      TREETRACE(0x800,pParse,p, ("dropping superfluous ORDER BY:\n"));
++      if( sqlite3TreeTrace & 0x800 ){
+         sqlite3TreeViewExprList(0, p->pOrderBy, 0, "ORDERBY");
+       }
+ #endif
+-      sqlite3ParserAddCleanup(pParse,
+-        (void(*)(sqlite3*,void*))sqlite3ExprListDelete,
+-        p->pOrderBy);
++      sqlite3ParserAddCleanup(pParse, sqlite3ExprListDeleteGeneric,
++                              p->pOrderBy);
+       testcase( pParse->earlyCleanup );
+       p->pOrderBy = 0;
+     }
+@@ -142309,8 +149223,8 @@ SQLITE_PRIVATE int sqlite3Select(
+   assert( db->mallocFailed==0 );
+   assert( p->pEList!=0 );
+ #if TREETRACE_ENABLED
+-  if( sqlite3TreeTrace & 0x104 ){
+-    SELECTTRACE(0x104,pParse,p, ("after name resolution:\n"));
++  if( sqlite3TreeTrace & 0x10 ){
++    TREETRACE(0x10,pParse,p, ("after name resolution:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -142351,8 +149265,8 @@ SQLITE_PRIVATE int sqlite3Select(
+     goto select_end;
+   }
+ #if TREETRACE_ENABLED
+-  if( p->pWin && (sqlite3TreeTrace & 0x108)!=0 ){
+-    SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
++  if( p->pWin && (sqlite3TreeTrace & 0x40)!=0 ){
++    TREETRACE(0x40,pParse,p, ("after window rewrite:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -142376,22 +149290,58 @@ SQLITE_PRIVATE int sqlite3Select(
+     ** to a real table */
+     assert( pTab!=0 );
+ 
+-    /* Convert LEFT JOIN into JOIN if there are terms of the right table
+-    ** of the LEFT JOIN used in the WHERE clause.
++    /* Try to simplify joins:
++    **
++    **      LEFT JOIN  ->  JOIN
++    **     RIGHT JOIN  ->  JOIN
++    **      FULL JOIN  ->  RIGHT JOIN
++    **
++    ** If terms of the i-th table are used in the WHERE clause in such a
++    ** way that the i-th table cannot be the NULL row of a join, then
++    ** perform the appropriate simplification. This is called
++    ** "OUTER JOIN strength reduction" in the SQLite documentation.
+     */
+-    if( (pItem->fg.jointype & (JT_LEFT|JT_RIGHT))==JT_LEFT
+-     && sqlite3ExprImpliesNonNullRow(p->pWhere, pItem->iCursor)
++    if( (pItem->fg.jointype & (JT_LEFT|JT_LTORJ))!=0
++     && sqlite3ExprImpliesNonNullRow(p->pWhere, pItem->iCursor,
++                                     pItem->fg.jointype & JT_LTORJ)
+      && OptimizationEnabled(db, SQLITE_SimplifyJoin)
+     ){
+-      SELECTTRACE(0x100,pParse,p,
+-                ("LEFT-JOIN simplifies to JOIN on term %d\n",i));
+-      pItem->fg.jointype &= ~(JT_LEFT|JT_OUTER);
+-      assert( pItem->iCursor>=0 );
+-      unsetJoinExpr(p->pWhere, pItem->iCursor,
+-                    pTabList->a[0].fg.jointype & JT_LTORJ);
++      if( pItem->fg.jointype & JT_LEFT ){
++        if( pItem->fg.jointype & JT_RIGHT ){
++          TREETRACE(0x1000,pParse,p,
++                    ("FULL-JOIN simplifies to RIGHT-JOIN on term %d\n",i));
++          pItem->fg.jointype &= ~JT_LEFT;
++        }else{
++          TREETRACE(0x1000,pParse,p,
++                    ("LEFT-JOIN simplifies to JOIN on term %d\n",i));
++          pItem->fg.jointype &= ~(JT_LEFT|JT_OUTER);
++          unsetJoinExpr(p->pWhere, pItem->iCursor, 0);
++        }
++      }
++      if( pItem->fg.jointype & JT_LTORJ ){
++        for(j=i+1; jnSrc; j++){
++          SrcItem *pI2 = &pTabList->a[j];
++          if( pI2->fg.jointype & JT_RIGHT ){
++            if( pI2->fg.jointype & JT_LEFT ){
++              TREETRACE(0x1000,pParse,p,
++                        ("FULL-JOIN simplifies to LEFT-JOIN on term %d\n",j));
++              pI2->fg.jointype &= ~JT_RIGHT;
++            }else{
++              TREETRACE(0x1000,pParse,p,
++                        ("RIGHT-JOIN simplifies to JOIN on term %d\n",j));
++              pI2->fg.jointype &= ~(JT_RIGHT|JT_OUTER);
++              unsetJoinExpr(p->pWhere, pI2->iCursor, 1);
++            }
++          }
++        }
++        for(j=pTabList->nSrc-1; j>=0; j--){
++          pTabList->a[j].fg.jointype &= ~JT_LTORJ;
++          if( pTabList->a[j].fg.jointype & JT_RIGHT ) break;
++        }
++      }
+     }
+ 
+-    /* No futher action if this term of the FROM clause is no a subquery */
++    /* No further action if this term of the FROM clause is not a subquery */
+     if( pSub==0 ) continue;
+ 
+     /* Catch mismatch in the declared columns of a view and the number of
+@@ -142402,6 +149352,14 @@ SQLITE_PRIVATE int sqlite3Select(
+       goto select_end;
+     }
+ 
++    /* Do not attempt the usual optimizations (flattening and ORDER BY
++    ** elimination) on a MATERIALIZED common table expression because
++    ** a MATERIALIZED common table expression is an optimization fence.
++    */
++    if( pItem->fg.isCte && pItem->u2.pCteUse->eM10d==M10d_Yes ){
++      continue;
++    }
++
+     /* Do not try to flatten an aggregate subquery.
+     **
+     ** Flattening an aggregate subquery is only possible if the outer query
+@@ -142431,6 +149389,8 @@ SQLITE_PRIVATE int sqlite3Select(
+     **            (a)  The outer query has a different ORDER BY clause
+     **            (b)  The subquery is part of a join
+     **          See forum post 062d576715d277c8
++    **
++    ** Also retain the ORDER BY if the OmitOrderBy optimization is disabled.
+     */
+     if( pSub->pOrderBy!=0
+      && (p->pOrderBy!=0 || pTabList->nSrc>1)      /* Condition (5) */
+@@ -142439,11 +149399,10 @@ SQLITE_PRIVATE int sqlite3Select(
+      && (p->selFlags & SF_OrderByReqd)==0         /* Condition (3) and (4) */
+      && OptimizationEnabled(db, SQLITE_OmitOrderBy)
+     ){
+-      SELECTTRACE(0x100,pParse,p,
++      TREETRACE(0x800,pParse,p,
+                 ("omit superfluous ORDER BY on %r FROM-clause subquery\n",i+1));
+-      sqlite3ParserAddCleanup(pParse,
+-         (void(*)(sqlite3*,void*))sqlite3ExprListDelete,
+-         pSub->pOrderBy);
++      sqlite3ParserAddCleanup(pParse, sqlite3ExprListDeleteGeneric,
++                              pSub->pOrderBy);
+       pSub->pOrderBy = 0;
+     }
+ 
+@@ -142494,8 +149453,8 @@ SQLITE_PRIVATE int sqlite3Select(
+   if( p->pPrior ){
+     rc = multiSelect(pParse, p, pDest);
+ #if TREETRACE_ENABLED
+-    SELECTTRACE(0x1,pParse,p,("end compound-select processing\n"));
+-    if( (sqlite3TreeTrace & 0x2000)!=0 && ExplainQueryPlanParent(pParse)==0 ){
++    TREETRACE(0x400,pParse,p,("end compound-select processing\n"));
++    if( (sqlite3TreeTrace & 0x400)!=0 && ExplainQueryPlanParent(pParse)==0 ){
+       sqlite3TreeViewSelect(0, p, 0);
+     }
+ #endif
+@@ -142515,24 +149474,21 @@ SQLITE_PRIVATE int sqlite3Select(
+    && propagateConstants(pParse, p)
+   ){
+ #if TREETRACE_ENABLED
+-    if( sqlite3TreeTrace & 0x100 ){
+-      SELECTTRACE(0x100,pParse,p,("After constant propagation:\n"));
++    if( sqlite3TreeTrace & 0x2000 ){
++      TREETRACE(0x2000,pParse,p,("After constant propagation:\n"));
+       sqlite3TreeViewSelect(0, p, 0);
+     }
+ #endif
+   }else{
+-    SELECTTRACE(0x100,pParse,p,("Constant propagation not helpful\n"));
++    TREETRACE(0x2000,pParse,p,("Constant propagation not helpful\n"));
+   }
+ 
+-#ifdef SQLITE_COUNTOFVIEW_OPTIMIZATION
+   if( OptimizationEnabled(db, SQLITE_QueryFlattener|SQLITE_CountOfView)
+    && countOfViewOptimization(pParse, p)
+   ){
+     if( db->mallocFailed ) goto select_end;
+-    pEList = p->pEList;
+     pTabList = p->pSrc;
+   }
+-#endif
+ 
+   /* For each term in the FROM clause, do two things:
+   ** (1) Authorized unreferenced tables
+@@ -142591,39 +149547,42 @@ SQLITE_PRIVATE int sqlite3Select(
+     if( OptimizationEnabled(db, SQLITE_PushDown)
+      && (pItem->fg.isCte==0
+          || (pItem->u2.pCteUse->eM10d!=M10d_Yes && pItem->u2.pCteUse->nUse<2))
+-     && pushDownWhereTerms(pParse, pSub, p->pWhere, pItem)
++     && pushDownWhereTerms(pParse, pSub, p->pWhere, pTabList, i)
+     ){
+ #if TREETRACE_ENABLED
+-      if( sqlite3TreeTrace & 0x100 ){
+-        SELECTTRACE(0x100,pParse,p,
++      if( sqlite3TreeTrace & 0x4000 ){
++        TREETRACE(0x4000,pParse,p,
+             ("After WHERE-clause push-down into subquery %d:\n", pSub->selId));
+         sqlite3TreeViewSelect(0, p, 0);
+       }
+ #endif
+       assert( pItem->pSelect && (pItem->pSelect->selFlags & SF_PushDown)!=0 );
+     }else{
+-      SELECTTRACE(0x100,pParse,p,("Push-down not possible\n"));
++      TREETRACE(0x4000,pParse,p,("Push-down not possible\n"));
++    }
++
++    /* Convert unused result columns of the subquery into simple NULL
++    ** expressions, to avoid unneeded searching and computation.
++    */
++    if( OptimizationEnabled(db, SQLITE_NullUnusedCols)
++     && disableUnusedSubqueryResultColumns(pItem)
++    ){
++#if TREETRACE_ENABLED
++      if( sqlite3TreeTrace & 0x4000 ){
++        TREETRACE(0x4000,pParse,p,
++            ("Change unused result columns to NULL for subquery %d:\n",
++             pSub->selId));
++        sqlite3TreeViewSelect(0, p, 0);
++      }
++#endif
+     }
+ 
+     zSavedAuthContext = pParse->zAuthContext;
+     pParse->zAuthContext = pItem->zName;
+ 
+     /* Generate code to implement the subquery
+-    **
+-    ** The subquery is implemented as a co-routine if all of the following are
+-    ** true:
+-    **
+-    **    (1)  the subquery is guaranteed to be the outer loop (so that
+-    **         it does not need to be computed more than once), and
+-    **    (2)  the subquery is not a CTE that should be materialized
+-    **    (3)  the subquery is not part of a left operand for a RIGHT JOIN
+     */
+-    if( i==0
+-     && (pTabList->nSrc==1
+-            || (pTabList->a[1].fg.jointype&(JT_OUTER|JT_CROSS))!=0)  /* (1) */
+-     && (pItem->fg.isCte==0 || pItem->u2.pCteUse->eM10d!=M10d_Yes)   /* (2) */
+-     && (pTabList->a[0].fg.jointype & JT_LTORJ)==0                   /* (3) */
+-    ){
++    if( fromClauseTermCanBeCoroutine(pParse, pTabList, i, p->selFlags) ){
+       /* Implement a co-routine that will return a single row of the result
+       ** set on each invocation.
+       */
+@@ -142645,7 +149604,7 @@ SQLITE_PRIVATE int sqlite3Select(
+     }else if( pItem->fg.isCte && pItem->u2.pCteUse->addrM9e>0 ){
+       /* This is a CTE for which materialization code has already been
+       ** generated.  Invoke the subroutine to compute the materialization,
+-      ** the make the pItem->iCursor be a copy of the ephemerial table that
++      ** the make the pItem->iCursor be a copy of the ephemeral table that
+       ** holds the result of the materialization. */
+       CteUse *pCteUse = pItem->u2.pCteUse;
+       sqlite3VdbeAddOp2(v, OP_Gosub, pCteUse->regRtn, pCteUse->addrM9e);
+@@ -142654,7 +149613,7 @@ SQLITE_PRIVATE int sqlite3Select(
+         VdbeComment((v, "%!S", pItem));
+       }
+       pSub->nSelectRow = pCteUse->nRowEst;
+-    }else if( (pPrior = isSelfJoinView(pTabList, pItem))!=0 ){
++    }else if( (pPrior = isSelfJoinView(pTabList, pItem, 0, i))!=0 ){
+       /* This view has already been materialized by a prior entry in
+       ** this same FROM clause.  Reuse it. */
+       if( pPrior->addrFillSub ){
+@@ -142668,6 +149627,9 @@ SQLITE_PRIVATE int sqlite3Select(
+       ** the same view can reuse the materialization. */
+       int topAddr;
+       int onceAddr = 0;
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++      int addrExplain;
++#endif
+ 
+       pItem->regReturn = ++pParse->nMem;
+       topAddr = sqlite3VdbeAddOp0(v, OP_Goto);
+@@ -142683,12 +149645,14 @@ SQLITE_PRIVATE int sqlite3Select(
+         VdbeNoopComment((v, "materialize %!S", pItem));
+       }
+       sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
+-      ExplainQueryPlan((pParse, 1, "MATERIALIZE %!S", pItem));
++
++      ExplainQueryPlan2(addrExplain, (pParse, 1, "MATERIALIZE %!S", pItem));
+       sqlite3Select(pParse, pSub, &dest);
+       pItem->pTab->nRowLogEst = pSub->nSelectRow;
+       if( onceAddr ) sqlite3VdbeJumpHere(v, onceAddr);
+       sqlite3VdbeAddOp2(v, OP_Return, pItem->regReturn, topAddr+1);
+       VdbeComment((v, "end %!S", pItem));
++      sqlite3VdbeScanStatusRange(v, addrExplain, addrExplain, -1);
+       sqlite3VdbeJumpHere(v, topAddr);
+       sqlite3ClearTempRegCache(pParse);
+       if( pItem->fg.isCte && pItem->fg.isCorrelated==0 ){
+@@ -142714,8 +149678,8 @@ SQLITE_PRIVATE int sqlite3Select(
+   sDistinct.isTnct = (p->selFlags & SF_Distinct)!=0;
+ 
+ #if TREETRACE_ENABLED
+-  if( sqlite3TreeTrace & 0x400 ){
+-    SELECTTRACE(0x400,pParse,p,("After all FROM-clause analysis:\n"));
++  if( sqlite3TreeTrace & 0x8000 ){
++    TREETRACE(0x8000,pParse,p,("After all FROM-clause analysis:\n"));
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -142751,8 +149715,8 @@ SQLITE_PRIVATE int sqlite3Select(
+     sDistinct.isTnct = 2;
+ 
+ #if TREETRACE_ENABLED
+-    if( sqlite3TreeTrace & 0x400 ){
+-      SELECTTRACE(0x400,pParse,p,("Transform DISTINCT into GROUP BY:\n"));
++    if( sqlite3TreeTrace & 0x20000 ){
++      TREETRACE(0x20000,pParse,p,("Transform DISTINCT into GROUP BY:\n"));
+       sqlite3TreeViewSelect(0, p, 0);
+     }
+ #endif
+@@ -142804,7 +149768,7 @@ SQLITE_PRIVATE int sqlite3Select(
+   if( (p->selFlags & SF_FixedLimit)==0 ){
+     p->nSelectRow = 320;  /* 4 billion rows */
+   }
+-  computeLimitRegisters(pParse, p, iEnd);
++  if( p->pLimit ) computeLimitRegisters(pParse, p, iEnd);
+   if( p->iLimit==0 && sSort.addrSortIndex>=0 ){
+     sqlite3VdbeChangeOpcode(v, sSort.addrSortIndex, OP_SorterOpen);
+     sSort.sortFlags |= SORTFLAG_UseSorter;
+@@ -142838,7 +149802,7 @@ SQLITE_PRIVATE int sqlite3Select(
+ 
+ 
+     /* Begin the database scan. */
+-    SELECTTRACE(1,pParse,p,("WhereBegin\n"));
++    TREETRACE(0x2,pParse,p,("WhereBegin\n"));
+     pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, sSort.pOrderBy,
+                                p->pEList, p, wctrlFlags, p->nSelectRow);
+     if( pWInfo==0 ) goto select_end;
+@@ -142855,7 +149819,7 @@ SQLITE_PRIVATE int sqlite3Select(
+         sSort.pOrderBy = 0;
+       }
+     }
+-    SELECTTRACE(1,pParse,p,("WhereBegin returns\n"));
++    TREETRACE(0x2,pParse,p,("WhereBegin returns\n"));
+ 
+     /* If sorting index that was created by a prior OP_OpenEphemeral
+     ** instruction ended up not being needed, then change the OP_OpenEphemeral
+@@ -142894,7 +149858,7 @@ SQLITE_PRIVATE int sqlite3Select(
+ 
+       /* End the database scan loop.
+       */
+-      SELECTTRACE(1,pParse,p,("WhereEnd\n"));
++      TREETRACE(0x2,pParse,p,("WhereEnd\n"));
+       sqlite3WhereEnd(pWInfo);
+     }
+   }else{
+@@ -142967,20 +149931,21 @@ SQLITE_PRIVATE int sqlite3Select(
+     */
+     pAggInfo = sqlite3DbMallocZero(db, sizeof(*pAggInfo) );
+     if( pAggInfo ){
+-      sqlite3ParserAddCleanup(pParse,
+-          (void(*)(sqlite3*,void*))agginfoFree, pAggInfo);
++      sqlite3ParserAddCleanup(pParse, agginfoFree, pAggInfo);
+       testcase( pParse->earlyCleanup );
+     }
+     if( db->mallocFailed ){
+       goto select_end;
+     }
+     pAggInfo->selId = p->selId;
++#ifdef SQLITE_DEBUG
++    pAggInfo->pSelect = p;
++#endif
+     memset(&sNC, 0, sizeof(sNC));
+     sNC.pParse = pParse;
+     sNC.pSrcList = pTabList;
+     sNC.uNC.pAggInfo = pAggInfo;
+     VVA_ONLY( sNC.ncFlags = NC_UAggInfo; )
+-    pAggInfo->mnReg = pParse->nMem+1;
+     pAggInfo->nSortingColumn = pGroupBy ? pGroupBy->nExpr : 0;
+     pAggInfo->pGroupBy = pGroupBy;
+     sqlite3ExprAnalyzeAggList(&sNC, pEList);
+@@ -143001,40 +149966,17 @@ SQLITE_PRIVATE int sqlite3Select(
+     }else{
+       minMaxFlag = WHERE_ORDERBY_NORMAL;
+     }
+-    for(i=0; inFunc; i++){
+-      Expr *pExpr = pAggInfo->aFunc[i].pFExpr;
+-      assert( ExprUseXList(pExpr) );
+-      sNC.ncFlags |= NC_InAggFunc;
+-      sqlite3ExprAnalyzeAggList(&sNC, pExpr->x.pList);
+-#ifndef SQLITE_OMIT_WINDOWFUNC
+-      assert( !IsWindowFunc(pExpr) );
+-      if( ExprHasProperty(pExpr, EP_WinFunc) ){
+-        sqlite3ExprAnalyzeAggregates(&sNC, pExpr->y.pWin->pFilter);
+-      }
+-#endif
+-      sNC.ncFlags &= ~NC_InAggFunc;
+-    }
+-    pAggInfo->mxReg = pParse->nMem;
++    analyzeAggFuncArgs(pAggInfo, &sNC);
+     if( db->mallocFailed ) goto select_end;
+ #if TREETRACE_ENABLED
+-    if( sqlite3TreeTrace & 0x400 ){
+-      int ii;
+-      SELECTTRACE(0x400,pParse,p,("After aggregate analysis %p:\n", pAggInfo));
++    if( sqlite3TreeTrace & 0x20 ){
++      TREETRACE(0x20,pParse,p,("After aggregate analysis %p:\n", pAggInfo));
+       sqlite3TreeViewSelect(0, p, 0);
+       if( minMaxFlag ){
+         sqlite3DebugPrintf("MIN/MAX Optimization (0x%02x) adds:\n", minMaxFlag);
+         sqlite3TreeViewExprList(0, pMinMaxOrderBy, 0, "ORDERBY");
+       }
+-      for(ii=0; iinColumn; ii++){
+-        sqlite3DebugPrintf("agg-column[%d] iMem=%d\n",
+-            ii, pAggInfo->aCol[ii].iMem);
+-        sqlite3TreeViewExpr(0, pAggInfo->aCol[ii].pCExpr, 0);
+-      }
+-      for(ii=0; iinFunc; ii++){
+-        sqlite3DebugPrintf("agg-func[%d]: iMem=%d\n",
+-            ii, pAggInfo->aFunc[ii].iMem);
+-        sqlite3TreeViewExpr(0, pAggInfo->aFunc[ii].pFExpr, 0);
+-      }
++      printAggInfo(pAggInfo);
+     }
+ #endif
+ 
+@@ -143044,7 +149986,7 @@ SQLITE_PRIVATE int sqlite3Select(
+     */
+     if( pGroupBy ){
+       KeyInfo *pKeyInfo;  /* Keying information for the group by clause */
+-      int addr1;          /* A-vs-B comparision jump */
++      int addr1;          /* A-vs-B comparison jump */
+       int addrOutputRow;  /* Start of subroutine that outputs a result row */
+       int regOutputRow;   /* Return address register for output subroutine */
+       int addrSetAbort;   /* Set the abort flag and return */
+@@ -143103,17 +150045,21 @@ SQLITE_PRIVATE int sqlite3Select(
+       ** in the right order to begin with.
+       */
+       sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
+-      SELECTTRACE(1,pParse,p,("WhereBegin\n"));
++      TREETRACE(0x2,pParse,p,("WhereBegin\n"));
+       pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, pDistinct,
+-          0, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY)
++          p, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY)
+           |  (orderByGrp ? WHERE_SORTBYGROUP : 0) | distFlag, 0
+       );
+       if( pWInfo==0 ){
+         sqlite3ExprListDelete(db, pDistinct);
+         goto select_end;
+       }
++      if( pParse->pIdxEpr ){
++        optimizeAggregateUseOfIndexedExpr(pParse, p, pAggInfo, &sNC);
++      }
++      assignAggregateRegisters(pParse, pAggInfo);
+       eDist = sqlite3WhereIsDistinct(pWInfo);
+-      SELECTTRACE(1,pParse,p,("WhereBegin returns\n"));
++      TREETRACE(0x2,pParse,p,("WhereBegin returns\n"));
+       if( sqlite3WhereIsOrdered(pWInfo)==pGroupBy->nExpr ){
+         /* The optimizer is able to deliver rows in group by order so
+         ** we do not have to sort.  The OP_OpenEphemeral table will be
+@@ -143131,9 +150077,13 @@ SQLITE_PRIVATE int sqlite3Select(
+         int nCol;
+         int nGroupBy;
+ 
+-        explainTempTable(pParse,
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++        int addrExp;              /* Address of OP_Explain instruction */
++#endif
++        ExplainQueryPlan2(addrExp, (pParse, 0, "USE TEMP B-TREE FOR %s",
+             (sDistinct.isTnct && (p->selFlags&SF_Distinct)==0) ?
+-                    "DISTINCT" : "GROUP BY");
++                    "DISTINCT" : "GROUP BY"
++        ));
+ 
+         groupBySort = 1;
+         nGroupBy = pGroupBy->nExpr;
+@@ -143148,28 +150098,50 @@ SQLITE_PRIVATE int sqlite3Select(
+         regBase = sqlite3GetTempRange(pParse, nCol);
+         sqlite3ExprCodeExprList(pParse, pGroupBy, regBase, 0, 0);
+         j = nGroupBy;
++        pAggInfo->directMode = 1;
+         for(i=0; inColumn; i++){
+           struct AggInfo_col *pCol = &pAggInfo->aCol[i];
+           if( pCol->iSorterColumn>=j ){
+-            int r1 = j + regBase;
+-            sqlite3ExprCodeGetColumnOfTable(v,
+-                               pCol->pTab, pCol->iTable, pCol->iColumn, r1);
++            sqlite3ExprCode(pParse, pCol->pCExpr, j + regBase);
+             j++;
+           }
+         }
++        pAggInfo->directMode = 0;
+         regRecord = sqlite3GetTempReg(pParse);
++        sqlite3VdbeScanStatusCounters(v, addrExp, 0, sqlite3VdbeCurrentAddr(v));
+         sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol, regRecord);
+         sqlite3VdbeAddOp2(v, OP_SorterInsert, pAggInfo->sortingIdx, regRecord);
++        sqlite3VdbeScanStatusRange(v, addrExp, sqlite3VdbeCurrentAddr(v)-2, -1);
+         sqlite3ReleaseTempReg(pParse, regRecord);
+         sqlite3ReleaseTempRange(pParse, regBase, nCol);
+-        SELECTTRACE(1,pParse,p,("WhereEnd\n"));
++        TREETRACE(0x2,pParse,p,("WhereEnd\n"));
+         sqlite3WhereEnd(pWInfo);
+         pAggInfo->sortingIdxPTab = sortPTab = pParse->nTab++;
+         sortOut = sqlite3GetTempReg(pParse);
++        sqlite3VdbeScanStatusCounters(v, addrExp, sqlite3VdbeCurrentAddr(v), 0);
+         sqlite3VdbeAddOp3(v, OP_OpenPseudo, sortPTab, sortOut, nCol);
+         sqlite3VdbeAddOp2(v, OP_SorterSort, pAggInfo->sortingIdx, addrEnd);
+         VdbeComment((v, "GROUP BY sort")); VdbeCoverage(v);
+         pAggInfo->useSortingIdx = 1;
++        sqlite3VdbeScanStatusRange(v, addrExp, -1, sortPTab);
++        sqlite3VdbeScanStatusRange(v, addrExp, -1, pAggInfo->sortingIdx);
++      }
++
++      /* If there are entries in pAgggInfo->aFunc[] that contain subexpressions
++      ** that are indexed (and that were previously identified and tagged
++      ** in optimizeAggregateUseOfIndexedExpr()) then those subexpressions
++      ** must now be converted into a TK_AGG_COLUMN node so that the value
++      ** is correctly pulled from the index rather than being recomputed. */
++      if( pParse->pIdxEpr ){
++        aggregateConvertIndexedExprRefToColumn(pAggInfo);
++#if TREETRACE_ENABLED
++        if( sqlite3TreeTrace & 0x20 ){
++          TREETRACE(0x20, pParse, p,
++             ("AggInfo function expressions converted to reference index\n"));
++          sqlite3TreeViewSelect(0, p, 0);
++          printAggInfo(pAggInfo);
++        }
++#endif
+       }
+ 
+       /* If the index or temporary table used by the GROUP BY sort
+@@ -143240,7 +150212,7 @@ SQLITE_PRIVATE int sqlite3Select(
+         sqlite3VdbeAddOp2(v, OP_SorterNext, pAggInfo->sortingIdx,addrTopOfLoop);
+         VdbeCoverage(v);
+       }else{
+-        SELECTTRACE(1,pParse,p,("WhereEnd\n"));
++        TREETRACE(0x2,pParse,p,("WhereEnd\n"));
+         sqlite3WhereEnd(pWInfo);
+         sqlite3VdbeChangeToNoop(v, addrSortingIdx);
+       }
+@@ -143350,7 +150322,8 @@ SQLITE_PRIVATE int sqlite3Select(
+         if( pKeyInfo ){
+           sqlite3VdbeChangeP4(v, -1, (char *)pKeyInfo, P4_KEYINFO);
+         }
+-        sqlite3VdbeAddOp2(v, OP_Count, iCsr, pAggInfo->aFunc[0].iMem);
++        assignAggregateRegisters(pParse, pAggInfo);
++        sqlite3VdbeAddOp2(v, OP_Count, iCsr, AggInfoFuncReg(pAggInfo,0));
+         sqlite3VdbeAddOp1(v, OP_Close, iCsr);
+         explainSimpleCount(pParse, pTab, pBest);
+       }else{
+@@ -143386,6 +150359,7 @@ SQLITE_PRIVATE int sqlite3Select(
+           pDistinct = pAggInfo->aFunc[0].pFExpr->x.pList;
+           distFlag = pDistinct ? (WHERE_WANT_DISTINCT|WHERE_AGG_DISTINCT) : 0;
+         }
++        assignAggregateRegisters(pParse, pAggInfo);
+ 
+         /* This case runs if the aggregate has no GROUP BY clause.  The
+         ** processing is much simpler since there is only a single row
+@@ -143402,13 +150376,13 @@ SQLITE_PRIVATE int sqlite3Select(
+         assert( minMaxFlag==WHERE_ORDERBY_NORMAL || pMinMaxOrderBy!=0 );
+         assert( pMinMaxOrderBy==0 || pMinMaxOrderBy->nExpr==1 );
+ 
+-        SELECTTRACE(1,pParse,p,("WhereBegin\n"));
++        TREETRACE(0x2,pParse,p,("WhereBegin\n"));
+         pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pMinMaxOrderBy,
+-                                   pDistinct, 0, minMaxFlag|distFlag, 0);
++                                   pDistinct, p, minMaxFlag|distFlag, 0);
+         if( pWInfo==0 ){
+           goto select_end;
+         }
+-        SELECTTRACE(1,pParse,p,("WhereBegin returns\n"));
++        TREETRACE(0x2,pParse,p,("WhereBegin returns\n"));
+         eDist = sqlite3WhereIsDistinct(pWInfo);
+         updateAccumulator(pParse, regAcc, pAggInfo, eDist);
+         if( eDist!=WHERE_DISTINCT_NOOP ){
+@@ -143422,7 +150396,7 @@ SQLITE_PRIVATE int sqlite3Select(
+         if( minMaxFlag ){
+           sqlite3WhereMinMaxOptEarlyOut(v, pWInfo);
+         }
+-        SELECTTRACE(1,pParse,p,("WhereEnd\n"));
++        TREETRACE(0x2,pParse,p,("WhereEnd\n"));
+         sqlite3WhereEnd(pWInfo);
+         finalizeAggFunctions(pParse, pAggInfo);
+       }
+@@ -143444,8 +150418,6 @@ SQLITE_PRIVATE int sqlite3Select(
+   ** and send them to the callback one by one.
+   */
+   if( sSort.pOrderBy ){
+-    explainTempTable(pParse,
+-                     sSort.nOBSat>0 ? "RIGHT PART OF ORDER BY":"ORDER BY");
+     assert( p->pEList==pEList );
+     generateSortTail(pParse, p, &sSort, pEList->nExpr, pDest);
+   }
+@@ -143469,7 +150441,7 @@ select_end:
+   if( pAggInfo && !db->mallocFailed ){
+     for(i=0; inColumn; i++){
+       Expr *pExpr = pAggInfo->aCol[i].pCExpr;
+-      assert( pExpr!=0 );
++      if( pExpr==0 ) continue;
+       assert( pExpr->pAggInfo==pAggInfo );
+       assert( pExpr->iAgg==i );
+     }
+@@ -143483,8 +150455,8 @@ select_end:
+ #endif
+ 
+ #if TREETRACE_ENABLED
+-  SELECTTRACE(0x1,pParse,p,("end processing\n"));
+-  if( (sqlite3TreeTrace & 0x2000)!=0 && ExplainQueryPlanParent(pParse)==0 ){
++  TREETRACE(0x1,pParse,p,("end processing\n"));
++  if( (sqlite3TreeTrace & 0x40000)!=0 && ExplainQueryPlanParent(pParse)==0 ){
+     sqlite3TreeViewSelect(0, p, 0);
+   }
+ #endif
+@@ -143758,7 +150730,7 @@ SQLITE_PRIVATE Trigger *sqlite3TriggerList(Parse *pParse, Table *pTab){
+     if( pTrig->pTabSchema==pTab->pSchema
+      && pTrig->table
+      && 0==sqlite3StrICmp(pTrig->table, pTab->zName)
+-     && pTrig->pTabSchema!=pTmpSchema
++     && (pTrig->pTabSchema!=pTmpSchema || pTrig->bReturning)
+     ){
+       pTrig->pNext = pList;
+       pList = pTrig;
+@@ -143880,6 +150852,10 @@ SQLITE_PRIVATE void sqlite3BeginTrigger(
+     sqlite3ErrorMsg(pParse, "cannot create triggers on virtual tables");
+     goto trigger_orphan_error;
+   }
++  if( (pTab->tabFlags & TF_Shadow)!=0 && sqlite3ReadOnlyShadowTables(db) ){
++    sqlite3ErrorMsg(pParse, "cannot create triggers on shadow tables");
++    goto trigger_orphan_error;
++  }
+ 
+   /* Check that the trigger name is not reserved and that no trigger of the
+   ** specified name exists */
+@@ -143899,6 +150875,7 @@ SQLITE_PRIVATE void sqlite3BeginTrigger(
+       }else{
+         assert( !db->init.busy );
+         sqlite3CodeVerifySchema(pParse, iDb);
++        VVA_ONLY( pParse->ifNotExists = 1; )
+       }
+       goto trigger_cleanup;
+     }
+@@ -144662,10 +151639,17 @@ static void codeReturningTrigger(
+   SrcList sFrom;
+ 
+   assert( v!=0 );
+-  assert( pParse->bReturning );
++  if( !pParse->bReturning ){
++    /* This RETURNING trigger must be for a different statement as
++    ** this statement lacks a RETURNING clause. */
++    return;
++  }
+   assert( db->pParse==pParse );
+   pReturning = pParse->u1.pReturning;
+-  assert( pTrigger == &(pReturning->retTrig) );
++  if( pTrigger != &(pReturning->retTrig) ){
++    /* This RETURNING trigger is for a different statement */
++    return;
++  }
+   memset(&sSelect, 0, sizeof(sSelect));
+   memset(&sFrom, 0, sizeof(sFrom));
+   sSelect.pEList = sqlite3ExprListDup(db, pReturning->pReturnEL, 0);
+@@ -144680,7 +151664,7 @@ static void codeReturningTrigger(
+   }
+   sqlite3ExprListDelete(db, sSelect.pEList);
+   pNew = sqlite3ExpandReturning(pParse, pReturning->pReturnEL, pTab);
+-  if( !db->mallocFailed ){
++  if( pParse->nErr==0 ){
+     NameContext sNC;
+     memset(&sNC, 0, sizeof(sNC));
+     if( pReturning->nRetCol==0 ){
+@@ -144888,7 +151872,7 @@ static TriggerPrg *codeRowTrigger(
+   sSubParse.zAuthContext = pTrigger->zName;
+   sSubParse.eTriggerOp = pTrigger->op;
+   sSubParse.nQueryLoop = pParse->nQueryLoop;
+-  sSubParse.disableVtab = pParse->disableVtab;
++  sSubParse.prepFlags = pParse->prepFlags;
+ 
+   v = sqlite3GetVdbe(&sSubParse);
+   if( v ){
+@@ -145149,6 +152133,9 @@ SQLITE_PRIVATE u32 sqlite3TriggerColmask(
+   Trigger *p;
+ 
+   assert( isNew==1 || isNew==0 );
++  if( IsView(pTab) ){
++    return 0xffffffff;
++  }
+   for(p=pTrigger; p; p=p->pNext){
+     if( p->op==op
+      && (tr_tm&p->tr_tm)
+@@ -145234,11 +152221,14 @@ static void updateVirtualTable(
+ ** it has been converted into REAL.
+ */
+ SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
++  Column *pCol;
+   assert( pTab!=0 );
+-  if( !IsView(pTab) ){
++  assert( pTab->nCol>i );
++  pCol = &pTab->aCol[i];
++  if( pCol->iDflt ){
+     sqlite3_value *pValue = 0;
+     u8 enc = ENC(sqlite3VdbeDb(v));
+-    Column *pCol = &pTab->aCol[i];
++    assert( !IsView(pTab) );
+     VdbeComment((v, "%s.%s", pTab->zName, pCol->zCnName));
+     assert( inCol );
+     sqlite3ValueFromExpr(sqlite3VdbeDb(v),
+@@ -145249,7 +152239,7 @@ SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
+     }
+   }
+ #ifndef SQLITE_OMIT_FLOATING_POINT
+-  if( pTab->aCol[i].affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
++  if( pCol->affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
+     sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
+   }
+ #endif
+@@ -145396,7 +152386,7 @@ static void updateFromSelect(
+ 
+   assert( pTabList->nSrc>1 );
+   if( pSrc ){
+-    pSrc->a[0].fg.notCte = 1;
++    assert( pSrc->a[0].fg.notCte );
+     pSrc->a[0].iCursor = -1;
+     pSrc->a[0].pTab->nTabRef--;
+     pSrc->a[0].pTab = 0;
+@@ -145435,7 +152425,8 @@ static void updateFromSelect(
+     }
+   }
+   pSelect = sqlite3SelectNew(pParse, pList,
+-      pSrc, pWhere2, pGrp, 0, pOrderBy2, SF_UFSrcCheck|SF_IncludeHidden, pLimit2
++      pSrc, pWhere2, pGrp, 0, pOrderBy2,
++      SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom, pLimit2
+   );
+   if( pSelect ) pSelect->selFlags |= SF_OrderByReqd;
+   sqlite3SelectDestInit(&dest, eDest, iEph);
+@@ -145579,7 +152570,7 @@ SQLITE_PRIVATE void sqlite3Update(
+   if( sqlite3ViewGetColumnNames(pParse, pTab) ){
+     goto update_cleanup;
+   }
+-  if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
++  if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
+     goto update_cleanup;
+   }
+ 
+@@ -145898,12 +152889,22 @@ SQLITE_PRIVATE void sqlite3Update(
+       /* Begin the database scan.
+       **
+       ** Do not consider a single-pass strategy for a multi-row update if
+-      ** there are any triggers or foreign keys to process, or rows may
+-      ** be deleted as a result of REPLACE conflict handling. Any of these
+-      ** things might disturb a cursor being used to scan through the table
+-      ** or index, causing a single-pass approach to malfunction.  */
++      ** there is anything that might disrupt the cursor being used to do
++      ** the UPDATE:
++      **   (1) This is a nested UPDATE
++      **   (2) There are triggers
++      **   (3) There are FOREIGN KEY constraints
++      **   (4) There are REPLACE conflict handlers
++      **   (5) There are subqueries in the WHERE clause
++      */
+       flags = WHERE_ONEPASS_DESIRED;
+-      if( !pParse->nested && !pTrigger && !hasFK && !chngKey && !bReplace ){
++      if( !pParse->nested
++       && !pTrigger
++       && !hasFK
++       && !chngKey
++       && !bReplace
++       && (pWhere==0 || !ExprHasProperty(pWhere, EP_Subquery))
++      ){
+         flags |= WHERE_ONEPASS_MULTIROW;
+       }
+       pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere,0,0,0,flags,iIdxCur);
+@@ -145974,6 +152975,8 @@ SQLITE_PRIVATE void sqlite3Update(
+ 
+     if( !isView ){
+       int addrOnce = 0;
++      int iNotUsed1 = 0;
++      int iNotUsed2 = 0;
+ 
+       /* Open every index that needs updating. */
+       if( eOnePass!=ONEPASS_OFF ){
+@@ -145985,7 +152988,7 @@ SQLITE_PRIVATE void sqlite3Update(
+         addrOnce = sqlite3VdbeAddOp0(v, OP_Once); VdbeCoverage(v);
+       }
+       sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, 0, iBaseCur,
+-                                 aToOpen, 0, 0);
++                                 aToOpen, &iNotUsed1, &iNotUsed2);
+       if( addrOnce ){
+         sqlite3VdbeJumpHereOrPopInst(v, addrOnce);
+       }
+@@ -146276,8 +153279,10 @@ SQLITE_PRIVATE void sqlite3Update(
+     sqlite3VdbeAddOp2(v, OP_AddImm, regRowCount, 1);
+   }
+ 
+-  sqlite3CodeRowTrigger(pParse, pTrigger, TK_UPDATE, pChanges,
+-      TRIGGER_AFTER, pTab, regOldRowid, onError, labelContinue);
++  if( pTrigger ){
++    sqlite3CodeRowTrigger(pParse, pTrigger, TK_UPDATE, pChanges,
++        TRIGGER_AFTER, pTab, regOldRowid, onError, labelContinue);
++  }
+ 
+   /* Repeat the above with the next record to be updated, until
+   ** all record selected by the WHERE clause have been updated.
+@@ -146372,7 +153377,7 @@ static void updateVirtualTable(
+   int nArg = 2 + pTab->nCol;      /* Number of arguments to VUpdate */
+   int regArg;                     /* First register in VUpdate arg array */
+   int regRec;                     /* Register in which to assemble record */
+-  int regRowid;                   /* Register for ephem table rowid */
++  int regRowid;                   /* Register for ephemeral table rowid */
+   int iCsr = pSrc->a[0].iCursor;  /* Cursor used for virtual table scan */
+   int aDummy[2];                  /* Unused arg for sqlite3WhereOkOnePass() */
+   int eOnePass;                   /* True to use onepass strategy */
+@@ -146416,7 +153421,9 @@ static void updateVirtualTable(
+           sqlite3ExprDup(db, pChanges->a[aXRef[i]].pExpr, 0)
+         );
+       }else{
+-        pList = sqlite3ExprListAppend(pParse, pList, exprRowColumn(pParse, i));
++        Expr *pRowExpr = exprRowColumn(pParse, i);
++        if( pRowExpr ) pRowExpr->op2 = OPFLAG_NOCHNG;
++        pList = sqlite3ExprListAppend(pParse, pList, pRowExpr);
+       }
+     }
+ 
+@@ -146493,7 +153500,7 @@ static void updateVirtualTable(
+       sqlite3WhereEnd(pWInfo);
+     }
+ 
+-    /* Begin scannning through the ephemeral table. */
++    /* Begin scanning through the ephemeral table. */
+     addr = sqlite3VdbeAddOp1(v, OP_Rewind, ephemTab); VdbeCoverage(v);
+ 
+     /* Extract arguments from the current row of the ephemeral table and
+@@ -146689,6 +153696,7 @@ SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(
+         if( pIdx->aiColumn[ii]==XN_EXPR ){
+           assert( pIdx->aColExpr!=0 );
+           assert( pIdx->aColExpr->nExpr>ii );
++          assert( pIdx->bHasExpr );
+           pExpr = pIdx->aColExpr->a[ii].pExpr;
+           if( pExpr->op!=TK_COLLATE ){
+             sCol[0].pLeft = pExpr;
+@@ -146700,7 +153708,7 @@ SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(
+           pExpr = &sCol[0];
+         }
+         for(jj=0; jja[jj].pExpr,pExpr,iCursor)<2 ){
++          if( sqlite3ExprCompare(0,pTarget->a[jj].pExpr,pExpr,iCursor)<2 ){
+             break;  /* Column ii of the index matches column jj of target */
+           }
+         }
+@@ -147002,6 +154010,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3RunVacuum(
+   int nDb;                /* Number of attached databases */
+   const char *zDbMain;    /* Schema name of database to vacuum */
+   const char *zOut;       /* Name of output file */
++  u32 pgflags = PAGER_SYNCHRONOUS_OFF; /* sync flags for output db */
+ 
+   if( !db->autoCommit ){
+     sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
+@@ -147048,7 +154057,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3RunVacuum(
+   ** (possibly synchronous) transaction opened on the main database before
+   ** sqlite3BtreeCopyFile() is called.
+   **
+-  ** An optimisation would be to use a non-journaled pager.
++  ** An optimization would be to use a non-journaled pager.
+   ** (Later:) I tried setting "PRAGMA vacuum_db.journal_mode=OFF" but
+   ** that actually made the VACUUM run slower.  Very little journalling
+   ** actually occurs when doing a vacuum since the vacuum_db is initially
+@@ -147073,12 +154082,17 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3RunVacuum(
+       goto end_of_vacuum;
+     }
+     db->mDbFlags |= DBFLAG_VacuumInto;
++
++    /* For a VACUUM INTO, the pager-flags are set to the same values as
++    ** they are for the database being vacuumed, except that PAGER_CACHESPILL
++    ** is always set. */
++    pgflags = db->aDb[iDb].safety_level | (db->flags & PAGER_FLAGS_MASK);
+   }
+   nRes = sqlite3BtreeGetRequestedReserve(pMain);
+ 
+   sqlite3BtreeSetCacheSize(pTemp, db->aDb[iDb].pSchema->cache_size);
+   sqlite3BtreeSetSpillSize(pTemp, sqlite3BtreeSetSpillSize(pMain,0));
+-  sqlite3BtreeSetPagerFlags(pTemp, PAGER_SYNCHRONOUS_OFF|PAGER_CACHESPILL);
++  sqlite3BtreeSetPagerFlags(pTemp, pgflags|PAGER_CACHESPILL);
+ 
+   /* Begin a transaction and take an exclusive lock on the main database
+   ** file. This is done before the sqlite3BtreeGetPageSize(pMain) call below,
+@@ -147462,10 +154476,10 @@ SQLITE_PRIVATE void sqlite3VtabUnlock(VTable *pVTab){
+   pVTab->nRef--;
+   if( pVTab->nRef==0 ){
+     sqlite3_vtab *p = pVTab->pVtab;
+-    sqlite3VtabModuleUnref(pVTab->db, pVTab->pMod);
+     if( p ){
+       p->pModule->xDisconnect(p);
+     }
++    sqlite3VtabModuleUnref(pVTab->db, pVTab->pMod);
+     sqlite3DbFree(db, pVTab);
+   }
+ }
+@@ -147566,7 +154580,6 @@ SQLITE_PRIVATE void sqlite3VtabUnlockList(sqlite3 *db){
+ 
+   if( p ){
+     db->pDisconnect = 0;
+-    sqlite3ExpirePreparedStatements(db, 0);
+     do {
+       VTable *pNext = p->pNext;
+       sqlite3VtabUnlock(p);
+@@ -147591,7 +154604,8 @@ SQLITE_PRIVATE void sqlite3VtabUnlockList(sqlite3 *db){
+ */
+ SQLITE_PRIVATE void sqlite3VtabClear(sqlite3 *db, Table *p){
+   assert( IsVirtual(p) );
+-  if( !db || db->pnBytesFreed==0 ) vtabDisconnectAll(0, p);
++  assert( db!=0 );
++  if( db->pnBytesFreed==0 ) vtabDisconnectAll(0, p);
+   if( p->u.vtab.azArg ){
+     int i;
+     for(i=0; iu.vtab.nArg; i++){
+@@ -147731,7 +154745,7 @@ SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){
+     ** the information we've collected.
+     **
+     ** The VM register number pParse->regRowid holds the rowid of an
+-    ** entry in the sqlite_schema table tht was created for this vtab
++    ** entry in the sqlite_schema table that was created for this vtab
+     ** by sqlite3StartTable().
+     */
+     iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+@@ -147860,7 +154874,9 @@ static int vtabCallConstructor(
+   sCtx.pPrior = db->pVtabCtx;
+   sCtx.bDeclared = 0;
+   db->pVtabCtx = &sCtx;
++  pTab->nTabRef++;
+   rc = xConstruct(db, pMod->pAux, nArg, azArg, &pVTable->pVtab, &zErr);
++  sqlite3DeleteTable(db, pTab);
+   db->pVtabCtx = sCtx.pPrior;
+   if( rc==SQLITE_NOMEM ) sqlite3OomFault(db);
+   assert( sCtx.pTab==pTab );
+@@ -148069,7 +155085,7 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
+   sqlite3_mutex_enter(db->mutex);
+   pCtx = db->pVtabCtx;
+   if( !pCtx || pCtx->bDeclared ){
+-    sqlite3Error(db, SQLITE_MISUSE);
++    sqlite3Error(db, SQLITE_MISUSE_BKPT);
+     sqlite3_mutex_leave(db->mutex);
+     return SQLITE_MISUSE_BKPT;
+   }
+@@ -148350,7 +155366,10 @@ SQLITE_PRIVATE int sqlite3VtabSavepoint(sqlite3 *db, int op, int iSavepoint){
+             break;
+         }
+         if( xMethod && pVTab->iSavepoint>iSavepoint ){
++          u64 savedFlags = (db->flags & SQLITE_Defensive);
++          db->flags &= ~(u64)SQLITE_Defensive;
+           rc = xMethod(pVTab->pVtab, iSavepoint);
++          db->flags |= savedFlags;
+         }
+         sqlite3VtabUnlock(pVTab);
+       }
+@@ -148391,7 +155410,7 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(
+   if( pExpr->op!=TK_COLUMN ) return pDef;
+   assert( ExprUseYTab(pExpr) );
+   pTab = pExpr->y.pTab;
+-  if( pTab==0 ) return pDef;
++  if( NEVER(pTab==0) ) return pDef;
+   if( !IsVirtual(pTab) ) return pDef;
+   pVtab = sqlite3GetVTable(db, pTab)->pVtab;
+   assert( pVtab!=0 );
+@@ -148470,7 +155489,7 @@ SQLITE_PRIVATE void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){
+ **
+ ** An eponymous virtual table instance is one that is named after its
+ ** module, and more importantly, does not require a CREATE VIRTUAL TABLE
+-** statement in order to come into existance.  Eponymous virtual table
++** statement in order to come into existence.  Eponymous virtual table
+ ** instances always exist.  They cannot be DROP-ed.
+ **
+ ** Any virtual table module for which xConnect and xCreate are the same
+@@ -148579,6 +155598,10 @@ SQLITE_API int sqlite3_vtab_config(sqlite3 *db, int op, ...){
+         p->pVTable->eVtabRisk = SQLITE_VTABRISK_High;
+         break;
+       }
++      case SQLITE_VTAB_USES_ALL_SCHEMAS: {
++        p->pVTable->bAllSchemas = 1;
++        break;
++      }
+       default: {
+         rc = SQLITE_MISUSE_BKPT;
+         break;
+@@ -148657,7 +155680,7 @@ typedef struct WhereRightJoin WhereRightJoin;
+ 
+ /*
+ ** This object is a header on a block of allocated memory that will be
+-** automatically freed when its WInfo oject is destructed.
++** automatically freed when its WInfo object is destructed.
+ */
+ struct WhereMemBlock {
+   WhereMemBlock *pNext;      /* Next block in the chain */
+@@ -148718,7 +155741,7 @@ struct WhereLevel {
+         int iCur;              /* The VDBE cursor used by this IN operator */
+         int addrInTop;         /* Top of the IN loop */
+         int iBase;             /* Base register of multi-key index record */
+-        int nPrefix;           /* Number of prior entires in the key */
++        int nPrefix;           /* Number of prior entries in the key */
+         u8 eEndLoopOp;         /* IN Loop terminator. OP_Next or OP_Prev */
+       } *aInLoop;           /* Information about each nested IN operator */
+     } in;                 /* Used when pWLoop->wsFlags&WHERE_IN_ABLE */
+@@ -148968,7 +155991,7 @@ struct WhereClause {
+   int nTerm;               /* Number of terms */
+   int nSlot;               /* Number of entries in a[] */
+   int nBase;               /* Number of terms through the last non-Virtual */
+-  WhereTerm *a;            /* Each a[] describes a term of the WHERE cluase */
++  WhereTerm *a;            /* Each a[] describes a term of the WHERE clause */
+ #if defined(SQLITE_SMALL_STACK)
+   WhereTerm aStatic[1];    /* Initial static space for a[] */
+ #else
+@@ -148998,7 +156021,7 @@ struct WhereAndInfo {
+ ** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
+ **
+ ** The VDBE cursor numbers are small integers contained in
+-** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE
++** SrcItem.iCursor and Expr.iTable fields.  For any given WHERE
+ ** clause, the cursor numbers might not begin with 0 and they might
+ ** contain gaps in the numbering sequence.  But we want to make maximum
+ ** use of the bits in our bitmasks.  This structure provides a mapping
+@@ -149069,20 +156092,6 @@ struct WhereLoopBuilder {
+ # define SQLITE_QUERY_PLANNER_LIMIT_INCR 1000
+ #endif
+ 
+-/*
+-** Each instance of this object records a change to a single node
+-** in an expression tree to cause that node to point to a column
+-** of an index rather than an expression or a virtual column.  All
+-** such transformations need to be undone at the end of WHERE clause
+-** processing.
+-*/
+-typedef struct WhereExprMod WhereExprMod;
+-struct WhereExprMod {
+-  WhereExprMod *pNext;  /* Next translation on a list of them all */
+-  Expr *pExpr;          /* The Expr node that was transformed */
+-  Expr orig;            /* Original value of the Expr node */
+-};
+-
+ /*
+ ** The WHERE clause processing routine has two halves.  The
+ ** first part does the start of the WHERE loop and the second
+@@ -149098,10 +156107,10 @@ struct WhereInfo {
+   SrcList *pTabList;        /* List of tables in the join */
+   ExprList *pOrderBy;       /* The ORDER BY clause or NULL */
+   ExprList *pResultSet;     /* Result set of the query */
++#if WHERETRACE_ENABLED
+   Expr *pWhere;             /* The complete WHERE clause */
+-#ifndef SQLITE_OMIT_VIRTUALTABLE
+-  Select *pLimit;           /* Used to access LIMIT expr/registers for vtabs */
+ #endif
++  Select *pSelect;          /* The entire SELECT statement containing WHERE */
+   int aiCurOnePass[2];      /* OP_OpenWrite cursors for the ONEPASS opt */
+   int iContinue;            /* Jump here to continue with next record */
+   int iBreak;               /* Jump here to break out of the loop */
+@@ -149120,7 +156129,6 @@ struct WhereInfo {
+   int iTop;                 /* The very beginning of the WHERE loop */
+   int iEndWhere;            /* End of the WHERE clause itself */
+   WhereLoop *pLoops;        /* List of all WhereLoop objects */
+-  WhereExprMod *pExprMods;  /* Expression modifications */
+   WhereMemBlock *pMemToFree;/* Memory to free when this object destroyed */
+   Bitmask revMask;          /* Mask of ORDER BY terms that need reversing */
+   WhereClause sWC;          /* Decomposition of the WHERE clause */
+@@ -149137,7 +156145,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereGetMask(WhereMaskSet*,int);
+ #ifdef WHERETRACE_ENABLED
+ SQLITE_PRIVATE void sqlite3WhereClausePrint(WhereClause *pWC);
+ SQLITE_PRIVATE void sqlite3WhereTermPrint(WhereTerm *pTerm, int iTerm);
+-SQLITE_PRIVATE void sqlite3WhereLoopPrint(WhereLoop *p, WhereClause *pWC);
++SQLITE_PRIVATE void sqlite3WhereLoopPrint(const WhereLoop *p, const WhereClause *pWC);
+ #endif
+ SQLITE_PRIVATE WhereTerm *sqlite3WhereFindTerm(
+   WhereClause *pWC,     /* The WHERE clause to be searched */
+@@ -149268,6 +156276,8 @@ SQLITE_PRIVATE void sqlite3WhereTabFuncArgs(Parse*, SrcItem*, WhereClause*);
+ #define WHERE_BLOOMFILTER  0x00400000  /* Consider using a Bloom-filter */
+ #define WHERE_SELFCULL     0x00800000  /* nOut reduced by extra WHERE terms */
+ #define WHERE_OMIT_OFFSET  0x01000000  /* Set offset counter to zero */
++                      /*   0x02000000  -- available for reuse */
++#define WHERE_EXPRIDX      0x04000000  /* Uses an index-on-expressions */
+ 
+ #endif /* !defined(SQLITE_WHEREINT_H) */
+ 
+@@ -149365,9 +156375,9 @@ static void explainIndexRange(StrAccum *pStr, WhereLoop *pLoop){
+ 
+ /*
+ ** This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
+-** command, or if either SQLITE_DEBUG or SQLITE_ENABLE_STMT_SCANSTATUS was
+-** defined at compile-time. If it is not a no-op, a single OP_Explain opcode
+-** is added to the output to describe the table scan strategy in pLevel.
++** command, or if stmt_scanstatus_v2() stats are enabled, or if SQLITE_DEBUG
++** was defined at compile-time. If it is not a no-op, a single OP_Explain
++** opcode is added to the output to describe the table scan strategy in pLevel.
+ **
+ ** If an OP_Explain opcode is added to the VM, its address is returned.
+ ** Otherwise, if no OP_Explain is coded, zero is returned.
+@@ -149379,8 +156389,8 @@ SQLITE_PRIVATE int sqlite3WhereExplainOneScan(
+   u16 wctrlFlags                  /* Flags passed to sqlite3WhereBegin() */
+ ){
+   int ret = 0;
+-#if !defined(SQLITE_DEBUG) && !defined(SQLITE_ENABLE_STMT_SCANSTATUS)
+-  if( sqlite3ParseToplevel(pParse)->explain==2 )
++#if !defined(SQLITE_DEBUG)
++  if( sqlite3ParseToplevel(pParse)->explain==2 || IS_STMT_SCANSTATUS(pParse->db) )
+ #endif
+   {
+     SrcItem *pItem = &pTabList->a[pLevel->iFrom];
+@@ -149524,6 +156534,8 @@ SQLITE_PRIVATE int sqlite3WhereExplainBloomFilter(
+   zMsg = sqlite3StrAccumFinish(&str);
+   ret = sqlite3VdbeAddOp4(v, OP_Explain, sqlite3VdbeCurrentAddr(v),
+                           pParse->addrExplain, 0, zMsg,P4_DYNAMIC);
++
++  sqlite3VdbeScanStatus(v, sqlite3VdbeCurrentAddr(v)-1, 0, 0, 0, 0);
+   return ret;
+ }
+ #endif /* SQLITE_OMIT_EXPLAIN */
+@@ -149544,16 +156556,37 @@ SQLITE_PRIVATE void sqlite3WhereAddScanStatus(
+   WhereLevel *pLvl,               /* Level to add scanstatus() entry for */
+   int addrExplain                 /* Address of OP_Explain (or 0) */
+ ){
+-  const char *zObj = 0;
+-  WhereLoop *pLoop = pLvl->pWLoop;
+-  if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0  &&  pLoop->u.btree.pIndex!=0 ){
+-    zObj = pLoop->u.btree.pIndex->zName;
+-  }else{
+-    zObj = pSrclist->a[pLvl->iFrom].zName;
++  if( IS_STMT_SCANSTATUS( sqlite3VdbeDb(v) ) ){
++    const char *zObj = 0;
++    WhereLoop *pLoop = pLvl->pWLoop;
++    int wsFlags = pLoop->wsFlags;
++    int viaCoroutine = 0;
++
++    if( (wsFlags & WHERE_VIRTUALTABLE)==0  &&  pLoop->u.btree.pIndex!=0 ){
++      zObj = pLoop->u.btree.pIndex->zName;
++    }else{
++      zObj = pSrclist->a[pLvl->iFrom].zName;
++      viaCoroutine = pSrclist->a[pLvl->iFrom].fg.viaCoroutine;
++    }
++    sqlite3VdbeScanStatus(
++        v, addrExplain, pLvl->addrBody, pLvl->addrVisit, pLoop->nOut, zObj
++    );
++
++    if( viaCoroutine==0 ){
++      if( (wsFlags & (WHERE_MULTI_OR|WHERE_AUTO_INDEX))==0 ){
++        sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iTabCur);
++      }
++      if( wsFlags & WHERE_INDEXED ){
++        sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iIdxCur);
++      }
++    }else{
++      int addr = pSrclist->a[pLvl->iFrom].addrFillSub;
++      VdbeOp *pOp = sqlite3VdbeGetOp(v, addr-1);
++      assert( sqlite3VdbeDb(v)->mallocFailed || pOp->opcode==OP_InitCoroutine );
++      assert( sqlite3VdbeDb(v)->mallocFailed || pOp->p2>addr );
++      sqlite3VdbeScanStatusRange(v, addrExplain, addr, pOp->p2-1);
++    }
+   }
+-  sqlite3VdbeScanStatus(
+-      v, addrExplain, pLvl->addrBody, pLvl->addrVisit, pLoop->nOut, zObj
+-  );
+ }
+ #endif
+ 
+@@ -149613,7 +156646,7 @@ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){
+       pTerm->wtFlags |= TERM_CODED;
+     }
+ #ifdef WHERETRACE_ENABLED
+-    if( sqlite3WhereTrace & 0x20000 ){
++    if( (sqlite3WhereTrace & 0x4001)==0x4001 ){
+       sqlite3DebugPrintf("DISABLE-");
+       sqlite3WhereTermPrint(pTerm, (int)(pTerm - (pTerm->pWC->a)));
+     }
+@@ -149728,68 +156761,75 @@ static Expr *removeUnindexableInClauseTerms(
+   Expr *pX              /* The IN expression to be reduced */
+ ){
+   sqlite3 *db = pParse->db;
++  Select *pSelect;            /* Pointer to the SELECT on the RHS */
+   Expr *pNew;
+   pNew = sqlite3ExprDup(db, pX, 0);
+   if( db->mallocFailed==0 ){
+-    ExprList *pOrigRhs;         /* Original unmodified RHS */
+-    ExprList *pOrigLhs;         /* Original unmodified LHS */
+-    ExprList *pRhs = 0;         /* New RHS after modifications */
+-    ExprList *pLhs = 0;         /* New LHS after mods */
+-    int i;                      /* Loop counter */
+-    Select *pSelect;            /* Pointer to the SELECT on the RHS */
+-
+-    assert( ExprUseXSelect(pNew) );
+-    pOrigRhs = pNew->x.pSelect->pEList;
+-    assert( pNew->pLeft!=0 );
+-    assert( ExprUseXList(pNew->pLeft) );
+-    pOrigLhs = pNew->pLeft->x.pList;
+-    for(i=iEq; inLTerm; i++){
+-      if( pLoop->aLTerm[i]->pExpr==pX ){
+-        int iField;
+-        assert( (pLoop->aLTerm[i]->eOperator & (WO_OR|WO_AND))==0 );
+-        iField = pLoop->aLTerm[i]->u.x.iField - 1;
+-        if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
+-        pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
+-        pOrigRhs->a[iField].pExpr = 0;
+-        assert( pOrigLhs->a[iField].pExpr!=0 );
+-        pLhs = sqlite3ExprListAppend(pParse, pLhs, pOrigLhs->a[iField].pExpr);
+-        pOrigLhs->a[iField].pExpr = 0;
+-      }
+-    }
+-    sqlite3ExprListDelete(db, pOrigRhs);
+-    sqlite3ExprListDelete(db, pOrigLhs);
+-    pNew->pLeft->x.pList = pLhs;
+-    pNew->x.pSelect->pEList = pRhs;
+-    if( pLhs && pLhs->nExpr==1 ){
+-      /* Take care here not to generate a TK_VECTOR containing only a
+-      ** single value. Since the parser never creates such a vector, some
+-      ** of the subroutines do not handle this case.  */
+-      Expr *p = pLhs->a[0].pExpr;
+-      pLhs->a[0].pExpr = 0;
+-      sqlite3ExprDelete(db, pNew->pLeft);
+-      pNew->pLeft = p;
+-    }
+-    pSelect = pNew->x.pSelect;
+-    if( pSelect->pOrderBy ){
+-      /* If the SELECT statement has an ORDER BY clause, zero the
+-      ** iOrderByCol variables. These are set to non-zero when an
+-      ** ORDER BY term exactly matches one of the terms of the
+-      ** result-set. Since the result-set of the SELECT statement may
+-      ** have been modified or reordered, these variables are no longer
+-      ** set correctly.  Since setting them is just an optimization,
+-      ** it's easiest just to zero them here.  */
+-      ExprList *pOrderBy = pSelect->pOrderBy;
+-      for(i=0; inExpr; i++){
+-        pOrderBy->a[i].u.x.iOrderByCol = 0;
++    for(pSelect=pNew->x.pSelect; pSelect; pSelect=pSelect->pPrior){
++      ExprList *pOrigRhs;         /* Original unmodified RHS */
++      ExprList *pOrigLhs = 0;     /* Original unmodified LHS */
++      ExprList *pRhs = 0;         /* New RHS after modifications */
++      ExprList *pLhs = 0;         /* New LHS after mods */
++      int i;                      /* Loop counter */
++
++      assert( ExprUseXSelect(pNew) );
++      pOrigRhs = pSelect->pEList;
++      assert( pNew->pLeft!=0 );
++      assert( ExprUseXList(pNew->pLeft) );
++      if( pSelect==pNew->x.pSelect ){
++        pOrigLhs = pNew->pLeft->x.pList;
++      }
++      for(i=iEq; inLTerm; i++){
++        if( pLoop->aLTerm[i]->pExpr==pX ){
++          int iField;
++          assert( (pLoop->aLTerm[i]->eOperator & (WO_OR|WO_AND))==0 );
++          iField = pLoop->aLTerm[i]->u.x.iField - 1;
++          if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
++          pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
++          pOrigRhs->a[iField].pExpr = 0;
++          if( pOrigLhs ){
++            assert( pOrigLhs->a[iField].pExpr!=0 );
++            pLhs = sqlite3ExprListAppend(pParse,pLhs,pOrigLhs->a[iField].pExpr);
++            pOrigLhs->a[iField].pExpr = 0;
++          }
++        }
++      }
++      sqlite3ExprListDelete(db, pOrigRhs);
++      if( pOrigLhs ){
++        sqlite3ExprListDelete(db, pOrigLhs);
++        pNew->pLeft->x.pList = pLhs;
++      }
++      pSelect->pEList = pRhs;
++      if( pLhs && pLhs->nExpr==1 ){
++        /* Take care here not to generate a TK_VECTOR containing only a
++        ** single value. Since the parser never creates such a vector, some
++        ** of the subroutines do not handle this case.  */
++        Expr *p = pLhs->a[0].pExpr;
++        pLhs->a[0].pExpr = 0;
++        sqlite3ExprDelete(db, pNew->pLeft);
++        pNew->pLeft = p;
++      }
++      if( pSelect->pOrderBy ){
++        /* If the SELECT statement has an ORDER BY clause, zero the
++        ** iOrderByCol variables. These are set to non-zero when an
++        ** ORDER BY term exactly matches one of the terms of the
++        ** result-set. Since the result-set of the SELECT statement may
++        ** have been modified or reordered, these variables are no longer
++        ** set correctly.  Since setting them is just an optimization,
++        ** it's easiest just to zero them here.  */
++        ExprList *pOrderBy = pSelect->pOrderBy;
++        for(i=0; inExpr; i++){
++          pOrderBy->a[i].u.x.iOrderByCol = 0;
++        }
+       }
+-    }
+ 
+ #if 0
+-    printf("For indexing, change the IN expr:\n");
+-    sqlite3TreeViewExpr(0, pX, 0);
+-    printf("Into:\n");
+-    sqlite3TreeViewExpr(0, pNew, 0);
++      printf("For indexing, change the IN expr:\n");
++      sqlite3TreeViewExpr(0, pX, 0);
++      printf("Into:\n");
++      sqlite3TreeViewExpr(0, pNew, 0);
+ #endif
++    }
+   }
+   return pNew;
+ }
+@@ -150042,7 +157082,7 @@ static int codeAllEqualityTerms(
+   /* Figure out how many memory cells we will need then allocate them.
+   */
+   regBase = pParse->nMem + 1;
+-  nReg = pLoop->u.btree.nEq + nExtraReg;
++  nReg = nEq + nExtraReg;
+   pParse->nMem += nReg;
+ 
+   zAff = sqlite3DbStrDup(pParse->db,sqlite3IndexAffinityStr(pParse->db,pIdx));
+@@ -150089,9 +157129,6 @@ static int codeAllEqualityTerms(
+         sqlite3VdbeAddOp2(v, OP_Copy, r1, regBase+j);
+       }
+     }
+-  }
+-  for(j=nSkip; jaLTerm[j];
+     if( pTerm->eOperator & WO_IN ){
+       if( pTerm->pExpr->flags & EP_xIsSelect ){
+         /* No affinity ever needs to be (or should be) applied to a value
+@@ -150147,7 +157184,7 @@ static void whereLikeOptimizationStringFixup(
+   if( pTerm->wtFlags & TERM_LIKEOPT ){
+     VdbeOp *pOp;
+     assert( pLevel->iLikeRepCntr>0 );
+-    pOp = sqlite3VdbeGetOp(v, -1);
++    pOp = sqlite3VdbeGetLastOp(v);
+     assert( pOp!=0 );
+     assert( pOp->opcode==OP_String8
+             || pTerm->pWC->pWInfo->pParse->db->mallocFailed );
+@@ -150234,18 +157271,19 @@ static int codeCursorHintIsOrFunction(Walker *pWalker, Expr *pExpr){
+ **   2) transform the expression node to a TK_REGISTER node that reads
+ **      from the newly populated register.
+ **
+-** Also, if the node is a TK_COLUMN that does access the table idenified
++** Also, if the node is a TK_COLUMN that does access the table identified
+ ** by pCCurHint.iTabCur, and an index is being used (which we will
+ ** know because CCurHint.pIdx!=0) then transform the TK_COLUMN into
+ ** an access of the index rather than the original table.
+ */
+ static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
+   int rc = WRC_Continue;
++  int reg;
+   struct CCurHint *pHint = pWalker->u.pCCurHint;
+   if( pExpr->op==TK_COLUMN ){
+     if( pExpr->iTable!=pHint->iTabCur ){
+-      int reg = ++pWalker->pParse->nMem;   /* Register for column value */
+-      sqlite3ExprCode(pWalker->pParse, pExpr, reg);
++      reg = ++pWalker->pParse->nMem;   /* Register for column value */
++      reg = sqlite3ExprCodeTarget(pWalker->pParse, pExpr, reg);
+       pExpr->op = TK_REGISTER;
+       pExpr->iTable = reg;
+     }else if( pHint->pIdx!=0 ){
+@@ -150253,15 +157291,15 @@ static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
+       pExpr->iColumn = sqlite3TableColumnToIndex(pHint->pIdx, pExpr->iColumn);
+       assert( pExpr->iColumn>=0 );
+     }
+-  }else if( pExpr->op==TK_AGG_FUNCTION ){
+-    /* An aggregate function in the WHERE clause of a query means this must
+-    ** be a correlated sub-query, and expression pExpr is an aggregate from
+-    ** the parent context. Do not walk the function arguments in this case.
+-    **
+-    ** todo: It should be possible to replace this node with a TK_REGISTER
+-    ** expression, as the result of the expression must be stored in a
+-    ** register at this point. The same holds for TK_AGG_COLUMN nodes. */
++  }else if( pExpr->pAggInfo ){
+     rc = WRC_Prune;
++    reg = ++pWalker->pParse->nMem;   /* Register for column value */
++    reg = sqlite3ExprCodeTarget(pWalker->pParse, pExpr, reg);
++    pExpr->op = TK_REGISTER;
++    pExpr->iTable = reg;
++  }else if( pExpr->op==TK_TRUEFALSE ){
++    /* Do not walk disabled expressions.  tag-20230504-1 */
++    return WRC_Prune;
+   }
+   return rc;
+ }
+@@ -150363,7 +157401,7 @@ static void codeCursorHint(
+   }
+   if( pExpr!=0 ){
+     sWalker.xExprCallback = codeCursorHintFixExpr;
+-    sqlite3WalkExpr(&sWalker, pExpr);
++    if( pParse->nErr==0 ) sqlite3WalkExpr(&sWalker, pExpr);
+     sqlite3VdbeAddOp4(v, OP_CursorHint,
+                       (sHint.pIdx ? sHint.iIdxCur : sHint.iTabCur), 0, 0,
+                       (const char*)pExpr, P4_EXPR);
+@@ -150471,143 +157509,6 @@ static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
+   }
+ }
+ 
+-/* An instance of the IdxExprTrans object carries information about a
+-** mapping from an expression on table columns into a column in an index
+-** down through the Walker.
+-*/
+-typedef struct IdxExprTrans {
+-  Expr *pIdxExpr;    /* The index expression */
+-  int iTabCur;       /* The cursor of the corresponding table */
+-  int iIdxCur;       /* The cursor for the index */
+-  int iIdxCol;       /* The column for the index */
+-  int iTabCol;       /* The column for the table */
+-  WhereInfo *pWInfo; /* Complete WHERE clause information */
+-  sqlite3 *db;       /* Database connection (for malloc()) */
+-} IdxExprTrans;
+-
+-/*
+-** Preserve pExpr on the WhereETrans list of the WhereInfo.
+-*/
+-static void preserveExpr(IdxExprTrans *pTrans, Expr *pExpr){
+-  WhereExprMod *pNew;
+-  pNew = sqlite3DbMallocRaw(pTrans->db, sizeof(*pNew));
+-  if( pNew==0 ) return;
+-  pNew->pNext = pTrans->pWInfo->pExprMods;
+-  pTrans->pWInfo->pExprMods = pNew;
+-  pNew->pExpr = pExpr;
+-  memcpy(&pNew->orig, pExpr, sizeof(*pExpr));
+-}
+-
+-/* The walker node callback used to transform matching expressions into
+-** a reference to an index column for an index on an expression.
+-**
+-** If pExpr matches, then transform it into a reference to the index column
+-** that contains the value of pExpr.
+-*/
+-static int whereIndexExprTransNode(Walker *p, Expr *pExpr){
+-  IdxExprTrans *pX = p->u.pIdxTrans;
+-  if( sqlite3ExprCompare(0, pExpr, pX->pIdxExpr, pX->iTabCur)==0 ){
+-    pExpr = sqlite3ExprSkipCollate(pExpr);
+-    preserveExpr(pX, pExpr);
+-    pExpr->affExpr = sqlite3ExprAffinity(pExpr);
+-    pExpr->op = TK_COLUMN;
+-    pExpr->iTable = pX->iIdxCur;
+-    pExpr->iColumn = pX->iIdxCol;
+-    testcase( ExprHasProperty(pExpr, EP_Unlikely) );
+-    ExprClearProperty(pExpr, EP_Skip|EP_Unlikely|EP_WinFunc|EP_Subrtn);
+-    pExpr->y.pTab = 0;
+-    return WRC_Prune;
+-  }else{
+-    return WRC_Continue;
+-  }
+-}
+-
+-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
+-/* A walker node callback that translates a column reference to a table
+-** into a corresponding column reference of an index.
+-*/
+-static int whereIndexExprTransColumn(Walker *p, Expr *pExpr){
+-  if( pExpr->op==TK_COLUMN ){
+-    IdxExprTrans *pX = p->u.pIdxTrans;
+-    if( pExpr->iTable==pX->iTabCur && pExpr->iColumn==pX->iTabCol ){
+-      assert( ExprUseYTab(pExpr) && pExpr->y.pTab!=0 );
+-      preserveExpr(pX, pExpr);
+-      pExpr->affExpr = sqlite3TableColumnAffinity(pExpr->y.pTab,pExpr->iColumn);
+-      pExpr->iTable = pX->iIdxCur;
+-      pExpr->iColumn = pX->iIdxCol;
+-      pExpr->y.pTab = 0;
+-    }
+-  }
+-  return WRC_Continue;
+-}
+-#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
+-
+-/*
+-** For an indexes on expression X, locate every instance of expression X
+-** in pExpr and change that subexpression into a reference to the appropriate
+-** column of the index.
+-**
+-** 2019-10-24: Updated to also translate references to a VIRTUAL column in
+-** the table into references to the corresponding (stored) column of the
+-** index.
+-*/
+-static void whereIndexExprTrans(
+-  Index *pIdx,      /* The Index */
+-  int iTabCur,      /* Cursor of the table that is being indexed */
+-  int iIdxCur,      /* Cursor of the index itself */
+-  WhereInfo *pWInfo /* Transform expressions in this WHERE clause */
+-){
+-  int iIdxCol;               /* Column number of the index */
+-  ExprList *aColExpr;        /* Expressions that are indexed */
+-  Table *pTab;
+-  Walker w;
+-  IdxExprTrans x;
+-  aColExpr = pIdx->aColExpr;
+-  if( aColExpr==0 && !pIdx->bHasVCol ){
+-    /* The index does not reference any expressions or virtual columns
+-    ** so no translations are needed. */
+-    return;
+-  }
+-  pTab = pIdx->pTable;
+-  memset(&w, 0, sizeof(w));
+-  w.u.pIdxTrans = &x;
+-  x.iTabCur = iTabCur;
+-  x.iIdxCur = iIdxCur;
+-  x.pWInfo = pWInfo;
+-  x.db = pWInfo->pParse->db;
+-  for(iIdxCol=0; iIdxColnColumn; iIdxCol++){
+-    i16 iRef = pIdx->aiColumn[iIdxCol];
+-    if( iRef==XN_EXPR ){
+-      assert( aColExpr!=0 && aColExpr->a[iIdxCol].pExpr!=0 );
+-      x.pIdxExpr = aColExpr->a[iIdxCol].pExpr;
+-      if( sqlite3ExprIsConstant(x.pIdxExpr) ) continue;
+-      w.xExprCallback = whereIndexExprTransNode;
+-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
+-    }else if( iRef>=0
+-       && (pTab->aCol[iRef].colFlags & COLFLAG_VIRTUAL)!=0
+-       && ((pTab->aCol[iRef].colFlags & COLFLAG_HASCOLL)==0
+-           || sqlite3StrICmp(sqlite3ColumnColl(&pTab->aCol[iRef]),
+-                                               sqlite3StrBINARY)==0)
+-    ){
+-      /* Check to see if there are direct references to generated columns
+-      ** that are contained in the index.  Pulling the generated column
+-      ** out of the index is an optimization only - the main table is always
+-      ** available if the index cannot be used.  To avoid unnecessary
+-      ** complication, omit this optimization if the collating sequence for
+-      ** the column is non-standard */
+-      x.iTabCol = iRef;
+-      w.xExprCallback = whereIndexExprTransColumn;
+-#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
+-    }else{
+-      continue;
+-    }
+-    x.iIdxCol = iIdxCol;
+-    sqlite3WalkExpr(&w, pWInfo->pWhere);
+-    sqlite3WalkExprList(&w, pWInfo->pOrderBy);
+-    sqlite3WalkExprList(&w, pWInfo->pResultSet);
+-  }
+-}
+-
+ /*
+ ** The pTruth expression is always true because it is the WHERE clause
+ ** a partial index that is driving a query loop.  Look through all of the
+@@ -150676,6 +157577,8 @@ static SQLITE_NOINLINE void filterPullDown(
+       testcase( pTerm->wtFlags & TERM_VIRTUAL );
+       regRowid = sqlite3GetTempReg(pParse);
+       regRowid = codeEqualityTerm(pParse, pTerm, pLevel, 0, 0, regRowid);
++      sqlite3VdbeAddOp2(pParse->pVdbe, OP_MustBeInt, regRowid, addrNxt);
++      VdbeCoverage(pParse->pVdbe);
+       sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
+                            addrNxt, regRowid, 1);
+       VdbeCoverage(pParse->pVdbe);
+@@ -150735,13 +157638,15 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+   pLevel->notReady = notReady & ~sqlite3WhereGetMask(&pWInfo->sMaskSet, iCur);
+   bRev = (pWInfo->revMask>>iLevel)&1;
+   VdbeModuleComment((v, "Begin WHERE-loop%d: %s",iLevel,pTabItem->pTab->zName));
+-#if WHERETRACE_ENABLED /* 0x20800 */
+-  if( sqlite3WhereTrace & 0x800 ){
++#if WHERETRACE_ENABLED /* 0x4001 */
++  if( sqlite3WhereTrace & 0x1 ){
+     sqlite3DebugPrintf("Coding level %d of %d:  notReady=%llx  iFrom=%d\n",
+        iLevel, pWInfo->nLevel, (u64)notReady, pLevel->iFrom);
+-    sqlite3WhereLoopPrint(pLoop, pWC);
++    if( sqlite3WhereTrace & 0x1000 ){
++      sqlite3WhereLoopPrint(pLoop, pWC);
++    }
+   }
+-  if( sqlite3WhereTrace & 0x20000 ){
++  if( (sqlite3WhereTrace & 0x4001)==0x4001 ){
+     if( iLevel==0 ){
+       sqlite3DebugPrintf("WHERE clause being coded:\n");
+       sqlite3TreeViewExpr(0, pWInfo->pWhere, 0);
+@@ -150827,9 +157732,9 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+          && pLoop->u.vtab.bOmitOffset
+         ){
+           assert( pTerm->eOperator==WO_AUX );
+-          assert( pWInfo->pLimit!=0 );
+-          assert( pWInfo->pLimit->iOffset>0 );
+-          sqlite3VdbeAddOp2(v, OP_Integer, 0, pWInfo->pLimit->iOffset);
++          assert( pWInfo->pSelect!=0 );
++          assert( pWInfo->pSelect->iOffset>0 );
++          sqlite3VdbeAddOp2(v, OP_Integer, 0, pWInfo->pSelect->iOffset);
+           VdbeComment((v,"Zero OFFSET counter"));
+         }
+       }
+@@ -150937,6 +157842,8 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     if( iRowidReg!=iReleaseReg ) sqlite3ReleaseTempReg(pParse, iReleaseReg);
+     addrNxt = pLevel->addrNxt;
+     if( pLevel->regFilter ){
++      sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
++      VdbeCoverage(v);
+       sqlite3VdbeAddOp4Int(v, OP_Filter, pLevel->regFilter, addrNxt,
+                            iRowidReg, 1);
+       VdbeCoverage(v);
+@@ -150982,7 +157889,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+       };
+       assert( TK_LE==TK_GT+1 );      /* Make sure the ordering.. */
+       assert( TK_LT==TK_GT+2 );      /*  ... of the TK_xx values... */
+-      assert( TK_GE==TK_GT+3 );      /*  ... is correcct. */
++      assert( TK_GE==TK_GT+3 );      /*  ... is correct. */
+ 
+       assert( (pStart->wtFlags & TERM_VNULL)==0 );
+       testcase( pStart->wtFlags & TERM_VIRTUAL );
+@@ -151288,6 +158195,11 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+         ** guess. */
+         addrSeekScan = sqlite3VdbeAddOp1(v, OP_SeekScan,
+                                          (pIdx->aiRowLogEst[0]+9)/10);
++        if( pRangeStart || pRangeEnd ){
++          sqlite3VdbeChangeP5(v, 1);
++          sqlite3VdbeChangeP2(v, addrSeekScan, sqlite3VdbeCurrentAddr(v)+1);
++          addrSeekScan = 0;
++        }
+         VdbeCoverage(v);
+       }
+       sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
+@@ -151324,16 +158236,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     assert( pLevel->p2==0 );
+     if( pRangeEnd ){
+       Expr *pRight = pRangeEnd->pExpr->pRight;
+-      if( addrSeekScan ){
+-        /* For a seek-scan that has a range on the lowest term of the index,
+-        ** we have to make the top of the loop be code that sets the end
+-        ** condition of the range.  Otherwise, the OP_SeekScan might jump
+-        ** over that initialization, leaving the range-end value set to the
+-        ** range-start value, resulting in a wrong answer.
+-        ** See ticket 5981a8c041a3c2f3 (2021-11-02).
+-        */
+-        pLevel->p2 = sqlite3VdbeCurrentAddr(v);
+-      }
++      assert( addrSeekScan==0 );
+       codeExprOrVector(pParse, pRight, regBase+nEq, nTop);
+       whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
+       if( (pRangeEnd->wtFlags & TERM_VNULL)==0
+@@ -151363,11 +158266,11 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+       }
+       nConstraint++;
+     }
+-    sqlite3DbFree(db, zStartAff);
+-    sqlite3DbFree(db, zEndAff);
++    if( zStartAff ) sqlite3DbNNFreeNN(db, zStartAff);
++    if( zEndAff ) sqlite3DbNNFreeNN(db, zEndAff);
+ 
+     /* Top of the loop body */
+-    if( pLevel->p2==0 ) pLevel->p2 = sqlite3VdbeCurrentAddr(v);
++    pLevel->p2 = sqlite3VdbeCurrentAddr(v);
+ 
+     /* Check if the index cursor is past the end of the range. */
+     if( nConstraint ){
+@@ -151426,27 +158329,6 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     }
+ 
+     if( pLevel->iLeftJoin==0 ){
+-      /* If pIdx is an index on one or more expressions, then look through
+-      ** all the expressions in pWInfo and try to transform matching expressions
+-      ** into reference to index columns.  Also attempt to translate references
+-      ** to virtual columns in the table into references to (stored) columns
+-      ** of the index.
+-      **
+-      ** Do not do this for the RHS of a LEFT JOIN. This is because the
+-      ** expression may be evaluated after OP_NullRow has been executed on
+-      ** the cursor. In this case it is important to do the full evaluation,
+-      ** as the result of the expression may not be NULL, even if all table
+-      ** column values are.  https://www.sqlite.org/src/info/7fa8049685b50b5a
+-      **
+-      ** Also, do not do this when processing one index an a multi-index
+-      ** OR clause, since the transformation will become invalid once we
+-      ** move forward to the next index.
+-      ** https://sqlite.org/src/info/4e8e4857d32d401f
+-      */
+-      if( (pWInfo->wctrlFlags & (WHERE_OR_SUBCLAUSE|WHERE_RIGHT_JOIN))==0 ){
+-        whereIndexExprTrans(pIdx, iCur, iIdxCur, pWInfo);
+-      }
+-
+       /* If a partial index is driving the loop, try to eliminate WHERE clause
+       ** terms from the query that must be true due to the WHERE clause of
+       ** the partial index.
+@@ -151559,7 +158441,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+       int nNotReady;                 /* The number of notReady tables */
+       SrcItem *origSrc;              /* Original list of tables */
+       nNotReady = pWInfo->nLevel - iLevel - 1;
+-      pOrTab = sqlite3StackAllocRaw(db,
++      pOrTab = sqlite3DbMallocRawNN(db,
+                             sizeof(*pOrTab)+ nNotReady*sizeof(pOrTab->a[0]));
+       if( pOrTab==0 ) return notReady;
+       pOrTab->nAlloc = (u8)(nNotReady + 1);
+@@ -151679,7 +158561,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+         }
+         /* Loop through table entries that match term pOrTerm. */
+         ExplainQueryPlan((pParse, 1, "INDEX %d", ii+1));
+-        WHERETRACE(0xffff, ("Subplan for OR-clause:\n"));
++        WHERETRACE(0xffffffff, ("Subplan for OR-clause:\n"));
+         pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrExpr, 0, 0, 0,
+                                       WHERE_OR_SUBCLAUSE, iCovCur);
+         assert( pSubWInfo || pParse->nErr );
+@@ -151812,7 +158694,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     assert( pLevel->op==OP_Return );
+     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
+ 
+-    if( pWInfo->nLevel>1 ){ sqlite3StackFree(db, pOrTab); }
++    if( pWInfo->nLevel>1 ){ sqlite3DbFreeNN(db, pOrTab); }
+     if( !untestedTerms ) disableTerm(pLevel, pTerm);
+   }else
+ #endif /* SQLITE_OMIT_OR_OPTIMIZATION */
+@@ -151916,12 +158798,12 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+         }
+ #endif
+       }
+-#ifdef WHERETRACE_ENABLED /* 0xffff */
++#ifdef WHERETRACE_ENABLED /* 0xffffffff */
+       if( sqlite3WhereTrace ){
+         VdbeNoopComment((v, "WhereTerm[%d] (%p) priority=%d",
+                          pWC->nTerm-j, pTerm, iLoop));
+       }
+-      if( sqlite3WhereTrace & 0x800 ){
++      if( sqlite3WhereTrace & 0x4000 ){
+         sqlite3DebugPrintf("Coding auxiliary constraint:\n");
+         sqlite3WhereTermPrint(pTerm, pWC->nTerm-j);
+       }
+@@ -151950,8 +158832,8 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     if( pTerm->leftCursor!=iCur ) continue;
+     if( pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT) ) continue;
+     pE = pTerm->pExpr;
+-#ifdef WHERETRACE_ENABLED /* 0x800 */
+-    if( sqlite3WhereTrace & 0x800 ){
++#ifdef WHERETRACE_ENABLED /* 0x4001 */
++    if( (sqlite3WhereTrace & 0x4001)==0x4001 ){
+       sqlite3DebugPrintf("Coding transitive constraint:\n");
+       sqlite3WhereTermPrint(pTerm, pWC->nTerm-j);
+     }
+@@ -152066,13 +158948,13 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
+     }
+   }
+ 
+-#if WHERETRACE_ENABLED /* 0x20800 */
+-  if( sqlite3WhereTrace & 0x20000 ){
++#if WHERETRACE_ENABLED /* 0x4001 */
++  if( sqlite3WhereTrace & 0x4000 ){
+     sqlite3DebugPrintf("All WHERE-clause terms after coding level %d:\n",
+                        iLevel);
+     sqlite3WhereClausePrint(pWC);
+   }
+-  if( sqlite3WhereTrace & 0x800 ){
++  if( sqlite3WhereTrace & 0x1 ){
+     sqlite3DebugPrintf("End Coding level %d:  notReady=%llx\n",
+        iLevel, (u64)pLevel->notReady);
+   }
+@@ -152187,7 +159069,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE void sqlite3WhereRightJoinLoop(
+ ** the WHERE clause of SQL statements.
+ **
+ ** This file was originally part of where.c but was split out to improve
+-** readability and editabiliity.  This file contains utility routines for
++** readability and editability.  This file contains utility routines for
+ ** analyzing Expr objects in the WHERE clause.
+ */
+ /* #include "sqliteInt.h" */
+@@ -152403,7 +159285,7 @@ static int isLikeOrGlob(
+     ** range search. The third is because the caller assumes that the pattern
+     ** consists of at least one character after all escapes have been
+     ** removed.  */
+-    if( cnt!=0 && 255!=(u8)z[cnt-1] && (cnt>1 || z[0]!=wc[3]) ){
++    if( (cnt>1 || (cnt>0 && z[0]!=wc[3])) && 255!=(u8)z[cnt-1] ){
+       Expr *pPrefix;
+ 
+       /* A "complete" match if the pattern ends with "*" or "%" */
+@@ -152440,7 +159322,7 @@ static int isLikeOrGlob(
+         if( pLeft->op!=TK_COLUMN
+          || sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT
+          || (ALWAYS( ExprUseYTab(pLeft) )
+-             && pLeft->y.pTab
++             && ALWAYS(pLeft->y.pTab)
+              && IsVirtual(pLeft->y.pTab))  /* Might be numeric */
+         ){
+           int isNum;
+@@ -152557,8 +159439,7 @@ static int isAuxiliaryVtabOperator(
+     **       MATCH(expression,vtab_column)
+     */
+     pCol = pList->a[1].pExpr;
+-    assert( pCol->op!=TK_COLUMN || ExprUseYTab(pCol) );
+-    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++    assert( pCol->op!=TK_COLUMN || (ExprUseYTab(pCol) && pCol->y.pTab!=0) );
+     if( ExprIsVtab(pCol) ){
+       for(i=0; ia[0].pExpr;
+     assert( pCol->op!=TK_COLUMN || ExprUseYTab(pCol) );
+-    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++    assert( pCol->op!=TK_COLUMN || (ExprUseYTab(pCol) && pCol->y.pTab!=0) );
+     if( ExprIsVtab(pCol) ){
+       sqlite3_vtab *pVtab;
+       sqlite3_module *pMod;
+@@ -152608,13 +159489,12 @@ static int isAuxiliaryVtabOperator(
+     int res = 0;
+     Expr *pLeft = pExpr->pLeft;
+     Expr *pRight = pExpr->pRight;
+-    assert( pLeft->op!=TK_COLUMN || ExprUseYTab(pLeft) );
+-    testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
++    assert( pLeft->op!=TK_COLUMN || (ExprUseYTab(pLeft) && pLeft->y.pTab!=0) );
+     if( ExprIsVtab(pLeft) ){
+       res++;
+     }
+-    assert( pRight==0 || pRight->op!=TK_COLUMN || ExprUseYTab(pRight) );
+-    testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
++    assert( pRight==0 || pRight->op!=TK_COLUMN
++            || (ExprUseYTab(pRight) && pRight->y.pTab!=0) );
+     if( pRight && ExprIsVtab(pRight) ){
+       res++;
+       SWAP(Expr*, pLeft, pRight);
+@@ -152978,7 +159858,7 @@ static void exprAnalyzeOrTerm(
+                                             pOrTerm->leftCursor))==0 ){
+           /* This term must be of the form t1.a==t2.b where t2 is in the
+           ** chngToIN set but t1 is not.  This term will be either preceded
+-          ** or follwed by an inverted copy (t2.b==t1.a).  Skip this term
++          ** or followed by an inverted copy (t2.b==t1.a).  Skip this term
+           ** and use its inversion. */
+           testcase( pOrTerm->wtFlags & TERM_COPIED );
+           testcase( pOrTerm->wtFlags & TERM_VIRTUAL );
+@@ -153150,35 +160030,40 @@ static Bitmask exprSelectUsage(WhereMaskSet *pMaskSet, Select *pS){
+ */
+ static SQLITE_NOINLINE int exprMightBeIndexed2(
+   SrcList *pFrom,        /* The FROM clause */
+-  Bitmask mPrereq,       /* Bitmask of FROM clause terms referenced by pExpr */
+   int *aiCurCol,         /* Write the referenced table cursor and column here */
+-  Expr *pExpr            /* An operand of a comparison operator */
++  Expr *pExpr,           /* An operand of a comparison operator */
++  int j                  /* Start looking with the j-th pFrom entry */
+ ){
+   Index *pIdx;
+   int i;
+   int iCur;
+-  for(i=0; mPrereq>1; i++, mPrereq>>=1){}
+-  iCur = pFrom->a[i].iCursor;
+-  for(pIdx=pFrom->a[i].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+-    if( pIdx->aColExpr==0 ) continue;
+-    for(i=0; inKeyCol; i++){
+-      if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
+-      if( sqlite3ExprCompareSkip(pExpr, pIdx->aColExpr->a[i].pExpr, iCur)==0 ){
+-        aiCurCol[0] = iCur;
+-        aiCurCol[1] = XN_EXPR;
+-        return 1;
++  do{
++    iCur = pFrom->a[j].iCursor;
++    for(pIdx=pFrom->a[j].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++      if( pIdx->aColExpr==0 ) continue;
++      for(i=0; inKeyCol; i++){
++        if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
++        assert( pIdx->bHasExpr );
++        if( sqlite3ExprCompareSkip(pExpr,pIdx->aColExpr->a[i].pExpr,iCur)==0
++          && pExpr->op!=TK_STRING
++        ){
++          aiCurCol[0] = iCur;
++          aiCurCol[1] = XN_EXPR;
++          return 1;
++        }
+       }
+     }
+-  }
++  }while( ++j < pFrom->nSrc );
+   return 0;
+ }
+ static int exprMightBeIndexed(
+   SrcList *pFrom,        /* The FROM clause */
+-  Bitmask mPrereq,       /* Bitmask of FROM clause terms referenced by pExpr */
+   int *aiCurCol,         /* Write the referenced table cursor & column here */
+   Expr *pExpr,           /* An operand of a comparison operator */
+   int op                 /* The specific comparison operator */
+ ){
++  int i;
++
+   /* If this expression is a vector to the left or right of a
+   ** inequality constraint (>, <, >= or <=), perform the processing
+   ** on the first element of the vector.  */
+@@ -153188,7 +160073,6 @@ static int exprMightBeIndexed(
+   if( pExpr->op==TK_VECTOR && (op>=TK_GT && ALWAYS(op<=TK_GE)) ){
+     assert( ExprUseXList(pExpr) );
+     pExpr = pExpr->x.pList->a[0].pExpr;
+-
+   }
+ 
+   if( pExpr->op==TK_COLUMN ){
+@@ -153196,9 +160080,16 @@ static int exprMightBeIndexed(
+     aiCurCol[1] = pExpr->iColumn;
+     return 1;
+   }
+-  if( mPrereq==0 ) return 0;                 /* No table references */
+-  if( (mPrereq&(mPrereq-1))!=0 ) return 0;   /* Refs more than one table */
+-  return exprMightBeIndexed2(pFrom,mPrereq,aiCurCol,pExpr);
++
++  for(i=0; inSrc; i++){
++    Index *pIdx;
++    for(pIdx=pFrom->a[i].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++      if( pIdx->aColExpr ){
++        return exprMightBeIndexed2(pFrom,aiCurCol,pExpr,i);
++      }
++    }
++  }
++  return 0;
+ }
+ 
+ 
+@@ -153229,8 +160120,8 @@ static void exprAnalyze(
+   WhereTerm *pTerm;                /* The term to be analyzed */
+   WhereMaskSet *pMaskSet;          /* Set of table index masks */
+   Expr *pExpr;                     /* The expression to be analyzed */
+-  Bitmask prereqLeft;              /* Prerequesites of the pExpr->pLeft */
+-  Bitmask prereqAll;               /* Prerequesites of pExpr */
++  Bitmask prereqLeft;              /* Prerequisites of the pExpr->pLeft */
++  Bitmask prereqAll;               /* Prerequisites of pExpr */
+   Bitmask extraRight = 0;          /* Extra dependencies on LEFT JOIN */
+   Expr *pStr1 = 0;                 /* RHS of LIKE/GLOB operator */
+   int isComplete = 0;              /* RHS of LIKE/GLOB ends with wildcard */
+@@ -153324,7 +160215,7 @@ static void exprAnalyze(
+       pLeft = pLeft->x.pList->a[pTerm->u.x.iField-1].pExpr;
+     }
+ 
+-    if( exprMightBeIndexed(pSrc, prereqLeft, aiCurCol, pLeft, op) ){
++    if( exprMightBeIndexed(pSrc, aiCurCol, pLeft, op) ){
+       pTerm->leftCursor = aiCurCol[0];
+       assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
+       pTerm->u.x.leftColumn = aiCurCol[1];
+@@ -153332,7 +160223,7 @@ static void exprAnalyze(
+     }
+     if( op==TK_IS ) pTerm->wtFlags |= TERM_IS;
+     if( pRight
+-     && exprMightBeIndexed(pSrc, pTerm->prereqRight, aiCurCol, pRight, op)
++     && exprMightBeIndexed(pSrc, aiCurCol, pRight, op)
+      && !ExprHasProperty(pRight, EP_FixedCol)
+     ){
+       WhereTerm *pNew;
+@@ -153376,7 +160267,7 @@ static void exprAnalyze(
+      && 0==sqlite3ExprCanBeNull(pLeft)
+     ){
+       assert( !ExprHasProperty(pExpr, EP_IntValue) );
+-      pExpr->op = TK_TRUEFALSE;
++      pExpr->op = TK_TRUEFALSE;  /* See tag-20230504-1 */
+       pExpr->u.zToken = "false";
+       ExprSetProperty(pExpr, EP_IsFalse);
+       pTerm->prereqAll = 0;
+@@ -153543,7 +160434,6 @@ static void exprAnalyze(
+     transferJoinMarkings(pNewExpr1, pExpr);
+     idxNew1 = whereClauseInsert(pWC, pNewExpr1, wtFlags);
+     testcase( idxNew1==0 );
+-    exprAnalyze(pSrc, pWC, idxNew1);
+     pNewExpr2 = sqlite3ExprDup(db, pLeft, 0);
+     pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
+            sqlite3ExprAddCollateString(pParse,pNewExpr2,zCollSeqName),
+@@ -153551,6 +160441,7 @@ static void exprAnalyze(
+     transferJoinMarkings(pNewExpr2, pExpr);
+     idxNew2 = whereClauseInsert(pWC, pNewExpr2, wtFlags);
+     testcase( idxNew2==0 );
++    exprAnalyze(pSrc, pWC, idxNew1);
+     exprAnalyze(pSrc, pWC, idxNew2);
+     pTerm = &pWC->a[idxTerm];
+     if( isComplete ){
+@@ -153607,7 +160498,7 @@ static void exprAnalyze(
+    && pTerm->u.x.iField==0
+    && pExpr->pLeft->op==TK_VECTOR
+    && ALWAYS( ExprUseXSelect(pExpr) )
+-   && pExpr->x.pSelect->pPrior==0
++   && (pExpr->x.pSelect->pPrior==0 || (pExpr->x.pSelect->selFlags & SF_Values))
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+    && pExpr->x.pSelect->pWin==0
+ #endif
+@@ -153776,9 +160667,9 @@ static void whereAddLimitExpr(
+ ** exist only so that they may be passed to the xBestIndex method of the
+ ** single virtual table in the FROM clause of the SELECT.
+ */
+-SQLITE_PRIVATE void sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
+-  assert( p==0 || (p->pGroupBy==0 && (p->selFlags & SF_Aggregate)==0) );
+-  if( (p && p->pLimit)                                          /* 1 */
++SQLITE_PRIVATE void SQLITE_NOINLINE sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
++  assert( p!=0 && p->pLimit!=0 );                 /* 1 -- checked by caller */
++  if( p->pGroupBy==0
+    && (p->selFlags & (SF_Distinct|SF_Aggregate))==0             /* 2 */
+    && (p->pSrc->nSrc==1 && IsVirtual(p->pSrc->a[0].pTab))       /* 3 */
+   ){
+@@ -153795,6 +160686,13 @@ SQLITE_PRIVATE void sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
+         assert( pWC->a[ii].eOperator==WO_ROWVAL );
+         continue;
+       }
++      if( pWC->a[ii].nChild ){
++        /* If this term has child terms, then they are also part of the
++        ** pWC->a[] array. So this term can be ignored, as a LIMIT clause
++        ** will only be added if each of the child terms passes the
++        ** (leftCursor==iCsr) test below.  */
++        continue;
++      }
+       if( pWC->a[ii].leftCursor!=iCsr ) return;
+     }
+ 
+@@ -154014,9 +160912,12 @@ SQLITE_PRIVATE void sqlite3WhereTabFuncArgs(
+     pRhs = sqlite3PExpr(pParse, TK_UPLUS,
+         sqlite3ExprDup(pParse->db, pArgs->a[j].pExpr, 0), 0);
+     pTerm = sqlite3PExpr(pParse, TK_EQ, pColRef, pRhs);
+-    if( pItem->fg.jointype & (JT_LEFT|JT_LTORJ) ){
++    if( pItem->fg.jointype & (JT_LEFT|JT_RIGHT) ){
++      testcase( pItem->fg.jointype & JT_LEFT );  /* testtag-20230227a */
++      testcase( pItem->fg.jointype & JT_RIGHT ); /* testtag-20230227b */
+       joinType = EP_OuterON;
+     }else{
++      testcase( pItem->fg.jointype & JT_LTORJ ); /* testtag-20230227c */
+       joinType = EP_InnerON;
+     }
+     sqlite3SetJoinExpr(pTerm, pItem->iCursor, joinType);
+@@ -154095,7 +160996,7 @@ SQLITE_PRIVATE int sqlite3WhereIsDistinct(WhereInfo *pWInfo){
+ ** block sorting is required.
+ */
+ SQLITE_PRIVATE int sqlite3WhereIsOrdered(WhereInfo *pWInfo){
+-  return pWInfo->nOBSat;
++  return pWInfo->nOBSat<0 ? 0 : pWInfo->nOBSat;
+ }
+ 
+ /*
+@@ -154706,12 +161607,22 @@ static void translateColumnToCopy(
+   for(; iStartp1!=iTabCur ) continue;
+     if( pOp->opcode==OP_Column ){
++#ifdef SQLITE_DEBUG
++      if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
++        printf("TRANSLATE OP_Column to OP_Copy at %d\n", iStart);
++      }
++#endif
+       pOp->opcode = OP_Copy;
+       pOp->p1 = pOp->p2 + iRegister;
+       pOp->p2 = pOp->p3;
+       pOp->p3 = 0;
+       pOp->p5 = 2;  /* Cause the MEM_Subtype flag to be cleared */
+     }else if( pOp->opcode==OP_Rowid ){
++#ifdef SQLITE_DEBUG
++      if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
++        printf("TRANSLATE OP_Rowid to OP_Sequence at %d\n", iStart);
++      }
++#endif
+       pOp->opcode = OP_Sequence;
+       pOp->p1 = iAutoidxCur;
+ #ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+@@ -154733,7 +161644,7 @@ static void translateColumnToCopy(
+ #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(WHERETRACE_ENABLED)
+ static void whereTraceIndexInfoInputs(sqlite3_index_info *p){
+   int i;
+-  if( !sqlite3WhereTrace ) return;
++  if( (sqlite3WhereTrace & 0x10)==0 ) return;
+   for(i=0; inConstraint; i++){
+     sqlite3DebugPrintf(
+        "  constraint[%d]: col=%d termid=%d op=%d usabled=%d collseq=%s\n",
+@@ -154753,7 +161664,7 @@ static void whereTraceIndexInfoInputs(sqlite3_index_info *p){
+ }
+ static void whereTraceIndexInfoOutputs(sqlite3_index_info *p){
+   int i;
+-  if( !sqlite3WhereTrace ) return;
++  if( (sqlite3WhereTrace & 0x10)==0 ) return;
+   for(i=0; inConstraint; i++){
+     sqlite3DebugPrintf("  usage[%d]: argvIdx=%d omit=%d\n",
+        i,
+@@ -154771,6 +161682,43 @@ static void whereTraceIndexInfoOutputs(sqlite3_index_info *p){
+ #define whereTraceIndexInfoOutputs(A)
+ #endif
+ 
++/*
++** We know that pSrc is an operand of an outer join.  Return true if
++** pTerm is a constraint that is compatible with that join.
++**
++** pTerm must be EP_OuterON if pSrc is the right operand of an
++** outer join.  pTerm can be either EP_OuterON or EP_InnerON if pSrc
++** is the left operand of a RIGHT join.
++**
++** See https://sqlite.org/forum/forumpost/206d99a16dd9212f
++** for an example of a WHERE clause constraints that may not be used on
++** the right table of a RIGHT JOIN because the constraint implies a
++** not-NULL condition on the left table of the RIGHT JOIN.
++*/
++static int constraintCompatibleWithOuterJoin(
++  const WhereTerm *pTerm,       /* WHERE clause term to check */
++  const SrcItem *pSrc           /* Table we are trying to access */
++){
++  assert( (pSrc->fg.jointype&(JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ); /* By caller */
++  testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
++  testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
++  testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
++  testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
++  if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
++   || pTerm->pExpr->w.iJoin != pSrc->iCursor
++  ){
++    return 0;
++  }
++  if( (pSrc->fg.jointype & (JT_LEFT|JT_RIGHT))!=0
++   && ExprHasProperty(pTerm->pExpr, EP_InnerON)
++  ){
++    return 0;
++  }
++  return 1;
++}
++
++
++
+ #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
+ /*
+ ** Return TRUE if the WHERE clause term pTerm is of a form where it
+@@ -154786,16 +161734,10 @@ static int termCanDriveIndex(
+   if( pTerm->leftCursor!=pSrc->iCursor ) return 0;
+   if( (pTerm->eOperator & (WO_EQ|WO_IS))==0 ) return 0;
+   assert( (pSrc->fg.jointype & JT_RIGHT)==0 );
+-  if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
+-    testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
+-    testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
+-    testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
+-    testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
+-    if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
+-     || pTerm->pExpr->w.iJoin != pSrc->iCursor
+-    ){
+-      return 0;  /* See tag-20191211-001 */
+-    }
++  if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
++   && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
++  ){
++    return 0;  /* See https://sqlite.org/forum/forumpost/51e6959f61 */
+   }
+   if( (pTerm->prereqRight & notReady)!=0 ) return 0;
+   assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
+@@ -154809,6 +161751,57 @@ static int termCanDriveIndex(
+ 
+ 
+ #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
++
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++/*
++** Argument pIdx represents an automatic index that the current statement
++** will create and populate. Add an OP_Explain with text of the form:
++**
++**     CREATE AUTOMATIC INDEX ON () [WHERE ]
++**
++** This is only required if sqlite3_stmt_scanstatus() is enabled, to
++** associate an SQLITE_SCANSTAT_NCYCLE and SQLITE_SCANSTAT_NLOOP
++** values with. In order to avoid breaking legacy code and test cases,
++** the OP_Explain is not added if this is an EXPLAIN QUERY PLAN command.
++*/
++static void explainAutomaticIndex(
++  Parse *pParse,
++  Index *pIdx,                    /* Automatic index to explain */
++  int bPartial,                   /* True if pIdx is a partial index */
++  int *pAddrExplain               /* OUT: Address of OP_Explain */
++){
++  if( IS_STMT_SCANSTATUS(pParse->db) && pParse->explain!=2 ){
++    Table *pTab = pIdx->pTable;
++    const char *zSep = "";
++    char *zText = 0;
++    int ii = 0;
++    sqlite3_str *pStr = sqlite3_str_new(pParse->db);
++    sqlite3_str_appendf(pStr,"CREATE AUTOMATIC INDEX ON %s(", pTab->zName);
++    assert( pIdx->nColumn>1 );
++    assert( pIdx->aiColumn[pIdx->nColumn-1]==XN_ROWID );
++    for(ii=0; ii<(pIdx->nColumn-1); ii++){
++      const char *zName = 0;
++      int iCol = pIdx->aiColumn[ii];
++
++      zName = pTab->aCol[iCol].zCnName;
++      sqlite3_str_appendf(pStr, "%s%s", zSep, zName);
++      zSep = ", ";
++    }
++    zText = sqlite3_str_finish(pStr);
++    if( zText==0 ){
++      sqlite3OomFault(pParse->db);
++    }else{
++      *pAddrExplain = sqlite3VdbeExplain(
++          pParse, 0, "%s)%s", zText, (bPartial ? " WHERE " : "")
++      );
++      sqlite3_free(zText);
++    }
++  }
++}
++#else
++# define explainAutomaticIndex(a,b,c,d)
++#endif
++
+ /*
+ ** Generate code to construct the Index object for an automatic index
+ ** and to set up the WhereLevel object pLevel so that the code generator
+@@ -154816,8 +161809,7 @@ static int termCanDriveIndex(
+ */
+ static SQLITE_NOINLINE void constructAutomaticIndex(
+   Parse *pParse,              /* The parsing context */
+-  const WhereClause *pWC,     /* The WHERE clause */
+-  const SrcItem *pSrc,        /* The FROM clause term to get the next index */
++  WhereClause *pWC,           /* The WHERE clause */
+   const Bitmask notReady,     /* Mask of cursors that are not available */
+   WhereLevel *pLevel          /* Write new index here */
+ ){
+@@ -154838,12 +161830,17 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+   char *zNotUsed;             /* Extra space on the end of pIdx */
+   Bitmask idxCols;            /* Bitmap of columns used for indexing */
+   Bitmask extraCols;          /* Bitmap of additional columns */
+-  u8 sentWarning = 0;         /* True if a warnning has been issued */
++  u8 sentWarning = 0;         /* True if a warning has been issued */
++  u8 useBloomFilter = 0;      /* True to also add a Bloom filter */
+   Expr *pPartial = 0;         /* Partial Index Expression */
+   int iContinue = 0;          /* Jump here to skip excluded rows */
+-  SrcItem *pTabItem;          /* FROM clause term being indexed */
++  SrcList *pTabList;          /* The complete FROM clause */
++  SrcItem *pSrc;              /* The FROM clause term to get the next index */
+   int addrCounter = 0;        /* Address where integer counter is initialized */
+   int regBase;                /* Array of registers where record is assembled */
++#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
++  int addrExp = 0;            /* Address of OP_Explain */
++#endif
+ 
+   /* Generate code to skip over the creation and initialization of the
+   ** transient index on 2nd and subsequent iterations of the loop. */
+@@ -154854,6 +161851,8 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+   /* Count the number of columns that will be added to the index
+   ** and used to match WHERE clause constraints */
+   nKeyCol = 0;
++  pTabList = pWC->pWInfo->pTabList;
++  pSrc = &pTabList->a[pLevel->iFrom];
+   pTable = pSrc->pTab;
+   pWCEnd = &pWC->a[pWC->nTerm];
+   pLoop = pLevel->pWLoop;
+@@ -154864,7 +161863,7 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+     ** WHERE clause (or the ON clause of a LEFT join) that constrain which
+     ** rows of the target table (pSrc) that can be used. */
+     if( (pTerm->wtFlags & TERM_VIRTUAL)==0
+-     && sqlite3ExprIsTableConstraint(pExpr, pSrc)
++     && sqlite3ExprIsSingleTableConstraint(pExpr, pTabList, pLevel->iFrom)
+     ){
+       pPartial = sqlite3ExprAnd(pParse, pPartial,
+                                 sqlite3ExprDup(pParse->db, pExpr, 0));
+@@ -154905,7 +161904,11 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+   ** original table changes and the index and table cannot both be used
+   ** if they go out of sync.
+   */
+-  extraCols = pSrc->colUsed & (~idxCols | MASKBIT(BMS-1));
++  if( IsView(pTable) ){
++    extraCols = ALLBITS;
++  }else{
++    extraCols = pSrc->colUsed & (~idxCols | MASKBIT(BMS-1));
++  }
+   mxBitCol = MIN(BMS-1,pTable->nCol);
+   testcase( pTable->nCol==BMS-1 );
+   testcase( pTable->nCol==BMS-2 );
+@@ -154941,6 +161944,16 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+         assert( pColl!=0 || pParse->nErr>0 ); /* TH3 collate01.800 */
+         pIdx->azColl[n] = pColl ? pColl->zName : sqlite3StrBINARY;
+         n++;
++        if( ALWAYS(pX->pLeft!=0)
++         && sqlite3ExprAffinity(pX->pLeft)!=SQLITE_AFF_TEXT
++        ){
++          /* TUNING: only use a Bloom filter on an automatic index
++          ** if one or more key columns has the ability to hold numeric
++          ** values, since strings all have the same hash in the Bloom
++          ** filter implementation and hence a Bloom filter on a text column
++          ** is not usually helpful. */
++          useBloomFilter = 1;
++        }
+       }
+     }
+   }
+@@ -154967,25 +161980,27 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+   pIdx->azColl[n] = sqlite3StrBINARY;
+ 
+   /* Create the automatic index */
++  explainAutomaticIndex(pParse, pIdx, pPartial!=0, &addrExp);
+   assert( pLevel->iIdxCur>=0 );
+   pLevel->iIdxCur = pParse->nTab++;
+   sqlite3VdbeAddOp2(v, OP_OpenAutoindex, pLevel->iIdxCur, nKeyCol+1);
+   sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
+   VdbeComment((v, "for %s", pTable->zName));
+-  if( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) ){
++  if( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) && useBloomFilter ){
++    sqlite3WhereExplainBloomFilter(pParse, pWC->pWInfo, pLevel);
+     pLevel->regFilter = ++pParse->nMem;
+     sqlite3VdbeAddOp2(v, OP_Blob, 10000, pLevel->regFilter);
+   }
+ 
+   /* Fill the automatic index with content */
+-  pTabItem = &pWC->pWInfo->pTabList->a[pLevel->iFrom];
+-  if( pTabItem->fg.viaCoroutine ){
+-    int regYield = pTabItem->regReturn;
++  assert( pSrc == &pWC->pWInfo->pTabList->a[pLevel->iFrom] );
++  if( pSrc->fg.viaCoroutine ){
++    int regYield = pSrc->regReturn;
+     addrCounter = sqlite3VdbeAddOp2(v, OP_Integer, 0, 0);
+-    sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pTabItem->addrFillSub);
++    sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pSrc->addrFillSub);
+     addrTop =  sqlite3VdbeAddOp1(v, OP_Yield, regYield);
+     VdbeCoverage(v);
+-    VdbeComment((v, "next row of %s", pTabItem->pTab->zName));
++    VdbeComment((v, "next row of %s", pSrc->pTab->zName));
+   }else{
+     addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, pLevel->iTabCur); VdbeCoverage(v);
+   }
+@@ -155002,17 +162017,18 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+     sqlite3VdbeAddOp4Int(v, OP_FilterAdd, pLevel->regFilter, 0,
+                          regBase, pLoop->u.btree.nEq);
+   }
++  sqlite3VdbeScanStatusCounters(v, addrExp, addrExp, sqlite3VdbeCurrentAddr(v));
+   sqlite3VdbeAddOp2(v, OP_IdxInsert, pLevel->iIdxCur, regRecord);
+   sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
+   if( pPartial ) sqlite3VdbeResolveLabel(v, iContinue);
+-  if( pTabItem->fg.viaCoroutine ){
++  if( pSrc->fg.viaCoroutine ){
+     sqlite3VdbeChangeP2(v, addrCounter, regBase+n);
+     testcase( pParse->db->mallocFailed );
+     assert( pLevel->iIdxCur>0 );
+     translateColumnToCopy(pParse, addrTop, pLevel->iTabCur,
+-                          pTabItem->regResult, pLevel->iIdxCur);
++                          pSrc->regResult, pLevel->iIdxCur);
+     sqlite3VdbeGoto(v, addrTop);
+-    pTabItem->fg.viaCoroutine = 0;
++    pSrc->fg.viaCoroutine = 0;
+   }else{
+     sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1); VdbeCoverage(v);
+     sqlite3VdbeChangeP5(v, SQLITE_STMTSTATUS_AUTOINDEX);
+@@ -155022,6 +162038,7 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
+ 
+   /* Jump here when skipping the initialization */
+   sqlite3VdbeJumpHere(v, addrInit);
++  sqlite3VdbeScanStatusRange(v, addrExp, addrExp, -1);
+ 
+ end_auto_index_create:
+   sqlite3ExprDelete(pParse->db, pPartial);
+@@ -155063,16 +162080,26 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
+   Vdbe *v = pParse->pVdbe;             /* VDBE under construction */
+   WhereLoop *pLoop = pLevel->pWLoop;   /* The loop being coded */
+   int iCur;                            /* Cursor for table getting the filter */
++  IndexedExpr *saved_pIdxEpr;          /* saved copy of Parse.pIdxEpr */
++  IndexedExpr *saved_pIdxPartExpr;     /* saved copy of Parse.pIdxPartExpr */
++
++  saved_pIdxEpr = pParse->pIdxEpr;
++  saved_pIdxPartExpr = pParse->pIdxPartExpr;
++  pParse->pIdxEpr = 0;
++  pParse->pIdxPartExpr = 0;
+ 
+   assert( pLoop!=0 );
+   assert( v!=0 );
+   assert( pLoop->wsFlags & WHERE_BLOOMFILTER );
++  assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0 );
+ 
+   addrOnce = sqlite3VdbeAddOp0(v, OP_Once); VdbeCoverage(v);
+   do{
++    const SrcList *pTabList;
+     const SrcItem *pItem;
+     const Table *pTab;
+     u64 sz;
++    int iSrc;
+     sqlite3WhereExplainBloomFilter(pParse, pWInfo, pLevel);
+     addrCont = sqlite3VdbeMakeLabel(pParse);
+     iCur = pLevel->iTabCur;
+@@ -155086,7 +162113,9 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
+     ** testing complicated.  By basing the blob size on the value in the
+     ** sqlite_stat1 table, testing is much easier.
+     */
+-    pItem = &pWInfo->pTabList->a[pLevel->iFrom];
++    pTabList = pWInfo->pTabList;
++    iSrc = pLevel->iFrom;
++    pItem = &pTabList->a[iSrc];
+     assert( pItem!=0 );
+     pTab = pItem->pTab;
+     assert( pTab!=0 );
+@@ -155103,7 +162132,7 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
+     for(pTerm=pWInfo->sWC.a; pTermpExpr;
+       if( (pTerm->wtFlags & TERM_VIRTUAL)==0
+-       && sqlite3ExprIsTableConstraint(pExpr, pItem)
++       && sqlite3ExprIsSingleTableConstraint(pExpr, pTabList, iSrc)
+       ){
+         sqlite3ExprIfFalse(pParse, pTerm->pExpr, addrCont, SQLITE_JUMPIFNULL);
+       }
+@@ -155119,9 +162148,8 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
+       int r1 = sqlite3GetTempRange(pParse, n);
+       int jj;
+       for(jj=0; jjaiColumn[jj];
+         assert( pIdx->pTable==pItem->pTab );
+-        sqlite3ExprCodeGetColumnOfTable(v, pIdx->pTable, iCur, iCol,r1+jj);
++        sqlite3ExprCodeLoadIndexColumn(pParse, pIdx, iCur, jj, r1+jj);
+       }
+       sqlite3VdbeAddOp4Int(v, OP_FilterAdd, pLevel->regFilter, 0, r1, n);
+       sqlite3ReleaseTempRange(pParse, r1, n);
+@@ -155152,6 +162180,8 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
+     }
+   }while( iLevel < pWInfo->nLevel );
+   sqlite3VdbeJumpHere(v, addrOnce);
++  pParse->pIdxEpr = saved_pIdxEpr;
++  pParse->pIdxPartExpr = saved_pIdxPartExpr;
+ }
+ 
+ 
+@@ -155207,22 +162237,10 @@ static sqlite3_index_info *allocateIndexInfo(
+     assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
+     assert( pTerm->u.x.leftColumn>=XN_ROWID );
+     assert( pTerm->u.x.leftColumnnCol );
+-
+-    /* tag-20191211-002: WHERE-clause constraints are not useful to the
+-    ** right-hand table of a LEFT JOIN nor to the either table of a
+-    ** RIGHT JOIN.  See tag-20191211-001 for the
+-    ** equivalent restriction for ordinary tables. */
+-    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_RIGHT );
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
+-      testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) );
+-      testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
+-      if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
+-       || pTerm->pExpr->w.iJoin != pSrc->iCursor
+-      ){
+-        continue;
+-      }
++    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
++     && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
++    ){
++      continue;
+     }
+     nTerm++;
+     pTerm->wtFlags |= TERM_OK;
+@@ -155419,6 +162437,9 @@ static int vtabBestIndex(Parse *pParse, Table *pTab, sqlite3_index_info *p){
+       sqlite3ErrorMsg(pParse, "%s", pVtab->zErrMsg);
+     }
+   }
++  if( pTab->u.vtab.p->bAllSchemas ){
++    sqlite3VtabUsesAllSchemas(pParse);
++  }
+   sqlite3_free(pVtab->zErrMsg);
+   pVtab->zErrMsg = 0;
+   return rc;
+@@ -155463,6 +162484,7 @@ static int whereKeyStats(
+   assert( pIdx->nSample>0 );
+   assert( pRec->nField>0 );
+ 
++
+   /* Do a binary search to find the first sample greater than or equal
+   ** to pRec. If pRec contains a single field, the set of samples to search
+   ** is simply the aSample[] array. If the samples in aSample[] contain more
+@@ -155507,7 +162529,12 @@ static int whereKeyStats(
+   ** it is extended to two fields. The duplicates that this creates do not
+   ** cause any problems.
+   */
+-  nField = MIN(pRec->nField, pIdx->nSample);
++  if( !HasRowid(pIdx->pTable) && IsPrimaryKeyIndex(pIdx) ){
++    nField = pIdx->nKeyCol;
++  }else{
++    nField = pIdx->nColumn;
++  }
++  nField = MIN(pRec->nField, nField);
+   iCol = 0;
+   iSample = pIdx->nSample * nField;
+   do{
+@@ -155573,12 +162600,12 @@ static int whereKeyStats(
+       if( iCol>0 ){
+         pRec->nField = iCol;
+         assert( sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)<=0
+-             || pParse->db->mallocFailed );
++             || pParse->db->mallocFailed || CORRUPT_DB );
+       }
+       if( i>0 ){
+         pRec->nField = nField;
+         assert( sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
+-             || pParse->db->mallocFailed );
++             || pParse->db->mallocFailed || CORRUPT_DB );
+       }
+     }
+   }
+@@ -155595,7 +162622,7 @@ static int whereKeyStats(
+     ** is larger than all samples in the array. */
+     tRowcnt iUpper, iGap;
+     if( i>=pIdx->nSample ){
+-      iUpper = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
++      iUpper = pIdx->nRowEst0;
+     }else{
+       iUpper = aSample[i].anLt[iCol];
+     }
+@@ -155670,7 +162697,7 @@ SQLITE_PRIVATE char sqlite3IndexColumnAffinity(sqlite3 *db, Index *pIdx, int iCo
+ ** Value pLoop->nOut is currently set to the estimated number of rows
+ ** visited for scanning (a=? AND b=?). This function reduces that estimate
+ ** by some factor to account for the (c BETWEEN ? AND ?) expression based
+-** on the stat4 data for the index. this scan will be peformed multiple
++** on the stat4 data for the index. this scan will be performed multiple
+ ** times (once for each (a,b) combination that matches a=?) is dealt with
+ ** by the caller.
+ **
+@@ -155751,7 +162778,7 @@ static int whereRangeSkipScanEst(
+       int nAdjust = (sqlite3LogEst(p->nSample) - sqlite3LogEst(nDiff));
+       pLoop->nOut -= nAdjust;
+       *pbDone = 1;
+-      WHERETRACE(0x10, ("range skip-scan regions: %u..%u  adjust=%d est=%d\n",
++      WHERETRACE(0x20, ("range skip-scan regions: %u..%u  adjust=%d est=%d\n",
+                            nLower, nUpper, nAdjust*-1, pLoop->nOut));
+     }
+ 
+@@ -155922,14 +162949,15 @@ static int whereRangeScanEst(
+           ** sample, then assume they are 4x more selective.  This brings
+           ** the estimated selectivity more in line with what it would be
+           ** if estimated without the use of STAT4 tables. */
+-          if( iLwrIdx==iUprIdx ) nNew -= 20;  assert( 20==sqlite3LogEst(4) );
++          if( iLwrIdx==iUprIdx ){ nNew -= 20; }
++          assert( 20==sqlite3LogEst(4) );
+         }else{
+           nNew = 10;        assert( 10==sqlite3LogEst(2) );
+         }
+         if( nNewwtFlags & TERM_VNULL)==0 );
++  assert( pUpper==0 || (pUpper->wtFlags & TERM_VNULL)==0 || pParse->nErr>0 );
+   nNew = whereRangeAdjust(pLower, nOut);
+   nNew = whereRangeAdjust(pUpper, nNew);
+ 
+@@ -155962,7 +162990,7 @@ static int whereRangeScanEst(
+   if( nNewnOut>nOut ){
+-    WHERETRACE(0x10,("Range scan lowers nOut from %d to %d\n",
++    WHERETRACE(0x20,("Range scan lowers nOut from %d to %d\n",
+                     pLoop->nOut, nOut));
+   }
+ #endif
+@@ -156027,7 +163055,7 @@ static int whereEqualScanEst(
+   pBuilder->nRecValid = nEq;
+ 
+   whereKeyStats(pParse, p, pRec, 0, a);
+-  WHERETRACE(0x10,("equality scan regions %s(%d): %d\n",
++  WHERETRACE(0x20,("equality scan regions %s(%d): %d\n",
+                    p->zName, nEq-1, (int)a[1]));
+   *pnRow = a[1];
+ 
+@@ -156075,9 +163103,9 @@ static int whereInScanEst(
+   }
+ 
+   if( rc==SQLITE_OK ){
+-    if( nRowEst > nRow0 ) nRowEst = nRow0;
++    if( nRowEst > (tRowcnt)nRow0 ) nRowEst = nRow0;
+     *pnRow = nRowEst;
+-    WHERETRACE(0x10,("IN row estimate: est=%d\n", nRowEst));
++    WHERETRACE(0x20,("IN row estimate: est=%d\n", nRowEst));
+   }
+   assert( pBuilder->nRecValid==nRecValid );
+   return rc;
+@@ -156146,17 +163174,34 @@ SQLITE_PRIVATE void sqlite3WhereClausePrint(WhereClause *pWC){
+ #ifdef WHERETRACE_ENABLED
+ /*
+ ** Print a WhereLoop object for debugging purposes
+-*/
+-SQLITE_PRIVATE void sqlite3WhereLoopPrint(WhereLoop *p, WhereClause *pWC){
+-  WhereInfo *pWInfo = pWC->pWInfo;
+-  int nb = 1+(pWInfo->pTabList->nSrc+3)/4;
+-  SrcItem *pItem = pWInfo->pTabList->a + p->iTab;
+-  Table *pTab = pItem->pTab;
+-  Bitmask mAll = (((Bitmask)1)<<(nb*4)) - 1;
+-  sqlite3DebugPrintf("%c%2d.%0*llx.%0*llx", p->cId,
+-                     p->iTab, nb, p->maskSelf, nb, p->prereq & mAll);
+-  sqlite3DebugPrintf(" %12s",
+-                     pItem->zAlias ? pItem->zAlias : pTab->zName);
++**
++** Format example:
++**
++**     .--- Position in WHERE clause           rSetup, rRun, nOut ---.
++**     |                                                             |
++**     |  .--- selfMask                       nTerm ------.          |
++**     |  |                                               |          |
++**     |  |   .-- prereq    Idx          wsFlags----.     |          |
++**     |  |   |             Name                    |     |          |
++**     |  |   |           __|__        nEq ---.  ___|__   |        __|__
++**     | / \ / \         /     \              | /      \ / \      /     \
++**     1.002.001         t2.t2xy              2 f 010241 N 2 cost 0,56,31
++*/
++SQLITE_PRIVATE void sqlite3WhereLoopPrint(const WhereLoop *p, const WhereClause *pWC){
++  if( pWC ){
++    WhereInfo *pWInfo = pWC->pWInfo;
++    int nb = 1+(pWInfo->pTabList->nSrc+3)/4;
++    SrcItem *pItem = pWInfo->pTabList->a + p->iTab;
++    Table *pTab = pItem->pTab;
++    Bitmask mAll = (((Bitmask)1)<<(nb*4)) - 1;
++    sqlite3DebugPrintf("%c%2d.%0*llx.%0*llx", p->cId,
++                       p->iTab, nb, p->maskSelf, nb, p->prereq & mAll);
++    sqlite3DebugPrintf(" %12s",
++                       pItem->zAlias ? pItem->zAlias : pTab->zName);
++  }else{
++    sqlite3DebugPrintf("%c%2d.%03llx.%03llx %c%d",
++         p->cId, p->iTab, p->maskSelf, p->prereq & 0xfff, p->cId, p->iTab);
++  }
+   if( (p->wsFlags & WHERE_VIRTUALTABLE)==0 ){
+     const char *zName;
+     if( p->u.btree.pIndex && (zName = p->u.btree.pIndex->zName)!=0 ){
+@@ -156186,13 +163231,22 @@ SQLITE_PRIVATE void sqlite3WhereLoopPrint(WhereLoop *p, WhereClause *pWC){
+     sqlite3DebugPrintf(" f %06x N %d", p->wsFlags, p->nLTerm);
+   }
+   sqlite3DebugPrintf(" cost %d,%d,%d\n", p->rSetup, p->rRun, p->nOut);
+-  if( p->nLTerm && (sqlite3WhereTrace & 0x100)!=0 ){
++  if( p->nLTerm && (sqlite3WhereTrace & 0x4000)!=0 ){
+     int i;
+     for(i=0; inLTerm; i++){
+       sqlite3WhereTermPrint(p->aLTerm[i], i);
+     }
+   }
+ }
++SQLITE_PRIVATE void sqlite3ShowWhereLoop(const WhereLoop *p){
++  if( p ) sqlite3WhereLoopPrint(p, 0);
++}
++SQLITE_PRIVATE void sqlite3ShowWhereLoopList(const WhereLoop *p){
++  while( p ){
++    sqlite3ShowWhereLoop(p);
++    p = p->pNextLoop;
++  }
++}
+ #endif
+ 
+ /*
+@@ -156224,12 +163278,18 @@ static void whereLoopClearUnion(sqlite3 *db, WhereLoop *p){
+ }
+ 
+ /*
+-** Deallocate internal memory used by a WhereLoop object
++** Deallocate internal memory used by a WhereLoop object.  Leave the
++** object in an initialized state, as if it had been newly allocated.
+ */
+ static void whereLoopClear(sqlite3 *db, WhereLoop *p){
+-  if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFreeNN(db, p->aLTerm);
++  if( p->aLTerm!=p->aLTermSpace ){
++    sqlite3DbFreeNN(db, p->aLTerm);
++    p->aLTerm = p->aLTermSpace;
++    p->nLSlot = ArraySize(p->aLTermSpace);
++  }
+   whereLoopClearUnion(db, p);
+-  whereLoopInit(p);
++  p->nLTerm = 0;
++  p->wsFlags = 0;
+ }
+ 
+ /*
+@@ -156253,7 +163313,9 @@ static int whereLoopResize(sqlite3 *db, WhereLoop *p, int n){
+ */
+ static int whereLoopXfer(sqlite3 *db, WhereLoop *pTo, WhereLoop *pFrom){
+   whereLoopClearUnion(db, pTo);
+-  if( whereLoopResize(db, pTo, pFrom->nLTerm) ){
++  if( pFrom->nLTerm > pTo->nLSlot
++   && whereLoopResize(db, pTo, pFrom->nLTerm)
++  ){
+     memset(pTo, 0, WHERE_LOOP_XFER_SZ);
+     return SQLITE_NOMEM_BKPT;
+   }
+@@ -156271,8 +163333,9 @@ static int whereLoopXfer(sqlite3 *db, WhereLoop *pTo, WhereLoop *pFrom){
+ ** Delete a WhereLoop object
+ */
+ static void whereLoopDelete(sqlite3 *db, WhereLoop *p){
++  assert( db!=0 );
+   whereLoopClear(db, p);
+-  sqlite3DbFreeNN(db, p);
++  sqlite3DbNNFreeNN(db, p);
+ }
+ 
+ /*
+@@ -156280,73 +163343,76 @@ static void whereLoopDelete(sqlite3 *db, WhereLoop *p){
+ */
+ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
+   assert( pWInfo!=0 );
++  assert( db!=0 );
+   sqlite3WhereClauseClear(&pWInfo->sWC);
+   while( pWInfo->pLoops ){
+     WhereLoop *p = pWInfo->pLoops;
+     pWInfo->pLoops = p->pNextLoop;
+     whereLoopDelete(db, p);
+   }
+-  assert( pWInfo->pExprMods==0 );
+   while( pWInfo->pMemToFree ){
+     WhereMemBlock *pNext = pWInfo->pMemToFree->pNext;
+-    sqlite3DbFreeNN(db, pWInfo->pMemToFree);
++    sqlite3DbNNFreeNN(db, pWInfo->pMemToFree);
+     pWInfo->pMemToFree = pNext;
+   }
+-  sqlite3DbFreeNN(db, pWInfo);
+-}
+-
+-/* Undo all Expr node modifications
+-*/
+-static void whereUndoExprMods(WhereInfo *pWInfo){
+-  while( pWInfo->pExprMods ){
+-    WhereExprMod *p = pWInfo->pExprMods;
+-    pWInfo->pExprMods = p->pNext;
+-    memcpy(p->pExpr, &p->orig, sizeof(p->orig));
+-    sqlite3DbFree(pWInfo->pParse->db, p);
+-  }
++  sqlite3DbNNFreeNN(db, pWInfo);
+ }
+ 
+ /*
+-** Return TRUE if all of the following are true:
++** Return TRUE if X is a proper subset of Y but is of equal or less cost.
++** In other words, return true if all constraints of X are also part of Y
++** and Y has additional constraints that might speed the search that X lacks
++** but the cost of running X is not more than the cost of running Y.
+ **
+-**   (1)  X has the same or lower cost, or returns the same or fewer rows,
+-**        than Y.
+-**   (2)  X uses fewer WHERE clause terms than Y
+-**   (3)  Every WHERE clause term used by X is also used by Y
+-**   (4)  X skips at least as many columns as Y
+-**   (5)  If X is a covering index, than Y is too
++** In other words, return true if the cost relationwship between X and Y
++** is inverted and needs to be adjusted.
+ **
+-** Conditions (2) and (3) mean that X is a "proper subset" of Y.
+-** If X is a proper subset of Y then Y is a better choice and ought
+-** to have a lower cost.  This routine returns TRUE when that cost
+-** relationship is inverted and needs to be adjusted.  Constraint (4)
+-** was added because if X uses skip-scan less than Y it still might
+-** deserve a lower cost even if it is a proper subset of Y.  Constraint (5)
+-** was added because a covering index probably deserves to have a lower cost
+-** than a non-covering index even if it is a proper subset.
++** Case 1:
++**
++**   (1a)  X and Y use the same index.
++**   (1b)  X has fewer == terms than Y
++**   (1c)  Neither X nor Y use skip-scan
++**   (1d)  X does not have a a greater cost than Y
++**
++** Case 2:
++**
++**   (2a)  X has the same or lower cost, or returns the same or fewer rows,
++**         than Y.
++**   (2b)  X uses fewer WHERE clause terms than Y
++**   (2c)  Every WHERE clause term used by X is also used by Y
++**   (2d)  X skips at least as many columns as Y
++**   (2e)  If X is a covering index, than Y is too
+ */
+ static int whereLoopCheaperProperSubset(
+   const WhereLoop *pX,       /* First WhereLoop to compare */
+   const WhereLoop *pY        /* Compare against this WhereLoop */
+ ){
+   int i, j;
++  if( pX->rRun>pY->rRun && pX->nOut>pY->nOut ) return 0; /* (1d) and (2a) */
++  assert( (pX->wsFlags & WHERE_VIRTUALTABLE)==0 );
++  assert( (pY->wsFlags & WHERE_VIRTUALTABLE)==0 );
++  if( pX->u.btree.nEq < pY->u.btree.nEq                  /* (1b) */
++   && pX->u.btree.pIndex==pY->u.btree.pIndex             /* (1a) */
++   && pX->nSkip==0 && pY->nSkip==0                       /* (1c) */
++  ){
++    return 1;  /* Case 1 is true */
++  }
+   if( pX->nLTerm-pX->nSkip >= pY->nLTerm-pY->nSkip ){
+-    return 0; /* X is not a subset of Y */
++    return 0;                                            /* (2b) */
+   }
+-  if( pX->rRun>pY->rRun && pX->nOut>pY->nOut ) return 0;
+-  if( pY->nSkip > pX->nSkip ) return 0;
++  if( pY->nSkip > pX->nSkip ) return 0;                  /* (2d) */
+   for(i=pX->nLTerm-1; i>=0; i--){
+     if( pX->aLTerm[i]==0 ) continue;
+     for(j=pY->nLTerm-1; j>=0; j--){
+       if( pY->aLTerm[j]==pX->aLTerm[i] ) break;
+     }
+-    if( j<0 ) return 0;  /* X not a subset of Y since term X[i] not used by Y */
++    if( j<0 ) return 0;                                  /* (2c) */
+   }
+   if( (pX->wsFlags&WHERE_IDX_ONLY)!=0
+    && (pY->wsFlags&WHERE_IDX_ONLY)==0 ){
+-    return 0;  /* Constraint (5) */
++    return 0;                                            /* (2e) */
+   }
+-  return 1;  /* All conditions meet */
++  return 1;  /* Case 2 is true */
+ }
+ 
+ /*
+@@ -156427,7 +163493,7 @@ static WhereLoop **whereLoopFindLesser(
+     ** rSetup. Call this SETUP-INVARIANT */
+     assert( p->rSetup>=pTemplate->rSetup );
+ 
+-    /* Any loop using an appliation-defined index (or PRIMARY KEY or
++    /* Any loop using an application-defined index (or PRIMARY KEY or
+     ** UNIQUE constraint) with one or more == constraints is better
+     ** than an automatic index. Unless it is a skip-scan. */
+     if( (p->wsFlags & WHERE_AUTO_INDEX)!=0
+@@ -156454,7 +163520,7 @@ static WhereLoop **whereLoopFindLesser(
+ 
+     /* If pTemplate is always better than p, then cause p to be overwritten
+     ** with pTemplate.  pTemplate is better than p if:
+-    **   (1)  pTemplate has no more dependences than p, and
++    **   (1)  pTemplate has no more dependencies than p, and
+     **   (2)  pTemplate has an equal or lower cost than p.
+     */
+     if( (p->prereq & pTemplate->prereq)==pTemplate->prereq   /* (1)  */
+@@ -156572,7 +163638,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
+   }else{
+     /* We will be overwriting WhereLoop p[].  But before we do, first
+     ** go through the rest of the list and delete any other entries besides
+-    ** p[] that are also supplated by pTemplate */
++    ** p[] that are also supplanted by pTemplate */
+     WhereLoop **ppTail = &p->pNextLoop;
+     WhereLoop *pToDel;
+     while( *ppTail ){
+@@ -156652,6 +163718,7 @@ static void whereLoopOutputAdjust(
+       if( pX->iParent>=0 && (&pWC->a[pX->iParent])==pTerm ) break;
+     }
+     if( j<0 ){
++      sqlite3ProgressCheck(pWC->pWInfo->pParse);
+       if( pLoop->maskSelf==pTerm->prereqAll ){
+         /* If there are extra terms in the WHERE clause not used by an index
+         ** that depend only on the table being scanned, and that will tend to
+@@ -156771,7 +163838,7 @@ static int whereRangeVectorLen(
+ }
+ 
+ /*
+-** Adjust the cost C by the costMult facter T.  This only occurs if
++** Adjust the cost C by the costMult factor T.  This only occurs if
+ ** compiled with -DSQLITE_ENABLE_COSTMULT
+ */
+ #ifdef SQLITE_ENABLE_COSTMULT
+@@ -156798,7 +163865,7 @@ static int whereLoopAddBtreeIndex(
+   Index *pProbe,                  /* An index on pSrc */
+   LogEst nInMul                   /* log(Number of iterations due to IN) */
+ ){
+-  WhereInfo *pWInfo = pBuilder->pWInfo;  /* WHERE analyse context */
++  WhereInfo *pWInfo = pBuilder->pWInfo;  /* WHERE analyze context */
+   Parse *pParse = pWInfo->pParse;        /* Parsing context */
+   sqlite3 *db = pParse->db;       /* Database connection malloc context */
+   WhereLoop *pNew;                /* Template WhereLoop under construction */
+@@ -156819,7 +163886,10 @@ static int whereLoopAddBtreeIndex(
+   WhereTerm *pTop = 0, *pBtm = 0; /* Top and bottom range constraints */
+ 
+   pNew = pBuilder->pNew;
+-  if( db->mallocFailed ) return SQLITE_NOMEM_BKPT;
++  assert( db->mallocFailed==0 || pParse->nErr>0 );
++  if( pParse->nErr ){
++    return pParse->rc;
++  }
+   WHERETRACE(0x800, ("BEGIN %s.addBtreeIdx(%s), nEq=%d, nSkip=%d, rRun=%d\n",
+                      pProbe->pTable->zName,pProbe->zName,
+                      pNew->u.btree.nEq, pNew->nSkip, pNew->rRun));
+@@ -156832,7 +163902,10 @@ static int whereLoopAddBtreeIndex(
+     assert( pNew->u.btree.nBtm==0 );
+     opMask = WO_EQ|WO_IN|WO_GT|WO_GE|WO_LT|WO_LE|WO_ISNULL|WO_IS;
+   }
+-  if( pProbe->bUnordered ) opMask &= ~(WO_GT|WO_GE|WO_LT|WO_LE);
++  if( pProbe->bUnordered || pProbe->bLowQual ){
++    if( pProbe->bUnordered ) opMask &= ~(WO_GT|WO_GE|WO_LT|WO_LE);
++    if( pProbe->bLowQual )   opMask &= ~(WO_EQ|WO_IN|WO_IS);
++  }
+ 
+   assert( pNew->u.btree.nEqnColumn );
+   assert( pNew->u.btree.nEqnKeyCol
+@@ -156870,32 +163943,11 @@ static int whereLoopAddBtreeIndex(
+     ** to mix with a lower range bound from some other source */
+     if( pTerm->wtFlags & TERM_LIKEOPT && pTerm->eOperator==WO_LT ) continue;
+ 
+-    /* tag-20191211-001:  Do not allow constraints from the WHERE clause to
+-    ** be used by the right table of a LEFT JOIN nor by the left table of a
+-    ** RIGHT JOIN.  Only constraints in the ON clause are allowed.
+-    ** See tag-20191211-002 for the vtab equivalent.
+-    **
+-    ** 2022-06-06: See https://sqlite.org/forum/forumpost/206d99a16dd9212f
+-    ** for an example of a WHERE clause constraints that may not be used on
+-    ** the right table of a RIGHT JOIN because the constraint implies a
+-    ** not-NULL condition on the left table of the RIGHT JOIN.
+-    **
+-    ** 2022-06-10: The same condition applies to termCanDriveIndex() above.
+-    ** https://sqlite.org/forum/forumpost/51e6959f61
+-    */
+-    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_RIGHT );
+-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
+-      testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
+-      testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
+-      if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
+-       || pTerm->pExpr->w.iJoin != pSrc->iCursor
+-      ){
+-        continue;
+-      }
++    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
++     && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
++    ){
++      continue;
+     }
+-
+     if( IsUniqueIndex(pProbe) && saved_nEq==pProbe->nKeyCol-1 ){
+       pBuilder->bldFlags1 |= SQLITE_BLDF1_UNIQUE;
+     }else{
+@@ -156906,7 +163958,11 @@ static int whereLoopAddBtreeIndex(
+     pNew->u.btree.nBtm = saved_nBtm;
+     pNew->u.btree.nTop = saved_nTop;
+     pNew->nLTerm = saved_nLTerm;
+-    if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
++    if( pNew->nLTerm>=pNew->nLSlot
++     && whereLoopResize(db, pNew, pNew->nLTerm+1)
++    ){
++       break; /* OOM while trying to enlarge the pNew->aLTerm array */
++    }
+     pNew->aLTerm[pNew->nLTerm++] = pTerm;
+     pNew->prereq = (saved_prereq | pTerm->prereqRight) & ~pNew->maskSelf;
+ 
+@@ -156999,38 +164055,39 @@ static int whereLoopAddBtreeIndex(
+       if( scan.iEquiv>1 ) pNew->wsFlags |= WHERE_TRANSCONS;
+     }else if( eOp & WO_ISNULL ){
+       pNew->wsFlags |= WHERE_COLUMN_NULL;
+-    }else if( eOp & (WO_GT|WO_GE) ){
+-      testcase( eOp & WO_GT );
+-      testcase( eOp & WO_GE );
+-      pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_BTM_LIMIT;
+-      pNew->u.btree.nBtm = whereRangeVectorLen(
+-          pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
+-      );
+-      pBtm = pTerm;
+-      pTop = 0;
+-      if( pTerm->wtFlags & TERM_LIKEOPT ){
+-        /* Range constraints that come from the LIKE optimization are
+-        ** always used in pairs. */
+-        pTop = &pTerm[1];
+-        assert( (pTop-(pTerm->pWC->a))pWC->nTerm );
+-        assert( pTop->wtFlags & TERM_LIKEOPT );
+-        assert( pTop->eOperator==WO_LT );
+-        if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
+-        pNew->aLTerm[pNew->nLTerm++] = pTop;
+-        pNew->wsFlags |= WHERE_TOP_LIMIT;
+-        pNew->u.btree.nTop = 1;
+-      }
+-    }else{
+-      assert( eOp & (WO_LT|WO_LE) );
+-      testcase( eOp & WO_LT );
+-      testcase( eOp & WO_LE );
+-      pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_TOP_LIMIT;
+-      pNew->u.btree.nTop = whereRangeVectorLen(
++    }else{
++      int nVecLen = whereRangeVectorLen(
+           pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
+       );
+-      pTop = pTerm;
+-      pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
+-                     pNew->aLTerm[pNew->nLTerm-2] : 0;
++      if( eOp & (WO_GT|WO_GE) ){
++        testcase( eOp & WO_GT );
++        testcase( eOp & WO_GE );
++        pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_BTM_LIMIT;
++        pNew->u.btree.nBtm = nVecLen;
++        pBtm = pTerm;
++        pTop = 0;
++        if( pTerm->wtFlags & TERM_LIKEOPT ){
++          /* Range constraints that come from the LIKE optimization are
++          ** always used in pairs. */
++          pTop = &pTerm[1];
++          assert( (pTop-(pTerm->pWC->a))pWC->nTerm );
++          assert( pTop->wtFlags & TERM_LIKEOPT );
++          assert( pTop->eOperator==WO_LT );
++          if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
++          pNew->aLTerm[pNew->nLTerm++] = pTop;
++          pNew->wsFlags |= WHERE_TOP_LIMIT;
++          pNew->u.btree.nTop = 1;
++        }
++      }else{
++        assert( eOp & (WO_LT|WO_LE) );
++        testcase( eOp & WO_LT );
++        testcase( eOp & WO_LE );
++        pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_TOP_LIMIT;
++        pNew->u.btree.nTop = nVecLen;
++        pTop = pTerm;
++        pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
++                       pNew->aLTerm[pNew->nLTerm-2] : 0;
++      }
+     }
+ 
+     /* At this point pNew->nOut is set to the number of rows expected to
+@@ -157082,7 +164139,7 @@ static int whereLoopAddBtreeIndex(
+              && pNew->nOut+10 > pProbe->aiRowLogEst[0]
+             ){
+ #if WHERETRACE_ENABLED /* 0x01 */
+-              if( sqlite3WhereTrace & 0x01 ){
++              if( sqlite3WhereTrace & 0x20 ){
+                 sqlite3DebugPrintf(
+                    "STAT4 determines term has low selectivity:\n");
+                 sqlite3WhereTermPrint(pTerm, 999);
+@@ -157119,9 +164176,17 @@ static int whereLoopAddBtreeIndex(
+     ** seek only. Then, if this is a non-covering index, add the cost of
+     ** visiting the rows in the main table.  */
+     assert( pSrc->pTab->szTabRow>0 );
+-    rCostIdx = pNew->nOut + 1 + (15*pProbe->szIdxRow)/pSrc->pTab->szTabRow;
++    if( pProbe->idxType==SQLITE_IDXTYPE_IPK ){
++      /* The pProbe->szIdxRow is low for an IPK table since the interior
++      ** pages are small.  Thus szIdxRow gives a good estimate of seek cost.
++      ** But the leaf pages are full-size, so pProbe->szIdxRow would badly
++      ** under-estimate the scanning cost. */
++      rCostIdx = pNew->nOut + 16;
++    }else{
++      rCostIdx = pNew->nOut + 1 + (15*pProbe->szIdxRow)/pSrc->pTab->szTabRow;
++    }
+     pNew->rRun = sqlite3LogEstAdd(rLogSize, rCostIdx);
+-    if( (pNew->wsFlags & (WHERE_IDX_ONLY|WHERE_IPK))==0 ){
++    if( (pNew->wsFlags & (WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX))==0 ){
+       pNew->rRun = sqlite3LogEstAdd(pNew->rRun, pNew->nOut + 16);
+     }
+     ApplyCostMultiplier(pNew->rRun, pProbe->pTable->costMult);
+@@ -157143,6 +164208,9 @@ static int whereLoopAddBtreeIndex(
+      && (pNew->u.btree.nEqnKeyCol ||
+            pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY)
+     ){
++      if( pNew->u.btree.nEq>3 ){
++        sqlite3ProgressCheck(pParse);
++      }
+       whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
+     }
+     pNew->nOut = saved_nOut;
+@@ -157274,6 +164342,243 @@ static int whereUsablePartialIndex(
+   return 0;
+ }
+ 
++/*
++** pIdx is an index containing expressions.  Check it see if any of the
++** expressions in the index match the pExpr expression.
++*/
++static int exprIsCoveredByIndex(
++  const Expr *pExpr,
++  const Index *pIdx,
++  int iTabCur
++){
++  int i;
++  for(i=0; inColumn; i++){
++    if( pIdx->aiColumn[i]==XN_EXPR
++     && sqlite3ExprCompare(0, pExpr, pIdx->aColExpr->a[i].pExpr, iTabCur)==0
++    ){
++      return 1;
++    }
++  }
++  return 0;
++}
++
++/*
++** Structure passed to the whereIsCoveringIndex Walker callback.
++*/
++typedef struct CoveringIndexCheck CoveringIndexCheck;
++struct CoveringIndexCheck {
++  Index *pIdx;       /* The index */
++  int iTabCur;       /* Cursor number for the corresponding table */
++  u8 bExpr;          /* Uses an indexed expression */
++  u8 bUnidx;         /* Uses an unindexed column not within an indexed expr */
++};
++
++/*
++** Information passed in is pWalk->u.pCovIdxCk.  Call it pCk.
++**
++** If the Expr node references the table with cursor pCk->iTabCur, then
++** make sure that column is covered by the index pCk->pIdx.  We know that
++** all columns less than 63 (really BMS-1) are covered, so we don't need
++** to check them.  But we do need to check any column at 63 or greater.
++**
++** If the index does not cover the column, then set pWalk->eCode to
++** non-zero and return WRC_Abort to stop the search.
++**
++** If this node does not disprove that the index can be a covering index,
++** then just return WRC_Continue, to continue the search.
++**
++** If pCk->pIdx contains indexed expressions and one of those expressions
++** matches pExpr, then prune the search.
++*/
++static int whereIsCoveringIndexWalkCallback(Walker *pWalk, Expr *pExpr){
++  int i;                    /* Loop counter */
++  const Index *pIdx;        /* The index of interest */
++  const i16 *aiColumn;      /* Columns contained in the index */
++  u16 nColumn;              /* Number of columns in the index */
++  CoveringIndexCheck *pCk;  /* Info about this search */
++
++  pCk = pWalk->u.pCovIdxCk;
++  pIdx = pCk->pIdx;
++  if( (pExpr->op==TK_COLUMN || pExpr->op==TK_AGG_COLUMN) ){
++    /* if( pExpr->iColumn<(BMS-1) && pIdx->bHasExpr==0 ) return WRC_Continue;*/
++    if( pExpr->iTable!=pCk->iTabCur ) return WRC_Continue;
++    pIdx = pWalk->u.pCovIdxCk->pIdx;
++    aiColumn = pIdx->aiColumn;
++    nColumn = pIdx->nColumn;
++    for(i=0; iiColumn ) return WRC_Continue;
++    }
++    pCk->bUnidx = 1;
++    return WRC_Abort;
++  }else if( pIdx->bHasExpr
++         && exprIsCoveredByIndex(pExpr, pIdx, pWalk->u.pCovIdxCk->iTabCur) ){
++    pCk->bExpr = 1;
++    return WRC_Prune;
++  }
++  return WRC_Continue;
++}
++
++
++/*
++** pIdx is an index that covers all of the low-number columns used by
++** pWInfo->pSelect (columns from 0 through 62) or an index that has
++** expressions terms.  Hence, we cannot determine whether or not it is
++** a covering index by using the colUsed bitmasks.  We have to do a search
++** to see if the index is covering.  This routine does that search.
++**
++** The return value is one of these:
++**
++**      0                The index is definitely not a covering index
++**
++**      WHERE_IDX_ONLY   The index is definitely a covering index
++**
++**      WHERE_EXPRIDX    The index is likely a covering index, but it is
++**                       difficult to determine precisely because of the
++**                       expressions that are indexed.  Score it as a
++**                       covering index, but still keep the main table open
++**                       just in case we need it.
++**
++** This routine is an optimization.  It is always safe to return zero.
++** But returning one of the other two values when zero should have been
++** returned can lead to incorrect bytecode and assertion faults.
++*/
++static SQLITE_NOINLINE u32 whereIsCoveringIndex(
++  WhereInfo *pWInfo,     /* The WHERE clause context */
++  Index *pIdx,           /* Index that is being tested */
++  int iTabCur            /* Cursor for the table being indexed */
++){
++  int i, rc;
++  struct CoveringIndexCheck ck;
++  Walker w;
++  if( pWInfo->pSelect==0 ){
++    /* We don't have access to the full query, so we cannot check to see
++    ** if pIdx is covering.  Assume it is not. */
++    return 0;
++  }
++  if( pIdx->bHasExpr==0 ){
++    for(i=0; inColumn; i++){
++      if( pIdx->aiColumn[i]>=BMS-1 ) break;
++    }
++    if( i>=pIdx->nColumn ){
++      /* pIdx does not index any columns greater than 62, but we know from
++      ** colMask that columns greater than 62 are used, so this is not a
++      ** covering index */
++      return 0;
++    }
++  }
++  ck.pIdx = pIdx;
++  ck.iTabCur = iTabCur;
++  ck.bExpr = 0;
++  ck.bUnidx = 0;
++  memset(&w, 0, sizeof(w));
++  w.xExprCallback = whereIsCoveringIndexWalkCallback;
++  w.xSelectCallback = sqlite3SelectWalkNoop;
++  w.u.pCovIdxCk = &ck;
++  sqlite3WalkSelect(&w, pWInfo->pSelect);
++  if( ck.bUnidx ){
++    rc = 0;
++  }else if( ck.bExpr ){
++    rc = WHERE_EXPRIDX;
++  }else{
++    rc = WHERE_IDX_ONLY;
++  }
++  return rc;
++}
++
++/*
++** This is an sqlite3ParserAddCleanup() callback that is invoked to
++** free the Parse->pIdxEpr list when the Parse object is destroyed.
++*/
++static void whereIndexedExprCleanup(sqlite3 *db, void *pObject){
++  IndexedExpr **pp = (IndexedExpr**)pObject;
++  while( *pp!=0 ){
++    IndexedExpr *p = *pp;
++    *pp = p->pIENext;
++    sqlite3ExprDelete(db, p->pExpr);
++    sqlite3DbFreeNN(db, p);
++  }
++}
++
++/*
++** This function is called for a partial index - one with a WHERE clause - in
++** two scenarios. In both cases, it determines whether or not the WHERE
++** clause on the index implies that a column of the table may be safely
++** replaced by a constant expression. For example, in the following
++** SELECT:
++**
++**   CREATE INDEX i1 ON t1(b, c) WHERE a=;
++**   SELECT a, b, c FROM t1 WHERE a= AND b=?;
++**
++** The "a" in the select-list may be replaced by , iff:
++**
++**    (a)  is a constant expression, and
++**    (b) The (a=) comparison uses the BINARY collation sequence, and
++**    (c) Column "a" has an affinity other than NONE or BLOB.
++**
++** If argument pItem is NULL, then pMask must not be NULL. In this case this
++** function is being called as part of determining whether or not pIdx
++** is a covering index. This function clears any bits in (*pMask)
++** corresponding to columns that may be replaced by constants as described
++** above.
++**
++** Otherwise, if pItem is not NULL, then this function is being called
++** as part of coding a loop that uses index pIdx. In this case, add entries
++** to the Parse.pIdxPartExpr list for each column that can be replaced
++** by a constant.
++*/
++static void wherePartIdxExpr(
++  Parse *pParse,                  /* Parse context */
++  Index *pIdx,                    /* Partial index being processed */
++  Expr *pPart,                    /* WHERE clause being processed */
++  Bitmask *pMask,                 /* Mask to clear bits in */
++  int iIdxCur,                    /* Cursor number for index */
++  SrcItem *pItem                  /* The FROM clause entry for the table */
++){
++  assert( pItem==0 || (pItem->fg.jointype & JT_RIGHT)==0 );
++  assert( (pItem==0 || pMask==0) && (pMask!=0 || pItem!=0) );
++
++  if( pPart->op==TK_AND ){
++    wherePartIdxExpr(pParse, pIdx, pPart->pRight, pMask, iIdxCur, pItem);
++    pPart = pPart->pLeft;
++  }
++
++  if( (pPart->op==TK_EQ || pPart->op==TK_IS) ){
++    Expr *pLeft = pPart->pLeft;
++    Expr *pRight = pPart->pRight;
++    u8 aff;
++
++    if( pLeft->op!=TK_COLUMN ) return;
++    if( !sqlite3ExprIsConstant(pRight) ) return;
++    if( !sqlite3IsBinary(sqlite3ExprCompareCollSeq(pParse, pPart)) ) return;
++    if( pLeft->iColumn<0 ) return;
++    aff = pIdx->pTable->aCol[pLeft->iColumn].affinity;
++    if( aff>=SQLITE_AFF_TEXT ){
++      if( pItem ){
++        sqlite3 *db = pParse->db;
++        IndexedExpr *p = (IndexedExpr*)sqlite3DbMallocRaw(db, sizeof(*p));
++        if( p ){
++          int bNullRow = (pItem->fg.jointype&(JT_LEFT|JT_LTORJ))!=0;
++          p->pExpr = sqlite3ExprDup(db, pRight, 0);
++          p->iDataCur = pItem->iCursor;
++          p->iIdxCur = iIdxCur;
++          p->iIdxCol = pLeft->iColumn;
++          p->bMaybeNullRow = bNullRow;
++          p->pIENext = pParse->pIdxPartExpr;
++          p->aff = aff;
++          pParse->pIdxPartExpr = p;
++          if( p->pIENext==0 ){
++            void *pArg = (void*)&pParse->pIdxPartExpr;
++            sqlite3ParserAddCleanup(pParse, whereIndexedExprCleanup, pArg);
++          }
++        }
++      }else if( pLeft->iColumn<(BMS-1) ){
++        *pMask &= ~((Bitmask)1 << pLeft->iColumn);
++      }
++    }
++  }
++}
++
++
+ /*
+ ** Add all WhereLoop objects for a single table of the join where the table
+ ** is identified by pBuilder->pNew->iTab.  That table is guaranteed to be
+@@ -157312,7 +164617,7 @@ static int whereUsablePartialIndex(
+ */
+ static int whereLoopAddBtree(
+   WhereLoopBuilder *pBuilder, /* WHERE clause information */
+-  Bitmask mPrereq             /* Extra prerequesites for using this table */
++  Bitmask mPrereq             /* Extra prerequisites for using this table */
+ ){
+   WhereInfo *pWInfo;          /* WHERE analysis context */
+   Index *pProbe;              /* An index we are evaluating */
+@@ -157356,7 +164661,7 @@ static int whereLoopAddBtree(
+     sPk.aiRowLogEst = aiRowEstPk;
+     sPk.onError = OE_Replace;
+     sPk.pTable = pTab;
+-    sPk.szIdxRow = pTab->szTabRow;
++    sPk.szIdxRow = 3;  /* TUNING: Interior rows of IPK table are very small */
+     sPk.idxType = SQLITE_IDXTYPE_IPK;
+     aiRowEstPk[0] = pTab->nRowLogEst;
+     aiRowEstPk[1] = 0;
+@@ -157407,7 +164712,8 @@ static int whereLoopAddBtree(
+         if( !IsView(pTab) && (pTab->tabFlags & TF_Ephemeral)==0 ){
+           pNew->rSetup += 28;
+         }else{
+-          pNew->rSetup -= 10;
++          pNew->rSetup -= 25;  /* Greatly reduced setup cost for auto indexes
++                               ** on ephemeral materializations of views */
+         }
+         ApplyCostMultiplier(pNew->rSetup, pTab->costMult);
+         if( pNew->rSetup<0 ) pNew->rSetup = 0;
+@@ -157484,11 +164790,43 @@ static int whereLoopAddBtree(
+     }else{
+       Bitmask m;
+       if( pProbe->isCovering ){
+-        pNew->wsFlags = WHERE_IDX_ONLY | WHERE_INDEXED;
+         m = 0;
++        pNew->wsFlags = WHERE_IDX_ONLY | WHERE_INDEXED;
+       }else{
+         m = pSrc->colUsed & pProbe->colNotIdxed;
+-        pNew->wsFlags = (m==0) ? (WHERE_IDX_ONLY|WHERE_INDEXED) : WHERE_INDEXED;
++        if( pProbe->pPartIdxWhere ){
++          wherePartIdxExpr(
++              pWInfo->pParse, pProbe, pProbe->pPartIdxWhere, &m, 0, 0
++          );
++        }
++        pNew->wsFlags = WHERE_INDEXED;
++        if( m==TOPBIT || (pProbe->bHasExpr && !pProbe->bHasVCol && m!=0) ){
++          u32 isCov = whereIsCoveringIndex(pWInfo, pProbe, pSrc->iCursor);
++          if( isCov==0 ){
++            WHERETRACE(0x200,
++               ("-> %s is not a covering index"
++                " according to whereIsCoveringIndex()\n", pProbe->zName));
++            assert( m!=0 );
++          }else{
++            m = 0;
++            pNew->wsFlags |= isCov;
++            if( isCov & WHERE_IDX_ONLY ){
++              WHERETRACE(0x200,
++                 ("-> %s is a covering expression index"
++                  " according to whereIsCoveringIndex()\n", pProbe->zName));
++            }else{
++              assert( isCov==WHERE_EXPRIDX );
++              WHERETRACE(0x200,
++                 ("-> %s might be a covering expression index"
++                  " according to whereIsCoveringIndex()\n", pProbe->zName));
++            }
++          }
++        }else if( m==0 ){
++          WHERETRACE(0x200,
++             ("-> %s a covering index according to bitmasks\n",
++             pProbe->zName, m==0 ? "is" : "is not"));
++          pNew->wsFlags = WHERE_IDX_ONLY | WHERE_INDEXED;
++        }
+       }
+ 
+       /* Full scan via index */
+@@ -157661,7 +164999,7 @@ static int whereLoopAddVirtualOne(
+       ** that the particular combination of parameters provided is unusable.
+       ** Make no entries in the loop table.
+       */
+-      WHERETRACE(0xffff, ("  ^^^^--- non-viable plan rejected!\n"));
++      WHERETRACE(0xffffffff, ("  ^^^^--- non-viable plan rejected!\n"));
+       return SQLITE_OK;
+     }
+     return rc;
+@@ -157772,7 +165110,7 @@ static int whereLoopAddVirtualOne(
+     sqlite3_free(pNew->u.vtab.idxStr);
+     pNew->u.vtab.needFree = 0;
+   }
+-  WHERETRACE(0xffff, ("  bIn=%d prereqIn=%04llx prereqOut=%04llx\n",
++  WHERETRACE(0xffffffff, ("  bIn=%d prereqIn=%04llx prereqOut=%04llx\n",
+                       *pbIn, (sqlite3_uint64)mPrereq,
+                       (sqlite3_uint64)(pNew->prereq & ~mPrereq)));
+ 
+@@ -157788,7 +165126,7 @@ static int whereLoopAddVirtualOne(
+ **
+ ** Return a pointer to the collation name:
+ **
+-**    1. If there is an explicit COLLATE operator on the constaint, return it.
++**    1. If there is an explicit COLLATE operator on the constraint, return it.
+ **
+ **    2. Else, if the column has an alternative collation, return that.
+ **
+@@ -157843,7 +165181,7 @@ SQLITE_API int sqlite3_vtab_rhs_value(
+   sqlite3_value *pVal = 0;
+   int rc = SQLITE_OK;
+   if( iCons<0 || iCons>=pIdxInfo->nConstraint ){
+-    rc = SQLITE_MISUSE; /* EV: R-30545-25046 */
++    rc = SQLITE_MISUSE_BKPT; /* EV: R-30545-25046 */
+   }else{
+     if( pH->aRhs[iCons]==0 ){
+       WhereTerm *pTerm = &pH->pWC->a[pIdxInfo->aConstraint[iCons].iTermOffset];
+@@ -157873,32 +165211,27 @@ SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info *pIdxInfo){
+   return pHidden->eDistinct;
+ }
+ 
+-#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
+-    && !defined(SQLITE_OMIT_VIRTUALTABLE)
+ /*
+ ** Cause the prepared statement that is associated with a call to
+-** xBestIndex to potentiall use all schemas.  If the statement being
++** xBestIndex to potentially use all schemas.  If the statement being
+ ** prepared is read-only, then just start read transactions on all
+ ** schemas.  But if this is a write operation, start writes on all
+ ** schemas.
+ **
+ ** This is used by the (built-in) sqlite_dbpage virtual table.
+ */
+-SQLITE_PRIVATE void sqlite3VtabUsesAllSchemas(sqlite3_index_info *pIdxInfo){
+-  HiddenIndexInfo *pHidden = (HiddenIndexInfo*)&pIdxInfo[1];
+-  Parse *pParse = pHidden->pParse;
++SQLITE_PRIVATE void sqlite3VtabUsesAllSchemas(Parse *pParse){
+   int nDb = pParse->db->nDb;
+   int i;
+   for(i=0; iwriteMask ){
++  if( DbMaskNonZero(pParse->writeMask) ){
+     for(i=0; ipTab->zName));
+-  WHERETRACE(0x40, ("  VirtualOne: all usable\n"));
++  WHERETRACE(0x800, ("  VirtualOne: all usable\n"));
+   rc = whereLoopAddVirtualOne(
+       pBuilder, mPrereq, ALLBITS, 0, p, mNoOmit, &bIn, &bRetry
+   );
+@@ -157989,7 +165322,7 @@ static int whereLoopAddVirtual(
+     /* If the plan produced by the earlier call uses an IN(...) term, call
+     ** xBestIndex again, this time with IN(...) terms disabled. */
+     if( bIn ){
+-      WHERETRACE(0x40, ("  VirtualOne: all usable w/o IN\n"));
++      WHERETRACE(0x800, ("  VirtualOne: all usable w/o IN\n"));
+       rc = whereLoopAddVirtualOne(
+           pBuilder, mPrereq, ALLBITS, WO_IN, p, mNoOmit, &bIn, 0);
+       assert( bIn==0 );
+@@ -158015,7 +165348,7 @@ static int whereLoopAddVirtual(
+       mPrev = mNext;
+       if( mNext==ALLBITS ) break;
+       if( mNext==mBest || mNext==mBestNoIn ) continue;
+-      WHERETRACE(0x40, ("  VirtualOne: mPrev=%04llx mNext=%04llx\n",
++      WHERETRACE(0x800, ("  VirtualOne: mPrev=%04llx mNext=%04llx\n",
+                        (sqlite3_uint64)mPrev, (sqlite3_uint64)mNext));
+       rc = whereLoopAddVirtualOne(
+           pBuilder, mPrereq, mNext|mPrereq, 0, p, mNoOmit, &bIn, 0);
+@@ -158029,7 +165362,7 @@ static int whereLoopAddVirtual(
+     ** that requires no source tables at all (i.e. one guaranteed to be
+     ** usable), make a call here with all source tables disabled */
+     if( rc==SQLITE_OK && seenZero==0 ){
+-      WHERETRACE(0x40, ("  VirtualOne: all disabled\n"));
++      WHERETRACE(0x800, ("  VirtualOne: all disabled\n"));
+       rc = whereLoopAddVirtualOne(
+           pBuilder, mPrereq, mPrereq, 0, p, mNoOmit, &bIn, 0);
+       if( bIn==0 ) seenZeroNoIN = 1;
+@@ -158039,7 +165372,7 @@ static int whereLoopAddVirtual(
+     ** that requires no source tables at all and does not use an IN(...)
+     ** operator, make a final call to obtain one here.  */
+     if( rc==SQLITE_OK && seenZeroNoIN==0 ){
+-      WHERETRACE(0x40, ("  VirtualOne: all disabled and w/o IN\n"));
++      WHERETRACE(0x800, ("  VirtualOne: all disabled and w/o IN\n"));
+       rc = whereLoopAddVirtualOne(
+           pBuilder, mPrereq, mPrereq, WO_IN, p, mNoOmit, &bIn, 0);
+     }
+@@ -158095,7 +165428,7 @@ static int whereLoopAddOr(
+       sSubBuild = *pBuilder;
+       sSubBuild.pOrSet = &sCur;
+ 
+-      WHERETRACE(0x200, ("Begin processing OR-clause %p\n", pTerm));
++      WHERETRACE(0x400, ("Begin processing OR-clause %p\n", pTerm));
+       for(pOrTerm=pOrWC->a; pOrTermeOperator & WO_AND)!=0 ){
+           sSubBuild.pWC = &pOrTerm->u.pAndInfo->wc;
+@@ -158112,9 +165445,9 @@ static int whereLoopAddOr(
+         }
+         sCur.n = 0;
+ #ifdef WHERETRACE_ENABLED
+-        WHERETRACE(0x200, ("OR-term %d of %p has %d subterms:\n",
++        WHERETRACE(0x400, ("OR-term %d of %p has %d subterms:\n",
+                    (int)(pOrTerm-pOrWC->a), pTerm, sSubBuild.pWC->nTerm));
+-        if( sqlite3WhereTrace & 0x400 ){
++        if( sqlite3WhereTrace & 0x20000 ){
+           sqlite3WhereClausePrint(sSubBuild.pWC);
+         }
+ #endif
+@@ -158129,8 +165462,6 @@ static int whereLoopAddOr(
+         if( rc==SQLITE_OK ){
+           rc = whereLoopAddOr(&sSubBuild, mPrereq, mUnusable);
+         }
+-        assert( rc==SQLITE_OK || rc==SQLITE_DONE || sCur.n==0
+-                || rc==SQLITE_NOMEM );
+         testcase( rc==SQLITE_NOMEM && sCur.n>0 );
+         testcase( rc==SQLITE_DONE );
+         if( sCur.n==0 ){
+@@ -158176,7 +165507,7 @@ static int whereLoopAddOr(
+         pNew->prereq = sSum.a[i].prereq;
+         rc = whereLoopInsert(pBuilder, pNew);
+       }
+-      WHERETRACE(0x200, ("End processing OR-clause %p\n", pTerm));
++      WHERETRACE(0x400, ("End processing OR-clause %p\n", pTerm));
+     }
+   }
+   return rc;
+@@ -158202,7 +165533,13 @@ static int whereLoopAddAll(WhereLoopBuilder *pBuilder){
+ 
+   /* Loop over the tables in the join, from left to right */
+   pNew = pBuilder->pNew;
+-  whereLoopInit(pNew);
++
++  /* Verify that pNew has already been initialized */
++  assert( pNew->nLTerm==0 );
++  assert( pNew->wsFlags==0 );
++  assert( pNew->nLSlot>=ArraySize(pNew->aLTermSpace) );
++  assert( pNew->aLTerm!=0 );
++
+   pBuilder->iPlanLimit = SQLITE_QUERY_PLANNER_LIMIT;
+   for(iTab=0, pItem=pTabList->a; pItemiTable!=iCur ) continue;
+             if( pOBExpr->iColumn!=iColumn ) continue;
+           }else{
+-            Expr *pIdxExpr = pIndex->aColExpr->a[j].pExpr;
+-            if( sqlite3ExprCompareSkip(pOBExpr, pIdxExpr, iCur) ){
++            Expr *pIxExpr = pIndex->aColExpr->a[j].pExpr;
++            if( sqlite3ExprCompareSkip(pOBExpr, pIxExpr, iCur) ){
+               continue;
+             }
+           }
+@@ -158651,37 +165988,56 @@ static const char *wherePathName(WherePath *pPath, int nLoop, WhereLoop *pLast){
+ ** order.
+ */
+ static LogEst whereSortingCost(
+-  WhereInfo *pWInfo,
+-  LogEst nRow,
+-  int nOrderBy,
+-  int nSorted
++  WhereInfo *pWInfo, /* Query planning context */
++  LogEst nRow,       /* Estimated number of rows to sort */
++  int nOrderBy,      /* Number of ORDER BY clause terms */
++  int nSorted        /* Number of initial ORDER BY terms naturally in order */
+ ){
+-  /* TUNING: Estimated cost of a full external sort, where N is
++  /* Estimated cost of a full external sort, where N is
+   ** the number of rows to sort is:
+   **
+-  **   cost = (3.0 * N * log(N)).
++  **   cost = (K * N * log(N)).
+   **
+   ** Or, if the order-by clause has X terms but only the last Y
+   ** terms are out of order, then block-sorting will reduce the
+   ** sorting cost to:
+   **
+-  **   cost = (3.0 * N * log(N)) * (Y/X)
++  **   cost = (K * N * log(N)) * (Y/X)
++  **
++  ** The constant K is at least 2.0 but will be larger if there are a
++  ** large number of columns to be sorted, as the sorting time is
++  ** proportional to the amount of content to be sorted.  The algorithm
++  ** does not currently distinguish between fat columns (BLOBs and TEXTs)
++  ** and skinny columns (INTs).  It just uses the number of columns as
++  ** an approximation for the row width.
+   **
+-  ** The (Y/X) term is implemented using stack variable rScale
+-  ** below.
++  ** And extra factor of 2.0 or 3.0 is added to the sorting cost if the sort
++  ** is built using OP_IdxInsert and OP_Sort rather than with OP_SorterInsert.
+   */
+-  LogEst rScale, rSortCost;
+-  assert( nOrderBy>0 && 66==sqlite3LogEst(100) );
+-  rScale = sqlite3LogEst((nOrderBy-nSorted)*100/nOrderBy) - 66;
+-  rSortCost = nRow + rScale + 16;
++  LogEst rSortCost, nCol;
++  assert( pWInfo->pSelect!=0 );
++  assert( pWInfo->pSelect->pEList!=0 );
++  /* TUNING: sorting cost proportional to the number of output columns: */
++  nCol = sqlite3LogEst((pWInfo->pSelect->pEList->nExpr+59)/30);
++  rSortCost = nRow + nCol;
++  if( nSorted>0 ){
++    /* Scale the result by (Y/X) */
++    rSortCost += sqlite3LogEst((nOrderBy-nSorted)*100/nOrderBy) - 66;
++  }
+ 
+   /* Multiple by log(M) where M is the number of output rows.
+   ** Use the LIMIT for M if it is smaller.  Or if this sort is for
+   ** a DISTINCT operator, M will be the number of distinct output
+   ** rows, so fudge it downwards a bit.
+   */
+-  if( (pWInfo->wctrlFlags & WHERE_USE_LIMIT)!=0 && pWInfo->iLimitiLimit;
++  if( (pWInfo->wctrlFlags & WHERE_USE_LIMIT)!=0 ){
++    rSortCost += 10;       /* TUNING: Extra 2.0x if using LIMIT */
++    if( nSorted!=0 ){
++      rSortCost += 6;      /* TUNING: Extra 1.5x if also using partial sort */
++    }
++    if( pWInfo->iLimitiLimit;
++    }
+   }else if( (pWInfo->wctrlFlags & WHERE_WANT_DISTINCT) ){
+     /* TUNING: In the sort for a DISTINCT operator, assume that the DISTINCT
+     ** reduces the number of output rows by a factor of 2 */
+@@ -158707,7 +166063,6 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+   int mxChoice;             /* Maximum number of simultaneous paths tracked */
+   int nLoop;                /* Number of terms in the join */
+   Parse *pParse;            /* Parsing context */
+-  sqlite3 *db;              /* The database connection */
+   int iLoop;                /* Loop counter over the terms of the join */
+   int ii, jj;               /* Loop counters */
+   int mxI = 0;              /* Index of next entry to replace */
+@@ -158726,14 +166081,14 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+   int nSpace;               /* Bytes of space allocated at pSpace */
+ 
+   pParse = pWInfo->pParse;
+-  db = pParse->db;
+   nLoop = pWInfo->nLevel;
+   /* TUNING: For simple queries, only the best path is tracked.
+   ** For 2-way joins, the 5 best paths are followed.
+   ** For joins of 3 or more tables, track the 10 best paths */
+   mxChoice = (nLoop<=1) ? 1 : (nLoop==2 ? 5 : 10);
+   assert( nLoop<=pWInfo->pTabList->nSrc );
+-  WHERETRACE(0x002, ("---- begin solver.  (nRowEst=%d)\n", nRowEst));
++  WHERETRACE(0x002, ("---- begin solver.  (nRowEst=%d, nQueryLoop=%d)\n",
++                     nRowEst, pParse->nQueryLoop));
+ 
+   /* If nRowEst is zero and there is an ORDER BY clause, ignore it. In this
+   ** case the purpose of this call is to estimate the number of rows returned
+@@ -158749,7 +166104,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+   /* Allocate and initialize space for aTo, aFrom and aSortCost[] */
+   nSpace = (sizeof(WherePath)+sizeof(WhereLoop*)*nLoop)*mxChoice*2;
+   nSpace += sizeof(LogEst) * nOrderBy;
+-  pSpace = sqlite3DbMallocRawNN(db, nSpace);
++  pSpace = sqlite3StackAllocRawNN(pParse->db, nSpace);
+   if( pSpace==0 ) return SQLITE_NOMEM_BKPT;
+   aTo = (WherePath*)pSpace;
+   aFrom = aTo+mxChoice;
+@@ -158799,9 +166154,9 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+         LogEst nOut;                      /* Rows visited by (pFrom+pWLoop) */
+         LogEst rCost;                     /* Cost of path (pFrom+pWLoop) */
+         LogEst rUnsorted;                 /* Unsorted cost of (pFrom+pWLoop) */
+-        i8 isOrdered = pFrom->isOrdered;  /* isOrdered for (pFrom+pWLoop) */
++        i8 isOrdered;                     /* isOrdered for (pFrom+pWLoop) */
+         Bitmask maskNew;                  /* Mask of src visited by (..) */
+-        Bitmask revMask = 0;              /* Mask of rev-order loops for (..) */
++        Bitmask revMask;                  /* Mask of rev-order loops for (..) */
+ 
+         if( (pWLoop->prereq & ~pFrom->maskLoop)!=0 ) continue;
+         if( (pWLoop->maskSelf & pFrom->maskLoop)!=0 ) continue;
+@@ -158820,7 +166175,9 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+         rUnsorted = sqlite3LogEstAdd(rUnsorted, pFrom->rUnsorted);
+         nOut = pFrom->nRow + pWLoop->nOut;
+         maskNew = pFrom->maskLoop | pWLoop->maskSelf;
++        isOrdered = pFrom->isOrdered;
+         if( isOrdered<0 ){
++          revMask = 0;
+           isOrdered = wherePathSatisfiesOrderBy(pWInfo,
+                        pWInfo->pOrderBy, pFrom, pWInfo->wctrlFlags,
+                        iLoop, pWLoop, &revMask);
+@@ -158833,11 +166190,11 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+                 pWInfo, nRowEst, nOrderBy, isOrdered
+             );
+           }
+-          /* TUNING:  Add a small extra penalty (5) to sorting as an
+-          ** extra encouragment to the query planner to select a plan
++          /* TUNING:  Add a small extra penalty (3) to sorting as an
++          ** extra encouragement to the query planner to select a plan
+           ** where the rows emerge in the correct order without any sorting
+           ** required. */
+-          rCost = sqlite3LogEstAdd(rUnsorted, aSortCost[isOrdered]) + 5;
++          rCost = sqlite3LogEstAdd(rUnsorted, aSortCost[isOrdered]) + 3;
+ 
+           WHERETRACE(0x002,
+               ("---- sort cost=%-3d (%d/%d) increases cost %3d to %-3d\n",
+@@ -158998,7 +166355,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+ 
+   if( nFrom==0 ){
+     sqlite3ErrorMsg(pParse, "no query solution");
+-    sqlite3DbFreeNN(db, pSpace);
++    sqlite3StackFreeNN(pParse->db, pSpace);
+     return SQLITE_ERROR;
+   }
+ 
+@@ -159034,6 +166391,10 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+       if( pFrom->isOrdered==pWInfo->pOrderBy->nExpr ){
+         pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
+       }
++      if( pWInfo->pSelect->pOrderBy
++       && pWInfo->nOBSat > pWInfo->pSelect->pOrderBy->nExpr ){
++        pWInfo->nOBSat = pWInfo->pSelect->pOrderBy->nExpr;
++      }
+     }else{
+       pWInfo->revMask = pFrom->revLoop;
+       if( pWInfo->nOBSat<=0 ){
+@@ -159080,7 +166441,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+   pWInfo->nRowOut = pFrom->nRow;
+ 
+   /* Free temporary memory and return success */
+-  sqlite3DbFreeNN(db, pSpace);
++  sqlite3StackFreeNN(pParse->db, pSpace);
+   return SQLITE_OK;
+ }
+ 
+@@ -159178,7 +166539,7 @@ static int whereShortCut(WhereLoopBuilder *pBuilder){
+     pLoop->cId = '0';
+ #endif
+ #ifdef WHERETRACE_ENABLED
+-    if( sqlite3WhereTrace ){
++    if( sqlite3WhereTrace & 0x02 ){
+       sqlite3DebugPrintf("whereShortCut() used to compute solution\n");
+     }
+ #endif
+@@ -159245,6 +166606,13 @@ static void showAllWhereLoops(WhereInfo *pWInfo, WhereClause *pWC){
+ **      at most a single row.
+ **   4) The table must not be referenced by any part of the query apart
+ **      from its own USING or ON clause.
++**   5) The table must not have an inner-join ON or USING clause if there is
++**      a RIGHT JOIN anywhere in the query.  Otherwise the ON/USING clause
++**      might move from the right side to the left side of the RIGHT JOIN.
++**      Note: Due to (2), this condition can only arise if the table is
++**      the right-most table of a subquery that was flattened into the
++**      main query and that subquery was the right-hand operand of an
++**      inner join that held an ON or USING clause.
+ **
+ ** For example, given:
+ **
+@@ -159270,6 +166638,7 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
+ ){
+   int i;
+   Bitmask tabUsed;
++  int hasRightJoin;
+ 
+   /* Preconditions checked by the caller */
+   assert( pWInfo->nLevel>=2 );
+@@ -159284,6 +166653,7 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
+   if( pWInfo->pOrderBy ){
+     tabUsed |= sqlite3WhereExprListUsage(&pWInfo->sMaskSet, pWInfo->pOrderBy);
+   }
++  hasRightJoin = (pWInfo->pTabList->a[0].fg.jointype & JT_LTORJ)!=0;
+   for(i=pWInfo->nLevel-1; i>=1; i--){
+     WhereTerm *pTerm, *pEnd;
+     SrcItem *pItem;
+@@ -159306,9 +166676,15 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
+           break;
+         }
+       }
++      if( hasRightJoin
++       && ExprHasProperty(pTerm->pExpr, EP_InnerON)
++       && pTerm->pExpr->w.iJoin==pItem->iCursor
++      ){
++        break;  /* restriction (5) */
++      }
+     }
+     if( pTerm drop loop %c not used\n", pLoop->cId));
++    WHERETRACE(0xffffffff, ("-> drop loop %c not used\n", pLoop->cId));
+     notReady &= ~pLoop->maskSelf;
+     for(pTerm=pWInfo->sWC.a; pTermprereqAll & pLoop->maskSelf)!=0 ){
+@@ -159347,28 +166723,27 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
+   const WhereInfo *pWInfo
+ ){
+   int i;
+-  LogEst nSearch;
++  LogEst nSearch = 0;
+ 
+   assert( pWInfo->nLevel>=2 );
+   assert( OptimizationEnabled(pWInfo->pParse->db, SQLITE_BloomFilter) );
+-  nSearch = pWInfo->a[0].pWLoop->nOut;
+-  for(i=1; inLevel; i++){
++  for(i=0; inLevel; i++){
+     WhereLoop *pLoop = pWInfo->a[i].pWLoop;
+     const unsigned int reqFlags = (WHERE_SELFCULL|WHERE_COLUMN_EQ);
+-    if( (pLoop->wsFlags & reqFlags)==reqFlags
++    SrcItem *pItem = &pWInfo->pTabList->a[pLoop->iTab];
++    Table *pTab = pItem->pTab;
++    if( (pTab->tabFlags & TF_HasStat1)==0 ) break;
++    pTab->tabFlags |= TF_StatsUsed;
++    if( i>=1
++     && (pLoop->wsFlags & reqFlags)==reqFlags
+      /* vvvvvv--- Always the case if WHERE_COLUMN_EQ is defined */
+      && ALWAYS((pLoop->wsFlags & (WHERE_IPK|WHERE_INDEXED))!=0)
+     ){
+-      SrcItem *pItem = &pWInfo->pTabList->a[pLoop->iTab];
+-      Table *pTab = pItem->pTab;
+-      pTab->tabFlags |= TF_StatsUsed;
+-      if( nSearch > pTab->nRowLogEst
+-       && (pTab->tabFlags & TF_HasStat1)!=0
+-      ){
++      if( nSearch > pTab->nRowLogEst ){
+         testcase( pItem->fg.jointype & JT_LEFT );
+         pLoop->wsFlags |= WHERE_BLOOMFILTER;
+         pLoop->wsFlags &= ~WHERE_IDX_ONLY;
+-        WHERETRACE(0xffff, (
++        WHERETRACE(0xffffffff, (
+            "-> use Bloom-filter on loop %c because there are ~%.1e "
+            "lookups into %s which has only ~%.1e rows\n",
+            pLoop->cId, (double)sqlite3LogEstToInt(nSearch), pTab->zName,
+@@ -159379,6 +166754,109 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
+   }
+ }
+ 
++/*
++** The index pIdx is used by a query and contains one or more expressions.
++** In other words pIdx is an index on an expression.  iIdxCur is the cursor
++** number for the index and iDataCur is the cursor number for the corresponding
++** table.
++**
++** This routine adds IndexedExpr entries to the Parse->pIdxEpr field for
++** each of the expressions in the index so that the expression code generator
++** will know to replace occurrences of the indexed expression with
++** references to the corresponding column of the index.
++*/
++static SQLITE_NOINLINE void whereAddIndexedExpr(
++  Parse *pParse,     /* Add IndexedExpr entries to pParse->pIdxEpr */
++  Index *pIdx,       /* The index-on-expression that contains the expressions */
++  int iIdxCur,       /* Cursor number for pIdx */
++  SrcItem *pTabItem  /* The FROM clause entry for the table */
++){
++  int i;
++  IndexedExpr *p;
++  Table *pTab;
++  assert( pIdx->bHasExpr );
++  pTab = pIdx->pTable;
++  for(i=0; inColumn; i++){
++    Expr *pExpr;
++    int j = pIdx->aiColumn[i];
++    int bMaybeNullRow;
++    if( j==XN_EXPR ){
++      pExpr = pIdx->aColExpr->a[i].pExpr;
++      testcase( pTabItem->fg.jointype & JT_LEFT );
++      testcase( pTabItem->fg.jointype & JT_RIGHT );
++      testcase( pTabItem->fg.jointype & JT_LTORJ );
++      bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
++    }else if( j>=0 && (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)!=0 ){
++      pExpr = sqlite3ColumnExpr(pTab, &pTab->aCol[j]);
++      bMaybeNullRow = 0;
++    }else{
++      continue;
++    }
++    if( sqlite3ExprIsConstant(pExpr) ) continue;
++    if( pExpr->op==TK_FUNCTION ){
++      /* Functions that might set a subtype should not be replaced by the
++      ** value taken from an expression index since the index omits the
++      ** subtype.  https://sqlite.org/forum/forumpost/68d284c86b082c3e */
++      int n;
++      FuncDef *pDef;
++      sqlite3 *db = pParse->db;
++      assert( ExprUseXList(pExpr) );
++      n = pExpr->x.pList ? pExpr->x.pList->nExpr : 0;
++      pDef = sqlite3FindFunction(db, pExpr->u.zToken, n, ENC(db), 0);
++      if( pDef==0 || (pDef->funcFlags & SQLITE_RESULT_SUBTYPE)!=0 ){
++        continue;
++      }
++    }
++    p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexedExpr));
++    if( p==0 ) break;
++    p->pIENext = pParse->pIdxEpr;
++#ifdef WHERETRACE_ENABLED
++    if( sqlite3WhereTrace & 0x200 ){
++      sqlite3DebugPrintf("New pParse->pIdxEpr term {%d,%d}\n", iIdxCur, i);
++      if( sqlite3WhereTrace & 0x5000 ) sqlite3ShowExpr(pExpr);
++    }
++#endif
++    p->pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
++    p->iDataCur = pTabItem->iCursor;
++    p->iIdxCur = iIdxCur;
++    p->iIdxCol = i;
++    p->bMaybeNullRow = bMaybeNullRow;
++    if( sqlite3IndexAffinityStr(pParse->db, pIdx) ){
++      p->aff = pIdx->zColAff[i];
++    }
++#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
++    p->zIdxName = pIdx->zName;
++#endif
++    pParse->pIdxEpr = p;
++    if( p->pIENext==0 ){
++      void *pArg = (void*)&pParse->pIdxEpr;
++      sqlite3ParserAddCleanup(pParse, whereIndexedExprCleanup, pArg);
++    }
++  }
++}
++
++/*
++** Set the reverse-scan order mask to one for all tables in the query
++** with the exception of MATERIALIZED common table expressions that have
++** their own internal ORDER BY clauses.
++**
++** This implements the PRAGMA reverse_unordered_selects=ON setting.
++** (Also SQLITE_DBCONFIG_REVERSE_SCANORDER).
++*/
++static SQLITE_NOINLINE void whereReverseScanOrder(WhereInfo *pWInfo){
++  int ii;
++  for(ii=0; iipTabList->nSrc; ii++){
++    SrcItem *pItem = &pWInfo->pTabList->a[ii];
++    if( !pItem->fg.isCte
++     || pItem->u2.pCteUse->eM10d!=M10d_Yes
++     || NEVER(pItem->pSelect==0)
++     || pItem->pSelect->pOrderBy==0
++    ){
++      pWInfo->revMask |= MASKBIT(ii);
++    }
++  }
++}
++
+ /*
+ ** Generate the beginning of the loop used for WHERE clause processing.
+ ** The return value is a pointer to an opaque structure that contains
+@@ -159437,7 +166915,7 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
+ **
+ ** OUTER JOINS
+ **
+-** An outer join of tables t1 and t2 is conceptally coded as follows:
++** An outer join of tables t1 and t2 is conceptually coded as follows:
+ **
+ **    foreach row1 in t1 do
+ **      flag = 0
+@@ -159473,7 +166951,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   Expr *pWhere,           /* The WHERE clause */
+   ExprList *pOrderBy,     /* An ORDER BY (or GROUP BY) clause, or NULL */
+   ExprList *pResultSet,   /* Query result set.  Req'd for DISTINCT */
+-  Select *pLimit,         /* Use this LIMIT/OFFSET clause, if any */
++  Select *pSelect,        /* The entire SELECT statement */
+   u16 wctrlFlags,         /* The WHERE_* flags defined in sqliteInt.h */
+   int iAuxArg             /* If WHERE_OR_SUBCLAUSE is set, index cursor number
+                           ** If WHERE_USE_LIMIT, then the limit amount */
+@@ -159507,7 +166985,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+ 
+   /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */
+   testcase( pOrderBy && pOrderBy->nExpr==BMS-1 );
+-  if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0;
++  if( pOrderBy && pOrderBy->nExpr>=BMS ){
++    pOrderBy = 0;
++    wctrlFlags &= ~WHERE_WANT_DISTINCT;
++  }
+ 
+   /* The number of tables in the FROM clause is limited by the number of
+   ** bits in a Bitmask
+@@ -159532,7 +167013,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   ** field (type Bitmask) it must be aligned on an 8-byte boundary on
+   ** some architectures. Hence the ROUND8() below.
+   */
+-  nByteWInfo = ROUND8P(sizeof(WhereInfo)+(nTabList-1)*sizeof(WhereLevel));
++  nByteWInfo = ROUND8P(sizeof(WhereInfo));
++  if( nTabList>1 ){
++    nByteWInfo = ROUND8P(nByteWInfo + (nTabList-1)*sizeof(WhereLevel));
++  }
+   pWInfo = sqlite3DbMallocRawNN(db, nByteWInfo + sizeof(WhereLoop));
+   if( db->mallocFailed ){
+     sqlite3DbFree(db, pWInfo);
+@@ -159542,7 +167026,9 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   pWInfo->pParse = pParse;
+   pWInfo->pTabList = pTabList;
+   pWInfo->pOrderBy = pOrderBy;
++#if WHERETRACE_ENABLED
+   pWInfo->pWhere = pWhere;
++#endif
+   pWInfo->pResultSet = pResultSet;
+   pWInfo->aiCurOnePass[0] = pWInfo->aiCurOnePass[1] = -1;
+   pWInfo->nLevel = nTabList;
+@@ -159550,9 +167036,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   pWInfo->wctrlFlags = wctrlFlags;
+   pWInfo->iLimit = iAuxArg;
+   pWInfo->savedNQueryLoop = pParse->nQueryLoop;
+-#ifndef SQLITE_OMIT_VIRTUALTABLE
+-  pWInfo->pLimit = pLimit;
+-#endif
++  pWInfo->pSelect = pSelect;
+   memset(&pWInfo->nOBSat, 0,
+          offsetof(WhereInfo,sWC) - offsetof(WhereInfo,nOBSat));
+   memset(&pWInfo->a[0], 0, sizeof(WhereLoop)+nTabList*sizeof(WhereLevel));
+@@ -159592,7 +167076,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+     **
+     ** The N-th term of the FROM clause is assigned a bitmask of 1<sWC);
+-  sqlite3WhereAddLimit(&pWInfo->sWC, pLimit);
++  if( pSelect && pSelect->pLimit ){
++    sqlite3WhereAddLimit(&pWInfo->sWC, pSelect);
++  }
+   if( pParse->nErr ) goto whereBeginError;
+ 
+-  /* Special case: WHERE terms that do not refer to any tables in the join
+-  ** (constant expressions). Evaluate each such term, and jump over all the
+-  ** generated code if the result is not true.
++  /* The False-WHERE-Term-Bypass optimization:
++  **
++  ** If there are WHERE terms that are false, then no rows will be output,
++  ** so skip over all of the code generated here.
+   **
+-  ** Do not do this if the expression contains non-deterministic functions
+-  ** that are not within a sub-select. This is not strictly required, but
+-  ** preserves SQLite's legacy behaviour in the following two cases:
++  ** Conditions:
+   **
+-  **   FROM ... WHERE random()>0;           -- eval random() once per row
+-  **   FROM ... WHERE (SELECT random())>0;  -- eval random() once overall
++  **   (1)  The WHERE term must not refer to any tables in the join.
++  **   (2)  The term must not come from an ON clause on the
++  **        right-hand side of a LEFT or FULL JOIN.
++  **   (3)  The term must not come from an ON clause, or there must be
++  **        no RIGHT or FULL OUTER joins in pTabList.
++  **   (4)  If the expression contains non-deterministic functions
++  **        that are not within a sub-select. This is not required
++  **        for correctness but rather to preserves SQLite's legacy
++  **        behaviour in the following two cases:
++  **
++  **          WHERE random()>0;           -- eval random() once per row
++  **          WHERE (SELECT random())>0;  -- eval random() just once overall
++  **
++  ** Note that the Where term need not be a constant in order for this
++  ** optimization to apply, though it does need to be constant relative to
++  ** the current subquery (condition 1).  The term might include variables
++  ** from outer queries so that the value of the term changes from one
++  ** invocation of the current subquery to the next.
+   */
+   for(ii=0; iinBase; ii++){
+-    WhereTerm *pT = &sWLB.pWC->a[ii];
++    WhereTerm *pT = &sWLB.pWC->a[ii];  /* A term of the WHERE clause */
++    Expr *pX;                          /* The expression of pT */
+     if( pT->wtFlags & TERM_VIRTUAL ) continue;
+-    if( pT->prereqAll==0 && (nTabList==0 || exprIsDeterministic(pT->pExpr)) ){
+-      sqlite3ExprIfFalse(pParse, pT->pExpr, pWInfo->iBreak, SQLITE_JUMPIFNULL);
++    pX = pT->pExpr;
++    assert( pX!=0 );
++    assert( pT->prereqAll!=0 || !ExprHasProperty(pX, EP_OuterON) );
++    if( pT->prereqAll==0                           /* Conditions (1) and (2) */
++     && (nTabList==0 || exprIsDeterministic(pX))   /* Condition (4) */
++     && !(ExprHasProperty(pX, EP_InnerON)          /* Condition (3) */
++          && (pTabList->a[0].fg.jointype & JT_LTORJ)!=0 )
++    ){
++      sqlite3ExprIfFalse(pParse, pX, pWInfo->iBreak, SQLITE_JUMPIFNULL);
+       pT->wtFlags |= TERM_CODED;
+     }
+   }
+@@ -159662,13 +167171,13 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+ 
+   /* Construct the WhereLoop objects */
+ #if defined(WHERETRACE_ENABLED)
+-  if( sqlite3WhereTrace & 0xffff ){
++  if( sqlite3WhereTrace & 0xffffffff ){
+     sqlite3DebugPrintf("*** Optimizer Start *** (wctrlFlags: 0x%x",wctrlFlags);
+     if( wctrlFlags & WHERE_USE_LIMIT ){
+       sqlite3DebugPrintf(", limit: %d", iAuxArg);
+     }
+     sqlite3DebugPrintf(")\n");
+-    if( sqlite3WhereTrace & 0x100 ){
++    if( sqlite3WhereTrace & 0x8000 ){
+       Select sSelect;
+       memset(&sSelect, 0, sizeof(sSelect));
+       sSelect.selFlags = SF_WhereBegin;
+@@ -159678,10 +167187,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+       sSelect.pEList = pResultSet;
+       sqlite3TreeViewSelect(0, &sSelect, 0);
+     }
+-  }
+-  if( sqlite3WhereTrace & 0x100 ){ /* Display all terms of the WHERE clause */
+-    sqlite3DebugPrintf("---- WHERE clause at start of analysis:\n");
+-    sqlite3WhereClausePrint(sWLB.pWC);
++    if( sqlite3WhereTrace & 0x4000 ){ /* Display all WHERE clause terms */
++      sqlite3DebugPrintf("---- WHERE clause at start of analysis:\n");
++      sqlite3WhereClausePrint(sWLB.pWC);
++    }
+   }
+ #endif
+ 
+@@ -159697,7 +167206,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+     ** loops will be built using the revised truthProb values. */
+     if( sWLB.bldFlags2 & SQLITE_BLDF2_2NDPASS ){
+       WHERETRACE_ALL_LOOPS(pWInfo, sWLB.pWC);
+-      WHERETRACE(0xffff,
++      WHERETRACE(0xffffffff,
+            ("**** Redo all loop computations due to"
+             " TERM_HIGHTRUTH changes ****\n"));
+       while( pWInfo->pLoops ){
+@@ -159717,9 +167226,20 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+        wherePathSolver(pWInfo, pWInfo->nRowOut+1);
+        if( db->mallocFailed ) goto whereBeginError;
+     }
++
++    /* TUNING:  Assume that a DISTINCT clause on a subquery reduces
++    ** the output size by a factor of 8 (LogEst -30).
++    */
++    if( (pWInfo->wctrlFlags & WHERE_WANT_DISTINCT)!=0 ){
++      WHERETRACE(0x0080,("nRowOut reduced from %d to %d due to DISTINCT\n",
++                         pWInfo->nRowOut, pWInfo->nRowOut-30));
++      pWInfo->nRowOut -= 30;
++    }
++
+   }
++  assert( pWInfo->pTabList!=0 );
+   if( pWInfo->pOrderBy==0 && (db->flags & SQLITE_ReverseOrder)!=0 ){
+-     pWInfo->revMask = ALLBITS;
++    whereReverseScanOrder(pWInfo);
+   }
+   if( pParse->nErr ){
+     goto whereBeginError;
+@@ -159783,11 +167303,11 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   }
+ 
+ #if defined(WHERETRACE_ENABLED)
+-  if( sqlite3WhereTrace & 0x100 ){ /* Display all terms of the WHERE clause */
++  if( sqlite3WhereTrace & 0x4000 ){ /* Display all terms of the WHERE clause */
+     sqlite3DebugPrintf("---- WHERE clause at end of analysis:\n");
+     sqlite3WhereClausePrint(sWLB.pWC);
+   }
+-  WHERETRACE(0xffff,("*** Optimizer Finished ***\n"));
++  WHERETRACE(0xffffffff,("*** Optimizer Finished ***\n"));
+ #endif
+   pWInfo->pParse->nQueryLoop += pWInfo->nRowOut;
+ 
+@@ -159819,6 +167339,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+         0!=(wctrlFlags & WHERE_ONEPASS_MULTIROW)
+      && !IsVirtual(pTabList->a[0].pTab)
+      && (0==(wsFlags & WHERE_MULTI_OR) || (wctrlFlags & WHERE_DUPLICATES_OK))
++     && OptimizationEnabled(db, SQLITE_OnePass)
+     )){
+       pWInfo->eOnePass = bOnerow ? ONEPASS_SINGLE : ONEPASS_MULTI;
+       if( HasRowid(pTabList->a[0].pTab) && (wsFlags & WHERE_IDX_ONLY) ){
+@@ -159882,7 +167403,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+         assert( n<=pTab->nCol );
+       }
+ #ifdef SQLITE_ENABLE_CURSOR_HINTS
+-      if( pLoop->u.btree.pIndex!=0 ){
++      if( pLoop->u.btree.pIndex!=0 && (pTab->tabFlags & TF_WithoutRowid)==0 ){
+         sqlite3VdbeChangeP5(v, OPFLAG_SEEKEQ|bFordelete);
+       }else
+ #endif
+@@ -159924,6 +167445,14 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+         op = OP_ReopenIdx;
+       }else{
+         iIndexCur = pParse->nTab++;
++        if( pIx->bHasExpr && OptimizationEnabled(db, SQLITE_IndexedExpr) ){
++          whereAddIndexedExpr(pParse, pIx, iIndexCur, pTabItem);
++        }
++        if( pIx->pPartIdxWhere && (pTabItem->fg.jointype & JT_RIGHT)==0 ){
++          wherePartIdxExpr(
++              pParse, pIx, pIx->pPartIdxWhere, 0, iIndexCur, pTabItem
++          );
++        }
+       }
+       pLevel->iIdxCur = iIndexCur;
+       assert( pIx!=0 );
+@@ -160016,11 +167545,11 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+         sqlite3VdbeJumpHere(v, iOnce);
+       }
+     }
++    assert( pTabList == pWInfo->pTabList );
+     if( (wsFlags & (WHERE_AUTO_INDEX|WHERE_BLOOMFILTER))!=0 ){
+       if( (wsFlags & WHERE_AUTO_INDEX)!=0 ){
+ #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
+-        constructAutomaticIndex(pParse, &pWInfo->sWC,
+-                  &pTabList->a[pLevel->iFrom], notReady, pLevel);
++        constructAutomaticIndex(pParse, &pWInfo->sWC, notReady, pLevel);
+ #endif
+       }else{
+         sqlite3ConstructBloomFilter(pWInfo, ii, pLevel, notReady);
+@@ -160046,11 +167575,14 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
+   /* Jump here if malloc fails */
+ whereBeginError:
+   if( pWInfo ){
+-    testcase( pWInfo->pExprMods!=0 );
+-    whereUndoExprMods(pWInfo);
+     pParse->nQueryLoop = pWInfo->savedNQueryLoop;
+     whereInfoFree(db, pWInfo);
+   }
++#ifdef WHERETRACE_ENABLED
++  /* Prevent harmless compiler warnings about debugging routines
++  ** being declared but never used */
++  sqlite3ShowWhereLoopList(0);
++#endif /* WHERETRACE_ENABLED */
+   return 0;
+ }
+ 
+@@ -160266,7 +167798,6 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
+   }
+ 
+   assert( pWInfo->nLevel<=pTabList->nSrc );
+-  if( pWInfo->pExprMods ) whereUndoExprMods(pWInfo);
+   for(i=0, pLevel=pWInfo->a; inLevel; i++, pLevel++){
+     int k, last;
+     VdbeOp *pOp, *pLastOp;
+@@ -160320,10 +167851,28 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
+       }else{
+         last = pWInfo->iEndWhere;
+       }
++      if( pIdx->bHasExpr ){
++        IndexedExpr *p = pParse->pIdxEpr;
++        while( p ){
++          if( p->iIdxCur==pLevel->iIdxCur ){
++#ifdef WHERETRACE_ENABLED
++            if( sqlite3WhereTrace & 0x200 ){
++              sqlite3DebugPrintf("Disable pParse->pIdxEpr term {%d,%d}\n",
++                                  p->iIdxCur, p->iIdxCol);
++              if( sqlite3WhereTrace & 0x5000 ) sqlite3ShowExpr(p->pExpr);
++            }
++#endif
++            p->iDataCur = -1;
++            p->iIdxCur = -1;
++          }
++          p = p->pIENext;
++        }
++      }
+       k = pLevel->addrBody + 1;
+ #ifdef SQLITE_DEBUG
+       if( db->flags & SQLITE_VdbeAddopTrace ){
+-        printf("TRANSLATE opcodes in range %d..%d\n", k, last-1);
++        printf("TRANSLATE cursor %d->%d in opcode range %d..%d\n",
++                pLevel->iTabCur, pLevel->iIdxCur, k, last-1);
+       }
+       /* Proof that the "+1" on the k value above is safe */
+       pOp = sqlite3VdbeGetOp(v, k - 1);
+@@ -160530,7 +168079,7 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
+ **
+ **   These are the same built-in window functions supported by Postgres.
+ **   Although the behaviour of aggregate window functions (functions that
+-**   can be used as either aggregates or window funtions) allows them to
++**   can be used as either aggregates or window functions) allows them to
+ **   be implemented using an API, built-in window functions are much more
+ **   esoteric. Additionally, some window functions (e.g. nth_value())
+ **   may only be implemented by caching the entire partition in memory.
+@@ -161060,7 +168609,7 @@ static Window *windowFind(Parse *pParse, Window *pList, const char *zName){
+ ** is the Window object representing the associated OVER clause. This
+ ** function updates the contents of pWin as follows:
+ **
+-**   * If the OVER clause refered to a named window (as in "max(x) OVER win"),
++**   * If the OVER clause referred to a named window (as in "max(x) OVER win"),
+ **     search list pList for a matching WINDOW definition, and update pWin
+ **     accordingly. If no such WINDOW clause can be found, leave an error
+ **     in pParse.
+@@ -161198,6 +168747,7 @@ static int selectWindowRewriteExprCb(Walker *pWalker, Expr *pExpr){
+       }
+       /* no break */ deliberate_fall_through
+ 
++    case TK_IF_NULL_ROW:
+     case TK_AGG_FUNCTION:
+     case TK_COLUMN: {
+       int iCol = -1;
+@@ -161313,7 +168863,6 @@ static ExprList *exprListAppendList(
+     for(i=0; inExpr; i++){
+       sqlite3 *db = pParse->db;
+       Expr *pDup = sqlite3ExprDup(db, pAppend->a[i].pExpr, 0);
+-      assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) );
+       if( db->mallocFailed ){
+         sqlite3ExprDelete(db, pDup);
+         break;
+@@ -161451,7 +169000,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){
+       assert( ExprUseXList(pWin->pOwner) );
+       assert( pWin->pWFunc!=0 );
+       pArgs = pWin->pOwner->x.pList;
+-      if( pWin->pWFunc->funcFlags & SQLITE_FUNC_SUBTYPE ){
++      if( pWin->pWFunc->funcFlags & SQLITE_SUBTYPE ){
+         selectWindowRewriteEList(pParse, pMWin, pSrc, pArgs, pTab, &pSublist);
+         pWin->iArgCol = (pSublist ? pSublist->nExpr : 0);
+         pWin->bExprArgs = 1;
+@@ -161483,7 +169032,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){
+     pSub = sqlite3SelectNew(
+         pParse, pSublist, pSrc, pWhere, pGroupBy, pHaving, pSort, 0, 0
+     );
+-    SELECTTRACE(1,pParse,pSub,
++    TREETRACE(0x40,pParse,pSub,
+        ("New window-function subquery in FROM clause of (%u/%p)\n",
+        p->selId, p));
+     p->pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
+@@ -161493,6 +169042,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){
+     if( p->pSrc ){
+       Table *pTab2;
+       p->pSrc->a[0].pSelect = pSub;
++      p->pSrc->a[0].fg.isCorrelated = 1;
+       sqlite3SrcListAssignCursors(pParse, p->pSrc);
+       pSub->selFlags |= SF_Expanded|SF_OrderByReqd;
+       pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_NONE);
+@@ -161680,7 +169230,7 @@ SQLITE_PRIVATE Window *sqlite3WindowAssemble(
+ }
+ 
+ /*
+-** Window *pWin has just been created from a WINDOW clause. Tokne pBase
++** Window *pWin has just been created from a WINDOW clause. Token pBase
+ ** is the base window. Earlier windows from the same WINDOW clause are
+ ** stored in the linked list starting at pWin->pNextWin. This function
+ ** either updates *pWin according to the base specification, or else
+@@ -161724,8 +169274,9 @@ SQLITE_PRIVATE void sqlite3WindowAttach(Parse *pParse, Expr *p, Window *pWin){
+   if( p ){
+     assert( p->op==TK_FUNCTION );
+     assert( pWin );
++    assert( ExprIsFullSize(p) );
+     p->y.pWin = pWin;
+-    ExprSetProperty(p, EP_WinFunc);
++    ExprSetProperty(p, EP_WinFunc|EP_FullSize);
+     pWin->pOwner = p;
+     if( (p->flags & EP_Distinct) && pWin->eFrmType!=TK_FILTER ){
+       sqlite3ErrorMsg(pParse,
+@@ -161986,7 +169537,7 @@ struct WindowCsrAndReg {
+ **
+ **     (ORDER BY a, b GROUPS BETWEEN 2 PRECEDING AND 2 FOLLOWING)
+ **
+-**   The windows functions implmentation caches the input rows in a temp
++**   The windows functions implementation caches the input rows in a temp
+ **   table, sorted by "a, b" (it actually populates the cache lazily, and
+ **   aggressively removes rows once they are no longer required, but that's
+ **   a mere detail). It keeps three cursors open on the temp table. One
+@@ -162584,10 +170135,9 @@ static void windowCodeRangeTest(
+ 
+     /* This block runs if reg1 is not NULL, but reg2 is. */
+     sqlite3VdbeJumpHere(v, addr);
+-    sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v);
+-    if( op==OP_Gt || op==OP_Ge ){
+-      sqlite3VdbeChangeP2(v, -1, addrDone);
+-    }
++    sqlite3VdbeAddOp2(v, OP_IsNull, reg2,
++                      (op==OP_Gt || op==OP_Ge) ? addrDone : lbl);
++    VdbeCoverage(v);
+   }
+ 
+   /* Register reg1 currently contains csr1.peerVal (the peer-value from csr1).
+@@ -162996,7 +170546,7 @@ static int windowExprGtZero(Parse *pParse, Expr *pExpr){
+ **
+ ** For the most part, the patterns above are adapted to support UNBOUNDED by
+ ** assuming that it is equivalent to "infinity PRECEDING/FOLLOWING" and
+-** CURRENT ROW by assuming that it is equivilent to "0 PRECEDING/FOLLOWING".
++** CURRENT ROW by assuming that it is equivalent to "0 PRECEDING/FOLLOWING".
+ ** This is optimized of course - branches that will never be taken and
+ ** conditions that are always true are omitted from the VM code. The only
+ ** exceptional case is:
+@@ -163275,7 +170825,7 @@ SQLITE_PRIVATE void sqlite3WindowCodeStep(
+   }
+ 
+   /* Allocate registers for the array of values from the sub-query, the
+-  ** samve values in record form, and the rowid used to insert said record
++  ** same values in record form, and the rowid used to insert said record
+   ** into the ephemeral table.  */
+   regNew = pParse->nMem+1;
+   pParse->nMem += nInput;
+@@ -163359,8 +170909,7 @@ SQLITE_PRIVATE void sqlite3WindowCodeStep(
+     VdbeCoverageNeverNullIf(v, op==OP_Ge); /* NeverNull because bound  */
+     VdbeCoverageNeverNullIf(v, op==OP_Le); /*   values previously checked */
+     windowAggFinal(&s, 0);
+-    sqlite3VdbeAddOp2(v, OP_Rewind, s.current.csr, 1);
+-    VdbeCoverageNeverTaken(v);
++    sqlite3VdbeAddOp1(v, OP_Rewind, s.current.csr);
+     windowReturnOneRow(&s);
+     sqlite3VdbeAddOp1(v, OP_ResetSorter, s.current.csr);
+     sqlite3VdbeAddOp2(v, OP_Goto, 0, lblWhereEnd);
+@@ -163372,13 +170921,10 @@ SQLITE_PRIVATE void sqlite3WindowCodeStep(
+   }
+ 
+   if( pMWin->eStart!=TK_UNBOUNDED ){
+-    sqlite3VdbeAddOp2(v, OP_Rewind, s.start.csr, 1);
+-    VdbeCoverageNeverTaken(v);
++    sqlite3VdbeAddOp1(v, OP_Rewind, s.start.csr);
+   }
+-  sqlite3VdbeAddOp2(v, OP_Rewind, s.current.csr, 1);
+-  VdbeCoverageNeverTaken(v);
+-  sqlite3VdbeAddOp2(v, OP_Rewind, s.end.csr, 1);
+-  VdbeCoverageNeverTaken(v);
++  sqlite3VdbeAddOp1(v, OP_Rewind, s.current.csr);
++  sqlite3VdbeAddOp1(v, OP_Rewind, s.end.csr);
+   if( regPeer && pOrderBy ){
+     sqlite3VdbeAddOp3(v, OP_Copy, regNewPeer, regPeer, pOrderBy->nExpr-1);
+     sqlite3VdbeAddOp3(v, OP_Copy, regPeer, s.start.reg, pOrderBy->nExpr-1);
+@@ -163520,7 +171066,8 @@ SQLITE_PRIVATE void sqlite3WindowCodeStep(
+ /************** End of window.c **********************************************/
+ /************** Begin file parse.c *******************************************/
+ /* This file is automatically generated by Lemon from input grammar
+-** source file "parse.y". */
++** source file "parse.y".
++*/
+ /*
+ ** 2001-09-15
+ **
+@@ -163537,7 +171084,7 @@ SQLITE_PRIVATE void sqlite3WindowCodeStep(
+ ** The canonical source code to this file ("parse.y") is a Lemon grammar
+ ** file that specifies the input grammar and actions to take while parsing.
+ ** That input file is processed by Lemon to generate a C-language
+-** implementation of a parser for the given grammer.  You might be reading
++** implementation of a parser for the given grammar.  You might be reading
+ ** this comment as part of the translated C-code.  Edits should be made
+ ** to the original parse.y sources.
+ */
+@@ -164031,18 +171578,18 @@ typedef union {
+ #define sqlite3ParserCTX_FETCH Parse *pParse=yypParser->pParse;
+ #define sqlite3ParserCTX_STORE yypParser->pParse=pParse;
+ #define YYFALLBACK 1
+-#define YYNSTATE             576
++#define YYNSTATE             579
+ #define YYNRULE              405
+-#define YYNRULE_WITH_ACTION  342
++#define YYNRULE_WITH_ACTION  340
+ #define YYNTOKEN             185
+-#define YY_MAX_SHIFT         575
+-#define YY_MIN_SHIFTREDUCE   835
+-#define YY_MAX_SHIFTREDUCE   1239
+-#define YY_ERROR_ACTION      1240
+-#define YY_ACCEPT_ACTION     1241
+-#define YY_NO_ACTION         1242
+-#define YY_MIN_REDUCE        1243
+-#define YY_MAX_REDUCE        1647
++#define YY_MAX_SHIFT         578
++#define YY_MIN_SHIFTREDUCE   838
++#define YY_MAX_SHIFTREDUCE   1242
++#define YY_ERROR_ACTION      1243
++#define YY_ACCEPT_ACTION     1244
++#define YY_NO_ACTION         1245
++#define YY_MIN_REDUCE        1246
++#define YY_MAX_REDUCE        1650
+ /************* End control #defines *******************************************/
+ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
+ 
+@@ -164109,218 +171656,218 @@ typedef union {
+ **  yy_default[]       Default action for each state.
+ **
+ *********** Begin parsing tables **********************************************/
+-#define YY_ACTTAB_COUNT (2098)
++#define YY_ACTTAB_COUNT (2100)
+ static const YYACTIONTYPE yy_action[] = {
+- /*     0 */   568,  208,  568,  118,  115,  229,  568,  118,  115,  229,
+- /*    10 */   568, 1314,  377, 1293,  408,  562,  562,  562,  568,  409,
+- /*    20 */   378, 1314, 1276,   41,   41,   41,   41,  208, 1526,   71,
+- /*    30 */    71,  971,  419,   41,   41,  491,  303,  279,  303,  972,
+- /*    40 */   397,   71,   71,  125,  126,   80, 1217, 1217, 1050, 1053,
+- /*    50 */  1040, 1040,  123,  123,  124,  124,  124,  124,  476,  409,
+- /*    60 */  1241,    1,    1,  575,    2, 1245,  550,  118,  115,  229,
+- /*    70 */   317,  480,  146,  480,  524,  118,  115,  229,  529, 1327,
+- /*    80 */   417,  523,  142,  125,  126,   80, 1217, 1217, 1050, 1053,
+- /*    90 */  1040, 1040,  123,  123,  124,  124,  124,  124,  118,  115,
+- /*   100 */   229,  327,  122,  122,  122,  122,  121,  121,  120,  120,
+- /*   110 */   120,  119,  116,  444,  284,  284,  284,  284,  442,  442,
+- /*   120 */   442, 1567,  376, 1569, 1192,  375, 1163,  565, 1163,  565,
+- /*   130 */   409, 1567,  537,  259,  226,  444,  101,  145,  449,  316,
+- /*   140 */   559,  240,  122,  122,  122,  122,  121,  121,  120,  120,
+- /*   150 */   120,  119,  116,  444,  125,  126,   80, 1217, 1217, 1050,
+- /*   160 */  1053, 1040, 1040,  123,  123,  124,  124,  124,  124,  142,
+- /*   170 */   294, 1192,  339,  448,  120,  120,  120,  119,  116,  444,
+- /*   180 */   127, 1192, 1193, 1194,  148,  441,  440,  568,  119,  116,
+- /*   190 */   444,  124,  124,  124,  124,  117,  122,  122,  122,  122,
+- /*   200 */   121,  121,  120,  120,  120,  119,  116,  444,  454,  113,
+- /*   210 */    13,   13,  546,  122,  122,  122,  122,  121,  121,  120,
+- /*   220 */   120,  120,  119,  116,  444,  422,  316,  559, 1192, 1193,
+- /*   230 */  1194,  149, 1224,  409, 1224,  124,  124,  124,  124,  122,
+- /*   240 */   122,  122,  122,  121,  121,  120,  120,  120,  119,  116,
+- /*   250 */   444,  465,  342, 1037, 1037, 1051, 1054,  125,  126,   80,
+- /*   260 */  1217, 1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,
+- /*   270 */   124,  124, 1279,  522,  222, 1192,  568,  409,  224,  514,
+- /*   280 */   175,   82,   83,  122,  122,  122,  122,  121,  121,  120,
+- /*   290 */   120,  120,  119,  116,  444, 1007,   16,   16, 1192,  133,
+- /*   300 */   133,  125,  126,   80, 1217, 1217, 1050, 1053, 1040, 1040,
+- /*   310 */   123,  123,  124,  124,  124,  124,  122,  122,  122,  122,
+- /*   320 */   121,  121,  120,  120,  120,  119,  116,  444, 1041,  546,
+- /*   330 */  1192,  373, 1192, 1193, 1194,  252, 1434,  399,  504,  501,
+- /*   340 */   500,  111,  560,  566,    4,  926,  926,  433,  499,  340,
+- /*   350 */   460,  328,  360,  394, 1237, 1192, 1193, 1194,  563,  568,
+- /*   360 */   122,  122,  122,  122,  121,  121,  120,  120,  120,  119,
+- /*   370 */   116,  444,  284,  284,  369, 1580, 1607,  441,  440,  154,
+- /*   380 */   409,  445,   71,   71, 1286,  565, 1221, 1192, 1193, 1194,
+- /*   390 */    85, 1223,  271,  557,  543,  515, 1561,  568,   98, 1222,
+- /*   400 */     6, 1278,  472,  142,  125,  126,   80, 1217, 1217, 1050,
+- /*   410 */  1053, 1040, 1040,  123,  123,  124,  124,  124,  124,  550,
+- /*   420 */    13,   13, 1027,  507, 1224, 1192, 1224,  549,  109,  109,
+- /*   430 */   222,  568, 1238,  175,  568,  427,  110,  197,  445,  570,
+- /*   440 */   569,  430, 1552, 1017,  325,  551, 1192,  270,  287,  368,
+- /*   450 */   510,  363,  509,  257,   71,   71,  543,   71,   71,  359,
+- /*   460 */   316,  559, 1613,  122,  122,  122,  122,  121,  121,  120,
+- /*   470 */   120,  120,  119,  116,  444, 1017, 1017, 1019, 1020,   27,
+- /*   480 */   284,  284, 1192, 1193, 1194, 1158,  568, 1612,  409,  901,
+- /*   490 */   190,  550,  356,  565,  550,  937,  533,  517, 1158,  516,
+- /*   500 */   413, 1158,  552, 1192, 1193, 1194,  568,  544, 1554,   51,
+- /*   510 */    51,  214,  125,  126,   80, 1217, 1217, 1050, 1053, 1040,
+- /*   520 */  1040,  123,  123,  124,  124,  124,  124, 1192,  474,  135,
+- /*   530 */   135,  409,  284,  284, 1490,  505,  121,  121,  120,  120,
+- /*   540 */   120,  119,  116,  444, 1007,  565,  518,  217,  541, 1561,
+- /*   550 */   316,  559,  142,    6,  532,  125,  126,   80, 1217, 1217,
+- /*   560 */  1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,  124,
+- /*   570 */  1555,  122,  122,  122,  122,  121,  121,  120,  120,  120,
+- /*   580 */   119,  116,  444,  485, 1192, 1193, 1194,  482,  281, 1267,
+- /*   590 */   957,  252, 1192,  373,  504,  501,  500, 1192,  340,  571,
+- /*   600 */  1192,  571,  409,  292,  499,  957,  876,  191,  480,  316,
+- /*   610 */   559,  384,  290,  380,  122,  122,  122,  122,  121,  121,
+- /*   620 */   120,  120,  120,  119,  116,  444,  125,  126,   80, 1217,
+- /*   630 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*   640 */   124,  409,  394, 1136, 1192,  869,  100,  284,  284, 1192,
+- /*   650 */  1193, 1194,  373, 1093, 1192, 1193, 1194, 1192, 1193, 1194,
+- /*   660 */   565,  455,   32,  373,  233,  125,  126,   80, 1217, 1217,
+- /*   670 */  1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,  124,
+- /*   680 */  1433,  959,  568,  228,  958,  122,  122,  122,  122,  121,
+- /*   690 */   121,  120,  120,  120,  119,  116,  444, 1158,  228, 1192,
+- /*   700 */   157, 1192, 1193, 1194, 1553,   13,   13,  301,  957, 1232,
+- /*   710 */  1158,  153,  409, 1158,  373, 1583, 1176,    5,  369, 1580,
+- /*   720 */   429, 1238,    3,  957,  122,  122,  122,  122,  121,  121,
+- /*   730 */   120,  120,  120,  119,  116,  444,  125,  126,   80, 1217,
+- /*   740 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*   750 */   124,  409,  208,  567, 1192, 1028, 1192, 1193, 1194, 1192,
+- /*   760 */   388,  852,  155, 1552,  286,  402, 1098, 1098,  488,  568,
+- /*   770 */   465,  342, 1319, 1319, 1552,  125,  126,   80, 1217, 1217,
+- /*   780 */  1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,  124,
+- /*   790 */   129,  568,   13,   13,  374,  122,  122,  122,  122,  121,
+- /*   800 */   121,  120,  120,  120,  119,  116,  444,  302,  568,  453,
+- /*   810 */   528, 1192, 1193, 1194,   13,   13, 1192, 1193, 1194, 1297,
+- /*   820 */   463, 1267,  409, 1317, 1317, 1552, 1012,  453,  452,  200,
+- /*   830 */   299,   71,   71, 1265,  122,  122,  122,  122,  121,  121,
+- /*   840 */   120,  120,  120,  119,  116,  444,  125,  126,   80, 1217,
+- /*   850 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*   860 */   124,  409,  227, 1073, 1158,  284,  284,  419,  312,  278,
+- /*   870 */   278,  285,  285, 1419,  406,  405,  382, 1158,  565,  568,
+- /*   880 */  1158, 1196,  565, 1600,  565,  125,  126,   80, 1217, 1217,
+- /*   890 */  1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,  124,
+- /*   900 */   453, 1482,   13,   13, 1536,  122,  122,  122,  122,  121,
+- /*   910 */   121,  120,  120,  120,  119,  116,  444,  201,  568,  354,
+- /*   920 */  1586,  575,    2, 1245,  840,  841,  842, 1562,  317, 1212,
+- /*   930 */   146,    6,  409,  255,  254,  253,  206, 1327,    9, 1196,
+- /*   940 */   262,   71,   71,  424,  122,  122,  122,  122,  121,  121,
+- /*   950 */   120,  120,  120,  119,  116,  444,  125,  126,   80, 1217,
+- /*   960 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*   970 */   124,  568,  284,  284,  568, 1213,  409,  574,  313, 1245,
+- /*   980 */   349, 1296,  352,  419,  317,  565,  146,  491,  525, 1643,
+- /*   990 */   395,  371,  491, 1327,   70,   70, 1295,   71,   71,  240,
+- /*  1000 */  1325,  104,   80, 1217, 1217, 1050, 1053, 1040, 1040,  123,
+- /*  1010 */   123,  124,  124,  124,  124,  122,  122,  122,  122,  121,
+- /*  1020 */   121,  120,  120,  120,  119,  116,  444, 1114,  284,  284,
+- /*  1030 */   428,  448, 1525, 1213,  439,  284,  284, 1489, 1352,  311,
+- /*  1040 */   474,  565, 1115,  971,  491,  491,  217, 1263,  565, 1538,
+- /*  1050 */   568,  972,  207,  568, 1027,  240,  383, 1116,  519,  122,
+- /*  1060 */   122,  122,  122,  121,  121,  120,  120,  120,  119,  116,
+- /*  1070 */   444, 1018,  107,   71,   71, 1017,   13,   13,  912,  568,
+- /*  1080 */  1495,  568,  284,  284,   97,  526,  491,  448,  913, 1326,
+- /*  1090 */  1322,  545,  409,  284,  284,  565,  151,  209, 1495, 1497,
+- /*  1100 */   262,  450,   55,   55,   56,   56,  565, 1017, 1017, 1019,
+- /*  1110 */   443,  332,  409,  527,   12,  295,  125,  126,   80, 1217,
+- /*  1120 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*  1130 */   124,  347,  409,  864, 1534, 1213,  125,  126,   80, 1217,
+- /*  1140 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*  1150 */   124, 1137, 1641,  474, 1641,  371,  125,  114,   80, 1217,
+- /*  1160 */  1217, 1050, 1053, 1040, 1040,  123,  123,  124,  124,  124,
+- /*  1170 */   124, 1495,  329,  474,  331,  122,  122,  122,  122,  121,
+- /*  1180 */   121,  120,  120,  120,  119,  116,  444,  203, 1419,  568,
+- /*  1190 */  1294,  864,  464, 1213,  436,  122,  122,  122,  122,  121,
+- /*  1200 */   121,  120,  120,  120,  119,  116,  444,  553, 1137, 1642,
+- /*  1210 */   539, 1642,   15,   15,  892,  122,  122,  122,  122,  121,
+- /*  1220 */   121,  120,  120,  120,  119,  116,  444,  568,  298,  538,
+- /*  1230 */  1135, 1419, 1559, 1560, 1331,  409,    6,    6, 1169, 1268,
+- /*  1240 */   415,  320,  284,  284, 1419,  508,  565,  525,  300,  457,
+- /*  1250 */    43,   43,  568,  893,   12,  565,  330,  478,  425,  407,
+- /*  1260 */   126,   80, 1217, 1217, 1050, 1053, 1040, 1040,  123,  123,
+- /*  1270 */   124,  124,  124,  124,  568,   57,   57,  288, 1192, 1419,
+- /*  1280 */   496,  458,  392,  392,  391,  273,  389, 1135, 1558,  849,
+- /*  1290 */  1169,  407,    6,  568,  321, 1158,  470,   44,   44, 1557,
+- /*  1300 */  1114,  426,  234,    6,  323,  256,  540,  256, 1158,  431,
+- /*  1310 */   568, 1158,  322,   17,  487, 1115,   58,   58,  122,  122,
+- /*  1320 */   122,  122,  121,  121,  120,  120,  120,  119,  116,  444,
+- /*  1330 */  1116,  216,  481,   59,   59, 1192, 1193, 1194,  111,  560,
+- /*  1340 */   324,    4,  236,  456,  526,  568,  237,  456,  568,  437,
+- /*  1350 */   168,  556,  420,  141,  479,  563,  568,  293,  568, 1095,
+- /*  1360 */   568,  293,  568, 1095,  531,  568,  872,    8,   60,   60,
+- /*  1370 */   235,   61,   61,  568,  414,  568,  414,  568,  445,   62,
+- /*  1380 */    62,   45,   45,   46,   46,   47,   47,  199,   49,   49,
+- /*  1390 */   557,  568,  359,  568,  100,  486,   50,   50,   63,   63,
+- /*  1400 */    64,   64,  561,  415,  535,  410,  568, 1027,  568,  534,
+- /*  1410 */   316,  559,  316,  559,   65,   65,   14,   14,  568, 1027,
+- /*  1420 */   568,  512,  932,  872, 1018,  109,  109,  931, 1017,   66,
+- /*  1430 */    66,  131,  131,  110,  451,  445,  570,  569,  416,  177,
+- /*  1440 */  1017,  132,  132,   67,   67,  568,  467,  568,  932,  471,
+- /*  1450 */  1364,  283,  226,  931,  315, 1363,  407,  568,  459,  407,
+- /*  1460 */  1017, 1017, 1019,  239,  407,   86,  213, 1350,   52,   52,
+- /*  1470 */    68,   68, 1017, 1017, 1019, 1020,   27, 1585, 1180,  447,
+- /*  1480 */    69,   69,  288,   97,  108, 1541,  106,  392,  392,  391,
+- /*  1490 */   273,  389,  568,  879,  849,  883,  568,  111,  560,  466,
+- /*  1500 */     4,  568,  152,   30,   38,  568, 1132,  234,  396,  323,
+- /*  1510 */   111,  560,  527,    4,  563,   53,   53,  322,  568,  163,
+- /*  1520 */   163,  568,  337,  468,  164,  164,  333,  563,   76,   76,
+- /*  1530 */   568,  289, 1514,  568,   31, 1513,  568,  445,  338,  483,
+- /*  1540 */   100,   54,   54,  344,   72,   72,  296,  236, 1080,  557,
+- /*  1550 */   445,  879, 1360,  134,  134,  168,   73,   73,  141,  161,
+- /*  1560 */   161, 1574,  557,  535,  568,  319,  568,  348,  536, 1009,
+- /*  1570 */   473,  261,  261,  891,  890,  235,  535,  568, 1027,  568,
+- /*  1580 */   475,  534,  261,  367,  109,  109,  521,  136,  136,  130,
+- /*  1590 */   130, 1027,  110,  366,  445,  570,  569,  109,  109, 1017,
+- /*  1600 */   162,  162,  156,  156,  568,  110, 1080,  445,  570,  569,
+- /*  1610 */   410,  351, 1017,  568,  353,  316,  559,  568,  343,  568,
+- /*  1620 */   100,  497,  357,  258,  100,  898,  899,  140,  140,  355,
+- /*  1630 */  1310, 1017, 1017, 1019, 1020,   27,  139,  139,  362,  451,
+- /*  1640 */   137,  137,  138,  138, 1017, 1017, 1019, 1020,   27, 1180,
+- /*  1650 */   447,  568,  372,  288,  111,  560, 1021,    4,  392,  392,
+- /*  1660 */   391,  273,  389,  568, 1141,  849,  568, 1076,  568,  258,
+- /*  1670 */   492,  563,  568,  211,   75,   75,  555,  962,  234,  261,
+- /*  1680 */   323,  111,  560,  929,    4,  113,   77,   77,  322,   74,
+- /*  1690 */    74,   42,   42, 1373,  445,   48,   48, 1418,  563,  974,
+- /*  1700 */   975, 1092, 1091, 1092, 1091,  862,  557,  150,  930, 1346,
+- /*  1710 */   113, 1358,  554, 1424, 1021, 1275, 1266, 1254,  236, 1253,
+- /*  1720 */  1255,  445, 1593, 1343,  308,  276,  168,  309,   11,  141,
+- /*  1730 */   393,  310,  232,  557, 1405, 1027,  335,  291, 1400,  219,
+- /*  1740 */   336,  109,  109,  936,  297, 1410,  235,  341,  477,  110,
+- /*  1750 */   502,  445,  570,  569, 1393, 1409, 1017,  400, 1293,  365,
+- /*  1760 */   223, 1486, 1027, 1485, 1355, 1356, 1354, 1353,  109,  109,
+- /*  1770 */   204, 1596, 1232,  558,  265,  218,  110,  205,  445,  570,
+- /*  1780 */   569,  410,  387, 1017, 1533,  179,  316,  559, 1017, 1017,
+- /*  1790 */  1019, 1020,   27,  230, 1531, 1229,   79,  560,   85,    4,
+- /*  1800 */   418,  215,  548,   81,   84,  188, 1406,  173,  181,  461,
+- /*  1810 */   451,   35,  462,  563,  183, 1017, 1017, 1019, 1020,   27,
+- /*  1820 */   184, 1491,  185,  186,  495,  242,   98,  398, 1412,   36,
+- /*  1830 */  1411,  484,   91,  469,  401, 1414,  445,  192, 1480,  246,
+- /*  1840 */  1502,  490,  346,  277,  248,  196,  493,  511,  557,  350,
+- /*  1850 */  1256,  249,  250,  403, 1313, 1312,  111,  560,  432,    4,
+- /*  1860 */  1311, 1304,   93, 1611,  883, 1610,  224,  404,  434,  520,
+- /*  1870 */   263,  435, 1579,  563, 1283, 1282,  364, 1027,  306, 1281,
+- /*  1880 */   264, 1609, 1565,  109,  109,  370, 1303,  307, 1564,  438,
+- /*  1890 */   128,  110, 1378,  445,  570,  569,  445,  546, 1017,   10,
+- /*  1900 */  1466,  105,  381, 1377,   34,  572,   99, 1336,  557,  314,
+- /*  1910 */  1186,  530,  272,  274,  379,  210, 1335,  547,  385,  386,
+- /*  1920 */   275,  573, 1251, 1246,  411,  412, 1518,  165,  178, 1519,
+- /*  1930 */  1017, 1017, 1019, 1020,   27, 1517, 1516, 1027,   78,  147,
+- /*  1940 */   166,  220,  221,  109,  109,  836,  304,  167,  446,  212,
+- /*  1950 */   318,  110,  231,  445,  570,  569,  144, 1090, 1017, 1088,
+- /*  1960 */   326,  180,  169, 1212,  182,  334,  238,  915,  241, 1104,
+- /*  1970 */   187,  170,  171,  421,   87,   88,  423,  189,   89,   90,
+- /*  1980 */   172, 1107,  243, 1103,  244,  158,   18,  245,  345,  247,
+- /*  1990 */  1017, 1017, 1019, 1020,   27,  261, 1096,  193, 1226,  489,
+- /*  2000 */   194,   37,  366,  851,  494,  251,  195,  506,   92,   19,
+- /*  2010 */   498,  358,   20,  503,  881,  361,   94,  894,  305,  159,
+- /*  2020 */   513,   39,   95, 1174,  160, 1056,  966, 1143,   96,  174,
+- /*  2030 */  1142,  225,  280,  282,  198,  960,  113, 1164, 1160,  260,
+- /*  2040 */    21,   22,   23, 1162, 1168, 1167, 1148,   24,   33,   25,
+- /*  2050 */   202,  542,   26,  100, 1071,  102, 1057,  103,    7, 1055,
+- /*  2060 */  1059, 1113, 1060, 1112,  266,  267,   28,   40,  390, 1022,
+- /*  2070 */   863,  112,   29,  564, 1182, 1181,  268,  176,  143,  925,
+- /*  2080 */  1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242,
+- /*  2090 */  1242, 1242, 1242, 1242,  269, 1602, 1242, 1601,
++ /*     0 */   572,  210,  572,  119,  116,  231,  572,  119,  116,  231,
++ /*    10 */   572, 1317,  379, 1296,  410,  566,  566,  566,  572,  411,
++ /*    20 */   380, 1317, 1279,   42,   42,   42,   42,  210, 1529,   72,
++ /*    30 */    72,  974,  421,   42,   42,  495,  305,  281,  305,  975,
++ /*    40 */   399,   72,   72,  126,  127,   81, 1217, 1217, 1054, 1057,
++ /*    50 */  1044, 1044,  124,  124,  125,  125,  125,  125,  480,  411,
++ /*    60 */  1244,    1,    1,  578,    2, 1248,  554,  119,  116,  231,
++ /*    70 */   319,  484,  147,  484,  528,  119,  116,  231,  533, 1330,
++ /*    80 */   419,  527,  143,  126,  127,   81, 1217, 1217, 1054, 1057,
++ /*    90 */  1044, 1044,  124,  124,  125,  125,  125,  125,  119,  116,
++ /*   100 */   231,  329,  123,  123,  123,  123,  122,  122,  121,  121,
++ /*   110 */   121,  120,  117,  448,  286,  286,  286,  286,  446,  446,
++ /*   120 */   446, 1568,  378, 1570, 1193,  377, 1164,  569, 1164,  569,
++ /*   130 */   411, 1568,  541,  261,  228,  448,  102,  146,  453,  318,
++ /*   140 */   563,  242,  123,  123,  123,  123,  122,  122,  121,  121,
++ /*   150 */   121,  120,  117,  448,  126,  127,   81, 1217, 1217, 1054,
++ /*   160 */  1057, 1044, 1044,  124,  124,  125,  125,  125,  125,  143,
++ /*   170 */   296, 1193,  341,  452,  121,  121,  121,  120,  117,  448,
++ /*   180 */   128, 1193, 1194, 1193,  149,  445,  444,  572,  120,  117,
++ /*   190 */   448,  125,  125,  125,  125,  118,  123,  123,  123,  123,
++ /*   200 */   122,  122,  121,  121,  121,  120,  117,  448,  458,  114,
++ /*   210 */    13,   13,  550,  123,  123,  123,  123,  122,  122,  121,
++ /*   220 */   121,  121,  120,  117,  448,  424,  318,  563, 1193, 1194,
++ /*   230 */  1193,  150, 1225,  411, 1225,  125,  125,  125,  125,  123,
++ /*   240 */   123,  123,  123,  122,  122,  121,  121,  121,  120,  117,
++ /*   250 */   448,  469,  344, 1041, 1041, 1055, 1058,  126,  127,   81,
++ /*   260 */  1217, 1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,
++ /*   270 */   125,  125, 1282,  526,  224, 1193,  572,  411,  226,  519,
++ /*   280 */   177,   83,   84,  123,  123,  123,  123,  122,  122,  121,
++ /*   290 */   121,  121,  120,  117,  448, 1010,   16,   16, 1193,  134,
++ /*   300 */   134,  126,  127,   81, 1217, 1217, 1054, 1057, 1044, 1044,
++ /*   310 */   124,  124,  125,  125,  125,  125,  123,  123,  123,  123,
++ /*   320 */   122,  122,  121,  121,  121,  120,  117,  448, 1045,  550,
++ /*   330 */  1193,  375, 1193, 1194, 1193,  254, 1438,  401,  508,  505,
++ /*   340 */   504,  112,  564,  570,    4,  929,  929,  435,  503,  342,
++ /*   350 */   464,  330,  362,  396, 1238, 1193, 1194, 1193,  567,  572,
++ /*   360 */   123,  123,  123,  123,  122,  122,  121,  121,  121,  120,
++ /*   370 */   117,  448,  286,  286,  371, 1581, 1607,  445,  444,  155,
++ /*   380 */   411,  449,   72,   72, 1289,  569, 1222, 1193, 1194, 1193,
++ /*   390 */    86, 1224,  273,  561,  547,  520,  520,  572,   99, 1223,
++ /*   400 */     6, 1281,  476,  143,  126,  127,   81, 1217, 1217, 1054,
++ /*   410 */  1057, 1044, 1044,  124,  124,  125,  125,  125,  125,  554,
++ /*   420 */    13,   13, 1031,  511, 1225, 1193, 1225,  553,  110,  110,
++ /*   430 */   224,  572, 1239,  177,  572,  429,  111,  199,  449,  573,
++ /*   440 */   449,  432, 1555, 1019,  327,  555, 1193,  272,  289,  370,
++ /*   450 */   514,  365,  513,  259,   72,   72,  547,   72,   72,  361,
++ /*   460 */   318,  563, 1613,  123,  123,  123,  123,  122,  122,  121,
++ /*   470 */   121,  121,  120,  117,  448, 1019, 1019, 1021, 1022,   28,
++ /*   480 */   286,  286, 1193, 1194, 1193, 1159,  572, 1612,  411,  904,
++ /*   490 */   192,  554,  358,  569,  554,  940,  537,  521, 1159,  437,
++ /*   500 */   415, 1159,  556, 1193, 1194, 1193,  572,  548,  548,   52,
++ /*   510 */    52,  216,  126,  127,   81, 1217, 1217, 1054, 1057, 1044,
++ /*   520 */  1044,  124,  124,  125,  125,  125,  125, 1193,  478,  136,
++ /*   530 */   136,  411,  286,  286, 1493,  509,  122,  122,  121,  121,
++ /*   540 */   121,  120,  117,  448, 1010,  569,  522,  219,  545,  545,
++ /*   550 */   318,  563,  143,    6,  536,  126,  127,   81, 1217, 1217,
++ /*   560 */  1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,  125,
++ /*   570 */  1557,  123,  123,  123,  123,  122,  122,  121,  121,  121,
++ /*   580 */   120,  117,  448,  489, 1193, 1194, 1193,  486,  283, 1270,
++ /*   590 */   960,  254, 1193,  375,  508,  505,  504, 1193,  342,  574,
++ /*   600 */  1193,  574,  411,  294,  503,  960,  879,  193,  484,  318,
++ /*   610 */   563,  386,  292,  382,  123,  123,  123,  123,  122,  122,
++ /*   620 */   121,  121,  121,  120,  117,  448,  126,  127,   81, 1217,
++ /*   630 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*   640 */   125,  411,  396, 1139, 1193,  872,  101,  286,  286, 1193,
++ /*   650 */  1194, 1193,  375, 1096, 1193, 1194, 1193, 1193, 1194, 1193,
++ /*   660 */   569,  459,   33,  375,  235,  126,  127,   81, 1217, 1217,
++ /*   670 */  1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,  125,
++ /*   680 */  1437,  962,  572,  230,  961,  123,  123,  123,  123,  122,
++ /*   690 */   122,  121,  121,  121,  120,  117,  448, 1159,  230, 1193,
++ /*   700 */   158, 1193, 1194, 1193, 1556,   13,   13,  303,  960, 1233,
++ /*   710 */  1159,  154,  411, 1159,  375, 1584, 1177,    5,  371, 1581,
++ /*   720 */   431, 1239,    3,  960,  123,  123,  123,  123,  122,  122,
++ /*   730 */   121,  121,  121,  120,  117,  448,  126,  127,   81, 1217,
++ /*   740 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*   750 */   125,  411,  210,  571, 1193, 1032, 1193, 1194, 1193, 1193,
++ /*   760 */   390,  855,  156, 1555,  376,  404, 1101, 1101,  492,  572,
++ /*   770 */   469,  344, 1322, 1322, 1555,  126,  127,   81, 1217, 1217,
++ /*   780 */  1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,  125,
++ /*   790 */   130,  572,   13,   13,  532,  123,  123,  123,  123,  122,
++ /*   800 */   122,  121,  121,  121,  120,  117,  448,  304,  572,  457,
++ /*   810 */   229, 1193, 1194, 1193,   13,   13, 1193, 1194, 1193, 1300,
++ /*   820 */   467, 1270,  411, 1320, 1320, 1555, 1015,  457,  456,  436,
++ /*   830 */   301,   72,   72, 1268,  123,  123,  123,  123,  122,  122,
++ /*   840 */   121,  121,  121,  120,  117,  448,  126,  127,   81, 1217,
++ /*   850 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*   860 */   125,  411,  384, 1076, 1159,  286,  286,  421,  314,  280,
++ /*   870 */   280,  287,  287,  461,  408,  407, 1539, 1159,  569,  572,
++ /*   880 */  1159, 1196,  569,  409,  569,  126,  127,   81, 1217, 1217,
++ /*   890 */  1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,  125,
++ /*   900 */   457, 1485,   13,   13, 1541,  123,  123,  123,  123,  122,
++ /*   910 */   122,  121,  121,  121,  120,  117,  448,  202,  572,  462,
++ /*   920 */  1587,  578,    2, 1248,  843,  844,  845, 1563,  319,  409,
++ /*   930 */   147,    6,  411,  257,  256,  255,  208, 1330,    9, 1196,
++ /*   940 */   264,   72,   72, 1436,  123,  123,  123,  123,  122,  122,
++ /*   950 */   121,  121,  121,  120,  117,  448,  126,  127,   81, 1217,
++ /*   960 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*   970 */   125,  572,  286,  286,  572, 1213,  411,  577,  315, 1248,
++ /*   980 */   421,  371, 1581,  356,  319,  569,  147,  495,  529, 1644,
++ /*   990 */   397,  935,  495, 1330,   71,   71,  934,   72,   72,  242,
++ /*  1000 */  1328,  105,   81, 1217, 1217, 1054, 1057, 1044, 1044,  124,
++ /*  1010 */   124,  125,  125,  125,  125,  123,  123,  123,  123,  122,
++ /*  1020 */   122,  121,  121,  121,  120,  117,  448, 1117,  286,  286,
++ /*  1030 */  1422,  452, 1528, 1213,  443,  286,  286, 1492, 1355,  313,
++ /*  1040 */   478,  569, 1118,  454,  351,  495,  354, 1266,  569,  209,
++ /*  1050 */   572,  418,  179,  572, 1031,  242,  385, 1119,  523,  123,
++ /*  1060 */   123,  123,  123,  122,  122,  121,  121,  121,  120,  117,
++ /*  1070 */   448, 1020,  108,   72,   72, 1019,   13,   13,  915,  572,
++ /*  1080 */  1498,  572,  286,  286,   98,  530, 1537,  452,  916, 1334,
++ /*  1090 */  1329,  203,  411,  286,  286,  569,  152,  211, 1498, 1500,
++ /*  1100 */   426,  569,   56,   56,   57,   57,  569, 1019, 1019, 1021,
++ /*  1110 */   447,  572,  411,  531,   12,  297,  126,  127,   81, 1217,
++ /*  1120 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*  1130 */   125,  572,  411,  867,   15,   15,  126,  127,   81, 1217,
++ /*  1140 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*  1150 */   125,  373,  529,  264,   44,   44,  126,  115,   81, 1217,
++ /*  1160 */  1217, 1054, 1057, 1044, 1044,  124,  124,  125,  125,  125,
++ /*  1170 */   125, 1498,  478, 1271,  417,  123,  123,  123,  123,  122,
++ /*  1180 */   122,  121,  121,  121,  120,  117,  448,  205, 1213,  495,
++ /*  1190 */   430,  867,  468,  322,  495,  123,  123,  123,  123,  122,
++ /*  1200 */   122,  121,  121,  121,  120,  117,  448,  572,  557, 1140,
++ /*  1210 */  1642, 1422, 1642,  543,  572,  123,  123,  123,  123,  122,
++ /*  1220 */   122,  121,  121,  121,  120,  117,  448,  572, 1422,  572,
++ /*  1230 */    13,   13,  542,  323, 1325,  411,  334,   58,   58,  349,
++ /*  1240 */  1422, 1170,  326,  286,  286,  549, 1213,  300,  895,  530,
++ /*  1250 */    45,   45,   59,   59, 1140, 1643,  569, 1643,  565,  417,
++ /*  1260 */   127,   81, 1217, 1217, 1054, 1057, 1044, 1044,  124,  124,
++ /*  1270 */   125,  125,  125,  125, 1367,  373,  500,  290, 1193,  512,
++ /*  1280 */  1366,  427,  394,  394,  393,  275,  391,  896, 1138,  852,
++ /*  1290 */   478,  258, 1422, 1170,  463, 1159,   12,  331,  428,  333,
++ /*  1300 */  1117,  460,  236,  258,  325,  460,  544, 1544, 1159, 1098,
++ /*  1310 */   491, 1159,  324, 1098,  440, 1118,  335,  516,  123,  123,
++ /*  1320 */   123,  123,  122,  122,  121,  121,  121,  120,  117,  448,
++ /*  1330 */  1119,  318,  563, 1138,  572, 1193, 1194, 1193,  112,  564,
++ /*  1340 */   201,    4,  238,  433,  935,  490,  285,  228, 1517,  934,
++ /*  1350 */   170,  560,  572,  142, 1516,  567,  572,   60,   60,  572,
++ /*  1360 */   416,  572,  441,  572,  535,  302,  875,    8,  487,  572,
++ /*  1370 */   237,  572,  416,  572,  485,   61,   61,  572,  449,   62,
++ /*  1380 */    62,  332,   63,   63,   46,   46,   47,   47,  361,  572,
++ /*  1390 */   561,  572,   48,   48,   50,   50,   51,   51,  572,  295,
++ /*  1400 */    64,   64,  482,  295,  539,  412,  471, 1031,  572,  538,
++ /*  1410 */   318,  563,   65,   65,   66,   66,  409,  475,  572, 1031,
++ /*  1420 */   572,   14,   14,  875, 1020,  110,  110,  409, 1019,  572,
++ /*  1430 */   474,   67,   67,  111,  455,  449,  573,  449,   98,  317,
++ /*  1440 */  1019,  132,  132,  133,  133,  572, 1561,  572,  974,  409,
++ /*  1450 */     6, 1562,   68,   68, 1560,    6,  975,  572,    6, 1559,
++ /*  1460 */  1019, 1019, 1021,    6,  346,  218,  101,  531,   53,   53,
++ /*  1470 */    69,   69, 1019, 1019, 1021, 1022,   28, 1586, 1181,  451,
++ /*  1480 */    70,   70,  290,   87,  215,   31, 1363,  394,  394,  393,
++ /*  1490 */   275,  391,  350,  109,  852,  107,  572,  112,  564,  483,
++ /*  1500 */     4, 1212,  572,  239,  153,  572,   39,  236, 1299,  325,
++ /*  1510 */   112,  564, 1298,    4,  567,  572,   32,  324,  572,   54,
++ /*  1520 */    54,  572, 1135,  353,  398,  165,  165,  567,  166,  166,
++ /*  1530 */   572,  291,  355,  572,   17,  357,  572,  449,   77,   77,
++ /*  1540 */  1313,   55,   55, 1297,   73,   73,  572,  238,  470,  561,
++ /*  1550 */   449,  472,  364,  135,  135,  170,   74,   74,  142,  163,
++ /*  1560 */   163,  374,  561,  539,  572,  321,  572,  886,  540,  137,
++ /*  1570 */   137,  339, 1353,  422,  298,  237,  539,  572, 1031,  572,
++ /*  1580 */   340,  538,  101,  369,  110,  110,  162,  131,  131,  164,
++ /*  1590 */   164, 1031,  111,  368,  449,  573,  449,  110,  110, 1019,
++ /*  1600 */   157,  157,  141,  141,  572,  111,  572,  449,  573,  449,
++ /*  1610 */   412,  288, 1019,  572,  882,  318,  563,  572,  219,  572,
++ /*  1620 */   241, 1012,  477,  263,  263,  894,  893,  140,  140,  138,
++ /*  1630 */   138, 1019, 1019, 1021, 1022,   28,  139,  139,  525,  455,
++ /*  1640 */    76,   76,   78,   78, 1019, 1019, 1021, 1022,   28, 1181,
++ /*  1650 */   451,  572, 1083,  290,  112,  564, 1575,    4,  394,  394,
++ /*  1660 */   393,  275,  391,  572, 1023,  852,  572,  479,  345,  263,
++ /*  1670 */   101,  567,  882, 1376,   75,   75, 1421,  501,  236,  260,
++ /*  1680 */   325,  112,  564,  359,    4,  101,   43,   43,  324,   49,
++ /*  1690 */    49,  901,  902,  161,  449,  101,  977,  978,  567, 1079,
++ /*  1700 */  1349,  260,  965,  932,  263,  114,  561, 1095,  517, 1095,
++ /*  1710 */  1083, 1094,  865, 1094,  151,  933, 1144,  114,  238, 1361,
++ /*  1720 */   558,  449, 1023,  559, 1426, 1278,  170, 1269, 1257,  142,
++ /*  1730 */  1601, 1256, 1258,  561, 1594, 1031,  496,  278,  213, 1346,
++ /*  1740 */   310,  110,  110,  939,  311,  312,  237,   11,  234,  111,
++ /*  1750 */   221,  449,  573,  449,  293,  395, 1019, 1408,  337, 1403,
++ /*  1760 */  1396,  338, 1031,  299,  343, 1413, 1412,  481,  110,  110,
++ /*  1770 */   506,  402,  225, 1296,  206,  367,  111, 1358,  449,  573,
++ /*  1780 */   449,  412, 1359, 1019, 1489, 1488,  318,  563, 1019, 1019,
++ /*  1790 */  1021, 1022,   28,  562,  207,  220,   80,  564,  389,    4,
++ /*  1800 */  1597, 1357,  552, 1356, 1233,  181,  267,  232, 1536, 1534,
++ /*  1810 */   455, 1230,  420,  567,   82, 1019, 1019, 1021, 1022,   28,
++ /*  1820 */    86,  217,   85, 1494,  190,  175,  183,  465,  185,  466,
++ /*  1830 */    36, 1409,  186,  187,  188,  499,  449,  244,   37,   99,
++ /*  1840 */   400, 1415, 1414,  488, 1417,  194,  473,  403,  561, 1483,
++ /*  1850 */   248,   92, 1505,  494,  198,  279,  112,  564,  250,    4,
++ /*  1860 */   348,  497,  405,  352, 1259,  251,  252,  515, 1316,  434,
++ /*  1870 */  1315, 1314,   94,  567, 1307,  886, 1306, 1031,  226,  406,
++ /*  1880 */  1611, 1610,  438,  110,  110, 1580, 1286,  524,  439,  308,
++ /*  1890 */   266,  111, 1285,  449,  573,  449,  449,  309, 1019,  366,
++ /*  1900 */  1284, 1609,  265, 1566, 1565,  442,  372, 1381,  561,  129,
++ /*  1910 */   550, 1380,   10, 1470,  383,  106,  316,  551,  100,   35,
++ /*  1920 */   534,  575,  212, 1339,  381,  387, 1187, 1338,  274,  276,
++ /*  1930 */  1019, 1019, 1021, 1022,   28,  277,  413, 1031,  576, 1254,
++ /*  1940 */   388, 1521, 1249,  110,  110,  167, 1522,  168,  148, 1520,
++ /*  1950 */  1519,  111,  306,  449,  573,  449,  222,  223, 1019,  839,
++ /*  1960 */   169,   79,  450,  214,  414,  233,  320,  145, 1093, 1091,
++ /*  1970 */   328,  182,  171, 1212,  918,  184,  240,  336,  243, 1107,
++ /*  1980 */   189,  172,  173,  423,  425,   88,  180,  191,   89,   90,
++ /*  1990 */  1019, 1019, 1021, 1022,   28,   91,  174, 1110,  245, 1106,
++ /*  2000 */   246,  159,   18,  247,  347, 1099,  263,  195, 1227,  493,
++ /*  2010 */   249,  196,   38,  854,  498,  368,  253,  360,  897,  197,
++ /*  2020 */   502,   93,   19,   20,  507,  884,  363,  510,   95,  307,
++ /*  2030 */   160,   96,  518,   97, 1175, 1060, 1146,   40,   21,  227,
++ /*  2040 */   176, 1145,  282,  284,  969,  200,  963,  114,  262, 1165,
++ /*  2050 */    22,   23,   24, 1161, 1169,   25, 1163, 1150,   34,   26,
++ /*  2060 */  1168,  546,   27,  204,  101,  103,  104, 1074,    7, 1061,
++ /*  2070 */  1059, 1063, 1116, 1064, 1115,  268,  269,   29,   41,  270,
++ /*  2080 */  1024,  866,  113,   30,  568,  392, 1183,  144,  178, 1182,
++ /*  2090 */   271,  928, 1245, 1245, 1245, 1245, 1245, 1245, 1245, 1602,
+ };
+ static const YYCODETYPE yy_lookahead[] = {
+  /*     0 */   193,  193,  193,  274,  275,  276,  193,  274,  275,  276,
+@@ -164399,7 +171946,7 @@ static const YYCODETYPE yy_lookahead[] = {
+  /*   730 */   108,  109,  110,  111,  112,  113,   43,   44,   45,   46,
+  /*   740 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+  /*   750 */    57,   19,  193,  193,   59,   23,  116,  117,  118,   59,
+- /*   760 */   201,   21,  241,  304,   22,  206,  127,  128,  129,  193,
++ /*   760 */   201,   21,  241,  304,  193,  206,  127,  128,  129,  193,
+  /*   770 */   128,  129,  235,  236,  304,   43,   44,   45,   46,   47,
+  /*   780 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
+  /*   790 */    22,  193,  216,  217,  193,  102,  103,  104,  105,  106,
+@@ -164410,129 +171957,129 @@ static const YYCODETYPE yy_lookahead[] = {
+  /*   840 */   108,  109,  110,  111,  112,  113,   43,   44,   45,   46,
+  /*   850 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+  /*   860 */    57,   19,  193,  123,   76,  239,  240,  193,  253,  239,
+- /*   870 */   240,  239,  240,  193,  106,  107,  193,   89,  252,  193,
+- /*   880 */    92,   59,  252,  141,  252,   43,   44,   45,   46,   47,
++ /*   870 */   240,  239,  240,  244,  106,  107,  193,   89,  252,  193,
++ /*   880 */    92,   59,  252,  254,  252,   43,   44,   45,   46,   47,
+  /*   890 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
+  /*   900 */   284,  161,  216,  217,  193,  102,  103,  104,  105,  106,
+- /*   910 */   107,  108,  109,  110,  111,  112,  113,  231,  193,   16,
+- /*   920 */   187,  188,  189,  190,    7,    8,    9,  309,  195,   25,
++ /*   910 */   107,  108,  109,  110,  111,  112,  113,  231,  193,  244,
++ /*   920 */   187,  188,  189,  190,    7,    8,    9,  309,  195,  254,
+  /*   930 */   197,  313,   19,  127,  128,  129,  262,  204,   22,  117,
+- /*   940 */    24,  216,  217,  263,  102,  103,  104,  105,  106,  107,
++ /*   940 */    24,  216,  217,  273,  102,  103,  104,  105,  106,  107,
+  /*   950 */   108,  109,  110,  111,  112,  113,   43,   44,   45,   46,
+  /*   960 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+  /*   970 */    57,  193,  239,  240,  193,   59,   19,  188,  253,  190,
+- /*   980 */    77,  226,   79,  193,  195,  252,  197,  193,   19,  301,
+- /*   990 */   302,  193,  193,  204,  216,  217,  226,  216,  217,  266,
++ /*   980 */   193,  311,  312,   16,  195,  252,  197,  193,   19,  301,
++ /*   990 */   302,  135,  193,  204,  216,  217,  140,  216,  217,  266,
+  /*  1000 */   204,  159,   45,   46,   47,   48,   49,   50,   51,   52,
+  /*  1010 */    53,   54,   55,   56,   57,  102,  103,  104,  105,  106,
+  /*  1020 */   107,  108,  109,  110,  111,  112,  113,   12,  239,  240,
+- /*  1030 */   232,  298,  238,  117,  253,  239,  240,  238,  259,  260,
+- /*  1040 */   193,  252,   27,   31,  193,  193,  142,  204,  252,  193,
+- /*  1050 */   193,   39,  262,  193,  100,  266,  278,   42,  204,  102,
++ /*  1030 */   193,  298,  238,  117,  253,  239,  240,  238,  259,  260,
++ /*  1040 */   193,  252,   27,  193,   77,  193,   79,  204,  252,  262,
++ /*  1050 */   193,  299,  300,  193,  100,  266,  278,   42,  204,  102,
+  /*  1060 */   103,  104,  105,  106,  107,  108,  109,  110,  111,  112,
+  /*  1070 */   113,  117,  159,  216,  217,  121,  216,  217,   63,  193,
+- /*  1080 */   193,  193,  239,  240,  115,  116,  193,  298,   73,  238,
++ /*  1080 */   193,  193,  239,  240,  115,  116,  193,  298,   73,  240,
+  /*  1090 */   238,  231,   19,  239,  240,  252,   22,   24,  211,  212,
+- /*  1100 */    24,  193,  216,  217,  216,  217,  252,  153,  154,  155,
+- /*  1110 */   253,   16,   19,  144,  213,  268,   43,   44,   45,   46,
++ /*  1100 */   263,  252,  216,  217,  216,  217,  252,  153,  154,  155,
++ /*  1110 */   253,  193,   19,  144,  213,  268,   43,   44,   45,   46,
+  /*  1120 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+- /*  1130 */    57,  238,   19,   59,  193,   59,   43,   44,   45,   46,
++ /*  1130 */    57,  193,   19,   59,  216,  217,   43,   44,   45,   46,
+  /*  1140 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+- /*  1150 */    57,   22,   23,  193,   25,  193,   43,   44,   45,   46,
++ /*  1150 */    57,  193,   19,   24,  216,  217,   43,   44,   45,   46,
+  /*  1160 */    47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+- /*  1170 */    57,  284,   77,  193,   79,  102,  103,  104,  105,  106,
+- /*  1180 */   107,  108,  109,  110,  111,  112,  113,  286,  193,  193,
+- /*  1190 */   193,  117,  291,  117,  232,  102,  103,  104,  105,  106,
+- /*  1200 */   107,  108,  109,  110,  111,  112,  113,  204,   22,   23,
+- /*  1210 */    66,   25,  216,  217,   35,  102,  103,  104,  105,  106,
+- /*  1220 */   107,  108,  109,  110,  111,  112,  113,  193,  268,   85,
+- /*  1230 */   101,  193,  309,  309,  240,   19,  313,  313,   94,  208,
+- /*  1240 */   209,  193,  239,  240,  193,   66,  252,   19,  268,  244,
+- /*  1250 */   216,  217,  193,   74,  213,  252,  161,   19,  263,  254,
++ /*  1170 */    57,  284,  193,  208,  209,  102,  103,  104,  105,  106,
++ /*  1180 */   107,  108,  109,  110,  111,  112,  113,  286,   59,  193,
++ /*  1190 */   232,  117,  291,  193,  193,  102,  103,  104,  105,  106,
++ /*  1200 */   107,  108,  109,  110,  111,  112,  113,  193,  204,   22,
++ /*  1210 */    23,  193,   25,   66,  193,  102,  103,  104,  105,  106,
++ /*  1220 */   107,  108,  109,  110,  111,  112,  113,  193,  193,  193,
++ /*  1230 */   216,  217,   85,  193,  238,   19,   16,  216,  217,  238,
++ /*  1240 */   193,   94,  193,  239,  240,  231,  117,  268,   35,  116,
++ /*  1250 */   216,  217,  216,  217,   22,   23,  252,   25,  208,  209,
+  /*  1260 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
+- /*  1270 */    54,   55,   56,   57,  193,  216,  217,    5,   59,  193,
+- /*  1280 */    19,  244,   10,   11,   12,   13,   14,  101,  309,   17,
+- /*  1290 */   146,  254,  313,  193,  193,   76,  115,  216,  217,  309,
+- /*  1300 */    12,  263,   30,  313,   32,   46,   87,   46,   89,  130,
+- /*  1310 */   193,   92,   40,   22,  263,   27,  216,  217,  102,  103,
++ /*  1270 */    54,   55,   56,   57,  193,  193,   19,    5,   59,   66,
++ /*  1280 */   193,  263,   10,   11,   12,   13,   14,   74,  101,   17,
++ /*  1290 */   193,   46,  193,  146,  193,   76,  213,   77,  263,   79,
++ /*  1300 */    12,  260,   30,   46,   32,  264,   87,  193,   89,   29,
++ /*  1310 */   263,   92,   40,   33,  232,   27,  193,  108,  102,  103,
+  /*  1320 */   104,  105,  106,  107,  108,  109,  110,  111,  112,  113,
+- /*  1330 */    42,  150,  291,  216,  217,  116,  117,  118,   19,   20,
+- /*  1340 */   193,   22,   70,  260,  116,  193,   24,  264,  193,  263,
+- /*  1350 */    78,   63,   61,   81,  116,   36,  193,  260,  193,   29,
+- /*  1360 */   193,  264,  193,   33,  145,  193,   59,   48,  216,  217,
+- /*  1370 */    98,  216,  217,  193,  115,  193,  115,  193,   59,  216,
+- /*  1380 */   217,  216,  217,  216,  217,  216,  217,  255,  216,  217,
+- /*  1390 */    71,  193,  131,  193,   25,   65,  216,  217,  216,  217,
+- /*  1400 */   216,  217,  208,  209,   85,  133,  193,  100,  193,   90,
+- /*  1410 */   138,  139,  138,  139,  216,  217,  216,  217,  193,  100,
+- /*  1420 */   193,  108,  135,  116,  117,  106,  107,  140,  121,  216,
+- /*  1430 */   217,  216,  217,  114,  162,  116,  117,  118,  299,  300,
+- /*  1440 */   121,  216,  217,  216,  217,  193,  244,  193,  135,  244,
+- /*  1450 */   193,  256,  257,  140,  244,  193,  254,  193,  193,  254,
+- /*  1460 */   153,  154,  155,  141,  254,  149,  150,  258,  216,  217,
++ /*  1330 */    42,  138,  139,  101,  193,  116,  117,  118,   19,   20,
++ /*  1340 */   255,   22,   70,  130,  135,   65,  256,  257,  193,  140,
++ /*  1350 */    78,   63,  193,   81,  193,   36,  193,  216,  217,  193,
++ /*  1360 */   115,  193,  263,  193,  145,  268,   59,   48,  193,  193,
++ /*  1370 */    98,  193,  115,  193,  291,  216,  217,  193,   59,  216,
++ /*  1380 */   217,  161,  216,  217,  216,  217,  216,  217,  131,  193,
++ /*  1390 */    71,  193,  216,  217,  216,  217,  216,  217,  193,  260,
++ /*  1400 */   216,  217,   19,  264,   85,  133,  244,  100,  193,   90,
++ /*  1410 */   138,  139,  216,  217,  216,  217,  254,  244,  193,  100,
++ /*  1420 */   193,  216,  217,  116,  117,  106,  107,  254,  121,  193,
++ /*  1430 */   115,  216,  217,  114,  162,  116,  117,  118,  115,  244,
++ /*  1440 */   121,  216,  217,  216,  217,  193,  309,  193,   31,  254,
++ /*  1450 */   313,  309,  216,  217,  309,  313,   39,  193,  313,  309,
++ /*  1460 */   153,  154,  155,  313,  193,  150,   25,  144,  216,  217,
+  /*  1470 */   216,  217,  153,  154,  155,  156,  157,    0,    1,    2,
+- /*  1480 */   216,  217,    5,  115,  158,  193,  160,   10,   11,   12,
+- /*  1490 */    13,   14,  193,   59,   17,  126,  193,   19,   20,  129,
+- /*  1500 */    22,  193,   22,   22,   24,  193,   23,   30,   25,   32,
+- /*  1510 */    19,   20,  144,   22,   36,  216,  217,   40,  193,  216,
+- /*  1520 */   217,  193,  152,  129,  216,  217,  193,   36,  216,  217,
+- /*  1530 */   193,   99,  193,  193,   53,  193,  193,   59,   23,  193,
+- /*  1540 */    25,  216,  217,  193,  216,  217,  152,   70,   59,   71,
+- /*  1550 */    59,  117,  193,  216,  217,   78,  216,  217,   81,  216,
+- /*  1560 */   217,  318,   71,   85,  193,  133,  193,  193,   90,   23,
+- /*  1570 */    23,   25,   25,  120,  121,   98,   85,  193,  100,  193,
+- /*  1580 */    23,   90,   25,  121,  106,  107,   19,  216,  217,  216,
++ /*  1480 */   216,  217,    5,  149,  150,   22,  193,   10,   11,   12,
++ /*  1490 */    13,   14,  193,  158,   17,  160,  193,   19,   20,  116,
++ /*  1500 */    22,   25,  193,   24,   22,  193,   24,   30,  226,   32,
++ /*  1510 */    19,   20,  226,   22,   36,  193,   53,   40,  193,  216,
++ /*  1520 */   217,  193,   23,  193,   25,  216,  217,   36,  216,  217,
++ /*  1530 */   193,   99,  193,  193,   22,  193,  193,   59,  216,  217,
++ /*  1540 */   193,  216,  217,  193,  216,  217,  193,   70,  129,   71,
++ /*  1550 */    59,  129,  193,  216,  217,   78,  216,  217,   81,  216,
++ /*  1560 */   217,  193,   71,   85,  193,  133,  193,  126,   90,  216,
++ /*  1570 */   217,  152,  258,   61,  152,   98,   85,  193,  100,  193,
++ /*  1580 */    23,   90,   25,  121,  106,  107,   23,  216,  217,  216,
+  /*  1590 */   217,  100,  114,  131,  116,  117,  118,  106,  107,  121,
+- /*  1600 */   216,  217,  216,  217,  193,  114,  117,  116,  117,  118,
+- /*  1610 */   133,  193,  121,  193,  193,  138,  139,  193,   23,  193,
+- /*  1620 */    25,   23,   23,   25,   25,    7,    8,  216,  217,  193,
+- /*  1630 */   193,  153,  154,  155,  156,  157,  216,  217,  193,  162,
++ /*  1600 */   216,  217,  216,  217,  193,  114,  193,  116,  117,  118,
++ /*  1610 */   133,   22,  121,  193,   59,  138,  139,  193,  142,  193,
++ /*  1620 */   141,   23,   23,   25,   25,  120,  121,  216,  217,  216,
++ /*  1630 */   217,  153,  154,  155,  156,  157,  216,  217,   19,  162,
+  /*  1640 */   216,  217,  216,  217,  153,  154,  155,  156,  157,    1,
+- /*  1650 */     2,  193,  193,    5,   19,   20,   59,   22,   10,   11,
+- /*  1660 */    12,   13,   14,  193,   97,   17,  193,   23,  193,   25,
+- /*  1670 */   288,   36,  193,  242,  216,  217,  236,   23,   30,   25,
++ /*  1650 */     2,  193,   59,    5,   19,   20,  318,   22,   10,   11,
++ /*  1660 */    12,   13,   14,  193,   59,   17,  193,   23,   23,   25,
++ /*  1670 */    25,   36,  117,  193,  216,  217,  193,   23,   30,   25,
+  /*  1680 */    32,   19,   20,   23,   22,   25,  216,  217,   40,  216,
+- /*  1690 */   217,  216,  217,  193,   59,  216,  217,  193,   36,   83,
+- /*  1700 */    84,  153,  153,  155,  155,   23,   71,   25,   23,  193,
+- /*  1710 */    25,  193,  193,  193,  117,  193,  193,  193,   70,  193,
+- /*  1720 */   193,   59,  193,  255,  255,  287,   78,  255,  243,   81,
+- /*  1730 */   191,  255,  297,   71,  271,  100,  293,  245,  267,  214,
+- /*  1740 */   246,  106,  107,  108,  246,  271,   98,  245,  293,  114,
+- /*  1750 */   220,  116,  117,  118,  267,  271,  121,  271,  225,  219,
+- /*  1760 */   229,  219,  100,  219,  259,  259,  259,  259,  106,  107,
+- /*  1770 */   249,  196,   60,  280,  141,  243,  114,  249,  116,  117,
+- /*  1780 */   118,  133,  245,  121,  200,  297,  138,  139,  153,  154,
+- /*  1790 */   155,  156,  157,  297,  200,   38,   19,   20,  151,   22,
+- /*  1800 */   200,  150,  140,  294,  294,   22,  272,   43,  234,   18,
+- /*  1810 */   162,  270,  200,   36,  237,  153,  154,  155,  156,  157,
+- /*  1820 */   237,  283,  237,  237,   18,  199,  149,  246,  272,  270,
+- /*  1830 */   272,  200,  158,  246,  246,  234,   59,  234,  246,  199,
+- /*  1840 */   290,   62,  289,  200,  199,   22,  221,  115,   71,  200,
+- /*  1850 */   200,  199,  199,  221,  218,  218,   19,   20,   64,   22,
+- /*  1860 */   218,  227,   22,  224,  126,  224,  165,  221,   24,  305,
+- /*  1870 */   200,  113,  312,   36,  218,  220,  218,  100,  282,  218,
+- /*  1880 */    91,  218,  317,  106,  107,  221,  227,  282,  317,   82,
+- /*  1890 */   148,  114,  265,  116,  117,  118,   59,  145,  121,   22,
+- /*  1900 */   277,  158,  200,  265,   25,  202,  147,  250,   71,  279,
+- /*  1910 */    13,  146,  194,  194,  249,  248,  250,  140,  247,  246,
+- /*  1920 */     6,  192,  192,  192,  303,  303,  213,  207,  300,  213,
+- /*  1930 */   153,  154,  155,  156,  157,  213,  213,  100,  213,  222,
+- /*  1940 */   207,  214,  214,  106,  107,    4,  222,  207,    3,   22,
+- /*  1950 */   163,  114,   15,  116,  117,  118,   16,   23,  121,   23,
+- /*  1960 */   139,  151,  130,   25,  142,   16,   24,   20,  144,    1,
+- /*  1970 */   142,  130,  130,   61,   53,   53,   37,  151,   53,   53,
+- /*  1980 */   130,  116,   34,    1,  141,    5,   22,  115,  161,  141,
+- /*  1990 */   153,  154,  155,  156,  157,   25,   68,   68,   75,   41,
+- /*  2000 */   115,   24,  131,   20,   19,  125,   22,   96,   22,   22,
+- /*  2010 */    67,   23,   22,   67,   59,   24,   22,   28,   67,   23,
+- /*  2020 */    22,   22,  149,   23,   23,   23,  116,   23,   25,   37,
+- /*  2030 */    97,  141,   23,   23,   22,  143,   25,   75,   88,   34,
+- /*  2040 */    34,   34,   34,   86,   75,   93,   23,   34,   22,   34,
+- /*  2050 */    25,   24,   34,   25,   23,  142,   23,  142,   44,   23,
+- /*  2060 */    23,   23,   11,   23,   25,   22,   22,   22,   15,   23,
+- /*  2070 */    23,   22,   22,   25,    1,    1,  141,   25,   23,  135,
+- /*  2080 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+- /*  2090 */   319,  319,  319,  319,  141,  141,  319,  141,  319,  319,
++ /*  1690 */   217,    7,    8,   23,   59,   25,   83,   84,   36,   23,
++ /*  1700 */   193,   25,   23,   23,   25,   25,   71,  153,  145,  155,
++ /*  1710 */   117,  153,   23,  155,   25,   23,   97,   25,   70,  193,
++ /*  1720 */   193,   59,  117,  236,  193,  193,   78,  193,  193,   81,
++ /*  1730 */   141,  193,  193,   71,  193,  100,  288,  287,  242,  255,
++ /*  1740 */   255,  106,  107,  108,  255,  255,   98,  243,  297,  114,
++ /*  1750 */   214,  116,  117,  118,  245,  191,  121,  271,  293,  267,
++ /*  1760 */   267,  246,  100,  246,  245,  271,  271,  293,  106,  107,
++ /*  1770 */   220,  271,  229,  225,  249,  219,  114,  259,  116,  117,
++ /*  1780 */   118,  133,  259,  121,  219,  219,  138,  139,  153,  154,
++ /*  1790 */   155,  156,  157,  280,  249,  243,   19,   20,  245,   22,
++ /*  1800 */   196,  259,  140,  259,   60,  297,  141,  297,  200,  200,
++ /*  1810 */   162,   38,  200,   36,  294,  153,  154,  155,  156,  157,
++ /*  1820 */   151,  150,  294,  283,   22,   43,  234,   18,  237,  200,
++ /*  1830 */   270,  272,  237,  237,  237,   18,   59,  199,  270,  149,
++ /*  1840 */   246,  272,  272,  200,  234,  234,  246,  246,   71,  246,
++ /*  1850 */   199,  158,  290,   62,   22,  200,   19,   20,  199,   22,
++ /*  1860 */   289,  221,  221,  200,  200,  199,  199,  115,  218,   64,
++ /*  1870 */   218,  218,   22,   36,  227,  126,  227,  100,  165,  221,
++ /*  1880 */   224,  224,   24,  106,  107,  312,  218,  305,  113,  282,
++ /*  1890 */    91,  114,  220,  116,  117,  118,   59,  282,  121,  218,
++ /*  1900 */   218,  218,  200,  317,  317,   82,  221,  265,   71,  148,
++ /*  1910 */   145,  265,   22,  277,  200,  158,  279,  140,  147,   25,
++ /*  1920 */   146,  202,  248,  250,  249,  247,   13,  250,  194,  194,
++ /*  1930 */   153,  154,  155,  156,  157,    6,  303,  100,  192,  192,
++ /*  1940 */   246,  213,  192,  106,  107,  207,  213,  207,  222,  213,
++ /*  1950 */   213,  114,  222,  116,  117,  118,  214,  214,  121,    4,
++ /*  1960 */   207,  213,    3,   22,  303,   15,  163,   16,   23,   23,
++ /*  1970 */   139,  151,  130,   25,   20,  142,   24,   16,  144,    1,
++ /*  1980 */   142,  130,  130,   61,   37,   53,  300,  151,   53,   53,
++ /*  1990 */   153,  154,  155,  156,  157,   53,  130,  116,   34,    1,
++ /*  2000 */   141,    5,   22,  115,  161,   68,   25,   68,   75,   41,
++ /*  2010 */   141,  115,   24,   20,   19,  131,  125,   23,   28,   22,
++ /*  2020 */    67,   22,   22,   22,   67,   59,   24,   96,   22,   67,
++ /*  2030 */    23,  149,   22,   25,   23,   23,   23,   22,   34,  141,
++ /*  2040 */    37,   97,   23,   23,  116,   22,  143,   25,   34,   75,
++ /*  2050 */    34,   34,   34,   88,   75,   34,   86,   23,   22,   34,
++ /*  2060 */    93,   24,   34,   25,   25,  142,  142,   23,   44,   23,
++ /*  2070 */    23,   23,   23,   11,   23,   25,   22,   22,   22,  141,
++ /*  2080 */    23,   23,   22,   22,   25,   15,    1,   23,   25,    1,
++ /*  2090 */   141,  135,  319,  319,  319,  319,  319,  319,  319,  141,
+  /*  2100 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+  /*  2110 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+  /*  2120 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+@@ -164551,176 +172098,177 @@ static const YYCODETYPE yy_lookahead[] = {
+  /*  2250 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+  /*  2260 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+  /*  2270 */   319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+- /*  2280 */   319,  319,  319,
++ /*  2280 */   319,  319,  319,  319,  319,
+ };
+-#define YY_SHIFT_COUNT    (575)
++#define YY_SHIFT_COUNT    (578)
+ #define YY_SHIFT_MIN      (0)
+-#define YY_SHIFT_MAX      (2074)
++#define YY_SHIFT_MAX      (2088)
+ static const unsigned short int yy_shift_ofst[] = {
+  /*     0 */  1648, 1477, 1272,  322,  322,    1, 1319, 1478, 1491, 1837,
+  /*    10 */  1837, 1837,  471,    0,    0,  214, 1093, 1837, 1837, 1837,
+  /*    20 */  1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+- /*    30 */   271,  271, 1219, 1219,  216,   88,    1,    1,    1,    1,
+- /*    40 */     1,   40,  111,  258,  361,  469,  512,  583,  622,  693,
+- /*    50 */   732,  803,  842,  913, 1073, 1093, 1093, 1093, 1093, 1093,
++ /*    30 */  1837,  271,  271, 1219, 1219,  216,   88,    1,    1,    1,
++ /*    40 */     1,    1,   40,  111,  258,  361,  469,  512,  583,  622,
++ /*    50 */   693,  732,  803,  842,  913, 1073, 1093, 1093, 1093, 1093,
+  /*    60 */  1093, 1093, 1093, 1093, 1093, 1093, 1093, 1093, 1093, 1093,
+- /*    70 */  1093, 1093, 1093, 1113, 1093, 1216,  957,  957, 1635, 1662,
+- /*    80 */  1777, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
++ /*    70 */  1093, 1093, 1093, 1093, 1113, 1093, 1216,  957,  957, 1635,
++ /*    80 */  1662, 1777, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+  /*    90 */  1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+  /*   100 */  1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+  /*   110 */  1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+  /*   120 */  1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837, 1837,
+- /*   130 */   137,  181,  181,  181,  181,  181,  181,  181,   94,  430,
+- /*   140 */    66,   65,  112,  366,  533,  533,  740, 1261,  533,  533,
+- /*   150 */    79,   79,  533,  412,  412,  412,   77,  412,  123,  113,
+- /*   160 */   113,   22,   22, 2098, 2098,  328,  328,  328,  239,  468,
+- /*   170 */   468,  468,  468, 1015, 1015,  409,  366, 1129, 1186,  533,
+- /*   180 */   533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+- /*   190 */   533,  533,  533,  533,  533,  533,  533,  533,  533,  969,
+- /*   200 */   621,  621,  533,  642,  788,  788, 1228, 1228,  822,  822,
+- /*   210 */    67, 1274, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 1307,
+- /*   220 */   954,  954,  585,  472,  640,  387,  695,  538,  541,  700,
+- /*   230 */   533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+- /*   240 */   222,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+- /*   250 */   533,  533,  533, 1179, 1179, 1179,  533,  533,  533,  565,
+- /*   260 */   533,  533,  533,  916, 1144,  533,  533, 1288,  533,  533,
+- /*   270 */   533,  533,  533,  533,  533,  533,  639, 1330,  209, 1076,
+- /*   280 */  1076, 1076, 1076,  580,  209,  209, 1313,  768,  917,  649,
+- /*   290 */  1181, 1316,  405, 1316, 1238,  249, 1181, 1181,  249, 1181,
+- /*   300 */   405, 1238, 1369,  464, 1259, 1012, 1012, 1012, 1368, 1368,
+- /*   310 */  1368, 1368,  184,  184, 1326,  904, 1287, 1480, 1712, 1712,
+- /*   320 */  1633, 1633, 1757, 1757, 1633, 1647, 1651, 1783, 1764, 1791,
+- /*   330 */  1791, 1791, 1791, 1633, 1806, 1677, 1651, 1651, 1677, 1783,
+- /*   340 */  1764, 1677, 1764, 1677, 1633, 1806, 1674, 1779, 1633, 1806,
+- /*   350 */  1823, 1633, 1806, 1633, 1806, 1823, 1732, 1732, 1732, 1794,
+- /*   360 */  1840, 1840, 1823, 1732, 1738, 1732, 1794, 1732, 1732, 1701,
+- /*   370 */  1844, 1758, 1758, 1823, 1633, 1789, 1789, 1807, 1807, 1742,
+- /*   380 */  1752, 1877, 1633, 1743, 1742, 1759, 1765, 1677, 1879, 1897,
+- /*   390 */  1897, 1914, 1914, 1914, 2098, 2098, 2098, 2098, 2098, 2098,
+- /*   400 */  2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098,  207,
+- /*   410 */  1095,  331,  620,  903,  806, 1074, 1483, 1432, 1481, 1322,
+- /*   420 */  1370, 1394, 1515, 1291, 1546, 1547, 1557, 1595, 1598, 1599,
+- /*   430 */  1434, 1453, 1618, 1462, 1567, 1489, 1644, 1654, 1616, 1660,
+- /*   440 */  1548, 1549, 1682, 1685, 1597,  742, 1941, 1945, 1927, 1787,
+- /*   450 */  1937, 1940, 1934, 1936, 1821, 1810, 1832, 1938, 1938, 1942,
+- /*   460 */  1822, 1947, 1824, 1949, 1968, 1828, 1841, 1938, 1842, 1912,
+- /*   470 */  1939, 1938, 1826, 1921, 1922, 1925, 1926, 1850, 1865, 1948,
+- /*   480 */  1843, 1982, 1980, 1964, 1872, 1827, 1928, 1970, 1929, 1923,
+- /*   490 */  1958, 1848, 1885, 1977, 1983, 1985, 1871, 1880, 1984, 1943,
+- /*   500 */  1986, 1987, 1988, 1990, 1946, 1955, 1991, 1911, 1989, 1994,
+- /*   510 */  1951, 1992, 1996, 1873, 1998, 2000, 2001, 2002, 2003, 2004,
+- /*   520 */  1999, 1933, 1890, 2009, 2010, 1910, 2005, 2012, 1892, 2011,
+- /*   530 */  2006, 2007, 2008, 2013, 1950, 1962, 1957, 2014, 1969, 1952,
+- /*   540 */  2015, 2023, 2026, 2027, 2025, 2028, 2018, 1913, 1915, 2031,
+- /*   550 */  2011, 2033, 2036, 2037, 2038, 2039, 2040, 2043, 2051, 2044,
+- /*   560 */  2045, 2046, 2047, 2049, 2050, 2048, 1944, 1935, 1953, 1954,
+- /*   570 */  1956, 2052, 2055, 2053, 2073, 2074,
+-};
+-#define YY_REDUCE_COUNT (408)
++ /*   130 */  1837,  137,  181,  181,  181,  181,  181,  181,  181,   94,
++ /*   140 */   430,   66,   65,  112,  366,  533,  533,  740, 1257,  533,
++ /*   150 */   533,   79,   79,  533,  412,  412,  412,   77,  412,  123,
++ /*   160 */   113,  113,  113,   22,   22, 2100, 2100,  328,  328,  328,
++ /*   170 */   239,  468,  468,  468,  468, 1015, 1015,  409,  366, 1187,
++ /*   180 */  1232,  533,  533,  533,  533,  533,  533,  533,  533,  533,
++ /*   190 */   533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
++ /*   200 */   533,  969,  621,  621,  533,  642,  788,  788, 1133, 1133,
++ /*   210 */   822,  822,   67, 1193, 2100, 2100, 2100, 2100, 2100, 2100,
++ /*   220 */  2100, 1307,  954,  954,  585,  472,  640,  387,  695,  538,
++ /*   230 */   541,  700,  533,  533,  533,  533,  533,  533,  533,  533,
++ /*   240 */   533,  533,  222,  533,  533,  533,  533,  533,  533,  533,
++ /*   250 */   533,  533,  533,  533,  533, 1213, 1213, 1213,  533,  533,
++ /*   260 */   533,  565,  533,  533,  533,  916, 1147,  533,  533, 1288,
++ /*   270 */   533,  533,  533,  533,  533,  533,  533,  533,  639, 1280,
++ /*   280 */   209, 1129, 1129, 1129, 1129,  580,  209,  209, 1209,  768,
++ /*   290 */   917,  649, 1315, 1334,  405, 1334, 1383,  249, 1315, 1315,
++ /*   300 */   249, 1315,  405, 1383, 1441,  464, 1245, 1417, 1417, 1417,
++ /*   310 */  1323, 1323, 1323, 1323,  184,  184, 1335, 1476,  856, 1482,
++ /*   320 */  1744, 1744, 1665, 1665, 1773, 1773, 1665, 1669, 1671, 1802,
++ /*   330 */  1782, 1809, 1809, 1809, 1809, 1665, 1817, 1690, 1671, 1671,
++ /*   340 */  1690, 1802, 1782, 1690, 1782, 1690, 1665, 1817, 1693, 1791,
++ /*   350 */  1665, 1817, 1832, 1665, 1817, 1665, 1817, 1832, 1752, 1752,
++ /*   360 */  1752, 1805, 1850, 1850, 1832, 1752, 1749, 1752, 1805, 1752,
++ /*   370 */  1752, 1713, 1858, 1775, 1775, 1832, 1665, 1799, 1799, 1823,
++ /*   380 */  1823, 1761, 1765, 1890, 1665, 1757, 1761, 1771, 1774, 1690,
++ /*   390 */  1894, 1913, 1913, 1929, 1929, 1929, 2100, 2100, 2100, 2100,
++ /*   400 */  2100, 2100, 2100, 2100, 2100, 2100, 2100, 2100, 2100, 2100,
++ /*   410 */  2100,  207, 1220,  331,  620,  967,  806, 1074, 1499, 1432,
++ /*   420 */  1463, 1479, 1419, 1422, 1557, 1512, 1598, 1599, 1644, 1645,
++ /*   430 */  1654, 1660, 1555, 1505, 1684, 1462, 1670, 1563, 1619, 1593,
++ /*   440 */  1676, 1679, 1613, 1680, 1554, 1558, 1689, 1692, 1605, 1589,
++ /*   450 */  1955, 1959, 1941, 1803, 1950, 1951, 1945, 1946, 1831, 1820,
++ /*   460 */  1842, 1948, 1948, 1952, 1833, 1954, 1834, 1961, 1978, 1838,
++ /*   470 */  1851, 1948, 1852, 1922, 1947, 1948, 1836, 1932, 1935, 1936,
++ /*   480 */  1942, 1866, 1881, 1964, 1859, 1998, 1996, 1980, 1888, 1843,
++ /*   490 */  1937, 1981, 1939, 1933, 1968, 1869, 1896, 1988, 1993, 1995,
++ /*   500 */  1884, 1891, 1997, 1953, 1999, 2000, 1994, 2001, 1957, 1966,
++ /*   510 */  2002, 1931, 1990, 2006, 1962, 2003, 2007, 2004, 1882, 2010,
++ /*   520 */  2011, 2012, 2008, 2013, 2015, 1944, 1898, 2019, 2020, 1928,
++ /*   530 */  2014, 2023, 1903, 2022, 2016, 2017, 2018, 2021, 1965, 1974,
++ /*   540 */  1970, 2024, 1979, 1967, 2025, 2034, 2036, 2037, 2038, 2039,
++ /*   550 */  2028, 1923, 1924, 2044, 2022, 2046, 2047, 2048, 2049, 2050,
++ /*   560 */  2051, 2054, 2062, 2055, 2056, 2057, 2058, 2060, 2061, 2059,
++ /*   570 */  1956, 1938, 1949, 1958, 2063, 2064, 2070, 2085, 2088,
++};
++#define YY_REDUCE_COUNT (410)
+ #define YY_REDUCE_MIN   (-271)
+-#define YY_REDUCE_MAX   (1740)
++#define YY_REDUCE_MAX   (1753)
+ static const short yy_reduce_ofst[] = {
+  /*     0 */  -125,  733,  789,  241,  293, -123, -193, -191, -183, -187,
+  /*    10 */   166,  238,  133, -207, -199, -267, -176,   -6,  204,  489,
+- /*    20 */   576, -175,  598,  686,  615,  725,  860,  778,  781,  857,
+- /*    30 */   616,  887,   87,  240, -192,  408,  626,  796,  843,  854,
+- /*    40 */  1003, -271, -271, -271, -271, -271, -271, -271, -271, -271,
++ /*    20 */   576,  598, -175,  686,  860,  615,  725, 1014,  778,  781,
++ /*    30 */   857,  616,  887,   87,  240, -192,  408,  626,  796,  843,
++ /*    40 */   854, 1004, -271, -271, -271, -271, -271, -271, -271, -271,
+  /*    50 */  -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+  /*    60 */  -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+- /*    70 */  -271, -271, -271, -271, -271, -271, -271, -271,   80,   83,
+- /*    80 */   313,  886,  888,  996, 1034, 1059, 1081, 1100, 1117, 1152,
+- /*    90 */  1155, 1163, 1165, 1167, 1169, 1172, 1180, 1182, 1184, 1198,
+- /*   100 */  1200, 1213, 1215, 1225, 1227, 1252, 1254, 1264, 1299, 1303,
+- /*   110 */  1308, 1312, 1325, 1328, 1337, 1340, 1343, 1371, 1373, 1384,
+- /*   120 */  1386, 1411, 1420, 1424, 1426, 1458, 1470, 1473, 1475, 1479,
+- /*   130 */  -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+- /*   140 */  -271,  138,  459,  396, -158,  470,  302, -212,  521,  201,
+- /*   150 */  -195,  -92,  559,  630,  632,  630, -271,  632,  901,   63,
+- /*   160 */   407, -271, -271, -271, -271,  161,  161,  161,  251,  335,
+- /*   170 */   847,  960,  980,  537,  588,  618,  628,  688,  688, -166,
+- /*   180 */  -161,  674,  790,  794,  799,  851,  852, -122,  680, -120,
+- /*   190 */   995, 1038,  415, 1051,  893,  798,  962,  400, 1086,  779,
+- /*   200 */   923,  924,  263, 1041,  979,  990, 1083, 1097, 1031, 1194,
+- /*   210 */   362,  994, 1139, 1005, 1037, 1202, 1205, 1195, 1210, -194,
+- /*   220 */    56,  185, -135,  232,  522,  560,  601,  617,  669,  683,
+- /*   230 */   711,  856,  908,  941, 1048, 1101, 1147, 1257, 1262, 1265,
+- /*   240 */   392, 1292, 1333, 1339, 1342, 1346, 1350, 1359, 1374, 1418,
+- /*   250 */  1421, 1436, 1437,  593,  755,  770,  997, 1445, 1459, 1209,
+- /*   260 */  1500, 1504, 1516, 1132, 1243, 1518, 1519, 1440, 1520,  560,
+- /*   270 */  1522, 1523, 1524, 1526, 1527, 1529, 1382, 1438, 1431, 1468,
+- /*   280 */  1469, 1472, 1476, 1209, 1431, 1431, 1485, 1525, 1539, 1435,
+- /*   290 */  1463, 1471, 1492, 1487, 1443, 1494, 1474, 1484, 1498, 1486,
+- /*   300 */  1502, 1455, 1530, 1531, 1533, 1540, 1542, 1544, 1505, 1506,
+- /*   310 */  1507, 1508, 1521, 1528, 1493, 1537, 1532, 1575, 1488, 1496,
+- /*   320 */  1584, 1594, 1509, 1510, 1600, 1538, 1534, 1541, 1574, 1577,
+- /*   330 */  1583, 1585, 1586, 1612, 1626, 1581, 1556, 1558, 1587, 1559,
+- /*   340 */  1601, 1588, 1603, 1592, 1631, 1640, 1550, 1553, 1643, 1645,
+- /*   350 */  1625, 1649, 1652, 1650, 1653, 1632, 1636, 1637, 1642, 1634,
+- /*   360 */  1639, 1641, 1646, 1656, 1655, 1658, 1659, 1661, 1663, 1560,
+- /*   370 */  1564, 1596, 1605, 1664, 1670, 1565, 1571, 1627, 1638, 1657,
+- /*   380 */  1665, 1623, 1702, 1630, 1666, 1667, 1671, 1673, 1703, 1718,
+- /*   390 */  1719, 1729, 1730, 1731, 1621, 1622, 1628, 1720, 1713, 1716,
+- /*   400 */  1722, 1723, 1733, 1717, 1724, 1727, 1728, 1725, 1740,
++ /*    70 */  -271, -271, -271, -271, -271, -271, -271, -271, -271,   80,
++ /*    80 */    83,  313,  886,  888,  918,  938, 1021, 1034, 1036, 1141,
++ /*    90 */  1159, 1163, 1166, 1168, 1170, 1176, 1178, 1180, 1184, 1196,
++ /*   100 */  1198, 1205, 1215, 1225, 1227, 1236, 1252, 1254, 1264, 1303,
++ /*   110 */  1309, 1312, 1322, 1325, 1328, 1337, 1340, 1343, 1353, 1371,
++ /*   120 */  1373, 1384, 1386, 1411, 1413, 1420, 1424, 1426, 1458, 1470,
++ /*   130 */  1473, -271, -271, -271, -271, -271, -271, -271, -271, -271,
++ /*   140 */  -271, -271,  138,  459,  396, -158,  470,  302, -212,  521,
++ /*   150 */   201, -195,  -92,  559,  630,  632,  630, -271,  632,  901,
++ /*   160 */    63,  407,  670, -271, -271, -271, -271,  161,  161,  161,
++ /*   170 */   251,  335,  847,  979, 1097,  537,  588,  618,  628,  688,
++ /*   180 */   688, -166, -161,  674,  787,  794,  799,  852,  996, -122,
++ /*   190 */   837, -120, 1018, 1035,  415, 1047, 1001,  958, 1082,  400,
++ /*   200 */  1099,  779, 1137, 1142,  263, 1083, 1145, 1150, 1041, 1139,
++ /*   210 */   965, 1050,  362,  849,  752,  629,  675, 1162, 1173, 1090,
++ /*   220 */  1195, -194,   56,  185, -135,  232,  522,  560,  571,  601,
++ /*   230 */   617,  669,  683,  711,  850,  893, 1000, 1040, 1049, 1081,
++ /*   240 */  1087, 1101,  392, 1114, 1123, 1155, 1161, 1175, 1271, 1293,
++ /*   250 */  1299, 1330, 1339, 1342, 1347,  593, 1282, 1286, 1350, 1359,
++ /*   260 */  1368, 1314, 1480, 1483, 1507, 1085, 1338, 1526, 1527, 1487,
++ /*   270 */  1531,  560, 1532, 1534, 1535, 1538, 1539, 1541, 1448, 1450,
++ /*   280 */  1496, 1484, 1485, 1489, 1490, 1314, 1496, 1496, 1504, 1536,
++ /*   290 */  1564, 1451, 1486, 1492, 1509, 1493, 1465, 1515, 1494, 1495,
++ /*   300 */  1517, 1500, 1519, 1474, 1550, 1543, 1548, 1556, 1565, 1566,
++ /*   310 */  1518, 1523, 1542, 1544, 1525, 1545, 1513, 1553, 1552, 1604,
++ /*   320 */  1508, 1510, 1608, 1609, 1520, 1528, 1612, 1540, 1559, 1560,
++ /*   330 */  1592, 1591, 1595, 1596, 1597, 1629, 1638, 1594, 1569, 1570,
++ /*   340 */  1600, 1568, 1610, 1601, 1611, 1603, 1643, 1651, 1562, 1571,
++ /*   350 */  1655, 1659, 1640, 1663, 1666, 1664, 1667, 1641, 1650, 1652,
++ /*   360 */  1653, 1647, 1656, 1657, 1658, 1668, 1672, 1681, 1649, 1682,
++ /*   370 */  1683, 1573, 1582, 1607, 1615, 1685, 1702, 1586, 1587, 1642,
++ /*   380 */  1646, 1673, 1675, 1636, 1714, 1637, 1677, 1674, 1678, 1694,
++ /*   390 */  1719, 1734, 1735, 1746, 1747, 1750, 1633, 1661, 1686, 1738,
++ /*   400 */  1728, 1733, 1736, 1737, 1740, 1726, 1730, 1742, 1743, 1748,
++ /*   410 */  1753,
+ };
+ static const YYACTIONTYPE yy_default[] = {
+- /*     0 */  1647, 1647, 1647, 1475, 1240, 1351, 1240, 1240, 1240, 1475,
+- /*    10 */  1475, 1475, 1240, 1381, 1381, 1528, 1273, 1240, 1240, 1240,
+- /*    20 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1474, 1240, 1240,
+- /*    30 */  1240, 1240, 1563, 1563, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*    40 */  1240, 1240, 1390, 1240, 1397, 1240, 1240, 1240, 1240, 1240,
+- /*    50 */  1476, 1477, 1240, 1240, 1240, 1527, 1529, 1492, 1404, 1403,
+- /*    60 */  1402, 1401, 1510, 1369, 1395, 1388, 1392, 1470, 1471, 1469,
+- /*    70 */  1473, 1477, 1476, 1240, 1391, 1438, 1454, 1437, 1240, 1240,
+- /*    80 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*    90 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   100 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   110 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   120 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   130 */  1446, 1453, 1452, 1451, 1460, 1450, 1447, 1440, 1439, 1441,
+- /*   140 */  1442, 1240, 1240, 1264, 1240, 1240, 1261, 1315, 1240, 1240,
+- /*   150 */  1240, 1240, 1240, 1547, 1546, 1240, 1443, 1240, 1273, 1432,
+- /*   160 */  1431, 1457, 1444, 1456, 1455, 1535, 1599, 1598, 1493, 1240,
+- /*   170 */  1240, 1240, 1240, 1240, 1240, 1563, 1240, 1240, 1240, 1240,
+- /*   180 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   190 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1371,
+- /*   200 */  1563, 1563, 1240, 1273, 1563, 1563, 1372, 1372, 1269, 1269,
+- /*   210 */  1375, 1240, 1542, 1342, 1342, 1342, 1342, 1351, 1342, 1240,
+- /*   220 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   230 */  1240, 1240, 1240, 1240, 1532, 1530, 1240, 1240, 1240, 1240,
+- /*   240 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   250 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   260 */  1240, 1240, 1240, 1347, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   270 */  1240, 1240, 1240, 1240, 1240, 1592, 1240, 1505, 1329, 1347,
+- /*   280 */  1347, 1347, 1347, 1349, 1330, 1328, 1341, 1274, 1247, 1639,
+- /*   290 */  1407, 1396, 1348, 1396, 1636, 1394, 1407, 1407, 1394, 1407,
+- /*   300 */  1348, 1636, 1290, 1615, 1285, 1381, 1381, 1381, 1371, 1371,
+- /*   310 */  1371, 1371, 1375, 1375, 1472, 1348, 1341, 1240, 1639, 1639,
+- /*   320 */  1357, 1357, 1638, 1638, 1357, 1493, 1623, 1416, 1318, 1324,
+- /*   330 */  1324, 1324, 1324, 1357, 1258, 1394, 1623, 1623, 1394, 1416,
+- /*   340 */  1318, 1394, 1318, 1394, 1357, 1258, 1509, 1633, 1357, 1258,
+- /*   350 */  1483, 1357, 1258, 1357, 1258, 1483, 1316, 1316, 1316, 1305,
+- /*   360 */  1240, 1240, 1483, 1316, 1290, 1316, 1305, 1316, 1316, 1581,
+- /*   370 */  1240, 1487, 1487, 1483, 1357, 1573, 1573, 1384, 1384, 1389,
+- /*   380 */  1375, 1478, 1357, 1240, 1389, 1387, 1385, 1394, 1308, 1595,
+- /*   390 */  1595, 1591, 1591, 1591, 1644, 1644, 1542, 1608, 1273, 1273,
+- /*   400 */  1273, 1273, 1608, 1292, 1292, 1274, 1274, 1273, 1608, 1240,
+- /*   410 */  1240, 1240, 1240, 1240, 1240, 1603, 1240, 1537, 1494, 1361,
+- /*   420 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   430 */  1240, 1240, 1240, 1240, 1548, 1240, 1240, 1240, 1240, 1240,
+- /*   440 */  1240, 1240, 1240, 1240, 1240, 1421, 1240, 1243, 1539, 1240,
+- /*   450 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1398, 1399, 1362,
+- /*   460 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1413, 1240, 1240,
+- /*   470 */  1240, 1408, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   480 */  1635, 1240, 1240, 1240, 1240, 1240, 1240, 1508, 1507, 1240,
+- /*   490 */  1240, 1359, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   500 */  1240, 1240, 1240, 1240, 1240, 1288, 1240, 1240, 1240, 1240,
+- /*   510 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   520 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1386,
+- /*   530 */  1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   540 */  1240, 1240, 1240, 1240, 1578, 1376, 1240, 1240, 1240, 1240,
+- /*   550 */  1626, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240, 1240,
+- /*   560 */  1240, 1240, 1240, 1240, 1240, 1619, 1332, 1423, 1240, 1422,
+- /*   570 */  1426, 1262, 1240, 1252, 1240, 1240,
++ /*     0 */  1648, 1648, 1648, 1478, 1243, 1354, 1243, 1243, 1243, 1478,
++ /*    10 */  1478, 1478, 1243, 1384, 1384, 1531, 1276, 1243, 1243, 1243,
++ /*    20 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1477, 1243,
++ /*    30 */  1243, 1243, 1243, 1564, 1564, 1243, 1243, 1243, 1243, 1243,
++ /*    40 */  1243, 1243, 1243, 1393, 1243, 1400, 1243, 1243, 1243, 1243,
++ /*    50 */  1243, 1479, 1480, 1243, 1243, 1243, 1530, 1532, 1495, 1407,
++ /*    60 */  1406, 1405, 1404, 1513, 1372, 1398, 1391, 1395, 1474, 1475,
++ /*    70 */  1473, 1626, 1480, 1479, 1243, 1394, 1442, 1458, 1441, 1243,
++ /*    80 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*    90 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   100 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   110 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   120 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   130 */  1243, 1450, 1457, 1456, 1455, 1464, 1454, 1451, 1444, 1443,
++ /*   140 */  1445, 1446, 1243, 1243, 1267, 1243, 1243, 1264, 1318, 1243,
++ /*   150 */  1243, 1243, 1243, 1243, 1550, 1549, 1243, 1447, 1243, 1276,
++ /*   160 */  1435, 1434, 1433, 1461, 1448, 1460, 1459, 1538, 1600, 1599,
++ /*   170 */  1496, 1243, 1243, 1243, 1243, 1243, 1243, 1564, 1243, 1243,
++ /*   180 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   190 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   200 */  1243, 1374, 1564, 1564, 1243, 1276, 1564, 1564, 1375, 1375,
++ /*   210 */  1272, 1272, 1378, 1243, 1545, 1345, 1345, 1345, 1345, 1354,
++ /*   220 */  1345, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   230 */  1243, 1243, 1243, 1243, 1243, 1243, 1535, 1533, 1243, 1243,
++ /*   240 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   250 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   260 */  1243, 1243, 1243, 1243, 1243, 1350, 1243, 1243, 1243, 1243,
++ /*   270 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1593, 1243, 1508,
++ /*   280 */  1332, 1350, 1350, 1350, 1350, 1352, 1333, 1331, 1344, 1277,
++ /*   290 */  1250, 1640, 1410, 1399, 1351, 1399, 1637, 1397, 1410, 1410,
++ /*   300 */  1397, 1410, 1351, 1637, 1293, 1615, 1288, 1384, 1384, 1384,
++ /*   310 */  1374, 1374, 1374, 1374, 1378, 1378, 1476, 1351, 1344, 1243,
++ /*   320 */  1640, 1640, 1360, 1360, 1639, 1639, 1360, 1496, 1623, 1419,
++ /*   330 */  1321, 1327, 1327, 1327, 1327, 1360, 1261, 1397, 1623, 1623,
++ /*   340 */  1397, 1419, 1321, 1397, 1321, 1397, 1360, 1261, 1512, 1634,
++ /*   350 */  1360, 1261, 1486, 1360, 1261, 1360, 1261, 1486, 1319, 1319,
++ /*   360 */  1319, 1308, 1243, 1243, 1486, 1319, 1293, 1319, 1308, 1319,
++ /*   370 */  1319, 1582, 1243, 1490, 1490, 1486, 1360, 1574, 1574, 1387,
++ /*   380 */  1387, 1392, 1378, 1481, 1360, 1243, 1392, 1390, 1388, 1397,
++ /*   390 */  1311, 1596, 1596, 1592, 1592, 1592, 1645, 1645, 1545, 1608,
++ /*   400 */  1276, 1276, 1276, 1276, 1608, 1295, 1295, 1277, 1277, 1276,
++ /*   410 */  1608, 1243, 1243, 1243, 1243, 1243, 1243, 1603, 1243, 1540,
++ /*   420 */  1497, 1364, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   430 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1551, 1243,
++ /*   440 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1424,
++ /*   450 */  1243, 1246, 1542, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   460 */  1243, 1401, 1402, 1365, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   470 */  1243, 1416, 1243, 1243, 1243, 1411, 1243, 1243, 1243, 1243,
++ /*   480 */  1243, 1243, 1243, 1243, 1636, 1243, 1243, 1243, 1243, 1243,
++ /*   490 */  1243, 1511, 1510, 1243, 1243, 1362, 1243, 1243, 1243, 1243,
++ /*   500 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1291,
++ /*   510 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   520 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   530 */  1243, 1243, 1243, 1389, 1243, 1243, 1243, 1243, 1243, 1243,
++ /*   540 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1579, 1379,
++ /*   550 */  1243, 1243, 1243, 1243, 1627, 1243, 1243, 1243, 1243, 1243,
++ /*   560 */  1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1619,
++ /*   570 */  1335, 1425, 1243, 1428, 1265, 1243, 1255, 1243, 1243,
+ };
+ /********** End of lemon-generated parsing tables *****************************/
+ 
+@@ -165517,59 +173065,59 @@ static const char *const yyRuleName[] = {
+  /* 175 */ "idlist ::= idlist COMMA nm",
+  /* 176 */ "idlist ::= nm",
+  /* 177 */ "expr ::= LP expr RP",
+- /* 178 */ "expr ::= ID|INDEXED",
+- /* 179 */ "expr ::= JOIN_KW",
+- /* 180 */ "expr ::= nm DOT nm",
+- /* 181 */ "expr ::= nm DOT nm DOT nm",
+- /* 182 */ "term ::= NULL|FLOAT|BLOB",
+- /* 183 */ "term ::= STRING",
+- /* 184 */ "term ::= INTEGER",
+- /* 185 */ "expr ::= VARIABLE",
+- /* 186 */ "expr ::= expr COLLATE ID|STRING",
+- /* 187 */ "expr ::= CAST LP expr AS typetoken RP",
+- /* 188 */ "expr ::= ID|INDEXED LP distinct exprlist RP",
+- /* 189 */ "expr ::= ID|INDEXED LP STAR RP",
+- /* 190 */ "expr ::= ID|INDEXED LP distinct exprlist RP filter_over",
+- /* 191 */ "expr ::= ID|INDEXED LP STAR RP filter_over",
+- /* 192 */ "term ::= CTIME_KW",
+- /* 193 */ "expr ::= LP nexprlist COMMA expr RP",
+- /* 194 */ "expr ::= expr AND expr",
+- /* 195 */ "expr ::= expr OR expr",
+- /* 196 */ "expr ::= expr LT|GT|GE|LE expr",
+- /* 197 */ "expr ::= expr EQ|NE expr",
+- /* 198 */ "expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr",
+- /* 199 */ "expr ::= expr PLUS|MINUS expr",
+- /* 200 */ "expr ::= expr STAR|SLASH|REM expr",
+- /* 201 */ "expr ::= expr CONCAT expr",
+- /* 202 */ "likeop ::= NOT LIKE_KW|MATCH",
+- /* 203 */ "expr ::= expr likeop expr",
+- /* 204 */ "expr ::= expr likeop expr ESCAPE expr",
+- /* 205 */ "expr ::= expr ISNULL|NOTNULL",
+- /* 206 */ "expr ::= expr NOT NULL",
+- /* 207 */ "expr ::= expr IS expr",
+- /* 208 */ "expr ::= expr IS NOT expr",
+- /* 209 */ "expr ::= expr IS NOT DISTINCT FROM expr",
+- /* 210 */ "expr ::= expr IS DISTINCT FROM expr",
+- /* 211 */ "expr ::= NOT expr",
+- /* 212 */ "expr ::= BITNOT expr",
+- /* 213 */ "expr ::= PLUS|MINUS expr",
+- /* 214 */ "expr ::= expr PTR expr",
+- /* 215 */ "between_op ::= BETWEEN",
+- /* 216 */ "between_op ::= NOT BETWEEN",
+- /* 217 */ "expr ::= expr between_op expr AND expr",
+- /* 218 */ "in_op ::= IN",
+- /* 219 */ "in_op ::= NOT IN",
+- /* 220 */ "expr ::= expr in_op LP exprlist RP",
+- /* 221 */ "expr ::= LP select RP",
+- /* 222 */ "expr ::= expr in_op LP select RP",
+- /* 223 */ "expr ::= expr in_op nm dbnm paren_exprlist",
+- /* 224 */ "expr ::= EXISTS LP select RP",
+- /* 225 */ "expr ::= CASE case_operand case_exprlist case_else END",
+- /* 226 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
+- /* 227 */ "case_exprlist ::= WHEN expr THEN expr",
+- /* 228 */ "case_else ::= ELSE expr",
+- /* 229 */ "case_else ::=",
+- /* 230 */ "case_operand ::= expr",
++ /* 178 */ "expr ::= ID|INDEXED|JOIN_KW",
++ /* 179 */ "expr ::= nm DOT nm",
++ /* 180 */ "expr ::= nm DOT nm DOT nm",
++ /* 181 */ "term ::= NULL|FLOAT|BLOB",
++ /* 182 */ "term ::= STRING",
++ /* 183 */ "term ::= INTEGER",
++ /* 184 */ "expr ::= VARIABLE",
++ /* 185 */ "expr ::= expr COLLATE ID|STRING",
++ /* 186 */ "expr ::= CAST LP expr AS typetoken RP",
++ /* 187 */ "expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP",
++ /* 188 */ "expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP",
++ /* 189 */ "expr ::= ID|INDEXED|JOIN_KW LP STAR RP",
++ /* 190 */ "expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP filter_over",
++ /* 191 */ "expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP filter_over",
++ /* 192 */ "expr ::= ID|INDEXED|JOIN_KW LP STAR RP filter_over",
++ /* 193 */ "term ::= CTIME_KW",
++ /* 194 */ "expr ::= LP nexprlist COMMA expr RP",
++ /* 195 */ "expr ::= expr AND expr",
++ /* 196 */ "expr ::= expr OR expr",
++ /* 197 */ "expr ::= expr LT|GT|GE|LE expr",
++ /* 198 */ "expr ::= expr EQ|NE expr",
++ /* 199 */ "expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr",
++ /* 200 */ "expr ::= expr PLUS|MINUS expr",
++ /* 201 */ "expr ::= expr STAR|SLASH|REM expr",
++ /* 202 */ "expr ::= expr CONCAT expr",
++ /* 203 */ "likeop ::= NOT LIKE_KW|MATCH",
++ /* 204 */ "expr ::= expr likeop expr",
++ /* 205 */ "expr ::= expr likeop expr ESCAPE expr",
++ /* 206 */ "expr ::= expr ISNULL|NOTNULL",
++ /* 207 */ "expr ::= expr NOT NULL",
++ /* 208 */ "expr ::= expr IS expr",
++ /* 209 */ "expr ::= expr IS NOT expr",
++ /* 210 */ "expr ::= expr IS NOT DISTINCT FROM expr",
++ /* 211 */ "expr ::= expr IS DISTINCT FROM expr",
++ /* 212 */ "expr ::= NOT expr",
++ /* 213 */ "expr ::= BITNOT expr",
++ /* 214 */ "expr ::= PLUS|MINUS expr",
++ /* 215 */ "expr ::= expr PTR expr",
++ /* 216 */ "between_op ::= BETWEEN",
++ /* 217 */ "between_op ::= NOT BETWEEN",
++ /* 218 */ "expr ::= expr between_op expr AND expr",
++ /* 219 */ "in_op ::= IN",
++ /* 220 */ "in_op ::= NOT IN",
++ /* 221 */ "expr ::= expr in_op LP exprlist RP",
++ /* 222 */ "expr ::= LP select RP",
++ /* 223 */ "expr ::= expr in_op LP select RP",
++ /* 224 */ "expr ::= expr in_op nm dbnm paren_exprlist",
++ /* 225 */ "expr ::= EXISTS LP select RP",
++ /* 226 */ "expr ::= CASE case_operand case_exprlist case_else END",
++ /* 227 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
++ /* 228 */ "case_exprlist ::= WHEN expr THEN expr",
++ /* 229 */ "case_else ::= ELSE expr",
++ /* 230 */ "case_else ::=",
+  /* 231 */ "case_operand ::=",
+  /* 232 */ "exprlist ::=",
+  /* 233 */ "nexprlist ::= nexprlist COMMA expr",
+@@ -165650,100 +173198,100 @@ static const char *const yyRuleName[] = {
+  /* 308 */ "wqitem ::= nm eidlist_opt wqas LP select RP",
+  /* 309 */ "wqlist ::= wqitem",
+  /* 310 */ "wqlist ::= wqlist COMMA wqitem",
+- /* 311 */ "windowdefn_list ::= windowdefn",
+- /* 312 */ "windowdefn_list ::= windowdefn_list COMMA windowdefn",
+- /* 313 */ "windowdefn ::= nm AS LP window RP",
+- /* 314 */ "window ::= PARTITION BY nexprlist orderby_opt frame_opt",
+- /* 315 */ "window ::= nm PARTITION BY nexprlist orderby_opt frame_opt",
+- /* 316 */ "window ::= ORDER BY sortlist frame_opt",
+- /* 317 */ "window ::= nm ORDER BY sortlist frame_opt",
+- /* 318 */ "window ::= frame_opt",
+- /* 319 */ "window ::= nm frame_opt",
+- /* 320 */ "frame_opt ::=",
+- /* 321 */ "frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt",
+- /* 322 */ "frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt",
+- /* 323 */ "range_or_rows ::= RANGE|ROWS|GROUPS",
+- /* 324 */ "frame_bound_s ::= frame_bound",
+- /* 325 */ "frame_bound_s ::= UNBOUNDED PRECEDING",
+- /* 326 */ "frame_bound_e ::= frame_bound",
+- /* 327 */ "frame_bound_e ::= UNBOUNDED FOLLOWING",
+- /* 328 */ "frame_bound ::= expr PRECEDING|FOLLOWING",
+- /* 329 */ "frame_bound ::= CURRENT ROW",
+- /* 330 */ "frame_exclude_opt ::=",
+- /* 331 */ "frame_exclude_opt ::= EXCLUDE frame_exclude",
+- /* 332 */ "frame_exclude ::= NO OTHERS",
+- /* 333 */ "frame_exclude ::= CURRENT ROW",
+- /* 334 */ "frame_exclude ::= GROUP|TIES",
+- /* 335 */ "window_clause ::= WINDOW windowdefn_list",
+- /* 336 */ "filter_over ::= filter_clause over_clause",
+- /* 337 */ "filter_over ::= over_clause",
+- /* 338 */ "filter_over ::= filter_clause",
+- /* 339 */ "over_clause ::= OVER LP window RP",
+- /* 340 */ "over_clause ::= OVER nm",
+- /* 341 */ "filter_clause ::= FILTER LP WHERE expr RP",
+- /* 342 */ "input ::= cmdlist",
+- /* 343 */ "cmdlist ::= cmdlist ecmd",
+- /* 344 */ "cmdlist ::= ecmd",
+- /* 345 */ "ecmd ::= SEMI",
+- /* 346 */ "ecmd ::= cmdx SEMI",
+- /* 347 */ "ecmd ::= explain cmdx SEMI",
+- /* 348 */ "trans_opt ::=",
+- /* 349 */ "trans_opt ::= TRANSACTION",
+- /* 350 */ "trans_opt ::= TRANSACTION nm",
+- /* 351 */ "savepoint_opt ::= SAVEPOINT",
+- /* 352 */ "savepoint_opt ::=",
+- /* 353 */ "cmd ::= create_table create_table_args",
+- /* 354 */ "table_option_set ::= table_option",
+- /* 355 */ "columnlist ::= columnlist COMMA columnname carglist",
+- /* 356 */ "columnlist ::= columnname carglist",
+- /* 357 */ "nm ::= ID|INDEXED",
+- /* 358 */ "nm ::= STRING",
+- /* 359 */ "nm ::= JOIN_KW",
+- /* 360 */ "typetoken ::= typename",
+- /* 361 */ "typename ::= ID|STRING",
+- /* 362 */ "signed ::= plus_num",
+- /* 363 */ "signed ::= minus_num",
+- /* 364 */ "carglist ::= carglist ccons",
+- /* 365 */ "carglist ::=",
+- /* 366 */ "ccons ::= NULL onconf",
+- /* 367 */ "ccons ::= GENERATED ALWAYS AS generated",
+- /* 368 */ "ccons ::= AS generated",
+- /* 369 */ "conslist_opt ::= COMMA conslist",
+- /* 370 */ "conslist ::= conslist tconscomma tcons",
+- /* 371 */ "conslist ::= tcons",
+- /* 372 */ "tconscomma ::=",
+- /* 373 */ "defer_subclause_opt ::= defer_subclause",
+- /* 374 */ "resolvetype ::= raisetype",
+- /* 375 */ "selectnowith ::= oneselect",
+- /* 376 */ "oneselect ::= values",
+- /* 377 */ "sclp ::= selcollist COMMA",
+- /* 378 */ "as ::= ID|STRING",
+- /* 379 */ "indexed_opt ::= indexed_by",
+- /* 380 */ "returning ::=",
+- /* 381 */ "expr ::= term",
+- /* 382 */ "likeop ::= LIKE_KW|MATCH",
+- /* 383 */ "exprlist ::= nexprlist",
+- /* 384 */ "nmnum ::= plus_num",
+- /* 385 */ "nmnum ::= nm",
+- /* 386 */ "nmnum ::= ON",
+- /* 387 */ "nmnum ::= DELETE",
+- /* 388 */ "nmnum ::= DEFAULT",
+- /* 389 */ "plus_num ::= INTEGER|FLOAT",
+- /* 390 */ "foreach_clause ::=",
+- /* 391 */ "foreach_clause ::= FOR EACH ROW",
+- /* 392 */ "trnm ::= nm",
+- /* 393 */ "tridxby ::=",
+- /* 394 */ "database_kw_opt ::= DATABASE",
+- /* 395 */ "database_kw_opt ::=",
+- /* 396 */ "kwcolumn_opt ::=",
+- /* 397 */ "kwcolumn_opt ::= COLUMNKW",
+- /* 398 */ "vtabarglist ::= vtabarg",
+- /* 399 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
+- /* 400 */ "vtabarg ::= vtabarg vtabargtoken",
+- /* 401 */ "anylist ::=",
+- /* 402 */ "anylist ::= anylist LP anylist RP",
+- /* 403 */ "anylist ::= anylist ANY",
+- /* 404 */ "with ::=",
++ /* 311 */ "windowdefn_list ::= windowdefn_list COMMA windowdefn",
++ /* 312 */ "windowdefn ::= nm AS LP window RP",
++ /* 313 */ "window ::= PARTITION BY nexprlist orderby_opt frame_opt",
++ /* 314 */ "window ::= nm PARTITION BY nexprlist orderby_opt frame_opt",
++ /* 315 */ "window ::= ORDER BY sortlist frame_opt",
++ /* 316 */ "window ::= nm ORDER BY sortlist frame_opt",
++ /* 317 */ "window ::= nm frame_opt",
++ /* 318 */ "frame_opt ::=",
++ /* 319 */ "frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt",
++ /* 320 */ "frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt",
++ /* 321 */ "range_or_rows ::= RANGE|ROWS|GROUPS",
++ /* 322 */ "frame_bound_s ::= frame_bound",
++ /* 323 */ "frame_bound_s ::= UNBOUNDED PRECEDING",
++ /* 324 */ "frame_bound_e ::= frame_bound",
++ /* 325 */ "frame_bound_e ::= UNBOUNDED FOLLOWING",
++ /* 326 */ "frame_bound ::= expr PRECEDING|FOLLOWING",
++ /* 327 */ "frame_bound ::= CURRENT ROW",
++ /* 328 */ "frame_exclude_opt ::=",
++ /* 329 */ "frame_exclude_opt ::= EXCLUDE frame_exclude",
++ /* 330 */ "frame_exclude ::= NO OTHERS",
++ /* 331 */ "frame_exclude ::= CURRENT ROW",
++ /* 332 */ "frame_exclude ::= GROUP|TIES",
++ /* 333 */ "window_clause ::= WINDOW windowdefn_list",
++ /* 334 */ "filter_over ::= filter_clause over_clause",
++ /* 335 */ "filter_over ::= over_clause",
++ /* 336 */ "filter_over ::= filter_clause",
++ /* 337 */ "over_clause ::= OVER LP window RP",
++ /* 338 */ "over_clause ::= OVER nm",
++ /* 339 */ "filter_clause ::= FILTER LP WHERE expr RP",
++ /* 340 */ "input ::= cmdlist",
++ /* 341 */ "cmdlist ::= cmdlist ecmd",
++ /* 342 */ "cmdlist ::= ecmd",
++ /* 343 */ "ecmd ::= SEMI",
++ /* 344 */ "ecmd ::= cmdx SEMI",
++ /* 345 */ "ecmd ::= explain cmdx SEMI",
++ /* 346 */ "trans_opt ::=",
++ /* 347 */ "trans_opt ::= TRANSACTION",
++ /* 348 */ "trans_opt ::= TRANSACTION nm",
++ /* 349 */ "savepoint_opt ::= SAVEPOINT",
++ /* 350 */ "savepoint_opt ::=",
++ /* 351 */ "cmd ::= create_table create_table_args",
++ /* 352 */ "table_option_set ::= table_option",
++ /* 353 */ "columnlist ::= columnlist COMMA columnname carglist",
++ /* 354 */ "columnlist ::= columnname carglist",
++ /* 355 */ "nm ::= ID|INDEXED|JOIN_KW",
++ /* 356 */ "nm ::= STRING",
++ /* 357 */ "typetoken ::= typename",
++ /* 358 */ "typename ::= ID|STRING",
++ /* 359 */ "signed ::= plus_num",
++ /* 360 */ "signed ::= minus_num",
++ /* 361 */ "carglist ::= carglist ccons",
++ /* 362 */ "carglist ::=",
++ /* 363 */ "ccons ::= NULL onconf",
++ /* 364 */ "ccons ::= GENERATED ALWAYS AS generated",
++ /* 365 */ "ccons ::= AS generated",
++ /* 366 */ "conslist_opt ::= COMMA conslist",
++ /* 367 */ "conslist ::= conslist tconscomma tcons",
++ /* 368 */ "conslist ::= tcons",
++ /* 369 */ "tconscomma ::=",
++ /* 370 */ "defer_subclause_opt ::= defer_subclause",
++ /* 371 */ "resolvetype ::= raisetype",
++ /* 372 */ "selectnowith ::= oneselect",
++ /* 373 */ "oneselect ::= values",
++ /* 374 */ "sclp ::= selcollist COMMA",
++ /* 375 */ "as ::= ID|STRING",
++ /* 376 */ "indexed_opt ::= indexed_by",
++ /* 377 */ "returning ::=",
++ /* 378 */ "expr ::= term",
++ /* 379 */ "likeop ::= LIKE_KW|MATCH",
++ /* 380 */ "case_operand ::= expr",
++ /* 381 */ "exprlist ::= nexprlist",
++ /* 382 */ "nmnum ::= plus_num",
++ /* 383 */ "nmnum ::= nm",
++ /* 384 */ "nmnum ::= ON",
++ /* 385 */ "nmnum ::= DELETE",
++ /* 386 */ "nmnum ::= DEFAULT",
++ /* 387 */ "plus_num ::= INTEGER|FLOAT",
++ /* 388 */ "foreach_clause ::=",
++ /* 389 */ "foreach_clause ::= FOR EACH ROW",
++ /* 390 */ "trnm ::= nm",
++ /* 391 */ "tridxby ::=",
++ /* 392 */ "database_kw_opt ::= DATABASE",
++ /* 393 */ "database_kw_opt ::=",
++ /* 394 */ "kwcolumn_opt ::=",
++ /* 395 */ "kwcolumn_opt ::= COLUMNKW",
++ /* 396 */ "vtabarglist ::= vtabarg",
++ /* 397 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
++ /* 398 */ "vtabarg ::= vtabarg vtabargtoken",
++ /* 399 */ "anylist ::=",
++ /* 400 */ "anylist ::= anylist LP anylist RP",
++ /* 401 */ "anylist ::= anylist ANY",
++ /* 402 */ "with ::=",
++ /* 403 */ "windowdefn_list ::= windowdefn",
++ /* 404 */ "window ::= frame_opt",
+ };
+ #endif /* NDEBUG */
+ 
+@@ -166428,59 +173976,59 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
+    263,  /* (175) idlist ::= idlist COMMA nm */
+    263,  /* (176) idlist ::= nm */
+    217,  /* (177) expr ::= LP expr RP */
+-   217,  /* (178) expr ::= ID|INDEXED */
+-   217,  /* (179) expr ::= JOIN_KW */
+-   217,  /* (180) expr ::= nm DOT nm */
+-   217,  /* (181) expr ::= nm DOT nm DOT nm */
+-   216,  /* (182) term ::= NULL|FLOAT|BLOB */
+-   216,  /* (183) term ::= STRING */
+-   216,  /* (184) term ::= INTEGER */
+-   217,  /* (185) expr ::= VARIABLE */
+-   217,  /* (186) expr ::= expr COLLATE ID|STRING */
+-   217,  /* (187) expr ::= CAST LP expr AS typetoken RP */
+-   217,  /* (188) expr ::= ID|INDEXED LP distinct exprlist RP */
+-   217,  /* (189) expr ::= ID|INDEXED LP STAR RP */
+-   217,  /* (190) expr ::= ID|INDEXED LP distinct exprlist RP filter_over */
+-   217,  /* (191) expr ::= ID|INDEXED LP STAR RP filter_over */
+-   216,  /* (192) term ::= CTIME_KW */
+-   217,  /* (193) expr ::= LP nexprlist COMMA expr RP */
+-   217,  /* (194) expr ::= expr AND expr */
+-   217,  /* (195) expr ::= expr OR expr */
+-   217,  /* (196) expr ::= expr LT|GT|GE|LE expr */
+-   217,  /* (197) expr ::= expr EQ|NE expr */
+-   217,  /* (198) expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */
+-   217,  /* (199) expr ::= expr PLUS|MINUS expr */
+-   217,  /* (200) expr ::= expr STAR|SLASH|REM expr */
+-   217,  /* (201) expr ::= expr CONCAT expr */
+-   274,  /* (202) likeop ::= NOT LIKE_KW|MATCH */
+-   217,  /* (203) expr ::= expr likeop expr */
+-   217,  /* (204) expr ::= expr likeop expr ESCAPE expr */
+-   217,  /* (205) expr ::= expr ISNULL|NOTNULL */
+-   217,  /* (206) expr ::= expr NOT NULL */
+-   217,  /* (207) expr ::= expr IS expr */
+-   217,  /* (208) expr ::= expr IS NOT expr */
+-   217,  /* (209) expr ::= expr IS NOT DISTINCT FROM expr */
+-   217,  /* (210) expr ::= expr IS DISTINCT FROM expr */
+-   217,  /* (211) expr ::= NOT expr */
+-   217,  /* (212) expr ::= BITNOT expr */
+-   217,  /* (213) expr ::= PLUS|MINUS expr */
+-   217,  /* (214) expr ::= expr PTR expr */
+-   275,  /* (215) between_op ::= BETWEEN */
+-   275,  /* (216) between_op ::= NOT BETWEEN */
+-   217,  /* (217) expr ::= expr between_op expr AND expr */
+-   276,  /* (218) in_op ::= IN */
+-   276,  /* (219) in_op ::= NOT IN */
+-   217,  /* (220) expr ::= expr in_op LP exprlist RP */
+-   217,  /* (221) expr ::= LP select RP */
+-   217,  /* (222) expr ::= expr in_op LP select RP */
+-   217,  /* (223) expr ::= expr in_op nm dbnm paren_exprlist */
+-   217,  /* (224) expr ::= EXISTS LP select RP */
+-   217,  /* (225) expr ::= CASE case_operand case_exprlist case_else END */
+-   279,  /* (226) case_exprlist ::= case_exprlist WHEN expr THEN expr */
+-   279,  /* (227) case_exprlist ::= WHEN expr THEN expr */
+-   280,  /* (228) case_else ::= ELSE expr */
+-   280,  /* (229) case_else ::= */
+-   278,  /* (230) case_operand ::= expr */
++   217,  /* (178) expr ::= ID|INDEXED|JOIN_KW */
++   217,  /* (179) expr ::= nm DOT nm */
++   217,  /* (180) expr ::= nm DOT nm DOT nm */
++   216,  /* (181) term ::= NULL|FLOAT|BLOB */
++   216,  /* (182) term ::= STRING */
++   216,  /* (183) term ::= INTEGER */
++   217,  /* (184) expr ::= VARIABLE */
++   217,  /* (185) expr ::= expr COLLATE ID|STRING */
++   217,  /* (186) expr ::= CAST LP expr AS typetoken RP */
++   217,  /* (187) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP */
++   217,  /* (188) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP */
++   217,  /* (189) expr ::= ID|INDEXED|JOIN_KW LP STAR RP */
++   217,  /* (190) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP filter_over */
++   217,  /* (191) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP filter_over */
++   217,  /* (192) expr ::= ID|INDEXED|JOIN_KW LP STAR RP filter_over */
++   216,  /* (193) term ::= CTIME_KW */
++   217,  /* (194) expr ::= LP nexprlist COMMA expr RP */
++   217,  /* (195) expr ::= expr AND expr */
++   217,  /* (196) expr ::= expr OR expr */
++   217,  /* (197) expr ::= expr LT|GT|GE|LE expr */
++   217,  /* (198) expr ::= expr EQ|NE expr */
++   217,  /* (199) expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */
++   217,  /* (200) expr ::= expr PLUS|MINUS expr */
++   217,  /* (201) expr ::= expr STAR|SLASH|REM expr */
++   217,  /* (202) expr ::= expr CONCAT expr */
++   274,  /* (203) likeop ::= NOT LIKE_KW|MATCH */
++   217,  /* (204) expr ::= expr likeop expr */
++   217,  /* (205) expr ::= expr likeop expr ESCAPE expr */
++   217,  /* (206) expr ::= expr ISNULL|NOTNULL */
++   217,  /* (207) expr ::= expr NOT NULL */
++   217,  /* (208) expr ::= expr IS expr */
++   217,  /* (209) expr ::= expr IS NOT expr */
++   217,  /* (210) expr ::= expr IS NOT DISTINCT FROM expr */
++   217,  /* (211) expr ::= expr IS DISTINCT FROM expr */
++   217,  /* (212) expr ::= NOT expr */
++   217,  /* (213) expr ::= BITNOT expr */
++   217,  /* (214) expr ::= PLUS|MINUS expr */
++   217,  /* (215) expr ::= expr PTR expr */
++   275,  /* (216) between_op ::= BETWEEN */
++   275,  /* (217) between_op ::= NOT BETWEEN */
++   217,  /* (218) expr ::= expr between_op expr AND expr */
++   276,  /* (219) in_op ::= IN */
++   276,  /* (220) in_op ::= NOT IN */
++   217,  /* (221) expr ::= expr in_op LP exprlist RP */
++   217,  /* (222) expr ::= LP select RP */
++   217,  /* (223) expr ::= expr in_op LP select RP */
++   217,  /* (224) expr ::= expr in_op nm dbnm paren_exprlist */
++   217,  /* (225) expr ::= EXISTS LP select RP */
++   217,  /* (226) expr ::= CASE case_operand case_exprlist case_else END */
++   279,  /* (227) case_exprlist ::= case_exprlist WHEN expr THEN expr */
++   279,  /* (228) case_exprlist ::= WHEN expr THEN expr */
++   280,  /* (229) case_else ::= ELSE expr */
++   280,  /* (230) case_else ::= */
+    278,  /* (231) case_operand ::= */
+    261,  /* (232) exprlist ::= */
+    253,  /* (233) nexprlist ::= nexprlist COMMA expr */
+@@ -166561,100 +174109,100 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
+    304,  /* (308) wqitem ::= nm eidlist_opt wqas LP select RP */
+    241,  /* (309) wqlist ::= wqitem */
+    241,  /* (310) wqlist ::= wqlist COMMA wqitem */
+-   306,  /* (311) windowdefn_list ::= windowdefn */
+-   306,  /* (312) windowdefn_list ::= windowdefn_list COMMA windowdefn */
+-   307,  /* (313) windowdefn ::= nm AS LP window RP */
+-   308,  /* (314) window ::= PARTITION BY nexprlist orderby_opt frame_opt */
+-   308,  /* (315) window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
+-   308,  /* (316) window ::= ORDER BY sortlist frame_opt */
+-   308,  /* (317) window ::= nm ORDER BY sortlist frame_opt */
+-   308,  /* (318) window ::= frame_opt */
+-   308,  /* (319) window ::= nm frame_opt */
+-   309,  /* (320) frame_opt ::= */
+-   309,  /* (321) frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
+-   309,  /* (322) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
+-   313,  /* (323) range_or_rows ::= RANGE|ROWS|GROUPS */
+-   315,  /* (324) frame_bound_s ::= frame_bound */
+-   315,  /* (325) frame_bound_s ::= UNBOUNDED PRECEDING */
+-   316,  /* (326) frame_bound_e ::= frame_bound */
+-   316,  /* (327) frame_bound_e ::= UNBOUNDED FOLLOWING */
+-   314,  /* (328) frame_bound ::= expr PRECEDING|FOLLOWING */
+-   314,  /* (329) frame_bound ::= CURRENT ROW */
+-   317,  /* (330) frame_exclude_opt ::= */
+-   317,  /* (331) frame_exclude_opt ::= EXCLUDE frame_exclude */
+-   318,  /* (332) frame_exclude ::= NO OTHERS */
+-   318,  /* (333) frame_exclude ::= CURRENT ROW */
+-   318,  /* (334) frame_exclude ::= GROUP|TIES */
+-   251,  /* (335) window_clause ::= WINDOW windowdefn_list */
+-   273,  /* (336) filter_over ::= filter_clause over_clause */
+-   273,  /* (337) filter_over ::= over_clause */
+-   273,  /* (338) filter_over ::= filter_clause */
+-   312,  /* (339) over_clause ::= OVER LP window RP */
+-   312,  /* (340) over_clause ::= OVER nm */
+-   311,  /* (341) filter_clause ::= FILTER LP WHERE expr RP */
+-   185,  /* (342) input ::= cmdlist */
+-   186,  /* (343) cmdlist ::= cmdlist ecmd */
+-   186,  /* (344) cmdlist ::= ecmd */
+-   187,  /* (345) ecmd ::= SEMI */
+-   187,  /* (346) ecmd ::= cmdx SEMI */
+-   187,  /* (347) ecmd ::= explain cmdx SEMI */
+-   192,  /* (348) trans_opt ::= */
+-   192,  /* (349) trans_opt ::= TRANSACTION */
+-   192,  /* (350) trans_opt ::= TRANSACTION nm */
+-   194,  /* (351) savepoint_opt ::= SAVEPOINT */
+-   194,  /* (352) savepoint_opt ::= */
+-   190,  /* (353) cmd ::= create_table create_table_args */
+-   203,  /* (354) table_option_set ::= table_option */
+-   201,  /* (355) columnlist ::= columnlist COMMA columnname carglist */
+-   201,  /* (356) columnlist ::= columnname carglist */
+-   193,  /* (357) nm ::= ID|INDEXED */
+-   193,  /* (358) nm ::= STRING */
+-   193,  /* (359) nm ::= JOIN_KW */
+-   208,  /* (360) typetoken ::= typename */
+-   209,  /* (361) typename ::= ID|STRING */
+-   210,  /* (362) signed ::= plus_num */
+-   210,  /* (363) signed ::= minus_num */
+-   207,  /* (364) carglist ::= carglist ccons */
+-   207,  /* (365) carglist ::= */
+-   215,  /* (366) ccons ::= NULL onconf */
+-   215,  /* (367) ccons ::= GENERATED ALWAYS AS generated */
+-   215,  /* (368) ccons ::= AS generated */
+-   202,  /* (369) conslist_opt ::= COMMA conslist */
+-   228,  /* (370) conslist ::= conslist tconscomma tcons */
+-   228,  /* (371) conslist ::= tcons */
+-   229,  /* (372) tconscomma ::= */
+-   233,  /* (373) defer_subclause_opt ::= defer_subclause */
+-   235,  /* (374) resolvetype ::= raisetype */
+-   239,  /* (375) selectnowith ::= oneselect */
+-   240,  /* (376) oneselect ::= values */
+-   254,  /* (377) sclp ::= selcollist COMMA */
+-   255,  /* (378) as ::= ID|STRING */
+-   264,  /* (379) indexed_opt ::= indexed_by */
+-   272,  /* (380) returning ::= */
+-   217,  /* (381) expr ::= term */
+-   274,  /* (382) likeop ::= LIKE_KW|MATCH */
+-   261,  /* (383) exprlist ::= nexprlist */
+-   284,  /* (384) nmnum ::= plus_num */
+-   284,  /* (385) nmnum ::= nm */
+-   284,  /* (386) nmnum ::= ON */
+-   284,  /* (387) nmnum ::= DELETE */
+-   284,  /* (388) nmnum ::= DEFAULT */
+-   211,  /* (389) plus_num ::= INTEGER|FLOAT */
+-   289,  /* (390) foreach_clause ::= */
+-   289,  /* (391) foreach_clause ::= FOR EACH ROW */
+-   292,  /* (392) trnm ::= nm */
+-   293,  /* (393) tridxby ::= */
+-   294,  /* (394) database_kw_opt ::= DATABASE */
+-   294,  /* (395) database_kw_opt ::= */
+-   297,  /* (396) kwcolumn_opt ::= */
+-   297,  /* (397) kwcolumn_opt ::= COLUMNKW */
+-   299,  /* (398) vtabarglist ::= vtabarg */
+-   299,  /* (399) vtabarglist ::= vtabarglist COMMA vtabarg */
+-   300,  /* (400) vtabarg ::= vtabarg vtabargtoken */
+-   303,  /* (401) anylist ::= */
+-   303,  /* (402) anylist ::= anylist LP anylist RP */
+-   303,  /* (403) anylist ::= anylist ANY */
+-   266,  /* (404) with ::= */
++   306,  /* (311) windowdefn_list ::= windowdefn_list COMMA windowdefn */
++   307,  /* (312) windowdefn ::= nm AS LP window RP */
++   308,  /* (313) window ::= PARTITION BY nexprlist orderby_opt frame_opt */
++   308,  /* (314) window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
++   308,  /* (315) window ::= ORDER BY sortlist frame_opt */
++   308,  /* (316) window ::= nm ORDER BY sortlist frame_opt */
++   308,  /* (317) window ::= nm frame_opt */
++   309,  /* (318) frame_opt ::= */
++   309,  /* (319) frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
++   309,  /* (320) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
++   313,  /* (321) range_or_rows ::= RANGE|ROWS|GROUPS */
++   315,  /* (322) frame_bound_s ::= frame_bound */
++   315,  /* (323) frame_bound_s ::= UNBOUNDED PRECEDING */
++   316,  /* (324) frame_bound_e ::= frame_bound */
++   316,  /* (325) frame_bound_e ::= UNBOUNDED FOLLOWING */
++   314,  /* (326) frame_bound ::= expr PRECEDING|FOLLOWING */
++   314,  /* (327) frame_bound ::= CURRENT ROW */
++   317,  /* (328) frame_exclude_opt ::= */
++   317,  /* (329) frame_exclude_opt ::= EXCLUDE frame_exclude */
++   318,  /* (330) frame_exclude ::= NO OTHERS */
++   318,  /* (331) frame_exclude ::= CURRENT ROW */
++   318,  /* (332) frame_exclude ::= GROUP|TIES */
++   251,  /* (333) window_clause ::= WINDOW windowdefn_list */
++   273,  /* (334) filter_over ::= filter_clause over_clause */
++   273,  /* (335) filter_over ::= over_clause */
++   273,  /* (336) filter_over ::= filter_clause */
++   312,  /* (337) over_clause ::= OVER LP window RP */
++   312,  /* (338) over_clause ::= OVER nm */
++   311,  /* (339) filter_clause ::= FILTER LP WHERE expr RP */
++   185,  /* (340) input ::= cmdlist */
++   186,  /* (341) cmdlist ::= cmdlist ecmd */
++   186,  /* (342) cmdlist ::= ecmd */
++   187,  /* (343) ecmd ::= SEMI */
++   187,  /* (344) ecmd ::= cmdx SEMI */
++   187,  /* (345) ecmd ::= explain cmdx SEMI */
++   192,  /* (346) trans_opt ::= */
++   192,  /* (347) trans_opt ::= TRANSACTION */
++   192,  /* (348) trans_opt ::= TRANSACTION nm */
++   194,  /* (349) savepoint_opt ::= SAVEPOINT */
++   194,  /* (350) savepoint_opt ::= */
++   190,  /* (351) cmd ::= create_table create_table_args */
++   203,  /* (352) table_option_set ::= table_option */
++   201,  /* (353) columnlist ::= columnlist COMMA columnname carglist */
++   201,  /* (354) columnlist ::= columnname carglist */
++   193,  /* (355) nm ::= ID|INDEXED|JOIN_KW */
++   193,  /* (356) nm ::= STRING */
++   208,  /* (357) typetoken ::= typename */
++   209,  /* (358) typename ::= ID|STRING */
++   210,  /* (359) signed ::= plus_num */
++   210,  /* (360) signed ::= minus_num */
++   207,  /* (361) carglist ::= carglist ccons */
++   207,  /* (362) carglist ::= */
++   215,  /* (363) ccons ::= NULL onconf */
++   215,  /* (364) ccons ::= GENERATED ALWAYS AS generated */
++   215,  /* (365) ccons ::= AS generated */
++   202,  /* (366) conslist_opt ::= COMMA conslist */
++   228,  /* (367) conslist ::= conslist tconscomma tcons */
++   228,  /* (368) conslist ::= tcons */
++   229,  /* (369) tconscomma ::= */
++   233,  /* (370) defer_subclause_opt ::= defer_subclause */
++   235,  /* (371) resolvetype ::= raisetype */
++   239,  /* (372) selectnowith ::= oneselect */
++   240,  /* (373) oneselect ::= values */
++   254,  /* (374) sclp ::= selcollist COMMA */
++   255,  /* (375) as ::= ID|STRING */
++   264,  /* (376) indexed_opt ::= indexed_by */
++   272,  /* (377) returning ::= */
++   217,  /* (378) expr ::= term */
++   274,  /* (379) likeop ::= LIKE_KW|MATCH */
++   278,  /* (380) case_operand ::= expr */
++   261,  /* (381) exprlist ::= nexprlist */
++   284,  /* (382) nmnum ::= plus_num */
++   284,  /* (383) nmnum ::= nm */
++   284,  /* (384) nmnum ::= ON */
++   284,  /* (385) nmnum ::= DELETE */
++   284,  /* (386) nmnum ::= DEFAULT */
++   211,  /* (387) plus_num ::= INTEGER|FLOAT */
++   289,  /* (388) foreach_clause ::= */
++   289,  /* (389) foreach_clause ::= FOR EACH ROW */
++   292,  /* (390) trnm ::= nm */
++   293,  /* (391) tridxby ::= */
++   294,  /* (392) database_kw_opt ::= DATABASE */
++   294,  /* (393) database_kw_opt ::= */
++   297,  /* (394) kwcolumn_opt ::= */
++   297,  /* (395) kwcolumn_opt ::= COLUMNKW */
++   299,  /* (396) vtabarglist ::= vtabarg */
++   299,  /* (397) vtabarglist ::= vtabarglist COMMA vtabarg */
++   300,  /* (398) vtabarg ::= vtabarg vtabargtoken */
++   303,  /* (399) anylist ::= */
++   303,  /* (400) anylist ::= anylist LP anylist RP */
++   303,  /* (401) anylist ::= anylist ANY */
++   266,  /* (402) with ::= */
++   306,  /* (403) windowdefn_list ::= windowdefn */
++   308,  /* (404) window ::= frame_opt */
+ };
+ 
+ /* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
+@@ -166838,59 +174386,59 @@ static const signed char yyRuleInfoNRhs[] = {
+    -3,  /* (175) idlist ::= idlist COMMA nm */
+    -1,  /* (176) idlist ::= nm */
+    -3,  /* (177) expr ::= LP expr RP */
+-   -1,  /* (178) expr ::= ID|INDEXED */
+-   -1,  /* (179) expr ::= JOIN_KW */
+-   -3,  /* (180) expr ::= nm DOT nm */
+-   -5,  /* (181) expr ::= nm DOT nm DOT nm */
+-   -1,  /* (182) term ::= NULL|FLOAT|BLOB */
+-   -1,  /* (183) term ::= STRING */
+-   -1,  /* (184) term ::= INTEGER */
+-   -1,  /* (185) expr ::= VARIABLE */
+-   -3,  /* (186) expr ::= expr COLLATE ID|STRING */
+-   -6,  /* (187) expr ::= CAST LP expr AS typetoken RP */
+-   -5,  /* (188) expr ::= ID|INDEXED LP distinct exprlist RP */
+-   -4,  /* (189) expr ::= ID|INDEXED LP STAR RP */
+-   -6,  /* (190) expr ::= ID|INDEXED LP distinct exprlist RP filter_over */
+-   -5,  /* (191) expr ::= ID|INDEXED LP STAR RP filter_over */
+-   -1,  /* (192) term ::= CTIME_KW */
+-   -5,  /* (193) expr ::= LP nexprlist COMMA expr RP */
+-   -3,  /* (194) expr ::= expr AND expr */
+-   -3,  /* (195) expr ::= expr OR expr */
+-   -3,  /* (196) expr ::= expr LT|GT|GE|LE expr */
+-   -3,  /* (197) expr ::= expr EQ|NE expr */
+-   -3,  /* (198) expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */
+-   -3,  /* (199) expr ::= expr PLUS|MINUS expr */
+-   -3,  /* (200) expr ::= expr STAR|SLASH|REM expr */
+-   -3,  /* (201) expr ::= expr CONCAT expr */
+-   -2,  /* (202) likeop ::= NOT LIKE_KW|MATCH */
+-   -3,  /* (203) expr ::= expr likeop expr */
+-   -5,  /* (204) expr ::= expr likeop expr ESCAPE expr */
+-   -2,  /* (205) expr ::= expr ISNULL|NOTNULL */
+-   -3,  /* (206) expr ::= expr NOT NULL */
+-   -3,  /* (207) expr ::= expr IS expr */
+-   -4,  /* (208) expr ::= expr IS NOT expr */
+-   -6,  /* (209) expr ::= expr IS NOT DISTINCT FROM expr */
+-   -5,  /* (210) expr ::= expr IS DISTINCT FROM expr */
+-   -2,  /* (211) expr ::= NOT expr */
+-   -2,  /* (212) expr ::= BITNOT expr */
+-   -2,  /* (213) expr ::= PLUS|MINUS expr */
+-   -3,  /* (214) expr ::= expr PTR expr */
+-   -1,  /* (215) between_op ::= BETWEEN */
+-   -2,  /* (216) between_op ::= NOT BETWEEN */
+-   -5,  /* (217) expr ::= expr between_op expr AND expr */
+-   -1,  /* (218) in_op ::= IN */
+-   -2,  /* (219) in_op ::= NOT IN */
+-   -5,  /* (220) expr ::= expr in_op LP exprlist RP */
+-   -3,  /* (221) expr ::= LP select RP */
+-   -5,  /* (222) expr ::= expr in_op LP select RP */
+-   -5,  /* (223) expr ::= expr in_op nm dbnm paren_exprlist */
+-   -4,  /* (224) expr ::= EXISTS LP select RP */
+-   -5,  /* (225) expr ::= CASE case_operand case_exprlist case_else END */
+-   -5,  /* (226) case_exprlist ::= case_exprlist WHEN expr THEN expr */
+-   -4,  /* (227) case_exprlist ::= WHEN expr THEN expr */
+-   -2,  /* (228) case_else ::= ELSE expr */
+-    0,  /* (229) case_else ::= */
+-   -1,  /* (230) case_operand ::= expr */
++   -1,  /* (178) expr ::= ID|INDEXED|JOIN_KW */
++   -3,  /* (179) expr ::= nm DOT nm */
++   -5,  /* (180) expr ::= nm DOT nm DOT nm */
++   -1,  /* (181) term ::= NULL|FLOAT|BLOB */
++   -1,  /* (182) term ::= STRING */
++   -1,  /* (183) term ::= INTEGER */
++   -1,  /* (184) expr ::= VARIABLE */
++   -3,  /* (185) expr ::= expr COLLATE ID|STRING */
++   -6,  /* (186) expr ::= CAST LP expr AS typetoken RP */
++   -5,  /* (187) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP */
++   -8,  /* (188) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP */
++   -4,  /* (189) expr ::= ID|INDEXED|JOIN_KW LP STAR RP */
++   -6,  /* (190) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP filter_over */
++   -9,  /* (191) expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP filter_over */
++   -5,  /* (192) expr ::= ID|INDEXED|JOIN_KW LP STAR RP filter_over */
++   -1,  /* (193) term ::= CTIME_KW */
++   -5,  /* (194) expr ::= LP nexprlist COMMA expr RP */
++   -3,  /* (195) expr ::= expr AND expr */
++   -3,  /* (196) expr ::= expr OR expr */
++   -3,  /* (197) expr ::= expr LT|GT|GE|LE expr */
++   -3,  /* (198) expr ::= expr EQ|NE expr */
++   -3,  /* (199) expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */
++   -3,  /* (200) expr ::= expr PLUS|MINUS expr */
++   -3,  /* (201) expr ::= expr STAR|SLASH|REM expr */
++   -3,  /* (202) expr ::= expr CONCAT expr */
++   -2,  /* (203) likeop ::= NOT LIKE_KW|MATCH */
++   -3,  /* (204) expr ::= expr likeop expr */
++   -5,  /* (205) expr ::= expr likeop expr ESCAPE expr */
++   -2,  /* (206) expr ::= expr ISNULL|NOTNULL */
++   -3,  /* (207) expr ::= expr NOT NULL */
++   -3,  /* (208) expr ::= expr IS expr */
++   -4,  /* (209) expr ::= expr IS NOT expr */
++   -6,  /* (210) expr ::= expr IS NOT DISTINCT FROM expr */
++   -5,  /* (211) expr ::= expr IS DISTINCT FROM expr */
++   -2,  /* (212) expr ::= NOT expr */
++   -2,  /* (213) expr ::= BITNOT expr */
++   -2,  /* (214) expr ::= PLUS|MINUS expr */
++   -3,  /* (215) expr ::= expr PTR expr */
++   -1,  /* (216) between_op ::= BETWEEN */
++   -2,  /* (217) between_op ::= NOT BETWEEN */
++   -5,  /* (218) expr ::= expr between_op expr AND expr */
++   -1,  /* (219) in_op ::= IN */
++   -2,  /* (220) in_op ::= NOT IN */
++   -5,  /* (221) expr ::= expr in_op LP exprlist RP */
++   -3,  /* (222) expr ::= LP select RP */
++   -5,  /* (223) expr ::= expr in_op LP select RP */
++   -5,  /* (224) expr ::= expr in_op nm dbnm paren_exprlist */
++   -4,  /* (225) expr ::= EXISTS LP select RP */
++   -5,  /* (226) expr ::= CASE case_operand case_exprlist case_else END */
++   -5,  /* (227) case_exprlist ::= case_exprlist WHEN expr THEN expr */
++   -4,  /* (228) case_exprlist ::= WHEN expr THEN expr */
++   -2,  /* (229) case_else ::= ELSE expr */
++    0,  /* (230) case_else ::= */
+     0,  /* (231) case_operand ::= */
+     0,  /* (232) exprlist ::= */
+    -3,  /* (233) nexprlist ::= nexprlist COMMA expr */
+@@ -166971,100 +174519,100 @@ static const signed char yyRuleInfoNRhs[] = {
+    -6,  /* (308) wqitem ::= nm eidlist_opt wqas LP select RP */
+    -1,  /* (309) wqlist ::= wqitem */
+    -3,  /* (310) wqlist ::= wqlist COMMA wqitem */
+-   -1,  /* (311) windowdefn_list ::= windowdefn */
+-   -3,  /* (312) windowdefn_list ::= windowdefn_list COMMA windowdefn */
+-   -5,  /* (313) windowdefn ::= nm AS LP window RP */
+-   -5,  /* (314) window ::= PARTITION BY nexprlist orderby_opt frame_opt */
+-   -6,  /* (315) window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
+-   -4,  /* (316) window ::= ORDER BY sortlist frame_opt */
+-   -5,  /* (317) window ::= nm ORDER BY sortlist frame_opt */
+-   -1,  /* (318) window ::= frame_opt */
+-   -2,  /* (319) window ::= nm frame_opt */
+-    0,  /* (320) frame_opt ::= */
+-   -3,  /* (321) frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
+-   -6,  /* (322) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
+-   -1,  /* (323) range_or_rows ::= RANGE|ROWS|GROUPS */
+-   -1,  /* (324) frame_bound_s ::= frame_bound */
+-   -2,  /* (325) frame_bound_s ::= UNBOUNDED PRECEDING */
+-   -1,  /* (326) frame_bound_e ::= frame_bound */
+-   -2,  /* (327) frame_bound_e ::= UNBOUNDED FOLLOWING */
+-   -2,  /* (328) frame_bound ::= expr PRECEDING|FOLLOWING */
+-   -2,  /* (329) frame_bound ::= CURRENT ROW */
+-    0,  /* (330) frame_exclude_opt ::= */
+-   -2,  /* (331) frame_exclude_opt ::= EXCLUDE frame_exclude */
+-   -2,  /* (332) frame_exclude ::= NO OTHERS */
+-   -2,  /* (333) frame_exclude ::= CURRENT ROW */
+-   -1,  /* (334) frame_exclude ::= GROUP|TIES */
+-   -2,  /* (335) window_clause ::= WINDOW windowdefn_list */
+-   -2,  /* (336) filter_over ::= filter_clause over_clause */
+-   -1,  /* (337) filter_over ::= over_clause */
+-   -1,  /* (338) filter_over ::= filter_clause */
+-   -4,  /* (339) over_clause ::= OVER LP window RP */
+-   -2,  /* (340) over_clause ::= OVER nm */
+-   -5,  /* (341) filter_clause ::= FILTER LP WHERE expr RP */
+-   -1,  /* (342) input ::= cmdlist */
+-   -2,  /* (343) cmdlist ::= cmdlist ecmd */
+-   -1,  /* (344) cmdlist ::= ecmd */
+-   -1,  /* (345) ecmd ::= SEMI */
+-   -2,  /* (346) ecmd ::= cmdx SEMI */
+-   -3,  /* (347) ecmd ::= explain cmdx SEMI */
+-    0,  /* (348) trans_opt ::= */
+-   -1,  /* (349) trans_opt ::= TRANSACTION */
+-   -2,  /* (350) trans_opt ::= TRANSACTION nm */
+-   -1,  /* (351) savepoint_opt ::= SAVEPOINT */
+-    0,  /* (352) savepoint_opt ::= */
+-   -2,  /* (353) cmd ::= create_table create_table_args */
+-   -1,  /* (354) table_option_set ::= table_option */
+-   -4,  /* (355) columnlist ::= columnlist COMMA columnname carglist */
+-   -2,  /* (356) columnlist ::= columnname carglist */
+-   -1,  /* (357) nm ::= ID|INDEXED */
+-   -1,  /* (358) nm ::= STRING */
+-   -1,  /* (359) nm ::= JOIN_KW */
+-   -1,  /* (360) typetoken ::= typename */
+-   -1,  /* (361) typename ::= ID|STRING */
+-   -1,  /* (362) signed ::= plus_num */
+-   -1,  /* (363) signed ::= minus_num */
+-   -2,  /* (364) carglist ::= carglist ccons */
+-    0,  /* (365) carglist ::= */
+-   -2,  /* (366) ccons ::= NULL onconf */
+-   -4,  /* (367) ccons ::= GENERATED ALWAYS AS generated */
+-   -2,  /* (368) ccons ::= AS generated */
+-   -2,  /* (369) conslist_opt ::= COMMA conslist */
+-   -3,  /* (370) conslist ::= conslist tconscomma tcons */
+-   -1,  /* (371) conslist ::= tcons */
+-    0,  /* (372) tconscomma ::= */
+-   -1,  /* (373) defer_subclause_opt ::= defer_subclause */
+-   -1,  /* (374) resolvetype ::= raisetype */
+-   -1,  /* (375) selectnowith ::= oneselect */
+-   -1,  /* (376) oneselect ::= values */
+-   -2,  /* (377) sclp ::= selcollist COMMA */
+-   -1,  /* (378) as ::= ID|STRING */
+-   -1,  /* (379) indexed_opt ::= indexed_by */
+-    0,  /* (380) returning ::= */
+-   -1,  /* (381) expr ::= term */
+-   -1,  /* (382) likeop ::= LIKE_KW|MATCH */
+-   -1,  /* (383) exprlist ::= nexprlist */
+-   -1,  /* (384) nmnum ::= plus_num */
+-   -1,  /* (385) nmnum ::= nm */
+-   -1,  /* (386) nmnum ::= ON */
+-   -1,  /* (387) nmnum ::= DELETE */
+-   -1,  /* (388) nmnum ::= DEFAULT */
+-   -1,  /* (389) plus_num ::= INTEGER|FLOAT */
+-    0,  /* (390) foreach_clause ::= */
+-   -3,  /* (391) foreach_clause ::= FOR EACH ROW */
+-   -1,  /* (392) trnm ::= nm */
+-    0,  /* (393) tridxby ::= */
+-   -1,  /* (394) database_kw_opt ::= DATABASE */
+-    0,  /* (395) database_kw_opt ::= */
+-    0,  /* (396) kwcolumn_opt ::= */
+-   -1,  /* (397) kwcolumn_opt ::= COLUMNKW */
+-   -1,  /* (398) vtabarglist ::= vtabarg */
+-   -3,  /* (399) vtabarglist ::= vtabarglist COMMA vtabarg */
+-   -2,  /* (400) vtabarg ::= vtabarg vtabargtoken */
+-    0,  /* (401) anylist ::= */
+-   -4,  /* (402) anylist ::= anylist LP anylist RP */
+-   -2,  /* (403) anylist ::= anylist ANY */
+-    0,  /* (404) with ::= */
++   -3,  /* (311) windowdefn_list ::= windowdefn_list COMMA windowdefn */
++   -5,  /* (312) windowdefn ::= nm AS LP window RP */
++   -5,  /* (313) window ::= PARTITION BY nexprlist orderby_opt frame_opt */
++   -6,  /* (314) window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
++   -4,  /* (315) window ::= ORDER BY sortlist frame_opt */
++   -5,  /* (316) window ::= nm ORDER BY sortlist frame_opt */
++   -2,  /* (317) window ::= nm frame_opt */
++    0,  /* (318) frame_opt ::= */
++   -3,  /* (319) frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
++   -6,  /* (320) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
++   -1,  /* (321) range_or_rows ::= RANGE|ROWS|GROUPS */
++   -1,  /* (322) frame_bound_s ::= frame_bound */
++   -2,  /* (323) frame_bound_s ::= UNBOUNDED PRECEDING */
++   -1,  /* (324) frame_bound_e ::= frame_bound */
++   -2,  /* (325) frame_bound_e ::= UNBOUNDED FOLLOWING */
++   -2,  /* (326) frame_bound ::= expr PRECEDING|FOLLOWING */
++   -2,  /* (327) frame_bound ::= CURRENT ROW */
++    0,  /* (328) frame_exclude_opt ::= */
++   -2,  /* (329) frame_exclude_opt ::= EXCLUDE frame_exclude */
++   -2,  /* (330) frame_exclude ::= NO OTHERS */
++   -2,  /* (331) frame_exclude ::= CURRENT ROW */
++   -1,  /* (332) frame_exclude ::= GROUP|TIES */
++   -2,  /* (333) window_clause ::= WINDOW windowdefn_list */
++   -2,  /* (334) filter_over ::= filter_clause over_clause */
++   -1,  /* (335) filter_over ::= over_clause */
++   -1,  /* (336) filter_over ::= filter_clause */
++   -4,  /* (337) over_clause ::= OVER LP window RP */
++   -2,  /* (338) over_clause ::= OVER nm */
++   -5,  /* (339) filter_clause ::= FILTER LP WHERE expr RP */
++   -1,  /* (340) input ::= cmdlist */
++   -2,  /* (341) cmdlist ::= cmdlist ecmd */
++   -1,  /* (342) cmdlist ::= ecmd */
++   -1,  /* (343) ecmd ::= SEMI */
++   -2,  /* (344) ecmd ::= cmdx SEMI */
++   -3,  /* (345) ecmd ::= explain cmdx SEMI */
++    0,  /* (346) trans_opt ::= */
++   -1,  /* (347) trans_opt ::= TRANSACTION */
++   -2,  /* (348) trans_opt ::= TRANSACTION nm */
++   -1,  /* (349) savepoint_opt ::= SAVEPOINT */
++    0,  /* (350) savepoint_opt ::= */
++   -2,  /* (351) cmd ::= create_table create_table_args */
++   -1,  /* (352) table_option_set ::= table_option */
++   -4,  /* (353) columnlist ::= columnlist COMMA columnname carglist */
++   -2,  /* (354) columnlist ::= columnname carglist */
++   -1,  /* (355) nm ::= ID|INDEXED|JOIN_KW */
++   -1,  /* (356) nm ::= STRING */
++   -1,  /* (357) typetoken ::= typename */
++   -1,  /* (358) typename ::= ID|STRING */
++   -1,  /* (359) signed ::= plus_num */
++   -1,  /* (360) signed ::= minus_num */
++   -2,  /* (361) carglist ::= carglist ccons */
++    0,  /* (362) carglist ::= */
++   -2,  /* (363) ccons ::= NULL onconf */
++   -4,  /* (364) ccons ::= GENERATED ALWAYS AS generated */
++   -2,  /* (365) ccons ::= AS generated */
++   -2,  /* (366) conslist_opt ::= COMMA conslist */
++   -3,  /* (367) conslist ::= conslist tconscomma tcons */
++   -1,  /* (368) conslist ::= tcons */
++    0,  /* (369) tconscomma ::= */
++   -1,  /* (370) defer_subclause_opt ::= defer_subclause */
++   -1,  /* (371) resolvetype ::= raisetype */
++   -1,  /* (372) selectnowith ::= oneselect */
++   -1,  /* (373) oneselect ::= values */
++   -2,  /* (374) sclp ::= selcollist COMMA */
++   -1,  /* (375) as ::= ID|STRING */
++   -1,  /* (376) indexed_opt ::= indexed_by */
++    0,  /* (377) returning ::= */
++   -1,  /* (378) expr ::= term */
++   -1,  /* (379) likeop ::= LIKE_KW|MATCH */
++   -1,  /* (380) case_operand ::= expr */
++   -1,  /* (381) exprlist ::= nexprlist */
++   -1,  /* (382) nmnum ::= plus_num */
++   -1,  /* (383) nmnum ::= nm */
++   -1,  /* (384) nmnum ::= ON */
++   -1,  /* (385) nmnum ::= DELETE */
++   -1,  /* (386) nmnum ::= DEFAULT */
++   -1,  /* (387) plus_num ::= INTEGER|FLOAT */
++    0,  /* (388) foreach_clause ::= */
++   -3,  /* (389) foreach_clause ::= FOR EACH ROW */
++   -1,  /* (390) trnm ::= nm */
++    0,  /* (391) tridxby ::= */
++   -1,  /* (392) database_kw_opt ::= DATABASE */
++    0,  /* (393) database_kw_opt ::= */
++    0,  /* (394) kwcolumn_opt ::= */
++   -1,  /* (395) kwcolumn_opt ::= COLUMNKW */
++   -1,  /* (396) vtabarglist ::= vtabarg */
++   -3,  /* (397) vtabarglist ::= vtabarglist COMMA vtabarg */
++   -2,  /* (398) vtabarg ::= vtabarg vtabargtoken */
++    0,  /* (399) anylist ::= */
++   -4,  /* (400) anylist ::= anylist LP anylist RP */
++   -2,  /* (401) anylist ::= anylist ANY */
++    0,  /* (402) with ::= */
++   -1,  /* (403) windowdefn_list ::= windowdefn */
++   -1,  /* (404) window ::= frame_opt */
+ };
+ 
+ static void yy_accept(yyParser*);  /* Forward Declaration */
+@@ -167107,10 +174655,10 @@ static YYACTIONTYPE yy_reduce(
+ /********** Begin reduce actions **********************************************/
+         YYMINORTYPE yylhsminor;
+       case 0: /* explain ::= EXPLAIN */
+-{ pParse->explain = 1; }
++{ if( pParse->pReprepare==0 ) pParse->explain = 1; }
+         break;
+       case 1: /* explain ::= EXPLAIN QUERY PLAN */
+-{ pParse->explain = 2; }
++{ if( pParse->pReprepare==0 ) pParse->explain = 2; }
+         break;
+       case 2: /* cmdx ::= cmd */
+ { sqlite3FinishCoding(pParse); }
+@@ -167124,7 +174672,7 @@ static YYACTIONTYPE yy_reduce(
+       case 5: /* transtype ::= DEFERRED */
+       case 6: /* transtype ::= IMMEDIATE */ yytestcase(yyruleno==6);
+       case 7: /* transtype ::= EXCLUSIVE */ yytestcase(yyruleno==7);
+-      case 323: /* range_or_rows ::= RANGE|ROWS|GROUPS */ yytestcase(yyruleno==323);
++      case 321: /* range_or_rows ::= RANGE|ROWS|GROUPS */ yytestcase(yyruleno==321);
+ {yymsp[0].minor.yy394 = yymsp[0].major; /*A-overwrites-X*/}
+         break;
+       case 8: /* cmd ::= COMMIT|END trans_opt */
+@@ -167345,8 +174893,8 @@ static YYACTIONTYPE yy_reduce(
+         break;
+       case 63: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */
+       case 80: /* ifexists ::= IF EXISTS */ yytestcase(yyruleno==80);
+-      case 216: /* between_op ::= NOT BETWEEN */ yytestcase(yyruleno==216);
+-      case 219: /* in_op ::= NOT IN */ yytestcase(yyruleno==219);
++      case 217: /* between_op ::= NOT BETWEEN */ yytestcase(yyruleno==217);
++      case 220: /* in_op ::= NOT IN */ yytestcase(yyruleno==220);
+       case 245: /* collate ::= COLLATE ID|STRING */ yytestcase(yyruleno==245);
+ {yymsp[-1].minor.yy394 = 1;}
+         break;
+@@ -167420,7 +174968,6 @@ static YYACTIONTYPE yy_reduce(
+   if( p ){
+     parserDoubleLinkSelect(pParse, p);
+   }
+-  yymsp[0].minor.yy47 = p; /*A-overwrites-X*/
+ }
+         break;
+       case 88: /* selectnowith ::= selectnowith multiselect_op oneselect */
+@@ -167512,14 +175059,17 @@ static YYACTIONTYPE yy_reduce(
+       case 101: /* selcollist ::= sclp scanpt STAR */
+ {
+   Expr *p = sqlite3Expr(pParse->db, TK_ASTERISK, 0);
++  sqlite3ExprSetErrorOffset(p, (int)(yymsp[0].minor.yy0.z - pParse->zTail));
+   yymsp[-2].minor.yy322 = sqlite3ExprListAppend(pParse, yymsp[-2].minor.yy322, p);
+ }
+         break;
+       case 102: /* selcollist ::= sclp scanpt nm DOT STAR */
+ {
+-  Expr *pRight = sqlite3PExpr(pParse, TK_ASTERISK, 0, 0);
+-  Expr *pLeft = tokenExpr(pParse, TK_ID, yymsp[-2].minor.yy0);
+-  Expr *pDot = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight);
++  Expr *pRight, *pLeft, *pDot;
++  pRight = sqlite3PExpr(pParse, TK_ASTERISK, 0, 0);
++  sqlite3ExprSetErrorOffset(pRight, (int)(yymsp[0].minor.yy0.z - pParse->zTail));
++  pLeft = tokenExpr(pParse, TK_ID, yymsp[-2].minor.yy0);
++  pDot = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight);
+   yymsp[-4].minor.yy322 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy322, pDot);
+ }
+         break;
+@@ -167570,7 +175120,7 @@ static YYACTIONTYPE yy_reduce(
+ {
+     if( yymsp[-5].minor.yy131==0 && yymsp[-1].minor.yy0.n==0 && yymsp[0].minor.yy561.pOn==0 && yymsp[0].minor.yy561.pUsing==0 ){
+       yymsp[-5].minor.yy131 = yymsp[-3].minor.yy131;
+-    }else if( yymsp[-3].minor.yy131->nSrc==1 ){
++    }else if( ALWAYS(yymsp[-3].minor.yy131!=0) && yymsp[-3].minor.yy131->nSrc==1 ){
+       yymsp[-5].minor.yy131 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-5].minor.yy131,0,0,&yymsp[-1].minor.yy0,0,&yymsp[0].minor.yy561);
+       if( yymsp[-5].minor.yy131 ){
+         SrcItem *pNew = &yymsp[-5].minor.yy131->a[yymsp[-5].minor.yy131->nSrc-1];
+@@ -167698,7 +175248,7 @@ static YYACTIONTYPE yy_reduce(
+       case 146: /* limit_opt ::= */ yytestcase(yyruleno==146);
+       case 151: /* where_opt ::= */ yytestcase(yyruleno==151);
+       case 153: /* where_opt_ret ::= */ yytestcase(yyruleno==153);
+-      case 229: /* case_else ::= */ yytestcase(yyruleno==229);
++      case 230: /* case_else ::= */ yytestcase(yyruleno==230);
+       case 231: /* case_operand ::= */ yytestcase(yyruleno==231);
+       case 250: /* vinto ::= */ yytestcase(yyruleno==250);
+ {yymsp[1].minor.yy528 = 0;}
+@@ -167706,7 +175256,7 @@ static YYACTIONTYPE yy_reduce(
+       case 145: /* having_opt ::= HAVING expr */
+       case 152: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==152);
+       case 154: /* where_opt_ret ::= WHERE expr */ yytestcase(yyruleno==154);
+-      case 228: /* case_else ::= ELSE expr */ yytestcase(yyruleno==228);
++      case 229: /* case_else ::= ELSE expr */ yytestcase(yyruleno==229);
+       case 249: /* vinto ::= INTO expr */ yytestcase(yyruleno==249);
+ {yymsp[-1].minor.yy528 = yymsp[0].minor.yy528;}
+         break;
+@@ -167819,11 +175369,10 @@ static YYACTIONTYPE yy_reduce(
+       case 177: /* expr ::= LP expr RP */
+ {yymsp[-2].minor.yy528 = yymsp[-1].minor.yy528;}
+         break;
+-      case 178: /* expr ::= ID|INDEXED */
+-      case 179: /* expr ::= JOIN_KW */ yytestcase(yyruleno==179);
++      case 178: /* expr ::= ID|INDEXED|JOIN_KW */
+ {yymsp[0].minor.yy528=tokenExpr(pParse,TK_ID,yymsp[0].minor.yy0); /*A-overwrites-X*/}
+         break;
+-      case 180: /* expr ::= nm DOT nm */
++      case 179: /* expr ::= nm DOT nm */
+ {
+   Expr *temp1 = tokenExpr(pParse,TK_ID,yymsp[-2].minor.yy0);
+   Expr *temp2 = tokenExpr(pParse,TK_ID,yymsp[0].minor.yy0);
+@@ -167831,7 +175380,7 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-2].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 181: /* expr ::= nm DOT nm DOT nm */
++      case 180: /* expr ::= nm DOT nm DOT nm */
+ {
+   Expr *temp1 = tokenExpr(pParse,TK_ID,yymsp[-4].minor.yy0);
+   Expr *temp2 = tokenExpr(pParse,TK_ID,yymsp[-2].minor.yy0);
+@@ -167844,18 +175393,18 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-4].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 182: /* term ::= NULL|FLOAT|BLOB */
+-      case 183: /* term ::= STRING */ yytestcase(yyruleno==183);
++      case 181: /* term ::= NULL|FLOAT|BLOB */
++      case 182: /* term ::= STRING */ yytestcase(yyruleno==182);
+ {yymsp[0].minor.yy528=tokenExpr(pParse,yymsp[0].major,yymsp[0].minor.yy0); /*A-overwrites-X*/}
+         break;
+-      case 184: /* term ::= INTEGER */
++      case 183: /* term ::= INTEGER */
+ {
+   yylhsminor.yy528 = sqlite3ExprAlloc(pParse->db, TK_INTEGER, &yymsp[0].minor.yy0, 1);
+   if( yylhsminor.yy528 ) yylhsminor.yy528->w.iOfst = (int)(yymsp[0].minor.yy0.z - pParse->zTail);
+ }
+   yymsp[0].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 185: /* expr ::= VARIABLE */
++      case 184: /* expr ::= VARIABLE */
+ {
+   if( !(yymsp[0].minor.yy0.z[0]=='#' && sqlite3Isdigit(yymsp[0].minor.yy0.z[1])) ){
+     u32 n = yymsp[0].minor.yy0.n;
+@@ -167877,50 +175426,65 @@ static YYACTIONTYPE yy_reduce(
+   }
+ }
+         break;
+-      case 186: /* expr ::= expr COLLATE ID|STRING */
++      case 185: /* expr ::= expr COLLATE ID|STRING */
+ {
+   yymsp[-2].minor.yy528 = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy528, &yymsp[0].minor.yy0, 1);
+ }
+         break;
+-      case 187: /* expr ::= CAST LP expr AS typetoken RP */
++      case 186: /* expr ::= CAST LP expr AS typetoken RP */
+ {
+   yymsp[-5].minor.yy528 = sqlite3ExprAlloc(pParse->db, TK_CAST, &yymsp[-1].minor.yy0, 1);
+   sqlite3ExprAttachSubtrees(pParse->db, yymsp[-5].minor.yy528, yymsp[-3].minor.yy528, 0);
+ }
+         break;
+-      case 188: /* expr ::= ID|INDEXED LP distinct exprlist RP */
++      case 187: /* expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP */
+ {
+   yylhsminor.yy528 = sqlite3ExprFunction(pParse, yymsp[-1].minor.yy322, &yymsp[-4].minor.yy0, yymsp[-2].minor.yy394);
+ }
+   yymsp[-4].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 189: /* expr ::= ID|INDEXED LP STAR RP */
++      case 188: /* expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP */
++{
++  yylhsminor.yy528 = sqlite3ExprFunction(pParse, yymsp[-4].minor.yy322, &yymsp[-7].minor.yy0, yymsp[-5].minor.yy394);
++  sqlite3ExprAddFunctionOrderBy(pParse, yylhsminor.yy528, yymsp[-1].minor.yy322);
++}
++  yymsp[-7].minor.yy528 = yylhsminor.yy528;
++        break;
++      case 189: /* expr ::= ID|INDEXED|JOIN_KW LP STAR RP */
+ {
+   yylhsminor.yy528 = sqlite3ExprFunction(pParse, 0, &yymsp[-3].minor.yy0, 0);
+ }
+   yymsp[-3].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 190: /* expr ::= ID|INDEXED LP distinct exprlist RP filter_over */
++      case 190: /* expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist RP filter_over */
+ {
+   yylhsminor.yy528 = sqlite3ExprFunction(pParse, yymsp[-2].minor.yy322, &yymsp[-5].minor.yy0, yymsp[-3].minor.yy394);
+   sqlite3WindowAttach(pParse, yylhsminor.yy528, yymsp[0].minor.yy41);
+ }
+   yymsp[-5].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 191: /* expr ::= ID|INDEXED LP STAR RP filter_over */
++      case 191: /* expr ::= ID|INDEXED|JOIN_KW LP distinct exprlist ORDER BY sortlist RP filter_over */
++{
++  yylhsminor.yy528 = sqlite3ExprFunction(pParse, yymsp[-5].minor.yy322, &yymsp[-8].minor.yy0, yymsp[-6].minor.yy394);
++  sqlite3WindowAttach(pParse, yylhsminor.yy528, yymsp[0].minor.yy41);
++  sqlite3ExprAddFunctionOrderBy(pParse, yylhsminor.yy528, yymsp[-2].minor.yy322);
++}
++  yymsp[-8].minor.yy528 = yylhsminor.yy528;
++        break;
++      case 192: /* expr ::= ID|INDEXED|JOIN_KW LP STAR RP filter_over */
+ {
+   yylhsminor.yy528 = sqlite3ExprFunction(pParse, 0, &yymsp[-4].minor.yy0, 0);
+   sqlite3WindowAttach(pParse, yylhsminor.yy528, yymsp[0].minor.yy41);
+ }
+   yymsp[-4].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 192: /* term ::= CTIME_KW */
++      case 193: /* term ::= CTIME_KW */
+ {
+   yylhsminor.yy528 = sqlite3ExprFunction(pParse, 0, &yymsp[0].minor.yy0, 0);
+ }
+   yymsp[0].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 193: /* expr ::= LP nexprlist COMMA expr RP */
++      case 194: /* expr ::= LP nexprlist COMMA expr RP */
+ {
+   ExprList *pList = sqlite3ExprListAppend(pParse, yymsp[-3].minor.yy322, yymsp[-1].minor.yy528);
+   yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_VECTOR, 0, 0);
+@@ -167934,22 +175498,22 @@ static YYACTIONTYPE yy_reduce(
+   }
+ }
+         break;
+-      case 194: /* expr ::= expr AND expr */
++      case 195: /* expr ::= expr AND expr */
+ {yymsp[-2].minor.yy528=sqlite3ExprAnd(pParse,yymsp[-2].minor.yy528,yymsp[0].minor.yy528);}
+         break;
+-      case 195: /* expr ::= expr OR expr */
+-      case 196: /* expr ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==196);
+-      case 197: /* expr ::= expr EQ|NE expr */ yytestcase(yyruleno==197);
+-      case 198: /* expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==198);
+-      case 199: /* expr ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==199);
+-      case 200: /* expr ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==200);
+-      case 201: /* expr ::= expr CONCAT expr */ yytestcase(yyruleno==201);
++      case 196: /* expr ::= expr OR expr */
++      case 197: /* expr ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==197);
++      case 198: /* expr ::= expr EQ|NE expr */ yytestcase(yyruleno==198);
++      case 199: /* expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==199);
++      case 200: /* expr ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==200);
++      case 201: /* expr ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==201);
++      case 202: /* expr ::= expr CONCAT expr */ yytestcase(yyruleno==202);
+ {yymsp[-2].minor.yy528=sqlite3PExpr(pParse,yymsp[-1].major,yymsp[-2].minor.yy528,yymsp[0].minor.yy528);}
+         break;
+-      case 202: /* likeop ::= NOT LIKE_KW|MATCH */
++      case 203: /* likeop ::= NOT LIKE_KW|MATCH */
+ {yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n|=0x80000000; /*yymsp[-1].minor.yy0-overwrite-yymsp[0].minor.yy0*/}
+         break;
+-      case 203: /* expr ::= expr likeop expr */
++      case 204: /* expr ::= expr likeop expr */
+ {
+   ExprList *pList;
+   int bNot = yymsp[-1].minor.yy0.n & 0x80000000;
+@@ -167961,7 +175525,7 @@ static YYACTIONTYPE yy_reduce(
+   if( yymsp[-2].minor.yy528 ) yymsp[-2].minor.yy528->flags |= EP_InfixFunc;
+ }
+         break;
+-      case 204: /* expr ::= expr likeop expr ESCAPE expr */
++      case 205: /* expr ::= expr likeop expr ESCAPE expr */
+ {
+   ExprList *pList;
+   int bNot = yymsp[-3].minor.yy0.n & 0x80000000;
+@@ -167974,47 +175538,47 @@ static YYACTIONTYPE yy_reduce(
+   if( yymsp[-4].minor.yy528 ) yymsp[-4].minor.yy528->flags |= EP_InfixFunc;
+ }
+         break;
+-      case 205: /* expr ::= expr ISNULL|NOTNULL */
++      case 206: /* expr ::= expr ISNULL|NOTNULL */
+ {yymsp[-1].minor.yy528 = sqlite3PExpr(pParse,yymsp[0].major,yymsp[-1].minor.yy528,0);}
+         break;
+-      case 206: /* expr ::= expr NOT NULL */
++      case 207: /* expr ::= expr NOT NULL */
+ {yymsp[-2].minor.yy528 = sqlite3PExpr(pParse,TK_NOTNULL,yymsp[-2].minor.yy528,0);}
+         break;
+-      case 207: /* expr ::= expr IS expr */
++      case 208: /* expr ::= expr IS expr */
+ {
+   yymsp[-2].minor.yy528 = sqlite3PExpr(pParse,TK_IS,yymsp[-2].minor.yy528,yymsp[0].minor.yy528);
+   binaryToUnaryIfNull(pParse, yymsp[0].minor.yy528, yymsp[-2].minor.yy528, TK_ISNULL);
+ }
+         break;
+-      case 208: /* expr ::= expr IS NOT expr */
++      case 209: /* expr ::= expr IS NOT expr */
+ {
+   yymsp[-3].minor.yy528 = sqlite3PExpr(pParse,TK_ISNOT,yymsp[-3].minor.yy528,yymsp[0].minor.yy528);
+   binaryToUnaryIfNull(pParse, yymsp[0].minor.yy528, yymsp[-3].minor.yy528, TK_NOTNULL);
+ }
+         break;
+-      case 209: /* expr ::= expr IS NOT DISTINCT FROM expr */
++      case 210: /* expr ::= expr IS NOT DISTINCT FROM expr */
+ {
+   yymsp[-5].minor.yy528 = sqlite3PExpr(pParse,TK_IS,yymsp[-5].minor.yy528,yymsp[0].minor.yy528);
+   binaryToUnaryIfNull(pParse, yymsp[0].minor.yy528, yymsp[-5].minor.yy528, TK_ISNULL);
+ }
+         break;
+-      case 210: /* expr ::= expr IS DISTINCT FROM expr */
++      case 211: /* expr ::= expr IS DISTINCT FROM expr */
+ {
+   yymsp[-4].minor.yy528 = sqlite3PExpr(pParse,TK_ISNOT,yymsp[-4].minor.yy528,yymsp[0].minor.yy528);
+   binaryToUnaryIfNull(pParse, yymsp[0].minor.yy528, yymsp[-4].minor.yy528, TK_NOTNULL);
+ }
+         break;
+-      case 211: /* expr ::= NOT expr */
+-      case 212: /* expr ::= BITNOT expr */ yytestcase(yyruleno==212);
++      case 212: /* expr ::= NOT expr */
++      case 213: /* expr ::= BITNOT expr */ yytestcase(yyruleno==213);
+ {yymsp[-1].minor.yy528 = sqlite3PExpr(pParse, yymsp[-1].major, yymsp[0].minor.yy528, 0);/*A-overwrites-B*/}
+         break;
+-      case 213: /* expr ::= PLUS|MINUS expr */
++      case 214: /* expr ::= PLUS|MINUS expr */
+ {
+   yymsp[-1].minor.yy528 = sqlite3PExpr(pParse, yymsp[-1].major==TK_PLUS ? TK_UPLUS : TK_UMINUS, yymsp[0].minor.yy528, 0);
+   /*A-overwrites-B*/
+ }
+         break;
+-      case 214: /* expr ::= expr PTR expr */
++      case 215: /* expr ::= expr PTR expr */
+ {
+   ExprList *pList = sqlite3ExprListAppend(pParse, 0, yymsp[-2].minor.yy528);
+   pList = sqlite3ExprListAppend(pParse, pList, yymsp[0].minor.yy528);
+@@ -168022,11 +175586,11 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-2].minor.yy528 = yylhsminor.yy528;
+         break;
+-      case 215: /* between_op ::= BETWEEN */
+-      case 218: /* in_op ::= IN */ yytestcase(yyruleno==218);
++      case 216: /* between_op ::= BETWEEN */
++      case 219: /* in_op ::= IN */ yytestcase(yyruleno==219);
+ {yymsp[0].minor.yy394 = 0;}
+         break;
+-      case 217: /* expr ::= expr between_op expr AND expr */
++      case 218: /* expr ::= expr between_op expr AND expr */
+ {
+   ExprList *pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy528);
+   pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy528);
+@@ -168039,7 +175603,7 @@ static YYACTIONTYPE yy_reduce(
+   if( yymsp[-3].minor.yy394 ) yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_NOT, yymsp[-4].minor.yy528, 0);
+ }
+         break;
+-      case 220: /* expr ::= expr in_op LP exprlist RP */
++      case 221: /* expr ::= expr in_op LP exprlist RP */
+ {
+     if( yymsp[-1].minor.yy322==0 ){
+       /* Expressions of the form
+@@ -168060,6 +175624,11 @@ static YYACTIONTYPE yy_reduce(
+         sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy322);
+         pRHS = sqlite3PExpr(pParse, TK_UPLUS, pRHS, 0);
+         yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_EQ, yymsp[-4].minor.yy528, pRHS);
++      }else if( yymsp[-1].minor.yy322->nExpr==1 && pRHS->op==TK_SELECT ){
++        yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy528, 0);
++        sqlite3PExprAddSelect(pParse, yymsp[-4].minor.yy528, pRHS->x.pSelect);
++        pRHS->x.pSelect = 0;
++        sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy322);
+       }else{
+         yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy528, 0);
+         if( yymsp[-4].minor.yy528==0 ){
+@@ -168080,20 +175649,20 @@ static YYACTIONTYPE yy_reduce(
+     }
+   }
+         break;
+-      case 221: /* expr ::= LP select RP */
++      case 222: /* expr ::= LP select RP */
+ {
+     yymsp[-2].minor.yy528 = sqlite3PExpr(pParse, TK_SELECT, 0, 0);
+     sqlite3PExprAddSelect(pParse, yymsp[-2].minor.yy528, yymsp[-1].minor.yy47);
+   }
+         break;
+-      case 222: /* expr ::= expr in_op LP select RP */
++      case 223: /* expr ::= expr in_op LP select RP */
+ {
+     yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy528, 0);
+     sqlite3PExprAddSelect(pParse, yymsp[-4].minor.yy528, yymsp[-1].minor.yy47);
+     if( yymsp[-3].minor.yy394 ) yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_NOT, yymsp[-4].minor.yy528, 0);
+   }
+         break;
+-      case 223: /* expr ::= expr in_op nm dbnm paren_exprlist */
++      case 224: /* expr ::= expr in_op nm dbnm paren_exprlist */
+ {
+     SrcList *pSrc = sqlite3SrcListAppend(pParse, 0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0);
+     Select *pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0);
+@@ -168103,14 +175672,14 @@ static YYACTIONTYPE yy_reduce(
+     if( yymsp[-3].minor.yy394 ) yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_NOT, yymsp[-4].minor.yy528, 0);
+   }
+         break;
+-      case 224: /* expr ::= EXISTS LP select RP */
++      case 225: /* expr ::= EXISTS LP select RP */
+ {
+     Expr *p;
+     p = yymsp[-3].minor.yy528 = sqlite3PExpr(pParse, TK_EXISTS, 0, 0);
+     sqlite3PExprAddSelect(pParse, p, yymsp[-1].minor.yy47);
+   }
+         break;
+-      case 225: /* expr ::= CASE case_operand case_exprlist case_else END */
++      case 226: /* expr ::= CASE case_operand case_exprlist case_else END */
+ {
+   yymsp[-4].minor.yy528 = sqlite3PExpr(pParse, TK_CASE, yymsp[-3].minor.yy528, 0);
+   if( yymsp[-4].minor.yy528 ){
+@@ -168122,21 +175691,18 @@ static YYACTIONTYPE yy_reduce(
+   }
+ }
+         break;
+-      case 226: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
++      case 227: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
+ {
+   yymsp[-4].minor.yy322 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy322, yymsp[-2].minor.yy528);
+   yymsp[-4].minor.yy322 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy322, yymsp[0].minor.yy528);
+ }
+         break;
+-      case 227: /* case_exprlist ::= WHEN expr THEN expr */
++      case 228: /* case_exprlist ::= WHEN expr THEN expr */
+ {
+   yymsp[-3].minor.yy322 = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy528);
+   yymsp[-3].minor.yy322 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy322, yymsp[0].minor.yy528);
+ }
+         break;
+-      case 230: /* case_operand ::= expr */
+-{yymsp[0].minor.yy528 = yymsp[0].minor.yy528; /*A-overwrites-X*/}
+-        break;
+       case 233: /* nexprlist ::= nexprlist COMMA expr */
+ {yymsp[-2].minor.yy322 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy322,yymsp[0].minor.yy528);}
+         break;
+@@ -168412,11 +175978,7 @@ static YYACTIONTYPE yy_reduce(
+   yymsp[-2].minor.yy521 = sqlite3WithAdd(pParse, yymsp[-2].minor.yy521, yymsp[0].minor.yy385);
+ }
+         break;
+-      case 311: /* windowdefn_list ::= windowdefn */
+-{ yylhsminor.yy41 = yymsp[0].minor.yy41; }
+-  yymsp[0].minor.yy41 = yylhsminor.yy41;
+-        break;
+-      case 312: /* windowdefn_list ::= windowdefn_list COMMA windowdefn */
++      case 311: /* windowdefn_list ::= windowdefn_list COMMA windowdefn */
+ {
+   assert( yymsp[0].minor.yy41!=0 );
+   sqlite3WindowChain(pParse, yymsp[0].minor.yy41, yymsp[-2].minor.yy41);
+@@ -168425,7 +175987,7 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-2].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 313: /* windowdefn ::= nm AS LP window RP */
++      case 312: /* windowdefn ::= nm AS LP window RP */
+ {
+   if( ALWAYS(yymsp[-1].minor.yy41) ){
+     yymsp[-1].minor.yy41->zName = sqlite3DbStrNDup(pParse->db, yymsp[-4].minor.yy0.z, yymsp[-4].minor.yy0.n);
+@@ -168434,90 +175996,83 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-4].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 314: /* window ::= PARTITION BY nexprlist orderby_opt frame_opt */
++      case 313: /* window ::= PARTITION BY nexprlist orderby_opt frame_opt */
+ {
+   yymsp[-4].minor.yy41 = sqlite3WindowAssemble(pParse, yymsp[0].minor.yy41, yymsp[-2].minor.yy322, yymsp[-1].minor.yy322, 0);
+ }
+         break;
+-      case 315: /* window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
++      case 314: /* window ::= nm PARTITION BY nexprlist orderby_opt frame_opt */
+ {
+   yylhsminor.yy41 = sqlite3WindowAssemble(pParse, yymsp[0].minor.yy41, yymsp[-2].minor.yy322, yymsp[-1].minor.yy322, &yymsp[-5].minor.yy0);
+ }
+   yymsp[-5].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 316: /* window ::= ORDER BY sortlist frame_opt */
++      case 315: /* window ::= ORDER BY sortlist frame_opt */
+ {
+   yymsp[-3].minor.yy41 = sqlite3WindowAssemble(pParse, yymsp[0].minor.yy41, 0, yymsp[-1].minor.yy322, 0);
+ }
+         break;
+-      case 317: /* window ::= nm ORDER BY sortlist frame_opt */
++      case 316: /* window ::= nm ORDER BY sortlist frame_opt */
+ {
+   yylhsminor.yy41 = sqlite3WindowAssemble(pParse, yymsp[0].minor.yy41, 0, yymsp[-1].minor.yy322, &yymsp[-4].minor.yy0);
+ }
+   yymsp[-4].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 318: /* window ::= frame_opt */
+-      case 337: /* filter_over ::= over_clause */ yytestcase(yyruleno==337);
+-{
+-  yylhsminor.yy41 = yymsp[0].minor.yy41;
+-}
+-  yymsp[0].minor.yy41 = yylhsminor.yy41;
+-        break;
+-      case 319: /* window ::= nm frame_opt */
++      case 317: /* window ::= nm frame_opt */
+ {
+   yylhsminor.yy41 = sqlite3WindowAssemble(pParse, yymsp[0].minor.yy41, 0, 0, &yymsp[-1].minor.yy0);
+ }
+   yymsp[-1].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 320: /* frame_opt ::= */
++      case 318: /* frame_opt ::= */
+ {
+   yymsp[1].minor.yy41 = sqlite3WindowAlloc(pParse, 0, TK_UNBOUNDED, 0, TK_CURRENT, 0, 0);
+ }
+         break;
+-      case 321: /* frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
++      case 319: /* frame_opt ::= range_or_rows frame_bound_s frame_exclude_opt */
+ {
+   yylhsminor.yy41 = sqlite3WindowAlloc(pParse, yymsp[-2].minor.yy394, yymsp[-1].minor.yy595.eType, yymsp[-1].minor.yy595.pExpr, TK_CURRENT, 0, yymsp[0].minor.yy516);
+ }
+   yymsp[-2].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 322: /* frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
++      case 320: /* frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e frame_exclude_opt */
+ {
+   yylhsminor.yy41 = sqlite3WindowAlloc(pParse, yymsp[-5].minor.yy394, yymsp[-3].minor.yy595.eType, yymsp[-3].minor.yy595.pExpr, yymsp[-1].minor.yy595.eType, yymsp[-1].minor.yy595.pExpr, yymsp[0].minor.yy516);
+ }
+   yymsp[-5].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 324: /* frame_bound_s ::= frame_bound */
+-      case 326: /* frame_bound_e ::= frame_bound */ yytestcase(yyruleno==326);
++      case 322: /* frame_bound_s ::= frame_bound */
++      case 324: /* frame_bound_e ::= frame_bound */ yytestcase(yyruleno==324);
+ {yylhsminor.yy595 = yymsp[0].minor.yy595;}
+   yymsp[0].minor.yy595 = yylhsminor.yy595;
+         break;
+-      case 325: /* frame_bound_s ::= UNBOUNDED PRECEDING */
+-      case 327: /* frame_bound_e ::= UNBOUNDED FOLLOWING */ yytestcase(yyruleno==327);
+-      case 329: /* frame_bound ::= CURRENT ROW */ yytestcase(yyruleno==329);
++      case 323: /* frame_bound_s ::= UNBOUNDED PRECEDING */
++      case 325: /* frame_bound_e ::= UNBOUNDED FOLLOWING */ yytestcase(yyruleno==325);
++      case 327: /* frame_bound ::= CURRENT ROW */ yytestcase(yyruleno==327);
+ {yylhsminor.yy595.eType = yymsp[-1].major; yylhsminor.yy595.pExpr = 0;}
+   yymsp[-1].minor.yy595 = yylhsminor.yy595;
+         break;
+-      case 328: /* frame_bound ::= expr PRECEDING|FOLLOWING */
++      case 326: /* frame_bound ::= expr PRECEDING|FOLLOWING */
+ {yylhsminor.yy595.eType = yymsp[0].major; yylhsminor.yy595.pExpr = yymsp[-1].minor.yy528;}
+   yymsp[-1].minor.yy595 = yylhsminor.yy595;
+         break;
+-      case 330: /* frame_exclude_opt ::= */
++      case 328: /* frame_exclude_opt ::= */
+ {yymsp[1].minor.yy516 = 0;}
+         break;
+-      case 331: /* frame_exclude_opt ::= EXCLUDE frame_exclude */
++      case 329: /* frame_exclude_opt ::= EXCLUDE frame_exclude */
+ {yymsp[-1].minor.yy516 = yymsp[0].minor.yy516;}
+         break;
+-      case 332: /* frame_exclude ::= NO OTHERS */
+-      case 333: /* frame_exclude ::= CURRENT ROW */ yytestcase(yyruleno==333);
++      case 330: /* frame_exclude ::= NO OTHERS */
++      case 331: /* frame_exclude ::= CURRENT ROW */ yytestcase(yyruleno==331);
+ {yymsp[-1].minor.yy516 = yymsp[-1].major; /*A-overwrites-X*/}
+         break;
+-      case 334: /* frame_exclude ::= GROUP|TIES */
++      case 332: /* frame_exclude ::= GROUP|TIES */
+ {yymsp[0].minor.yy516 = yymsp[0].major; /*A-overwrites-X*/}
+         break;
+-      case 335: /* window_clause ::= WINDOW windowdefn_list */
++      case 333: /* window_clause ::= WINDOW windowdefn_list */
+ { yymsp[-1].minor.yy41 = yymsp[0].minor.yy41; }
+         break;
+-      case 336: /* filter_over ::= filter_clause over_clause */
++      case 334: /* filter_over ::= filter_clause over_clause */
+ {
+   if( yymsp[0].minor.yy41 ){
+     yymsp[0].minor.yy41->pFilter = yymsp[-1].minor.yy528;
+@@ -168528,7 +176083,13 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[-1].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 338: /* filter_over ::= filter_clause */
++      case 335: /* filter_over ::= over_clause */
++{
++  yylhsminor.yy41 = yymsp[0].minor.yy41;
++}
++  yymsp[0].minor.yy41 = yylhsminor.yy41;
++        break;
++      case 336: /* filter_over ::= filter_clause */
+ {
+   yylhsminor.yy41 = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
+   if( yylhsminor.yy41 ){
+@@ -168540,13 +176101,13 @@ static YYACTIONTYPE yy_reduce(
+ }
+   yymsp[0].minor.yy41 = yylhsminor.yy41;
+         break;
+-      case 339: /* over_clause ::= OVER LP window RP */
++      case 337: /* over_clause ::= OVER LP window RP */
+ {
+   yymsp[-3].minor.yy41 = yymsp[-1].minor.yy41;
+   assert( yymsp[-3].minor.yy41!=0 );
+ }
+         break;
+-      case 340: /* over_clause ::= OVER nm */
++      case 338: /* over_clause ::= OVER nm */
+ {
+   yymsp[-1].minor.yy41 = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
+   if( yymsp[-1].minor.yy41 ){
+@@ -168554,73 +176115,75 @@ static YYACTIONTYPE yy_reduce(
+   }
+ }
+         break;
+-      case 341: /* filter_clause ::= FILTER LP WHERE expr RP */
++      case 339: /* filter_clause ::= FILTER LP WHERE expr RP */
+ { yymsp[-4].minor.yy528 = yymsp[-1].minor.yy528; }
+         break;
+       default:
+-      /* (342) input ::= cmdlist */ yytestcase(yyruleno==342);
+-      /* (343) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==343);
+-      /* (344) cmdlist ::= ecmd (OPTIMIZED OUT) */ assert(yyruleno!=344);
+-      /* (345) ecmd ::= SEMI */ yytestcase(yyruleno==345);
+-      /* (346) ecmd ::= cmdx SEMI */ yytestcase(yyruleno==346);
+-      /* (347) ecmd ::= explain cmdx SEMI (NEVER REDUCES) */ assert(yyruleno!=347);
+-      /* (348) trans_opt ::= */ yytestcase(yyruleno==348);
+-      /* (349) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==349);
+-      /* (350) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==350);
+-      /* (351) savepoint_opt ::= SAVEPOINT */ yytestcase(yyruleno==351);
+-      /* (352) savepoint_opt ::= */ yytestcase(yyruleno==352);
+-      /* (353) cmd ::= create_table create_table_args */ yytestcase(yyruleno==353);
+-      /* (354) table_option_set ::= table_option (OPTIMIZED OUT) */ assert(yyruleno!=354);
+-      /* (355) columnlist ::= columnlist COMMA columnname carglist */ yytestcase(yyruleno==355);
+-      /* (356) columnlist ::= columnname carglist */ yytestcase(yyruleno==356);
+-      /* (357) nm ::= ID|INDEXED */ yytestcase(yyruleno==357);
+-      /* (358) nm ::= STRING */ yytestcase(yyruleno==358);
+-      /* (359) nm ::= JOIN_KW */ yytestcase(yyruleno==359);
+-      /* (360) typetoken ::= typename */ yytestcase(yyruleno==360);
+-      /* (361) typename ::= ID|STRING */ yytestcase(yyruleno==361);
+-      /* (362) signed ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=362);
+-      /* (363) signed ::= minus_num (OPTIMIZED OUT) */ assert(yyruleno!=363);
+-      /* (364) carglist ::= carglist ccons */ yytestcase(yyruleno==364);
+-      /* (365) carglist ::= */ yytestcase(yyruleno==365);
+-      /* (366) ccons ::= NULL onconf */ yytestcase(yyruleno==366);
+-      /* (367) ccons ::= GENERATED ALWAYS AS generated */ yytestcase(yyruleno==367);
+-      /* (368) ccons ::= AS generated */ yytestcase(yyruleno==368);
+-      /* (369) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==369);
+-      /* (370) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==370);
+-      /* (371) conslist ::= tcons (OPTIMIZED OUT) */ assert(yyruleno!=371);
+-      /* (372) tconscomma ::= */ yytestcase(yyruleno==372);
+-      /* (373) defer_subclause_opt ::= defer_subclause (OPTIMIZED OUT) */ assert(yyruleno!=373);
+-      /* (374) resolvetype ::= raisetype (OPTIMIZED OUT) */ assert(yyruleno!=374);
+-      /* (375) selectnowith ::= oneselect (OPTIMIZED OUT) */ assert(yyruleno!=375);
+-      /* (376) oneselect ::= values */ yytestcase(yyruleno==376);
+-      /* (377) sclp ::= selcollist COMMA */ yytestcase(yyruleno==377);
+-      /* (378) as ::= ID|STRING */ yytestcase(yyruleno==378);
+-      /* (379) indexed_opt ::= indexed_by (OPTIMIZED OUT) */ assert(yyruleno!=379);
+-      /* (380) returning ::= */ yytestcase(yyruleno==380);
+-      /* (381) expr ::= term (OPTIMIZED OUT) */ assert(yyruleno!=381);
+-      /* (382) likeop ::= LIKE_KW|MATCH */ yytestcase(yyruleno==382);
+-      /* (383) exprlist ::= nexprlist */ yytestcase(yyruleno==383);
+-      /* (384) nmnum ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=384);
+-      /* (385) nmnum ::= nm (OPTIMIZED OUT) */ assert(yyruleno!=385);
+-      /* (386) nmnum ::= ON */ yytestcase(yyruleno==386);
+-      /* (387) nmnum ::= DELETE */ yytestcase(yyruleno==387);
+-      /* (388) nmnum ::= DEFAULT */ yytestcase(yyruleno==388);
+-      /* (389) plus_num ::= INTEGER|FLOAT */ yytestcase(yyruleno==389);
+-      /* (390) foreach_clause ::= */ yytestcase(yyruleno==390);
+-      /* (391) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==391);
+-      /* (392) trnm ::= nm */ yytestcase(yyruleno==392);
+-      /* (393) tridxby ::= */ yytestcase(yyruleno==393);
+-      /* (394) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==394);
+-      /* (395) database_kw_opt ::= */ yytestcase(yyruleno==395);
+-      /* (396) kwcolumn_opt ::= */ yytestcase(yyruleno==396);
+-      /* (397) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==397);
+-      /* (398) vtabarglist ::= vtabarg */ yytestcase(yyruleno==398);
+-      /* (399) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==399);
+-      /* (400) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==400);
+-      /* (401) anylist ::= */ yytestcase(yyruleno==401);
+-      /* (402) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==402);
+-      /* (403) anylist ::= anylist ANY */ yytestcase(yyruleno==403);
+-      /* (404) with ::= */ yytestcase(yyruleno==404);
++      /* (340) input ::= cmdlist */ yytestcase(yyruleno==340);
++      /* (341) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==341);
++      /* (342) cmdlist ::= ecmd (OPTIMIZED OUT) */ assert(yyruleno!=342);
++      /* (343) ecmd ::= SEMI */ yytestcase(yyruleno==343);
++      /* (344) ecmd ::= cmdx SEMI */ yytestcase(yyruleno==344);
++      /* (345) ecmd ::= explain cmdx SEMI (NEVER REDUCES) */ assert(yyruleno!=345);
++      /* (346) trans_opt ::= */ yytestcase(yyruleno==346);
++      /* (347) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==347);
++      /* (348) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==348);
++      /* (349) savepoint_opt ::= SAVEPOINT */ yytestcase(yyruleno==349);
++      /* (350) savepoint_opt ::= */ yytestcase(yyruleno==350);
++      /* (351) cmd ::= create_table create_table_args */ yytestcase(yyruleno==351);
++      /* (352) table_option_set ::= table_option (OPTIMIZED OUT) */ assert(yyruleno!=352);
++      /* (353) columnlist ::= columnlist COMMA columnname carglist */ yytestcase(yyruleno==353);
++      /* (354) columnlist ::= columnname carglist */ yytestcase(yyruleno==354);
++      /* (355) nm ::= ID|INDEXED|JOIN_KW */ yytestcase(yyruleno==355);
++      /* (356) nm ::= STRING */ yytestcase(yyruleno==356);
++      /* (357) typetoken ::= typename */ yytestcase(yyruleno==357);
++      /* (358) typename ::= ID|STRING */ yytestcase(yyruleno==358);
++      /* (359) signed ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=359);
++      /* (360) signed ::= minus_num (OPTIMIZED OUT) */ assert(yyruleno!=360);
++      /* (361) carglist ::= carglist ccons */ yytestcase(yyruleno==361);
++      /* (362) carglist ::= */ yytestcase(yyruleno==362);
++      /* (363) ccons ::= NULL onconf */ yytestcase(yyruleno==363);
++      /* (364) ccons ::= GENERATED ALWAYS AS generated */ yytestcase(yyruleno==364);
++      /* (365) ccons ::= AS generated */ yytestcase(yyruleno==365);
++      /* (366) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==366);
++      /* (367) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==367);
++      /* (368) conslist ::= tcons (OPTIMIZED OUT) */ assert(yyruleno!=368);
++      /* (369) tconscomma ::= */ yytestcase(yyruleno==369);
++      /* (370) defer_subclause_opt ::= defer_subclause (OPTIMIZED OUT) */ assert(yyruleno!=370);
++      /* (371) resolvetype ::= raisetype (OPTIMIZED OUT) */ assert(yyruleno!=371);
++      /* (372) selectnowith ::= oneselect (OPTIMIZED OUT) */ assert(yyruleno!=372);
++      /* (373) oneselect ::= values */ yytestcase(yyruleno==373);
++      /* (374) sclp ::= selcollist COMMA */ yytestcase(yyruleno==374);
++      /* (375) as ::= ID|STRING */ yytestcase(yyruleno==375);
++      /* (376) indexed_opt ::= indexed_by (OPTIMIZED OUT) */ assert(yyruleno!=376);
++      /* (377) returning ::= */ yytestcase(yyruleno==377);
++      /* (378) expr ::= term (OPTIMIZED OUT) */ assert(yyruleno!=378);
++      /* (379) likeop ::= LIKE_KW|MATCH */ yytestcase(yyruleno==379);
++      /* (380) case_operand ::= expr */ yytestcase(yyruleno==380);
++      /* (381) exprlist ::= nexprlist */ yytestcase(yyruleno==381);
++      /* (382) nmnum ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=382);
++      /* (383) nmnum ::= nm (OPTIMIZED OUT) */ assert(yyruleno!=383);
++      /* (384) nmnum ::= ON */ yytestcase(yyruleno==384);
++      /* (385) nmnum ::= DELETE */ yytestcase(yyruleno==385);
++      /* (386) nmnum ::= DEFAULT */ yytestcase(yyruleno==386);
++      /* (387) plus_num ::= INTEGER|FLOAT */ yytestcase(yyruleno==387);
++      /* (388) foreach_clause ::= */ yytestcase(yyruleno==388);
++      /* (389) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==389);
++      /* (390) trnm ::= nm */ yytestcase(yyruleno==390);
++      /* (391) tridxby ::= */ yytestcase(yyruleno==391);
++      /* (392) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==392);
++      /* (393) database_kw_opt ::= */ yytestcase(yyruleno==393);
++      /* (394) kwcolumn_opt ::= */ yytestcase(yyruleno==394);
++      /* (395) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==395);
++      /* (396) vtabarglist ::= vtabarg */ yytestcase(yyruleno==396);
++      /* (397) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==397);
++      /* (398) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==398);
++      /* (399) anylist ::= */ yytestcase(yyruleno==399);
++      /* (400) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==400);
++      /* (401) anylist ::= anylist ANY */ yytestcase(yyruleno==401);
++      /* (402) with ::= */ yytestcase(yyruleno==402);
++      /* (403) windowdefn_list ::= windowdefn (OPTIMIZED OUT) */ assert(yyruleno!=403);
++      /* (404) window ::= frame_opt (OPTIMIZED OUT) */ assert(yyruleno!=404);
+         break;
+ /********** End reduce actions ************************************************/
+   };
+@@ -169196,7 +176759,7 @@ static const unsigned char aKWHash[127] = {
+ /* aKWNext[] forms the hash collision chain.  If aKWHash[i]==0
+ ** then the i-th keyword has no more hash collisions.  Otherwise,
+ ** the next keyword with the same hash is aKWHash[i]-1. */
+-static const unsigned char aKWNext[147] = {
++static const unsigned char aKWNext[148] = {0,
+      0,   0,   0,   0,   4,   0,  43,   0,   0, 106, 114,   0,   0,
+      0,   2,   0,   0, 143,   0,   0,   0,  13,   0,   0,   0,   0,
+    141,   0,   0, 119,  52,   0,   0, 137,  12,   0,   0,  62,   0,
+@@ -169211,7 +176774,7 @@ static const unsigned char aKWNext[147] = {
+    102,   0,   0,  87,
+ };
+ /* aKWLen[i] is the length (in bytes) of the i-th keyword */
+-static const unsigned char aKWLen[147] = {
++static const unsigned char aKWLen[148] = {0,
+      7,   7,   5,   4,   6,   4,   5,   3,   6,   7,   3,   6,   6,
+      7,   7,   3,   8,   2,   6,   5,   4,   4,   3,  10,   4,   7,
+      6,   9,   4,   2,   6,   5,   9,   9,   4,   7,   3,   2,   4,
+@@ -169227,7 +176790,7 @@ static const unsigned char aKWLen[147] = {
+ };
+ /* aKWOffset[i] is the index into zKWText[] of the start of
+ ** the text for the i-th keyword. */
+-static const unsigned short int aKWOffset[147] = {
++static const unsigned short int aKWOffset[148] = {0,
+      0,   2,   2,   8,   9,  14,  16,  20,  23,  25,  25,  29,  33,
+     36,  41,  46,  48,  53,  54,  59,  62,  65,  67,  69,  78,  81,
+     86,  90,  90,  94,  99, 101, 105, 111, 119, 123, 123, 123, 126,
+@@ -169242,7 +176805,7 @@ static const unsigned short int aKWOffset[147] = {
+    648, 650, 655, 659,
+ };
+ /* aKWCode[i] is the parser symbol code for the i-th keyword */
+-static const unsigned char aKWCode[147] = {
++static const unsigned char aKWCode[148] = {0,
+   TK_REINDEX,    TK_INDEXED,    TK_INDEX,      TK_DESC,       TK_ESCAPE,
+   TK_EACH,       TK_CHECK,      TK_KEY,        TK_BEFORE,     TK_FOREIGN,
+   TK_FOR,        TK_IGNORE,     TK_LIKE_KW,    TK_EXPLAIN,    TK_INSTEAD,
+@@ -169409,185 +176972,185 @@ static const unsigned char aKWCode[147] = {
+ static int keywordCode(const char *z, int n, int *pType){
+   int i, j;
+   const char *zKW;
+-  if( n>=2 ){
+-    i = ((charMap(z[0])*4) ^ (charMap(z[n-1])*3) ^ n*1) % 127;
+-    for(i=((int)aKWHash[i])-1; i>=0; i=((int)aKWNext[i])-1){
+-      if( aKWLen[i]!=n ) continue;
+-      zKW = &zKWText[aKWOffset[i]];
++  assert( n>=2 );
++  i = ((charMap(z[0])*4) ^ (charMap(z[n-1])*3) ^ n*1) % 127;
++  for(i=(int)aKWHash[i]; i>0; i=aKWNext[i]){
++    if( aKWLen[i]!=n ) continue;
++    zKW = &zKWText[aKWOffset[i]];
+ #ifdef SQLITE_ASCII
+-      if( (z[0]&~0x20)!=zKW[0] ) continue;
+-      if( (z[1]&~0x20)!=zKW[1] ) continue;
+-      j = 2;
+-      while( j=2 ) keywordCode((char*)z, n, &id);
+   return id;
+ }
+ #define SQLITE_N_KEYWORD 147
+ SQLITE_API int sqlite3_keyword_name(int i,const char **pzName,int *pnName){
+   if( i<0 || i>=SQLITE_N_KEYWORD ) return SQLITE_ERROR;
++  i++;
+   *pzName = zKWText + aKWOffset[i];
+   *pnName = aKWLen[i];
+   return SQLITE_OK;
+@@ -169886,7 +177449,7 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){
+       testcase( z[0]=='0' );  testcase( z[0]=='1' );  testcase( z[0]=='2' );
+       testcase( z[0]=='3' );  testcase( z[0]=='4' );  testcase( z[0]=='5' );
+       testcase( z[0]=='6' );  testcase( z[0]=='7' );  testcase( z[0]=='8' );
+-      testcase( z[0]=='9' );
++      testcase( z[0]=='9' );  testcase( z[0]=='.' );
+       *tokenType = TK_INTEGER;
+ #ifndef SQLITE_OMIT_HEX_INTEGER
+       if( z[0]=='0' && (z[1]=='x' || z[1]=='X') && sqlite3Isxdigit(z[2]) ){
+@@ -169958,7 +177521,8 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){
+       return i;
+     }
+     case CC_KYWD0: {
+-      for(i=1; aiClass[z[i]]<=CC_KYWD; i++){}
++      if( aiClass[z[1]]>CC_KYWD ){ i = 1;  break; }
++      for(i=2; aiClass[z[i]]<=CC_KYWD; i++){}
+       if( IdChar(z[i]) ){
+         /* This token started out using characters that can appear in keywords,
+         ** but z[i] is a character not allowed within keywords, so this must
+@@ -170164,7 +177728,7 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql){
+   if( pParse->pNewTrigger && !IN_RENAME_OBJECT ){
+     sqlite3DeleteTrigger(db, pParse->pNewTrigger);
+   }
+-  if( pParse->pVList ) sqlite3DbFreeNN(db, pParse->pVList);
++  if( pParse->pVList ) sqlite3DbNNFreeNN(db, pParse->pVList);
+   db->pParse = pParentParse;
+   assert( nErr==0 || pParse->rc!=SQLITE_OK );
+   return nErr;
+@@ -170737,30 +178301,20 @@ static int sqlite3TestExtInit(sqlite3 *db){
+ ** Forward declarations of external module initializer functions
+ ** for modules that need them.
+ */
+-#ifdef SQLITE_ENABLE_FTS1
+-SQLITE_PRIVATE int sqlite3Fts1Init(sqlite3*);
+-#endif
+-#ifdef SQLITE_ENABLE_FTS2
+-SQLITE_PRIVATE int sqlite3Fts2Init(sqlite3*);
+-#endif
+ #ifdef SQLITE_ENABLE_FTS5
+ SQLITE_PRIVATE int sqlite3Fts5Init(sqlite3*);
+ #endif
+ #ifdef SQLITE_ENABLE_STMTVTAB
+ SQLITE_PRIVATE int sqlite3StmtVtabInit(sqlite3*);
+ #endif
+-
++#ifdef SQLITE_EXTRA_AUTOEXT
++int SQLITE_EXTRA_AUTOEXT(sqlite3*);
++#endif
+ /*
+ ** An array of pointers to extension initializer functions for
+ ** built-in extensions.
+ */
+ static int (*const sqlite3BuiltinExtensions[])(sqlite3*) = {
+-#ifdef SQLITE_ENABLE_FTS1
+-  sqlite3Fts1Init,
+-#endif
+-#ifdef SQLITE_ENABLE_FTS2
+-  sqlite3Fts2Init,
+-#endif
+ #ifdef SQLITE_ENABLE_FTS3
+   sqlite3Fts3Init,
+ #endif
+@@ -170789,6 +178343,9 @@ static int (*const sqlite3BuiltinExtensions[])(sqlite3*) = {
+ #ifdef SQLITE_ENABLE_BYTECODE_VTAB
+   sqlite3VdbeBytecodeVtabInit,
+ #endif
++#ifdef SQLITE_EXTRA_AUTOEXT
++  SQLITE_EXTRA_AUTOEXT,
++#endif
+ };
+ 
+ #ifndef SQLITE_AMALGAMATION
+@@ -170862,6 +178419,32 @@ SQLITE_API char *sqlite3_temp_directory = 0;
+ */
+ SQLITE_API char *sqlite3_data_directory = 0;
+ 
++/*
++** Determine whether or not high-precision (long double) floating point
++** math works correctly on CPU currently running.
++*/
++static SQLITE_NOINLINE int hasHighPrecisionDouble(int rc){
++  if( sizeof(LONGDOUBLE_TYPE)<=8 ){
++    /* If the size of "long double" is not more than 8, then
++    ** high-precision math is not possible. */
++    return 0;
++  }else{
++    /* Just because sizeof(long double)>8 does not mean that the underlying
++    ** hardware actually supports high-precision floating point.  For example,
++    ** clearing the 0x100 bit in the floating-point control word on Intel
++    ** processors will make long double work like double, even though long
++    ** double takes up more space.  The only way to determine if long double
++    ** actually works is to run an experiment. */
++    LONGDOUBLE_TYPE a, b, c;
++    rc++;
++    a = 1.0+rc*0.1;
++    b = 1.0e+18+rc*25.0;
++    c = a+b;
++    return b!=c;
++  }
++}
++
++
+ /*
+ ** Initialize SQLite.
+ **
+@@ -171057,6 +178640,12 @@ SQLITE_API int sqlite3_initialize(void){
+   }
+ #endif
+ 
++  /* Experimentally determine if high-precision floating point is
++  ** available. */
++#ifndef SQLITE_OMIT_WSD
++  sqlite3Config.bUseLongDouble = hasHighPrecisionDouble(rc);
++#endif
++
+   return rc;
+ }
+ 
+@@ -171126,9 +178715,21 @@ SQLITE_API int sqlite3_config(int op, ...){
+   va_list ap;
+   int rc = SQLITE_OK;
+ 
+-  /* sqlite3_config() shall return SQLITE_MISUSE if it is invoked while
+-  ** the SQLite library is in use. */
+-  if( sqlite3GlobalConfig.isInit ) return SQLITE_MISUSE_BKPT;
++  /* sqlite3_config() normally returns SQLITE_MISUSE if it is invoked while
++  ** the SQLite library is in use.  Except, a few selected opcodes
++  ** are allowed.
++  */
++  if( sqlite3GlobalConfig.isInit ){
++    static const u64 mAnytimeConfigOption = 0
++       | MASKBIT64( SQLITE_CONFIG_LOG )
++       | MASKBIT64( SQLITE_CONFIG_PCACHE_HDRSZ )
++    ;
++    if( op<0 || op>63 || (MASKBIT64(op) & mAnytimeConfigOption)==0 ){
++      return SQLITE_MISUSE_BKPT;
++    }
++    testcase( op==SQLITE_CONFIG_LOG );
++    testcase( op==SQLITE_CONFIG_PCACHE_HDRSZ );
++  }
+ 
+   va_start(ap, op);
+   switch( op ){
+@@ -171197,6 +178798,7 @@ SQLITE_API int sqlite3_config(int op, ...){
+       break;
+     }
+     case SQLITE_CONFIG_MEMSTATUS: {
++      assert( !sqlite3GlobalConfig.isInit );  /* Cannot change at runtime */
+       /* EVIDENCE-OF: R-61275-35157 The SQLITE_CONFIG_MEMSTATUS option takes
+       ** single argument of type int, interpreted as a boolean, which enables
+       ** or disables the collection of memory allocation statistics. */
+@@ -171320,8 +178922,10 @@ SQLITE_API int sqlite3_config(int op, ...){
+       ** sqlite3GlobalConfig.xLog = va_arg(ap, void(*)(void*,int,const char*));
+       */
+       typedef void(*LOGFUNC_t)(void*,int,const char*);
+-      sqlite3GlobalConfig.xLog = va_arg(ap, LOGFUNC_t);
+-      sqlite3GlobalConfig.pLogArg = va_arg(ap, void*);
++      LOGFUNC_t xLog = va_arg(ap, LOGFUNC_t);
++      void *pLogArg = va_arg(ap, void*);
++      AtomicStore(&sqlite3GlobalConfig.xLog, xLog);
++      AtomicStore(&sqlite3GlobalConfig.pLogArg, pLogArg);
+       break;
+     }
+ 
+@@ -171335,7 +178939,8 @@ SQLITE_API int sqlite3_config(int op, ...){
+       ** argument of type int. If non-zero, then URI handling is globally
+       ** enabled. If the parameter is zero, then URI handling is globally
+       ** disabled. */
+-      sqlite3GlobalConfig.bOpenUri = va_arg(ap, int);
++      int bOpenUri = va_arg(ap, int);
++      AtomicStore(&sqlite3GlobalConfig.bOpenUri, bOpenUri);
+       break;
+     }
+ 
+@@ -171520,18 +179125,19 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
+     db->lookaside.bMalloced = pBuf==0 ?1:0;
+     db->lookaside.nSlot = nBig+nSm;
+   }else{
+-    db->lookaside.pStart = db;
++    db->lookaside.pStart = 0;
+ #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
+     db->lookaside.pSmallInit = 0;
+     db->lookaside.pSmallFree = 0;
+-    db->lookaside.pMiddle = db;
++    db->lookaside.pMiddle = 0;
+ #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
+-    db->lookaside.pEnd = db;
++    db->lookaside.pEnd = 0;
+     db->lookaside.bDisable = 1;
+     db->lookaside.sz = 0;
+     db->lookaside.bMalloced = 0;
+     db->lookaside.nSlot = 0;
+   }
++  db->lookaside.pTrueEnd = db->lookaside.pEnd;
+   assert( sqlite3LookasideUsed(db,0)==0 );
+ #endif /* SQLITE_OMIT_LOOKASIDE */
+   return SQLITE_OK;
+@@ -171610,6 +179216,11 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3 *db){
+ SQLITE_API int sqlite3_db_config(sqlite3 *db, int op, ...){
+   va_list ap;
+   int rc;
++
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
++#endif
++  sqlite3_mutex_enter(db->mutex);
+   va_start(ap, op);
+   switch( op ){
+     case SQLITE_DBCONFIG_MAINDBNAME: {
+@@ -171648,6 +179259,8 @@ SQLITE_API int sqlite3_db_config(sqlite3 *db, int op, ...){
+         { SQLITE_DBCONFIG_DQS_DML,               SQLITE_DqsDML         },
+         { SQLITE_DBCONFIG_LEGACY_FILE_FORMAT,    SQLITE_LegacyFileFmt  },
+         { SQLITE_DBCONFIG_TRUSTED_SCHEMA,        SQLITE_TrustedSchema  },
++        { SQLITE_DBCONFIG_STMT_SCANSTATUS,       SQLITE_StmtScanStatus },
++        { SQLITE_DBCONFIG_REVERSE_SCANORDER,     SQLITE_ReverseOrder   },
+       };
+       unsigned int i;
+       rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
+@@ -171675,6 +179288,7 @@ SQLITE_API int sqlite3_db_config(sqlite3 *db, int op, ...){
+     }
+   }
+   va_end(ap);
++  sqlite3_mutex_leave(db->mutex);
+   return rc;
+ }
+ 
+@@ -171935,6 +179549,14 @@ static int sqlite3Close(sqlite3 *db, int forceZombie){
+   }
+ #endif
+ 
++  while( db->pDbData ){
++    DbClientData *p = db->pDbData;
++    db->pDbData = p->pNext;
++    assert( p->pData!=0 );
++    if( p->xDestructor ) p->xDestructor(p->pData);
++    sqlite3_free(p);
++  }
++
+   /* Convert the connection into a zombie and then close it.
+   */
+   db->eOpenState = SQLITE_STATE_ZOMBIE;
+@@ -172259,6 +179881,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
+       case SQLITE_NOTICE_RECOVER_WAL: zName = "SQLITE_NOTICE_RECOVER_WAL";break;
+       case SQLITE_NOTICE_RECOVER_ROLLBACK:
+                                 zName = "SQLITE_NOTICE_RECOVER_ROLLBACK"; break;
++      case SQLITE_NOTICE_RBU:         zName = "SQLITE_NOTICE_RBU"; break;
+       case SQLITE_WARNING:            zName = "SQLITE_WARNING";           break;
+       case SQLITE_WARNING_AUTOINDEX:  zName = "SQLITE_WARNING_AUTOINDEX"; break;
+       case SQLITE_DONE:               zName = "SQLITE_DONE";              break;
+@@ -172351,9 +179974,9 @@ static int sqliteDefaultBusyCallback(
+   void *ptr,               /* Database connection */
+   int count                /* Number of times table has been busy */
+ ){
+-#if SQLITE_OS_WIN || HAVE_USLEEP
++#if SQLITE_OS_WIN || !defined(HAVE_NANOSLEEP) || HAVE_NANOSLEEP
+   /* This case is for systems that have support for sleeping for fractions of
+-  ** a second.  Examples:  All windows systems, unix systems with usleep() */
++  ** a second.  Examples:  All windows systems, unix systems with nanosleep() */
+   static const u8 delays[] =
+      { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50, 100 };
+   static const u8 totals[] =
+@@ -172488,7 +180111,9 @@ SQLITE_API int sqlite3_busy_timeout(sqlite3 *db, int ms){
+ */
+ SQLITE_API void sqlite3_interrupt(sqlite3 *db){
+ #ifdef SQLITE_ENABLE_API_ARMOR
+-  if( !sqlite3SafetyCheckOk(db) && (db==0 || db->eOpenState!=SQLITE_STATE_ZOMBIE) ){
++  if( !sqlite3SafetyCheckOk(db)
++   && (db==0 || db->eOpenState!=SQLITE_STATE_ZOMBIE)
++  ){
+     (void)SQLITE_MISUSE_BKPT;
+     return;
+   }
+@@ -172496,6 +180121,21 @@ SQLITE_API void sqlite3_interrupt(sqlite3 *db){
+   AtomicStore(&db->u1.isInterrupted, 1);
+ }
+ 
++/*
++** Return true or false depending on whether or not an interrupt is
++** pending on connection db.
++*/
++SQLITE_API int sqlite3_is_interrupted(sqlite3 *db){
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( !sqlite3SafetyCheckOk(db)
++   && (db==0 || db->eOpenState!=SQLITE_STATE_ZOMBIE)
++  ){
++    (void)SQLITE_MISUSE_BKPT;
++    return 0;
++  }
++#endif
++  return AtomicLoad(&db->u1.isInterrupted)!=0;
++}
+ 
+ /*
+ ** This function is exactly the same as sqlite3_create_function(), except
+@@ -172534,13 +180174,13 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
+   assert( SQLITE_FUNC_CONSTANT==SQLITE_DETERMINISTIC );
+   assert( SQLITE_FUNC_DIRECT==SQLITE_DIRECTONLY );
+   extraFlags = enc &  (SQLITE_DETERMINISTIC|SQLITE_DIRECTONLY|
+-                       SQLITE_SUBTYPE|SQLITE_INNOCUOUS);
++                       SQLITE_SUBTYPE|SQLITE_INNOCUOUS|SQLITE_RESULT_SUBTYPE);
+   enc &= (SQLITE_FUNC_ENCMASK|SQLITE_ANY);
+ 
+   /* The SQLITE_INNOCUOUS flag is the same bit as SQLITE_FUNC_UNSAFE.  But
+   ** the meaning is inverted.  So flip the bit. */
+   assert( SQLITE_FUNC_UNSAFE==SQLITE_INNOCUOUS );
+-  extraFlags ^= SQLITE_FUNC_UNSAFE;
++  extraFlags ^= SQLITE_FUNC_UNSAFE;  /* tag-20230109-1 */
+ 
+ 
+ #ifndef SQLITE_OMIT_UTF16
+@@ -172558,11 +180198,11 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
+     case SQLITE_ANY: {
+       int rc;
+       rc = sqlite3CreateFunc(db, zFunctionName, nArg,
+-           (SQLITE_UTF8|extraFlags)^SQLITE_FUNC_UNSAFE,
++           (SQLITE_UTF8|extraFlags)^SQLITE_FUNC_UNSAFE, /* tag-20230109-1 */
+            pUserData, xSFunc, xStep, xFinal, xValue, xInverse, pDestructor);
+       if( rc==SQLITE_OK ){
+         rc = sqlite3CreateFunc(db, zFunctionName, nArg,
+-             (SQLITE_UTF16LE|extraFlags)^SQLITE_FUNC_UNSAFE,
++             (SQLITE_UTF16LE|extraFlags)^SQLITE_FUNC_UNSAFE, /* tag-20230109-1*/
+              pUserData, xSFunc, xStep, xFinal, xValue, xInverse, pDestructor);
+       }
+       if( rc!=SQLITE_OK ){
+@@ -172811,7 +180451,7 @@ SQLITE_API int sqlite3_overload_function(
+   rc = sqlite3FindFunction(db, zName, nArg, SQLITE_UTF8, 0)!=0;
+   sqlite3_mutex_leave(db->mutex);
+   if( rc ) return SQLITE_OK;
+-  zCopy = sqlite3_mprintf(zName);
++  zCopy = sqlite3_mprintf("%s", zName);
+   if( zCopy==0 ) return SQLITE_NOMEM;
+   return sqlite3_create_function_v2(db, zName, nArg, SQLITE_UTF8,
+                            zCopy, sqlite3InvalidFunction, 0, 0, sqlite3_free);
+@@ -172991,6 +180631,12 @@ SQLITE_API void *sqlite3_preupdate_hook(
+   void *pArg                /* First callback argument */
+ ){
+   void *pRet;
++
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( db==0 ){
++    return 0;
++  }
++#endif
+   sqlite3_mutex_enter(db->mutex);
+   pRet = db->pPreUpdateArg;
+   db->xPreUpdateCallback = xCallback;
+@@ -173137,7 +180783,7 @@ SQLITE_API int sqlite3_wal_checkpoint_v2(
+   if( eModeSQLITE_CHECKPOINT_TRUNCATE ){
+     /* EVIDENCE-OF: R-03996-12088 The M parameter must be a valid checkpoint
+     ** mode: */
+-    return SQLITE_MISUSE;
++    return SQLITE_MISUSE_BKPT;
+   }
+ 
+   sqlite3_mutex_enter(db->mutex);
+@@ -173614,9 +181260,9 @@ SQLITE_PRIVATE int sqlite3ParseUri(
+ 
+   assert( *pzErrMsg==0 );
+ 
+-  if( ((flags & SQLITE_OPEN_URI)             /* IMP: R-48725-32206 */
+-            || sqlite3GlobalConfig.bOpenUri) /* IMP: R-51689-46548 */
+-   && nUri>=5 && memcmp(zUri, "file:", 5)==0 /* IMP: R-57884-37496 */
++  if( ((flags & SQLITE_OPEN_URI)                     /* IMP: R-48725-32206 */
++       || AtomicLoad(&sqlite3GlobalConfig.bOpenUri)) /* IMP: R-51689-46548 */
++   && nUri>=5 && memcmp(zUri, "file:", 5)==0         /* IMP: R-57884-37496 */
+   ){
+     char *zOpt;
+     int eState;                   /* Parser state when parsing URI */
+@@ -173815,6 +181461,9 @@ SQLITE_PRIVATE int sqlite3ParseUri(
+     flags &= ~SQLITE_OPEN_URI;
+   }
+ 
++  /* Check VFS. */
++  sqlite3mcCheckVfs(zVfs);
++
+   *ppVfs = sqlite3_vfs_find(zVfs);
+   if( *ppVfs==0 ){
+     *pzErrMsg = sqlite3_mprintf("no such vfs: %s", zVfs);
+@@ -173974,7 +181623,7 @@ static int openDatabase(
+ **         0                  off                         off
+ **
+ ** Legacy behavior is 3 (double-quoted string literals are allowed anywhere)
+-** and so that is the default.  But developers are encouranged to use
++** and so that is the default.  But developers are encouraged to use
+ ** -DSQLITE_DQS=0 (best) or -DSQLITE_DQS=1 (second choice) if possible.
+ */
+ #if !defined(SQLITE_DQS)
+@@ -174022,6 +181671,9 @@ static int openDatabase(
+ #endif
+ #if defined(SQLITE_DEFAULT_LEGACY_ALTER_TABLE)
+                  | SQLITE_LegacyAlter
++#endif
++#if defined(SQLITE_ENABLE_STMT_SCANSTATUS)
++                 | SQLITE_StmtScanStatus
+ #endif
+       ;
+   sqlite3HashInit(&db->aCollSeq);
+@@ -174045,6 +181697,19 @@ static int openDatabase(
+     goto opendb_out;
+   }
+ 
++#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
++  /* Process magic filenames ":localStorage:" and ":sessionStorage:" */
++  if( zFilename && zFilename[0]==':' ){
++    if( strcmp(zFilename, ":localStorage:")==0 ){
++      zFilename = "file:local?vfs=kvvfs";
++      flags |= SQLITE_OPEN_URI;
++    }else if( strcmp(zFilename, ":sessionStorage:")==0 ){
++      zFilename = "file:session?vfs=kvvfs";
++      flags |= SQLITE_OPEN_URI;
++    }
++  }
++#endif /* SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL) */
++
+   /* Parse the filename/URI argument
+   **
+   ** Only allow sensible combinations of bits in the flags argument.
+@@ -174075,6 +181740,12 @@ static int openDatabase(
+     sqlite3_free(zErrMsg);
+     goto opendb_out;
+   }
++  assert( db->pVfs!=0 );
++#if SQLITE_OS_KV || defined(SQLITE_OS_KV_OPTIONAL)
++  if( sqlite3_stricmp(db->pVfs->zName, "kvvfs")==0 ){
++    db->temp_store = 2;
++  }
++#endif
+ 
+   /* Open the backend database driver */
+   rc = sqlite3BtreeOpen(db->pVfs, zOpen, db, &db->aDb[0].pBt, 0,
+@@ -174179,6 +181850,11 @@ opendb_out:
+     sqlite3GlobalConfig.xSqllog(pArg, db, zFilename, 0);
+   }
+ #endif
++
++  /* Handle encryption related URI parameters. */
++  if( rc==SQLITE_OK ){
++    rc = sqlite3mcHandleMainKey(db, zOpen);
++  }
+   sqlite3_free_filename(zOpen);
+   return rc;
+ }
+@@ -174352,6 +182028,69 @@ SQLITE_API int sqlite3_collation_needed16(
+ }
+ #endif /* SQLITE_OMIT_UTF16 */
+ 
++/*
++** Find existing client data.
++*/
++SQLITE_API void *sqlite3_get_clientdata(sqlite3 *db, const char *zName){
++  DbClientData *p;
++  sqlite3_mutex_enter(db->mutex);
++  for(p=db->pDbData; p; p=p->pNext){
++    if( strcmp(p->zName, zName)==0 ){
++      void *pResult = p->pData;
++      sqlite3_mutex_leave(db->mutex);
++      return pResult;
++    }
++  }
++  sqlite3_mutex_leave(db->mutex);
++  return 0;
++}
++
++/*
++** Add new client data to a database connection.
++*/
++SQLITE_API int sqlite3_set_clientdata(
++  sqlite3 *db,                   /* Attach client data to this connection */
++  const char *zName,             /* Name of the client data */
++  void *pData,                   /* The client data itself */
++  void (*xDestructor)(void*)     /* Destructor */
++){
++  DbClientData *p, **pp;
++  sqlite3_mutex_enter(db->mutex);
++  pp = &db->pDbData;
++  for(p=db->pDbData; p && strcmp(p->zName,zName); p=p->pNext){
++    pp = &p->pNext;
++  }
++  if( p ){
++    assert( p->pData!=0 );
++    if( p->xDestructor ) p->xDestructor(p->pData);
++    if( pData==0 ){
++      *pp = p->pNext;
++      sqlite3_free(p);
++      sqlite3_mutex_leave(db->mutex);
++      return SQLITE_OK;
++    }
++  }else if( pData==0 ){
++    sqlite3_mutex_leave(db->mutex);
++    return SQLITE_OK;
++  }else{
++    size_t n = strlen(zName);
++    p = sqlite3_malloc64( sizeof(DbClientData)+n+1 );
++    if( p==0 ){
++      if( xDestructor ) xDestructor(pData);
++      sqlite3_mutex_leave(db->mutex);
++      return SQLITE_NOMEM;
++    }
++    memcpy(p->zName, zName, n+1);
++    p->pNext = db->pDbData;
++    db->pDbData = p;
++  }
++  p->pData = pData;
++  p->xDestructor = xDestructor;
++  sqlite3_mutex_leave(db->mutex);
++  return SQLITE_OK;
++}
++
++
+ #ifndef SQLITE_OMIT_DEPRECATED
+ /*
+ ** This function is now an anachronism. It used to be used to recover from a
+@@ -174487,7 +182226,7 @@ SQLITE_API int sqlite3_table_column_metadata(
+ 
+   /* Find the column for which info is requested */
+   if( zColumnName==0 ){
+-    /* Query for existance of table only */
++    /* Query for existence of table only */
+   }else{
+     for(iCol=0; iColnCol; iCol++){
+       pCol = &pTab->aCol[iCol];
+@@ -174568,7 +182307,7 @@ SQLITE_API int sqlite3_sleep(int ms){
+   /* This function works in milliseconds, but the underlying OsSleep()
+   ** API uses microseconds. Hence the 1000's.
+   */
+-  rc = (sqlite3OsSleep(pVfs, 1000*ms)/1000);
++  rc = (sqlite3OsSleep(pVfs, ms<0 ? 0 : 1000*ms)/1000);
+   return rc;
+ }
+ 
+@@ -174624,6 +182363,9 @@ SQLITE_API int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, vo
+         sqlite3BtreeSetPageSize(pBtree, 0, iNew, 0);
+       }
+       rc = SQLITE_OK;
++    }else if( op==SQLITE_FCNTL_RESET_CACHE ){
++      sqlite3BtreeClearCache(pBtree);
++      rc = SQLITE_OK;
+     }else{
+       int nSave = db->busyHandler.nBusy;
+       rc = sqlite3OsFileControl(fd, op, pArg);
+@@ -174698,6 +182440,28 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+     }
+ #endif
+ 
++    /*  sqlite3_test_control(SQLITE_TESTCTRL_FK_NO_ACTION, sqlite3 *db, int b);
++    **
++    ** If b is true, then activate the SQLITE_FkNoAction setting.  If b is
++    ** false then clearn that setting.  If the SQLITE_FkNoAction setting is
++    ** abled, all foreign key ON DELETE and ON UPDATE actions behave as if
++    ** they were NO ACTION, regardless of how they are defined.
++    **
++    ** NB:  One must usually run "PRAGMA writable_schema=RESET" after
++    ** using this test-control, before it will take full effect.  failing
++    ** to reset the schema can result in some unexpected behavior.
++    */
++    case SQLITE_TESTCTRL_FK_NO_ACTION: {
++      sqlite3 *db = va_arg(ap, sqlite3*);
++      int b = va_arg(ap, int);
++      if( b ){
++        db->flags |= SQLITE_FkNoAction;
++      }else{
++        db->flags &= ~SQLITE_FkNoAction;
++      }
++      break;
++    }
++
+     /*
+     **  sqlite3_test_control(BITVEC_TEST, size, program)
+     **
+@@ -174804,10 +182568,12 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+         sqlite3ShowSrcList(0);
+         sqlite3ShowWith(0);
+         sqlite3ShowUpsert(0);
++#ifndef SQLITE_OMIT_TRIGGER
+         sqlite3ShowTriggerStep(0);
+         sqlite3ShowTriggerStepList(0);
+         sqlite3ShowTrigger(0);
+         sqlite3ShowTriggerList(0);
++#endif
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+         sqlite3ShowWindow(0);
+         sqlite3ShowWinFunc(0);
+@@ -174924,7 +182690,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+     ** formed and never corrupt.  This flag is clear by default, indicating that
+     ** database files might have arbitrary corruption.  Setting the flag during
+     ** testing causes certain assert() statements in the code to be activated
+-    ** that demonstrat invariants on well-formed database files.
++    ** that demonstrate invariants on well-formed database files.
+     */
+     case SQLITE_TESTCTRL_NEVER_CORRUPT: {
+       sqlite3GlobalConfig.neverCorrupt = va_arg(ap, int);
+@@ -175078,7 +182844,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+     **
+     **   op==0       Store the current sqlite3TreeTrace in *ptr
+     **   op==1       Set sqlite3TreeTrace to the value *ptr
+-    **   op==3       Store the current sqlite3WhereTrace in *ptr
++    **   op==2       Store the current sqlite3WhereTrace in *ptr
+     **   op==3       Set sqlite3WhereTrace to the value *ptr
+     */
+     case SQLITE_TESTCTRL_TRACEFLAGS: {
+@@ -175114,6 +182880,23 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+       break;
+     }
+ 
++#if !defined(SQLITE_OMIT_WSD)
++    /* sqlite3_test_control(SQLITE_TESTCTRL_USELONGDOUBLE, int X);
++    **
++    **   X<0     Make no changes to the bUseLongDouble.  Just report value.
++    **   X==0    Disable bUseLongDouble
++    **   X==1    Enable bUseLongDouble
++    **   X>=2    Set bUseLongDouble to its default value for this platform
++    */
++    case SQLITE_TESTCTRL_USELONGDOUBLE: {
++      int b = va_arg(ap, int);
++      if( b>=2 ) b = hasHighPrecisionDouble(b);
++      if( b>=0 ) sqlite3Config.bUseLongDouble = b>0;
++      rc = sqlite3Config.bUseLongDouble!=0;
++      break;
++    }
++#endif
++
+ 
+ #if defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_WSD)
+     /* sqlite3_test_control(SQLITE_TESTCTRL_TUNE, id, *piValue)
+@@ -175144,6 +182927,28 @@ SQLITE_API int sqlite3_test_control(int op, ...){
+       break;
+     }
+ #endif
++
++    /* sqlite3_test_control(SQLITE_TESTCTRL_JSON_SELFCHECK, &onOff);
++    **
++    ** Activate or deactivate validation of JSONB that is generated from
++    ** text.  Off by default, as the validation is slow.  Validation is
++    ** only available if compiled using SQLITE_DEBUG.
++    **
++    ** If onOff is initially 1, then turn it on.  If onOff is initially
++    ** off, turn it off.  If onOff is initially -1, then change onOff
++    ** to be the current setting.
++    */
++    case SQLITE_TESTCTRL_JSON_SELFCHECK: {
++#if defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_WSD)
++      int *pOnOff = va_arg(ap, int*);
++      if( *pOnOff<0 ){
++        *pOnOff = sqlite3Config.bJsonSelfcheck;
++      }else{
++        sqlite3Config.bJsonSelfcheck = (u8)((*pOnOff)&0xff);
++      }
++#endif
++      break;
++    }
+   }
+   va_end(ap);
+ #endif /* SQLITE_UNTESTABLE */
+@@ -175184,7 +182989,7 @@ static char *appendText(char *p, const char *z){
+ ** Memory layout must be compatible with that generated by the pager
+ ** and expected by sqlite3_uri_parameter() and databaseName().
+ */
+-SQLITE_API char *sqlite3_create_filename(
++SQLITE_API const char *sqlite3_create_filename(
+   const char *zDatabase,
+   const char *zJournal,
+   const char *zWal,
+@@ -175220,10 +183025,10 @@ SQLITE_API char *sqlite3_create_filename(
+ ** error to call this routine with any parameter other than a pointer
+ ** previously obtained from sqlite3_create_filename() or a NULL pointer.
+ */
+-SQLITE_API void sqlite3_free_filename(char *p){
++SQLITE_API void sqlite3_free_filename(const char *p){
+   if( p==0 ) return;
+-  p = (char*)databaseName(p);
+-  sqlite3_free(p - 4);
++  p = databaseName(p);
++  sqlite3_free((char*)p - 4);
+ }
+ 
+ 
+@@ -175414,7 +183219,7 @@ SQLITE_API int sqlite3_snapshot_get(
+ }
+ 
+ /*
+-** Open a read-transaction on the snapshot idendified by pSnapshot.
++** Open a read-transaction on the snapshot identified by pSnapshot.
+ */
+ SQLITE_API int sqlite3_snapshot_open(
+   sqlite3 *db,
+@@ -175474,8 +183279,8 @@ SQLITE_API int sqlite3_snapshot_open(
+ */
+ SQLITE_API int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb){
+   int rc = SQLITE_ERROR;
+-  int iDb;
+ #ifndef SQLITE_OMIT_WAL
++  int iDb;
+ 
+ #ifdef SQLITE_ENABLE_API_ARMOR
+   if( !sqlite3SafetyCheckOk(db) ){
+@@ -175521,7 +183326,7 @@ SQLITE_API int sqlite3_compileoption_used(const char *zOptName){
+   int nOpt;
+   const char **azCompileOpt;
+ 
+-#if SQLITE_ENABLE_API_ARMOR
++#ifdef SQLITE_ENABLE_API_ARMOR
+   if( zOptName==0 ){
+     (void)SQLITE_MISUSE_BKPT;
+     return 0;
+@@ -175716,6 +183521,9 @@ SQLITE_API int sqlite3_unlock_notify(
+ ){
+   int rc = SQLITE_OK;
+ 
++#ifdef SQLITE_ENABLE_API_ARMOR
++  if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
++#endif
+   sqlite3_mutex_enter(db->mutex);
+   enterMutex();
+ 
+@@ -176737,6 +184545,7 @@ struct Fts3Table {
+   int nPgsz;                      /* Page size for host database */
+   char *zSegmentsTbl;             /* Name of %_segments table */
+   sqlite3_blob *pSegments;        /* Blob handle open on %_segments table */
++  int iSavepoint;
+ 
+   /*
+   ** The following array of hash tables is used to buffer pending index
+@@ -177122,6 +184931,10 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsalnum(int);
+ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int);
+ #endif
+ 
++SQLITE_PRIVATE int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*);
++
++SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk);
++
+ #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */
+ #endif /* _FTSINT_H */
+ 
+@@ -177478,6 +185291,7 @@ static void fts3DeclareVtab(int *pRc, Fts3Table *p){
+ 
+     zLanguageid = (p->zLanguageid ? p->zLanguageid : "__langid");
+     sqlite3_vtab_config(p->db, SQLITE_VTAB_CONSTRAINT_SUPPORT, 1);
++    sqlite3_vtab_config(p->db, SQLITE_VTAB_INNOCUOUS);
+ 
+     /* Create a list of user columns for the virtual table */
+     zCols = sqlite3_mprintf("%Q, ", p->azColumn[0]);
+@@ -180727,6 +188541,8 @@ static int fts3RenameMethod(
+     rc = sqlite3Fts3PendingTermsFlush(p);
+   }
+ 
++  p->bIgnoreSavepoint = 1;
++
+   if( p->zContentTbl==0 ){
+     fts3DbExec(&rc, db,
+       "ALTER TABLE %Q.'%q_content'  RENAME TO '%q_content';",
+@@ -180754,6 +188570,8 @@ static int fts3RenameMethod(
+     "ALTER TABLE %Q.'%q_segdir'   RENAME TO '%q_segdir';",
+     p->zDb, p->zName, zName
+   );
++
++  p->bIgnoreSavepoint = 0;
+   return rc;
+ }
+ 
+@@ -180764,12 +188582,28 @@ static int fts3RenameMethod(
+ */
+ static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
+   int rc = SQLITE_OK;
+-  UNUSED_PARAMETER(iSavepoint);
+-  assert( ((Fts3Table *)pVtab)->inTransaction );
+-  assert( ((Fts3Table *)pVtab)->mxSavepoint <= iSavepoint );
+-  TESTONLY( ((Fts3Table *)pVtab)->mxSavepoint = iSavepoint );
+-  if( ((Fts3Table *)pVtab)->bIgnoreSavepoint==0 ){
+-    rc = fts3SyncMethod(pVtab);
++  Fts3Table *pTab = (Fts3Table*)pVtab;
++  assert( pTab->inTransaction );
++  assert( pTab->mxSavepoint<=iSavepoint );
++  TESTONLY( pTab->mxSavepoint = iSavepoint );
++
++  if( pTab->bIgnoreSavepoint==0 ){
++    if( fts3HashCount(&pTab->aIndex[0].hPending)>0 ){
++      char *zSql = sqlite3_mprintf("INSERT INTO %Q.%Q(%Q) VALUES('flush')",
++          pTab->zDb, pTab->zName, pTab->zName
++          );
++      if( zSql ){
++        pTab->bIgnoreSavepoint = 1;
++        rc = sqlite3_exec(pTab->db, zSql, 0, 0, 0);
++        pTab->bIgnoreSavepoint = 0;
++        sqlite3_free(zSql);
++      }else{
++        rc = SQLITE_NOMEM;
++      }
++    }
++    if( rc==SQLITE_OK ){
++      pTab->iSavepoint = iSavepoint+1;
++    }
+   }
+   return rc;
+ }
+@@ -180780,12 +188614,11 @@ static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
+ ** This is a no-op.
+ */
+ static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
+-  TESTONLY( Fts3Table *p = (Fts3Table*)pVtab );
+-  UNUSED_PARAMETER(iSavepoint);
+-  UNUSED_PARAMETER(pVtab);
+-  assert( p->inTransaction );
+-  assert( p->mxSavepoint >= iSavepoint );
+-  TESTONLY( p->mxSavepoint = iSavepoint-1 );
++  Fts3Table *pTab = (Fts3Table*)pVtab;
++  assert( pTab->inTransaction );
++  assert( pTab->mxSavepoint >= iSavepoint );
++  TESTONLY( pTab->mxSavepoint = iSavepoint-1 );
++  pTab->iSavepoint = iSavepoint;
+   return SQLITE_OK;
+ }
+ 
+@@ -180795,11 +188628,13 @@ static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
+ ** Discard the contents of the pending terms table.
+ */
+ static int fts3RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){
+-  Fts3Table *p = (Fts3Table*)pVtab;
++  Fts3Table *pTab = (Fts3Table*)pVtab;
+   UNUSED_PARAMETER(iSavepoint);
+-  assert( p->inTransaction );
+-  TESTONLY( p->mxSavepoint = iSavepoint );
+-  sqlite3Fts3PendingTermsClear(p);
++  assert( pTab->inTransaction );
++  TESTONLY( pTab->mxSavepoint = iSavepoint );
++  if( (iSavepoint+1)<=pTab->iSavepoint ){
++    sqlite3Fts3PendingTermsClear(pTab);
++  }
+   return SQLITE_OK;
+ }
+ 
+@@ -180818,8 +188653,40 @@ static int fts3ShadowName(const char *zName){
+   return 0;
+ }
+ 
++/*
++** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual
++** table.
++*/
++static int fts3IntegrityMethod(
++  sqlite3_vtab *pVtab,      /* The virtual table to be checked */
++  const char *zSchema,      /* Name of schema in which pVtab lives */
++  const char *zTabname,     /* Name of the pVTab table */
++  int isQuick,              /* True if this is a quick_check */
++  char **pzErr              /* Write error message here */
++){
++  Fts3Table *p = (Fts3Table*)pVtab;
++  int rc;
++  int bOk = 0;
++
++  UNUSED_PARAMETER(isQuick);
++  rc = sqlite3Fts3IntegrityCheck(p, &bOk);
++  assert( rc!=SQLITE_CORRUPT_VTAB || bOk==0 );
++  if( rc!=SQLITE_OK && rc!=SQLITE_CORRUPT_VTAB ){
++    *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
++                             " FTS%d table %s.%s: %s",
++                p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc));
++  }else if( bOk==0 ){
++    *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s",
++                p->bFts4 ? 4 : 3, zSchema, zTabname);
++  }
++  sqlite3Fts3SegmentsClose(p);
++  return SQLITE_OK;
++}
++
++
++
+ static const sqlite3_module fts3Module = {
+-  /* iVersion      */ 3,
++  /* iVersion      */ 4,
+   /* xCreate       */ fts3CreateMethod,
+   /* xConnect      */ fts3ConnectMethod,
+   /* xBestIndex    */ fts3BestIndexMethod,
+@@ -180843,6 +188710,7 @@ static const sqlite3_module fts3Module = {
+   /* xRelease      */ fts3ReleaseMethod,
+   /* xRollbackTo   */ fts3RollbackToMethod,
+   /* xShadowName   */ fts3ShadowName,
++  /* xIntegrity    */ fts3IntegrityMethod,
+ };
+ 
+ /*
+@@ -182125,9 +189993,8 @@ static void fts3EvalNextRow(
+   Fts3Expr *pExpr,                /* Expr. to advance to next matching row */
+   int *pRc                        /* IN/OUT: Error code */
+ ){
+-  if( *pRc==SQLITE_OK ){
++  if( *pRc==SQLITE_OK && pExpr->bEof==0 ){
+     int bDescDoclist = pCsr->bDesc;         /* Used by DOCID_CMP() macro */
+-    assert( pExpr->bEof==0 );
+     pExpr->bStart = 1;
+ 
+     switch( pExpr->eType ){
+@@ -182603,6 +190470,22 @@ static void fts3EvalUpdateCounts(Fts3Expr *pExpr, int nCol){
+   }
+ }
+ 
++/*
++** This is an sqlite3Fts3ExprIterate() callback. If the Fts3Expr.aMI[] array
++** has not yet been allocated, allocate and zero it. Otherwise, just zero
++** it.
++*/
++static int fts3AllocateMSI(Fts3Expr *pExpr, int iPhrase, void *pCtx){
++  Fts3Table *pTab = (Fts3Table*)pCtx;
++  UNUSED_PARAMETER(iPhrase);
++  if( pExpr->aMI==0 ){
++    pExpr->aMI = (u32 *)sqlite3_malloc64(pTab->nColumn * 3 * sizeof(u32));
++    if( pExpr->aMI==0 ) return SQLITE_NOMEM;
++  }
++  memset(pExpr->aMI, 0, pTab->nColumn * 3 * sizeof(u32));
++  return SQLITE_OK;
++}
++
+ /*
+ ** Expression pExpr must be of type FTSQUERY_PHRASE.
+ **
+@@ -182624,7 +190507,6 @@ static int fts3EvalGatherStats(
+   if( pExpr->aMI==0 ){
+     Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab;
+     Fts3Expr *pRoot;                /* Root of NEAR expression */
+-    Fts3Expr *p;                    /* Iterator used for several purposes */
+ 
+     sqlite3_int64 iPrevId = pCsr->iPrevId;
+     sqlite3_int64 iDocid;
+@@ -182632,7 +190514,9 @@ static int fts3EvalGatherStats(
+ 
+     /* Find the root of the NEAR expression */
+     pRoot = pExpr;
+-    while( pRoot->pParent && pRoot->pParent->eType==FTSQUERY_NEAR ){
++    while( pRoot->pParent
++        && (pRoot->pParent->eType==FTSQUERY_NEAR || pRoot->bDeferred)
++    ){
+       pRoot = pRoot->pParent;
+     }
+     iDocid = pRoot->iDocid;
+@@ -182640,14 +190524,8 @@ static int fts3EvalGatherStats(
+     assert( pRoot->bStart );
+ 
+     /* Allocate space for the aMSI[] array of each FTSQUERY_PHRASE node */
+-    for(p=pRoot; p; p=p->pLeft){
+-      Fts3Expr *pE = (p->eType==FTSQUERY_PHRASE?p:p->pRight);
+-      assert( pE->aMI==0 );
+-      pE->aMI = (u32 *)sqlite3_malloc64(pTab->nColumn * 3 * sizeof(u32));
+-      if( !pE->aMI ) return SQLITE_NOMEM;
+-      memset(pE->aMI, 0, pTab->nColumn * 3 * sizeof(u32));
+-    }
+-
++    rc = sqlite3Fts3ExprIterate(pRoot, fts3AllocateMSI, (void*)pTab);
++    if( rc!=SQLITE_OK ) return rc;
+     fts3EvalRestart(pCsr, pRoot, &rc);
+ 
+     while( pCsr->isEof==0 && rc==SQLITE_OK ){
+@@ -182803,6 +190681,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
+     u8 bTreeEof = 0;
+     Fts3Expr *p;                  /* Used to iterate from pExpr to root */
+     Fts3Expr *pNear;              /* Most senior NEAR ancestor (or pExpr) */
++    Fts3Expr *pRun;               /* Closest non-deferred ancestor of pNear */
+     int bMatch;
+ 
+     /* Check if this phrase descends from an OR expression node. If not,
+@@ -182817,25 +190696,30 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
+       if( p->bEof ) bTreeEof = 1;
+     }
+     if( bOr==0 ) return SQLITE_OK;
++    pRun = pNear;
++    while( pRun->bDeferred ){
++      assert( pRun->pParent );
++      pRun = pRun->pParent;
++    }
+ 
+     /* This is the descendent of an OR node. In this case we cannot use
+     ** an incremental phrase. Load the entire doclist for the phrase
+     ** into memory in this case.  */
+     if( pPhrase->bIncr ){
+-      int bEofSave = pNear->bEof;
+-      fts3EvalRestart(pCsr, pNear, &rc);
+-      while( rc==SQLITE_OK && !pNear->bEof ){
+-        fts3EvalNextRow(pCsr, pNear, &rc);
+-        if( bEofSave==0 && pNear->iDocid==iDocid ) break;
++      int bEofSave = pRun->bEof;
++      fts3EvalRestart(pCsr, pRun, &rc);
++      while( rc==SQLITE_OK && !pRun->bEof ){
++        fts3EvalNextRow(pCsr, pRun, &rc);
++        if( bEofSave==0 && pRun->iDocid==iDocid ) break;
+       }
+       assert( rc!=SQLITE_OK || pPhrase->bIncr==0 );
+-      if( rc==SQLITE_OK && pNear->bEof!=bEofSave ){
++      if( rc==SQLITE_OK && pRun->bEof!=bEofSave ){
+         rc = FTS_CORRUPT_VTAB;
+       }
+     }
+     if( bTreeEof ){
+-      while( rc==SQLITE_OK && !pNear->bEof ){
+-        fts3EvalNextRow(pCsr, pNear, &rc);
++      while( rc==SQLITE_OK && !pRun->bEof ){
++        fts3EvalNextRow(pCsr, pRun, &rc);
+       }
+     }
+     if( rc!=SQLITE_OK ) return rc;
+@@ -183502,7 +191386,8 @@ SQLITE_PRIVATE int sqlite3Fts3InitAux(sqlite3 *db){
+      0,                           /* xSavepoint    */
+      0,                           /* xRelease      */
+      0,                           /* xRollbackTo   */
+-     0                            /* xShadowName   */
++     0,                           /* xShadowName   */
++     0                            /* xIntegrity    */
+   };
+   int rc;                         /* Return code */
+ 
+@@ -187068,7 +194953,8 @@ SQLITE_PRIVATE int sqlite3Fts3InitTok(sqlite3 *db, Fts3Hash *pHash, void(*xDestr
+      0,                           /* xSavepoint    */
+      0,                           /* xRelease      */
+      0,                           /* xRollbackTo   */
+-     0                            /* xShadowName   */
++     0,                           /* xShadowName   */
++     0                            /* xIntegrity    */
+   };
+   int rc;                         /* Return code */
+ 
+@@ -189751,16 +197637,18 @@ static int fts3MsrBufferData(
+   char *pList,
+   i64 nList
+ ){
+-  if( nList>pMsr->nBuffer ){
++  if( (nList+FTS3_NODE_PADDING)>pMsr->nBuffer ){
+     char *pNew;
+-    pMsr->nBuffer = nList*2;
+-    pNew = (char *)sqlite3_realloc64(pMsr->aBuffer, pMsr->nBuffer);
++    int nNew = nList*2 + FTS3_NODE_PADDING;
++    pNew = (char *)sqlite3_realloc64(pMsr->aBuffer, nNew);
+     if( !pNew ) return SQLITE_NOMEM;
+     pMsr->aBuffer = pNew;
++    pMsr->nBuffer = nNew;
+   }
+ 
+   assert( nList>0 );
+   memcpy(pMsr->aBuffer, pList, nList);
++  memset(&pMsr->aBuffer[nList], 0, FTS3_NODE_PADDING);
+   return SQLITE_OK;
+ }
+ 
+@@ -190407,7 +198295,6 @@ SQLITE_PRIVATE int sqlite3Fts3PendingTermsFlush(Fts3Table *p){
+     rc = fts3SegmentMerge(p, p->iPrevLangid, i, FTS3_SEGCURSOR_PENDING);
+     if( rc==SQLITE_DONE ) rc = SQLITE_OK;
+   }
+-  sqlite3Fts3PendingTermsClear(p);
+ 
+   /* Determine the auto-incr-merge setting if unknown.  If enabled,
+   ** estimate the number of leaf blocks of content to be written
+@@ -190429,6 +198316,10 @@ SQLITE_PRIVATE int sqlite3Fts3PendingTermsFlush(Fts3Table *p){
+       rc = sqlite3_reset(pStmt);
+     }
+   }
++
++  if( rc==SQLITE_OK ){
++    sqlite3Fts3PendingTermsClear(p);
++  }
+   return rc;
+ }
+ 
+@@ -191060,6 +198951,8 @@ static int fts3AppendToNode(
+ 
+   blobGrowBuffer(pPrev, nTerm, &rc);
+   if( rc!=SQLITE_OK ) return rc;
++  assert( pPrev!=0 );
++  assert( pPrev->a!=0 );
+ 
+   nPrefix = fts3PrefixCompress(pPrev->a, pPrev->n, zTerm, nTerm);
+   nSuffix = nTerm - nPrefix;
+@@ -191116,9 +199009,13 @@ static int fts3IncrmergeAppend(
+   nSpace += sqlite3Fts3VarintLen(nDoclist) + nDoclist;
+ 
+   /* If the current block is not empty, and if adding this term/doclist
+-  ** to the current block would make it larger than Fts3Table.nNodeSize
+-  ** bytes, write this block out to the database. */
+-  if( pLeaf->block.n>0 && (pLeaf->block.n + nSpace)>p->nNodeSize ){
++  ** to the current block would make it larger than Fts3Table.nNodeSize bytes,
++  ** and if there is still room for another leaf page, write this block out to
++  ** the database. */
++  if( pLeaf->block.n>0
++   && (pLeaf->block.n + nSpace)>p->nNodeSize
++   && pLeaf->iBlock < (pWriter->iStart + pWriter->nLeafEst)
++  ){
+     rc = fts3WriteSegment(p, pLeaf->iBlock, pLeaf->block.a, pLeaf->block.n);
+     pWriter->nWork++;
+ 
+@@ -191429,6 +199326,7 @@ static int fts3IncrmergeLoad(
+ 
+       for(i=nHeight; i>=0 && rc==SQLITE_OK; i--){
+         NodeReader reader;
++        memset(&reader, 0, sizeof(reader));
+         pNode = &pWriter->aNodeWriter[i];
+ 
+         if( pNode->block.a){
+@@ -191449,7 +199347,7 @@ static int fts3IncrmergeLoad(
+               rc = sqlite3Fts3ReadBlock(p, reader.iChild, &aBlock, &nBlock,0);
+               blobGrowBuffer(&pNode->block,
+                   MAX(nBlock, p->nNodeSize)+FTS3_NODE_PADDING, &rc
+-                  );
++              );
+               if( rc==SQLITE_OK ){
+                 memcpy(pNode->block.a, aBlock, nBlock);
+                 pNode->block.n = nBlock;
+@@ -192299,7 +200197,7 @@ static u64 fts3ChecksumIndex(
+   int rc;
+   u64 cksum = 0;
+ 
+-  assert( *pRc==SQLITE_OK );
++  if( *pRc ) return 0;
+ 
+   memset(&filter, 0, sizeof(filter));
+   memset(&csr, 0, sizeof(csr));
+@@ -192366,7 +200264,7 @@ static u64 fts3ChecksumIndex(
+ ** If an error occurs (e.g. an OOM or IO error), return an SQLite error
+ ** code. The final value of *pbOk is undefined in this case.
+ */
+-static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){
++SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){
+   int rc = SQLITE_OK;             /* Return code */
+   u64 cksum1 = 0;                 /* Checksum based on FTS index contents */
+   u64 cksum2 = 0;                 /* Checksum based on %_content contents */
+@@ -192444,7 +200342,7 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){
+     sqlite3_finalize(pStmt);
+   }
+ 
+-  *pbOk = (cksum1==cksum2);
++  *pbOk = (rc==SQLITE_OK && cksum1==cksum2);
+   return rc;
+ }
+ 
+@@ -192484,7 +200382,7 @@ static int fts3DoIntegrityCheck(
+ ){
+   int rc;
+   int bOk = 0;
+-  rc = fts3IntegrityCheck(p, &bOk);
++  rc = sqlite3Fts3IntegrityCheck(p, &bOk);
+   if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB;
+   return rc;
+ }
+@@ -192514,8 +200412,11 @@ static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
+     rc = fts3DoIncrmerge(p, &zVal[6]);
+   }else if( nVal>10 && 0==sqlite3_strnicmp(zVal, "automerge=", 10) ){
+     rc = fts3DoAutoincrmerge(p, &zVal[10]);
++  }else if( nVal==5 && 0==sqlite3_strnicmp(zVal, "flush", 5) ){
++    rc = sqlite3Fts3PendingTermsFlush(p);
++  }
+ #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
+-  }else{
++  else{
+     int v;
+     if( nVal>9 && 0==sqlite3_strnicmp(zVal, "nodesize=", 9) ){
+       v = atoi(&zVal[9]);
+@@ -192533,8 +200434,8 @@ static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
+       if( v>=4 && v<=FTS3_MERGE_COUNT && (v&1)==0 ) p->nMergeCount = v;
+       rc = SQLITE_OK;
+     }
+-#endif
+   }
++#endif
+   return rc;
+ }
+ 
+@@ -192942,7 +200843,7 @@ typedef sqlite3_int64 i64;
+ 
+ 
+ /*
+-** Used as an fts3ExprIterate() context when loading phrase doclists to
++** Used as an sqlite3Fts3ExprIterate() context when loading phrase doclists to
+ ** Fts3Expr.aDoclist[]/nDoclist.
+ */
+ typedef struct LoadDoclistCtx LoadDoclistCtx;
+@@ -192986,7 +200887,7 @@ struct SnippetFragment {
+ };
+ 
+ /*
+-** This type is used as an fts3ExprIterate() context object while
++** This type is used as an sqlite3Fts3ExprIterate() context object while
+ ** accumulating the data returned by the matchinfo() function.
+ */
+ typedef struct MatchInfo MatchInfo;
+@@ -193145,7 +201046,7 @@ static void fts3GetDeltaPosition(char **pp, i64 *piPos){
+ }
+ 
+ /*
+-** Helper function for fts3ExprIterate() (see below).
++** Helper function for sqlite3Fts3ExprIterate() (see below).
+ */
+ static int fts3ExprIterate2(
+   Fts3Expr *pExpr,                /* Expression to iterate phrases of */
+@@ -193179,7 +201080,7 @@ static int fts3ExprIterate2(
+ ** Otherwise, SQLITE_OK is returned after a callback has been made for
+ ** all eligible phrase nodes.
+ */
+-static int fts3ExprIterate(
++SQLITE_PRIVATE int sqlite3Fts3ExprIterate(
+   Fts3Expr *pExpr,                /* Expression to iterate phrases of */
+   int (*x)(Fts3Expr*,int,void*),  /* Callback function to invoke for phrases */
+   void *pCtx                      /* Second argument to pass to callback */
+@@ -193188,10 +201089,9 @@ static int fts3ExprIterate(
+   return fts3ExprIterate2(pExpr, &iPhrase, x, pCtx);
+ }
+ 
+-
+ /*
+-** This is an fts3ExprIterate() callback used while loading the doclists
+-** for each phrase into Fts3Expr.aDoclist[]/nDoclist. See also
++** This is an sqlite3Fts3ExprIterate() callback used while loading the
++** doclists for each phrase into Fts3Expr.aDoclist[]/nDoclist. See also
+ ** fts3ExprLoadDoclists().
+ */
+ static int fts3ExprLoadDoclistsCb(Fts3Expr *pExpr, int iPhrase, void *ctx){
+@@ -193223,9 +201123,9 @@ static int fts3ExprLoadDoclists(
+   int *pnToken                    /* OUT: Number of tokens in query */
+ ){
+   int rc;                         /* Return Code */
+-  LoadDoclistCtx sCtx = {0,0,0};  /* Context for fts3ExprIterate() */
++  LoadDoclistCtx sCtx = {0,0,0};  /* Context for sqlite3Fts3ExprIterate() */
+   sCtx.pCsr = pCsr;
+-  rc = fts3ExprIterate(pCsr->pExpr, fts3ExprLoadDoclistsCb, (void *)&sCtx);
++  rc = sqlite3Fts3ExprIterate(pCsr->pExpr,fts3ExprLoadDoclistsCb,(void*)&sCtx);
+   if( pnPhrase ) *pnPhrase = sCtx.nPhrase;
+   if( pnToken ) *pnToken = sCtx.nToken;
+   return rc;
+@@ -193238,7 +201138,7 @@ static int fts3ExprPhraseCountCb(Fts3Expr *pExpr, int iPhrase, void *ctx){
+ }
+ static int fts3ExprPhraseCount(Fts3Expr *pExpr){
+   int nPhrase = 0;
+-  (void)fts3ExprIterate(pExpr, fts3ExprPhraseCountCb, (void *)&nPhrase);
++  (void)sqlite3Fts3ExprIterate(pExpr, fts3ExprPhraseCountCb, (void *)&nPhrase);
+   return nPhrase;
+ }
+ 
+@@ -193366,8 +201266,9 @@ static void fts3SnippetDetails(
+ }
+ 
+ /*
+-** This function is an fts3ExprIterate() callback used by fts3BestSnippet().
+-** Each invocation populates an element of the SnippetIter.aPhrase[] array.
++** This function is an sqlite3Fts3ExprIterate() callback used by
++** fts3BestSnippet().  Each invocation populates an element of the
++** SnippetIter.aPhrase[] array.
+ */
+ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
+   SnippetIter *p = (SnippetIter *)ctx;
+@@ -193457,7 +201358,9 @@ static int fts3BestSnippet(
+   sIter.nSnippet = nSnippet;
+   sIter.nPhrase = nList;
+   sIter.iCurrent = -1;
+-  rc = fts3ExprIterate(pCsr->pExpr, fts3SnippetFindPositions, (void*)&sIter);
++  rc = sqlite3Fts3ExprIterate(
++      pCsr->pExpr, fts3SnippetFindPositions, (void*)&sIter
++  );
+   if( rc==SQLITE_OK ){
+ 
+     /* Set the *pmSeen output variable. */
+@@ -193818,10 +201721,10 @@ static int fts3ExprLHitGather(
+ }
+ 
+ /*
+-** fts3ExprIterate() callback used to collect the "global" matchinfo stats
+-** for a single query.
++** sqlite3Fts3ExprIterate() callback used to collect the "global" matchinfo
++** stats for a single query.
+ **
+-** fts3ExprIterate() callback to load the 'global' elements of a
++** sqlite3Fts3ExprIterate() callback to load the 'global' elements of a
+ ** FTS3_MATCHINFO_HITS matchinfo array. The global stats are those elements
+ ** of the matchinfo array that are constant for all rows returned by the
+ ** current query.
+@@ -193856,7 +201759,7 @@ static int fts3ExprGlobalHitsCb(
+ }
+ 
+ /*
+-** fts3ExprIterate() callback used to collect the "local" part of the
++** sqlite3Fts3ExprIterate() callback used to collect the "local" part of the
+ ** FTS3_MATCHINFO_HITS array. The local stats are those elements of the
+ ** array that are different for each row returned by the query.
+ */
+@@ -194052,7 +201955,7 @@ static int fts3MatchinfoLcs(Fts3Cursor *pCsr, MatchInfo *pInfo){
+   **/
+   aIter = sqlite3Fts3MallocZero(sizeof(LcsIterator) * pCsr->nPhrase);
+   if( !aIter ) return SQLITE_NOMEM;
+-  (void)fts3ExprIterate(pCsr->pExpr, fts3MatchinfoLcsCb, (void*)aIter);
++  (void)sqlite3Fts3ExprIterate(pCsr->pExpr, fts3MatchinfoLcsCb, (void*)aIter);
+ 
+   for(i=0; inPhrase; i++){
+     LcsIterator *pIter = &aIter[i];
+@@ -194229,11 +202132,11 @@ static int fts3MatchinfoValues(
+             rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &pInfo->nDoc,0,0);
+             if( rc!=SQLITE_OK ) break;
+           }
+-          rc = fts3ExprIterate(pExpr, fts3ExprGlobalHitsCb,(void*)pInfo);
++          rc = sqlite3Fts3ExprIterate(pExpr, fts3ExprGlobalHitsCb,(void*)pInfo);
+           sqlite3Fts3EvalTestDeferred(pCsr, &rc);
+           if( rc!=SQLITE_OK ) break;
+         }
+-        (void)fts3ExprIterate(pExpr, fts3ExprLocalHitsCb,(void*)pInfo);
++        (void)sqlite3Fts3ExprIterate(pExpr, fts3ExprLocalHitsCb,(void*)pInfo);
+         break;
+       }
+     }
+@@ -194456,7 +202359,7 @@ struct TermOffsetCtx {
+ };
+ 
+ /*
+-** This function is an fts3ExprIterate() callback used by sqlite3Fts3Offsets().
++** This function is an sqlite3Fts3ExprIterate() callback used by sqlite3Fts3Offsets().
+ */
+ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){
+   TermOffsetCtx *p = (TermOffsetCtx *)ctx;
+@@ -194538,7 +202441,9 @@ SQLITE_PRIVATE void sqlite3Fts3Offsets(
+     */
+     sCtx.iCol = iCol;
+     sCtx.iTerm = 0;
+-    rc = fts3ExprIterate(pCsr->pExpr, fts3ExprTermOffsetInit, (void*)&sCtx);
++    rc = sqlite3Fts3ExprIterate(
++        pCsr->pExpr, fts3ExprTermOffsetInit, (void*)&sCtx
++    );
+     if( rc!=SQLITE_OK ) goto offsets_out;
+ 
+     /* Retreive the text stored in column iCol. If an SQL NULL is stored
+@@ -195451,59 +203356,242 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int c, int eRemoveDiacritic){
+ **
+ ******************************************************************************
+ **
+-** This SQLite JSON functions.
++** SQLite JSON functions.
+ **
+ ** This file began as an extension in ext/misc/json1.c in 2015.  That
+ ** extension proved so useful that it has now been moved into the core.
+ **
+-** For the time being, all JSON is stored as pure text.  (We might add
+-** a JSONB type in the future which stores a binary encoding of JSON in
+-** a BLOB, but there is no support for JSONB in the current implementation.
+-** This implementation parses JSON text at 250 MB/s, so it is hard to see
+-** how JSONB might improve on that.)
++** The original design stored all JSON as pure text, canonical RFC-8259.
++** Support for JSON-5 extensions was added with version 3.42.0 (2023-05-16).
++** All generated JSON text still conforms strictly to RFC-8259, but text
++** with JSON-5 extensions is accepted as input.
++**
++** Beginning with version 3.45.0 (circa 2024-01-01), these routines also
++** accept BLOB values that have JSON encoded using a binary representation
++** called "JSONB".  The name JSONB comes from PostgreSQL, however the on-disk
++** format SQLite JSONB is completely different and incompatible with
++** PostgreSQL JSONB.
++**
++** Decoding and interpreting JSONB is still O(N) where N is the size of
++** the input, the same as text JSON.  However, the constant of proportionality
++** for JSONB is much smaller due to faster parsing.  The size of each
++** element in JSONB is encoded in its header, so there is no need to search
++** for delimiters using persnickety syntax rules.  JSONB seems to be about
++** 3x faster than text JSON as a result.  JSONB is also tends to be slightly
++** smaller than text JSON, by 5% or 10%, but there are corner cases where
++** JSONB can be slightly larger.  So you are not far mistaken to say that
++** a JSONB blob is the same size as the equivalent RFC-8259 text.
++**
++**
++** THE JSONB ENCODING:
++**
++** Every JSON element is encoded in JSONB as a header and a payload.
++** The header is between 1 and 9 bytes in size.  The payload is zero
++** or more bytes.
++**
++** The lower 4 bits of the first byte of the header determines the
++** element type:
++**
++**    0:   NULL
++**    1:   TRUE
++**    2:   FALSE
++**    3:   INT        -- RFC-8259 integer literal
++**    4:   INT5       -- JSON5 integer literal
++**    5:   FLOAT      -- RFC-8259 floating point literal
++**    6:   FLOAT5     -- JSON5 floating point literal
++**    7:   TEXT       -- Text literal acceptable to both SQL and JSON
++**    8:   TEXTJ      -- Text containing RFC-8259 escapes
++**    9:   TEXT5      -- Text containing JSON5 and/or RFC-8259 escapes
++**   10:   TEXTRAW    -- Text containing unescaped syntax characters
++**   11:   ARRAY
++**   12:   OBJECT
++**
++** The other three possible values (13-15) are reserved for future
++** enhancements.
++**
++** The upper 4 bits of the first byte determine the size of the header
++** and sometimes also the size of the payload.  If X is the first byte
++** of the element and if X>>4 is between 0 and 11, then the payload
++** will be that many bytes in size and the header is exactly one byte
++** in size.  Other four values for X>>4 (12-15) indicate that the header
++** is more than one byte in size and that the payload size is determined
++** by the remainder of the header, interpreted as a unsigned big-endian
++** integer.
++**
++**   Value of X>>4         Size integer        Total header size
++**   -------------     --------------------    -----------------
++**        12           1 byte (0-255)                2
++**        13           2 byte (0-65535)              3
++**        14           4 byte (0-4294967295)         5
++**        15           8 byte (0-1.8e19)             9
++**
++** The payload size need not be expressed in its minimal form.  For example,
++** if the payload size is 10, the size can be expressed in any of 5 different
++** ways: (1) (X>>4)==10, (2) (X>>4)==12 following by on 0x0a byte,
++** (3) (X>>4)==13 followed by 0x00 and 0x0a, (4) (X>>4)==14 followed by
++** 0x00 0x00 0x00 0x0a, or (5) (X>>4)==15 followed by 7 bytes of 0x00 and
++** a single byte of 0x0a.  The shorter forms are preferred, of course, but
++** sometimes when generating JSONB, the payload size is not known in advance
++** and it is convenient to reserve sufficient header space to cover the
++** largest possible payload size and then come back later and patch up
++** the size when it becomes known, resulting in a non-minimal encoding.
++**
++** The value (X>>4)==15 is not actually used in the current implementation
++** (as SQLite is currently unable handle BLOBs larger than about 2GB)
++** but is included in the design to allow for future enhancements.
++**
++** The payload follows the header.  NULL, TRUE, and FALSE have no payload and
++** their payload size must always be zero.  The payload for INT, INT5,
++** FLOAT, FLOAT5, TEXT, TEXTJ, TEXT5, and TEXTROW is text.  Note that the
++** "..." or '...' delimiters are omitted from the various text encodings.
++** The payload for ARRAY and OBJECT is a list of additional elements that
++** are the content for the array or object.  The payload for an OBJECT
++** must be an even number of elements.  The first element of each pair is
++** the label and must be of type TEXT, TEXTJ, TEXT5, or TEXTRAW.
++**
++** A valid JSONB blob consists of a single element, as described above.
++** Usually this will be an ARRAY or OBJECT element which has many more
++** elements as its content.  But the overall blob is just a single element.
++**
++** Input validation for JSONB blobs simply checks that the element type
++** code is between 0 and 12 and that the total size of the element
++** (header plus payload) is the same as the size of the BLOB.  If those
++** checks are true, the BLOB is assumed to be JSONB and processing continues.
++** Errors are only raised if some other miscoding is discovered during
++** processing.
++**
++** Additional information can be found in the doc/jsonb.md file of the
++** canonical SQLite source tree.
+ */
+ #ifndef SQLITE_OMIT_JSON
+ /* #include "sqliteInt.h" */
+ 
++/* JSONB element types
++*/
++#define JSONB_NULL     0   /* "null" */
++#define JSONB_TRUE     1   /* "true" */
++#define JSONB_FALSE    2   /* "false" */
++#define JSONB_INT      3   /* integer acceptable to JSON and SQL */
++#define JSONB_INT5     4   /* integer in 0x000 notation */
++#define JSONB_FLOAT    5   /* float acceptable to JSON and SQL */
++#define JSONB_FLOAT5   6   /* float with JSON5 extensions */
++#define JSONB_TEXT     7   /* Text compatible with both JSON and SQL */
++#define JSONB_TEXTJ    8   /* Text with JSON escapes */
++#define JSONB_TEXT5    9   /* Text with JSON-5 escape */
++#define JSONB_TEXTRAW 10   /* SQL text that needs escaping for JSON */
++#define JSONB_ARRAY   11   /* An array */
++#define JSONB_OBJECT  12   /* An object */
++
++/* Human-readable names for the JSONB values.  The index for each
++** string must correspond to the JSONB_* integer above.
++*/
++static const char * const jsonbType[] = {
++  "null", "true", "false", "integer", "integer",
++  "real", "real", "text",  "text",    "text",
++  "text", "array", "object", "", "", "", ""
++};
++
+ /*
+ ** Growing our own isspace() routine this way is twice as fast as
+ ** the library isspace() function, resulting in a 7% overall performance
+-** increase for the parser.  (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
++** increase for the text-JSON parser.  (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
+ */
+ static const char jsonIsSpace[] = {
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 1, 1, 0, 0, 1, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  1, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 1, 1, 0, 0, 1, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  1, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++};
++#define jsonIsspace(x) (jsonIsSpace[(unsigned char)x])
++
++/*
++** The set of all space characters recognized by jsonIsspace().
++** Useful as the second argument to strspn().
++*/
++static const char jsonSpaces[] = "\011\012\015\040";
++
++/*
++** Characters that are special to JSON.  Control characters,
++** '"' and '\\' and '\''.  Actually, '\'' is not special to
++** canonical JSON, but it is special in JSON-5, so we include
++** it in the set of special characters.
++*/
++static const char jsonIsOk[256] = {
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
++  1, 1, 0, 1, 1, 1, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 0, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1
+ };
+-#define fast_isspace(x) (jsonIsSpace[(unsigned char)x])
+-
+-#if !defined(SQLITE_DEBUG) && !defined(SQLITE_COVERAGE_TEST)
+-#  define VVA(X)
+-#else
+-#  define VVA(X) X
+-#endif
+ 
+ /* Objects */
++typedef struct JsonCache JsonCache;
+ typedef struct JsonString JsonString;
+-typedef struct JsonNode JsonNode;
+ typedef struct JsonParse JsonParse;
+ 
++/*
++** Magic number used for the JSON parse cache in sqlite3_get_auxdata()
++*/
++#define JSON_CACHE_ID    (-429938)  /* Cache entry */
++#define JSON_CACHE_SIZE  4          /* Max number of cache entries */
++
++/*
++** jsonUnescapeOneChar() returns this invalid code point if it encounters
++** a syntax error.
++*/
++#define JSON_INVALID_CHAR 0x99999
++
++/* A cache mapping JSON text into JSONB blobs.
++**
++** Each cache entry is a JsonParse object with the following restrictions:
++**
++**    *   The bReadOnly flag must be set
++**
++**    *   The aBlob[] array must be owned by the JsonParse object.  In other
++**        words, nBlobAlloc must be non-zero.
++**
++**    *   eEdit and delta must be zero.
++**
++**    *   zJson must be an RCStr.  In other words bJsonIsRCStr must be true.
++*/
++struct JsonCache {
++  sqlite3 *db;                    /* Database connection */
++  int nUsed;                      /* Number of active entries in the cache */
++  JsonParse *a[JSON_CACHE_SIZE];  /* One line for each cache entry */
++};
++
+ /* An instance of this object represents a JSON string
+ ** under construction.  Really, this is a generic string accumulator
+ ** that can be and is used to create strings other than JSON.
++**
++** If the generated string is longer than will fit into the zSpace[] buffer,
++** then it will be an RCStr string.  This aids with caching of large
++** JSON strings.
+ */
+ struct JsonString {
+   sqlite3_context *pCtx;   /* Function context - put error messages here */
+@@ -195511,89 +203599,227 @@ struct JsonString {
+   u64 nAlloc;              /* Bytes of storage available in zBuf[] */
+   u64 nUsed;               /* Bytes of zBuf[] currently used */
+   u8 bStatic;              /* True if zBuf is static space */
+-  u8 bErr;                 /* True if an error has been encountered */
++  u8 eErr;                 /* True if an error has been encountered */
+   char zSpace[100];        /* Initial static space */
+ };
+ 
+-/* JSON type values
+-*/
+-#define JSON_NULL     0
+-#define JSON_TRUE     1
+-#define JSON_FALSE    2
+-#define JSON_INT      3
+-#define JSON_REAL     4
+-#define JSON_STRING   5
+-#define JSON_ARRAY    6
+-#define JSON_OBJECT   7
++/* Allowed values for JsonString.eErr */
++#define JSTRING_OOM         0x01   /* Out of memory */
++#define JSTRING_MALFORMED   0x02   /* Malformed JSONB */
++#define JSTRING_ERR         0x04   /* Error already sent to sqlite3_result */
+ 
+-/* The "subtype" set for JSON values */
++/* The "subtype" set for text JSON values passed through using
++** sqlite3_result_subtype() and sqlite3_value_subtype().
++*/
+ #define JSON_SUBTYPE  74    /* Ascii for "J" */
+ 
+ /*
+-** Names of the various JSON types:
+-*/
+-static const char * const jsonType[] = {
+-  "null", "true", "false", "integer", "real", "text", "array", "object"
+-};
+-
+-/* Bit values for the JsonNode.jnFlag field
++** Bit values for the flags passed into various SQL function implementations
++** via the sqlite3_user_data() value.
+ */
+-#define JNODE_RAW     0x01         /* Content is raw, not JSON encoded */
+-#define JNODE_ESCAPE  0x02         /* Content is text with \ escapes */
+-#define JNODE_REMOVE  0x04         /* Do not output */
+-#define JNODE_REPLACE 0x08         /* Replace with JsonNode.u.iReplace */
+-#define JNODE_PATCH   0x10         /* Patch with JsonNode.u.pPatch */
+-#define JNODE_APPEND  0x20         /* More ARRAY/OBJECT entries at u.iAppend */
+-#define JNODE_LABEL   0x40         /* Is a label of an object */
++#define JSON_JSON      0x01        /* Result is always JSON */
++#define JSON_SQL       0x02        /* Result is always SQL */
++#define JSON_ABPATH    0x03        /* Allow abbreviated JSON path specs */
++#define JSON_ISSET     0x04        /* json_set(), not json_insert() */
++#define JSON_BLOB      0x08        /* Use the BLOB output format */
+ 
+ 
+-/* A single node of parsed JSON
+-*/
+-struct JsonNode {
+-  u8 eType;              /* One of the JSON_ type values */
+-  u8 jnFlags;            /* JNODE flags */
+-  u8 eU;                 /* Which union element to use */
+-  u32 n;                 /* Bytes of content, or number of sub-nodes */
+-  union {
+-    const char *zJContent; /* 1: Content for INT, REAL, and STRING */
+-    u32 iAppend;           /* 2: More terms for ARRAY and OBJECT */
+-    u32 iKey;              /* 3: Key for ARRAY objects in json_tree() */
+-    u32 iReplace;          /* 4: Replacement content for JNODE_REPLACE */
+-    JsonNode *pPatch;      /* 5: Node chain of patch for JNODE_PATCH */
+-  } u;
+-};
+-
+-/* A completely parsed JSON string
++/* A parsed JSON value.  Lifecycle:
++**
++**   1.  JSON comes in and is parsed into a JSONB value in aBlob.  The
++**       original text is stored in zJson.  This step is skipped if the
++**       input is JSONB instead of text JSON.
++**
++**   2.  The aBlob[] array is searched using the JSON path notation, if needed.
++**
++**   3.  Zero or more changes are made to aBlob[] (via json_remove() or
++**       json_replace() or json_patch() or similar).
++**
++**   4.  New JSON text is generated from the aBlob[] for output.  This step
++**       is skipped if the function is one of the jsonb_* functions that
++**       returns JSONB instead of text JSON.
+ */
+ struct JsonParse {
+-  u32 nNode;         /* Number of slots of aNode[] used */
+-  u32 nAlloc;        /* Number of slots of aNode[] allocated */
+-  JsonNode *aNode;   /* Array of nodes containing the parse */
+-  const char *zJson; /* Original JSON string */
+-  u32 *aUp;          /* Index of parent of each node */
+-  u8 oom;            /* Set to true if out of memory */
+-  u8 nErr;           /* Number of errors seen */
+-  u16 iDepth;        /* Nesting depth */
++  u8 *aBlob;         /* JSONB representation of JSON value */
++  u32 nBlob;         /* Bytes of aBlob[] actually used */
++  u32 nBlobAlloc;    /* Bytes allocated to aBlob[].  0 if aBlob is external */
++  char *zJson;       /* Json text used for parsing */
++  sqlite3 *db;       /* The database connection to which this object belongs */
+   int nJson;         /* Length of the zJson string in bytes */
+-  u32 iHold;         /* Replace cache line with the lowest iHold value */
++  u32 nJPRef;        /* Number of references to this object */
++  u32 iErr;          /* Error location in zJson[] */
++  u16 iDepth;        /* Nesting depth */
++  u8 nErr;           /* Number of errors seen */
++  u8 oom;            /* Set to true if out of memory */
++  u8 bJsonIsRCStr;   /* True if zJson is an RCStr */
++  u8 hasNonstd;      /* True if input uses non-standard features like JSON5 */
++  u8 bReadOnly;      /* Do not modify. */
++  /* Search and edit information.  See jsonLookupStep() */
++  u8 eEdit;          /* Edit operation to apply */
++  int delta;         /* Size change due to the edit */
++  u32 nIns;          /* Number of bytes to insert */
++  u32 iLabel;        /* Location of label if search landed on an object value */
++  u8 *aIns;          /* Content to be inserted */
+ };
+ 
++/* Allowed values for JsonParse.eEdit */
++#define JEDIT_DEL   1   /* Delete if exists */
++#define JEDIT_REPL  2   /* Overwrite if exists */
++#define JEDIT_INS   3   /* Insert if not exists */
++#define JEDIT_SET   4   /* Insert or overwrite */
++
+ /*
+ ** Maximum nesting depth of JSON for this implementation.
+ **
+ ** This limit is needed to avoid a stack overflow in the recursive
+-** descent parser.  A depth of 2000 is far deeper than any sane JSON
+-** should go.
++** descent parser.  A depth of 1000 is far deeper than any sane JSON
++** should go.  Historical note: This limit was 2000 prior to version 3.42.0
++*/
++#ifndef SQLITE_JSON_MAX_DEPTH
++# define JSON_MAX_DEPTH  1000
++#else
++# define JSON_MAX_DEPTH SQLITE_JSON_MAX_DEPTH
++#endif
++
++/*
++** Allowed values for the flgs argument to jsonParseFuncArg();
++*/
++#define JSON_EDITABLE  0x01   /* Generate a writable JsonParse object */
++#define JSON_KEEPERROR 0x02   /* Return non-NULL even if there is an error */
++
++/**************************************************************************
++** Forward references
++**************************************************************************/
++static void jsonReturnStringAsBlob(JsonString*);
++static int jsonFuncArgMightBeBinary(sqlite3_value *pJson);
++static u32 jsonTranslateBlobToText(const JsonParse*,u32,JsonString*);
++static void jsonReturnParse(sqlite3_context*,JsonParse*);
++static JsonParse *jsonParseFuncArg(sqlite3_context*,sqlite3_value*,u32);
++static void jsonParseFree(JsonParse*);
++static u32 jsonbPayloadSize(const JsonParse*, u32, u32*);
++static u32 jsonUnescapeOneChar(const char*, u32, u32*);
++
++/**************************************************************************
++** Utility routines for dealing with JsonCache objects
++**************************************************************************/
++
++/*
++** Free a JsonCache object.
++*/
++static void jsonCacheDelete(JsonCache *p){
++  int i;
++  for(i=0; inUsed; i++){
++    jsonParseFree(p->a[i]);
++  }
++  sqlite3DbFree(p->db, p);
++}
++static void jsonCacheDeleteGeneric(void *p){
++  jsonCacheDelete((JsonCache*)p);
++}
++
++/*
++** Insert a new entry into the cache.  If the cache is full, expel
++** the least recently used entry.  Return SQLITE_OK on success or a
++** result code otherwise.
++**
++** Cache entries are stored in age order, oldest first.
++*/
++static int jsonCacheInsert(
++  sqlite3_context *ctx,   /* The SQL statement context holding the cache */
++  JsonParse *pParse       /* The parse object to be added to the cache */
++){
++  JsonCache *p;
++
++  assert( pParse->zJson!=0 );
++  assert( pParse->bJsonIsRCStr );
++  assert( pParse->delta==0 );
++  p = sqlite3_get_auxdata(ctx, JSON_CACHE_ID);
++  if( p==0 ){
++    sqlite3 *db = sqlite3_context_db_handle(ctx);
++    p = sqlite3DbMallocZero(db, sizeof(*p));
++    if( p==0 ) return SQLITE_NOMEM;
++    p->db = db;
++    sqlite3_set_auxdata(ctx, JSON_CACHE_ID, p, jsonCacheDeleteGeneric);
++    p = sqlite3_get_auxdata(ctx, JSON_CACHE_ID);
++    if( p==0 ) return SQLITE_NOMEM;
++  }
++  if( p->nUsed >= JSON_CACHE_SIZE ){
++    jsonParseFree(p->a[0]);
++    memmove(p->a, &p->a[1], (JSON_CACHE_SIZE-1)*sizeof(p->a[0]));
++    p->nUsed = JSON_CACHE_SIZE-1;
++  }
++  assert( pParse->nBlobAlloc>0 );
++  pParse->eEdit = 0;
++  pParse->nJPRef++;
++  pParse->bReadOnly = 1;
++  p->a[p->nUsed] = pParse;
++  p->nUsed++;
++  return SQLITE_OK;
++}
++
++/*
++** Search for a cached translation the json text supplied by pArg.  Return
++** the JsonParse object if found.  Return NULL if not found.
++**
++** When a match if found, the matching entry is moved to become the
++** most-recently used entry if it isn't so already.
++**
++** The JsonParse object returned still belongs to the Cache and might
++** be deleted at any moment.  If the caller whants the JsonParse to
++** linger, it needs to increment the nPJRef reference counter.
+ */
+-#define JSON_MAX_DEPTH  2000
++static JsonParse *jsonCacheSearch(
++  sqlite3_context *ctx,    /* The SQL statement context holding the cache */
++  sqlite3_value *pArg      /* Function argument containing SQL text */
++){
++  JsonCache *p;
++  int i;
++  const char *zJson;
++  int nJson;
++
++  if( sqlite3_value_type(pArg)!=SQLITE_TEXT ){
++    return 0;
++  }
++  zJson = (const char*)sqlite3_value_text(pArg);
++  if( zJson==0 ) return 0;
++  nJson = sqlite3_value_bytes(pArg);
++
++  p = sqlite3_get_auxdata(ctx, JSON_CACHE_ID);
++  if( p==0 ){
++    return 0;
++  }
++  for(i=0; inUsed; i++){
++    if( p->a[i]->zJson==zJson ) break;
++  }
++  if( i>=p->nUsed ){
++    for(i=0; inUsed; i++){
++      if( p->a[i]->nJson!=nJson ) continue;
++      if( memcmp(p->a[i]->zJson, zJson, nJson)==0 ) break;
++    }
++  }
++  if( inUsed ){
++    if( inUsed-1 ){
++      /* Make the matching entry the most recently used entry */
++      JsonParse *tmp = p->a[i];
++      memmove(&p->a[i], &p->a[i+1], (p->nUsed-i-1)*sizeof(tmp));
++      p->a[p->nUsed-1] = tmp;
++      i = p->nUsed - 1;
++    }
++    assert( p->a[i]->delta==0 );
++    return p->a[i];
++  }else{
++    return 0;
++  }
++}
+ 
+ /**************************************************************************
+ ** Utility routines for dealing with JsonString objects
+ **************************************************************************/
+ 
+-/* Set the JsonString object to an empty string
++/* Turn uninitialized bulk memory into a valid JsonString object
++** holding a zero-length string.
+ */
+-static void jsonZero(JsonString *p){
++static void jsonStringZero(JsonString *p){
+   p->zBuf = p->zSpace;
+   p->nAlloc = sizeof(p->zSpace);
+   p->nUsed = 0;
+@@ -195602,53 +203828,51 @@ static void jsonZero(JsonString *p){
+ 
+ /* Initialize the JsonString object
+ */
+-static void jsonInit(JsonString *p, sqlite3_context *pCtx){
++static void jsonStringInit(JsonString *p, sqlite3_context *pCtx){
+   p->pCtx = pCtx;
+-  p->bErr = 0;
+-  jsonZero(p);
++  p->eErr = 0;
++  jsonStringZero(p);
+ }
+ 
+-
+ /* Free all allocated memory and reset the JsonString object back to its
+ ** initial state.
+ */
+-static void jsonReset(JsonString *p){
+-  if( !p->bStatic ) sqlite3_free(p->zBuf);
+-  jsonZero(p);
++static void jsonStringReset(JsonString *p){
++  if( !p->bStatic ) sqlite3RCStrUnref(p->zBuf);
++  jsonStringZero(p);
+ }
+ 
+-
+ /* Report an out-of-memory (OOM) condition
+ */
+-static void jsonOom(JsonString *p){
+-  p->bErr = 1;
+-  sqlite3_result_error_nomem(p->pCtx);
+-  jsonReset(p);
++static void jsonStringOom(JsonString *p){
++  p->eErr |= JSTRING_OOM;
++  if( p->pCtx ) sqlite3_result_error_nomem(p->pCtx);
++  jsonStringReset(p);
+ }
+ 
+ /* Enlarge pJson->zBuf so that it can hold at least N more bytes.
+ ** Return zero on success.  Return non-zero on an OOM error
+ */
+-static int jsonGrow(JsonString *p, u32 N){
++static int jsonStringGrow(JsonString *p, u32 N){
+   u64 nTotal = NnAlloc ? p->nAlloc*2 : p->nAlloc+N+10;
+   char *zNew;
+   if( p->bStatic ){
+-    if( p->bErr ) return 1;
+-    zNew = sqlite3_malloc64(nTotal);
++    if( p->eErr ) return 1;
++    zNew = sqlite3RCStrNew(nTotal);
+     if( zNew==0 ){
+-      jsonOom(p);
++      jsonStringOom(p);
+       return SQLITE_NOMEM;
+     }
+     memcpy(zNew, p->zBuf, (size_t)p->nUsed);
+     p->zBuf = zNew;
+     p->bStatic = 0;
+   }else{
+-    zNew = sqlite3_realloc64(p->zBuf, nTotal);
+-    if( zNew==0 ){
+-      jsonOom(p);
++    p->zBuf = sqlite3RCStrResize(p->zBuf, nTotal);
++    if( p->zBuf==0 ){
++      p->eErr |= JSTRING_OOM;
++      jsonStringZero(p);
+       return SQLITE_NOMEM;
+     }
+-    p->zBuf = zNew;
+   }
+   p->nAlloc = nTotal;
+   return SQLITE_OK;
+@@ -195656,18 +203880,41 @@ static int jsonGrow(JsonString *p, u32 N){
+ 
+ /* Append N bytes from zIn onto the end of the JsonString string.
+ */
+-static void jsonAppendRaw(JsonString *p, const char *zIn, u32 N){
+-  if( N==0 ) return;
+-  if( (N+p->nUsed >= p->nAlloc) && jsonGrow(p,N)!=0 ) return;
++static SQLITE_NOINLINE void jsonStringExpandAndAppend(
++  JsonString *p,
++  const char *zIn,
++  u32 N
++){
++  assert( N>0 );
++  if( jsonStringGrow(p,N) ) return;
+   memcpy(p->zBuf+p->nUsed, zIn, N);
+   p->nUsed += N;
+ }
++static void jsonAppendRaw(JsonString *p, const char *zIn, u32 N){
++  if( N==0 ) return;
++  if( N+p->nUsed >= p->nAlloc ){
++    jsonStringExpandAndAppend(p,zIn,N);
++  }else{
++    memcpy(p->zBuf+p->nUsed, zIn, N);
++    p->nUsed += N;
++  }
++}
++static void jsonAppendRawNZ(JsonString *p, const char *zIn, u32 N){
++  assert( N>0 );
++  if( N+p->nUsed >= p->nAlloc ){
++    jsonStringExpandAndAppend(p,zIn,N);
++  }else{
++    memcpy(p->zBuf+p->nUsed, zIn, N);
++    p->nUsed += N;
++  }
++}
++
+ 
+ /* Append formatted text (not to exceed N bytes) to the JsonString.
+ */
+ static void jsonPrintf(int N, JsonString *p, const char *zFormat, ...){
+   va_list ap;
+-  if( (p->nUsed + N >= p->nAlloc) && jsonGrow(p, N) ) return;
++  if( (p->nUsed + N >= p->nAlloc) && jsonStringGrow(p, N) ) return;
+   va_start(ap, zFormat);
+   sqlite3_vsnprintf(N, p->zBuf+p->nUsed, zFormat, ap);
+   va_end(ap);
+@@ -195676,10 +203923,38 @@ static void jsonPrintf(int N, JsonString *p, const char *zFormat, ...){
+ 
+ /* Append a single character
+ */
+-static void jsonAppendChar(JsonString *p, char c){
+-  if( p->nUsed>=p->nAlloc && jsonGrow(p,1)!=0 ) return;
++static SQLITE_NOINLINE void jsonAppendCharExpand(JsonString *p, char c){
++  if( jsonStringGrow(p,1) ) return;
+   p->zBuf[p->nUsed++] = c;
+ }
++static void jsonAppendChar(JsonString *p, char c){
++  if( p->nUsed>=p->nAlloc ){
++    jsonAppendCharExpand(p,c);
++  }else{
++    p->zBuf[p->nUsed++] = c;
++  }
++}
++
++/* Remove a single character from the end of the string
++*/
++static void jsonStringTrimOneChar(JsonString *p){
++  if( p->eErr==0 ){
++    assert( p->nUsed>0 );
++    p->nUsed--;
++  }
++}
++
++
++/* Make sure there is a zero terminator on p->zBuf[]
++**
++** Return true on success.  Return false if an OOM prevents this
++** from happening.
++*/
++static int jsonStringTerminate(JsonString *p){
++  jsonAppendChar(p, 0);
++  jsonStringTrimOneChar(p);
++  return p->eErr==0;
++}
+ 
+ /* Append a comma separator to the output buffer, if the previous
+ ** character is not '[' or '{'.
+@@ -195688,25 +203963,76 @@ static void jsonAppendSeparator(JsonString *p){
+   char c;
+   if( p->nUsed==0 ) return;
+   c = p->zBuf[p->nUsed-1];
+-  if( c!='[' && c!='{' ) jsonAppendChar(p, ',');
++  if( c=='[' || c=='{' ) return;
++  jsonAppendChar(p, ',');
+ }
+ 
+ /* Append the N-byte string in zIn to the end of the JsonString string
+-** under construction.  Enclose the string in "..." and escape
+-** any double-quotes or backslash characters contained within the
++** under construction.  Enclose the string in double-quotes ("...") and
++** escape any double-quotes or backslash characters contained within the
+ ** string.
++**
++** This routine is a high-runner.  There is a measurable performance
++** increase associated with unwinding the jsonIsOk[] loop.
+ */
+ static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
+-  u32 i;
+-  if( zIn==0 || ((N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0) ) return;
++  u32 k;
++  u8 c;
++  const u8 *z = (const u8*)zIn;
++  if( z==0 ) return;
++  if( (N+p->nUsed+2 >= p->nAlloc) && jsonStringGrow(p,N+2)!=0 ) return;
+   p->zBuf[p->nUsed++] = '"';
+-  for(i=0; i=N ){
++        while( k=N ){
++      if( k>0 ){
++        memcpy(&p->zBuf[p->nUsed], z, k);
++        p->nUsed += k;
++      }
++      break;
++    }
++    if( k>0 ){
++      memcpy(&p->zBuf[p->nUsed], z, k);
++      p->nUsed += k;
++      z += k;
++      N -= k;
++    }
++    c = z[0];
+     if( c=='"' || c=='\\' ){
+       json_simple_escape:
+-      if( (p->nUsed+N+3-i > p->nAlloc) && jsonGrow(p,N+3-i)!=0 ) return;
++      if( (p->nUsed+N+3 > p->nAlloc) && jsonStringGrow(p,N+3)!=0 ) return;
+       p->zBuf[p->nUsed++] = '\\';
+-    }else if( c<=0x1f ){
++      p->zBuf[p->nUsed++] = c;
++    }else if( c=='\'' ){
++      p->zBuf[p->nUsed++] = c;
++    }else{
+       static const char aSpecial[] = {
+          0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0,
+          0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0,   0,   0, 0, 0
+@@ -195717,39 +204043,44 @@ static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
+       assert( aSpecial['\n']=='n' );
+       assert( aSpecial['\r']=='r' );
+       assert( aSpecial['\t']=='t' );
++      assert( c>=0 && cnUsed+N+7+i > p->nAlloc) && jsonGrow(p,N+7-i)!=0 ) return;
++      if( (p->nUsed+N+7 > p->nAlloc) && jsonStringGrow(p,N+7)!=0 ) return;
+       p->zBuf[p->nUsed++] = '\\';
+       p->zBuf[p->nUsed++] = 'u';
+       p->zBuf[p->nUsed++] = '0';
+       p->zBuf[p->nUsed++] = '0';
+-      p->zBuf[p->nUsed++] = '0' + (c>>4);
+-      c = "0123456789abcdef"[c&0xf];
++      p->zBuf[p->nUsed++] = "0123456789abcdef"[c>>4];
++      p->zBuf[p->nUsed++] = "0123456789abcdef"[c&0xf];
+     }
+-    p->zBuf[p->nUsed++] = c;
++    z++;
++    N--;
+   }
+   p->zBuf[p->nUsed++] = '"';
+   assert( p->nUsednAlloc );
+ }
+ 
+ /*
+-** Append a function parameter value to the JSON string under
+-** construction.
++** Append an sqlite3_value (such as a function parameter) to the JSON
++** string under construction in p.
+ */
+-static void jsonAppendValue(
++static void jsonAppendSqlValue(
+   JsonString *p,                 /* Append to this JSON string */
+   sqlite3_value *pValue          /* Value to append */
+ ){
+   switch( sqlite3_value_type(pValue) ){
+     case SQLITE_NULL: {
+-      jsonAppendRaw(p, "null", 4);
++      jsonAppendRawNZ(p, "null", 4);
+       break;
+     }
+-    case SQLITE_INTEGER:
+     case SQLITE_FLOAT: {
++      jsonPrintf(100, p, "%!0.15g", sqlite3_value_double(pValue));
++      break;
++    }
++    case SQLITE_INTEGER: {
+       const char *z = (const char*)sqlite3_value_text(pValue);
+       u32 n = (u32)sqlite3_value_bytes(pValue);
+       jsonAppendRaw(p, z, n);
+@@ -195766,184 +204097,127 @@ static void jsonAppendValue(
+       break;
+     }
+     default: {
+-      if( p->bErr==0 ){
++      if( jsonFuncArgMightBeBinary(pValue) ){
++        JsonParse px;
++        memset(&px, 0, sizeof(px));
++        px.aBlob = (u8*)sqlite3_value_blob(pValue);
++        px.nBlob = sqlite3_value_bytes(pValue);
++        jsonTranslateBlobToText(&px, 0, p);
++      }else if( p->eErr==0 ){
+         sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
+-        p->bErr = 2;
+-        jsonReset(p);
++        p->eErr = JSTRING_ERR;
++        jsonStringReset(p);
+       }
+       break;
+     }
+   }
+ }
+ 
+-
+-/* Make the JSON in p the result of the SQL function.
++/* Make the text in p (which is probably a generated JSON text string)
++** the result of the SQL function.
++**
++** The JsonString is reset.
++**
++** If pParse and ctx are both non-NULL, then the SQL string in p is
++** loaded into the zJson field of the pParse object as a RCStr and the
++** pParse is added to the cache.
+ */
+-static void jsonResult(JsonString *p){
+-  if( p->bErr==0 ){
+-    sqlite3_result_text64(p->pCtx, p->zBuf, p->nUsed,
+-                          p->bStatic ? SQLITE_TRANSIENT : sqlite3_free,
+-                          SQLITE_UTF8);
+-    jsonZero(p);
++static void jsonReturnString(
++  JsonString *p,            /* String to return */
++  JsonParse *pParse,        /* JSONB source or NULL */
++  sqlite3_context *ctx      /* Where to cache */
++){
++  assert( (pParse!=0)==(ctx!=0) );
++  assert( ctx==0 || ctx==p->pCtx );
++  if( p->eErr==0 ){
++    int flags = SQLITE_PTR_TO_INT(sqlite3_user_data(p->pCtx));
++    if( flags & JSON_BLOB ){
++      jsonReturnStringAsBlob(p);
++    }else if( p->bStatic ){
++      sqlite3_result_text64(p->pCtx, p->zBuf, p->nUsed,
++                            SQLITE_TRANSIENT, SQLITE_UTF8);
++    }else if( jsonStringTerminate(p) ){
++      if( pParse && pParse->bJsonIsRCStr==0 && pParse->nBlobAlloc>0 ){
++        int rc;
++        pParse->zJson = sqlite3RCStrRef(p->zBuf);
++        pParse->nJson = p->nUsed;
++        pParse->bJsonIsRCStr = 1;
++        rc = jsonCacheInsert(ctx, pParse);
++        if( rc==SQLITE_NOMEM ){
++          sqlite3_result_error_nomem(ctx);
++          jsonStringReset(p);
++          return;
++        }
++      }
++      sqlite3_result_text64(p->pCtx, sqlite3RCStrRef(p->zBuf), p->nUsed,
++                            sqlite3RCStrUnref,
++                            SQLITE_UTF8);
++    }else{
++      sqlite3_result_error_nomem(p->pCtx);
++    }
++  }else if( p->eErr & JSTRING_OOM ){
++    sqlite3_result_error_nomem(p->pCtx);
++  }else if( p->eErr & JSTRING_MALFORMED ){
++    sqlite3_result_error(p->pCtx, "malformed JSON", -1);
+   }
+-  assert( p->bStatic );
++  jsonStringReset(p);
+ }
+ 
+ /**************************************************************************
+-** Utility routines for dealing with JsonNode and JsonParse objects
++** Utility routines for dealing with JsonParse objects
+ **************************************************************************/
+ 
+-/*
+-** Return the number of consecutive JsonNode slots need to represent
+-** the parsed JSON at pNode.  The minimum answer is 1.  For ARRAY and
+-** OBJECT types, the number might be larger.
+-**
+-** Appended elements are not counted.  The value returned is the number
+-** by which the JsonNode counter should increment in order to go to the
+-** next peer value.
+-*/
+-static u32 jsonNodeSize(JsonNode *pNode){
+-  return pNode->eType>=JSON_ARRAY ? pNode->n+1 : 1;
+-}
+-
+ /*
+ ** Reclaim all memory allocated by a JsonParse object.  But do not
+ ** delete the JsonParse object itself.
+ */
+ static void jsonParseReset(JsonParse *pParse){
+-  sqlite3_free(pParse->aNode);
+-  pParse->aNode = 0;
+-  pParse->nNode = 0;
+-  pParse->nAlloc = 0;
+-  sqlite3_free(pParse->aUp);
+-  pParse->aUp = 0;
++  assert( pParse->nJPRef<=1 );
++  if( pParse->bJsonIsRCStr ){
++    sqlite3RCStrUnref(pParse->zJson);
++    pParse->zJson = 0;
++    pParse->nJson = 0;
++    pParse->bJsonIsRCStr = 0;
++  }
++  if( pParse->nBlobAlloc ){
++    sqlite3DbFree(pParse->db, pParse->aBlob);
++    pParse->aBlob = 0;
++    pParse->nBlob = 0;
++    pParse->nBlobAlloc = 0;
++  }
+ }
+ 
+ /*
+-** Free a JsonParse object that was obtained from sqlite3_malloc().
++** Decrement the reference count on the JsonParse object.  When the
++** count reaches zero, free the object.
+ */
+ static void jsonParseFree(JsonParse *pParse){
+-  jsonParseReset(pParse);
+-  sqlite3_free(pParse);
+-}
+-
+-/*
+-** Convert the JsonNode pNode into a pure JSON string and
+-** append to pOut.  Subsubstructure is also included.  Return
+-** the number of JsonNode objects that are encoded.
+-*/
+-static void jsonRenderNode(
+-  JsonNode *pNode,               /* The node to render */
+-  JsonString *pOut,              /* Write JSON here */
+-  sqlite3_value **aReplace       /* Replacement values */
+-){
+-  assert( pNode!=0 );
+-  if( pNode->jnFlags & (JNODE_REPLACE|JNODE_PATCH) ){
+-    if( (pNode->jnFlags & JNODE_REPLACE)!=0 && ALWAYS(aReplace!=0) ){
+-      assert( pNode->eU==4 );
+-      jsonAppendValue(pOut, aReplace[pNode->u.iReplace]);
+-      return;
+-    }
+-    assert( pNode->eU==5 );
+-    pNode = pNode->u.pPatch;
+-  }
+-  switch( pNode->eType ){
+-    default: {
+-      assert( pNode->eType==JSON_NULL );
+-      jsonAppendRaw(pOut, "null", 4);
+-      break;
+-    }
+-    case JSON_TRUE: {
+-      jsonAppendRaw(pOut, "true", 4);
+-      break;
+-    }
+-    case JSON_FALSE: {
+-      jsonAppendRaw(pOut, "false", 5);
+-      break;
+-    }
+-    case JSON_STRING: {
+-      if( pNode->jnFlags & JNODE_RAW ){
+-        assert( pNode->eU==1 );
+-        jsonAppendString(pOut, pNode->u.zJContent, pNode->n);
+-        break;
+-      }
+-      /* no break */ deliberate_fall_through
+-    }
+-    case JSON_REAL:
+-    case JSON_INT: {
+-      assert( pNode->eU==1 );
+-      jsonAppendRaw(pOut, pNode->u.zJContent, pNode->n);
+-      break;
+-    }
+-    case JSON_ARRAY: {
+-      u32 j = 1;
+-      jsonAppendChar(pOut, '[');
+-      for(;;){
+-        while( j<=pNode->n ){
+-          if( (pNode[j].jnFlags & JNODE_REMOVE)==0 ){
+-            jsonAppendSeparator(pOut);
+-            jsonRenderNode(&pNode[j], pOut, aReplace);
+-          }
+-          j += jsonNodeSize(&pNode[j]);
+-        }
+-        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
+-        assert( pNode->eU==2 );
+-        pNode = &pNode[pNode->u.iAppend];
+-        j = 1;
+-      }
+-      jsonAppendChar(pOut, ']');
+-      break;
+-    }
+-    case JSON_OBJECT: {
+-      u32 j = 1;
+-      jsonAppendChar(pOut, '{');
+-      for(;;){
+-        while( j<=pNode->n ){
+-          if( (pNode[j+1].jnFlags & JNODE_REMOVE)==0 ){
+-            jsonAppendSeparator(pOut);
+-            jsonRenderNode(&pNode[j], pOut, aReplace);
+-            jsonAppendChar(pOut, ':');
+-            jsonRenderNode(&pNode[j+1], pOut, aReplace);
+-          }
+-          j += 1 + jsonNodeSize(&pNode[j+1]);
+-        }
+-        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
+-        assert( pNode->eU==2 );
+-        pNode = &pNode[pNode->u.iAppend];
+-        j = 1;
+-      }
+-      jsonAppendChar(pOut, '}');
+-      break;
++  if( pParse ){
++    if( pParse->nJPRef>1 ){
++      pParse->nJPRef--;
++    }else{
++      jsonParseReset(pParse);
++      sqlite3DbFree(pParse->db, pParse);
+     }
+   }
+ }
+ 
+-/*
+-** Return a JsonNode and all its descendents as a JSON string.
+-*/
+-static void jsonReturnJson(
+-  JsonNode *pNode,            /* Node to return */
+-  sqlite3_context *pCtx,      /* Return value for this function */
+-  sqlite3_value **aReplace    /* Array of replacement values */
+-){
+-  JsonString s;
+-  jsonInit(&s, pCtx);
+-  jsonRenderNode(pNode, &s, aReplace);
+-  jsonResult(&s);
+-  sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
+-}
++/**************************************************************************
++** Utility routines for the JSON text parser
++**************************************************************************/
+ 
+ /*
+ ** Translate a single byte of Hex into an integer.
+-** This routine only works if h really is a valid hexadecimal
+-** character:  0..9a..fA..F
++** This routine only gives a correct answer if h really is a valid hexadecimal
++** character:  0..9a..fA..F.  But unlike sqlite3HexToInt(), it does not
++** assert() if the digit is not hex.
+ */
+ static u8 jsonHexToInt(int h){
+-  assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
++#ifdef SQLITE_ASCII
++  h += 9*(1&(h>>6));
++#endif
+ #ifdef SQLITE_EBCDIC
+   h += 9*(1&~(h>>4));
+-#else
+-  h += 9*(1&(h>>6));
+ #endif
+   return (u8)(h & 0xf);
+ }
+@@ -195953,10 +204227,6 @@ static u8 jsonHexToInt(int h){
+ */
+ static u32 jsonHexToInt4(const char *z){
+   u32 v;
+-  assert( sqlite3Isxdigit(z[0]) );
+-  assert( sqlite3Isxdigit(z[1]) );
+-  assert( sqlite3Isxdigit(z[2]) );
+-  assert( sqlite3Isxdigit(z[3]) );
+   v = (jsonHexToInt(z[0])<<12)
+     + (jsonHexToInt(z[1])<<8)
+     + (jsonHexToInt(z[2])<<4)
+@@ -195965,420 +204235,1098 @@ static u32 jsonHexToInt4(const char *z){
+ }
+ 
+ /*
+-** Make the JsonNode the return value of the function.
++** Return true if z[] begins with 2 (or more) hexadecimal digits
+ */
+-static void jsonReturn(
+-  JsonNode *pNode,            /* Node to return */
+-  sqlite3_context *pCtx,      /* Return value for this function */
+-  sqlite3_value **aReplace    /* Array of replacement values */
+-){
+-  switch( pNode->eType ){
+-    default: {
+-      assert( pNode->eType==JSON_NULL );
+-      sqlite3_result_null(pCtx);
+-      break;
+-    }
+-    case JSON_TRUE: {
+-      sqlite3_result_int(pCtx, 1);
+-      break;
+-    }
+-    case JSON_FALSE: {
+-      sqlite3_result_int(pCtx, 0);
+-      break;
+-    }
+-    case JSON_INT: {
+-      sqlite3_int64 i = 0;
+-      const char *z;
+-      assert( pNode->eU==1 );
+-      z = pNode->u.zJContent;
+-      if( z[0]=='-' ){ z++; }
+-      while( z[0]>='0' && z[0]<='9' ){
+-        unsigned v = *(z++) - '0';
+-        if( i>=LARGEST_INT64/10 ){
+-          if( i>LARGEST_INT64/10 ) goto int_as_real;
+-          if( z[0]>='0' && z[0]<='9' ) goto int_as_real;
+-          if( v==9 ) goto int_as_real;
+-          if( v==8 ){
+-            if( pNode->u.zJContent[0]=='-' ){
+-              sqlite3_result_int64(pCtx, SMALLEST_INT64);
+-              goto int_done;
+-            }else{
+-              goto int_as_real;
++static int jsonIs2Hex(const char *z){
++  return sqlite3Isxdigit(z[0]) && sqlite3Isxdigit(z[1]);
++}
++
++/*
++** Return true if z[] begins with 4 (or more) hexadecimal digits
++*/
++static int jsonIs4Hex(const char *z){
++  return jsonIs2Hex(z) && jsonIs2Hex(&z[2]);
++}
++
++/*
++** Return the number of bytes of JSON5 whitespace at the beginning of
++** the input string z[].
++**
++** JSON5 whitespace consists of any of the following characters:
++**
++**    Unicode  UTF-8         Name
++**    U+0009   09            horizontal tab
++**    U+000a   0a            line feed
++**    U+000b   0b            vertical tab
++**    U+000c   0c            form feed
++**    U+000d   0d            carriage return
++**    U+0020   20            space
++**    U+00a0   c2 a0         non-breaking space
++**    U+1680   e1 9a 80      ogham space mark
++**    U+2000   e2 80 80      en quad
++**    U+2001   e2 80 81      em quad
++**    U+2002   e2 80 82      en space
++**    U+2003   e2 80 83      em space
++**    U+2004   e2 80 84      three-per-em space
++**    U+2005   e2 80 85      four-per-em space
++**    U+2006   e2 80 86      six-per-em space
++**    U+2007   e2 80 87      figure space
++**    U+2008   e2 80 88      punctuation space
++**    U+2009   e2 80 89      thin space
++**    U+200a   e2 80 8a      hair space
++**    U+2028   e2 80 a8      line separator
++**    U+2029   e2 80 a9      paragraph separator
++**    U+202f   e2 80 af      narrow no-break space (NNBSP)
++**    U+205f   e2 81 9f      medium mathematical space (MMSP)
++**    U+3000   e3 80 80      ideographical space
++**    U+FEFF   ef bb bf      byte order mark
++**
++** In addition, comments between '/', '*' and '*', '/' and
++** from '/', '/' to end-of-line are also considered to be whitespace.
++*/
++static int json5Whitespace(const char *zIn){
++  int n = 0;
++  const u8 *z = (u8*)zIn;
++  while( 1 /*exit by "goto whitespace_done"*/ ){
++    switch( z[n] ){
++      case 0x09:
++      case 0x0a:
++      case 0x0b:
++      case 0x0c:
++      case 0x0d:
++      case 0x20: {
++        n++;
++        break;
++      }
++      case '/': {
++        if( z[n+1]=='*' && z[n+2]!=0 ){
++          int j;
++          for(j=n+3; z[j]!='/' || z[j-1]!='*'; j++){
++            if( z[j]==0 ) goto whitespace_done;
++          }
++          n = j+1;
++          break;
++        }else if( z[n+1]=='/' ){
++          int j;
++          char c;
++          for(j=n+2; (c = z[j])!=0; j++){
++            if( c=='\n' || c=='\r' ) break;
++            if( 0xe2==(u8)c && 0x80==(u8)z[j+1]
++             && (0xa8==(u8)z[j+2] || 0xa9==(u8)z[j+2])
++            ){
++              j += 2;
++              break;
+             }
+           }
++          n = j;
++          if( z[n] ) n++;
++          break;
+         }
+-        i = i*10 + v;
++        goto whitespace_done;
+       }
+-      if( pNode->u.zJContent[0]=='-' ){ i = -i; }
+-      sqlite3_result_int64(pCtx, i);
+-      int_done:
+-      break;
+-      int_as_real: ; /* no break */ deliberate_fall_through
+-    }
+-    case JSON_REAL: {
+-      double r;
+-#ifdef SQLITE_AMALGAMATION
+-      const char *z;
+-      assert( pNode->eU==1 );
+-      z = pNode->u.zJContent;
+-      sqlite3AtoF(z, &r, sqlite3Strlen30(z), SQLITE_UTF8);
+-#else
+-      assert( pNode->eU==1 );
+-      r = strtod(pNode->u.zJContent, 0);
+-#endif
+-      sqlite3_result_double(pCtx, r);
+-      break;
+-    }
+-    case JSON_STRING: {
+-#if 0 /* Never happens because JNODE_RAW is only set by json_set(),
+-      ** json_insert() and json_replace() and those routines do not
+-      ** call jsonReturn() */
+-      if( pNode->jnFlags & JNODE_RAW ){
+-        assert( pNode->eU==1 );
+-        sqlite3_result_text(pCtx, pNode->u.zJContent, pNode->n,
+-                            SQLITE_TRANSIENT);
+-      }else
+-#endif
+-      assert( (pNode->jnFlags & JNODE_RAW)==0 );
+-      if( (pNode->jnFlags & JNODE_ESCAPE)==0 ){
+-        /* JSON formatted without any backslash-escapes */
+-        assert( pNode->eU==1 );
+-        sqlite3_result_text(pCtx, pNode->u.zJContent+1, pNode->n-2,
+-                            SQLITE_TRANSIENT);
+-      }else{
+-        /* Translate JSON formatted string into raw text */
+-        u32 i;
+-        u32 n = pNode->n;
+-        const char *z;
+-        char *zOut;
+-        u32 j;
+-        assert( pNode->eU==1 );
+-        z = pNode->u.zJContent;
+-        zOut = sqlite3_malloc( n+1 );
+-        if( zOut==0 ){
+-          sqlite3_result_error_nomem(pCtx);
++      case 0xc2: {
++        if( z[n+1]==0xa0 ){
++          n += 2;
+           break;
+         }
+-        for(i=1, j=0; i>6));
+-                zOut[j++] = 0x80 | (v&0x3f);
+-              }else{
+-                u32 vlo;
+-                if( (v&0xfc00)==0xd800
+-                  && i>18);
+-                  zOut[j++] = 0x80 | ((v>>12)&0x3f);
+-                  zOut[j++] = 0x80 | ((v>>6)&0x3f);
+-                  zOut[j++] = 0x80 | (v&0x3f);
+-                }else{
+-                  zOut[j++] = 0xe0 | (v>>12);
+-                  zOut[j++] = 0x80 | ((v>>6)&0x3f);
+-                  zOut[j++] = 0x80 | (v&0x3f);
+-                }
+-              }
+-            }else{
+-              if( c=='b' ){
+-                c = '\b';
+-              }else if( c=='f' ){
+-                c = '\f';
+-              }else if( c=='n' ){
+-                c = '\n';
+-              }else if( c=='r' ){
+-                c = '\r';
+-              }else if( c=='t' ){
+-                c = '\t';
+-              }
+-              zOut[j++] = c;
+-            }
++        goto whitespace_done;
++      }
++      case 0xe1: {
++        if( z[n+1]==0x9a && z[n+2]==0x80 ){
++          n += 3;
++          break;
++        }
++        goto whitespace_done;
++      }
++      case 0xe2: {
++        if( z[n+1]==0x80 ){
++          u8 c = z[n+2];
++          if( c<0x80 ) goto whitespace_done;
++          if( c<=0x8a || c==0xa8 || c==0xa9 || c==0xaf ){
++            n += 3;
++            break;
+           }
++        }else if( z[n+1]==0x81 && z[n+2]==0x9f ){
++          n += 3;
++          break;
+         }
+-        zOut[j] = 0;
+-        sqlite3_result_text(pCtx, zOut, j, sqlite3_free);
++        goto whitespace_done;
++      }
++      case 0xe3: {
++        if( z[n+1]==0x80 && z[n+2]==0x80 ){
++          n += 3;
++          break;
++        }
++        goto whitespace_done;
++      }
++      case 0xef: {
++        if( z[n+1]==0xbb && z[n+2]==0xbf ){
++          n += 3;
++          break;
++        }
++        goto whitespace_done;
++      }
++      default: {
++        goto whitespace_done;
+       }
+-      break;
+-    }
+-    case JSON_ARRAY:
+-    case JSON_OBJECT: {
+-      jsonReturnJson(pNode, pCtx, aReplace);
+-      break;
+     }
+   }
++  whitespace_done:
++  return n;
+ }
+ 
+-/* Forward reference */
+-static int jsonParseAddNode(JsonParse*,u32,u32,const char*);
+-
+ /*
+-** A macro to hint to the compiler that a function should not be
+-** inlined.
++** Extra floating-point literals to allow in JSON.
+ */
+-#if defined(__GNUC__)
+-#  define JSON_NOINLINE  __attribute__((noinline))
+-#elif defined(_MSC_VER) && _MSC_VER>=1310
+-#  define JSON_NOINLINE  __declspec(noinline)
+-#else
+-#  define JSON_NOINLINE
+-#endif
++static const struct NanInfName {
++  char c1;
++  char c2;
++  char n;
++  char eType;
++  char nRepl;
++  char *zMatch;
++  char *zRepl;
++} aNanInfName[] = {
++  { 'i', 'I', 3, JSONB_FLOAT, 7, "inf", "9.0e999" },
++  { 'i', 'I', 8, JSONB_FLOAT, 7, "infinity", "9.0e999" },
++  { 'n', 'N', 3, JSONB_NULL, 4, "NaN", "null" },
++  { 'q', 'Q', 4, JSONB_NULL, 4, "QNaN", "null" },
++  { 's', 'S', 4, JSONB_NULL, 4, "SNaN", "null" },
++};
+ 
+ 
+-static JSON_NOINLINE int jsonParseAddNodeExpand(
+-  JsonParse *pParse,        /* Append the node to this object */
+-  u32 eType,                /* Node type */
+-  u32 n,                    /* Content size or sub-node count */
+-  const char *zContent      /* Content */
++/*
++** Report the wrong number of arguments for json_insert(), json_replace()
++** or json_set().
++*/
++static void jsonWrongNumArgs(
++  sqlite3_context *pCtx,
++  const char *zFuncName
+ ){
+-  u32 nNew;
+-  JsonNode *pNew;
+-  assert( pParse->nNode>=pParse->nAlloc );
+-  if( pParse->oom ) return -1;
+-  nNew = pParse->nAlloc*2 + 10;
+-  pNew = sqlite3_realloc64(pParse->aNode, sizeof(JsonNode)*nNew);
+-  if( pNew==0 ){
+-    pParse->oom = 1;
+-    return -1;
++  char *zMsg = sqlite3_mprintf("json_%s() needs an odd number of arguments",
++                               zFuncName);
++  sqlite3_result_error(pCtx, zMsg, -1);
++  sqlite3_free(zMsg);
++}
++
++/****************************************************************************
++** Utility routines for dealing with the binary BLOB representation of JSON
++****************************************************************************/
++
++/*
++** Expand pParse->aBlob so that it holds at least N bytes.
++**
++** Return the number of errors.
++*/
++static int jsonBlobExpand(JsonParse *pParse, u32 N){
++  u8 *aNew;
++  u32 t;
++  assert( N>pParse->nBlobAlloc );
++  if( pParse->nBlobAlloc==0 ){
++    t = 100;
++  }else{
++    t = pParse->nBlobAlloc*2;
+   }
+-  pParse->nAlloc = nNew;
+-  pParse->aNode = pNew;
+-  assert( pParse->nNodenAlloc );
+-  return jsonParseAddNode(pParse, eType, n, zContent);
++  if( tdb, pParse->aBlob, t);
++  if( aNew==0 ){ pParse->oom = 1; return 1; }
++  pParse->aBlob = aNew;
++  pParse->nBlobAlloc = t;
++  return 0;
+ }
+ 
+ /*
+-** Create a new JsonNode instance based on the arguments and append that
+-** instance to the JsonParse.  Return the index in pParse->aNode[] of the
+-** new node, or -1 if a memory allocation fails.
++** If pParse->aBlob is not previously editable (because it is taken
++** from sqlite3_value_blob(), as indicated by the fact that
++** pParse->nBlobAlloc==0 and pParse->nBlob>0) then make it editable
++** by making a copy into space obtained from malloc.
++**
++** Return true on success.  Return false on OOM.
++*/
++static int jsonBlobMakeEditable(JsonParse *pParse, u32 nExtra){
++  u8 *aOld;
++  u32 nSize;
++  assert( !pParse->bReadOnly );
++  if( pParse->oom ) return 0;
++  if( pParse->nBlobAlloc>0 ) return 1;
++  aOld = pParse->aBlob;
++  nSize = pParse->nBlob + nExtra;
++  pParse->aBlob = 0;
++  if( jsonBlobExpand(pParse, nSize) ){
++    return 0;
++  }
++  assert( pParse->nBlobAlloc >= pParse->nBlob + nExtra );
++  memcpy(pParse->aBlob, aOld, pParse->nBlob);
++  return 1;
++}
++
++/* Expand pParse->aBlob and append one bytes.
+ */
+-static int jsonParseAddNode(
+-  JsonParse *pParse,        /* Append the node to this object */
+-  u32 eType,                /* Node type */
+-  u32 n,                    /* Content size or sub-node count */
+-  const char *zContent      /* Content */
++static SQLITE_NOINLINE void jsonBlobExpandAndAppendOneByte(
++  JsonParse *pParse,
++  u8 c
+ ){
+-  JsonNode *p;
+-  if( pParse->aNode==0 || pParse->nNode>=pParse->nAlloc ){
+-    return jsonParseAddNodeExpand(pParse, eType, n, zContent);
++  jsonBlobExpand(pParse, pParse->nBlob+1);
++  if( pParse->oom==0 ){
++    assert( pParse->nBlob+1<=pParse->nBlobAlloc );
++    pParse->aBlob[pParse->nBlob++] = c;
+   }
+-  p = &pParse->aNode[pParse->nNode];
+-  p->eType = (u8)eType;
+-  p->jnFlags = 0;
+-  VVA( p->eU = zContent ? 1 : 0 );
+-  p->n = n;
+-  p->u.zJContent = zContent;
+-  return pParse->nNode++;
++}
++
++/* Append a single character.
++*/
++static void jsonBlobAppendOneByte(JsonParse *pParse, u8 c){
++  if( pParse->nBlob >= pParse->nBlobAlloc ){
++    jsonBlobExpandAndAppendOneByte(pParse, c);
++  }else{
++    pParse->aBlob[pParse->nBlob++] = c;
++  }
++}
++
++/* Slow version of jsonBlobAppendNode() that first resizes the
++** pParse->aBlob structure.
++*/
++static void jsonBlobAppendNode(JsonParse*,u8,u32,const void*);
++static SQLITE_NOINLINE void jsonBlobExpandAndAppendNode(
++  JsonParse *pParse,
++  u8 eType,
++  u32 szPayload,
++  const void *aPayload
++){
++  if( jsonBlobExpand(pParse, pParse->nBlob+szPayload+9) ) return;
++  jsonBlobAppendNode(pParse, eType, szPayload, aPayload);
++}
++
++
++/* Append an node type byte together with the payload size and
++** possibly also the payload.
++**
++** If aPayload is not NULL, then it is a pointer to the payload which
++** is also appended.  If aPayload is NULL, the pParse->aBlob[] array
++** is resized (if necessary) so that it is big enough to hold the
++** payload, but the payload is not appended and pParse->nBlob is left
++** pointing to where the first byte of payload will eventually be.
++*/
++static void jsonBlobAppendNode(
++  JsonParse *pParse,          /* The JsonParse object under construction */
++  u8 eType,                   /* Node type.  One of JSONB_* */
++  u32 szPayload,              /* Number of bytes of payload */
++  const void *aPayload        /* The payload.  Might be NULL */
++){
++  u8 *a;
++  if( pParse->nBlob+szPayload+9 > pParse->nBlobAlloc ){
++    jsonBlobExpandAndAppendNode(pParse,eType,szPayload,aPayload);
++    return;
++  }
++  assert( pParse->aBlob!=0 );
++  a = &pParse->aBlob[pParse->nBlob];
++  if( szPayload<=11 ){
++    a[0] = eType | (szPayload<<4);
++    pParse->nBlob += 1;
++  }else if( szPayload<=0xff ){
++    a[0] = eType | 0xc0;
++    a[1] = szPayload & 0xff;
++    pParse->nBlob += 2;
++  }else if( szPayload<=0xffff ){
++    a[0] = eType | 0xd0;
++    a[1] = (szPayload >> 8) & 0xff;
++    a[2] = szPayload & 0xff;
++    pParse->nBlob += 3;
++  }else{
++    a[0] = eType | 0xe0;
++    a[1] = (szPayload >> 24) & 0xff;
++    a[2] = (szPayload >> 16) & 0xff;
++    a[3] = (szPayload >> 8) & 0xff;
++    a[4] = szPayload & 0xff;
++    pParse->nBlob += 5;
++  }
++  if( aPayload ){
++    pParse->nBlob += szPayload;
++    memcpy(&pParse->aBlob[pParse->nBlob-szPayload], aPayload, szPayload);
++  }
++}
++
++/* Change the payload size for the node at index i to be szPayload.
++*/
++static int jsonBlobChangePayloadSize(
++  JsonParse *pParse,
++  u32 i,
++  u32 szPayload
++){
++  u8 *a;
++  u8 szType;
++  u8 nExtra;
++  u8 nNeeded;
++  int delta;
++  if( pParse->oom ) return 0;
++  a = &pParse->aBlob[i];
++  szType = a[0]>>4;
++  if( szType<=11 ){
++    nExtra = 0;
++  }else if( szType==12 ){
++    nExtra = 1;
++  }else if( szType==13 ){
++    nExtra = 2;
++  }else{
++    nExtra = 4;
++  }
++  if( szPayload<=11 ){
++    nNeeded = 0;
++  }else if( szPayload<=0xff ){
++    nNeeded = 1;
++  }else if( szPayload<=0xffff ){
++    nNeeded = 2;
++  }else{
++    nNeeded = 4;
++  }
++  delta = nNeeded - nExtra;
++  if( delta ){
++    u32 newSize = pParse->nBlob + delta;
++    if( delta>0 ){
++      if( newSize>pParse->nBlobAlloc && jsonBlobExpand(pParse, newSize) ){
++        return 0;  /* OOM error.  Error state recorded in pParse->oom. */
++      }
++      a = &pParse->aBlob[i];
++      memmove(&a[1+delta], &a[1], pParse->nBlob - (i+1));
++    }else{
++      memmove(&a[1], &a[1-delta], pParse->nBlob - (i+1-delta));
++    }
++    pParse->nBlob = newSize;
++  }
++  if( nNeeded==0 ){
++    a[0] = (a[0] & 0x0f) | (szPayload<<4);
++  }else if( nNeeded==1 ){
++    a[0] = (a[0] & 0x0f) | 0xc0;
++    a[1] = szPayload & 0xff;
++  }else if( nNeeded==2 ){
++    a[0] = (a[0] & 0x0f) | 0xd0;
++    a[1] = (szPayload >> 8) & 0xff;
++    a[2] = szPayload & 0xff;
++  }else{
++    a[0] = (a[0] & 0x0f) | 0xe0;
++    a[1] = (szPayload >> 24) & 0xff;
++    a[2] = (szPayload >> 16) & 0xff;
++    a[3] = (szPayload >> 8) & 0xff;
++    a[4] = szPayload & 0xff;
++  }
++  return delta;
+ }
+ 
+ /*
+-** Return true if z[] begins with 4 (or more) hexadecimal digits
++** If z[0] is 'u' and is followed by exactly 4 hexadecimal character,
++** then set *pOp to JSONB_TEXTJ and return true.  If not, do not make
++** any changes to *pOp and return false.
+ */
+-static int jsonIs4Hex(const char *z){
+-  int i;
+-  for(i=0; i<4; i++) if( !sqlite3Isxdigit(z[i]) ) return 0;
++static int jsonIs4HexB(const char *z, int *pOp){
++  if( z[0]!='u' ) return 0;
++  if( !jsonIs4Hex(&z[1]) ) return 0;
++  *pOp = JSONB_TEXTJ;
+   return 1;
+ }
+ 
+ /*
+-** Parse a single JSON value which begins at pParse->zJson[i].  Return the
+-** index of the first character past the end of the value parsed.
++** Check a single element of the JSONB in pParse for validity.
++**
++** The element to be checked starts at offset i and must end at on the
++** last byte before iEnd.
++**
++** Return 0 if everything is correct.  Return the 1-based byte offset of the
++** error if a problem is detected.  (In other words, if the error is at offset
++** 0, return 1).
++*/
++static u32 jsonbValidityCheck(
++  const JsonParse *pParse,    /* Input JSONB.  Only aBlob and nBlob are used */
++  u32 i,                      /* Start of element as pParse->aBlob[i] */
++  u32 iEnd,                   /* One more than the last byte of the element */
++  u32 iDepth                  /* Current nesting depth */
++){
++  u32 n, sz, j, k;
++  const u8 *z;
++  u8 x;
++  if( iDepth>JSON_MAX_DEPTH ) return i+1;
++  sz = 0;
++  n = jsonbPayloadSize(pParse, i, &sz);
++  if( NEVER(n==0) ) return i+1;          /* Checked by caller */
++  if( NEVER(i+n+sz!=iEnd) ) return i+1;  /* Checked by caller */
++  z = pParse->aBlob;
++  x = z[i] & 0x0f;
++  switch( x ){
++    case JSONB_NULL:
++    case JSONB_TRUE:
++    case JSONB_FALSE: {
++      return n+sz==1 ? 0 : i+1;
++    }
++    case JSONB_INT: {
++      if( sz<1 ) return i+1;
++      j = i+n;
++      if( z[j]=='-' ){
++        j++;
++        if( sz<2 ) return i+1;
++      }
++      k = i+n+sz;
++      while( jk ) return j+1;
++        if( z[j+1]!='.' && z[j+1]!='e' && z[j+1]!='E' ) return j+1;
++        j++;
++      }
++      for(; j0 ) return j+1;
++          if( x==JSONB_FLOAT && (j==k-1 || !sqlite3Isdigit(z[j+1])) ){
++            return j+1;
++          }
++          seen = 1;
++          continue;
++        }
++        if( z[j]=='e' || z[j]=='E' ){
++          if( seen==2 ) return j+1;
++          if( j==k-1 ) return j+1;
++          if( z[j+1]=='+' || z[j+1]=='-' ){
++            j++;
++            if( j==k-1 ) return j+1;
++          }
++          seen = 2;
++          continue;
++        }
++        return j+1;
++      }
++      if( seen==0 ) return i+1;
++      return 0;
++    }
++    case JSONB_TEXT: {
++      j = i+n;
++      k = j+sz;
++      while( j=k ){
++            return j+1;
++          }else if( strchr("\"\\/bfnrt",z[j+1])!=0 ){
++            j++;
++          }else if( z[j+1]=='u' ){
++            if( j+5>=k ) return j+1;
++            if( !jsonIs4Hex((const char*)&z[j+2]) ) return j+1;
++            j++;
++          }else if( x!=JSONB_TEXT5 ){
++            return j+1;
++          }else{
++            u32 c = 0;
++            u32 szC = jsonUnescapeOneChar((const char*)&z[j], k-j, &c);
++            if( c==JSON_INVALID_CHAR ) return j+1;
++            j += szC - 1;
++          }
++        }
++        j++;
++      }
++      return 0;
++    }
++    case JSONB_TEXTRAW: {
++      return 0;
++    }
++    case JSONB_ARRAY: {
++      u32 sub;
++      j = i+n;
++      k = j+sz;
++      while( jk ) return j+1;
++        sub = jsonbValidityCheck(pParse, j, j+n+sz, iDepth+1);
++        if( sub ) return sub;
++        j += n + sz;
++      }
++      assert( j==k );
++      return 0;
++    }
++    case JSONB_OBJECT: {
++      u32 cnt = 0;
++      u32 sub;
++      j = i+n;
++      k = j+sz;
++      while( jk ) return j+1;
++        if( (cnt & 1)==0 ){
++          x = z[j] & 0x0f;
++          if( xJSONB_TEXTRAW ) return j+1;
++        }
++        sub = jsonbValidityCheck(pParse, j, j+n+sz, iDepth+1);
++        if( sub ) return sub;
++        cnt++;
++        j += n + sz;
++      }
++      assert( j==k );
++      if( (cnt & 1)!=0 ) return j+1;
++      return 0;
++    }
++    default: {
++      return i+1;
++    }
++  }
++}
++
++/*
++** Translate a single element of JSON text at pParse->zJson[i] into
++** its equivalent binary JSONB representation.  Append the translation into
++** pParse->aBlob[] beginning at pParse->nBlob.  The size of
++** pParse->aBlob[] is increased as necessary.
+ **
+-** Return negative for a syntax error.  Special cases:  return -2 if the
+-** first non-whitespace character is '}' and return -3 if the first
+-** non-whitespace character is ']'.
++** Return the index of the first character past the end of the element parsed,
++** or one of the following special result codes:
++**
++**      0    End of input
++**     -1    Syntax error or OOM
++**     -2    '}' seen   \
++**     -3    ']' seen    \___  For these returns, pParse->iErr is set to
++**     -4    ',' seen    /     the index in zJson[] of the seen character
++**     -5    ':' seen   /
+ */
+-static int jsonParseValue(JsonParse *pParse, u32 i){
++static int jsonTranslateTextToBlob(JsonParse *pParse, u32 i){
+   char c;
+   u32 j;
+-  int iThis;
++  u32 iThis, iStart;
+   int x;
+-  JsonNode *pNode;
++  u8 t;
+   const char *z = pParse->zJson;
+-  while( fast_isspace(z[i]) ){ i++; }
+-  if( (c = z[i])=='{' ){
++json_parse_restart:
++  switch( (u8)z[i] ){
++  case '{': {
+     /* Parse object */
+-    iThis = jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
+-    if( iThis<0 ) return -1;
++    iThis = pParse->nBlob;
++    jsonBlobAppendNode(pParse, JSONB_OBJECT, pParse->nJson-i, 0);
++    if( ++pParse->iDepth > JSON_MAX_DEPTH ){
++      pParse->iErr = i;
++      return -1;
++    }
++    iStart = pParse->nBlob;
+     for(j=i+1;;j++){
+-      while( fast_isspace(z[j]) ){ j++; }
+-      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
+-      x = jsonParseValue(pParse, j);
+-      if( x<0 ){
+-        pParse->iDepth--;
+-        if( x==(-2) && pParse->nNode==(u32)iThis+1 ) return j+1;
+-        return -1;
++      u32 iBlob = pParse->nBlob;
++      x = jsonTranslateTextToBlob(pParse, j);
++      if( x<=0 ){
++        int op;
++        if( x==(-2) ){
++          j = pParse->iErr;
++          if( pParse->nBlob!=(u32)iStart ) pParse->hasNonstd = 1;
++          break;
++        }
++        j += json5Whitespace(&z[j]);
++        op = JSONB_TEXT;
++        if( sqlite3JsonId1(z[j])
++         || (z[j]=='\\' && jsonIs4HexB(&z[j+1], &op))
++        ){
++          int k = j+1;
++          while( (sqlite3JsonId2(z[k]) && json5Whitespace(&z[k])==0)
++            || (z[k]=='\\' && jsonIs4HexB(&z[k+1], &op))
++          ){
++            k++;
++          }
++          assert( iBlob==pParse->nBlob );
++          jsonBlobAppendNode(pParse, op, k-j, &z[j]);
++          pParse->hasNonstd = 1;
++          x = k;
++        }else{
++          if( x!=-1 ) pParse->iErr = j;
++          return -1;
++        }
+       }
+       if( pParse->oom ) return -1;
+-      pNode = &pParse->aNode[pParse->nNode-1];
+-      if( pNode->eType!=JSON_STRING ) return -1;
+-      pNode->jnFlags |= JNODE_LABEL;
++      t = pParse->aBlob[iBlob] & 0x0f;
++      if( tJSONB_TEXTRAW ){
++        pParse->iErr = j;
++        return -1;
++      }
+       j = x;
+-      while( fast_isspace(z[j]) ){ j++; }
+-      if( z[j]!=':' ) return -1;
+-      j++;
+-      x = jsonParseValue(pParse, j);
+-      pParse->iDepth--;
+-      if( x<0 ) return -1;
++      if( z[j]==':' ){
++        j++;
++      }else{
++        if( jsonIsspace(z[j]) ){
++          /* strspn() is not helpful here */
++          do{ j++; }while( jsonIsspace(z[j]) );
++          if( z[j]==':' ){
++            j++;
++            goto parse_object_value;
++          }
++        }
++        x = jsonTranslateTextToBlob(pParse, j);
++        if( x!=(-5) ){
++          if( x!=(-1) ) pParse->iErr = j;
++          return -1;
++        }
++        j = pParse->iErr+1;
++      }
++    parse_object_value:
++      x = jsonTranslateTextToBlob(pParse, j);
++      if( x<=0 ){
++        if( x!=(-1) ) pParse->iErr = j;
++        return -1;
++      }
+       j = x;
+-      while( fast_isspace(z[j]) ){ j++; }
+-      c = z[j];
+-      if( c==',' ) continue;
+-      if( c!='}' ) return -1;
+-      break;
++      if( z[j]==',' ){
++        continue;
++      }else if( z[j]=='}' ){
++        break;
++      }else{
++        if( jsonIsspace(z[j]) ){
++          j += 1 + (u32)strspn(&z[j+1], jsonSpaces);
++          if( z[j]==',' ){
++            continue;
++          }else if( z[j]=='}' ){
++            break;
++          }
++        }
++        x = jsonTranslateTextToBlob(pParse, j);
++        if( x==(-4) ){
++          j = pParse->iErr;
++          continue;
++        }
++        if( x==(-2) ){
++          j = pParse->iErr;
++          break;
++        }
++      }
++      pParse->iErr = j;
++      return -1;
+     }
+-    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
++    jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
++    pParse->iDepth--;
+     return j+1;
+-  }else if( c=='[' ){
++  }
++  case '[': {
+     /* Parse array */
+-    iThis = jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
+-    if( iThis<0 ) return -1;
+-    memset(&pParse->aNode[iThis].u, 0, sizeof(pParse->aNode[iThis].u));
++    iThis = pParse->nBlob;
++    jsonBlobAppendNode(pParse, JSONB_ARRAY, pParse->nJson - i, 0);
++    iStart = pParse->nBlob;
++    if( pParse->oom ) return -1;
++    if( ++pParse->iDepth > JSON_MAX_DEPTH ){
++      pParse->iErr = i;
++      return -1;
++    }
+     for(j=i+1;;j++){
+-      while( fast_isspace(z[j]) ){ j++; }
+-      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
+-      x = jsonParseValue(pParse, j);
+-      pParse->iDepth--;
+-      if( x<0 ){
+-        if( x==(-3) && pParse->nNode==(u32)iThis+1 ) return j+1;
++      x = jsonTranslateTextToBlob(pParse, j);
++      if( x<=0 ){
++        if( x==(-3) ){
++          j = pParse->iErr;
++          if( pParse->nBlob!=iStart ) pParse->hasNonstd = 1;
++          break;
++        }
++        if( x!=(-1) ) pParse->iErr = j;
+         return -1;
+       }
+       j = x;
+-      while( fast_isspace(z[j]) ){ j++; }
+-      c = z[j];
+-      if( c==',' ) continue;
+-      if( c!=']' ) return -1;
+-      break;
++      if( z[j]==',' ){
++        continue;
++      }else if( z[j]==']' ){
++        break;
++      }else{
++        if( jsonIsspace(z[j]) ){
++          j += 1 + (u32)strspn(&z[j+1], jsonSpaces);
++          if( z[j]==',' ){
++            continue;
++          }else if( z[j]==']' ){
++            break;
++          }
++        }
++        x = jsonTranslateTextToBlob(pParse, j);
++        if( x==(-4) ){
++          j = pParse->iErr;
++          continue;
++        }
++        if( x==(-3) ){
++          j = pParse->iErr;
++          break;
++        }
++      }
++      pParse->iErr = j;
++      return -1;
+     }
+-    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
++    jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
++    pParse->iDepth--;
+     return j+1;
+-  }else if( c=='"' ){
++  }
++  case '\'': {
++    u8 opcode;
++    char cDelim;
++    pParse->hasNonstd = 1;
++    opcode = JSONB_TEXT;
++    goto parse_string;
++  case '"':
+     /* Parse string */
+-    u8 jnFlags = 0;
++    opcode = JSONB_TEXT;
++  parse_string:
++    cDelim = z[i];
+     j = i+1;
+-    for(;;){
+-      c = z[j];
+-      if( (c & ~0x1f)==0 ){
+-        /* Control characters are not allowed in strings */
+-        return -1;
++    while( 1 /*exit-by-break*/ ){
++      if( jsonIsOk[(u8)z[j]] ){
++        if( !jsonIsOk[(u8)z[j+1]] ){
++          j += 1;
++        }else if( !jsonIsOk[(u8)z[j+2]] ){
++          j += 2;
++        }else{
++          j += 3;
++          continue;
++        }
+       }
+-      if( c=='\\' ){
++      c = z[j];
++      if( c==cDelim ){
++        break;
++      }else if( c=='\\' ){
+         c = z[++j];
+         if( c=='"' || c=='\\' || c=='/' || c=='b' || c=='f'
+            || c=='n' || c=='r' || c=='t'
+-           || (c=='u' && jsonIs4Hex(z+j+1)) ){
+-          jnFlags = JNODE_ESCAPE;
++           || (c=='u' && jsonIs4Hex(&z[j+1])) ){
++          if( opcode==JSONB_TEXT ) opcode = JSONB_TEXTJ;
++        }else if( c=='\'' || c=='0' || c=='v' || c=='\n'
++           || (0xe2==(u8)c && 0x80==(u8)z[j+1]
++                && (0xa8==(u8)z[j+2] || 0xa9==(u8)z[j+2]))
++           || (c=='x' && jsonIs2Hex(&z[j+1])) ){
++          opcode = JSONB_TEXT5;
++          pParse->hasNonstd = 1;
++        }else if( c=='\r' ){
++          if( z[j+1]=='\n' ) j++;
++          opcode = JSONB_TEXT5;
++          pParse->hasNonstd = 1;
+         }else{
++          pParse->iErr = j;
+           return -1;
+         }
++      }else if( c<=0x1f ){
++        /* Control characters are not allowed in strings */
++        pParse->iErr = j;
++        return -1;
+       }else if( c=='"' ){
+-        break;
++        opcode = JSONB_TEXT5;
+       }
+       j++;
+     }
+-    jsonParseAddNode(pParse, JSON_STRING, j+1-i, &z[i]);
+-    if( !pParse->oom ) pParse->aNode[pParse->nNode-1].jnFlags = jnFlags;
++    jsonBlobAppendNode(pParse, opcode, j-1-i, &z[i+1]);
+     return j+1;
+-  }else if( c=='n'
+-         && strncmp(z+i,"null",4)==0
+-         && !sqlite3Isalnum(z[i+4]) ){
+-    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
+-    return i+4;
+-  }else if( c=='t'
+-         && strncmp(z+i,"true",4)==0
+-         && !sqlite3Isalnum(z[i+4]) ){
+-    jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
+-    return i+4;
+-  }else if( c=='f'
+-         && strncmp(z+i,"false",5)==0
+-         && !sqlite3Isalnum(z[i+5]) ){
+-    jsonParseAddNode(pParse, JSON_FALSE, 0, 0);
+-    return i+5;
+-  }else if( c=='-' || (c>='0' && c<='9') ){
++  }
++  case 't': {
++    if( strncmp(z+i,"true",4)==0 && !sqlite3Isalnum(z[i+4]) ){
++      jsonBlobAppendOneByte(pParse, JSONB_TRUE);
++      return i+4;
++    }
++    pParse->iErr = i;
++    return -1;
++  }
++  case 'f': {
++    if( strncmp(z+i,"false",5)==0 && !sqlite3Isalnum(z[i+5]) ){
++      jsonBlobAppendOneByte(pParse, JSONB_FALSE);
++      return i+5;
++    }
++    pParse->iErr = i;
++    return -1;
++  }
++  case '+': {
++    u8 seenE;
++    pParse->hasNonstd = 1;
++    t = 0x00;            /* Bit 0x01:  JSON5.   Bit 0x02:  FLOAT */
++    goto parse_number;
++  case '.':
++    if( sqlite3Isdigit(z[i+1]) ){
++      pParse->hasNonstd = 1;
++      t = 0x03;          /* Bit 0x01:  JSON5.   Bit 0x02:  FLOAT */
++      seenE = 0;
++      goto parse_number_2;
++    }
++    pParse->iErr = i;
++    return -1;
++  case '-':
++  case '0':
++  case '1':
++  case '2':
++  case '3':
++  case '4':
++  case '5':
++  case '6':
++  case '7':
++  case '8':
++  case '9':
+     /* Parse number */
+-    u8 seenDP = 0;
+-    u8 seenE = 0;
++    t = 0x00;            /* Bit 0x01:  JSON5.   Bit 0x02:  FLOAT */
++  parse_number:
++    seenE = 0;
+     assert( '-' < '0' );
++    assert( '+' < '0' );
++    assert( '.' < '0' );
++    c = z[i];
++
+     if( c<='0' ){
+-      j = c=='-' ? i+1 : i;
+-      if( z[j]=='0' && z[j+1]>='0' && z[j+1]<='9' ) return -1;
++      if( c=='0' ){
++        if( (z[i+1]=='x' || z[i+1]=='X') && sqlite3Isxdigit(z[i+2]) ){
++          assert( t==0x00 );
++          pParse->hasNonstd = 1;
++          t = 0x01;
++          for(j=i+3; sqlite3Isxdigit(z[j]); j++){}
++          goto parse_number_finish;
++        }else if( sqlite3Isdigit(z[i+1]) ){
++          pParse->iErr = i+1;
++          return -1;
++        }
++      }else{
++        if( !sqlite3Isdigit(z[i+1]) ){
++          /* JSON5 allows for "+Infinity" and "-Infinity" using exactly
++          ** that case.  SQLite also allows these in any case and it allows
++          ** "+inf" and "-inf". */
++          if( (z[i+1]=='I' || z[i+1]=='i')
++           && sqlite3StrNICmp(&z[i+1], "inf",3)==0
++          ){
++            pParse->hasNonstd = 1;
++            if( z[i]=='-' ){
++              jsonBlobAppendNode(pParse, JSONB_FLOAT, 6, "-9e999");
++            }else{
++              jsonBlobAppendNode(pParse, JSONB_FLOAT, 5, "9e999");
++            }
++            return i + (sqlite3StrNICmp(&z[i+4],"inity",5)==0 ? 9 : 4);
++          }
++          if( z[i+1]=='.' ){
++            pParse->hasNonstd = 1;
++            t |= 0x01;
++            goto parse_number_2;
++          }
++          pParse->iErr = i;
++          return -1;
++        }
++        if( z[i+1]=='0' ){
++          if( sqlite3Isdigit(z[i+2]) ){
++            pParse->iErr = i+1;
++            return -1;
++          }else if( (z[i+2]=='x' || z[i+2]=='X') && sqlite3Isxdigit(z[i+3]) ){
++            pParse->hasNonstd = 1;
++            t |= 0x01;
++            for(j=i+4; sqlite3Isxdigit(z[j]); j++){}
++            goto parse_number_finish;
++          }
++        }
++      }
+     }
+-    j = i+1;
+-    for(;; j++){
++
++  parse_number_2:
++    for(j=i+1;; j++){
+       c = z[j];
+-      if( c>='0' && c<='9' ) continue;
++      if( sqlite3Isdigit(c) ) continue;
+       if( c=='.' ){
+-        if( z[j-1]=='-' ) return -1;
+-        if( seenDP ) return -1;
+-        seenDP = 1;
++        if( (t & 0x02)!=0 ){
++          pParse->iErr = j;
++          return -1;
++        }
++        t |= 0x02;
+         continue;
+       }
+       if( c=='e' || c=='E' ){
+-        if( z[j-1]<'0' ) return -1;
+-        if( seenE ) return -1;
+-        seenDP = seenE = 1;
++        if( z[j-1]<'0' ){
++          if( ALWAYS(z[j-1]=='.') && ALWAYS(j-2>=i) && sqlite3Isdigit(z[j-2]) ){
++            pParse->hasNonstd = 1;
++            t |= 0x01;
++          }else{
++            pParse->iErr = j;
++            return -1;
++          }
++        }
++        if( seenE ){
++          pParse->iErr = j;
++          return -1;
++        }
++        t |= 0x02;
++        seenE = 1;
+         c = z[j+1];
+         if( c=='+' || c=='-' ){
+           j++;
+           c = z[j+1];
+         }
+-        if( c<'0' || c>'9' ) return -1;
++        if( c<'0' || c>'9' ){
++          pParse->iErr = j;
++          return -1;
++        }
+         continue;
+       }
+       break;
+     }
+-    if( z[j-1]<'0' ) return -1;
+-    jsonParseAddNode(pParse, seenDP ? JSON_REAL : JSON_INT,
+-                        j - i, &z[i]);
++    if( z[j-1]<'0' ){
++      if( ALWAYS(z[j-1]=='.') && ALWAYS(j-2>=i) && sqlite3Isdigit(z[j-2]) ){
++        pParse->hasNonstd = 1;
++        t |= 0x01;
++      }else{
++        pParse->iErr = j;
++        return -1;
++      }
++    }
++  parse_number_finish:
++    assert( JSONB_INT+0x01==JSONB_INT5 );
++    assert( JSONB_FLOAT+0x01==JSONB_FLOAT5 );
++    assert( JSONB_INT+0x02==JSONB_FLOAT );
++    if( z[i]=='+' ) i++;
++    jsonBlobAppendNode(pParse, JSONB_INT+t, j-i, &z[i]);
+     return j;
+-  }else if( c=='}' ){
++  }
++  case '}': {
++    pParse->iErr = i;
+     return -2;  /* End of {...} */
+-  }else if( c==']' ){
++  }
++  case ']': {
++    pParse->iErr = i;
+     return -3;  /* End of [...] */
+-  }else if( c==0 ){
++  }
++  case ',': {
++    pParse->iErr = i;
++    return -4;  /* List separator */
++  }
++  case ':': {
++    pParse->iErr = i;
++    return -5;  /* Object label/value separator */
++  }
++  case 0: {
+     return 0;   /* End of file */
+-  }else{
++  }
++  case 0x09:
++  case 0x0a:
++  case 0x0d:
++  case 0x20: {
++    i += 1 + (u32)strspn(&z[i+1], jsonSpaces);
++    goto json_parse_restart;
++  }
++  case 0x0b:
++  case 0x0c:
++  case '/':
++  case 0xc2:
++  case 0xe1:
++  case 0xe2:
++  case 0xe3:
++  case 0xef: {
++    j = json5Whitespace(&z[i]);
++    if( j>0 ){
++      i += j;
++      pParse->hasNonstd = 1;
++      goto json_parse_restart;
++    }
++    pParse->iErr = i;
++    return -1;
++  }
++  case 'n': {
++    if( strncmp(z+i,"null",4)==0 && !sqlite3Isalnum(z[i+4]) ){
++      jsonBlobAppendOneByte(pParse, JSONB_NULL);
++      return i+4;
++    }
++    /* fall-through into the default case that checks for NaN */
++  }
++  default: {
++    u32 k;
++    int nn;
++    c = z[i];
++    for(k=0; khasNonstd = 1;
++      return i + nn;
++    }
++    pParse->iErr = i;
+     return -1;  /* Syntax error */
+   }
++  } /* End switch(z[i]) */
+ }
+ 
++
+ /*
+ ** Parse a complete JSON string.  Return 0 on success or non-zero if there
+-** are any errors.  If an error occurs, free all memory associated with
+-** pParse.
++** are any errors.  If an error occurs, free all memory held by pParse,
++** but not pParse itself.
+ **
+-** pParse is uninitialized when this routine is called.
++** pParse must be initialized to an empty parse object prior to calling
++** this routine.
+ */
+-static int jsonParse(
++static int jsonConvertTextToBlob(
+   JsonParse *pParse,           /* Initialize and fill this JsonParse object */
+-  sqlite3_context *pCtx,       /* Report errors here */
+-  const char *zJson            /* Input JSON text to be parsed */
++  sqlite3_context *pCtx        /* Report errors here */
+ ){
+   int i;
+-  memset(pParse, 0, sizeof(*pParse));
+-  if( zJson==0 ) return 1;
+-  pParse->zJson = zJson;
+-  i = jsonParseValue(pParse, 0);
++  const char *zJson = pParse->zJson;
++  i = jsonTranslateTextToBlob(pParse, 0);
+   if( pParse->oom ) i = -1;
+   if( i>0 ){
++#ifdef SQLITE_DEBUG
+     assert( pParse->iDepth==0 );
+-    while( fast_isspace(zJson[i]) ) i++;
+-    if( zJson[i] ) i = -1;
++    if( sqlite3Config.bJsonSelfcheck ){
++      assert( jsonbValidityCheck(pParse, 0, pParse->nBlob, 0)==0 );
++    }
++#endif
++    while( jsonIsspace(zJson[i]) ) i++;
++    if( zJson[i] ){
++      i += json5Whitespace(&zJson[i]);
++      if( zJson[i] ){
++        if( pCtx ) sqlite3_result_error(pCtx, "malformed JSON", -1);
++        jsonParseReset(pParse);
++        return 1;
++      }
++      pParse->hasNonstd = 1;
++    }
+   }
+   if( i<=0 ){
+     if( pCtx!=0 ){
+@@ -196394,161 +205342,715 @@ static int jsonParse(
+   return 0;
+ }
+ 
+-/* Mark node i of pParse as being a child of iParent.  Call recursively
+-** to fill in all the descendants of node i.
++/*
++** The input string pStr is a well-formed JSON text string.  Convert
++** this into the JSONB format and make it the return value of the
++** SQL function.
+ */
+-static void jsonParseFillInParentage(JsonParse *pParse, u32 i, u32 iParent){
+-  JsonNode *pNode = &pParse->aNode[i];
+-  u32 j;
+-  pParse->aUp[i] = iParent;
+-  switch( pNode->eType ){
+-    case JSON_ARRAY: {
+-      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j)){
+-        jsonParseFillInParentage(pParse, i+j, i);
++static void jsonReturnStringAsBlob(JsonString *pStr){
++  JsonParse px;
++  memset(&px, 0, sizeof(px));
++  jsonStringTerminate(pStr);
++  px.zJson = pStr->zBuf;
++  px.nJson = pStr->nUsed;
++  px.db = sqlite3_context_db_handle(pStr->pCtx);
++  (void)jsonTranslateTextToBlob(&px, 0);
++  if( px.oom ){
++    sqlite3DbFree(px.db, px.aBlob);
++    sqlite3_result_error_nomem(pStr->pCtx);
++  }else{
++    assert( px.nBlobAlloc>0 );
++    assert( !px.bReadOnly );
++    sqlite3_result_blob(pStr->pCtx, px.aBlob, px.nBlob, SQLITE_DYNAMIC);
++  }
++}
++
++/* The byte at index i is a node type-code.  This routine
++** determines the payload size for that node and writes that
++** payload size in to *pSz.  It returns the offset from i to the
++** beginning of the payload.  Return 0 on error.
++*/
++static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){
++  u8 x;
++  u32 sz;
++  u32 n;
++  if( NEVER(i>pParse->nBlob) ){
++    *pSz = 0;
++    return 0;
++  }
++  x = pParse->aBlob[i]>>4;
++  if( x<=11 ){
++    sz = x;
++    n = 1;
++  }else if( x==12 ){
++    if( i+1>=pParse->nBlob ){
++      *pSz = 0;
++      return 0;
++    }
++    sz = pParse->aBlob[i+1];
++    n = 2;
++  }else if( x==13 ){
++    if( i+2>=pParse->nBlob ){
++      *pSz = 0;
++      return 0;
++    }
++    sz = (pParse->aBlob[i+1]<<8) + pParse->aBlob[i+2];
++    n = 3;
++  }else if( x==14 ){
++    if( i+4>=pParse->nBlob ){
++      *pSz = 0;
++      return 0;
++    }
++    sz = ((u32)pParse->aBlob[i+1]<<24) + (pParse->aBlob[i+2]<<16) +
++         (pParse->aBlob[i+3]<<8) + pParse->aBlob[i+4];
++    n = 5;
++  }else{
++    if( i+8>=pParse->nBlob
++     || pParse->aBlob[i+1]!=0
++     || pParse->aBlob[i+2]!=0
++     || pParse->aBlob[i+3]!=0
++     || pParse->aBlob[i+4]!=0
++    ){
++      *pSz = 0;
++      return 0;
++    }
++    sz = (pParse->aBlob[i+5]<<24) + (pParse->aBlob[i+6]<<16) +
++         (pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8];
++    n = 9;
++  }
++  if( (i64)i+sz+n > pParse->nBlob
++   && (i64)i+sz+n > pParse->nBlob-pParse->delta
++  ){
++    sz = 0;
++    n = 0;
++  }
++  *pSz = sz;
++  return n;
++}
++
++
++/*
++** Translate the binary JSONB representation of JSON beginning at
++** pParse->aBlob[i] into a JSON text string.  Append the JSON
++** text onto the end of pOut.  Return the index in pParse->aBlob[]
++** of the first byte past the end of the element that is translated.
++**
++** If an error is detected in the BLOB input, the pOut->eErr flag
++** might get set to JSTRING_MALFORMED.  But not all BLOB input errors
++** are detected.  So a malformed JSONB input might either result
++** in an error, or in incorrect JSON.
++**
++** The pOut->eErr JSTRING_OOM flag is set on a OOM.
++*/
++static u32 jsonTranslateBlobToText(
++  const JsonParse *pParse,       /* the complete parse of the JSON */
++  u32 i,                         /* Start rendering at this index */
++  JsonString *pOut               /* Write JSON here */
++){
++  u32 sz, n, j, iEnd;
++
++  n = jsonbPayloadSize(pParse, i, &sz);
++  if( n==0 ){
++    pOut->eErr |= JSTRING_MALFORMED;
++    return pParse->nBlob+1;
++  }
++  switch( pParse->aBlob[i] & 0x0f ){
++    case JSONB_NULL: {
++      jsonAppendRawNZ(pOut, "null", 4);
++      return i+1;
++    }
++    case JSONB_TRUE: {
++      jsonAppendRawNZ(pOut, "true", 4);
++      return i+1;
++    }
++    case JSONB_FALSE: {
++      jsonAppendRawNZ(pOut, "false", 5);
++      return i+1;
++    }
++    case JSONB_INT:
++    case JSONB_FLOAT: {
++      if( sz==0 ) goto malformed_jsonb;
++      jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz);
++      break;
++    }
++    case JSONB_INT5: {  /* Integer literal in hexadecimal notation */
++      u32 k = 2;
++      sqlite3_uint64 u = 0;
++      const char *zIn = (const char*)&pParse->aBlob[i+n];
++      int bOverflow = 0;
++      if( sz==0 ) goto malformed_jsonb;
++      if( zIn[0]=='-' ){
++        jsonAppendChar(pOut, '-');
++        k++;
++      }else if( zIn[0]=='+' ){
++        k++;
++      }
++      for(; keErr |= JSTRING_MALFORMED;
++          break;
++        }else if( (u>>60)!=0 ){
++          bOverflow = 1;
++        }else{
++          u = u*16 + sqlite3HexToInt(zIn[k]);
++        }
++      }
++      jsonPrintf(100,pOut,bOverflow?"9.0e999":"%llu", u);
++      break;
++    }
++    case JSONB_FLOAT5: { /* Float literal missing digits beside "." */
++      u32 k = 0;
++      const char *zIn = (const char*)&pParse->aBlob[i+n];
++      if( sz==0 ) goto malformed_jsonb;
++      if( zIn[0]=='-' ){
++        jsonAppendChar(pOut, '-');
++        k++;
++      }
++      if( zIn[k]=='.' ){
++        jsonAppendChar(pOut, '0');
++      }
++      for(; kn; j += jsonNodeSize(pNode+j+1)+1){
+-        pParse->aUp[i+j] = i;
+-        jsonParseFillInParentage(pParse, i+j+1, i);
++    case JSONB_TEXT:
++    case JSONB_TEXTJ: {
++      jsonAppendChar(pOut, '"');
++      jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz);
++      jsonAppendChar(pOut, '"');
++      break;
++    }
++    case JSONB_TEXT5: {
++      const char *zIn;
++      u32 k;
++      u32 sz2 = sz;
++      zIn = (const char*)&pParse->aBlob[i+n];
++      jsonAppendChar(pOut, '"');
++      while( sz2>0 ){
++        for(k=0; k0 ){
++          jsonAppendRawNZ(pOut, zIn, k);
++          if( k>=sz2 ){
++            break;
++          }
++          zIn += k;
++          sz2 -= k;
++        }
++        if( zIn[0]=='"' ){
++          jsonAppendRawNZ(pOut, "\\\"", 2);
++          zIn++;
++          sz2--;
++          continue;
++        }
++        assert( zIn[0]=='\\' );
++        assert( sz2>=1 );
++        if( sz2<2 ){
++          pOut->eErr |= JSTRING_MALFORMED;
++          break;
++        }
++        switch( (u8)zIn[1] ){
++          case '\'':
++            jsonAppendChar(pOut, '\'');
++            break;
++          case 'v':
++            jsonAppendRawNZ(pOut, "\\u0009", 6);
++            break;
++          case 'x':
++            if( sz2<4 ){
++              pOut->eErr |= JSTRING_MALFORMED;
++              sz2 = 2;
++              break;
++            }
++            jsonAppendRawNZ(pOut, "\\u00", 4);
++            jsonAppendRawNZ(pOut, &zIn[2], 2);
++            zIn += 2;
++            sz2 -= 2;
++            break;
++          case '0':
++            jsonAppendRawNZ(pOut, "\\u0000", 6);
++            break;
++          case '\r':
++            if( sz2>2 && zIn[2]=='\n' ){
++              zIn++;
++              sz2--;
++            }
++            break;
++          case '\n':
++            break;
++          case 0xe2:
++            /* '\' followed by either U+2028 or U+2029 is ignored as
++            ** whitespace.  Not that in UTF8, U+2028 is 0xe2 0x80 0x29.
++            ** U+2029 is the same except for the last byte */
++            if( sz2<4
++             || 0x80!=(u8)zIn[2]
++             || (0xa8!=(u8)zIn[3] && 0xa9!=(u8)zIn[3])
++            ){
++              pOut->eErr |= JSTRING_MALFORMED;
++              sz2 = 2;
++              break;
++            }
++            zIn += 2;
++            sz2 -= 2;
++            break;
++          default:
++            jsonAppendRawNZ(pOut, zIn, 2);
++            break;
++        }
++        assert( sz2>=2 );
++        zIn += 2;
++        sz2 -= 2;
+       }
++      jsonAppendChar(pOut, '"');
++      break;
++    }
++    case JSONB_TEXTRAW: {
++      jsonAppendString(pOut, (const char*)&pParse->aBlob[i+n], sz);
++      break;
++    }
++    case JSONB_ARRAY: {
++      jsonAppendChar(pOut, '[');
++      j = i+n;
++      iEnd = j+sz;
++      while( jeErr==0 ){
++        j = jsonTranslateBlobToText(pParse, j, pOut);
++        jsonAppendChar(pOut, ',');
++      }
++      if( j>iEnd ) pOut->eErr |= JSTRING_MALFORMED;
++      if( sz>0 ) jsonStringTrimOneChar(pOut);
++      jsonAppendChar(pOut, ']');
++      break;
++    }
++    case JSONB_OBJECT: {
++      int x = 0;
++      jsonAppendChar(pOut, '{');
++      j = i+n;
++      iEnd = j+sz;
++      while( jeErr==0 ){
++        j = jsonTranslateBlobToText(pParse, j, pOut);
++        jsonAppendChar(pOut, (x++ & 1) ? ',' : ':');
++      }
++      if( (x & 1)!=0 || j>iEnd ) pOut->eErr |= JSTRING_MALFORMED;
++      if( sz>0 ) jsonStringTrimOneChar(pOut);
++      jsonAppendChar(pOut, '}');
+       break;
+     }
++
+     default: {
++      malformed_jsonb:
++      pOut->eErr |= JSTRING_MALFORMED;
+       break;
+     }
+   }
++  return i+n+sz;
++}
++
++/* Return true if the input pJson
++**
++** For performance reasons, this routine does not do a detailed check of the
++** input BLOB to ensure that it is well-formed.  Hence, false positives are
++** possible.  False negatives should never occur, however.
++*/
++static int jsonFuncArgMightBeBinary(sqlite3_value *pJson){
++  u32 sz, n;
++  const u8 *aBlob;
++  int nBlob;
++  JsonParse s;
++  if( sqlite3_value_type(pJson)!=SQLITE_BLOB ) return 0;
++  aBlob = sqlite3_value_blob(pJson);
++  nBlob = sqlite3_value_bytes(pJson);
++  if( nBlob<1 ) return 0;
++  if( NEVER(aBlob==0) || (aBlob[0] & 0x0f)>JSONB_OBJECT ) return 0;
++  memset(&s, 0, sizeof(s));
++  s.aBlob = (u8*)aBlob;
++  s.nBlob = nBlob;
++  n = jsonbPayloadSize(&s, 0, &sz);
++  if( n==0 ) return 0;
++  if( sz+n!=(u32)nBlob ) return 0;
++  if( (aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0 ) return 0;
++  return sz+n==(u32)nBlob;
+ }
+ 
+ /*
+-** Compute the parentage of all nodes in a completed parse.
++** Given that a JSONB_ARRAY object starts at offset i, return
++** the number of entries in that array.
+ */
+-static int jsonParseFindParents(JsonParse *pParse){
+-  u32 *aUp;
+-  assert( pParse->aUp==0 );
+-  aUp = pParse->aUp = sqlite3_malloc64( sizeof(u32)*pParse->nNode );
+-  if( aUp==0 ){
+-    pParse->oom = 1;
+-    return SQLITE_NOMEM;
++static u32 jsonbArrayCount(JsonParse *pParse, u32 iRoot){
++  u32 n, sz, i, iEnd;
++  u32 k = 0;
++  n = jsonbPayloadSize(pParse, iRoot, &sz);
++  iEnd = iRoot+n+sz;
++  for(i=iRoot+n; n>0 && idelta.
+ */
+-#define JSON_CACHE_ID  (-429938)  /* First cache entry */
+-#define JSON_CACHE_SZ  4          /* Max number of cache entries */
++static void jsonAfterEditSizeAdjust(JsonParse *pParse, u32 iRoot){
++  u32 sz = 0;
++  u32 nBlob;
++  assert( pParse->delta!=0 );
++  assert( pParse->nBlobAlloc >= pParse->nBlob );
++  nBlob = pParse->nBlob;
++  pParse->nBlob = pParse->nBlobAlloc;
++  (void)jsonbPayloadSize(pParse, iRoot, &sz);
++  pParse->nBlob = nBlob;
++  sz += pParse->delta;
++  pParse->delta += jsonBlobChangePayloadSize(pParse, iRoot, sz);
++}
+ 
+ /*
+-** Obtain a complete parse of the JSON found in the first argument
+-** of the argv array.  Use the sqlite3_get_auxdata() cache for this
+-** parse if it is available.  If the cache is not available or if it
+-** is no longer valid, parse the JSON again and return the new parse,
+-** and also register the new parse so that it will be available for
+-** future sqlite3_get_auxdata() calls.
++** Modify the JSONB blob at pParse->aBlob by removing nDel bytes of
++** content beginning at iDel, and replacing them with nIns bytes of
++** content given by aIns.
++**
++** nDel may be zero, in which case no bytes are removed.  But iDel is
++** still important as new bytes will be insert beginning at iDel.
++**
++** aIns may be zero, in which case space is created to hold nIns bytes
++** beginning at iDel, but that space is uninitialized.
++**
++** Set pParse->oom if an OOM occurs.
+ */
+-static JsonParse *jsonParseCached(
+-  sqlite3_context *pCtx,
+-  sqlite3_value **argv,
+-  sqlite3_context *pErrCtx
++static void jsonBlobEdit(
++  JsonParse *pParse,     /* The JSONB to be modified is in pParse->aBlob */
++  u32 iDel,              /* First byte to be removed */
++  u32 nDel,              /* Number of bytes to remove */
++  const u8 *aIns,        /* Content to insert */
++  u32 nIns               /* Bytes of content to insert */
+ ){
+-  const char *zJson = (const char*)sqlite3_value_text(argv[0]);
+-  int nJson = sqlite3_value_bytes(argv[0]);
+-  JsonParse *p;
+-  JsonParse *pMatch = 0;
+-  int iKey;
+-  int iMinKey = 0;
+-  u32 iMinHold = 0xffffffff;
+-  u32 iMaxHold = 0;
+-  if( zJson==0 ) return 0;
+-  for(iKey=0; iKeynBlob + d > pParse->nBlobAlloc ){
++      jsonBlobExpand(pParse, pParse->nBlob+d);
++      if( pParse->oom ) return;
+     }
+-    if( pMatch==0
+-     && p->nJson==nJson
+-     && memcmp(p->zJson,zJson,nJson)==0
+-    ){
+-      p->nErr = 0;
+-      pMatch = p;
+-    }else if( p->iHoldiHold;
+-      iMinKey = iKey;
++    memmove(&pParse->aBlob[iDel+nIns],
++            &pParse->aBlob[iDel+nDel],
++            pParse->nBlob - (iDel+nDel));
++    pParse->nBlob += d;
++    pParse->delta += d;
++  }
++  if( nIns && aIns ) memcpy(&pParse->aBlob[iDel], aIns, nIns);
++}
++
++/*
++** Return the number of escaped newlines to be ignored.
++** An escaped newline is a one of the following byte sequences:
++**
++**    0x5c 0x0a
++**    0x5c 0x0d
++**    0x5c 0x0d 0x0a
++**    0x5c 0xe2 0x80 0xa8
++**    0x5c 0xe2 0x80 0xa9
++*/
++static u32 jsonBytesToBypass(const char *z, u32 n){
++  u32 i = 0;
++  while( i+1iHold>iMaxHold ){
+-      iMaxHold = p->iHold;
++    if( 0xe2==(u8)z[i+1]
++     && i+3nErr = 0;
+-    pMatch->iHold = iMaxHold+1;
+-    return pMatch;
++  return i;
++}
++
++/*
++** Input z[0..n] defines JSON escape sequence including the leading '\\'.
++** Decode that escape sequence into a single character.  Write that
++** character into *piOut.  Return the number of bytes in the escape sequence.
++**
++** If there is a syntax error of some kind (for example too few characters
++** after the '\\' to complete the encoding) then *piOut is set to
++** JSON_INVALID_CHAR.
++*/
++static u32 jsonUnescapeOneChar(const char *z, u32 n, u32 *piOut){
++  assert( n>0 );
++  assert( z[0]=='\\' );
++  if( n<2 ){
++    *piOut = JSON_INVALID_CHAR;
++    return n;
+   }
+-  p = sqlite3_malloc64( sizeof(*p) + nJson + 1 );
+-  if( p==0 ){
+-    sqlite3_result_error_nomem(pCtx);
+-    return 0;
++  switch( (u8)z[1] ){
++    case 'u': {
++      u32 v, vlo;
++      if( n<6 ){
++        *piOut = JSON_INVALID_CHAR;
++        return n;
++      }
++      v = jsonHexToInt4(&z[2]);
++      if( (v & 0xfc00)==0xd800
++       && n>=12
++       && z[6]=='\\'
++       && z[7]=='u'
++       && ((vlo = jsonHexToInt4(&z[8]))&0xfc00)==0xdc00
++      ){
++        *piOut = ((v&0x3ff)<<10) + (vlo&0x3ff) + 0x10000;
++        return 12;
++      }else{
++        *piOut = v;
++        return 6;
++      }
++    }
++    case 'b': {   *piOut = '\b';  return 2; }
++    case 'f': {   *piOut = '\f';  return 2; }
++    case 'n': {   *piOut = '\n';  return 2; }
++    case 'r': {   *piOut = '\r';  return 2; }
++    case 't': {   *piOut = '\t';  return 2; }
++    case 'v': {   *piOut = '\v';  return 2; }
++    case '0': {   *piOut = 0;     return 2; }
++    case '\'':
++    case '"':
++    case '/':
++    case '\\':{   *piOut = z[1];  return 2; }
++    case 'x': {
++      if( n<4 ){
++        *piOut = JSON_INVALID_CHAR;
++        return n;
++      }
++      *piOut = (jsonHexToInt(z[2])<<4) | jsonHexToInt(z[3]);
++      return 4;
++    }
++    case 0xe2:
++    case '\r':
++    case '\n': {
++      u32 nSkip = jsonBytesToBypass(z, n);
++      if( nSkip==0 ){
++        *piOut = JSON_INVALID_CHAR;
++        return n;
++      }else if( nSkip==n ){
++        *piOut = 0;
++        return n;
++      }else if( z[nSkip]=='\\' ){
++        return nSkip + jsonUnescapeOneChar(&z[nSkip], n-nSkip, piOut);
++      }else{
++        int sz = sqlite3Utf8ReadLimited((u8*)&z[nSkip], n-nSkip, piOut);
++        return nSkip + sz;
++      }
++    }
++    default: {
++      *piOut = JSON_INVALID_CHAR;
++      return 2;
++    }
+   }
+-  memset(p, 0, sizeof(*p));
+-  p->zJson = (char*)&p[1];
+-  memcpy((char*)p->zJson, zJson, nJson+1);
+-  if( jsonParse(p, pErrCtx, p->zJson) ){
+-    sqlite3_free(p);
+-    return 0;
++}
++
++
++/*
++** Compare two object labels.  Return 1 if they are equal and
++** 0 if they differ.
++**
++** In this version, we know that one or the other or both of the
++** two comparands contains an escape sequence.
++*/
++static SQLITE_NOINLINE int jsonLabelCompareEscaped(
++  const char *zLeft,          /* The left label */
++  u32 nLeft,                  /* Size of the left label in bytes */
++  int rawLeft,                /* True if zLeft contains no escapes */
++  const char *zRight,         /* The right label */
++  u32 nRight,                 /* Size of the right label in bytes */
++  int rawRight                /* True if zRight is escape-free */
++){
++  u32 cLeft, cRight;
++  assert( rawLeft==0 || rawRight==0 );
++  while( 1 /*exit-by-return*/ ){
++    if( nLeft==0 ){
++      cLeft = 0;
++    }else if( rawLeft || zLeft[0]!='\\' ){
++      cLeft = ((u8*)zLeft)[0];
++      if( cLeft>=0xc0 ){
++        int sz = sqlite3Utf8ReadLimited((u8*)zLeft, nLeft, &cLeft);
++        zLeft += sz;
++        nLeft -= sz;
++      }else{
++        zLeft++;
++        nLeft--;
++      }
++    }else{
++      u32 n = jsonUnescapeOneChar(zLeft, nLeft, &cLeft);
++      zLeft += n;
++      assert( n<=nLeft );
++      nLeft -= n;
++    }
++    if( nRight==0 ){
++      cRight = 0;
++    }else if( rawRight || zRight[0]!='\\' ){
++      cRight = ((u8*)zRight)[0];
++      if( cRight>=0xc0 ){
++        int sz = sqlite3Utf8ReadLimited((u8*)zRight, nRight, &cRight);
++        zRight += sz;
++        nRight -= sz;
++      }else{
++        zRight++;
++        nRight--;
++      }
++    }else{
++      u32 n = jsonUnescapeOneChar(zRight, nRight, &cRight);
++      zRight += n;
++      assert( n<=nRight );
++      nRight -= n;
++    }
++    if( cLeft!=cRight ) return 0;
++    if( cLeft==0 ) return 1;
+   }
+-  p->nJson = nJson;
+-  p->iHold = iMaxHold+1;
+-  sqlite3_set_auxdata(pCtx, JSON_CACHE_ID+iMinKey, p,
+-                      (void(*)(void*))jsonParseFree);
+-  return (JsonParse*)sqlite3_get_auxdata(pCtx, JSON_CACHE_ID+iMinKey);
+ }
+ 
+ /*
+-** Compare the OBJECT label at pNode against zKey,nKey.  Return true on
+-** a match.
++** Compare two object labels.  Return 1 if they are equal and
++** 0 if they differ.  Return -1 if an OOM occurs.
+ */
+-static int jsonLabelCompare(JsonNode *pNode, const char *zKey, u32 nKey){
+-  assert( pNode->eU==1 );
+-  if( pNode->jnFlags & JNODE_RAW ){
+-    if( pNode->n!=nKey ) return 0;
+-    return strncmp(pNode->u.zJContent, zKey, nKey)==0;
++static int jsonLabelCompare(
++  const char *zLeft,          /* The left label */
++  u32 nLeft,                  /* Size of the left label in bytes */
++  int rawLeft,                /* True if zLeft contains no escapes */
++  const char *zRight,         /* The right label */
++  u32 nRight,                 /* Size of the right label in bytes */
++  int rawRight                /* True if zRight is escape-free */
++){
++  if( rawLeft && rawRight ){
++    /* Simpliest case:  Neither label contains escapes.  A simple
++    ** memcmp() is sufficient. */
++    if( nLeft!=nRight ) return 0;
++    return memcmp(zLeft, zRight, nLeft)==0;
+   }else{
+-    if( pNode->n!=nKey+2 ) return 0;
+-    return strncmp(pNode->u.zJContent+1, zKey, nKey)==0;
++    return jsonLabelCompareEscaped(zLeft, nLeft, rawLeft,
++                                   zRight, nRight, rawRight);
+   }
+ }
+ 
+-/* forward declaration */
+-static JsonNode *jsonLookupAppend(JsonParse*,const char*,int*,const char**);
++/*
++** Error returns from jsonLookupStep()
++*/
++#define JSON_LOOKUP_ERROR      0xffffffff
++#define JSON_LOOKUP_NOTFOUND   0xfffffffe
++#define JSON_LOOKUP_PATHERROR  0xfffffffd
++#define JSON_LOOKUP_ISERROR(x) ((x)>=JSON_LOOKUP_PATHERROR)
++
++/* Forward declaration */
++static u32 jsonLookupStep(JsonParse*,u32,const char*,u32);
++
++
++/* This helper routine for jsonLookupStep() populates pIns with
++** binary data that is to be inserted into pParse.
++**
++** In the common case, pIns just points to pParse->aIns and pParse->nIns.
++** But if the zPath of the original edit operation includes path elements
++** that go deeper, additional substructure must be created.
++**
++** For example:
++**
++**     json_insert('{}', '$.a.b.c', 123);
++**
++** The search stops at '$.a'  But additional substructure must be
++** created for the ".b.c" part of the patch so that the final result
++** is:  {"a":{"b":{"c"::123}}}.  This routine populates pIns with
++** the binary equivalent of {"b":{"c":123}} so that it can be inserted.
++**
++** The caller is responsible for resetting pIns when it has finished
++** using the substructure.
++*/
++static u32 jsonCreateEditSubstructure(
++  JsonParse *pParse,  /* The original JSONB that is being edited */
++  JsonParse *pIns,    /* Populate this with the blob data to insert */
++  const char *zTail   /* Tail of the path that determins substructure */
++){
++  static const u8 emptyObject[] = { JSONB_ARRAY, JSONB_OBJECT };
++  int rc;
++  memset(pIns, 0, sizeof(*pIns));
++  pIns->db = pParse->db;
++  if( zTail[0]==0 ){
++    /* No substructure.  Just insert what is given in pParse. */
++    pIns->aBlob = pParse->aIns;
++    pIns->nBlob = pParse->nIns;
++    rc = 0;
++  }else{
++    /* Construct the binary substructure */
++    pIns->nBlob = 1;
++    pIns->aBlob = (u8*)&emptyObject[zTail[0]=='.'];
++    pIns->eEdit = pParse->eEdit;
++    pIns->nIns = pParse->nIns;
++    pIns->aIns = pParse->aIns;
++    rc = jsonLookupStep(pIns, 0, zTail, 0);
++    pParse->oom |= pIns->oom;
++  }
++  return rc;  /* Error code only */
++}
+ 
+ /*
+-** Search along zPath to find the node specified.  Return a pointer
+-** to that node, or NULL if zPath is malformed or if there is no such
+-** node.
++** Search along zPath to find the Json element specified.  Return an
++** index into pParse->aBlob[] for the start of that element's value.
++**
++** If the value found by this routine is the value half of label/value pair
++** within an object, then set pPath->iLabel to the start of the corresponding
++** label, before returning.
++**
++** Return one of the JSON_LOOKUP error codes if problems are seen.
+ **
+-** If pApnd!=0, then try to append new nodes to complete zPath if it is
+-** possible to do so and if no existing node corresponds to zPath.  If
+-** new nodes are appended *pApnd is set to 1.
++** This routine will also modify the blob.  If pParse->eEdit is one of
++** JEDIT_DEL, JEDIT_REPL, JEDIT_INS, or JEDIT_SET, then changes might be
++** made to the selected value.  If an edit is performed, then the return
++** value does not necessarily point to the select element.  If an edit
++** is performed, the return value is only useful for detecting error
++** conditions.
+ */
+-static JsonNode *jsonLookupStep(
++static u32 jsonLookupStep(
+   JsonParse *pParse,      /* The JSON to search */
+-  u32 iRoot,              /* Begin the search at this node */
++  u32 iRoot,              /* Begin the search at this element of aBlob[] */
+   const char *zPath,      /* The path to search */
+-  int *pApnd,             /* Append nodes to complete path if not NULL */
+-  const char **pzErr      /* Make *pzErr point to any syntax error in zPath */
++  u32 iLabel              /* Label if iRoot is a value of in an object */
+ ){
+-  u32 i, j, nKey;
++  u32 i, j, k, nKey, sz, n, iEnd, rc;
+   const char *zKey;
+-  JsonNode *pRoot = &pParse->aNode[iRoot];
+-  if( zPath[0]==0 ) return pRoot;
+-  if( pRoot->jnFlags & JNODE_REPLACE ) return 0;
++  u8 x;
++
++  if( zPath[0]==0 ){
++    if( pParse->eEdit && jsonBlobMakeEditable(pParse, pParse->nIns) ){
++      n = jsonbPayloadSize(pParse, iRoot, &sz);
++      sz += n;
++      if( pParse->eEdit==JEDIT_DEL ){
++        if( iLabel>0 ){
++          sz += iRoot - iLabel;
++          iRoot = iLabel;
++        }
++        jsonBlobEdit(pParse, iRoot, sz, 0, 0);
++      }else if( pParse->eEdit==JEDIT_INS ){
++        /* Already exists, so json_insert() is a no-op */
++      }else{
++        /* json_set() or json_replace() */
++        jsonBlobEdit(pParse, iRoot, sz, pParse->aIns, pParse->nIns);
++      }
++    }
++    pParse->iLabel = iLabel;
++    return iRoot;
++  }
+   if( zPath[0]=='.' ){
+-    if( pRoot->eType!=JSON_OBJECT ) return 0;
++    int rawKey = 1;
++    x = pParse->aBlob[iRoot];
+     zPath++;
+     if( zPath[0]=='"' ){
+       zKey = zPath + 1;
+@@ -196557,303 +206059,849 @@ static JsonNode *jsonLookupStep(
+       if( zPath[i] ){
+         i++;
+       }else{
+-        *pzErr = zPath;
+-        return 0;
++        return JSON_LOOKUP_PATHERROR;
+       }
+       testcase( nKey==0 );
++      rawKey = memchr(zKey, '\\', nKey)==0;
+     }else{
+       zKey = zPath;
+       for(i=0; zPath[i] && zPath[i]!='.' && zPath[i]!='['; i++){}
+       nKey = i;
+       if( nKey==0 ){
+-        *pzErr = zPath;
+-        return 0;
+-      }
+-    }
+-    j = 1;
+-    for(;;){
+-      while( j<=pRoot->n ){
+-        if( jsonLabelCompare(pRoot+j, zKey, nKey) ){
+-          return jsonLookupStep(pParse, iRoot+j+1, &zPath[i], pApnd, pzErr);
+-        }
+-        j++;
+-        j += jsonNodeSize(&pRoot[j]);
++        return JSON_LOOKUP_PATHERROR;
++      }
++    }
++    if( (x & 0x0f)!=JSONB_OBJECT ) return JSON_LOOKUP_NOTFOUND;
++    n = jsonbPayloadSize(pParse, iRoot, &sz);
++    j = iRoot + n;  /* j is the index of a label */
++    iEnd = j+sz;
++    while( jaBlob[j] & 0x0f;
++      if( xJSONB_TEXTRAW ) return JSON_LOOKUP_ERROR;
++      n = jsonbPayloadSize(pParse, j, &sz);
++      if( n==0 ) return JSON_LOOKUP_ERROR;
++      k = j+n;  /* k is the index of the label text */
++      if( k+sz>=iEnd ) return JSON_LOOKUP_ERROR;
++      zLabel = (const char*)&pParse->aBlob[k];
++      rawLabel = x==JSONB_TEXT || x==JSONB_TEXTRAW;
++      if( jsonLabelCompare(zKey, nKey, rawKey, zLabel, sz, rawLabel) ){
++        u32 v = k+sz;  /* v is the index of the value */
++        if( ((pParse->aBlob[v])&0x0f)>JSONB_OBJECT ) return JSON_LOOKUP_ERROR;
++        n = jsonbPayloadSize(pParse, v, &sz);
++        if( n==0 || v+n+sz>iEnd ) return JSON_LOOKUP_ERROR;
++        assert( j>0 );
++        rc = jsonLookupStep(pParse, v, &zPath[i], j);
++        if( pParse->delta ) jsonAfterEditSizeAdjust(pParse, iRoot);
++        return rc;
+       }
+-      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
+-      assert( pRoot->eU==2 );
+-      iRoot += pRoot->u.iAppend;
+-      pRoot = &pParse->aNode[iRoot];
+-      j = 1;
+-    }
+-    if( pApnd ){
+-      u32 iStart, iLabel;
+-      JsonNode *pNode;
+-      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
+-      iLabel = jsonParseAddNode(pParse, JSON_STRING, nKey, zKey);
+-      zPath += i;
+-      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
+-      if( pParse->oom ) return 0;
+-      if( pNode ){
+-        pRoot = &pParse->aNode[iRoot];
+-        assert( pRoot->eU==0 );
+-        pRoot->u.iAppend = iStart - iRoot;
+-        pRoot->jnFlags |= JNODE_APPEND;
+-        VVA( pRoot->eU = 2 );
+-        pParse->aNode[iLabel].jnFlags |= JNODE_RAW;
+-      }
+-      return pNode;
++      j = k+sz;
++      if( ((pParse->aBlob[j])&0x0f)>JSONB_OBJECT ) return JSON_LOOKUP_ERROR;
++      n = jsonbPayloadSize(pParse, j, &sz);
++      if( n==0 ) return JSON_LOOKUP_ERROR;
++      j += n+sz;
++    }
++    if( j>iEnd ) return JSON_LOOKUP_ERROR;
++    if( pParse->eEdit>=JEDIT_INS ){
++      u32 nIns;          /* Total bytes to insert (label+value) */
++      JsonParse v;       /* BLOB encoding of the value to be inserted */
++      JsonParse ix;      /* Header of the label to be inserted */
++      testcase( pParse->eEdit==JEDIT_INS );
++      testcase( pParse->eEdit==JEDIT_SET );
++      memset(&ix, 0, sizeof(ix));
++      ix.db = pParse->db;
++      jsonBlobAppendNode(&ix, rawKey?JSONB_TEXTRAW:JSONB_TEXT5, nKey, 0);
++      pParse->oom |= ix.oom;
++      rc = jsonCreateEditSubstructure(pParse, &v, &zPath[i]);
++      if( !JSON_LOOKUP_ISERROR(rc)
++       && jsonBlobMakeEditable(pParse, ix.nBlob+nKey+v.nBlob)
++      ){
++        assert( !pParse->oom );
++        nIns = ix.nBlob + nKey + v.nBlob;
++        jsonBlobEdit(pParse, j, 0, 0, nIns);
++        if( !pParse->oom ){
++          assert( pParse->aBlob!=0 ); /* Because pParse->oom!=0 */
++          assert( ix.aBlob!=0 );      /* Because pPasre->oom!=0 */
++          memcpy(&pParse->aBlob[j], ix.aBlob, ix.nBlob);
++          k = j + ix.nBlob;
++          memcpy(&pParse->aBlob[k], zKey, nKey);
++          k += nKey;
++          memcpy(&pParse->aBlob[k], v.aBlob, v.nBlob);
++          if( ALWAYS(pParse->delta) ) jsonAfterEditSizeAdjust(pParse, iRoot);
++        }
++      }
++      jsonParseReset(&v);
++      jsonParseReset(&ix);
++      return rc;
+     }
+   }else if( zPath[0]=='[' ){
+-    i = 0;
+-    j = 1;
+-    while( sqlite3Isdigit(zPath[j]) ){
+-      i = i*10 + zPath[j] - '0';
+-      j++;
++    x = pParse->aBlob[iRoot] & 0x0f;
++    if( x!=JSONB_ARRAY )  return JSON_LOOKUP_NOTFOUND;
++    n = jsonbPayloadSize(pParse, iRoot, &sz);
++    k = 0;
++    i = 1;
++    while( sqlite3Isdigit(zPath[i]) ){
++      k = k*10 + zPath[i] - '0';
++      i++;
+     }
+-    if( j<2 || zPath[j]!=']' ){
++    if( i<2 || zPath[i]!=']' ){
+       if( zPath[1]=='#' ){
+-        JsonNode *pBase = pRoot;
+-        int iBase = iRoot;
+-        if( pRoot->eType!=JSON_ARRAY ) return 0;
+-        for(;;){
+-          while( j<=pBase->n ){
+-            if( (pBase[j].jnFlags & JNODE_REMOVE)==0 ) i++;
+-            j += jsonNodeSize(&pBase[j]);
+-          }
+-          if( (pBase->jnFlags & JNODE_APPEND)==0 ) break;
+-          assert( pBase->eU==2 );
+-          iBase += pBase->u.iAppend;
+-          pBase = &pParse->aNode[iBase];
+-          j = 1;
+-        }
+-        j = 2;
++        k = jsonbArrayCount(pParse, iRoot);
++        i = 2;
+         if( zPath[2]=='-' && sqlite3Isdigit(zPath[3]) ){
+-          unsigned int x = 0;
+-          j = 3;
++          unsigned int nn = 0;
++          i = 3;
+           do{
+-            x = x*10 + zPath[j] - '0';
+-            j++;
+-          }while( sqlite3Isdigit(zPath[j]) );
+-          if( x>i ) return 0;
+-          i -= x;
++            nn = nn*10 + zPath[i] - '0';
++            i++;
++          }while( sqlite3Isdigit(zPath[i]) );
++          if( nn>k ) return JSON_LOOKUP_NOTFOUND;
++          k -= nn;
+         }
+-        if( zPath[j]!=']' ){
+-          *pzErr = zPath;
+-          return 0;
++        if( zPath[i]!=']' ){
++          return JSON_LOOKUP_PATHERROR;
+         }
+       }else{
+-        *pzErr = zPath;
+-        return 0;
++        return JSON_LOOKUP_PATHERROR;
+       }
+     }
+-    if( pRoot->eType!=JSON_ARRAY ) return 0;
+-    zPath += j + 1;
+-    j = 1;
+-    for(;;){
+-      while( j<=pRoot->n && (i>0 || (pRoot[j].jnFlags & JNODE_REMOVE)!=0) ){
+-        if( (pRoot[j].jnFlags & JNODE_REMOVE)==0 ) i--;
+-        j += jsonNodeSize(&pRoot[j]);
+-      }
+-      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
+-      assert( pRoot->eU==2 );
+-      iRoot += pRoot->u.iAppend;
+-      pRoot = &pParse->aNode[iRoot];
+-      j = 1;
+-    }
+-    if( j<=pRoot->n ){
+-      return jsonLookupStep(pParse, iRoot+j, zPath, pApnd, pzErr);
+-    }
+-    if( i==0 && pApnd ){
+-      u32 iStart;
+-      JsonNode *pNode;
+-      iStart = jsonParseAddNode(pParse, JSON_ARRAY, 1, 0);
+-      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
+-      if( pParse->oom ) return 0;
+-      if( pNode ){
+-        pRoot = &pParse->aNode[iRoot];
+-        assert( pRoot->eU==0 );
+-        pRoot->u.iAppend = iStart - iRoot;
+-        pRoot->jnFlags |= JNODE_APPEND;
+-        VVA( pRoot->eU = 2 );
++    j = iRoot+n;
++    iEnd = j+sz;
++    while( jdelta ) jsonAfterEditSizeAdjust(pParse, iRoot);
++        return rc;
+       }
+-      return pNode;
++      k--;
++      n = jsonbPayloadSize(pParse, j, &sz);
++      if( n==0 ) return JSON_LOOKUP_ERROR;
++      j += n+sz;
++    }
++    if( j>iEnd ) return JSON_LOOKUP_ERROR;
++    if( k>0 ) return JSON_LOOKUP_NOTFOUND;
++    if( pParse->eEdit>=JEDIT_INS ){
++      JsonParse v;
++      testcase( pParse->eEdit==JEDIT_INS );
++      testcase( pParse->eEdit==JEDIT_SET );
++      rc = jsonCreateEditSubstructure(pParse, &v, &zPath[i+1]);
++      if( !JSON_LOOKUP_ISERROR(rc)
++       && jsonBlobMakeEditable(pParse, v.nBlob)
++      ){
++        assert( !pParse->oom );
++        jsonBlobEdit(pParse, j, 0, v.aBlob, v.nBlob);
++      }
++      jsonParseReset(&v);
++      if( pParse->delta ) jsonAfterEditSizeAdjust(pParse, iRoot);
++      return rc;
+     }
+   }else{
+-    *pzErr = zPath;
++    return JSON_LOOKUP_PATHERROR;
+   }
+-  return 0;
++  return JSON_LOOKUP_NOTFOUND;
+ }
+ 
+ /*
+-** Append content to pParse that will complete zPath.  Return a pointer
+-** to the inserted node, or return NULL if the append fails.
++** Convert a JSON BLOB into text and make that text the return value
++** of an SQL function.
+ */
+-static JsonNode *jsonLookupAppend(
+-  JsonParse *pParse,     /* Append content to the JSON parse */
+-  const char *zPath,     /* Description of content to append */
+-  int *pApnd,            /* Set this flag to 1 */
+-  const char **pzErr     /* Make this point to any syntax error */
++static void jsonReturnTextJsonFromBlob(
++  sqlite3_context *ctx,
++  const u8 *aBlob,
++  u32 nBlob
+ ){
+-  *pApnd = 1;
+-  if( zPath[0]==0 ){
+-    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
+-    return pParse->oom ? 0 : &pParse->aNode[pParse->nNode-1];
+-  }
+-  if( zPath[0]=='.' ){
+-    jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
+-  }else if( strncmp(zPath,"[0]",3)==0 ){
+-    jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
+-  }else{
+-    return 0;
+-  }
+-  if( pParse->oom ) return 0;
+-  return jsonLookupStep(pParse, pParse->nNode-1, zPath, pApnd, pzErr);
++  JsonParse x;
++  JsonString s;
++
++  if( NEVER(aBlob==0) ) return;
++  memset(&x, 0, sizeof(x));
++  x.aBlob = (u8*)aBlob;
++  x.nBlob = nBlob;
++  jsonStringInit(&s, ctx);
++  jsonTranslateBlobToText(&x, 0, &s);
++  jsonReturnString(&s, 0, 0);
+ }
+ 
++
+ /*
+-** Return the text of a syntax error message on a JSON path.  Space is
+-** obtained from sqlite3_malloc().
++** Return the value of the BLOB node at index i.
++**
++** If the value is a primitive, return it as an SQL value.
++** If the value is an array or object, return it as either
++** JSON text or the BLOB encoding, depending on the JSON_B flag
++** on the userdata.
+ */
+-static char *jsonPathSyntaxError(const char *zErr){
+-  return sqlite3_mprintf("JSON path error near '%q'", zErr);
++static void jsonReturnFromBlob(
++  JsonParse *pParse,          /* Complete JSON parse tree */
++  u32 i,                      /* Index of the node */
++  sqlite3_context *pCtx,      /* Return value for this function */
++  int textOnly                /* return text JSON.  Disregard user-data */
++){
++  u32 n, sz;
++  int rc;
++  sqlite3 *db = sqlite3_context_db_handle(pCtx);
++
++  n = jsonbPayloadSize(pParse, i, &sz);
++  if( n==0 ){
++    sqlite3_result_error(pCtx, "malformed JSON", -1);
++    return;
++  }
++  switch( pParse->aBlob[i] & 0x0f ){
++    case JSONB_NULL: {
++      if( sz ) goto returnfromblob_malformed;
++      sqlite3_result_null(pCtx);
++      break;
++    }
++    case JSONB_TRUE: {
++      if( sz ) goto returnfromblob_malformed;
++      sqlite3_result_int(pCtx, 1);
++      break;
++    }
++    case JSONB_FALSE: {
++      if( sz ) goto returnfromblob_malformed;
++      sqlite3_result_int(pCtx, 0);
++      break;
++    }
++    case JSONB_INT5:
++    case JSONB_INT: {
++      sqlite3_int64 iRes = 0;
++      char *z;
++      int bNeg = 0;
++      char x;
++      if( sz==0 ) goto returnfromblob_malformed;
++      x = (char)pParse->aBlob[i+n];
++      if( x=='-' ){
++        if( sz<2 ) goto returnfromblob_malformed;
++        n++;
++        sz--;
++        bNeg = 1;
++      }
++      z = sqlite3DbStrNDup(db, (const char*)&pParse->aBlob[i+n], (int)sz);
++      if( z==0 ) goto returnfromblob_oom;
++      rc = sqlite3DecOrHexToI64(z, &iRes);
++      sqlite3DbFree(db, z);
++      if( rc==0 ){
++        sqlite3_result_int64(pCtx, bNeg ? -iRes : iRes);
++      }else if( rc==3 && bNeg ){
++        sqlite3_result_int64(pCtx, SMALLEST_INT64);
++      }else if( rc==1 ){
++        goto returnfromblob_malformed;
++      }else{
++        if( bNeg ){ n--; sz++; }
++        goto to_double;
++      }
++      break;
++    }
++    case JSONB_FLOAT5:
++    case JSONB_FLOAT: {
++      double r;
++      char *z;
++      if( sz==0 ) goto returnfromblob_malformed;
++    to_double:
++      z = sqlite3DbStrNDup(db, (const char*)&pParse->aBlob[i+n], (int)sz);
++      if( z==0 ) goto returnfromblob_oom;
++      rc = sqlite3AtoF(z, &r, sqlite3Strlen30(z), SQLITE_UTF8);
++      sqlite3DbFree(db, z);
++      if( rc<=0 ) goto returnfromblob_malformed;
++      sqlite3_result_double(pCtx, r);
++      break;
++    }
++    case JSONB_TEXTRAW:
++    case JSONB_TEXT: {
++      sqlite3_result_text(pCtx, (char*)&pParse->aBlob[i+n], sz,
++                          SQLITE_TRANSIENT);
++      break;
++    }
++    case JSONB_TEXT5:
++    case JSONB_TEXTJ: {
++      /* Translate JSON formatted string into raw text */
++      u32 iIn, iOut;
++      const char *z;
++      char *zOut;
++      u32 nOut = sz;
++      z = (const char*)&pParse->aBlob[i+n];
++      zOut = sqlite3DbMallocRaw(db, nOut+1);
++      if( zOut==0 ) goto returnfromblob_oom;
++      for(iIn=iOut=0; iIn=2 );
++            zOut[iOut++] = (char)(0xc0 | (v>>6));
++            zOut[iOut++] = 0x80 | (v&0x3f);
++          }else if( v<0x10000 ){
++            assert( szEscape>=3 );
++            zOut[iOut++] = 0xe0 | (v>>12);
++            zOut[iOut++] = 0x80 | ((v>>6)&0x3f);
++            zOut[iOut++] = 0x80 | (v&0x3f);
++          }else if( v==JSON_INVALID_CHAR ){
++            /* Silently ignore illegal unicode */
++          }else{
++            assert( szEscape>=4 );
++            zOut[iOut++] = 0xf0 | (v>>18);
++            zOut[iOut++] = 0x80 | ((v>>12)&0x3f);
++            zOut[iOut++] = 0x80 | ((v>>6)&0x3f);
++            zOut[iOut++] = 0x80 | (v&0x3f);
++          }
++          iIn += szEscape - 1;
++        }else{
++          zOut[iOut++] = c;
++        }
++      } /* end for() */
++      assert( iOut<=nOut );
++      zOut[iOut] = 0;
++      sqlite3_result_text(pCtx, zOut, iOut, SQLITE_DYNAMIC);
++      break;
++    }
++    case JSONB_ARRAY:
++    case JSONB_OBJECT: {
++      int flags = textOnly ? 0 : SQLITE_PTR_TO_INT(sqlite3_user_data(pCtx));
++      if( flags & JSON_BLOB ){
++        sqlite3_result_blob(pCtx, &pParse->aBlob[i], sz+n, SQLITE_TRANSIENT);
++      }else{
++        jsonReturnTextJsonFromBlob(pCtx, &pParse->aBlob[i], sz+n);
++      }
++      break;
++    }
++    default: {
++      goto returnfromblob_malformed;
++    }
++  }
++  return;
++
++returnfromblob_oom:
++  sqlite3_result_error_nomem(pCtx);
++  return;
++
++returnfromblob_malformed:
++  sqlite3_result_error(pCtx, "malformed JSON", -1);
++  return;
+ }
+ 
+ /*
+-** Do a node lookup using zPath.  Return a pointer to the node on success.
+-** Return NULL if not found or if there is an error.
++** pArg is a function argument that might be an SQL value or a JSON
++** value.  Figure out what it is and encode it as a JSONB blob.
++** Return the results in pParse.
+ **
+-** On an error, write an error message into pCtx and increment the
+-** pParse->nErr counter.
++** pParse is uninitialized upon entry.  This routine will handle the
++** initialization of pParse.  The result will be contained in
++** pParse->aBlob and pParse->nBlob.  pParse->aBlob might be dynamically
++** allocated (if pParse->nBlobAlloc is greater than zero) in which case
++** the caller is responsible for freeing the space allocated to pParse->aBlob
++** when it has finished with it.  Or pParse->aBlob might be a static string
++** or a value obtained from sqlite3_value_blob(pArg).
+ **
+-** If pApnd!=NULL then try to append missing nodes and set *pApnd = 1 if
+-** nodes are appended.
++** If the argument is a BLOB that is clearly not a JSONB, then this
++** function might set an error message in ctx and return non-zero.
++** It might also set an error message and return non-zero on an OOM error.
+ */
+-static JsonNode *jsonLookup(
+-  JsonParse *pParse,      /* The JSON to search */
+-  const char *zPath,      /* The path to search */
+-  int *pApnd,             /* Append nodes to complete path if not NULL */
+-  sqlite3_context *pCtx   /* Report errors here, if not NULL */
+-){
+-  const char *zErr = 0;
+-  JsonNode *pNode = 0;
+-  char *zMsg;
+-
+-  if( zPath==0 ) return 0;
+-  if( zPath[0]!='$' ){
+-    zErr = zPath;
+-    goto lookup_err;
++static int jsonFunctionArgToBlob(
++  sqlite3_context *ctx,
++  sqlite3_value *pArg,
++  JsonParse *pParse
++){
++  int eType = sqlite3_value_type(pArg);
++  static u8 aNull[] = { 0x00 };
++  memset(pParse, 0, sizeof(pParse[0]));
++  pParse->db = sqlite3_context_db_handle(ctx);
++  switch( eType ){
++    default: {
++      pParse->aBlob = aNull;
++      pParse->nBlob = 1;
++      return 0;
++    }
++    case SQLITE_BLOB: {
++      if( jsonFuncArgMightBeBinary(pArg) ){
++        pParse->aBlob = (u8*)sqlite3_value_blob(pArg);
++        pParse->nBlob = sqlite3_value_bytes(pArg);
++      }else{
++        sqlite3_result_error(ctx, "JSON cannot hold BLOB values", -1);
++        return 1;
++      }
++      break;
++    }
++    case SQLITE_TEXT: {
++      const char *zJson = (const char*)sqlite3_value_text(pArg);
++      int nJson = sqlite3_value_bytes(pArg);
++      if( zJson==0 ) return 1;
++      if( sqlite3_value_subtype(pArg)==JSON_SUBTYPE ){
++        pParse->zJson = (char*)zJson;
++        pParse->nJson = nJson;
++        if( jsonConvertTextToBlob(pParse, ctx) ){
++          sqlite3_result_error(ctx, "malformed JSON", -1);
++          sqlite3DbFree(pParse->db, pParse->aBlob);
++          memset(pParse, 0, sizeof(pParse[0]));
++          return 1;
++        }
++      }else{
++        jsonBlobAppendNode(pParse, JSONB_TEXTRAW, nJson, zJson);
++      }
++      break;
++    }
++    case SQLITE_FLOAT: {
++      double r = sqlite3_value_double(pArg);
++      if( NEVER(sqlite3IsNaN(r)) ){
++        jsonBlobAppendNode(pParse, JSONB_NULL, 0, 0);
++      }else{
++        int n = sqlite3_value_bytes(pArg);
++        const char *z = (const char*)sqlite3_value_text(pArg);
++        if( z==0 ) return 1;
++        if( z[0]=='I' ){
++          jsonBlobAppendNode(pParse, JSONB_FLOAT, 5, "9e999");
++        }else if( z[0]=='-' && z[1]=='I' ){
++          jsonBlobAppendNode(pParse, JSONB_FLOAT, 6, "-9e999");
++        }else{
++          jsonBlobAppendNode(pParse, JSONB_FLOAT, n, z);
++        }
++      }
++      break;
++    }
++    case SQLITE_INTEGER: {
++      int n = sqlite3_value_bytes(pArg);
++      const char *z = (const char*)sqlite3_value_text(pArg);
++      if( z==0 ) return 1;
++      jsonBlobAppendNode(pParse, JSONB_INT, n, z);
++      break;
++    }
++  }
++  if( pParse->oom ){
++    sqlite3_result_error_nomem(ctx);
++    return 1;
++  }else{
++    return 0;
+   }
+-  zPath++;
+-  pNode = jsonLookupStep(pParse, 0, zPath, pApnd, &zErr);
+-  if( zErr==0 ) return pNode;
++}
+ 
+-lookup_err:
+-  pParse->nErr++;
+-  assert( zErr!=0 && pCtx!=0 );
+-  zMsg = jsonPathSyntaxError(zErr);
++/*
++** Generate a bad path error.
++**
++** If ctx is not NULL then push the error message into ctx and return NULL.
++** If ctx is NULL, then return the text of the error message.
++*/
++static char *jsonBadPathError(
++  sqlite3_context *ctx,     /* The function call containing the error */
++  const char *zPath         /* The path with the problem */
++){
++  char *zMsg = sqlite3_mprintf("bad JSON path: %Q", zPath);
++  if( ctx==0 ) return zMsg;
+   if( zMsg ){
+-    sqlite3_result_error(pCtx, zMsg, -1);
++    sqlite3_result_error(ctx, zMsg, -1);
+     sqlite3_free(zMsg);
+   }else{
+-    sqlite3_result_error_nomem(pCtx);
++    sqlite3_result_error_nomem(ctx);
+   }
+   return 0;
+ }
+ 
++/* argv[0] is a BLOB that seems likely to be a JSONB.  Subsequent
++** arguments come in parse where each pair contains a JSON path and
++** content to insert or set at that patch.  Do the updates
++** and return the result.
++**
++** The specific operation is determined by eEdit, which can be one
++** of JEDIT_INS, JEDIT_REPL, or JEDIT_SET.
++*/
++static void jsonInsertIntoBlob(
++  sqlite3_context *ctx,
++  int argc,
++  sqlite3_value **argv,
++  int eEdit                /* JEDIT_INS, JEDIT_REPL, or JEDIT_SET */
++){
++  int i;
++  u32 rc = 0;
++  const char *zPath = 0;
++  int flgs;
++  JsonParse *p;
++  JsonParse ax;
++
++  assert( (argc&1)==1 );
++  flgs = argc==1 ? 0 : JSON_EDITABLE;
++  p = jsonParseFuncArg(ctx, argv[0], flgs);
++  if( p==0 ) return;
++  for(i=1; inBlob, ax.aBlob, ax.nBlob);
++      }
++      rc = 0;
++   }else{
++      p->eEdit = eEdit;
++      p->nIns = ax.nBlob;
++      p->aIns = ax.aBlob;
++      p->delta = 0;
++      rc = jsonLookupStep(p, 0, zPath+1, 0);
++    }
++    jsonParseReset(&ax);
++    if( rc==JSON_LOOKUP_NOTFOUND ) continue;
++    if( JSON_LOOKUP_ISERROR(rc) ) goto jsonInsertIntoBlob_patherror;
++  }
++  jsonReturnParse(ctx, p);
++  jsonParseFree(p);
++  return;
++
++jsonInsertIntoBlob_patherror:
++  jsonParseFree(p);
++  if( rc==JSON_LOOKUP_ERROR ){
++    sqlite3_result_error(ctx, "malformed JSON", -1);
++  }else{
++    jsonBadPathError(ctx, zPath);
++  }
++  return;
++}
++
++/*
++** If pArg is a blob that seems like a JSONB blob, then initialize
++** p to point to that JSONB and return TRUE.  If pArg does not seem like
++** a JSONB blob, then return FALSE;
++**
++** This routine is only called if it is already known that pArg is a
++** blob.  The only open question is whether or not the blob appears
++** to be a JSONB blob.
++*/
++static int jsonArgIsJsonb(sqlite3_value *pArg, JsonParse *p){
++  u32 n, sz = 0;
++  p->aBlob = (u8*)sqlite3_value_blob(pArg);
++  p->nBlob = (u32)sqlite3_value_bytes(pArg);
++  if( p->nBlob==0 ){
++    p->aBlob = 0;
++    return 0;
++  }
++  if( NEVER(p->aBlob==0) ){
++    return 0;
++  }
++  if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT
++   && (n = jsonbPayloadSize(p, 0, &sz))>0
++   && sz+n==p->nBlob
++   && ((p->aBlob[0] & 0x0f)>JSONB_FALSE || sz==0)
++  ){
++    return 1;
++  }
++  p->aBlob = 0;
++  p->nBlob = 0;
++  return 0;
++}
+ 
+ /*
+-** Report the wrong number of arguments for json_insert(), json_replace()
+-** or json_set().
++** Generate a JsonParse object, containing valid JSONB in aBlob and nBlob,
++** from the SQL function argument pArg.  Return a pointer to the new
++** JsonParse object.
++**
++** Ownership of the new JsonParse object is passed to the caller.  The
++** caller should invoke jsonParseFree() on the return value when it
++** has finished using it.
++**
++** If any errors are detected, an appropriate error messages is set
++** using sqlite3_result_error() or the equivalent and this routine
++** returns NULL.  This routine also returns NULL if the pArg argument
++** is an SQL NULL value, but no error message is set in that case.  This
++** is so that SQL functions that are given NULL arguments will return
++** a NULL value.
+ */
+-static void jsonWrongNumArgs(
+-  sqlite3_context *pCtx,
+-  const char *zFuncName
++static JsonParse *jsonParseFuncArg(
++  sqlite3_context *ctx,
++  sqlite3_value *pArg,
++  u32 flgs
+ ){
+-  char *zMsg = sqlite3_mprintf("json_%s() needs an odd number of arguments",
+-                               zFuncName);
+-  sqlite3_result_error(pCtx, zMsg, -1);
+-  sqlite3_free(zMsg);
++  int eType;                   /* Datatype of pArg */
++  JsonParse *p = 0;            /* Value to be returned */
++  JsonParse *pFromCache = 0;   /* Value taken from cache */
++  sqlite3 *db;                 /* The database connection */
++
++  assert( ctx!=0 );
++  eType = sqlite3_value_type(pArg);
++  if( eType==SQLITE_NULL ){
++    return 0;
++  }
++  pFromCache = jsonCacheSearch(ctx, pArg);
++  if( pFromCache ){
++    pFromCache->nJPRef++;
++    if( (flgs & JSON_EDITABLE)==0 ){
++      return pFromCache;
++    }
++  }
++  db = sqlite3_context_db_handle(ctx);
++rebuild_from_cache:
++  p = sqlite3DbMallocZero(db, sizeof(*p));
++  if( p==0 ) goto json_pfa_oom;
++  memset(p, 0, sizeof(*p));
++  p->db = db;
++  p->nJPRef = 1;
++  if( pFromCache!=0 ){
++    u32 nBlob = pFromCache->nBlob;
++    p->aBlob = sqlite3DbMallocRaw(db, nBlob);
++    if( p->aBlob==0 ) goto json_pfa_oom;
++    memcpy(p->aBlob, pFromCache->aBlob, nBlob);
++    p->nBlobAlloc = p->nBlob = nBlob;
++    p->hasNonstd = pFromCache->hasNonstd;
++    jsonParseFree(pFromCache);
++    return p;
++  }
++  if( eType==SQLITE_BLOB ){
++    if( jsonArgIsJsonb(pArg,p) ){
++      if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){
++        goto json_pfa_oom;
++      }
++      return p;
++    }
++    /* If the blob is not valid JSONB, fall through into trying to cast
++    ** the blob into text which is then interpreted as JSON.  (tag-20240123-a)
++    **
++    ** This goes against all historical documentation about how the SQLite
++    ** JSON functions were suppose to work.  From the beginning, blob was
++    ** reserved for expansion and a blob value should have raised an error.
++    ** But it did not, due to a bug.  And many applications came to depend
++    ** upon this buggy behavior, espeically when using the CLI and reading
++    ** JSON text using readfile(), which returns a blob.  For this reason
++    ** we will continue to support the bug moving forward.
++    ** See for example https://sqlite.org/forum/forumpost/012136abd5292b8d
++    */
++  }
++  p->zJson = (char*)sqlite3_value_text(pArg);
++  p->nJson = sqlite3_value_bytes(pArg);
++  if( p->nJson==0 ) goto json_pfa_malformed;
++  if( NEVER(p->zJson==0) ) goto json_pfa_oom;
++  if( jsonConvertTextToBlob(p, (flgs & JSON_KEEPERROR) ? 0 : ctx) ){
++    if( flgs & JSON_KEEPERROR ){
++      p->nErr = 1;
++      return p;
++    }else{
++      jsonParseFree(p);
++      return 0;
++    }
++  }else{
++    int isRCStr = sqlite3ValueIsOfClass(pArg, sqlite3RCStrUnref);
++    int rc;
++    if( !isRCStr ){
++      char *zNew = sqlite3RCStrNew( p->nJson );
++      if( zNew==0 ) goto json_pfa_oom;
++      memcpy(zNew, p->zJson, p->nJson);
++      p->zJson = zNew;
++      p->zJson[p->nJson] = 0;
++    }else{
++      sqlite3RCStrRef(p->zJson);
++    }
++    p->bJsonIsRCStr = 1;
++    rc = jsonCacheInsert(ctx, p);
++    if( rc==SQLITE_NOMEM ) goto json_pfa_oom;
++    if( flgs & JSON_EDITABLE ){
++      pFromCache = p;
++      p = 0;
++      goto rebuild_from_cache;
++    }
++  }
++  return p;
++
++json_pfa_malformed:
++  if( flgs & JSON_KEEPERROR ){
++    p->nErr = 1;
++    return p;
++  }else{
++    jsonParseFree(p);
++    sqlite3_result_error(ctx, "malformed JSON", -1);
++    return 0;
++  }
++
++json_pfa_oom:
++  jsonParseFree(pFromCache);
++  jsonParseFree(p);
++  sqlite3_result_error_nomem(ctx);
++  return 0;
+ }
+ 
+ /*
+-** Mark all NULL entries in the Object passed in as JNODE_REMOVE.
++** Make the return value of a JSON function either the raw JSONB blob
++** or make it JSON text, depending on whether the JSON_BLOB flag is
++** set on the function.
+ */
+-static void jsonRemoveAllNulls(JsonNode *pNode){
+-  int i, n;
+-  assert( pNode->eType==JSON_OBJECT );
+-  n = pNode->n;
+-  for(i=2; i<=n; i += jsonNodeSize(&pNode[i])+1){
+-    switch( pNode[i].eType ){
+-      case JSON_NULL:
+-        pNode[i].jnFlags |= JNODE_REMOVE;
+-        break;
+-      case JSON_OBJECT:
+-        jsonRemoveAllNulls(&pNode[i]);
+-        break;
++static void jsonReturnParse(
++  sqlite3_context *ctx,
++  JsonParse *p
++){
++  int flgs;
++  if( p->oom ){
++    sqlite3_result_error_nomem(ctx);
++    return;
++  }
++  flgs = SQLITE_PTR_TO_INT(sqlite3_user_data(ctx));
++  if( flgs & JSON_BLOB ){
++    if( p->nBlobAlloc>0 && !p->bReadOnly ){
++      sqlite3_result_blob(ctx, p->aBlob, p->nBlob, SQLITE_DYNAMIC);
++      p->nBlobAlloc = 0;
++    }else{
++      sqlite3_result_blob(ctx, p->aBlob, p->nBlob, SQLITE_TRANSIENT);
+     }
++  }else{
++    JsonString s;
++    jsonStringInit(&s, ctx);
++    p->delta = 0;
++    jsonTranslateBlobToText(p, 0, &s);
++    jsonReturnString(&s, p, ctx);
++    sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+   }
+ }
+ 
+-
+ /****************************************************************************
+ ** SQL functions used for testing and debugging
+ ****************************************************************************/
+ 
+-#ifdef SQLITE_DEBUG
++#if SQLITE_DEBUG
+ /*
+-** The json_parse(JSON) function returns a string which describes
+-** a parse of the JSON provided.  Or it returns NULL if JSON is not
+-** well-formed.
+-*/
+-static void jsonParseFunc(
+-  sqlite3_context *ctx,
+-  int argc,
+-  sqlite3_value **argv
+-){
+-  JsonString s;       /* Output string - not real JSON */
+-  JsonParse x;        /* The parse */
+-  u32 i;
+-
+-  assert( argc==1 );
+-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+-  jsonParseFindParents(&x);
+-  jsonInit(&s, ctx);
+-  for(i=0; iaBlob[iStart] & 0x0f;
++    u32 savedNBlob = pParse->nBlob;
++    sqlite3_str_appendf(pOut, "%5d:%*s", iStart, nIndent, "");
++    if( pParse->nBlobAlloc>pParse->nBlob ){
++      pParse->nBlob = pParse->nBlobAlloc;
++    }
++    nn = n = jsonbPayloadSize(pParse, iStart, &sz);
++    if( nn==0 ) nn = 1;
++    if( sz>0 && xaBlob[iStart+i]);
+     }
+-    jsonPrintf(100, &s,"node %3u: %7s n=%-4d up=%-4d",
+-               i, zType, x.aNode[i].n, x.aUp[i]);
+-    assert( x.aNode[i].eU==0 || x.aNode[i].eU==1 );
+-    if( x.aNode[i].u.zJContent!=0 ){
+-      assert( x.aNode[i].eU==1 );
+-      jsonAppendRaw(&s, " ", 1);
+-      jsonAppendRaw(&s, x.aNode[i].u.zJContent, x.aNode[i].n);
+-    }else{
+-      assert( x.aNode[i].eU==0 );
++    if( n==0 ){
++      sqlite3_str_appendf(pOut, "   ERROR invalid node size\n");
++      iStart = n==0 ? iStart+1 : iEnd;
++      continue;
++    }
++    pParse->nBlob = savedNBlob;
++    if( iStart+n+sz>iEnd ){
++      iEnd = iStart+n+sz;
++      if( iEnd>pParse->nBlob ){
++        if( pParse->nBlobAlloc>0 && iEnd>pParse->nBlobAlloc ){
++          iEnd = pParse->nBlobAlloc;
++        }else{
++          iEnd = pParse->nBlob;
++        }
++      }
++    }
++    sqlite3_str_appendall(pOut,"  <-- ");
++    switch( x ){
++      case JSONB_NULL:     sqlite3_str_appendall(pOut,"null"); break;
++      case JSONB_TRUE:     sqlite3_str_appendall(pOut,"true"); break;
++      case JSONB_FALSE:    sqlite3_str_appendall(pOut,"false"); break;
++      case JSONB_INT:      sqlite3_str_appendall(pOut,"int"); break;
++      case JSONB_INT5:     sqlite3_str_appendall(pOut,"int5"); break;
++      case JSONB_FLOAT:    sqlite3_str_appendall(pOut,"float"); break;
++      case JSONB_FLOAT5:   sqlite3_str_appendall(pOut,"float5"); break;
++      case JSONB_TEXT:     sqlite3_str_appendall(pOut,"text"); break;
++      case JSONB_TEXTJ:    sqlite3_str_appendall(pOut,"textj"); break;
++      case JSONB_TEXT5:    sqlite3_str_appendall(pOut,"text5"); break;
++      case JSONB_TEXTRAW:  sqlite3_str_appendall(pOut,"textraw"); break;
++      case JSONB_ARRAY: {
++        sqlite3_str_appendf(pOut,"array, %u bytes\n", sz);
++        jsonDebugPrintBlob(pParse, iStart+n, iStart+n+sz, nIndent+2, pOut);
++        showContent = 0;
++        break;
++      }
++      case JSONB_OBJECT: {
++        sqlite3_str_appendf(pOut, "object, %u bytes\n", sz);
++        jsonDebugPrintBlob(pParse, iStart+n, iStart+n+sz, nIndent+2, pOut);
++        showContent = 0;
++        break;
++      }
++      default: {
++        sqlite3_str_appendall(pOut, "ERROR: unknown node type\n");
++        showContent = 0;
++        break;
++      }
++    }
++    if( showContent ){
++      if( sz==0 && x<=JSONB_FALSE ){
++        sqlite3_str_append(pOut, "\n", 1);
++      }else{
++        u32 i;
++        sqlite3_str_appendall(pOut, ": \"");
++        for(i=iStart+n; iaBlob[i];
++          if( c<0x20 || c>=0x7f ) c = '.';
++          sqlite3_str_append(pOut, (char*)&c, 1);
++        }
++        sqlite3_str_append(pOut, "\"\n", 2);
++      }
+     }
+-    jsonAppendRaw(&s, "\n", 1);
++    iStart += n + sz;
++  }
++}
++static void jsonShowParse(JsonParse *pParse){
++  sqlite3_str out;
++  char zBuf[1000];
++  if( pParse==0 ){
++    printf("NULL pointer\n");
++    return;
++  }else{
++    printf("nBlobAlloc = %u\n", pParse->nBlobAlloc);
++    printf("nBlob = %u\n", pParse->nBlob);
++    printf("delta = %d\n", pParse->delta);
++    if( pParse->nBlob==0 ) return;
++    printf("content (bytes 0..%u):\n", pParse->nBlob-1);
+   }
+-  jsonParseReset(&x);
+-  jsonResult(&s);
++  sqlite3StrAccumInit(&out, 0, zBuf, sizeof(zBuf), 1000000);
++  jsonDebugPrintBlob(pParse, 0, pParse->nBlob, 0, &out);
++  printf("%s", sqlite3_str_value(&out));
++  sqlite3_str_reset(&out);
+ }
++#endif /* SQLITE_DEBUG */
+ 
++#ifdef SQLITE_DEBUG
+ /*
+-** The json_test1(JSON) function return true (1) if the input is JSON
+-** text generated by another json function.  It returns (0) if the input
+-** is not known to be JSON.
++** SQL function:   json_parse(JSON)
++**
++** Parse JSON using jsonParseFuncArg().  Return text that is a
++** human-readable dump of the binary JSONB for the input parameter.
+ */
+-static void jsonTest1Func(
++static void jsonParseFunc(
+   sqlite3_context *ctx,
+   int argc,
+   sqlite3_value **argv
+ ){
+-  UNUSED_PARAMETER(argc);
+-  sqlite3_result_int(ctx, sqlite3_value_subtype(argv[0])==JSON_SUBTYPE);
++  JsonParse *p;        /* The parse */
++  sqlite3_str out;
++
++  assert( argc>=1 );
++  sqlite3StrAccumInit(&out, 0, 0, 0, 1000000);
++  p = jsonParseFuncArg(ctx, argv[0], 0);
++  if( p==0 ) return;
++  if( argc==1 ){
++    jsonDebugPrintBlob(p, 0, p->nBlob, 0, &out);
++    sqlite3_result_text64(ctx, out.zText, out.nChar, SQLITE_DYNAMIC, SQLITE_UTF8);
++  }else{
++    jsonShowParse(p);
++  }
++  jsonParseFree(p);
+ }
+ #endif /* SQLITE_DEBUG */
+ 
+@@ -196862,7 +206910,7 @@ static void jsonTest1Func(
+ ****************************************************************************/
+ 
+ /*
+-** Implementation of the json_QUOTE(VALUE) function.  Return a JSON value
++** Implementation of the json_quote(VALUE) function.  Return a JSON value
+ ** corresponding to the SQL value input.  Mostly this means putting
+ ** double-quotes around strings and returning the unquoted string "null"
+ ** when given a NULL input.
+@@ -196875,9 +206923,9 @@ static void jsonQuoteFunc(
+   JsonString jx;
+   UNUSED_PARAMETER(argc);
+ 
+-  jsonInit(&jx, ctx);
+-  jsonAppendValue(&jx, argv[0]);
+-  jsonResult(&jx);
++  jsonStringInit(&jx, ctx);
++  jsonAppendSqlValue(&jx, argv[0]);
++  jsonReturnString(&jx, 0, 0);
+   sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+ }
+ 
+@@ -196894,18 +206942,17 @@ static void jsonArrayFunc(
+   int i;
+   JsonString jx;
+ 
+-  jsonInit(&jx, ctx);
++  jsonStringInit(&jx, ctx);
+   jsonAppendChar(&jx, '[');
+   for(i=0; inNode );
+   if( argc==2 ){
+     const char *zPath = (const char*)sqlite3_value_text(argv[1]);
+-    pNode = jsonLookup(p, zPath, 0, ctx);
++    if( zPath==0 ){
++      jsonParseFree(p);
++      return;
++    }
++    i = jsonLookupStep(p, 0, zPath[0]=='$' ? zPath+1 : "@", 0);
++    if( JSON_LOOKUP_ISERROR(i) ){
++      if( i==JSON_LOOKUP_NOTFOUND ){
++        /* no-op */
++      }else if( i==JSON_LOOKUP_PATHERROR ){
++        jsonBadPathError(ctx, zPath);
++      }else{
++        sqlite3_result_error(ctx, "malformed JSON", -1);
++      }
++      eErr = 1;
++      i = 0;
++    }
+   }else{
+-    pNode = p->aNode;
+-  }
+-  if( pNode==0 ){
+-    return;
++    i = 0;
+   }
+-  if( pNode->eType==JSON_ARRAY ){
+-    assert( (pNode->jnFlags & JNODE_APPEND)==0 );
+-    for(i=1; i<=pNode->n; n++){
+-      i += jsonNodeSize(&pNode[i]);
+-    }
++  if( (p->aBlob[i] & 0x0f)==JSONB_ARRAY ){
++    cnt = jsonbArrayCount(p, i);
+   }
+-  sqlite3_result_int64(ctx, n);
++  if( !eErr ) sqlite3_result_int64(ctx, cnt);
++  jsonParseFree(p);
+ }
+ 
+-/*
+-** Bit values for the flags passed into jsonExtractFunc() or
+-** jsonSetFunc() via the user-data value.
+-*/
+-#define JSON_JSON      0x01        /* Result is always JSON */
+-#define JSON_SQL       0x02        /* Result is always SQL */
+-#define JSON_ABPATH    0x03        /* Allow abbreviated JSON path specs */
+-#define JSON_ISSET     0x04        /* json_set(), not json_insert() */
++/* True if the string is all digits */
++static int jsonAllDigits(const char *z, int n){
++  int i;
++  for(i=0; i2 ){
++    jsonAppendChar(&jx, '[');
++  }
++  for(i=1; i and ->> operators accept abbreviated PATH arguments.  This
+-        ** is mostly for compatibility with PostgreSQL, but also for
+-        ** convenience.
+-        **
+-        **     NUMBER   ==>  $[NUMBER]     // PG compatible
+-        **     LABEL    ==>  $.LABEL       // PG compatible
+-        **     [NUMBER] ==>  $[NUMBER]     // Not PG.  Purely for convenience
+-        */
+-        jsonInit(&jx, ctx);
+-        if( sqlite3Isdigit(zPath[0]) ){
+-          jsonAppendRaw(&jx, "$[", 2);
+-          jsonAppendRaw(&jx, zPath, (int)strlen(zPath));
+-          jsonAppendRaw(&jx, "]", 2);
+-        }else{
+-          jsonAppendRaw(&jx, "$.", 1 + (zPath[0]!='['));
+-          jsonAppendRaw(&jx, zPath, (int)strlen(zPath));
+-          jsonAppendChar(&jx, 0);
+-        }
+-        pNode = jx.bErr ? 0 : jsonLookup(p, jx.zBuf, 0, ctx);
+-        jsonReset(&jx);
++    const char *zPath = (const char*)sqlite3_value_text(argv[i]);
++    int nPath;
++    u32 j;
++    if( zPath==0 ) goto json_extract_error;
++    nPath = sqlite3Strlen30(zPath);
++    if( zPath[0]=='$' ){
++      j = jsonLookupStep(p, 0, zPath+1, 0);
++    }else if( (flags & JSON_ABPATH) ){
++      /* The -> and ->> operators accept abbreviated PATH arguments.  This
++      ** is mostly for compatibility with PostgreSQL, but also for
++      ** convenience.
++      **
++      **     NUMBER   ==>  $[NUMBER]     // PG compatible
++      **     LABEL    ==>  $.LABEL       // PG compatible
++      **     [NUMBER] ==>  $[NUMBER]     // Not PG.  Purely for convenience
++      */
++      jsonStringInit(&jx, ctx);
++      if( jsonAllDigits(zPath, nPath) ){
++        jsonAppendRawNZ(&jx, "[", 1);
++        jsonAppendRaw(&jx, zPath, nPath);
++        jsonAppendRawNZ(&jx, "]", 2);
++      }else if( jsonAllAlphanum(zPath, nPath) ){
++        jsonAppendRawNZ(&jx, ".", 1);
++        jsonAppendRaw(&jx, zPath, nPath);
++      }else if( zPath[0]=='[' && nPath>=3 && zPath[nPath-1]==']' ){
++        jsonAppendRaw(&jx, zPath, nPath);
+       }else{
+-        pNode = jsonLookup(p, zPath, 0, ctx);
++        jsonAppendRawNZ(&jx, ".\"", 2);
++        jsonAppendRaw(&jx, zPath, nPath);
++        jsonAppendRawNZ(&jx, "\"", 1);
+       }
+-      if( pNode ){
++      jsonStringTerminate(&jx);
++      j = jsonLookupStep(p, 0, jx.zBuf, 0);
++      jsonStringReset(&jx);
++    }else{
++      jsonBadPathError(ctx, zPath);
++      goto json_extract_error;
++    }
++    if( jnBlob ){
++      if( argc==2 ){
+         if( flags & JSON_JSON ){
+-          jsonReturnJson(pNode, ctx, 0);
++          jsonStringInit(&jx, ctx);
++          jsonTranslateBlobToText(p, j, &jx);
++          jsonReturnString(&jx, 0, 0);
++          jsonStringReset(&jx);
++          assert( (flags & JSON_BLOB)==0 );
++          sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+         }else{
+-          jsonReturn(pNode, ctx, 0);
+-          sqlite3_result_subtype(ctx, 0);
++          jsonReturnFromBlob(p, j, ctx, 0);
++          if( (flags & (JSON_SQL|JSON_BLOB))==0
++           && (p->aBlob[j]&0x0f)>=JSONB_ARRAY
++          ){
++            sqlite3_result_subtype(ctx, JSON_SUBTYPE);
++          }
+         }
++      }else{
++        jsonAppendSeparator(&jx);
++        jsonTranslateBlobToText(p, j, &jx);
+       }
+-    }else{
+-      pNode = jsonLookup(p, zPath, 0, ctx);
+-      if( p->nErr==0 && pNode ) jsonReturn(pNode, ctx, 0);
+-    }
+-  }else{
+-    /* Two or more PATH arguments results in a JSON array with each
+-    ** element of the array being the value selected by one of the PATHs */
+-    int i;
+-    jsonInit(&jx, ctx);
+-    jsonAppendChar(&jx, '[');
+-    for(i=1; inErr ) break;
+-      jsonAppendSeparator(&jx);
+-      if( pNode ){
+-        jsonRenderNode(pNode, &jx, 0);
++    }else if( j==JSON_LOOKUP_NOTFOUND ){
++      if( argc==2 ){
++        goto json_extract_error;  /* Return NULL if not found */
+       }else{
+-        jsonAppendRaw(&jx, "null", 4);
++        jsonAppendSeparator(&jx);
++        jsonAppendRawNZ(&jx, "null", 4);
+       }
++    }else if( j==JSON_LOOKUP_ERROR ){
++      sqlite3_result_error(ctx, "malformed JSON", -1);
++      goto json_extract_error;
++    }else{
++      jsonBadPathError(ctx, zPath);
++      goto json_extract_error;
+     }
+-    if( i==argc ){
+-      jsonAppendChar(&jx, ']');
+-      jsonResult(&jx);
++  }
++  if( argc>2 ){
++    jsonAppendChar(&jx, ']');
++    jsonReturnString(&jx, 0, 0);
++    if( (flags & JSON_BLOB)==0 ){
+       sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+     }
+-    jsonReset(&jx);
+   }
++json_extract_error:
++  jsonStringReset(&jx);
++  jsonParseFree(p);
++  return;
+ }
+ 
+-/* This is the RFC 7396 MergePatch algorithm.
+-*/
+-static JsonNode *jsonMergePatch(
+-  JsonParse *pParse,   /* The JSON parser that contains the TARGET */
+-  u32 iTarget,         /* Node of the TARGET in pParse */
+-  JsonNode *pPatch     /* The PATCH */
+-){
+-  u32 i, j;
+-  u32 iRoot;
+-  JsonNode *pTarget;
+-  if( pPatch->eType!=JSON_OBJECT ){
+-    return pPatch;
+-  }
+-  assert( iTargetnNode );
+-  pTarget = &pParse->aNode[iTarget];
+-  assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
+-  if( pTarget->eType!=JSON_OBJECT ){
+-    jsonRemoveAllNulls(pPatch);
+-    return pPatch;
+-  }
+-  iRoot = iTarget;
+-  for(i=1; in; i += jsonNodeSize(&pPatch[i+1])+1){
+-    u32 nKey;
+-    const char *zKey;
+-    assert( pPatch[i].eType==JSON_STRING );
+-    assert( pPatch[i].jnFlags & JNODE_LABEL );
+-    assert( pPatch[i].eU==1 );
+-    nKey = pPatch[i].n;
+-    zKey = pPatch[i].u.zJContent;
+-    assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
+-    for(j=1; jn; j += jsonNodeSize(&pTarget[j+1])+1 ){
+-      assert( pTarget[j].eType==JSON_STRING );
+-      assert( pTarget[j].jnFlags & JNODE_LABEL );
+-      assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
+-      if( pTarget[j].n==nKey && strncmp(pTarget[j].u.zJContent,zKey,nKey)==0 ){
+-        if( pTarget[j+1].jnFlags & (JNODE_REMOVE|JNODE_PATCH) ) break;
+-        if( pPatch[i+1].eType==JSON_NULL ){
+-          pTarget[j+1].jnFlags |= JNODE_REMOVE;
+-        }else{
+-          JsonNode *pNew = jsonMergePatch(pParse, iTarget+j+1, &pPatch[i+1]);
+-          if( pNew==0 ) return 0;
+-          pTarget = &pParse->aNode[iTarget];
+-          if( pNew!=&pTarget[j+1] ){
+-            assert( pTarget[j+1].eU==0
+-                 || pTarget[j+1].eU==1
+-                 || pTarget[j+1].eU==2 );
+-            testcase( pTarget[j+1].eU==1 );
+-            testcase( pTarget[j+1].eU==2 );
+-            VVA( pTarget[j+1].eU = 5 );
+-            pTarget[j+1].u.pPatch = pNew;
+-            pTarget[j+1].jnFlags |= JNODE_PATCH;
+-          }
+-        }
+-        break;
++/*
++** Return codes for jsonMergePatch()
++*/
++#define JSON_MERGE_OK          0     /* Success */
++#define JSON_MERGE_BADTARGET   1     /* Malformed TARGET blob */
++#define JSON_MERGE_BADPATCH    2     /* Malformed PATCH blob */
++#define JSON_MERGE_OOM         3     /* Out-of-memory condition */
++
++/*
++** RFC-7396 MergePatch for two JSONB blobs.
++**
++** pTarget is the target. pPatch is the patch.  The target is updated
++** in place.  The patch is read-only.
++**
++** The original RFC-7396 algorithm is this:
++**
++**   define MergePatch(Target, Patch):
++**     if Patch is an Object:
++**       if Target is not an Object:
++**         Target = {} # Ignore the contents and set it to an empty Object
++**     for each Name/Value pair in Patch:
++**         if Value is null:
++**           if Name exists in Target:
++**             remove the Name/Value pair from Target
++**         else:
++**           Target[Name] = MergePatch(Target[Name], Value)
++**       return Target
++**     else:
++**       return Patch
++**
++** Here is an equivalent algorithm restructured to show the actual
++** implementation:
++**
++** 01   define MergePatch(Target, Patch):
++** 02      if Patch is not an Object:
++** 03         return Patch
++** 04      else: // if Patch is an Object
++** 05         if Target is not an Object:
++** 06            Target = {}
++** 07      for each Name/Value pair in Patch:
++** 08         if Name exists in Target:
++** 09            if Value is null:
++** 10               remove the Name/Value pair from Target
++** 11            else
++** 12               Target[name] = MergePatch(Target[Name], Value)
++** 13         else if Value is not NULL:
++** 14            if Value is not an Object:
++** 15               Target[name] = Value
++** 16            else:
++** 17               Target[name] = MergePatch('{}',value)
++** 18      return Target
++**  |
++**  ^---- Line numbers referenced in comments in the implementation
++*/
++static int jsonMergePatch(
++  JsonParse *pTarget,      /* The JSON parser that contains the TARGET */
++  u32 iTarget,             /* Index of TARGET in pTarget->aBlob[] */
++  const JsonParse *pPatch, /* The PATCH */
++  u32 iPatch               /* Index of PATCH in pPatch->aBlob[] */
++){
++  u8 x;             /* Type of a single node */
++  u32 n, sz=0;      /* Return values from jsonbPayloadSize() */
++  u32 iTCursor;     /* Cursor position while scanning the target object */
++  u32 iTStart;      /* First label in the target object */
++  u32 iTEndBE;      /* Original first byte past end of target, before edit */
++  u32 iTEnd;        /* Current first byte past end of target */
++  u8 eTLabel;       /* Node type of the target label */
++  u32 iTLabel = 0;  /* Index of the label */
++  u32 nTLabel = 0;  /* Header size in bytes for the target label */
++  u32 szTLabel = 0; /* Size of the target label payload */
++  u32 iTValue = 0;  /* Index of the target value */
++  u32 nTValue = 0;  /* Header size of the target value */
++  u32 szTValue = 0; /* Payload size for the target value */
++
++  u32 iPCursor;     /* Cursor position while scanning the patch */
++  u32 iPEnd;        /* First byte past the end of the patch */
++  u8 ePLabel;       /* Node type of the patch label */
++  u32 iPLabel;      /* Start of patch label */
++  u32 nPLabel;      /* Size of header on the patch label */
++  u32 szPLabel;     /* Payload size of the patch label */
++  u32 iPValue;      /* Start of patch value */
++  u32 nPValue;      /* Header size for the patch value */
++  u32 szPValue;     /* Payload size of the patch value */
++
++  assert( iTarget>=0 && iTargetnBlob );
++  assert( iPatch>=0 && iPatchnBlob );
++  x = pPatch->aBlob[iPatch] & 0x0f;
++  if( x!=JSONB_OBJECT ){  /* Algorithm line 02 */
++    u32 szPatch;        /* Total size of the patch, header+payload */
++    u32 szTarget;       /* Total size of the target, header+payload */
++    n = jsonbPayloadSize(pPatch, iPatch, &sz);
++    szPatch = n+sz;
++    sz = 0;
++    n = jsonbPayloadSize(pTarget, iTarget, &sz);
++    szTarget = n+sz;
++    jsonBlobEdit(pTarget, iTarget, szTarget, pPatch->aBlob+iPatch, szPatch);
++    return pTarget->oom ? JSON_MERGE_OOM : JSON_MERGE_OK;  /* Line 03 */
++  }
++  x = pTarget->aBlob[iTarget] & 0x0f;
++  if( x!=JSONB_OBJECT ){  /* Algorithm line 05 */
++    n = jsonbPayloadSize(pTarget, iTarget, &sz);
++    jsonBlobEdit(pTarget, iTarget+n, sz, 0, 0);
++    x = pTarget->aBlob[iTarget];
++    pTarget->aBlob[iTarget] = (x & 0xf0) | JSONB_OBJECT;
++  }
++  n = jsonbPayloadSize(pPatch, iPatch, &sz);
++  if( NEVER(n==0) ) return JSON_MERGE_BADPATCH;
++  iPCursor = iPatch+n;
++  iPEnd = iPCursor+sz;
++  n = jsonbPayloadSize(pTarget, iTarget, &sz);
++  if( NEVER(n==0) ) return JSON_MERGE_BADTARGET;
++  iTStart = iTarget+n;
++  iTEndBE = iTStart+sz;
++
++  while( iPCursoraBlob[iPCursor] & 0x0f;
++    if( ePLabelJSONB_TEXTRAW ){
++      return JSON_MERGE_BADPATCH;
++    }
++    nPLabel = jsonbPayloadSize(pPatch, iPCursor, &szPLabel);
++    if( nPLabel==0 ) return JSON_MERGE_BADPATCH;
++    iPValue = iPCursor + nPLabel + szPLabel;
++    if( iPValue>=iPEnd ) return JSON_MERGE_BADPATCH;
++    nPValue = jsonbPayloadSize(pPatch, iPValue, &szPValue);
++    if( nPValue==0 ) return JSON_MERGE_BADPATCH;
++    iPCursor = iPValue + nPValue + szPValue;
++    if( iPCursor>iPEnd ) return JSON_MERGE_BADPATCH;
++
++    iTCursor = iTStart;
++    iTEnd = iTEndBE + pTarget->delta;
++    while( iTCursoraBlob[iTCursor] & 0x0f;
++      if( eTLabelJSONB_TEXTRAW ){
++        return JSON_MERGE_BADTARGET;
++      }
++      nTLabel = jsonbPayloadSize(pTarget, iTCursor, &szTLabel);
++      if( nTLabel==0 ) return JSON_MERGE_BADTARGET;
++      iTValue = iTLabel + nTLabel + szTLabel;
++      if( iTValue>=iTEnd ) return JSON_MERGE_BADTARGET;
++      nTValue = jsonbPayloadSize(pTarget, iTValue, &szTValue);
++      if( nTValue==0 ) return JSON_MERGE_BADTARGET;
++      if( iTValue + nTValue + szTValue > iTEnd ) return JSON_MERGE_BADTARGET;
++      isEqual = jsonLabelCompare(
++                   (const char*)&pPatch->aBlob[iPLabel+nPLabel],
++                   szPLabel,
++                   (ePLabel==JSONB_TEXT || ePLabel==JSONB_TEXTRAW),
++                   (const char*)&pTarget->aBlob[iTLabel+nTLabel],
++                   szTLabel,
++                   (eTLabel==JSONB_TEXT || eTLabel==JSONB_TEXTRAW));
++      if( isEqual ) break;
++      iTCursor = iTValue + nTValue + szTValue;
++    }
++    x = pPatch->aBlob[iPValue] & 0x0f;
++    if( iTCursoroom) ) return JSON_MERGE_OOM;
++      }else{
++        /* Algorithm line 12 */
++        int rc, savedDelta = pTarget->delta;
++        pTarget->delta = 0;
++        rc = jsonMergePatch(pTarget, iTValue, pPatch, iPValue);
++        if( rc ) return rc;
++        pTarget->delta += savedDelta;
++      }
++    }else if( x>0 ){  /* Algorithm line 13 */
++      /* No match and patch value is not NULL */
++      u32 szNew = szPLabel+nPLabel;
++      if( (pPatch->aBlob[iPValue] & 0x0f)!=JSONB_OBJECT ){  /* Line 14 */
++        jsonBlobEdit(pTarget, iTEnd, 0, 0, szPValue+nPValue+szNew);
++        if( pTarget->oom ) return JSON_MERGE_OOM;
++        memcpy(&pTarget->aBlob[iTEnd], &pPatch->aBlob[iPLabel], szNew);
++        memcpy(&pTarget->aBlob[iTEnd+szNew],
++               &pPatch->aBlob[iPValue], szPValue+nPValue);
++      }else{
++        int rc, savedDelta;
++        jsonBlobEdit(pTarget, iTEnd, 0, 0, szNew+1);
++        if( pTarget->oom ) return JSON_MERGE_OOM;
++        memcpy(&pTarget->aBlob[iTEnd], &pPatch->aBlob[iPLabel], szNew);
++        pTarget->aBlob[iTEnd+szNew] = 0x00;
++        savedDelta = pTarget->delta;
++        pTarget->delta = 0;
++        rc = jsonMergePatch(pTarget, iTEnd+szNew,pPatch,iPValue);
++        if( rc ) return rc;
++        pTarget->delta += savedDelta;
+       }
+     }
+-    if( j>=pTarget->n && pPatch[i+1].eType!=JSON_NULL ){
+-      int iStart, iPatch;
+-      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
+-      jsonParseAddNode(pParse, JSON_STRING, nKey, zKey);
+-      iPatch = jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
+-      if( pParse->oom ) return 0;
+-      jsonRemoveAllNulls(pPatch);
+-      pTarget = &pParse->aNode[iTarget];
+-      assert( pParse->aNode[iRoot].eU==0 || pParse->aNode[iRoot].eU==2 );
+-      testcase( pParse->aNode[iRoot].eU==2 );
+-      pParse->aNode[iRoot].jnFlags |= JNODE_APPEND;
+-      VVA( pParse->aNode[iRoot].eU = 2 );
+-      pParse->aNode[iRoot].u.iAppend = iStart - iRoot;
+-      iRoot = iStart;
+-      assert( pParse->aNode[iPatch].eU==0 );
+-      VVA( pParse->aNode[iPatch].eU = 5 );
+-      pParse->aNode[iPatch].jnFlags |= JNODE_PATCH;
+-      pParse->aNode[iPatch].u.pPatch = &pPatch[i+1];
+-    }
+   }
+-  return pTarget;
++  if( pTarget->delta ) jsonAfterEditSizeAdjust(pTarget, iTarget);
++  return pTarget->oom ? JSON_MERGE_OOM : JSON_MERGE_OK;
+ }
+ 
++
+ /*
+ ** Implementation of the json_mergepatch(JSON1,JSON2) function.  Return a JSON
+ ** object that is the result of running the RFC 7396 MergePatch() algorithm
+@@ -197143,25 +207350,27 @@ static void jsonPatchFunc(
+   int argc,
+   sqlite3_value **argv
+ ){
+-  JsonParse x;     /* The JSON that is being patched */
+-  JsonParse y;     /* The patch */
+-  JsonNode *pResult;   /* The result of the merge */
++  JsonParse *pTarget;    /* The TARGET */
++  JsonParse *pPatch;     /* The PATCH */
++  int rc;                /* Result code */
+ 
+   UNUSED_PARAMETER(argc);
+-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+-  if( jsonParse(&y, ctx, (const char*)sqlite3_value_text(argv[1])) ){
+-    jsonParseReset(&x);
+-    return;
+-  }
+-  pResult = jsonMergePatch(&x, 0, y.aNode);
+-  assert( pResult!=0 || x.oom );
+-  if( pResult ){
+-    jsonReturnJson(pResult, ctx, 0);
+-  }else{
+-    sqlite3_result_error_nomem(ctx);
++  assert( argc==2 );
++  pTarget = jsonParseFuncArg(ctx, argv[0], JSON_EDITABLE);
++  if( pTarget==0 ) return;
++  pPatch = jsonParseFuncArg(ctx, argv[1], 0);
++  if( pPatch ){
++    rc = jsonMergePatch(pTarget, 0, pPatch, 0);
++    if( rc==JSON_MERGE_OK ){
++      jsonReturnParse(ctx, pTarget);
++    }else if( rc==JSON_MERGE_OOM ){
++      sqlite3_result_error_nomem(ctx);
++    }else{
++      sqlite3_result_error(ctx, "malformed JSON", -1);
++    }
++    jsonParseFree(pPatch);
+   }
+-  jsonParseReset(&x);
+-  jsonParseReset(&y);
++  jsonParseFree(pTarget);
+ }
+ 
+ 
+@@ -197185,23 +207394,23 @@ static void jsonObjectFunc(
+                                   "of arguments", -1);
+     return;
+   }
+-  jsonInit(&jx, ctx);
++  jsonStringInit(&jx, ctx);
+   jsonAppendChar(&jx, '{');
+   for(i=0; i1 ? JSON_EDITABLE : 0);
++  if( p==0 ) return;
++  for(i=1; ijnFlags |= JNODE_REMOVE;
+-  }
+-  if( (x.aNode[0].jnFlags & JNODE_REMOVE)==0 ){
+-    jsonReturnJson(x.aNode, ctx, 0);
++    if( zPath==0 ){
++      goto json_remove_done;
++    }
++    if( zPath[0]!='$' ){
++      goto json_remove_patherror;
++    }
++    if( zPath[1]==0 ){
++      /* json_remove(j,'$') returns NULL */
++      goto json_remove_done;
++    }
++    p->eEdit = JEDIT_DEL;
++    p->delta = 0;
++    rc = jsonLookupStep(p, 0, zPath+1, 0);
++    if( JSON_LOOKUP_ISERROR(rc) ){
++      if( rc==JSON_LOOKUP_NOTFOUND ){
++        continue;  /* No-op */
++      }else if( rc==JSON_LOOKUP_PATHERROR ){
++        jsonBadPathError(ctx, zPath);
++      }else{
++        sqlite3_result_error(ctx, "malformed JSON", -1);
++      }
++      goto json_remove_done;
++    }
+   }
+-remove_done:
+-  jsonParseReset(&x);
++  jsonReturnParse(ctx, p);
++  jsonParseFree(p);
++  return;
++
++json_remove_patherror:
++  jsonBadPathError(ctx, zPath);
++
++json_remove_done:
++  jsonParseFree(p);
++  return;
+ }
+ 
+ /*
+@@ -197250,38 +207483,12 @@ static void jsonReplaceFunc(
+   int argc,
+   sqlite3_value **argv
+ ){
+-  JsonParse x;          /* The parse */
+-  JsonNode *pNode;
+-  const char *zPath;
+-  u32 i;
+-
+   if( argc<1 ) return;
+   if( (argc&1)==0 ) {
+     jsonWrongNumArgs(ctx, "replace");
+     return;
+   }
+-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+-  assert( x.nNode );
+-  for(i=1; i<(u32)argc; i+=2){
+-    zPath = (const char*)sqlite3_value_text(argv[i]);
+-    pNode = jsonLookup(&x, zPath, 0, ctx);
+-    if( x.nErr ) goto replace_err;
+-    if( pNode ){
+-      assert( pNode->eU==0 || pNode->eU==1 || pNode->eU==4 );
+-      testcase( pNode->eU!=0 && pNode->eU!=1 );
+-      pNode->jnFlags |= (u8)JNODE_REPLACE;
+-      VVA( pNode->eU =  4 );
+-      pNode->u.iReplace = i + 1;
+-    }
+-  }
+-  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
+-    assert( x.aNode[0].eU==4 );
+-    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
+-  }else{
+-    jsonReturnJson(x.aNode, ctx, argv);
+-  }
+-replace_err:
+-  jsonParseReset(&x);
++  jsonInsertIntoBlob(ctx, argc, argv, JEDIT_REPL);
+ }
+ 
+ 
+@@ -197302,45 +207509,16 @@ static void jsonSetFunc(
+   int argc,
+   sqlite3_value **argv
+ ){
+-  JsonParse x;          /* The parse */
+-  JsonNode *pNode;
+-  const char *zPath;
+-  u32 i;
+-  int bApnd;
+-  int bIsSet = sqlite3_user_data(ctx)!=0;
++
++  int flags = SQLITE_PTR_TO_INT(sqlite3_user_data(ctx));
++  int bIsSet = (flags&JSON_ISSET)!=0;
+ 
+   if( argc<1 ) return;
+   if( (argc&1)==0 ) {
+     jsonWrongNumArgs(ctx, bIsSet ? "set" : "insert");
+     return;
+   }
+-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+-  assert( x.nNode );
+-  for(i=1; i<(u32)argc; i+=2){
+-    zPath = (const char*)sqlite3_value_text(argv[i]);
+-    bApnd = 0;
+-    pNode = jsonLookup(&x, zPath, &bApnd, ctx);
+-    if( x.oom ){
+-      sqlite3_result_error_nomem(ctx);
+-      goto jsonSetDone;
+-    }else if( x.nErr ){
+-      goto jsonSetDone;
+-    }else if( pNode && (bApnd || bIsSet) ){
+-      testcase( pNode->eU!=0 && pNode->eU!=1 );
+-      assert( pNode->eU!=3 && pNode->eU!=5 );
+-      VVA( pNode->eU = 4 );
+-      pNode->jnFlags |= (u8)JNODE_REPLACE;
+-      pNode->u.iReplace = i + 1;
+-    }
+-  }
+-  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
+-    assert( x.aNode[0].eU==4 );
+-    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
+-  }else{
+-    jsonReturnJson(x.aNode, ctx, argv);
+-  }
+-jsonSetDone:
+-  jsonParseReset(&x);
++  jsonInsertIntoBlob(ctx, argc, argv, bIsSet ? JEDIT_SET : JEDIT_INS);
+ }
+ 
+ /*
+@@ -197356,27 +207534,93 @@ static void jsonTypeFunc(
+   sqlite3_value **argv
+ ){
+   JsonParse *p;          /* The parse */
+-  const char *zPath;
+-  JsonNode *pNode;
++  const char *zPath = 0;
++  u32 i;
+ 
+-  p = jsonParseCached(ctx, argv, ctx);
++  p = jsonParseFuncArg(ctx, argv[0], 0);
+   if( p==0 ) return;
+   if( argc==2 ){
+     zPath = (const char*)sqlite3_value_text(argv[1]);
+-    pNode = jsonLookup(p, zPath, 0, ctx);
++    if( zPath==0 ) goto json_type_done;
++    if( zPath[0]!='$' ){
++      jsonBadPathError(ctx, zPath);
++      goto json_type_done;
++    }
++    i = jsonLookupStep(p, 0, zPath+1, 0);
++    if( JSON_LOOKUP_ISERROR(i) ){
++      if( i==JSON_LOOKUP_NOTFOUND ){
++        /* no-op */
++      }else if( i==JSON_LOOKUP_PATHERROR ){
++        jsonBadPathError(ctx, zPath);
++      }else{
++        sqlite3_result_error(ctx, "malformed JSON", -1);
++      }
++      goto json_type_done;
++    }
+   }else{
+-    pNode = p->aNode;
+-  }
+-  if( pNode ){
+-    sqlite3_result_text(ctx, jsonType[pNode->eType], -1, SQLITE_STATIC);
++    i = 0;
+   }
++  sqlite3_result_text(ctx, jsonbType[p->aBlob[i]&0x0f], -1, SQLITE_STATIC);
++json_type_done:
++  jsonParseFree(p);
+ }
+ 
+ /*
+ ** json_valid(JSON)
+-**
+-** Return 1 if JSON is a well-formed JSON string according to RFC-7159.
+-** Return 0 otherwise.
++** json_valid(JSON, FLAGS)
++**
++** Check the JSON argument to see if it is well-formed.  The FLAGS argument
++** encodes the various constraints on what is meant by "well-formed":
++**
++**     0x01      Canonical RFC-8259 JSON text
++**     0x02      JSON text with optional JSON-5 extensions
++**     0x04      Superficially appears to be JSONB
++**     0x08      Strictly well-formed JSONB
++**
++** If the FLAGS argument is omitted, it defaults to 1.  Useful values for
++** FLAGS include:
++**
++**    1          Strict canonical JSON text
++**    2          JSON text perhaps with JSON-5 extensions
++**    4          Superficially appears to be JSONB
++**    5          Canonical JSON text or superficial JSONB
++**    6          JSON-5 text or superficial JSONB
++**    8          Strict JSONB
++**    9          Canonical JSON text or strict JSONB
++**    10         JSON-5 text or strict JSONB
++**
++** Other flag combinations are redundant.  For example, every canonical
++** JSON text is also well-formed JSON-5 text, so FLAG values 2 and 3
++** are the same.  Similarly, any input that passes a strict JSONB validation
++** will also pass the superficial validation so 12 through 15 are the same
++** as 8 through 11 respectively.
++**
++** This routine runs in linear time to validate text and when doing strict
++** JSONB validation.  Superficial JSONB validation is constant time,
++** assuming the BLOB is already in memory.  The performance advantage
++** of superficial JSONB validation is why that option is provided.
++** Application developers can choose to do fast superficial validation or
++** slower strict validation, according to their specific needs.
++**
++** Only the lower four bits of the FLAGS argument are currently used.
++** Higher bits are reserved for future expansion.   To facilitate
++** compatibility, the current implementation raises an error if any bit
++** in FLAGS is set other than the lower four bits.
++**
++** The original circa 2015 implementation of the JSON routines in
++** SQLite only supported canonical RFC-8259 JSON text and the json_valid()
++** function only accepted one argument.  That is why the default value
++** for the FLAGS argument is 1, since FLAGS=1 causes this routine to only
++** recognize canonical RFC-8259 JSON text as valid.  The extra FLAGS
++** argument was added when the JSON routines were extended to support
++** JSON5-like extensions and binary JSONB stored in BLOBs.
++**
++** Return Values:
++**
++**   *   Raise an error if FLAGS is outside the range of 1 to 15.
++**   *   Return NULL if the input is NULL
++**   *   Return 1 if the input is well-formed.
++**   *   Return 0 if the input is not well-formed.
+ */
+ static void jsonValidFunc(
+   sqlite3_context *ctx,
+@@ -197384,11 +207628,127 @@ static void jsonValidFunc(
+   sqlite3_value **argv
+ ){
+   JsonParse *p;          /* The parse */
+-  UNUSED_PARAMETER(argc);
+-  p = jsonParseCached(ctx, argv, 0);
+-  sqlite3_result_int(ctx, p!=0);
++  u8 flags = 1;
++  u8 res = 0;
++  if( argc==2 ){
++    i64 f = sqlite3_value_int64(argv[1]);
++    if( f<1 || f>15 ){
++      sqlite3_result_error(ctx, "FLAGS parameter to json_valid() must be"
++                                " between 1 and 15", -1);
++      return;
++    }
++    flags = f & 0x0f;
++  }
++  switch( sqlite3_value_type(argv[0]) ){
++    case SQLITE_NULL: {
++#ifdef SQLITE_LEGACY_JSON_VALID
++      /* Incorrect legacy behavior was to return FALSE for a NULL input */
++      sqlite3_result_int(ctx, 0);
++#endif
++      return;
++    }
++    case SQLITE_BLOB: {
++      if( jsonFuncArgMightBeBinary(argv[0]) ){
++        if( flags & 0x04 ){
++          /* Superficial checking only - accomplished by the
++          ** jsonFuncArgMightBeBinary() call above. */
++          res = 1;
++        }else if( flags & 0x08 ){
++          /* Strict checking.  Check by translating BLOB->TEXT->BLOB.  If
++          ** no errors occur, call that a "strict check". */
++          JsonParse px;
++          u32 iErr;
++          memset(&px, 0, sizeof(px));
++          px.aBlob = (u8*)sqlite3_value_blob(argv[0]);
++          px.nBlob = sqlite3_value_bytes(argv[0]);
++          iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1);
++          res = iErr==0;
++        }
++        break;
++      }
++      /* Fall through into interpreting the input as text.  See note
++      ** above at tag-20240123-a. */
++      /* no break */ deliberate_fall_through
++    }
++    default: {
++      JsonParse px;
++      if( (flags & 0x3)==0 ) break;
++      memset(&px, 0, sizeof(px));
++
++      p = jsonParseFuncArg(ctx, argv[0], JSON_KEEPERROR);
++      if( p ){
++        if( p->oom ){
++          sqlite3_result_error_nomem(ctx);
++        }else if( p->nErr ){
++          /* no-op */
++        }else if( (flags & 0x02)!=0 || p->hasNonstd==0 ){
++          res = 1;
++        }
++        jsonParseFree(p);
++      }else{
++        sqlite3_result_error_nomem(ctx);
++      }
++      break;
++    }
++  }
++  sqlite3_result_int(ctx, res);
+ }
+ 
++/*
++** json_error_position(JSON)
++**
++** If the argument is NULL, return NULL
++**
++** If the argument is BLOB, do a full validity check and return non-zero
++** if the check fails.  The return value is the approximate 1-based offset
++** to the byte of the element that contains the first error.
++**
++** Otherwise interpret the argument is TEXT (even if it is numeric) and
++** return the 1-based character position for where the parser first recognized
++** that the input was not valid JSON, or return 0 if the input text looks
++** ok.  JSON-5 extensions are accepted.
++*/
++static void jsonErrorFunc(
++  sqlite3_context *ctx,
++  int argc,
++  sqlite3_value **argv
++){
++  i64 iErrPos = 0;       /* Error position to be returned */
++  JsonParse s;
++
++  assert( argc==1 );
++  UNUSED_PARAMETER(argc);
++  memset(&s, 0, sizeof(s));
++  s.db = sqlite3_context_db_handle(ctx);
++  if( jsonFuncArgMightBeBinary(argv[0]) ){
++    s.aBlob = (u8*)sqlite3_value_blob(argv[0]);
++    s.nBlob = sqlite3_value_bytes(argv[0]);
++    iErrPos = (i64)jsonbValidityCheck(&s, 0, s.nBlob, 1);
++  }else{
++    s.zJson = (char*)sqlite3_value_text(argv[0]);
++    if( s.zJson==0 ) return;  /* NULL input or OOM */
++    s.nJson = sqlite3_value_bytes(argv[0]);
++    if( jsonConvertTextToBlob(&s,0) ){
++      if( s.oom ){
++        iErrPos = -1;
++      }else{
++        /* Convert byte-offset s.iErr into a character offset */
++        u32 k;
++        assert( s.zJson!=0 );  /* Because s.oom is false */
++        for(k=0; kzBuf==0 ){
+-      jsonInit(pStr, ctx);
++      jsonStringInit(pStr, ctx);
+       jsonAppendChar(pStr, '[');
+     }else if( pStr->nUsed>1 ){
+       jsonAppendChar(pStr, ',');
+     }
+     pStr->pCtx = ctx;
+-    jsonAppendValue(pStr, argv[0]);
++    jsonAppendSqlValue(pStr, argv[0]);
+   }
+ }
+ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){
+   JsonString *pStr;
+   pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+   if( pStr ){
++    int flags;
+     pStr->pCtx = ctx;
+     jsonAppendChar(pStr, ']');
+-    if( pStr->bErr ){
+-      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
+-      assert( pStr->bStatic );
++    flags = SQLITE_PTR_TO_INT(sqlite3_user_data(ctx));
++    if( pStr->eErr ){
++      jsonReturnString(pStr, 0, 0);
++      return;
++    }else if( flags & JSON_BLOB ){
++      jsonReturnStringAsBlob(pStr);
++      if( isFinal ){
++        if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf);
++      }else{
++        jsonStringTrimOneChar(pStr);
++      }
++      return;
+     }else if( isFinal ){
+       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,
+-                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
++                          pStr->bStatic ? SQLITE_TRANSIENT :
++                              sqlite3RCStrUnref);
+       pStr->bStatic = 1;
+     }else{
+       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT);
+-      pStr->nUsed--;
++      jsonStringTrimOneChar(pStr);
+     }
+   }else{
+     sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC);
+@@ -197469,7 +207840,7 @@ static void jsonGroupInverse(
+   pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+ #ifdef NEVER
+   /* pStr is always non-NULL since jsonArrayStep() or jsonObjectStep() will
+-  ** always have been called to initalize it */
++  ** always have been called to initialize it */
+   if( NEVER(!pStr) ) return;
+ #endif
+   z = pStr->zBuf;
+@@ -197513,34 +207884,46 @@ static void jsonObjectStep(
+   pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr));
+   if( pStr ){
+     if( pStr->zBuf==0 ){
+-      jsonInit(pStr, ctx);
++      jsonStringInit(pStr, ctx);
+       jsonAppendChar(pStr, '{');
+     }else if( pStr->nUsed>1 ){
+       jsonAppendChar(pStr, ',');
+     }
+     pStr->pCtx = ctx;
+     z = (const char*)sqlite3_value_text(argv[0]);
+-    n = (u32)sqlite3_value_bytes(argv[0]);
++    n = sqlite3Strlen30(z);
+     jsonAppendString(pStr, z, n);
+     jsonAppendChar(pStr, ':');
+-    jsonAppendValue(pStr, argv[1]);
++    jsonAppendSqlValue(pStr, argv[1]);
+   }
+ }
+ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
+   JsonString *pStr;
+   pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+   if( pStr ){
++    int flags;
+     jsonAppendChar(pStr, '}');
+-    if( pStr->bErr ){
+-      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
+-      assert( pStr->bStatic );
++    pStr->pCtx = ctx;
++    flags = SQLITE_PTR_TO_INT(sqlite3_user_data(ctx));
++    if( pStr->eErr ){
++      jsonReturnString(pStr, 0, 0);
++      return;
++    }else if( flags & JSON_BLOB ){
++      jsonReturnStringAsBlob(pStr);
++      if( isFinal ){
++        if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf);
++      }else{
++        jsonStringTrimOneChar(pStr);
++      }
++      return;
+     }else if( isFinal ){
+       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,
+-                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
++                          pStr->bStatic ? SQLITE_TRANSIENT :
++                          sqlite3RCStrUnref);
+       pStr->bStatic = 1;
+     }else{
+       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT);
+-      pStr->nUsed--;
++      jsonStringTrimOneChar(pStr);
+     }
+   }else{
+     sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC);
+@@ -197560,19 +207943,37 @@ static void jsonObjectFinal(sqlite3_context *ctx){
+ /****************************************************************************
+ ** The json_each virtual table
+ ****************************************************************************/
++typedef struct JsonParent JsonParent;
++struct JsonParent {
++  u32 iHead;                 /* Start of object or array */
++  u32 iValue;                /* Start of the value */
++  u32 iEnd;                  /* First byte past the end */
++  u32 nPath;                 /* Length of path */
++  i64 iKey;                  /* Key for JSONB_ARRAY */
++};
++
+ typedef struct JsonEachCursor JsonEachCursor;
+ struct JsonEachCursor {
+   sqlite3_vtab_cursor base;  /* Base class - must be first */
+   u32 iRowid;                /* The rowid */
+-  u32 iBegin;                /* The first node of the scan */
+-  u32 i;                     /* Index in sParse.aNode[] of current row */
++  u32 i;                     /* Index in sParse.aBlob[] of current row */
+   u32 iEnd;                  /* EOF when i equals or exceeds this value */
+-  u8 eType;                  /* Type of top-level element */
++  u32 nRoot;                 /* Size of the root path in bytes */
++  u8 eType;                  /* Type of the container for element i */
+   u8 bRecursive;             /* True for json_tree().  False for json_each() */
+-  char *zJson;               /* Input JSON */
+-  char *zRoot;               /* Path by which to filter zJson */
++  u32 nParent;               /* Current nesting depth */
++  u32 nParentAlloc;          /* Space allocated for aParent[] */
++  JsonParent *aParent;       /* Parent elements of i */
++  sqlite3 *db;               /* Database connection */
++  JsonString path;           /* Current path */
+   JsonParse sParse;          /* Parse of the input JSON */
+ };
++typedef struct JsonEachConnection JsonEachConnection;
++struct JsonEachConnection {
++  sqlite3_vtab base;         /* Base class - must be first */
++  sqlite3 *db;               /* Database connection */
++};
++
+ 
+ /* Constructor for the json_each virtual table */
+ static int jsonEachConnect(
+@@ -197582,7 +207983,7 @@ static int jsonEachConnect(
+   sqlite3_vtab **ppVtab,
+   char **pzErr
+ ){
+-  sqlite3_vtab *pNew;
++  JsonEachConnection *pNew;
+   int rc;
+ 
+ /* Column numbers */
+@@ -197608,28 +208009,32 @@ static int jsonEachConnect(
+      "CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,"
+                     "json HIDDEN,root HIDDEN)");
+   if( rc==SQLITE_OK ){
+-    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
++    pNew = (JsonEachConnection*)sqlite3DbMallocZero(db, sizeof(*pNew));
++    *ppVtab = (sqlite3_vtab*)pNew;
+     if( pNew==0 ) return SQLITE_NOMEM;
+-    memset(pNew, 0, sizeof(*pNew));
+     sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
++    pNew->db = db;
+   }
+   return rc;
+ }
+ 
+ /* destructor for json_each virtual table */
+ static int jsonEachDisconnect(sqlite3_vtab *pVtab){
+-  sqlite3_free(pVtab);
++  JsonEachConnection *p = (JsonEachConnection*)pVtab;
++  sqlite3DbFree(p->db, pVtab);
+   return SQLITE_OK;
+ }
+ 
+ /* constructor for a JsonEachCursor object for json_each(). */
+ static int jsonEachOpenEach(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
++  JsonEachConnection *pVtab = (JsonEachConnection*)p;
+   JsonEachCursor *pCur;
+ 
+   UNUSED_PARAMETER(p);
+-  pCur = sqlite3_malloc( sizeof(*pCur) );
++  pCur = sqlite3DbMallocZero(pVtab->db, sizeof(*pCur));
+   if( pCur==0 ) return SQLITE_NOMEM;
+-  memset(pCur, 0, sizeof(*pCur));
++  pCur->db = pVtab->db;
++  jsonStringZero(&pCur->path);
+   *ppCursor = &pCur->base;
+   return SQLITE_OK;
+ }
+@@ -197647,22 +208052,24 @@ static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+ /* Reset a JsonEachCursor back to its original state.  Free any memory
+ ** held. */
+ static void jsonEachCursorReset(JsonEachCursor *p){
+-  sqlite3_free(p->zJson);
+-  sqlite3_free(p->zRoot);
+   jsonParseReset(&p->sParse);
++  jsonStringReset(&p->path);
++  sqlite3DbFree(p->db, p->aParent);
+   p->iRowid = 0;
+   p->i = 0;
++  p->aParent = 0;
++  p->nParent = 0;
++  p->nParentAlloc = 0;
+   p->iEnd = 0;
+   p->eType = 0;
+-  p->zJson = 0;
+-  p->zRoot = 0;
+ }
+ 
+ /* Destructor for a jsonEachCursor object */
+ static int jsonEachClose(sqlite3_vtab_cursor *cur){
+   JsonEachCursor *p = (JsonEachCursor*)cur;
+   jsonEachCursorReset(p);
+-  sqlite3_free(cur);
++
++  sqlite3DbFree(p->db, cur);
+   return SQLITE_OK;
+ }
+ 
+@@ -197673,198 +208080,230 @@ static int jsonEachEof(sqlite3_vtab_cursor *cur){
+   return p->i >= p->iEnd;
+ }
+ 
+-/* Advance the cursor to the next element for json_tree() */
+-static int jsonEachNext(sqlite3_vtab_cursor *cur){
+-  JsonEachCursor *p = (JsonEachCursor*)cur;
+-  if( p->bRecursive ){
+-    if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
+-    p->i++;
+-    p->iRowid++;
+-    if( p->iiEnd ){
+-      u32 iUp = p->sParse.aUp[p->i];
+-      JsonNode *pUp = &p->sParse.aNode[iUp];
+-      p->eType = pUp->eType;
+-      if( pUp->eType==JSON_ARRAY ){
+-        assert( pUp->eU==0 || pUp->eU==3 );
+-        testcase( pUp->eU==3 );
+-        VVA( pUp->eU = 3 );
+-        if( iUp==p->i-1 ){
+-          pUp->u.iKey = 0;
+-        }else{
+-          pUp->u.iKey++;
++/*
++** If the cursor is currently pointing at the label of a object entry,
++** then return the index of the value.  For all other cases, return the
++** current pointer position, which is the value.
++*/
++static int jsonSkipLabel(JsonEachCursor *p){
++  if( p->eType==JSONB_OBJECT ){
++    u32 sz = 0;
++    u32 n = jsonbPayloadSize(&p->sParse, p->i, &sz);
++    return p->i + n + sz;
++  }else{
++    return p->i;
++  }
++}
++
++/*
++** Append the path name for the current element.
++*/
++static void jsonAppendPathName(JsonEachCursor *p){
++  assert( p->nParent>0 );
++  assert( p->eType==JSONB_ARRAY || p->eType==JSONB_OBJECT );
++  if( p->eType==JSONB_ARRAY ){
++    jsonPrintf(30, &p->path, "[%lld]", p->aParent[p->nParent-1].iKey);
++  }else{
++    u32 n, sz = 0, k, i;
++    const char *z;
++    int needQuote = 0;
++    n = jsonbPayloadSize(&p->sParse, p->i, &sz);
++    k = p->i + n;
++    z = (const char*)&p->sParse.aBlob[k];
++    if( sz==0 || !sqlite3Isalpha(z[0]) ){
++      needQuote = 1;
++    }else{
++      for(i=0; ieType ){
+-      case JSON_ARRAY: {
+-        p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
+-        p->iRowid++;
+-        break;
+-      }
+-      case JSON_OBJECT: {
+-        p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
+-        p->iRowid++;
+-        break;
+-      }
+-      default: {
+-        p->i = p->iEnd;
+-        break;
+-      }
++    if( needQuote ){
++      jsonPrintf(sz+4,&p->path,".\"%.*s\"", sz, z);
++    }else{
++      jsonPrintf(sz+2,&p->path,".%.*s", sz, z);
+     }
+   }
+-  return SQLITE_OK;
+ }
+ 
+-/* Append an object label to the JSON Path being constructed
+-** in pStr.
+-*/
+-static void jsonAppendObjectPathElement(
+-  JsonString *pStr,
+-  JsonNode *pNode
+-){
+-  int jj, nn;
+-  const char *z;
+-  assert( pNode->eType==JSON_STRING );
+-  assert( pNode->jnFlags & JNODE_LABEL );
+-  assert( pNode->eU==1 );
+-  z = pNode->u.zJContent;
+-  nn = pNode->n;
+-  assert( nn>=2 );
+-  assert( z[0]=='"' );
+-  assert( z[nn-1]=='"' );
+-  if( nn>2 && sqlite3Isalpha(z[1]) ){
+-    for(jj=2; jjbRecursive ){
++    u8 x;
++    u8 levelChange = 0;
++    u32 n, sz = 0;
++    u32 i = jsonSkipLabel(p);
++    x = p->sParse.aBlob[i] & 0x0f;
++    n = jsonbPayloadSize(&p->sParse, i, &sz);
++    if( x==JSONB_OBJECT || x==JSONB_ARRAY ){
++      JsonParent *pParent;
++      if( p->nParent>=p->nParentAlloc ){
++        JsonParent *pNew;
++        u64 nNew;
++        nNew = p->nParentAlloc*2 + 3;
++        pNew = sqlite3DbRealloc(p->db, p->aParent, sizeof(JsonParent)*nNew);
++        if( pNew==0 ) return SQLITE_NOMEM;
++        p->nParentAlloc = (u32)nNew;
++        p->aParent = pNew;
++      }
++      levelChange = 1;
++      pParent = &p->aParent[p->nParent];
++      pParent->iHead = p->i;
++      pParent->iValue = i;
++      pParent->iEnd = i + n + sz;
++      pParent->iKey = -1;
++      pParent->nPath = (u32)p->path.nUsed;
++      if( p->eType && p->nParent ){
++        jsonAppendPathName(p);
++        if( p->path.eErr ) rc = SQLITE_NOMEM;
++      }
++      p->nParent++;
++      p->i = i + n;
++    }else{
++      p->i = i + n + sz;
++    }
++    while( p->nParent>0 && p->i >= p->aParent[p->nParent-1].iEnd ){
++      p->nParent--;
++      p->path.nUsed = p->aParent[p->nParent].nPath;
++      levelChange = 1;
++    }
++    if( levelChange ){
++      if( p->nParent>0 ){
++        JsonParent *pParent = &p->aParent[p->nParent-1];
++        u32 iVal = pParent->iValue;
++        p->eType = p->sParse.aBlob[iVal] & 0x0f;
++      }else{
++        p->eType = 0;
++      }
+     }
++  }else{
++    u32 n, sz = 0;
++    u32 i = jsonSkipLabel(p);
++    n = jsonbPayloadSize(&p->sParse, i, &sz);
++    p->i = i + n + sz;
+   }
+-  jsonPrintf(nn+2, pStr, ".%.*s", nn, z);
++  if( p->eType==JSONB_ARRAY && p->nParent ){
++    p->aParent[p->nParent-1].iKey++;
++  }
++  p->iRowid++;
++  return rc;
+ }
+ 
+-/* Append the name of the path for element i to pStr
++/* Length of the path for rowid==0 in bRecursive mode.
+ */
+-static void jsonEachComputePath(
+-  JsonEachCursor *p,       /* The cursor */
+-  JsonString *pStr,        /* Write the path here */
+-  u32 i                    /* Path to this element */
+-){
+-  JsonNode *pNode, *pUp;
+-  u32 iUp;
+-  if( i==0 ){
+-    jsonAppendChar(pStr, '$');
+-    return;
+-  }
+-  iUp = p->sParse.aUp[i];
+-  jsonEachComputePath(p, pStr, iUp);
+-  pNode = &p->sParse.aNode[i];
+-  pUp = &p->sParse.aNode[iUp];
+-  if( pUp->eType==JSON_ARRAY ){
+-    assert( pUp->eU==3 || (pUp->eU==0 && pUp->u.iKey==0) );
+-    testcase( pUp->eU==0 );
+-    jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
+-  }else{
+-    assert( pUp->eType==JSON_OBJECT );
+-    if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
+-    jsonAppendObjectPathElement(pStr, pNode);
++static int jsonEachPathLength(JsonEachCursor *p){
++  u32 n = p->path.nUsed;
++  char *z = p->path.zBuf;
++  if( p->iRowid==0 && p->bRecursive && n>=2 ){
++    while( n>1 ){
++      n--;
++      if( z[n]=='[' || z[n]=='.' ){
++        u32 x, sz = 0;
++        char cSaved = z[n];
++        z[n] = 0;
++        assert( p->sParse.eEdit==0 );
++        x = jsonLookupStep(&p->sParse, 0, z+1, 0);
++        z[n] = cSaved;
++        if( JSON_LOOKUP_ISERROR(x) ) continue;
++        if( x + jsonbPayloadSize(&p->sParse, x, &sz) == p->i ) break;
++      }
++    }
+   }
++  return n;
+ }
+ 
+ /* Return the value of a column */
+ static int jsonEachColumn(
+   sqlite3_vtab_cursor *cur,   /* The cursor */
+   sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
+-  int i                       /* Which column to return */
++  int iColumn                 /* Which column to return */
+ ){
+   JsonEachCursor *p = (JsonEachCursor*)cur;
+-  JsonNode *pThis = &p->sParse.aNode[p->i];
+-  switch( i ){
++  switch( iColumn ){
+     case JEACH_KEY: {
+-      if( p->i==0 ) break;
+-      if( p->eType==JSON_OBJECT ){
+-        jsonReturn(pThis, ctx, 0);
+-      }else if( p->eType==JSON_ARRAY ){
+-        u32 iKey;
+-        if( p->bRecursive ){
+-          if( p->iRowid==0 ) break;
+-          assert( p->sParse.aNode[p->sParse.aUp[p->i]].eU==3 );
+-          iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
++      if( p->nParent==0 ){
++        u32 n, j;
++        if( p->nRoot==1 ) break;
++        j = jsonEachPathLength(p);
++        n = p->nRoot - j;
++        if( n==0 ){
++          break;
++        }else if( p->path.zBuf[j]=='[' ){
++          i64 x;
++          sqlite3Atoi64(&p->path.zBuf[j+1], &x, n-1, SQLITE_UTF8);
++          sqlite3_result_int64(ctx, x);
++        }else if( p->path.zBuf[j+1]=='"' ){
++          sqlite3_result_text(ctx, &p->path.zBuf[j+2], n-3, SQLITE_TRANSIENT);
+         }else{
+-          iKey = p->iRowid;
++          sqlite3_result_text(ctx, &p->path.zBuf[j+1], n-1, SQLITE_TRANSIENT);
+         }
+-        sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
++        break;
++      }
++      if( p->eType==JSONB_OBJECT ){
++        jsonReturnFromBlob(&p->sParse, p->i, ctx, 1);
++      }else{
++        assert( p->eType==JSONB_ARRAY );
++        sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iKey);
+       }
+       break;
+     }
+     case JEACH_VALUE: {
+-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+-      jsonReturn(pThis, ctx, 0);
++      u32 i = jsonSkipLabel(p);
++      jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+       break;
+     }
+     case JEACH_TYPE: {
+-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+-      sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
++      u32 i = jsonSkipLabel(p);
++      u8 eType = p->sParse.aBlob[i] & 0x0f;
++      sqlite3_result_text(ctx, jsonbType[eType], -1, SQLITE_STATIC);
+       break;
+     }
+     case JEACH_ATOM: {
+-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+-      if( pThis->eType>=JSON_ARRAY ) break;
+-      jsonReturn(pThis, ctx, 0);
++      u32 i = jsonSkipLabel(p);
++      if( (p->sParse.aBlob[i] & 0x0f)sParse, i, ctx, 1);
++      }
+       break;
+     }
+     case JEACH_ID: {
+-      sqlite3_result_int64(ctx,
+-         (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
++      sqlite3_result_int64(ctx, (sqlite3_int64)p->i);
+       break;
+     }
+     case JEACH_PARENT: {
+-      if( p->i>p->iBegin && p->bRecursive ){
+-        sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
++      if( p->nParent>0 && p->bRecursive ){
++        sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iHead);
+       }
+       break;
+     }
+     case JEACH_FULLKEY: {
+-      JsonString x;
+-      jsonInit(&x, ctx);
+-      if( p->bRecursive ){
+-        jsonEachComputePath(p, &x, p->i);
+-      }else{
+-        if( p->zRoot ){
+-          jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
+-        }else{
+-          jsonAppendChar(&x, '$');
+-        }
+-        if( p->eType==JSON_ARRAY ){
+-          jsonPrintf(30, &x, "[%d]", p->iRowid);
+-        }else if( p->eType==JSON_OBJECT ){
+-          jsonAppendObjectPathElement(&x, pThis);
+-        }
+-      }
+-      jsonResult(&x);
++      u64 nBase = p->path.nUsed;
++      if( p->nParent ) jsonAppendPathName(p);
++      sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
++                            SQLITE_TRANSIENT, SQLITE_UTF8);
++      p->path.nUsed = nBase;
+       break;
+     }
+     case JEACH_PATH: {
+-      if( p->bRecursive ){
+-        JsonString x;
+-        jsonInit(&x, ctx);
+-        jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
+-        jsonResult(&x);
+-        break;
+-      }
+-      /* For json_each() path and root are the same so fall through
+-      ** into the root case */
+-      /* no break */ deliberate_fall_through
++      u32 n = jsonEachPathLength(p);
++      sqlite3_result_text64(ctx, p->path.zBuf, n,
++                            SQLITE_TRANSIENT, SQLITE_UTF8);
++      break;
+     }
+     default: {
+-      const char *zRoot = p->zRoot;
+-      if( zRoot==0 ) zRoot = "$";
+-      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
++      sqlite3_result_text(ctx, p->path.zBuf, p->nRoot, SQLITE_STATIC);
+       break;
+     }
+     case JEACH_JSON: {
+-      assert( i==JEACH_JSON );
+-      sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
++      if( p->sParse.zJson==0 ){
++        sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
++                            SQLITE_STATIC);
++      }else{
++        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
++      }
+       break;
+     }
+   }
+@@ -197914,6 +208353,13 @@ static int jsonEachBestIndex(
+       idxMask |= iMask;
+     }
+   }
++  if( pIdxInfo->nOrderBy>0
++   && pIdxInfo->aOrderBy[0].iColumn<0
++   && pIdxInfo->aOrderBy[0].desc==0
++  ){
++    pIdxInfo->orderByConsumed = 1;
++  }
++
+   if( (unusableMask & ~idxMask)!=0 ){
+     /* If there are any unusable constraints on JSON or ROOT, then reject
+     ** this entire plan */
+@@ -197948,78 +208394,97 @@ static int jsonEachFilter(
+   int argc, sqlite3_value **argv
+ ){
+   JsonEachCursor *p = (JsonEachCursor*)cur;
+-  const char *z;
+   const char *zRoot = 0;
+-  sqlite3_int64 n;
++  u32 i, n, sz;
+ 
+   UNUSED_PARAMETER(idxStr);
+   UNUSED_PARAMETER(argc);
+   jsonEachCursorReset(p);
+   if( idxNum==0 ) return SQLITE_OK;
+-  z = (const char*)sqlite3_value_text(argv[0]);
+-  if( z==0 ) return SQLITE_OK;
+-  n = sqlite3_value_bytes(argv[0]);
+-  p->zJson = sqlite3_malloc64( n+1 );
+-  if( p->zJson==0 ) return SQLITE_NOMEM;
+-  memcpy(p->zJson, z, (size_t)n+1);
+-  if( jsonParse(&p->sParse, 0, p->zJson) ){
+-    int rc = SQLITE_NOMEM;
+-    if( p->sParse.oom==0 ){
+-      sqlite3_free(cur->pVtab->zErrMsg);
+-      cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
+-      if( cur->pVtab->zErrMsg ) rc = SQLITE_ERROR;
+-    }
+-    jsonEachCursorReset(p);
+-    return rc;
+-  }else if( p->bRecursive && jsonParseFindParents(&p->sParse) ){
+-    jsonEachCursorReset(p);
+-    return SQLITE_NOMEM;
++  memset(&p->sParse, 0, sizeof(p->sParse));
++  p->sParse.nJPRef = 1;
++  p->sParse.db = p->db;
++  if( jsonFuncArgMightBeBinary(argv[0]) ){
++    p->sParse.nBlob = sqlite3_value_bytes(argv[0]);
++    p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]);
+   }else{
+-    JsonNode *pNode = 0;
+-    if( idxNum==3 ){
+-      const char *zErr = 0;
+-      zRoot = (const char*)sqlite3_value_text(argv[1]);
+-      if( zRoot==0 ) return SQLITE_OK;
+-      n = sqlite3_value_bytes(argv[1]);
+-      p->zRoot = sqlite3_malloc64( n+1 );
+-      if( p->zRoot==0 ) return SQLITE_NOMEM;
+-      memcpy(p->zRoot, zRoot, (size_t)n+1);
+-      if( zRoot[0]!='$' ){
+-        zErr = zRoot;
+-      }else{
+-        pNode = jsonLookupStep(&p->sParse, 0, p->zRoot+1, 0, &zErr);
++    p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
++    p->sParse.nJson = sqlite3_value_bytes(argv[0]);
++    if( p->sParse.zJson==0 ){
++      p->i = p->iEnd = 0;
++      return SQLITE_OK;
++    }
++    if( jsonConvertTextToBlob(&p->sParse, 0) ){
++      if( p->sParse.oom ){
++        return SQLITE_NOMEM;
+       }
+-      if( zErr ){
++      goto json_each_malformed_input;
++    }
++  }
++  if( idxNum==3 ){
++    zRoot = (const char*)sqlite3_value_text(argv[1]);
++    if( zRoot==0 ) return SQLITE_OK;
++    if( zRoot[0]!='$' ){
++      sqlite3_free(cur->pVtab->zErrMsg);
++      cur->pVtab->zErrMsg = jsonBadPathError(0, zRoot);
++      jsonEachCursorReset(p);
++      return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
++    }
++    p->nRoot = sqlite3Strlen30(zRoot);
++    if( zRoot[1]==0 ){
++      i = p->i = 0;
++      p->eType = 0;
++    }else{
++      i = jsonLookupStep(&p->sParse, 0, zRoot+1, 0);
++      if( JSON_LOOKUP_ISERROR(i) ){
++        if( i==JSON_LOOKUP_NOTFOUND ){
++          p->i = 0;
++          p->eType = 0;
++          p->iEnd = 0;
++          return SQLITE_OK;
++        }
+         sqlite3_free(cur->pVtab->zErrMsg);
+-        cur->pVtab->zErrMsg = jsonPathSyntaxError(zErr);
++        cur->pVtab->zErrMsg = jsonBadPathError(0, zRoot);
+         jsonEachCursorReset(p);
+         return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+-      }else if( pNode==0 ){
+-        return SQLITE_OK;
+       }
+-    }else{
+-      pNode = p->sParse.aNode;
+-    }
+-    p->iBegin = p->i = (int)(pNode - p->sParse.aNode);
+-    p->eType = pNode->eType;
+-    if( p->eType>=JSON_ARRAY ){
+-      assert( pNode->eU==0 );
+-      VVA( pNode->eU = 3 );
+-      pNode->u.iKey = 0;
+-      p->iEnd = p->i + pNode->n + 1;
+-      if( p->bRecursive ){
+-        p->eType = p->sParse.aNode[p->sParse.aUp[p->i]].eType;
+-        if( p->i>0 && (p->sParse.aNode[p->i-1].jnFlags & JNODE_LABEL)!=0 ){
+-          p->i--;
+-        }
++      if( p->sParse.iLabel ){
++        p->i = p->sParse.iLabel;
++        p->eType = JSONB_OBJECT;
+       }else{
+-        p->i++;
++        p->i = i;
++        p->eType = JSONB_ARRAY;
+       }
+-    }else{
+-      p->iEnd = p->i+1;
+     }
++    jsonAppendRaw(&p->path, zRoot, p->nRoot);
++  }else{
++    i = p->i = 0;
++    p->eType = 0;
++    p->nRoot = 1;
++    jsonAppendRaw(&p->path, "$", 1);
++  }
++  p->nParent = 0;
++  n = jsonbPayloadSize(&p->sParse, i, &sz);
++  p->iEnd = i+n+sz;
++  if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
++    p->i = i + n;
++    p->eType = p->sParse.aBlob[i] & 0x0f;
++    p->aParent = sqlite3DbMallocZero(p->db, sizeof(JsonParent));
++    if( p->aParent==0 ) return SQLITE_NOMEM;
++    p->nParent = 1;
++    p->nParentAlloc = 1;
++    p->aParent[0].iKey = 0;
++    p->aParent[0].iEnd = p->iEnd;
++    p->aParent[0].iHead = p->i;
++    p->aParent[0].iValue = i;
+   }
+   return SQLITE_OK;
++
++json_each_malformed_input:
++  sqlite3_free(cur->pVtab->zErrMsg);
++  cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
++  jsonEachCursorReset(p);
++  return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+ }
+ 
+ /* The methods of the json_each virtual table */
+@@ -198047,7 +208512,8 @@ static sqlite3_module jsonEachModule = {
+   0,                         /* xSavepoint */
+   0,                         /* xRelease */
+   0,                         /* xRollbackTo */
+-  0                          /* xShadowName */
++  0,                         /* xShadowName */
++  0                          /* xIntegrity */
+ };
+ 
+ /* The methods of the json_tree virtual table. */
+@@ -198075,7 +208541,8 @@ static sqlite3_module jsonTreeModule = {
+   0,                         /* xSavepoint */
+   0,                         /* xRelease */
+   0,                         /* xRollbackTo */
+-  0                          /* xShadowName */
++  0,                         /* xShadowName */
++  0                          /* xIntegrity */
+ };
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+ #endif /* !defined(SQLITE_OMIT_JSON) */
+@@ -198086,33 +208553,57 @@ static sqlite3_module jsonTreeModule = {
+ SQLITE_PRIVATE void sqlite3RegisterJsonFunctions(void){
+ #ifndef SQLITE_OMIT_JSON
+   static FuncDef aJsonFunc[] = {
+-    JFUNCTION(json,               1, 0,  jsonRemoveFunc),
+-    JFUNCTION(json_array,        -1, 0,  jsonArrayFunc),
+-    JFUNCTION(json_array_length,  1, 0,  jsonArrayLengthFunc),
+-    JFUNCTION(json_array_length,  2, 0,  jsonArrayLengthFunc),
+-    JFUNCTION(json_extract,      -1, 0,  jsonExtractFunc),
+-    JFUNCTION(->,                 2, JSON_JSON, jsonExtractFunc),
+-    JFUNCTION(->>,                2, JSON_SQL, jsonExtractFunc),
+-    JFUNCTION(json_insert,       -1, 0,  jsonSetFunc),
+-    JFUNCTION(json_object,       -1, 0,  jsonObjectFunc),
+-    JFUNCTION(json_patch,         2, 0,  jsonPatchFunc),
+-    JFUNCTION(json_quote,         1, 0,  jsonQuoteFunc),
+-    JFUNCTION(json_remove,       -1, 0,  jsonRemoveFunc),
+-    JFUNCTION(json_replace,      -1, 0,  jsonReplaceFunc),
+-    JFUNCTION(json_set,          -1, JSON_ISSET,  jsonSetFunc),
+-    JFUNCTION(json_type,          1, 0,  jsonTypeFunc),
+-    JFUNCTION(json_type,          2, 0,  jsonTypeFunc),
+-    JFUNCTION(json_valid,         1, 0,  jsonValidFunc),
++    /*   sqlite3_result_subtype() ----,  ,--- sqlite3_value_subtype()       */
++    /*                                |  |                                  */
++    /*             Uses cache ------, |  | ,---- Returns JSONB              */
++    /*                              | |  | |                                */
++    /*     Number of arguments ---, | |  | | ,--- Flags                     */
++    /*                            | | |  | | |                              */
++    JFUNCTION(json,               1,1,1, 0,0,0,          jsonRemoveFunc),
++    JFUNCTION(jsonb,              1,1,0, 0,1,0,          jsonRemoveFunc),
++    JFUNCTION(json_array,        -1,0,1, 1,0,0,          jsonArrayFunc),
++    JFUNCTION(jsonb_array,       -1,0,1, 1,1,0,          jsonArrayFunc),
++    JFUNCTION(json_array_length,  1,1,0, 0,0,0,          jsonArrayLengthFunc),
++    JFUNCTION(json_array_length,  2,1,0, 0,0,0,          jsonArrayLengthFunc),
++    JFUNCTION(json_error_position,1,1,0, 0,0,0,          jsonErrorFunc),
++    JFUNCTION(json_extract,      -1,1,1, 0,0,0,          jsonExtractFunc),
++    JFUNCTION(jsonb_extract,     -1,1,0, 0,1,0,          jsonExtractFunc),
++    JFUNCTION(->,                 2,1,1, 0,0,JSON_JSON,  jsonExtractFunc),
++    JFUNCTION(->>,                2,1,0, 0,0,JSON_SQL,   jsonExtractFunc),
++    JFUNCTION(json_insert,       -1,1,1, 1,0,0,          jsonSetFunc),
++    JFUNCTION(jsonb_insert,      -1,1,0, 1,1,0,          jsonSetFunc),
++    JFUNCTION(json_object,       -1,0,1, 1,0,0,          jsonObjectFunc),
++    JFUNCTION(jsonb_object,      -1,0,1, 1,1,0,          jsonObjectFunc),
++    JFUNCTION(json_patch,         2,1,1, 0,0,0,          jsonPatchFunc),
++    JFUNCTION(jsonb_patch,        2,1,0, 0,1,0,          jsonPatchFunc),
++    JFUNCTION(json_quote,         1,0,1, 1,0,0,          jsonQuoteFunc),
++    JFUNCTION(json_remove,       -1,1,1, 0,0,0,          jsonRemoveFunc),
++    JFUNCTION(jsonb_remove,      -1,1,0, 0,1,0,          jsonRemoveFunc),
++    JFUNCTION(json_replace,      -1,1,1, 1,0,0,          jsonReplaceFunc),
++    JFUNCTION(jsonb_replace,     -1,1,0, 1,1,0,          jsonReplaceFunc),
++    JFUNCTION(json_set,          -1,1,1, 1,0,JSON_ISSET, jsonSetFunc),
++    JFUNCTION(jsonb_set,         -1,1,0, 1,1,JSON_ISSET, jsonSetFunc),
++    JFUNCTION(json_type,          1,1,0, 0,0,0,          jsonTypeFunc),
++    JFUNCTION(json_type,          2,1,0, 0,0,0,          jsonTypeFunc),
++    JFUNCTION(json_valid,         1,1,0, 0,0,0,          jsonValidFunc),
++    JFUNCTION(json_valid,         2,1,0, 0,0,0,          jsonValidFunc),
+ #if SQLITE_DEBUG
+-    JFUNCTION(json_parse,         1, 0,  jsonParseFunc),
+-    JFUNCTION(json_test1,         1, 0,  jsonTest1Func),
++    JFUNCTION(json_parse,         1,1,0, 0,0,0,          jsonParseFunc),
+ #endif
+     WAGGREGATE(json_group_array,  1, 0, 0,
+        jsonArrayStep, jsonArrayFinal, jsonArrayValue, jsonGroupInverse,
+-       SQLITE_SUBTYPE|SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS),
++       SQLITE_SUBTYPE|SQLITE_RESULT_SUBTYPE|SQLITE_UTF8|
++       SQLITE_DETERMINISTIC),
++    WAGGREGATE(jsonb_group_array, 1, JSON_BLOB, 0,
++       jsonArrayStep, jsonArrayFinal, jsonArrayValue, jsonGroupInverse,
++       SQLITE_SUBTYPE|SQLITE_RESULT_SUBTYPE|SQLITE_UTF8|SQLITE_DETERMINISTIC),
+     WAGGREGATE(json_group_object, 2, 0, 0,
+        jsonObjectStep, jsonObjectFinal, jsonObjectValue, jsonGroupInverse,
+-       SQLITE_SUBTYPE|SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS)
++       SQLITE_SUBTYPE|SQLITE_RESULT_SUBTYPE|SQLITE_UTF8|SQLITE_DETERMINISTIC),
++    WAGGREGATE(jsonb_group_object,2, JSON_BLOB, 0,
++       jsonObjectStep, jsonObjectFinal, jsonObjectValue, jsonGroupInverse,
++       SQLITE_SUBTYPE|SQLITE_RESULT_SUBTYPE|SQLITE_UTF8|
++       SQLITE_DETERMINISTIC)
+   };
+   sqlite3InsertBuiltinFuncs(aJsonFunc, ArraySize(aJsonFunc));
+ #endif
+@@ -198239,6 +208730,11 @@ typedef unsigned int u32;
+ #endif
+ #endif /* !defined(SQLITE_AMALGAMATION) */
+ 
++/* Macro to check for 4-byte alignment.  Only used inside of assert() */
++#ifdef SQLITE_DEBUG
++# define FOUR_BYTE_ALIGNED(X)  ((((char*)(X) - (char*)0) & 3)==0)
++#endif
++
+ /* #include  */
+ /* #include  */
+ /* #include  */
+@@ -198304,6 +208800,7 @@ struct Rtree {
+   int iDepth;                 /* Current depth of the r-tree structure */
+   char *zDb;                  /* Name of database containing r-tree table */
+   char *zName;                /* Name of r-tree table */
++  char *zNodeName;            /* Name of the %_node table */
+   u32 nBusy;                  /* Current number of users of this structure */
+   i64 nRowEst;                /* Estimated number of rows in this table */
+   u32 nCursor;                /* Number of open cursors */
+@@ -198316,7 +208813,6 @@ struct Rtree {
+   ** headed by the node (leaf nodes have RtreeNode.iNode==0).
+   */
+   RtreeNode *pDeleted;
+-  int iReinsertHeight;        /* Height of sub-trees Reinsert() has run on */
+ 
+   /* Blob I/O on xxx_node */
+   sqlite3_blob *pNodeBlob;
+@@ -198613,17 +209109,23 @@ struct RtreeMatchArg {
+ ** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined
+ ** at run-time.
+ */
+-#ifndef SQLITE_BYTEORDER
+-#if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+-    defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+-    defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
+-# define SQLITE_BYTEORDER    1234
+-#elif defined(sparc)    || defined(__ppc__)
+-# define SQLITE_BYTEORDER    4321
+-#else
+-# define SQLITE_BYTEORDER    0     /* 0 means "unknown at compile-time" */
+-#endif
++#ifndef SQLITE_BYTEORDER /* Replicate changes at tag-20230904a */
++# if defined(__BYTE_ORDER__) && __BYTE_ORDER__==__ORDER_BIG_ENDIAN__
++#   define SQLITE_BYTEORDER 4321
++# elif defined(__BYTE_ORDER__) && __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
++#   define SQLITE_BYTEORDER 1234
++# elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__==1
++#   define SQLITE_BYTEORDER 4321
++# elif defined(i386)    || defined(__i386__)      || defined(_M_IX86) ||    \
++     defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
++     defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++#   define SQLITE_BYTEORDER 1234
++# elif defined(sparc)   || defined(__ARMEB__)     || defined(__AARCH64EB__)
++#   define SQLITE_BYTEORDER 4321
++# else
++#   define SQLITE_BYTEORDER 0
++# endif
+ #endif
+ 
+ 
+@@ -198644,7 +209146,7 @@ static int readInt16(u8 *p){
+   return (p[0]<<8) + p[1];
+ }
+ static void readCoord(u8 *p, RtreeCoord *pCoord){
+-  assert( ((((char*)p) - (char*)0)&3)==0 );  /* p is always 4-byte aligned */
++  assert( FOUR_BYTE_ALIGNED(p) );
+ #if SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
+   pCoord->u = _byteswap_ulong(*(u32*)p);
+ #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4003000
+@@ -198698,7 +209200,7 @@ static void writeInt16(u8 *p, int i){
+ }
+ static int writeCoord(u8 *p, RtreeCoord *pCoord){
+   u32 i;
+-  assert( ((((char*)p) - (char*)0)&3)==0 );  /* p is always 4-byte aligned */
++  assert( FOUR_BYTE_ALIGNED(p) );
+   assert( sizeof(RtreeCoord)==4 );
+   assert( sizeof(u32)==4 );
+ #if SQLITE_BYTEORDER==1234 && GCC_VERSION>=4003000
+@@ -198849,7 +209351,7 @@ static int nodeAcquire(
+   ** increase its reference count and return it.
+   */
+   if( (pNode = nodeHashLookup(pRtree, iNode))!=0 ){
+-    if( pParent && pParent!=pNode->pParent ){
++    if( pParent && ALWAYS(pParent!=pNode->pParent) ){
+       RTREE_IS_CORRUPT(pRtree);
+       return SQLITE_CORRUPT_VTAB;
+     }
+@@ -198869,11 +209371,9 @@ static int nodeAcquire(
+     }
+   }
+   if( pRtree->pNodeBlob==0 ){
+-    char *zTab = sqlite3_mprintf("%s_node", pRtree->zName);
+-    if( zTab==0 ) return SQLITE_NOMEM;
+-    rc = sqlite3_blob_open(pRtree->db, pRtree->zDb, zTab, "data", iNode, 0,
++    rc = sqlite3_blob_open(pRtree->db, pRtree->zDb, pRtree->zNodeName,
++                           "data", iNode, 0,
+                            &pRtree->pNodeBlob);
+-    sqlite3_free(zTab);
+   }
+   if( rc ){
+     nodeBlobReset(pRtree);
+@@ -199426,7 +209926,7 @@ static void rtreeNonleafConstraint(
+   assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE
+       || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_TRUE
+       || p->op==RTREE_FALSE );
+-  assert( ((((char*)pCellData) - (char*)0)&3)==0 );  /* 4-byte aligned */
++  assert( FOUR_BYTE_ALIGNED(pCellData) );
+   switch( p->op ){
+     case RTREE_TRUE:  return;   /* Always satisfied */
+     case RTREE_FALSE: break;    /* Never satisfied */
+@@ -199479,7 +209979,7 @@ static void rtreeLeafConstraint(
+       || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_TRUE
+       || p->op==RTREE_FALSE );
+   pCellData += 8 + p->iCoord*4;
+-  assert( ((((char*)pCellData) - (char*)0)&3)==0 );  /* 4-byte aligned */
++  assert( FOUR_BYTE_ALIGNED(pCellData) );
+   RTREE_DECODE_COORD(eInt, pCellData, xN);
+   switch( p->op ){
+     case RTREE_TRUE:  return;   /* Always satisfied */
+@@ -200049,7 +210549,20 @@ static int rtreeFilter(
+             p->pInfo->nCoord = pRtree->nDim2;
+             p->pInfo->anQueue = pCsr->anQueue;
+             p->pInfo->mxLevel = pRtree->iDepth + 1;
+-          }else if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
++          }else if( eType==SQLITE_INTEGER ){
++            sqlite3_int64 iVal = sqlite3_value_int64(argv[ii]);
++#ifdef SQLITE_RTREE_INT_ONLY
++            p->u.rValue = iVal;
++#else
++            p->u.rValue = (double)iVal;
++            if( iVal>=((sqlite3_int64)1)<<48
++             || iVal<=-(((sqlite3_int64)1)<<48)
++            ){
++              if( p->op==RTREE_LT ) p->op = RTREE_LE;
++              if( p->op==RTREE_GT ) p->op = RTREE_GE;
++            }
++#endif
++          }else if( eType==SQLITE_FLOAT ){
+ #ifdef SQLITE_RTREE_INT_ONLY
+             p->u.rValue = sqlite3_value_int64(argv[ii]);
+ #else
+@@ -200180,11 +210693,12 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+         || p->op==SQLITE_INDEX_CONSTRAINT_MATCH)
+     ){
+       u8 op;
++      u8 doOmit = 1;
+       switch( p->op ){
+-        case SQLITE_INDEX_CONSTRAINT_EQ:    op = RTREE_EQ;    break;
+-        case SQLITE_INDEX_CONSTRAINT_GT:    op = RTREE_GT;    break;
++        case SQLITE_INDEX_CONSTRAINT_EQ:    op = RTREE_EQ;    doOmit = 0; break;
++        case SQLITE_INDEX_CONSTRAINT_GT:    op = RTREE_GT;    doOmit = 0; break;
+         case SQLITE_INDEX_CONSTRAINT_LE:    op = RTREE_LE;    break;
+-        case SQLITE_INDEX_CONSTRAINT_LT:    op = RTREE_LT;    break;
++        case SQLITE_INDEX_CONSTRAINT_LT:    op = RTREE_LT;    doOmit = 0; break;
+         case SQLITE_INDEX_CONSTRAINT_GE:    op = RTREE_GE;    break;
+         case SQLITE_INDEX_CONSTRAINT_MATCH: op = RTREE_MATCH; break;
+         default:                            op = 0;           break;
+@@ -200193,15 +210707,19 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+         zIdxStr[iIdx++] = op;
+         zIdxStr[iIdx++] = (char)(p->iColumn - 1 + '0');
+         pIdxInfo->aConstraintUsage[ii].argvIndex = (iIdx/2);
+-        pIdxInfo->aConstraintUsage[ii].omit = 1;
++        pIdxInfo->aConstraintUsage[ii].omit = doOmit;
+       }
+     }
+   }
+ 
+   pIdxInfo->idxNum = 2;
+   pIdxInfo->needToFreeIdxStr = 1;
+-  if( iIdx>0 && 0==(pIdxInfo->idxStr = sqlite3_mprintf("%s", zIdxStr)) ){
+-    return SQLITE_NOMEM;
++  if( iIdx>0 ){
++    pIdxInfo->idxStr = sqlite3_malloc( iIdx+1 );
++    if( pIdxInfo->idxStr==0 ){
++      return SQLITE_NOMEM;
++    }
++    memcpy(pIdxInfo->idxStr, zIdxStr, iIdx+1);
+   }
+ 
+   nRow = pRtree->nRowEst >> (iIdx/2);
+@@ -200280,31 +210798,22 @@ static void cellUnion(Rtree *pRtree, RtreeCell *p1, RtreeCell *p2){
+ */
+ static int cellContains(Rtree *pRtree, RtreeCell *p1, RtreeCell *p2){
+   int ii;
+-  int isInt = (pRtree->eCoordType==RTREE_COORD_INT32);
+-  for(ii=0; iinDim2; ii+=2){
+-    RtreeCoord *a1 = &p1->aCoord[ii];
+-    RtreeCoord *a2 = &p2->aCoord[ii];
+-    if( (!isInt && (a2[0].fa1[1].f))
+-     || ( isInt && (a2[0].ia1[1].i))
+-    ){
+-      return 0;
++  if( pRtree->eCoordType==RTREE_COORD_INT32 ){
++    for(ii=0; iinDim2; ii+=2){
++      RtreeCoord *a1 = &p1->aCoord[ii];
++      RtreeCoord *a2 = &p2->aCoord[ii];
++      if( a2[0].ia1[1].i ) return 0;
++    }
++  }else{
++    for(ii=0; iinDim2; ii+=2){
++      RtreeCoord *a1 = &p1->aCoord[ii];
++      RtreeCoord *a2 = &p2->aCoord[ii];
++      if( a2[0].fa1[1].f ) return 0;
+     }
+   }
+   return 1;
+ }
+ 
+-/*
+-** Return the amount cell p would grow by if it were unioned with pCell.
+-*/
+-static RtreeDValue cellGrowth(Rtree *pRtree, RtreeCell *p, RtreeCell *pCell){
+-  RtreeDValue area;
+-  RtreeCell cell;
+-  memcpy(&cell, p, sizeof(RtreeCell));
+-  area = cellArea(pRtree, &cell);
+-  cellUnion(pRtree, &cell, pCell);
+-  return (cellArea(pRtree, &cell)-area);
+-}
+-
+ static RtreeDValue cellOverlap(
+   Rtree *pRtree,
+   RtreeCell *p,
+@@ -200351,38 +210860,52 @@ static int ChooseLeaf(
+   for(ii=0; rc==SQLITE_OK && ii<(pRtree->iDepth-iHeight); ii++){
+     int iCell;
+     sqlite3_int64 iBest = 0;
+-
++    int bFound = 0;
+     RtreeDValue fMinGrowth = RTREE_ZERO;
+     RtreeDValue fMinArea = RTREE_ZERO;
+-
+     int nCell = NCELL(pNode);
+-    RtreeCell cell;
+     RtreeNode *pChild = 0;
+ 
+-    RtreeCell *aCell = 0;
+-
+-    /* Select the child node which will be enlarged the least if pCell
+-    ** is inserted into it. Resolve ties by choosing the entry with
+-    ** the smallest area.
++    /* First check to see if there is are any cells in pNode that completely
++    ** contains pCell.  If two or more cells in pNode completely contain pCell
++    ** then pick the smallest.
+     */
+     for(iCell=0; iCell1 ){
+-    int iLeft = 0;
+-    int iRight = 0;
+-
+-    int nLeft = nIdx/2;
+-    int nRight = nIdx-nLeft;
+-    int *aLeft = aIdx;
+-    int *aRight = &aIdx[nLeft];
+-
+-    SortByDistance(aLeft, nLeft, aDistance, aSpare);
+-    SortByDistance(aRight, nRight, aDistance, aSpare);
+-
+-    memcpy(aSpare, aLeft, sizeof(int)*nLeft);
+-    aLeft = aSpare;
+-
+-    while( iLeftnDim; iDim++){
+-      aCenterCoord[iDim] += DCOORD(aCell[ii].aCoord[iDim*2]);
+-      aCenterCoord[iDim] += DCOORD(aCell[ii].aCoord[iDim*2+1]);
+-    }
+-  }
+-  for(iDim=0; iDimnDim; iDim++){
+-    aCenterCoord[iDim] = (aCenterCoord[iDim]/(nCell*(RtreeDValue)2));
+-  }
+-
+-  for(ii=0; iinDim; iDim++){
+-      RtreeDValue coord = (DCOORD(aCell[ii].aCoord[iDim*2+1]) -
+-                               DCOORD(aCell[ii].aCoord[iDim*2]));
+-      aDistance[ii] += (coord-aCenterCoord[iDim])*(coord-aCenterCoord[iDim]);
+-    }
+-  }
+-
+-  SortByDistance(aOrder, nCell, aDistance, aSpare);
+-  nodeZero(pRtree, pNode);
+-
+-  for(ii=0; rc==SQLITE_OK && ii<(nCell-(RTREE_MINCELLS(pRtree)+1)); ii++){
+-    RtreeCell *p = &aCell[aOrder[ii]];
+-    nodeInsertCell(pRtree, pNode, p);
+-    if( p->iRowid==pCell->iRowid ){
+-      if( iHeight==0 ){
+-        rc = rowidWrite(pRtree, p->iRowid, pNode->iNode);
+-      }else{
+-        rc = parentWrite(pRtree, p->iRowid, pNode->iNode);
+-      }
+-    }
+-  }
+-  if( rc==SQLITE_OK ){
+-    rc = fixBoundingBox(pRtree, pNode);
+-  }
+-  for(; rc==SQLITE_OK && iiiNode currently contains
+-    ** the height of the sub-tree headed by the cell.
+-    */
+-    RtreeNode *pInsert;
+-    RtreeCell *p = &aCell[aOrder[ii]];
+-    rc = ChooseLeaf(pRtree, p, iHeight, &pInsert);
+-    if( rc==SQLITE_OK ){
+-      int rc2;
+-      rc = rtreeInsertCell(pRtree, pInsert, p, iHeight);
+-      rc2 = nodeRelease(pRtree, pInsert);
+-      if( rc==SQLITE_OK ){
+-        rc = rc2;
+-      }
+-    }
+-  }
+-
+-  sqlite3_free(aCell);
+-  return rc;
+-}
+-
+ /*
+ ** Insert cell pCell into node pNode. Node pNode is the head of a
+ ** subtree iHeight high (leaf nodes have iHeight==0).
+@@ -201131,12 +211482,7 @@ static int rtreeInsertCell(
+     }
+   }
+   if( nodeInsertCell(pRtree, pNode, pCell) ){
+-    if( iHeight<=pRtree->iReinsertHeight || pNode->iNode==1){
+-      rc = SplitNode(pRtree, pNode, pCell, iHeight);
+-    }else{
+-      pRtree->iReinsertHeight = iHeight;
+-      rc = Reinsert(pRtree, pNode, pCell, iHeight);
+-    }
++    rc = SplitNode(pRtree, pNode, pCell, iHeight);
+   }else{
+     rc = AdjustTree(pRtree, pNode, pCell);
+     if( ALWAYS(rc==SQLITE_OK) ){
+@@ -201378,7 +211724,7 @@ static int rtreeUpdate(
+   rtreeReference(pRtree);
+   assert(nData>=1);
+ 
+-  cell.iRowid = 0;  /* Used only to suppress a compiler warning */
++  memset(&cell, 0, sizeof(cell));
+ 
+   /* Constraint handling. A write operation on an r-tree table may return
+   ** SQLITE_CONSTRAINT for two reasons:
+@@ -201479,7 +211825,6 @@ static int rtreeUpdate(
+     }
+     if( rc==SQLITE_OK ){
+       int rc2;
+-      pRtree->iReinsertHeight = -1;
+       rc = rtreeInsertCell(pRtree, pLeaf, &cell, 0);
+       rc2 = nodeRelease(pRtree, pLeaf);
+       if( rc==SQLITE_OK ){
+@@ -201620,8 +211965,11 @@ static int rtreeShadowName(const char *zName){
+   return 0;
+ }
+ 
++/* Forward declaration */
++static int rtreeIntegrity(sqlite3_vtab*, const char*, const char*, int, char**);
++
+ static sqlite3_module rtreeModule = {
+-  3,                          /* iVersion */
++  4,                          /* iVersion */
+   rtreeCreate,                /* xCreate - create a table */
+   rtreeConnect,               /* xConnect - connect to an existing table */
+   rtreeBestIndex,             /* xBestIndex - Determine search strategy */
+@@ -201644,7 +211992,8 @@ static sqlite3_module rtreeModule = {
+   rtreeSavepoint,             /* xSavepoint */
+   0,                          /* xRelease */
+   0,                          /* xRollbackTo */
+-  rtreeShadowName             /* xShadowName */
++  rtreeShadowName,            /* xShadowName */
++  rtreeIntegrity              /* xIntegrity */
+ };
+ 
+ static int rtreeSqlInit(
+@@ -201737,7 +212086,7 @@ static int rtreeSqlInit(
+     }
+     sqlite3_free(zSql);
+   }
+-  if( pRtree->nAux ){
++  if( pRtree->nAux && rc!=SQLITE_NOMEM ){
+     pRtree->zReadAuxSql = sqlite3_mprintf(
+        "SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1",
+        zDb, zPrefix);
+@@ -201900,22 +212249,27 @@ static int rtreeInit(
+   }
+ 
+   sqlite3_vtab_config(db, SQLITE_VTAB_CONSTRAINT_SUPPORT, 1);
++  sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
++
+ 
+   /* Allocate the sqlite3_vtab structure */
+   nDb = (int)strlen(argv[1]);
+   nName = (int)strlen(argv[2]);
+-  pRtree = (Rtree *)sqlite3_malloc64(sizeof(Rtree)+nDb+nName+2);
++  pRtree = (Rtree *)sqlite3_malloc64(sizeof(Rtree)+nDb+nName*2+8);
+   if( !pRtree ){
+     return SQLITE_NOMEM;
+   }
+-  memset(pRtree, 0, sizeof(Rtree)+nDb+nName+2);
++  memset(pRtree, 0, sizeof(Rtree)+nDb+nName*2+8);
+   pRtree->nBusy = 1;
+   pRtree->base.pModule = &rtreeModule;
+   pRtree->zDb = (char *)&pRtree[1];
+   pRtree->zName = &pRtree->zDb[nDb+1];
++  pRtree->zNodeName = &pRtree->zName[nName+1];
+   pRtree->eCoordType = (u8)eCoordType;
+   memcpy(pRtree->zDb, argv[1], nDb);
+   memcpy(pRtree->zName, argv[2], nName);
++  memcpy(pRtree->zNodeName, argv[2], nName);
++  memcpy(&pRtree->zNodeName[nName], "_node", 6);
+ 
+ 
+   /* Create/Connect to the underlying relational database schema. If
+@@ -202412,7 +212766,6 @@ static int rtreeCheckTable(
+ ){
+   RtreeCheck check;               /* Common context for various routines */
+   sqlite3_stmt *pStmt = 0;        /* Used to find column count of rtree table */
+-  int bEnd = 0;                   /* True if transaction should be closed */
+   int nAux = 0;                   /* Number of extra columns. */
+ 
+   /* Initialize the context object */
+@@ -202421,24 +212774,14 @@ static int rtreeCheckTable(
+   check.zDb = zDb;
+   check.zTab = zTab;
+ 
+-  /* If there is not already an open transaction, open one now. This is
+-  ** to ensure that the queries run as part of this integrity-check operate
+-  ** on a consistent snapshot.  */
+-  if( sqlite3_get_autocommit(db) ){
+-    check.rc = sqlite3_exec(db, "BEGIN", 0, 0, 0);
+-    bEnd = 1;
+-  }
+-
+   /* Find the number of auxiliary columns */
+-  if( check.rc==SQLITE_OK ){
+-    pStmt = rtreeCheckPrepare(&check, "SELECT * FROM %Q.'%q_rowid'", zDb, zTab);
+-    if( pStmt ){
+-      nAux = sqlite3_column_count(pStmt) - 2;
+-      sqlite3_finalize(pStmt);
+-    }else
+-    if( check.rc!=SQLITE_NOMEM ){
+-      check.rc = SQLITE_OK;
+-    }
++  pStmt = rtreeCheckPrepare(&check, "SELECT * FROM %Q.'%q_rowid'", zDb, zTab);
++  if( pStmt ){
++    nAux = sqlite3_column_count(pStmt) - 2;
++    sqlite3_finalize(pStmt);
++  }else
++  if( check.rc!=SQLITE_NOMEM ){
++    check.rc = SQLITE_OK;
+   }
+ 
+   /* Find number of dimensions in the rtree table. */
+@@ -202469,15 +212812,35 @@ static int rtreeCheckTable(
+   sqlite3_finalize(check.aCheckMapping[0]);
+   sqlite3_finalize(check.aCheckMapping[1]);
+ 
+-  /* If one was opened, close the transaction */
+-  if( bEnd ){
+-    int rc = sqlite3_exec(db, "END", 0, 0, 0);
+-    if( check.rc==SQLITE_OK ) check.rc = rc;
+-  }
+   *pzReport = check.zReport;
+   return check.rc;
+ }
+ 
++/*
++** Implementation of the xIntegrity method for Rtree.
++*/
++static int rtreeIntegrity(
++  sqlite3_vtab *pVtab,   /* The virtual table to check */
++  const char *zSchema,   /* Schema in which the virtual table lives */
++  const char *zName,     /* Name of the virtual table */
++  int isQuick,           /* True for a quick_check */
++  char **pzErr           /* Write results here */
++){
++  Rtree *pRtree = (Rtree*)pVtab;
++  int rc;
++  assert( pzErr!=0 && *pzErr==0 );
++  UNUSED_PARAMETER(zSchema);
++  UNUSED_PARAMETER(zName);
++  UNUSED_PARAMETER(isQuick);
++  rc = rtreeCheckTable(pRtree->db, pRtree->zDb, pRtree->zName, pzErr);
++  if( rc==SQLITE_OK && *pzErr ){
++    *pzErr = sqlite3_mprintf("In RTree %s.%s:\n%z",
++                 pRtree->zDb, pRtree->zName, *pzErr);
++    if( (*pzErr)==0 ) rc = SQLITE_NOMEM;
++  }
++  return rc;
++}
++
+ /*
+ ** Usage:
+ **
+@@ -202851,7 +213214,7 @@ static GeoPoly *geopolyFuncParam(
+   int nByte;
+   testcase( pCtx==0 );
+   if( sqlite3_value_type(pVal)==SQLITE_BLOB
+-   && (nByte = sqlite3_value_bytes(pVal))>=(4+6*sizeof(GeoCoord))
++   && (nByte = sqlite3_value_bytes(pVal))>=(int)(4+6*sizeof(GeoCoord))
+   ){
+     const unsigned char *a = sqlite3_value_blob(pVal);
+     int nVertex;
+@@ -202909,6 +213272,7 @@ static void geopolyBlobFunc(
+   sqlite3_value **argv
+ ){
+   GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
++  (void)argc;
+   if( p ){
+     sqlite3_result_blob(context, p->hdr,
+        4+8*p->nVertex, SQLITE_TRANSIENT);
+@@ -202928,6 +213292,7 @@ static void geopolyJsonFunc(
+   sqlite3_value **argv
+ ){
+   GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
++  (void)argc;
+   if( p ){
+     sqlite3 *db = sqlite3_context_db_handle(context);
+     sqlite3_str *x = sqlite3_str_new(db);
+@@ -203009,6 +213374,7 @@ static void geopolyXformFunc(
+   double F = sqlite3_value_double(argv[6]);
+   GeoCoord x1, y1, x0, y0;
+   int ii;
++  (void)argc;
+   if( p ){
+     for(ii=0; iinVertex; ii++){
+       x0 = GeoX(p,ii);
+@@ -203059,6 +213425,7 @@ static void geopolyAreaFunc(
+   sqlite3_value **argv
+ ){
+   GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
++  (void)argc;
+   if( p ){
+     sqlite3_result_double(context, geopolyArea(p));
+     sqlite3_free(p);
+@@ -203084,6 +213451,7 @@ static void geopolyCcwFunc(
+   sqlite3_value **argv
+ ){
+   GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
++  (void)argc;
+   if( p ){
+     if( geopolyArea(p)<0.0 ){
+       int ii, jj;
+@@ -203138,6 +213506,7 @@ static void geopolyRegularFunc(
+   int n = sqlite3_value_int(argv[3]);
+   int i;
+   GeoPoly *p;
++  (void)argc;
+ 
+   if( n<3 || r<=0.0 ) return;
+   if( n>1000 ) n = 1000;
+@@ -203247,6 +213616,7 @@ static void geopolyBBoxFunc(
+   sqlite3_value **argv
+ ){
+   GeoPoly *p = geopolyBBox(context, argv[0], 0, 0);
++  (void)argc;
+   if( p ){
+     sqlite3_result_blob(context, p->hdr,
+        4+8*p->nVertex, SQLITE_TRANSIENT);
+@@ -203274,6 +213644,7 @@ static void geopolyBBoxStep(
+ ){
+   RtreeCoord a[4];
+   int rc = SQLITE_OK;
++  (void)argc;
+   (void)geopolyBBox(context, argv[0], a, &rc);
+   if( rc==SQLITE_OK ){
+     GeoBBox *pBBox;
+@@ -203362,6 +213733,8 @@ static void geopolyContainsPointFunc(
+   int v = 0;
+   int cnt = 0;
+   int ii;
++  (void)argc;
++
+   if( p1==0 ) return;
+   for(ii=0; iinVertex-1; ii++){
+     v = pointBeneathLine(x0,y0,GeoX(p1,ii), GeoY(p1,ii),
+@@ -203401,6 +213774,7 @@ static void geopolyWithinFunc(
+ ){
+   GeoPoly *p1 = geopolyFuncParam(context, argv[0], 0);
+   GeoPoly *p2 = geopolyFuncParam(context, argv[1], 0);
++  (void)argc;
+   if( p1 && p2 ){
+     int x = geopolyOverlap(p1, p2);
+     if( x<0 ){
+@@ -203731,6 +214105,7 @@ static void geopolyOverlapFunc(
+ ){
+   GeoPoly *p1 = geopolyFuncParam(context, argv[0], 0);
+   GeoPoly *p2 = geopolyFuncParam(context, argv[1], 0);
++  (void)argc;
+   if( p1 && p2 ){
+     int x = geopolyOverlap(p1, p2);
+     if( x<0 ){
+@@ -203751,8 +214126,12 @@ static void geopolyDebugFunc(
+   int argc,
+   sqlite3_value **argv
+ ){
++  (void)context;
++  (void)argc;
+ #ifdef GEOPOLY_ENABLE_DEBUG
+   geo_debug = sqlite3_value_int(argv[0]);
++#else
++  (void)argv;
+ #endif
+ }
+ 
+@@ -203780,26 +214159,31 @@ static int geopolyInit(
+   sqlite3_str *pSql;
+   char *zSql;
+   int ii;
++  (void)pAux;
+ 
+   sqlite3_vtab_config(db, SQLITE_VTAB_CONSTRAINT_SUPPORT, 1);
++  sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
+ 
+   /* Allocate the sqlite3_vtab structure */
+   nDb = strlen(argv[1]);
+   nName = strlen(argv[2]);
+-  pRtree = (Rtree *)sqlite3_malloc64(sizeof(Rtree)+nDb+nName+2);
++  pRtree = (Rtree *)sqlite3_malloc64(sizeof(Rtree)+nDb+nName*2+8);
+   if( !pRtree ){
+     return SQLITE_NOMEM;
+   }
+-  memset(pRtree, 0, sizeof(Rtree)+nDb+nName+2);
++  memset(pRtree, 0, sizeof(Rtree)+nDb+nName*2+8);
+   pRtree->nBusy = 1;
+   pRtree->base.pModule = &rtreeModule;
+   pRtree->zDb = (char *)&pRtree[1];
+   pRtree->zName = &pRtree->zDb[nDb+1];
++  pRtree->zNodeName = &pRtree->zName[nName+1];
+   pRtree->eCoordType = RTREE_COORD_REAL32;
+   pRtree->nDim = 2;
+   pRtree->nDim2 = 4;
+   memcpy(pRtree->zDb, argv[1], nDb);
+   memcpy(pRtree->zName, argv[2], nName);
++  memcpy(pRtree->zNodeName, argv[2], nName);
++  memcpy(&pRtree->zNodeName[nName], "_node", 6);
+ 
+ 
+   /* Create/Connect to the underlying relational database schema. If
+@@ -203896,6 +214280,7 @@ static int geopolyFilter(
+   RtreeNode *pRoot = 0;
+   int rc = SQLITE_OK;
+   int iCell = 0;
++  (void)idxStr;
+ 
+   rtreeReference(pRtree);
+ 
+@@ -204022,6 +214407,7 @@ static int geopolyBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+   int iRowidTerm = -1;
+   int iFuncTerm = -1;
+   int idxNum = 0;
++  (void)tab;
+ 
+   for(ii=0; iinConstraint; ii++){
+     struct sqlite3_index_constraint *p = &pIdxInfo->aConstraint[ii];
+@@ -204211,7 +214597,6 @@ static int geopolyUpdate(
+     }
+     if( rc==SQLITE_OK ){
+       int rc2;
+-      pRtree->iReinsertHeight = -1;
+       rc = rtreeInsertCell(pRtree, pLeaf, &cell, 0);
+       rc2 = nodeRelease(pRtree, pLeaf);
+       if( rc==SQLITE_OK ){
+@@ -204268,6 +214653,8 @@ static int geopolyFindFunction(
+   void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
+   void **ppArg
+ ){
++  (void)pVtab;
++  (void)nArg;
+   if( sqlite3_stricmp(zName, "geopoly_overlap")==0 ){
+     *pxFunc = geopolyOverlapFunc;
+     *ppArg = 0;
+@@ -204306,7 +214693,8 @@ static sqlite3_module geopolyModule = {
+   rtreeSavepoint,             /* xSavepoint */
+   0,                          /* xRelease */
+   0,                          /* xRollbackTo */
+-  rtreeShadowName             /* xShadowName */
++  rtreeShadowName,            /* xShadowName */
++  rtreeIntegrity              /* xIntegrity */
+ };
+ 
+ static int sqlite3_geopoly_init(sqlite3 *db){
+@@ -204337,7 +214725,7 @@ static int sqlite3_geopoly_init(sqlite3 *db){
+   } aAgg[] = {
+      { geopolyBBoxStep, geopolyBBoxFinal, "geopoly_group_bbox"    },
+   };
+-  int i;
++  unsigned int i;
+   for(i=0; i naming scheme.
++** tables or views named using the data_ naming scheme.
+ **
+ ** Instead of the plain data_ naming scheme, RBU database tables
+ ** may also be named data_, where  is any sequence
+@@ -205571,7 +215959,7 @@ SQLITE_PRIVATE void sqlite3Fts3IcuTokenizerModule(
+ **
+ ** If the target database table is a virtual table or a table that has no
+ ** PRIMARY KEY declaration, the data_% table must also contain a column
+-** named "rbu_rowid". This column is mapped to the tables implicit primary
++** named "rbu_rowid". This column is mapped to the table's implicit primary
+ ** key column - "rowid". Virtual tables for which the "rowid" column does
+ ** not function like a primary key value cannot be updated using RBU. For
+ ** example, if the target db contains either of the following:
+@@ -206004,6 +216392,34 @@ SQLITE_API void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int*pnTwo);
+ 
+ SQLITE_API int sqlite3rbu_state(sqlite3rbu *pRbu);
+ 
++/*
++** As part of applying an RBU update or performing an RBU vacuum operation,
++** the system must at one point move the *-oal file to the equivalent *-wal
++** path. Normally, it does this by invoking POSIX function rename(2) directly.
++** Except on WINCE platforms, where it uses win32 API MoveFileW(). This
++** function may be used to register a callback that the RBU module will invoke
++** instead of one of these APIs.
++**
++** If a callback is registered with an RBU handle, it invokes it instead
++** of rename(2) when it needs to move a file within the file-system. The
++** first argument passed to the xRename() callback is a copy of the second
++** argument (pArg) passed to this function. The second is the full path
++** to the file to move and the third the full path to which it should be
++** moved. The callback function should return SQLITE_OK to indicate
++** success. If an error occurs, it should return an SQLite error code.
++** In this case the RBU operation will be abandoned and the error returned
++** to the RBU user.
++**
++** Passing a NULL pointer in place of the xRename argument to this function
++** restores the default behaviour.
++*/
++SQLITE_API void sqlite3rbu_rename_handler(
++  sqlite3rbu *pRbu,
++  void *pArg,
++  int (*xRename)(void *pArg, const char *zOld, const char *zNew)
++);
++
++
+ /*
+ ** Create an RBU VFS named zName that accesses the underlying file-system
+ ** via existing VFS zParent. Or, if the zParent parameter is passed NULL,
+@@ -206371,6 +216787,8 @@ struct sqlite3rbu {
+   int nPagePerSector;             /* Pages per sector for pTargetFd */
+   i64 iOalSz;
+   i64 nPhaseOneStep;
++  void *pRenameArg;
++  int (*xRename)(void*, const char*, const char*);
+ 
+   /* The following state variables are used as part of the incremental
+   ** checkpoint stage (eStage==RBU_STAGE_CKPT). See comments surrounding
+@@ -208759,7 +219177,7 @@ static void rbuOpenDatabase(sqlite3rbu *p, sqlite3 *dbMain, int *pbRetry){
+     sqlite3_file_control(p->dbRbu, "main", SQLITE_FCNTL_RBUCNT, (void*)p);
+     if( p->zState==0 ){
+       const char *zFile = sqlite3_db_filename(p->dbRbu, "main");
+-      p->zState = rbuMPrintf(p, "file://%s-vacuum?modeof=%s", zFile, zFile);
++      p->zState = rbuMPrintf(p, "file:///%s-vacuum?modeof=%s", zFile, zFile);
+     }
+   }
+ 
+@@ -209007,11 +219425,11 @@ static void rbuSetupCheckpoint(sqlite3rbu *p, RbuState *pState){
+   **     no-ops. These locks will not be released until the connection
+   **     is closed.
+   **
+-  **   * Attempting to xSync() the database file causes an SQLITE_INTERNAL
++  **   * Attempting to xSync() the database file causes an SQLITE_NOTICE
+   **     error.
+   **
+   ** As a result, unless an error (i.e. OOM or SQLITE_BUSY) occurs, the
+-  ** checkpoint below fails with SQLITE_INTERNAL, and leaves the aFrame[]
++  ** checkpoint below fails with SQLITE_NOTICE, and leaves the aFrame[]
+   ** array populated with a set of (frame -> page) mappings. Because the
+   ** WRITER, CHECKPOINT and READ0 locks are still held, it is safe to copy
+   ** data from the wal file into the database file according to the
+@@ -209021,7 +219439,7 @@ static void rbuSetupCheckpoint(sqlite3rbu *p, RbuState *pState){
+     int rc2;
+     p->eStage = RBU_STAGE_CAPTURE;
+     rc2 = sqlite3_exec(p->dbMain, "PRAGMA main.wal_checkpoint=restart", 0, 0,0);
+-    if( rc2!=SQLITE_INTERNAL ) p->rc = rc2;
++    if( rc2!=SQLITE_NOTICE ) p->rc = rc2;
+   }
+ 
+   if( p->rc==SQLITE_OK && p->nFrame>0 ){
+@@ -209067,7 +219485,7 @@ static int rbuCaptureWalRead(sqlite3rbu *pRbu, i64 iOff, int iAmt){
+ 
+   if( pRbu->mLock!=mReq ){
+     pRbu->rc = SQLITE_BUSY;
+-    return SQLITE_INTERNAL;
++    return SQLITE_NOTICE_RBU;
+   }
+ 
+   pRbu->pgsz = iAmt;
+@@ -209117,6 +219535,11 @@ static void rbuCheckpointFrame(sqlite3rbu *p, RbuFrame *pFrame){
+   p->rc = pDb->pMethods->xWrite(pDb, p->aBuf, p->pgsz, iOff);
+ }
+ 
++/*
++** This value is copied from the definition of ZIPVFS_CTRL_FILE_POINTER
++** in zipvfs.h.
++*/
++#define RBU_ZIPVFS_CTRL_FILE_POINTER 230439
+ 
+ /*
+ ** Take an EXCLUSIVE lock on the database file. Return SQLITE_OK if
+@@ -209125,9 +219548,20 @@ static void rbuCheckpointFrame(sqlite3rbu *p, RbuFrame *pFrame){
+ static int rbuLockDatabase(sqlite3 *db){
+   int rc = SQLITE_OK;
+   sqlite3_file *fd = 0;
+-  sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, &fd);
+ 
+-  if( fd->pMethods ){
++  sqlite3_file_control(db, "main", RBU_ZIPVFS_CTRL_FILE_POINTER, &fd);
++  if( fd ){
++    sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, &fd);
++    rc = fd->pMethods->xLock(fd, SQLITE_LOCK_SHARED);
++    if( rc==SQLITE_OK ){
++      rc = fd->pMethods->xUnlock(fd, SQLITE_LOCK_NONE);
++    }
++    sqlite3_file_control(db, "main", RBU_ZIPVFS_CTRL_FILE_POINTER, &fd);
++  }else{
++    sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, &fd);
++  }
++
++  if( rc==SQLITE_OK && fd->pMethods ){
+     rc = fd->pMethods->xLock(fd, SQLITE_LOCK_SHARED);
+     if( rc==SQLITE_OK ){
+       rc = fd->pMethods->xLock(fd, SQLITE_LOCK_EXCLUSIVE);
+@@ -209219,32 +219653,7 @@ static void rbuMoveOalFile(sqlite3rbu *p){
+     }
+ 
+     if( p->rc==SQLITE_OK ){
+-#if defined(_WIN32_WCE)
+-      {
+-        LPWSTR zWideOal;
+-        LPWSTR zWideWal;
+-
+-        zWideOal = rbuWinUtf8ToUnicode(zOal);
+-        if( zWideOal ){
+-          zWideWal = rbuWinUtf8ToUnicode(zWal);
+-          if( zWideWal ){
+-            if( MoveFileW(zWideOal, zWideWal) ){
+-              p->rc = SQLITE_OK;
+-            }else{
+-              p->rc = SQLITE_IOERR;
+-            }
+-            sqlite3_free(zWideWal);
+-          }else{
+-            p->rc = SQLITE_IOERR_NOMEM;
+-          }
+-          sqlite3_free(zWideOal);
+-        }else{
+-          p->rc = SQLITE_IOERR_NOMEM;
+-        }
+-      }
+-#else
+-      p->rc = rename(zOal, zWal) ? SQLITE_IOERR : SQLITE_OK;
+-#endif
++      p->rc = p->xRename(p->pRenameArg, zOal, zWal);
+     }
+ 
+     if( p->rc!=SQLITE_OK
+@@ -209831,7 +220240,8 @@ static void rbuSetupOal(sqlite3rbu *p, RbuState *pState){
+ static void rbuDeleteOalFile(sqlite3rbu *p){
+   char *zOal = rbuMPrintf(p, "%s-oal", p->zTarget);
+   if( zOal ){
+-    sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
++    sqlite3_vfs *pVfs = 0;
++    sqlite3_file_control(p->dbMain, "main", SQLITE_FCNTL_VFS_POINTER, &pVfs);
+     assert( pVfs && p->rc==SQLITE_OK && p->zErrmsg==0 );
+     pVfs->xDelete(pVfs, zOal, 0);
+     sqlite3_free(zOal);
+@@ -209983,6 +220393,7 @@ static sqlite3rbu *openRbuHandle(
+ 
+     /* Create the custom VFS. */
+     memset(p, 0, sizeof(sqlite3rbu));
++    sqlite3rbu_rename_handler(p, 0, 0);
+     rbuCreateVfs(p);
+ 
+     /* Open the target, RBU and state databases */
+@@ -210374,6 +220785,54 @@ SQLITE_API int sqlite3rbu_savestate(sqlite3rbu *p){
+   return rc;
+ }
+ 
++/*
++** Default xRename callback for RBU.
++*/
++static int xDefaultRename(void *pArg, const char *zOld, const char *zNew){
++  int rc = SQLITE_OK;
++#if defined(_WIN32_WCE)
++  {
++    LPWSTR zWideOld;
++    LPWSTR zWideNew;
++
++    zWideOld = rbuWinUtf8ToUnicode(zOld);
++    if( zWideOld ){
++      zWideNew = rbuWinUtf8ToUnicode(zNew);
++      if( zWideNew ){
++        if( MoveFileW(zWideOld, zWideNew) ){
++          rc = SQLITE_OK;
++        }else{
++          rc = SQLITE_IOERR;
++        }
++        sqlite3_free(zWideNew);
++      }else{
++        rc = SQLITE_IOERR_NOMEM;
++      }
++      sqlite3_free(zWideOld);
++    }else{
++      rc = SQLITE_IOERR_NOMEM;
++    }
++  }
++#else
++  rc = rename(zOld, zNew) ? SQLITE_IOERR : SQLITE_OK;
++#endif
++  return rc;
++}
++
++SQLITE_API void sqlite3rbu_rename_handler(
++  sqlite3rbu *pRbu,
++  void *pArg,
++  int (*xRename)(void *pArg, const char *zOld, const char *zNew)
++){
++  if( xRename ){
++    pRbu->xRename = xRename;
++    pRbu->pRenameArg = pArg;
++  }else{
++    pRbu->xRename = xDefaultRename;
++    pRbu->pRenameArg = 0;
++  }
++}
++
+ /**************************************************************************
+ ** Beginning of RBU VFS shim methods. The VFS shim modifies the behaviour
+ ** of a standard VFS in the following ways:
+@@ -210430,7 +220889,7 @@ SQLITE_API int sqlite3rbu_savestate(sqlite3rbu *p){
+ **     database file are recorded. xShmLock() calls to unlock the same
+ **     locks are no-ops (so that once obtained, these locks are never
+ **     relinquished). Finally, calls to xSync() on the target database
+-**     file fail with SQLITE_INTERNAL errors.
++**     file fail with SQLITE_NOTICE errors.
+ */
+ 
+ static void rbuUnlockShm(rbu_file *p){
+@@ -210539,9 +220998,12 @@ static int rbuVfsClose(sqlite3_file *pFile){
+   sqlite3_free(p->zDel);
+ 
+   if( p->openFlags & SQLITE_OPEN_MAIN_DB ){
++    const sqlite3_io_methods *pMeth = p->pReal->pMethods;
+     rbuMainlistRemove(p);
+     rbuUnlockShm(p);
+-    p->pReal->pMethods->xShmUnmap(p->pReal, 0);
++    if( pMeth->iVersion>1 && pMeth->xShmUnmap ){
++      pMeth->xShmUnmap(p->pReal, 0);
++    }
+   }
+   else if( (p->openFlags & SQLITE_OPEN_DELETEONCLOSE) && p->pRbu ){
+     rbuUpdateTempSize(p, 0);
+@@ -210709,7 +221171,7 @@ static int rbuVfsSync(sqlite3_file *pFile, int flags){
+   rbu_file *p = (rbu_file *)pFile;
+   if( p->pRbu && p->pRbu->eStage==RBU_STAGE_CAPTURE ){
+     if( p->openFlags & SQLITE_OPEN_MAIN_DB ){
+-      return SQLITE_INTERNAL;
++      return SQLITE_NOTICE_RBU;
+     }
+     return SQLITE_OK;
+   }
+@@ -211000,6 +221462,25 @@ static int rbuVfsOpen(
+     rbuVfsShmUnmap,               /* xShmUnmap */
+     0, 0                          /* xFetch, xUnfetch */
+   };
++  static sqlite3_io_methods rbuvfs_io_methods1 = {
++    1,                            /* iVersion */
++    rbuVfsClose,                  /* xClose */
++    rbuVfsRead,                   /* xRead */
++    rbuVfsWrite,                  /* xWrite */
++    rbuVfsTruncate,               /* xTruncate */
++    rbuVfsSync,                   /* xSync */
++    rbuVfsFileSize,               /* xFileSize */
++    rbuVfsLock,                   /* xLock */
++    rbuVfsUnlock,                 /* xUnlock */
++    rbuVfsCheckReservedLock,      /* xCheckReservedLock */
++    rbuVfsFileControl,            /* xFileControl */
++    rbuVfsSectorSize,             /* xSectorSize */
++    rbuVfsDeviceCharacteristics,  /* xDeviceCharacteristics */
++    0, 0, 0, 0, 0, 0
++  };
++
++
++
+   rbu_vfs *pRbuVfs = (rbu_vfs*)pVfs;
+   sqlite3_vfs *pRealVfs = pRbuVfs->pRealVfs;
+   rbu_file *pFd = (rbu_file *)pFile;
+@@ -211054,10 +221535,15 @@ static int rbuVfsOpen(
+     rc = pRealVfs->xOpen(pRealVfs, zOpen, pFd->pReal, oflags, pOutFlags);
+   }
+   if( pFd->pReal->pMethods ){
++    const sqlite3_io_methods *pMeth = pFd->pReal->pMethods;
+     /* The xOpen() operation has succeeded. Set the sqlite3_file.pMethods
+     ** pointer and, if the file is a main database file, link it into the
+     ** mutex protected linked list of all such files.  */
+-    pFile->pMethods = &rbuvfs_io_methods;
++    if( pMeth->iVersion<2 || pMeth->xShmLock==0 ){
++      pFile->pMethods = &rbuvfs_io_methods1;
++    }else{
++      pFile->pMethods = &rbuvfs_io_methods;
++    }
+     if( flags & SQLITE_OPEN_MAIN_DB ){
+       rbuMainlistAdd(pFd);
+     }
+@@ -211490,6 +221976,7 @@ static int statConnect(
+   StatTable *pTab = 0;
+   int rc = SQLITE_OK;
+   int iDb;
++  (void)pAux;
+ 
+   if( argc>=4 ){
+     Token nm;
+@@ -211543,6 +222030,7 @@ static int statBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+   int iSchema = -1;
+   int iName = -1;
+   int iAgg = -1;
++  (void)tab;
+ 
+   /* Look for a valid schema=? constraint.  If found, change the idxNum to
+   ** 1 and request the value of that constraint be sent to xFilter.  And
+@@ -212068,6 +222556,8 @@ static int statFilter(
+   int iArg = 0;           /* Count of argv[] parameters used so far */
+   int rc = SQLITE_OK;     /* Result of this operation */
+   const char *zName = 0;  /* Only provide analysis of this table */
++  (void)argc;
++  (void)idxStr;
+ 
+   statResetCsr(pCsr);
+   sqlite3_finalize(pCsr->pStmt);
+@@ -212151,16 +222641,16 @@ static int statColumn(
+       }
+       break;
+     case 4:            /* ncell */
+-      sqlite3_result_int(ctx, pCsr->nCell);
++      sqlite3_result_int64(ctx, pCsr->nCell);
+       break;
+     case 5:            /* payload */
+-      sqlite3_result_int(ctx, pCsr->nPayload);
++      sqlite3_result_int64(ctx, pCsr->nPayload);
+       break;
+     case 6:            /* unused */
+-      sqlite3_result_int(ctx, pCsr->nUnused);
++      sqlite3_result_int64(ctx, pCsr->nUnused);
+       break;
+     case 7:            /* mx_payload */
+-      sqlite3_result_int(ctx, pCsr->nMxPayload);
++      sqlite3_result_int64(ctx, pCsr->nMxPayload);
+       break;
+     case 8:            /* pgoffset */
+       if( !pCsr->isAgg ){
+@@ -212168,7 +222658,7 @@ static int statColumn(
+       }
+       break;
+     case 9:            /* pgsize */
+-      sqlite3_result_int(ctx, pCsr->szPage);
++      sqlite3_result_int64(ctx, pCsr->szPage);
+       break;
+     case 10: {         /* schema */
+       sqlite3 *db = sqlite3_context_db_handle(ctx);
+@@ -212218,7 +222708,8 @@ SQLITE_PRIVATE int sqlite3DbstatRegister(sqlite3 *db){
+     0,                            /* xSavepoint */
+     0,                            /* xRelease */
+     0,                            /* xRollbackTo */
+-    0                             /* xShadowName */
++    0,                            /* xShadowName */
++    0                             /* xIntegrity */
+   };
+   return sqlite3_create_module(db, "dbstat", &dbstat_module, 0);
+ }
+@@ -212302,8 +222793,13 @@ static int dbpageConnect(
+ ){
+   DbpageTable *pTab = 0;
+   int rc = SQLITE_OK;
++  (void)pAux;
++  (void)argc;
++  (void)argv;
++  (void)pzErr;
+ 
+   sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
++  sqlite3_vtab_config(db, SQLITE_VTAB_USES_ALL_SCHEMAS);
+   rc = sqlite3_declare_vtab(db,
+           "CREATE TABLE x(pgno INTEGER PRIMARY KEY, data BLOB, schema HIDDEN)");
+   if( rc==SQLITE_OK ){
+@@ -212340,6 +222836,7 @@ static int dbpageDisconnect(sqlite3_vtab *pVtab){
+ static int dbpageBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+   int i;
+   int iPlan = 0;
++  (void)tab;
+ 
+   /* If there is a schema= constraint, it must be honored.  Report a
+   ** ridiculously large estimated cost if the schema= constraint is
+@@ -212386,7 +222883,6 @@ static int dbpageBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+   ){
+     pIdxInfo->orderByConsumed = 1;
+   }
+-  sqlite3VtabUsesAllSchemas(pIdxInfo);
+   return SQLITE_OK;
+ }
+ 
+@@ -212455,6 +222951,8 @@ static int dbpageFilter(
+   sqlite3 *db = pTab->db;
+   Btree *pBt;
+ 
++  (void)idxStr;
++
+   /* Default setting is no rows of result */
+   pCsr->pgno = 1;
+   pCsr->mxPgno = 0;
+@@ -212469,7 +222967,7 @@ static int dbpageFilter(
+     pCsr->iDb = 0;
+   }
+   pBt = db->aDb[pCsr->iDb].pBt;
+-  if( pBt==0 ) return SQLITE_OK;
++  if( NEVER(pBt==0) ) return SQLITE_OK;
+   pCsr->pPager = sqlite3BtreePager(pBt);
+   pCsr->szPage = sqlite3BtreeGetPageSize(pBt);
+   pCsr->mxPgno = sqlite3BtreeLastPage(pBt);
+@@ -212504,12 +223002,18 @@ static int dbpageColumn(
+     }
+     case 1: {           /* data */
+       DbPage *pDbPage = 0;
+-      rc = sqlite3PagerGet(pCsr->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
+-      if( rc==SQLITE_OK ){
+-        sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pCsr->szPage,
+-                            SQLITE_TRANSIENT);
++      if( pCsr->pgno==((PENDING_BYTE/pCsr->szPage)+1) ){
++        /* The pending byte page. Assume it is zeroed out. Attempting to
++        ** request this page from the page is an SQLITE_CORRUPT error. */
++        sqlite3_result_zeroblob(ctx, pCsr->szPage);
++      }else{
++        rc = sqlite3PagerGet(pCsr->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
++        if( rc==SQLITE_OK ){
++          sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pCsr->szPage,
++              SQLITE_TRANSIENT);
++        }
++        sqlite3PagerUnref(pDbPage);
+       }
+-      sqlite3PagerUnref(pDbPage);
+       break;
+     }
+     default: {          /* schema */
+@@ -212518,7 +223022,7 @@ static int dbpageColumn(
+       break;
+     }
+   }
+-  return SQLITE_OK;
++  return rc;
+ }
+ 
+ static int dbpageRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
+@@ -212544,6 +223048,7 @@ static int dbpageUpdate(
+   Pager *pPager;
+   int szPage;
+ 
++  (void)pRowid;
+   if( pTab->db->flags & SQLITE_Defensive ){
+     zErr = "read-only";
+     goto update_fail;
+@@ -212553,18 +223058,20 @@ static int dbpageUpdate(
+     goto update_fail;
+   }
+   pgno = sqlite3_value_int(argv[0]);
+-  if( (Pgno)sqlite3_value_int(argv[1])!=pgno ){
++  if( sqlite3_value_type(argv[0])==SQLITE_NULL
++   || (Pgno)sqlite3_value_int(argv[1])!=pgno
++  ){
+     zErr = "cannot insert";
+     goto update_fail;
+   }
+   zSchema = (const char*)sqlite3_value_text(argv[4]);
+-  iDb = zSchema ? sqlite3FindDbName(pTab->db, zSchema) : -1;
+-  if( iDb<0 ){
++  iDb = ALWAYS(zSchema) ? sqlite3FindDbName(pTab->db, zSchema) : -1;
++  if( NEVER(iDb<0) ){
+     zErr = "no such schema";
+     goto update_fail;
+   }
+   pBt = pTab->db->aDb[iDb].pBt;
+-  if( pgno<1 || pBt==0 || pgno>sqlite3BtreeLastPage(pBt) ){
++  if( NEVER(pgno<1) || NEVER(pBt==0) || NEVER(pgno>sqlite3BtreeLastPage(pBt)) ){
+     zErr = "bad page number";
+     goto update_fail;
+   }
+@@ -212578,11 +223085,12 @@ static int dbpageUpdate(
+   pPager = sqlite3BtreePager(pBt);
+   rc = sqlite3PagerGet(pPager, pgno, (DbPage**)&pDbPage, 0);
+   if( rc==SQLITE_OK ){
+-    rc = sqlite3PagerWrite(pDbPage);
+-    if( rc==SQLITE_OK ){
+-      memcpy(sqlite3PagerGetData(pDbPage),
+-             sqlite3_value_blob(argv[3]),
+-             szPage);
++    const void *pData = sqlite3_value_blob(argv[3]);
++    assert( pData!=0 || pTab->db->mallocFailed );
++    if( pData
++     && (rc = sqlite3PagerWrite(pDbPage))==SQLITE_OK
++    ){
++      memcpy(sqlite3PagerGetData(pDbPage), pData, szPage);
+     }
+   }
+   sqlite3PagerUnref(pDbPage);
+@@ -212604,7 +223112,7 @@ static int dbpageBegin(sqlite3_vtab *pVtab){
+   int i;
+   for(i=0; inDb; i++){
+     Btree *pBt = db->aDb[i].pBt;
+-    if( pBt ) sqlite3BtreeBeginTrans(pBt, 1, 0);
++    if( pBt ) (void)sqlite3BtreeBeginTrans(pBt, 1, 0);
+   }
+   return SQLITE_OK;
+ }
+@@ -212638,7 +223146,8 @@ SQLITE_PRIVATE int sqlite3DbpageRegister(sqlite3 *db){
+     0,                            /* xSavepoint */
+     0,                            /* xRelease */
+     0,                            /* xRollbackTo */
+-    0                             /* xShadowName */
++    0,                            /* xShadowName */
++    0                             /* xIntegrity */
+   };
+   return sqlite3_create_module(db, "sqlite_dbpage", &dbpage_module, 0);
+ }
+@@ -212675,6 +223184,8 @@ typedef struct SessionInput SessionInput;
+ # endif
+ #endif
+ 
++#define SESSIONS_ROWID "_rowid_"
++
+ static int sessions_strm_chunk_size = SESSIONS_STRM_CHUNK_SIZE;
+ 
+ typedef struct SessionHook SessionHook;
+@@ -212696,6 +223207,7 @@ struct sqlite3_session {
+   int bEnable;                    /* True if currently recording */
+   int bIndirect;                  /* True if all changes are indirect */
+   int bAutoAttach;                /* True to auto-attach tables */
++  int bImplicitPK;                /* True to handle tables with implicit PK */
+   int rc;                         /* Non-zero if an error has occurred */
+   void *pFilterCtx;               /* First argument to pass to xTableFilter */
+   int (*xTableFilter)(void *pCtx, const char *zTab);
+@@ -212766,17 +223278,32 @@ struct sqlite3_changeset_iter {
+ ** The data associated with each hash-table entry is a structure containing
+ ** a subset of the initial values that the modified row contained at the
+ ** start of the session. Or no initial values if the row was inserted.
++**
++** pDfltStmt:
++**   This is only used by the sqlite3changegroup_xxx() APIs, not by
++**   regular sqlite3_session objects. It is a SELECT statement that
++**   selects the default value for each table column. For example,
++**   if the table is
++**
++**      CREATE TABLE xx(a DEFAULT 1, b, c DEFAULT 'abc')
++**
++**   then this variable is the compiled version of:
++**
++**      SELECT 1, NULL, 'abc'
+ */
+ struct SessionTable {
+   SessionTable *pNext;
+   char *zName;                    /* Local name of table */
+   int nCol;                       /* Number of columns in table zName */
+   int bStat1;                     /* True if this is sqlite_stat1 */
++  int bRowid;                     /* True if this table uses rowid for PK */
+   const char **azCol;             /* Column names */
++  const char **azDflt;            /* Default value expressions */
+   u8 *abPK;                       /* Array of primary key flags */
+   int nEntry;                     /* Total number of entries in hash table */
+   int nChange;                    /* Size of apChange[] array */
+   SessionChange **apChange;       /* Hash table buckets */
++  sqlite3_stmt *pDfltStmt;
+ };
+ 
+ /*
+@@ -212945,6 +223472,7 @@ struct SessionTable {
+ struct SessionChange {
+   u8 op;                          /* One of UPDATE, DELETE, INSERT */
+   u8 bIndirect;                   /* True if this change is "indirect" */
++  u16 nRecordField;               /* Number of fields in aRecord[] */
+   int nMaxSize;                   /* Max size of eventual changeset record */
+   int nRecord;                    /* Number of bytes in buffer aRecord[] */
+   u8 *aRecord;                    /* Buffer containing old.* record */
+@@ -212970,7 +223498,7 @@ static int sessionVarintLen(int iVal){
+ ** Read a varint value from aBuf[] into *piVal. Return the number of
+ ** bytes read.
+ */
+-static int sessionVarintGet(u8 *aBuf, int *piVal){
++static int sessionVarintGet(const u8 *aBuf, int *piVal){
+   return getVarint32(aBuf, *piVal);
+ }
+ 
+@@ -213164,6 +223692,7 @@ static unsigned int sessionHashAppendType(unsigned int h, int eType){
+ */
+ static int sessionPreupdateHash(
+   sqlite3_session *pSession,      /* Session object that owns pTab */
++  i64 iRowid,
+   SessionTable *pTab,             /* Session table handle */
+   int bNew,                       /* True to hash the new.* PK */
+   int *piHash,                    /* OUT: Hash value */
+@@ -213172,48 +223701,53 @@ static int sessionPreupdateHash(
+   unsigned int h = 0;             /* Hash value to return */
+   int i;                          /* Used to iterate through columns */
+ 
+-  assert( *pbNullPK==0 );
+-  assert( pTab->nCol==pSession->hook.xCount(pSession->hook.pCtx) );
+-  for(i=0; inCol; i++){
+-    if( pTab->abPK[i] ){
+-      int rc;
+-      int eType;
+-      sqlite3_value *pVal;
+-
+-      if( bNew ){
+-        rc = pSession->hook.xNew(pSession->hook.pCtx, i, &pVal);
+-      }else{
+-        rc = pSession->hook.xOld(pSession->hook.pCtx, i, &pVal);
+-      }
+-      if( rc!=SQLITE_OK ) return rc;
++  if( pTab->bRowid ){
++    assert( pTab->nCol-1==pSession->hook.xCount(pSession->hook.pCtx) );
++    h = sessionHashAppendI64(h, iRowid);
++  }else{
++    assert( *pbNullPK==0 );
++    assert( pTab->nCol==pSession->hook.xCount(pSession->hook.pCtx) );
++    for(i=0; inCol; i++){
++      if( pTab->abPK[i] ){
++        int rc;
++        int eType;
++        sqlite3_value *pVal;
+ 
+-      eType = sqlite3_value_type(pVal);
+-      h = sessionHashAppendType(h, eType);
+-      if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
+-        i64 iVal;
+-        if( eType==SQLITE_INTEGER ){
+-          iVal = sqlite3_value_int64(pVal);
++        if( bNew ){
++          rc = pSession->hook.xNew(pSession->hook.pCtx, i, &pVal);
+         }else{
+-          double rVal = sqlite3_value_double(pVal);
+-          assert( sizeof(iVal)==8 && sizeof(rVal)==8 );
+-          memcpy(&iVal, &rVal, 8);
++          rc = pSession->hook.xOld(pSession->hook.pCtx, i, &pVal);
+         }
+-        h = sessionHashAppendI64(h, iVal);
+-      }else if( eType==SQLITE_TEXT || eType==SQLITE_BLOB ){
+-        const u8 *z;
+-        int n;
+-        if( eType==SQLITE_TEXT ){
+-          z = (const u8 *)sqlite3_value_text(pVal);
++        if( rc!=SQLITE_OK ) return rc;
++
++        eType = sqlite3_value_type(pVal);
++        h = sessionHashAppendType(h, eType);
++        if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
++          i64 iVal;
++          if( eType==SQLITE_INTEGER ){
++            iVal = sqlite3_value_int64(pVal);
++          }else{
++            double rVal = sqlite3_value_double(pVal);
++            assert( sizeof(iVal)==8 && sizeof(rVal)==8 );
++            memcpy(&iVal, &rVal, 8);
++          }
++          h = sessionHashAppendI64(h, iVal);
++        }else if( eType==SQLITE_TEXT || eType==SQLITE_BLOB ){
++          const u8 *z;
++          int n;
++          if( eType==SQLITE_TEXT ){
++            z = (const u8 *)sqlite3_value_text(pVal);
++          }else{
++            z = (const u8 *)sqlite3_value_blob(pVal);
++          }
++          n = sqlite3_value_bytes(pVal);
++          if( !z && (eType!=SQLITE_BLOB || n>0) ) return SQLITE_NOMEM;
++          h = sessionHashAppendBlob(h, n, z);
+         }else{
+-          z = (const u8 *)sqlite3_value_blob(pVal);
++          assert( eType==SQLITE_NULL );
++          assert( pTab->bStat1==0 || i!=1 );
++          *pbNullPK = 1;
+         }
+-        n = sqlite3_value_bytes(pVal);
+-        if( !z && (eType!=SQLITE_BLOB || n>0) ) return SQLITE_NOMEM;
+-        h = sessionHashAppendBlob(h, n, z);
+-      }else{
+-        assert( eType==SQLITE_NULL );
+-        assert( pTab->bStat1==0 || i!=1 );
+-        *pbNullPK = 1;
+       }
+     }
+   }
+@@ -213227,9 +223761,11 @@ static int sessionPreupdateHash(
+ ** Return the number of bytes of space occupied by the value (including
+ ** the type byte).
+ */
+-static int sessionSerialLen(u8 *a){
+-  int e = *a;
++static int sessionSerialLen(const u8 *a){
++  int e;
+   int n;
++  assert( a!=0 );
++  e = *a;
+   if( e==0 || e==0xFF ) return 1;
+   if( e==SQLITE_NULL ) return 1;
+   if( e==SQLITE_INTEGER || e==SQLITE_FLOAT ) return 9;
+@@ -213496,6 +224032,7 @@ static int sessionMergeUpdate(
+ */
+ static int sessionPreupdateEqual(
+   sqlite3_session *pSession,      /* Session object that owns SessionTable */
++  i64 iRowid,                     /* Rowid value if pTab->bRowid */
+   SessionTable *pTab,             /* Table associated with change */
+   SessionChange *pChange,         /* Change to compare to */
+   int op                          /* Current pre-update operation */
+@@ -213503,6 +224040,11 @@ static int sessionPreupdateEqual(
+   int iCol;                       /* Used to iterate through columns */
+   u8 *a = pChange->aRecord;       /* Cursor used to scan change record */
+ 
++  if( pTab->bRowid ){
++    if( a[0]!=SQLITE_INTEGER ) return 0;
++    return sessionGetI64(&a[1])==iRowid;
++  }
++
+   assert( op==SQLITE_INSERT || op==SQLITE_UPDATE || op==SQLITE_DELETE );
+   for(iCol=0; iColnCol; iCol++){
+     if( !pTab->abPK[iCol] ){
+@@ -213525,6 +224067,7 @@ static int sessionPreupdateEqual(
+         rc = pSession->hook.xOld(pSession->hook.pCtx, iCol, &pVal);
+       }
+       assert( rc==SQLITE_OK );
++      (void)rc;                   /* Suppress warning about unused variable */
+       if( sqlite3_value_type(pVal)!=eType ) return 0;
+ 
+       /* A SessionChange object never has a NULL value in a PK column */
+@@ -213627,13 +224170,14 @@ static int sessionGrowHash(
+ **
+ ** For example, if the table is declared as:
+ **
+-**     CREATE TABLE tbl1(w, x, y, z, PRIMARY KEY(w, z));
++**     CREATE TABLE tbl1(w, x DEFAULT 'abc', y, z, PRIMARY KEY(w, z));
+ **
+-** Then the four output variables are populated as follows:
++** Then the five output variables are populated as follows:
+ **
+ **     *pnCol  = 4
+ **     *pzTab  = "tbl1"
+ **     *pazCol = {"w", "x", "y", "z"}
++**     *pazDflt = {NULL, 'abc', NULL, NULL}
+ **     *pabPK  = {1, 0, 0, 1}
+ **
+ ** All returned buffers are part of the same single allocation, which must
+@@ -213647,7 +224191,9 @@ static int sessionTableInfo(
+   int *pnCol,                     /* OUT: number of columns */
+   const char **pzTab,             /* OUT: Copy of zThis */
+   const char ***pazCol,           /* OUT: Array of column names for table */
+-  u8 **pabPK                      /* OUT: Array of booleans - true for PK col */
++  const char ***pazDflt,          /* OUT: Array of default value expressions */
++  u8 **pabPK,                     /* OUT: Array of booleans - true for PK col */
++  int *pbRowid                    /* OUT: True if only PK is a rowid */
+ ){
+   char *zPragma;
+   sqlite3_stmt *pStmt;
+@@ -213658,10 +224204,18 @@ static int sessionTableInfo(
+   int i;
+   u8 *pAlloc = 0;
+   char **azCol = 0;
++  char **azDflt = 0;
+   u8 *abPK = 0;
++  int bRowid = 0;                 /* Set to true to use rowid as PK */
+ 
+   assert( pazCol && pabPK );
+ 
++  *pazCol = 0;
++  *pabPK = 0;
++  *pnCol = 0;
++  if( pzTab ) *pzTab = 0;
++  if( pazDflt ) *pazDflt = 0;
++
+   nThis = sqlite3Strlen30(zThis);
+   if( nThis==12 && 0==sqlite3_stricmp("sqlite_stat1", zThis) ){
+     rc = sqlite3_table_column_metadata(db, zDb, zThis, 0, 0, 0, 0, 0, 0);
+@@ -213675,50 +224229,47 @@ static int sessionTableInfo(
+     }else if( rc==SQLITE_ERROR ){
+       zPragma = sqlite3_mprintf("");
+     }else{
+-      *pazCol = 0;
+-      *pabPK = 0;
+-      *pnCol = 0;
+-      if( pzTab ) *pzTab = 0;
+       return rc;
+     }
+   }else{
+     zPragma = sqlite3_mprintf("PRAGMA '%q'.table_info('%q')", zDb, zThis);
+   }
+   if( !zPragma ){
+-    *pazCol = 0;
+-    *pabPK = 0;
+-    *pnCol = 0;
+-    if( pzTab ) *pzTab = 0;
+     return SQLITE_NOMEM;
+   }
+ 
+   rc = sqlite3_prepare_v2(db, zPragma, -1, &pStmt, 0);
+   sqlite3_free(zPragma);
+   if( rc!=SQLITE_OK ){
+-    *pazCol = 0;
+-    *pabPK = 0;
+-    *pnCol = 0;
+-    if( pzTab ) *pzTab = 0;
+     return rc;
+   }
+ 
+   nByte = nThis + 1;
++  bRowid = (pbRowid!=0);
+   while( SQLITE_ROW==sqlite3_step(pStmt) ){
+-    nByte += sqlite3_column_bytes(pStmt, 1);
++    nByte += sqlite3_column_bytes(pStmt, 1);          /* name */
++    nByte += sqlite3_column_bytes(pStmt, 4);          /* dflt_value */
+     nDbCol++;
++    if( sqlite3_column_int(pStmt, 5) ) bRowid = 0;    /* pk */
+   }
++  if( nDbCol==0 ) bRowid = 0;
++  nDbCol += bRowid;
++  nByte += strlen(SESSIONS_ROWID);
+   rc = sqlite3_reset(pStmt);
+ 
+   if( rc==SQLITE_OK ){
+-    nByte += nDbCol * (sizeof(const char *) + sizeof(u8) + 1);
++    nByte += nDbCol * (sizeof(const char *)*2 + sizeof(u8) + 1 + 1);
+     pAlloc = sessionMalloc64(pSession, nByte);
+     if( pAlloc==0 ){
+       rc = SQLITE_NOMEM;
++    }else{
++      memset(pAlloc, 0, nByte);
+     }
+   }
+   if( rc==SQLITE_OK ){
+     azCol = (char **)pAlloc;
+-    pAlloc = (u8 *)&azCol[nDbCol];
++    azDflt = (char**)&azCol[nDbCol];
++    pAlloc = (u8 *)&azDflt[nDbCol];
+     abPK = (u8 *)pAlloc;
+     pAlloc = &abPK[nDbCol];
+     if( pzTab ){
+@@ -213728,43 +224279,57 @@ static int sessionTableInfo(
+     }
+ 
+     i = 0;
++    if( bRowid ){
++      size_t nName = strlen(SESSIONS_ROWID);
++      memcpy(pAlloc, SESSIONS_ROWID, nName+1);
++      azCol[i] = (char*)pAlloc;
++      pAlloc += nName+1;
++      abPK[i] = 1;
++      i++;
++    }
+     while( SQLITE_ROW==sqlite3_step(pStmt) ){
+       int nName = sqlite3_column_bytes(pStmt, 1);
++      int nDflt = sqlite3_column_bytes(pStmt, 4);
+       const unsigned char *zName = sqlite3_column_text(pStmt, 1);
++      const unsigned char *zDflt = sqlite3_column_text(pStmt, 4);
++
+       if( zName==0 ) break;
+       memcpy(pAlloc, zName, nName+1);
+       azCol[i] = (char *)pAlloc;
+       pAlloc += nName+1;
++      if( zDflt ){
++        memcpy(pAlloc, zDflt, nDflt+1);
++        azDflt[i] = (char *)pAlloc;
++        pAlloc += nDflt+1;
++      }else{
++        azDflt[i] = 0;
++      }
+       abPK[i] = sqlite3_column_int(pStmt, 5);
+       i++;
+     }
+     rc = sqlite3_reset(pStmt);
+-
+   }
+ 
+   /* If successful, populate the output variables. Otherwise, zero them and
+   ** free any allocation made. An error code will be returned in this case.
+   */
+   if( rc==SQLITE_OK ){
+-    *pazCol = (const char **)azCol;
++    *pazCol = (const char**)azCol;
++    if( pazDflt ) *pazDflt = (const char**)azDflt;
+     *pabPK = abPK;
+     *pnCol = nDbCol;
+   }else{
+-    *pazCol = 0;
+-    *pabPK = 0;
+-    *pnCol = 0;
+-    if( pzTab ) *pzTab = 0;
+     sessionFree(pSession, azCol);
+   }
++  if( pbRowid ) *pbRowid = bRowid;
+   sqlite3_finalize(pStmt);
+   return rc;
+ }
+ 
+ /*
+-** This function is only called from within a pre-update handler for a
+-** write to table pTab, part of session pSession. If this is the first
+-** write to this table, initalize the SessionTable.nCol, azCol[] and
+-** abPK[] arrays accordingly.
++** This function is called to initialize the SessionTable.nCol, azCol[]
++** abPK[] and azDflt[] members of SessionTable object pTab. If these
++** fields are already initilialized, this function is a no-op.
+ **
+ ** If an error occurs, an error code is stored in sqlite3_session.rc and
+ ** non-zero returned. Or, if no error occurs but the table has no primary
+@@ -213772,14 +224337,22 @@ static int sessionTableInfo(
+ ** indicate that updates on this table should be ignored. SessionTable.abPK
+ ** is set to NULL in this case.
+ */
+-static int sessionInitTable(sqlite3_session *pSession, SessionTable *pTab){
++static int sessionInitTable(
++  sqlite3_session *pSession,      /* Optional session handle */
++  SessionTable *pTab,             /* Table object to initialize */
++  sqlite3 *db,                    /* Database handle to read schema from */
++  const char *zDb                 /* Name of db - "main", "temp" etc. */
++){
++  int rc = SQLITE_OK;
++
+   if( pTab->nCol==0 ){
+     u8 *abPK;
+     assert( pTab->azCol==0 || pTab->abPK==0 );
+-    pSession->rc = sessionTableInfo(pSession, pSession->db, pSession->zDb,
+-        pTab->zName, &pTab->nCol, 0, &pTab->azCol, &abPK
++    rc = sessionTableInfo(pSession, db, zDb,
++        pTab->zName, &pTab->nCol, 0, &pTab->azCol, &pTab->azDflt, &abPK,
++        ((pSession==0 || pSession->bImplicitPK) ? &pTab->bRowid : 0)
+     );
+-    if( pSession->rc==SQLITE_OK ){
++    if( rc==SQLITE_OK ){
+       int i;
+       for(i=0; inCol; i++){
+         if( abPK[i] ){
+@@ -213791,14 +224364,321 @@ static int sessionInitTable(sqlite3_session *pSession, SessionTable *pTab){
+         pTab->bStat1 = 1;
+       }
+ 
+-      if( pSession->bEnableSize ){
++      if( pSession && pSession->bEnableSize ){
+         pSession->nMaxChangesetSize += (
+           1 + sessionVarintLen(pTab->nCol) + pTab->nCol + strlen(pTab->zName)+1
+         );
+       }
+     }
+   }
+-  return (pSession->rc || pTab->abPK==0);
++
++  if( pSession ){
++    pSession->rc = rc;
++    return (rc || pTab->abPK==0);
++  }
++  return rc;
++}
++
++/*
++** Re-initialize table object pTab.
++*/
++static int sessionReinitTable(sqlite3_session *pSession, SessionTable *pTab){
++  int nCol = 0;
++  const char **azCol = 0;
++  const char **azDflt = 0;
++  u8 *abPK = 0;
++  int bRowid = 0;
++
++  assert( pSession->rc==SQLITE_OK );
++
++  pSession->rc = sessionTableInfo(pSession, pSession->db, pSession->zDb,
++      pTab->zName, &nCol, 0, &azCol, &azDflt, &abPK,
++      (pSession->bImplicitPK ? &bRowid : 0)
++  );
++  if( pSession->rc==SQLITE_OK ){
++    if( pTab->nCol>nCol || pTab->bRowid!=bRowid ){
++      pSession->rc = SQLITE_SCHEMA;
++    }else{
++      int ii;
++      int nOldCol = pTab->nCol;
++      for(ii=0; iinCol ){
++          if( pTab->abPK[ii]!=abPK[ii] ){
++            pSession->rc = SQLITE_SCHEMA;
++          }
++        }else if( abPK[ii] ){
++          pSession->rc = SQLITE_SCHEMA;
++        }
++      }
++
++      if( pSession->rc==SQLITE_OK ){
++        const char **a = pTab->azCol;
++        pTab->azCol = azCol;
++        pTab->nCol = nCol;
++        pTab->azDflt = azDflt;
++        pTab->abPK = abPK;
++        azCol = a;
++      }
++      if( pSession->bEnableSize ){
++        pSession->nMaxChangesetSize += (nCol - nOldCol);
++        pSession->nMaxChangesetSize += sessionVarintLen(nCol);
++        pSession->nMaxChangesetSize -= sessionVarintLen(nOldCol);
++      }
++    }
++  }
++
++  sqlite3_free((char*)azCol);
++  return pSession->rc;
++}
++
++/*
++** Session-change object (*pp) contains an old.* record with fewer than
++** nCol fields. This function updates it with the default values for
++** the missing fields.
++*/
++static void sessionUpdateOneChange(
++  sqlite3_session *pSession,      /* For memory accounting */
++  int *pRc,                       /* IN/OUT: Error code */
++  SessionChange **pp,             /* IN/OUT: Change object to update */
++  int nCol,                       /* Number of columns now in table */
++  sqlite3_stmt *pDflt             /* SELECT  */
++){
++  SessionChange *pOld = *pp;
++
++  while( pOld->nRecordFieldnRecordField;
++    int eType = sqlite3_column_type(pDflt, iField);
++    switch( eType ){
++      case SQLITE_NULL:
++        nIncr = 1;
++        break;
++      case SQLITE_INTEGER:
++      case SQLITE_FLOAT:
++        nIncr = 9;
++        break;
++      default: {
++        int n = sqlite3_column_bytes(pDflt, iField);
++        nIncr = 1 + sessionVarintLen(n) + n;
++        assert( eType==SQLITE_TEXT || eType==SQLITE_BLOB );
++        break;
++      }
++    }
++
++    nByte = nIncr + (sizeof(SessionChange) + pOld->nRecord);
++    pNew = sessionMalloc64(pSession, nByte);
++    if( pNew==0 ){
++      *pRc = SQLITE_NOMEM;
++      return;
++    }else{
++      memcpy(pNew, pOld, sizeof(SessionChange));
++      pNew->aRecord = (u8*)&pNew[1];
++      memcpy(pNew->aRecord, pOld->aRecord, pOld->nRecord);
++      pNew->aRecord[pNew->nRecord++] = (u8)eType;
++      switch( eType ){
++        case SQLITE_INTEGER: {
++          i64 iVal = sqlite3_column_int64(pDflt, iField);
++          sessionPutI64(&pNew->aRecord[pNew->nRecord], iVal);
++          pNew->nRecord += 8;
++          break;
++        }
++
++        case SQLITE_FLOAT: {
++          double rVal = sqlite3_column_double(pDflt, iField);
++          i64 iVal = 0;
++          memcpy(&iVal, &rVal, sizeof(rVal));
++          sessionPutI64(&pNew->aRecord[pNew->nRecord], iVal);
++          pNew->nRecord += 8;
++          break;
++        }
++
++        case SQLITE_TEXT: {
++          int n = sqlite3_column_bytes(pDflt, iField);
++          const char *z = (const char*)sqlite3_column_text(pDflt, iField);
++          pNew->nRecord += sessionVarintPut(&pNew->aRecord[pNew->nRecord], n);
++          memcpy(&pNew->aRecord[pNew->nRecord], z, n);
++          pNew->nRecord += n;
++          break;
++        }
++
++        case SQLITE_BLOB: {
++          int n = sqlite3_column_bytes(pDflt, iField);
++          const u8 *z = (const u8*)sqlite3_column_blob(pDflt, iField);
++          pNew->nRecord += sessionVarintPut(&pNew->aRecord[pNew->nRecord], n);
++          memcpy(&pNew->aRecord[pNew->nRecord], z, n);
++          pNew->nRecord += n;
++          break;
++        }
++
++        default:
++          assert( eType==SQLITE_NULL );
++          break;
++      }
++
++      sessionFree(pSession, pOld);
++      *pp = pOld = pNew;
++      pNew->nRecordField++;
++      pNew->nMaxSize += nIncr;
++      if( pSession ){
++        pSession->nMaxChangesetSize += nIncr;
++      }
++    }
++  }
++}
++
++/*
++** Ensure that there is room in the buffer to append nByte bytes of data.
++** If not, use sqlite3_realloc() to grow the buffer so that there is.
++**
++** If successful, return zero. Otherwise, if an OOM condition is encountered,
++** set *pRc to SQLITE_NOMEM and return non-zero.
++*/
++static int sessionBufferGrow(SessionBuffer *p, i64 nByte, int *pRc){
++#define SESSION_MAX_BUFFER_SZ (0x7FFFFF00 - 1)
++  i64 nReq = p->nBuf + nByte;
++  if( *pRc==SQLITE_OK && nReq>p->nAlloc ){
++    u8 *aNew;
++    i64 nNew = p->nAlloc ? p->nAlloc : 128;
++
++    do {
++      nNew = nNew*2;
++    }while( nNewSESSION_MAX_BUFFER_SZ ){
++      nNew = SESSION_MAX_BUFFER_SZ;
++      if( nNewaBuf, nNew);
++    if( 0==aNew ){
++      *pRc = SQLITE_NOMEM;
++    }else{
++      p->aBuf = aNew;
++      p->nAlloc = nNew;
++    }
++  }
++  return (*pRc!=SQLITE_OK);
++}
++
++
++/*
++** This function is a no-op if *pRc is other than SQLITE_OK when it is
++** called. Otherwise, append a string to the buffer. All bytes in the string
++** up to (but not including) the nul-terminator are written to the buffer.
++**
++** If an OOM condition is encountered, set *pRc to SQLITE_NOMEM before
++** returning.
++*/
++static void sessionAppendStr(
++  SessionBuffer *p,
++  const char *zStr,
++  int *pRc
++){
++  int nStr = sqlite3Strlen30(zStr);
++  if( 0==sessionBufferGrow(p, nStr+1, pRc) ){
++    memcpy(&p->aBuf[p->nBuf], zStr, nStr);
++    p->nBuf += nStr;
++    p->aBuf[p->nBuf] = 0x00;
++  }
++}
++
++/*
++** Format a string using printf() style formatting and then append it to the
++** buffer using sessionAppendString().
++*/
++static void sessionAppendPrintf(
++  SessionBuffer *p,               /* Buffer to append to */
++  int *pRc,
++  const char *zFmt,
++  ...
++){
++  if( *pRc==SQLITE_OK ){
++    char *zApp = 0;
++    va_list ap;
++    va_start(ap, zFmt);
++    zApp = sqlite3_vmprintf(zFmt, ap);
++    if( zApp==0 ){
++      *pRc = SQLITE_NOMEM;
++    }else{
++      sessionAppendStr(p, zApp, pRc);
++    }
++    va_end(ap);
++    sqlite3_free(zApp);
++  }
++}
++
++/*
++** Prepare a statement against database handle db that SELECTs a single
++** row containing the default values for each column in table pTab. For
++** example, if pTab is declared as:
++**
++**   CREATE TABLE pTab(a PRIMARY KEY, b DEFAULT 123, c DEFAULT 'abcd');
++**
++** Then this function prepares and returns the SQL statement:
++**
++**   SELECT NULL, 123, 'abcd';
++*/
++static int sessionPrepareDfltStmt(
++  sqlite3 *db,                    /* Database handle */
++  SessionTable *pTab,             /* Table to prepare statement for */
++  sqlite3_stmt **ppStmt           /* OUT: Statement handle */
++){
++  SessionBuffer sql = {0,0,0};
++  int rc = SQLITE_OK;
++  const char *zSep = " ";
++  int ii = 0;
++
++  *ppStmt = 0;
++  sessionAppendPrintf(&sql, &rc, "SELECT");
++  for(ii=0; iinCol; ii++){
++    const char *zDflt = pTab->azDflt[ii] ? pTab->azDflt[ii] : "NULL";
++    sessionAppendPrintf(&sql, &rc, "%s%s", zSep, zDflt);
++    zSep = ", ";
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_prepare_v2(db, (const char*)sql.aBuf, -1, ppStmt, 0);
++  }
++  sqlite3_free(sql.aBuf);
++
++  return rc;
++}
++
++/*
++** Table pTab has one or more existing change-records with old.* records
++** with fewer than pTab->nCol columns. This function updates all such
++** change-records with the default values for the missing columns.
++*/
++static int sessionUpdateChanges(sqlite3_session *pSession, SessionTable *pTab){
++  sqlite3_stmt *pStmt = 0;
++  int rc = pSession->rc;
++
++  rc = sessionPrepareDfltStmt(pSession->db, pTab, &pStmt);
++  if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
++    int ii = 0;
++    SessionChange **pp = 0;
++    for(ii=0; iinChange; ii++){
++      for(pp=&pTab->apChange[ii]; *pp; pp=&((*pp)->pNext)){
++        if( (*pp)->nRecordField!=pTab->nCol ){
++          sessionUpdateOneChange(pSession, &rc, pp, pTab->nCol, pStmt);
++        }
++      }
++    }
++  }
++
++  pSession->rc = rc;
++  rc = sqlite3_finalize(pStmt);
++  if( pSession->rc==SQLITE_OK ) pSession->rc = rc;
++  return pSession->rc;
+ }
+ 
+ /*
+@@ -213849,6 +224729,7 @@ static int sessionUpdateMaxSize(
+ ){
+   i64 nNew = 2;
+   if( pC->op==SQLITE_INSERT ){
++    if( pTab->bRowid ) nNew += 9;
+     if( op!=SQLITE_DELETE ){
+       int ii;
+       for(ii=0; iinCol; ii++){
+@@ -213865,12 +224746,16 @@ static int sessionUpdateMaxSize(
+   }else{
+     int ii;
+     u8 *pCsr = pC->aRecord;
+-    for(ii=0; iinCol; ii++){
++    if( pTab->bRowid ){
++      nNew += 9 + 1;
++      pCsr += 9;
++    }
++    for(ii=pTab->bRowid; iinCol; ii++){
+       int bChanged = 1;
+       int nOld = 0;
+       int eType;
+       sqlite3_value *p = 0;
+-      pSession->hook.xNew(pSession->hook.pCtx, ii, &p);
++      pSession->hook.xNew(pSession->hook.pCtx, ii-pTab->bRowid, &p);
+       if( p==0 ){
+         return SQLITE_NOMEM;
+       }
+@@ -213949,22 +224834,29 @@ static int sessionUpdateMaxSize(
+ */
+ static void sessionPreupdateOneChange(
+   int op,                         /* One of SQLITE_UPDATE, INSERT, DELETE */
++  i64 iRowid,
+   sqlite3_session *pSession,      /* Session object pTab is attached to */
+   SessionTable *pTab              /* Table that change applies to */
+ ){
+   int iHash;
+   int bNull = 0;
+   int rc = SQLITE_OK;
++  int nExpect = 0;
+   SessionStat1Ctx stat1 = {{0,0,0,0,0},0};
+ 
+   if( pSession->rc ) return;
+ 
+   /* Load table details if required */
+-  if( sessionInitTable(pSession, pTab) ) return;
++  if( sessionInitTable(pSession, pTab, pSession->db, pSession->zDb) ) return;
+ 
+   /* Check the number of columns in this xPreUpdate call matches the
+   ** number of columns in the table.  */
+-  if( pTab->nCol!=pSession->hook.xCount(pSession->hook.pCtx) ){
++  nExpect = pSession->hook.xCount(pSession->hook.pCtx);
++  if( (pTab->nCol-pTab->bRowid)nCol-pTab->bRowid)!=nExpect ){
+     pSession->rc = SQLITE_SCHEMA;
+     return;
+   }
+@@ -213997,14 +224889,16 @@ static void sessionPreupdateOneChange(
+   /* Calculate the hash-key for this change. If the primary key of the row
+   ** includes a NULL value, exit early. Such changes are ignored by the
+   ** session module. */
+-  rc = sessionPreupdateHash(pSession, pTab, op==SQLITE_INSERT, &iHash, &bNull);
++  rc = sessionPreupdateHash(
++      pSession, iRowid, pTab, op==SQLITE_INSERT, &iHash, &bNull
++  );
+   if( rc!=SQLITE_OK ) goto error_out;
+ 
+   if( bNull==0 ){
+     /* Search the hash table for an existing record for this row. */
+     SessionChange *pC;
+     for(pC=pTab->apChange[iHash]; pC; pC=pC->pNext){
+-      if( sessionPreupdateEqual(pSession, pTab, pC, op) ) break;
++      if( sessionPreupdateEqual(pSession, iRowid, pTab, pC, op) ) break;
+     }
+ 
+     if( pC==0 ){
+@@ -214019,7 +224913,7 @@ static void sessionPreupdateOneChange(
+ 
+       /* Figure out how large an allocation is required */
+       nByte = sizeof(SessionChange);
+-      for(i=0; inCol; i++){
++      for(i=0; i<(pTab->nCol-pTab->bRowid); i++){
+         sqlite3_value *p = 0;
+         if( op!=SQLITE_INSERT ){
+           TESTONLY(int trc = ) pSession->hook.xOld(pSession->hook.pCtx, i, &p);
+@@ -214034,9 +224928,12 @@ static void sessionPreupdateOneChange(
+         rc = sessionSerializeValue(0, p, &nByte);
+         if( rc!=SQLITE_OK ) goto error_out;
+       }
++      if( pTab->bRowid ){
++        nByte += 9;               /* Size of rowid field - an integer */
++      }
+ 
+       /* Allocate the change object */
+-      pC = (SessionChange *)sessionMalloc64(pSession, nByte);
++      pC = (SessionChange*)sessionMalloc64(pSession, nByte);
+       if( !pC ){
+         rc = SQLITE_NOMEM;
+         goto error_out;
+@@ -214050,7 +224947,12 @@ static void sessionPreupdateOneChange(
+       ** required values and encodings have already been cached in memory.
+       ** It is not possible for an OOM to occur in this block. */
+       nByte = 0;
+-      for(i=0; inCol; i++){
++      if( pTab->bRowid ){
++        pC->aRecord[0] = SQLITE_INTEGER;
++        sessionPutI64(&pC->aRecord[1], iRowid);
++        nByte = 9;
++      }
++      for(i=0; i<(pTab->nCol-pTab->bRowid); i++){
+         sqlite3_value *p = 0;
+         if( op!=SQLITE_INSERT ){
+           pSession->hook.xOld(pSession->hook.pCtx, i, &p);
+@@ -214064,6 +224966,7 @@ static void sessionPreupdateOneChange(
+       if( pSession->bIndirect || pSession->hook.xDepth(pSession->hook.pCtx) ){
+         pC->bIndirect = 1;
+       }
++      pC->nRecordField = pTab->nCol;
+       pC->nRecord = nByte;
+       pC->op = op;
+       pC->pNext = pTab->apChange[iHash];
+@@ -214149,6 +225052,8 @@ static void xPreUpdate(
+   int nDb = sqlite3Strlen30(zDb);
+ 
+   assert( sqlite3_mutex_held(db->mutex) );
++  (void)iKey1;
++  (void)iKey2;
+ 
+   for(pSession=(sqlite3_session *)pCtx; pSession; pSession=pSession->pNext){
+     SessionTable *pTab;
+@@ -214163,9 +225068,10 @@ static void xPreUpdate(
+     pSession->rc = sessionFindTable(pSession, zName, &pTab);
+     if( pTab ){
+       assert( pSession->rc==SQLITE_OK );
+-      sessionPreupdateOneChange(op, pSession, pTab);
++      assert( op==SQLITE_UPDATE || iKey1==iKey2 );
++      sessionPreupdateOneChange(op, iKey1, pSession, pTab);
+       if( op==SQLITE_UPDATE ){
+-        sessionPreupdateOneChange(SQLITE_INSERT, pSession, pTab);
++        sessionPreupdateOneChange(SQLITE_INSERT, iKey2, pSession, pTab);
+       }
+     }
+   }
+@@ -214204,6 +225110,7 @@ static void sessionPreupdateHooks(
+ typedef struct SessionDiffCtx SessionDiffCtx;
+ struct SessionDiffCtx {
+   sqlite3_stmt *pStmt;
++  int bRowid;
+   int nOldOff;
+ };
+ 
+@@ -214212,19 +225119,20 @@ struct SessionDiffCtx {
+ */
+ static int sessionDiffOld(void *pCtx, int iVal, sqlite3_value **ppVal){
+   SessionDiffCtx *p = (SessionDiffCtx*)pCtx;
+-  *ppVal = sqlite3_column_value(p->pStmt, iVal+p->nOldOff);
++  *ppVal = sqlite3_column_value(p->pStmt, iVal+p->nOldOff+p->bRowid);
+   return SQLITE_OK;
+ }
+ static int sessionDiffNew(void *pCtx, int iVal, sqlite3_value **ppVal){
+   SessionDiffCtx *p = (SessionDiffCtx*)pCtx;
+-  *ppVal = sqlite3_column_value(p->pStmt, iVal);
++  *ppVal = sqlite3_column_value(p->pStmt, iVal+p->bRowid);
+    return SQLITE_OK;
+ }
+ static int sessionDiffCount(void *pCtx){
+   SessionDiffCtx *p = (SessionDiffCtx*)pCtx;
+-  return p->nOldOff ? p->nOldOff : sqlite3_column_count(p->pStmt);
++  return (p->nOldOff ? p->nOldOff : sqlite3_column_count(p->pStmt)) - p->bRowid;
+ }
+ static int sessionDiffDepth(void *pCtx){
++  (void)pCtx;
+   return 0;
+ }
+ 
+@@ -214298,17 +225206,18 @@ static char *sessionExprCompareOther(
+ }
+ 
+ static char *sessionSelectFindNew(
+-  int nCol,
+   const char *zDb1,      /* Pick rows in this db only */
+   const char *zDb2,      /* But not in this one */
++  int bRowid,
+   const char *zTbl,      /* Table name */
+   const char *zExpr
+ ){
++  const char *zSel = (bRowid ? SESSIONS_ROWID ", *" : "*");
+   char *zRet = sqlite3_mprintf(
+-      "SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS ("
++      "SELECT %s FROM \"%w\".\"%w\" WHERE NOT EXISTS ("
+       "  SELECT 1 FROM \"%w\".\"%w\" WHERE %s"
+       ")",
+-      zDb1, zTbl, zDb2, zTbl, zExpr
++      zSel, zDb1, zTbl, zDb2, zTbl, zExpr
+   );
+   return zRet;
+ }
+@@ -214322,7 +225231,9 @@ static int sessionDiffFindNew(
+   char *zExpr
+ ){
+   int rc = SQLITE_OK;
+-  char *zStmt = sessionSelectFindNew(pTab->nCol, zDb1, zDb2, pTab->zName,zExpr);
++  char *zStmt = sessionSelectFindNew(
++      zDb1, zDb2, pTab->bRowid, pTab->zName, zExpr
++  );
+ 
+   if( zStmt==0 ){
+     rc = SQLITE_NOMEM;
+@@ -214333,8 +225244,10 @@ static int sessionDiffFindNew(
+       SessionDiffCtx *pDiffCtx = (SessionDiffCtx*)pSession->hook.pCtx;
+       pDiffCtx->pStmt = pStmt;
+       pDiffCtx->nOldOff = 0;
++      pDiffCtx->bRowid = pTab->bRowid;
+       while( SQLITE_ROW==sqlite3_step(pStmt) ){
+-        sessionPreupdateOneChange(op, pSession, pTab);
++        i64 iRowid = (pTab->bRowid ? sqlite3_column_int64(pStmt, 0) : 0);
++        sessionPreupdateOneChange(op, iRowid, pSession, pTab);
+       }
+       rc = sqlite3_finalize(pStmt);
+     }
+@@ -214344,6 +225257,27 @@ static int sessionDiffFindNew(
+   return rc;
+ }
+ 
++/*
++** Return a comma-separated list of the fully-qualified (with both database
++** and table name) column names from table pTab. e.g.
++**
++**    "main"."t1"."a", "main"."t1"."b", "main"."t1"."c"
++*/
++static char *sessionAllCols(
++  const char *zDb,
++  SessionTable *pTab
++){
++  int ii;
++  char *zRet = 0;
++  for(ii=0; iinCol; ii++){
++    zRet = sqlite3_mprintf("%z%s\"%w\".\"%w\".\"%w\"",
++        zRet, (zRet ? ", " : ""), zDb, pTab->zName, pTab->azCol[ii]
++    );
++    if( !zRet ) break;
++  }
++  return zRet;
++}
++
+ static int sessionDiffFindModified(
+   sqlite3_session *pSession,
+   SessionTable *pTab,
+@@ -214358,11 +225292,13 @@ static int sessionDiffFindModified(
+   if( zExpr2==0 ){
+     rc = SQLITE_NOMEM;
+   }else{
++    char *z1 = sessionAllCols(pSession->zDb, pTab);
++    char *z2 = sessionAllCols(zFrom, pTab);
+     char *zStmt = sqlite3_mprintf(
+-        "SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)",
+-        pSession->zDb, pTab->zName, zFrom, pTab->zName, zExpr, zExpr2
++        "SELECT %s,%s FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)",
++        z1, z2, pSession->zDb, pTab->zName, zFrom, pTab->zName, zExpr, zExpr2
+     );
+-    if( zStmt==0 ){
++    if( zStmt==0 || z1==0 || z2==0 ){
+       rc = SQLITE_NOMEM;
+     }else{
+       sqlite3_stmt *pStmt;
+@@ -214373,12 +225309,15 @@ static int sessionDiffFindModified(
+         pDiffCtx->pStmt = pStmt;
+         pDiffCtx->nOldOff = pTab->nCol;
+         while( SQLITE_ROW==sqlite3_step(pStmt) ){
+-          sessionPreupdateOneChange(SQLITE_UPDATE, pSession, pTab);
++          i64 iRowid = (pTab->bRowid ? sqlite3_column_int64(pStmt, 0) : 0);
++          sessionPreupdateOneChange(SQLITE_UPDATE, iRowid, pSession, pTab);
+         }
+         rc = sqlite3_finalize(pStmt);
+       }
+-      sqlite3_free(zStmt);
+     }
++    sqlite3_free(zStmt);
++    sqlite3_free(z1);
++    sqlite3_free(z2);
+   }
+ 
+   return rc;
+@@ -214407,7 +225346,7 @@ SQLITE_API int sqlite3session_diff(
+     /* Locate and if necessary initialize the target table object */
+     rc = sessionFindTable(pSession, zTbl, &pTo);
+     if( pTo==0 ) goto diff_out;
+-    if( sessionInitTable(pSession, pTo) ){
++    if( sessionInitTable(pSession, pTo, pSession->db, pSession->zDb) ){
+       rc = pSession->rc;
+       goto diff_out;
+     }
+@@ -214417,9 +225356,12 @@ SQLITE_API int sqlite3session_diff(
+       int bHasPk = 0;
+       int bMismatch = 0;
+       int nCol;                   /* Columns in zFrom.zTbl */
++      int bRowid = 0;
+       u8 *abPK;
+       const char **azCol = 0;
+-      rc = sessionTableInfo(0, db, zFrom, zTbl, &nCol, 0, &azCol, &abPK);
++      rc = sessionTableInfo(0, db, zFrom, zTbl, &nCol, 0, &azCol, 0, &abPK,
++          pSession->bImplicitPK ? &bRowid : 0
++      );
+       if( rc==SQLITE_OK ){
+         if( pTo->nCol!=nCol ){
+           bMismatch = 1;
+@@ -214532,6 +225474,7 @@ static void sessionDeleteTable(sqlite3_session *pSession, SessionTable *pList){
+         sessionFree(pSession, p);
+       }
+     }
++    sqlite3_finalize(pTab->pDfltStmt);
+     sessionFree(pSession, (char*)pTab->azCol);  /* cast works around VC++ bug */
+     sessionFree(pSession, pTab->apChange);
+     sessionFree(pSession, pTab);
+@@ -214564,9 +225507,7 @@ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession){
+   ** associated hash-tables. */
+   sessionDeleteTable(pSession, pSession->pTable);
+ 
+-  /* Assert that all allocations have been freed and then free the
+-  ** session object itself. */
+-  assert( pSession->nMalloc==0 );
++  /* Free the session object. */
+   sqlite3_free(pSession);
+ }
+ 
+@@ -214637,48 +225578,6 @@ SQLITE_API int sqlite3session_attach(
+   return rc;
+ }
+ 
+-/*
+-** Ensure that there is room in the buffer to append nByte bytes of data.
+-** If not, use sqlite3_realloc() to grow the buffer so that there is.
+-**
+-** If successful, return zero. Otherwise, if an OOM condition is encountered,
+-** set *pRc to SQLITE_NOMEM and return non-zero.
+-*/
+-static int sessionBufferGrow(SessionBuffer *p, i64 nByte, int *pRc){
+-#define SESSION_MAX_BUFFER_SZ (0x7FFFFF00 - 1)
+-  i64 nReq = p->nBuf + nByte;
+-  if( *pRc==SQLITE_OK && nReq>p->nAlloc ){
+-    u8 *aNew;
+-    i64 nNew = p->nAlloc ? p->nAlloc : 128;
+-
+-    do {
+-      nNew = nNew*2;
+-    }while( nNewSESSION_MAX_BUFFER_SZ ){
+-      nNew = SESSION_MAX_BUFFER_SZ;
+-      if( nNewaBuf, nNew);
+-    if( 0==aNew ){
+-      *pRc = SQLITE_NOMEM;
+-    }else{
+-      p->aBuf = aNew;
+-      p->nAlloc = nNew;
+-    }
+-  }
+-  return (*pRc!=SQLITE_OK);
+-}
+-
+ /*
+ ** Append the value passed as the second argument to the buffer passed
+ ** as the first.
+@@ -214747,26 +225646,6 @@ static void sessionAppendBlob(
+   }
+ }
+ 
+-/*
+-** This function is a no-op if *pRc is other than SQLITE_OK when it is
+-** called. Otherwise, append a string to the buffer. All bytes in the string
+-** up to (but not including) the nul-terminator are written to the buffer.
+-**
+-** If an OOM condition is encountered, set *pRc to SQLITE_NOMEM before
+-** returning.
+-*/
+-static void sessionAppendStr(
+-  SessionBuffer *p,
+-  const char *zStr,
+-  int *pRc
+-){
+-  int nStr = sqlite3Strlen30(zStr);
+-  if( 0==sessionBufferGrow(p, nStr, pRc) ){
+-    memcpy(&p->aBuf[p->nBuf], zStr, nStr);
+-    p->nBuf += nStr;
+-  }
+-}
+-
+ /*
+ ** This function is a no-op if *pRc is other than SQLITE_OK when it is
+ ** called. Otherwise, append the string representation of integer iVal
+@@ -214799,7 +225678,7 @@ static void sessionAppendIdent(
+   const char *zStr,               /* String to quote, escape and append */
+   int *pRc                        /* IN/OUT: Error code */
+ ){
+-  int nStr = sqlite3Strlen30(zStr)*2 + 2 + 1;
++  int nStr = sqlite3Strlen30(zStr)*2 + 2 + 2;
+   if( 0==sessionBufferGrow(p, nStr, pRc) ){
+     char *zOut = (char *)&p->aBuf[p->nBuf];
+     const char *zIn = zStr;
+@@ -214810,6 +225689,7 @@ static void sessionAppendIdent(
+     }
+     *zOut++ = '"';
+     p->nBuf = (int)((u8 *)zOut - p->aBuf);
++    p->aBuf[p->nBuf] = 0x00;
+   }
+ }
+ 
+@@ -214945,7 +225825,7 @@ static int sessionAppendUpdate(
+     /* If at least one field has been modified, this is not a no-op. */
+     if( bChanged ) bNoop = 0;
+ 
+-    /* Add a field to the old.* record. This is omitted if this modules is
++    /* Add a field to the old.* record. This is omitted if this module is
+     ** currently generating a patchset. */
+     if( bPatchset==0 ){
+       if( bChanged || abPK[i] ){
+@@ -215034,12 +225914,20 @@ static int sessionAppendDelete(
+ ** Formulate and prepare a SELECT statement to retrieve a row from table
+ ** zTab in database zDb based on its primary key. i.e.
+ **
+-**   SELECT * FROM zDb.zTab WHERE pk1 = ? AND pk2 = ? AND ...
++**   SELECT *,  FROM zDb.zTab WHERE (pk1, pk2,...) IS (?1, ?2,...)
++**
++** where  is:
++**
++**   1 AND (?A OR ?1 IS ) AND ...
++**
++** for each non-pk .
+ */
+ static int sessionSelectStmt(
+   sqlite3 *db,                    /* Database handle */
++  int bIgnoreNoop,
+   const char *zDb,                /* Database name */
+   const char *zTab,               /* Table name */
++  int bRowid,
+   int nCol,                       /* Number of columns in table */
+   const char **azCol,             /* Names of table columns */
+   u8 *abPK,                       /* PRIMARY KEY  array */
+@@ -215047,8 +225935,50 @@ static int sessionSelectStmt(
+ ){
+   int rc = SQLITE_OK;
+   char *zSql = 0;
++  const char *zSep = "";
++  const char *zCols = bRowid ? SESSIONS_ROWID ", *" : "*";
+   int nSql = -1;
++  int i;
++
++  SessionBuffer nooptest = {0, 0, 0};
++  SessionBuffer pkfield = {0, 0, 0};
++  SessionBuffer pkvar = {0, 0, 0};
++
++  sessionAppendStr(&nooptest, ", 1", &rc);
++
++  if( 0==sqlite3_stricmp("sqlite_stat1", zTab) ){
++    sessionAppendStr(&nooptest, " AND (?6 OR ?3 IS stat)", &rc);
++    sessionAppendStr(&pkfield, "tbl, idx", &rc);
++    sessionAppendStr(&pkvar,
++        "?1, (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)", &rc
++    );
++    zCols = "tbl, ?2, stat";
++  }else{
++    for(i=0; ipTable; rc==SQLITE_OK && pTab; pTab=pTab->pNext){
+     if( pTab->nEntry ){
+       const char *zName = pTab->zName;
+-      int nCol = 0;               /* Number of columns in table */
+-      u8 *abPK = 0;               /* Primary key array */
+-      const char **azCol = 0;     /* Table columns */
+       int i;                      /* Used to iterate through hash buckets */
+       sqlite3_stmt *pSel = 0;     /* SELECT statement to query table pTab */
+       int nRewind = buf.nBuf;     /* Initial size of write buffer */
+       int nNoop;                  /* Size of buffer after writing tbl header */
++      int nOldCol = pTab->nCol;
+ 
+       /* Check the table schema is still Ok. */
+-      rc = sessionTableInfo(0, db, pSession->zDb, zName, &nCol, 0,&azCol,&abPK);
+-      if( !rc && (pTab->nCol!=nCol || memcmp(abPK, pTab->abPK, nCol)) ){
+-        rc = SQLITE_SCHEMA;
++      rc = sessionReinitTable(pSession, pTab);
++      if( rc==SQLITE_OK && pTab->nCol!=nOldCol ){
++        rc = sessionUpdateChanges(pSession, pTab);
+       }
+ 
+       /* Write a table header */
+@@ -215240,8 +226171,9 @@ static int sessionGenerateChangeset(
+ 
+       /* Build and compile a statement to execute: */
+       if( rc==SQLITE_OK ){
+-        rc = sessionSelectStmt(
+-            db, pSession->zDb, zName, nCol, azCol, abPK, &pSel);
++        rc = sessionSelectStmt(db, 0, pSession->zDb,
++            zName, pTab->bRowid, pTab->nCol, pTab->azCol, pTab->abPK, &pSel
++        );
+       }
+ 
+       nNoop = buf.nBuf;
+@@ -215249,22 +226181,22 @@ static int sessionGenerateChangeset(
+         SessionChange *p;         /* Used to iterate through changes */
+ 
+         for(p=pTab->apChange[i]; rc==SQLITE_OK && p; p=p->pNext){
+-          rc = sessionSelectBind(pSel, nCol, abPK, p);
++          rc = sessionSelectBind(pSel, pTab->nCol, pTab->abPK, p);
+           if( rc!=SQLITE_OK ) continue;
+           if( sqlite3_step(pSel)==SQLITE_ROW ){
+             if( p->op==SQLITE_INSERT ){
+               int iCol;
+               sessionAppendByte(&buf, SQLITE_INSERT, &rc);
+               sessionAppendByte(&buf, p->bIndirect, &rc);
+-              for(iCol=0; iColnCol; iCol++){
+                 sessionAppendCol(&buf, pSel, iCol, &rc);
+               }
+             }else{
+-              assert( abPK!=0 );  /* Because sessionSelectStmt() returned ok */
+-              rc = sessionAppendUpdate(&buf, bPatchset, pSel, p, abPK);
++              assert( pTab->abPK!=0 );
++              rc = sessionAppendUpdate(&buf, bPatchset, pSel, p, pTab->abPK);
+             }
+           }else if( p->op!=SQLITE_INSERT ){
+-            rc = sessionAppendDelete(&buf, bPatchset, p, nCol, abPK);
++            rc = sessionAppendDelete(&buf, bPatchset, p, pTab->nCol,pTab->abPK);
+           }
+           if( rc==SQLITE_OK ){
+             rc = sqlite3_reset(pSel);
+@@ -215289,7 +226221,6 @@ static int sessionGenerateChangeset(
+       if( buf.nBuf==nNoop ){
+         buf.nBuf = nRewind;
+       }
+-      sqlite3_free((char*)azCol);  /* cast works around VC++ bug */
+     }
+   }
+ 
+@@ -215324,7 +226255,7 @@ SQLITE_API int sqlite3session_changeset(
+   int rc;
+ 
+   if( pnChangeset==0 || ppChangeset==0 ) return SQLITE_MISUSE;
+-  rc = sessionGenerateChangeset(pSession, 0, 0, 0, pnChangeset,ppChangeset);
++  rc = sessionGenerateChangeset(pSession, 0, 0, 0, pnChangeset, ppChangeset);
+   assert( rc || pnChangeset==0
+        || pSession->bEnableSize==0 || *pnChangeset<=pSession->nMaxChangesetSize
+   );
+@@ -215442,6 +226373,19 @@ SQLITE_API int sqlite3session_object_config(sqlite3_session *pSession, int op, v
+       break;
+     }
+ 
++    case SQLITE_SESSION_OBJCONFIG_ROWID: {
++      int iArg = *(int*)pArg;
++      if( iArg>=0 ){
++        if( pSession->pTable ){
++          rc = SQLITE_MISUSE;
++        }else{
++          pSession->bImplicitPK = (iArg!=0);
++        }
++      }
++      *(int*)pArg = pSession->bImplicitPK;
++      break;
++    }
++
+     default:
+       rc = SQLITE_MISUSE;
+   }
+@@ -215700,15 +226644,19 @@ static int sessionReadRecord(
+         }
+       }
+       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
+-        sqlite3_int64 v = sessionGetI64(aVal);
+-        if( eType==SQLITE_INTEGER ){
+-          sqlite3VdbeMemSetInt64(apOut[i], v);
++        if( (pIn->nData-pIn->iNext)<8 ){
++          rc = SQLITE_CORRUPT_BKPT;
+         }else{
+-          double d;
+-          memcpy(&d, &v, 8);
+-          sqlite3VdbeMemSetDouble(apOut[i], d);
++          sqlite3_int64 v = sessionGetI64(aVal);
++          if( eType==SQLITE_INTEGER ){
++            sqlite3VdbeMemSetInt64(apOut[i], v);
++          }else{
++            double d;
++            memcpy(&d, &v, 8);
++            sqlite3VdbeMemSetDouble(apOut[i], d);
++          }
++          pIn->iNext += 8;
+         }
+-        pIn->iNext += 8;
+       }
+     }
+   }
+@@ -215977,6 +226925,22 @@ static int sessionChangesetNextOne(
+       if( p->op==SQLITE_INSERT ) p->op = SQLITE_DELETE;
+       else if( p->op==SQLITE_DELETE ) p->op = SQLITE_INSERT;
+     }
++
++    /* If this is an UPDATE that is part of a changeset, then check that
++    ** there are no fields in the old.* record that are not (a) PK fields,
++    ** or (b) also present in the new.* record.
++    **
++    ** Such records are technically corrupt, but the rebaser was at one
++    ** point generating them. Under most circumstances this is benign, but
++    ** can cause spurious SQLITE_RANGE errors when applying the changeset. */
++    if( p->bPatchset==0 && p->op==SQLITE_UPDATE){
++      for(i=0; inCol; i++){
++        if( p->abPK[i]==0 && p->apValue[i+p->nCol]==0 ){
++          sqlite3ValueFree(p->apValue[i]);
++          p->apValue[i] = 0;
++        }
++      }
++    }
+   }
+ 
+   return SQLITE_ROW;
+@@ -216414,6 +227378,8 @@ struct SessionApplyCtx {
+   SessionBuffer rebase;           /* Rebase information (if any) here */
+   u8 bRebaseStarted;              /* If table header is already in rebase */
+   u8 bRebase;                     /* True to collect rebase information */
++  u8 bIgnoreNoop;                 /* True to ignore no-op conflicts */
++  int bRowid;
+ };
+ 
+ /* Number of prepared UPDATE statements to cache. */
+@@ -216664,8 +227630,10 @@ static int sessionSelectRow(
+   const char *zTab,               /* Table name */
+   SessionApplyCtx *p              /* Session changeset-apply context */
+ ){
+-  return sessionSelectStmt(
+-      db, "main", zTab, p->nCol, p->azCol, p->abPK, &p->pSelect);
++  /* TODO */
++  return sessionSelectStmt(db, p->bIgnoreNoop,
++      "main", zTab, p->bRowid, p->nCol, p->azCol, p->abPK, &p->pSelect
++  );
+ }
+ 
+ /*
+@@ -216823,22 +227791,34 @@ static int sessionBindRow(
+ ** UPDATE, bind values from the old.* record.
+ */
+ static int sessionSeekToRow(
+-  sqlite3 *db,                    /* Database handle */
+   sqlite3_changeset_iter *pIter,  /* Changeset iterator */
+-  u8 *abPK,                       /* Primary key flags array */
+-  sqlite3_stmt *pSelect           /* SELECT statement from sessionSelectRow() */
++  SessionApplyCtx *p
+ ){
++  sqlite3_stmt *pSelect = p->pSelect;
+   int rc;                         /* Return code */
+   int nCol;                       /* Number of columns in table */
+   int op;                         /* Changset operation (SQLITE_UPDATE etc.) */
+   const char *zDummy;             /* Unused */
+ 
++  sqlite3_clear_bindings(pSelect);
+   sqlite3changeset_op(pIter, &zDummy, &nCol, &op, 0);
+   rc = sessionBindRow(pIter,
+       op==SQLITE_INSERT ? sqlite3changeset_new : sqlite3changeset_old,
+-      nCol, abPK, pSelect
++      nCol, p->abPK, pSelect
+   );
+ 
++  if( op!=SQLITE_DELETE && p->bIgnoreNoop ){
++    int ii;
++    for(ii=0; rc==SQLITE_OK && iiabPK[ii]==0 ){
++        sqlite3_value *pVal = 0;
++        sqlite3changeset_new(pIter, ii, &pVal);
++        sqlite3_bind_int(pSelect, ii+1+nCol, (pVal==0));
++        if( pVal ) rc = sessionBindValue(pSelect, ii+1, pVal);
++      }
++    }
++  }
++
+   if( rc==SQLITE_OK ){
+     rc = sqlite3_step(pSelect);
+     if( rc!=SQLITE_ROW ) rc = sqlite3_reset(pSelect);
+@@ -216953,16 +227933,22 @@ static int sessionConflictHandler(
+ 
+   /* Bind the new.* PRIMARY KEY values to the SELECT statement. */
+   if( pbReplace ){
+-    rc = sessionSeekToRow(p->db, pIter, p->abPK, p->pSelect);
++    rc = sessionSeekToRow(pIter, p);
+   }else{
+     rc = SQLITE_OK;
+   }
+ 
+   if( rc==SQLITE_ROW ){
+     /* There exists another row with the new.* primary key. */
+-    pIter->pConflict = p->pSelect;
+-    res = xConflict(pCtx, eType, pIter);
+-    pIter->pConflict = 0;
++    if( p->bIgnoreNoop
++     && sqlite3_column_int(p->pSelect, sqlite3_column_count(p->pSelect)-1)
++    ){
++      res = SQLITE_CHANGESET_OMIT;
++    }else{
++      pIter->pConflict = p->pSelect;
++      res = xConflict(pCtx, eType, pIter);
++      pIter->pConflict = 0;
++    }
+     rc = sqlite3_reset(p->pSelect);
+   }else if( rc==SQLITE_OK ){
+     if( p->bDeferConstraints && eType==SQLITE_CHANGESET_CONFLICT ){
+@@ -217070,7 +228056,7 @@ static int sessionApplyOneOp(
+ 
+     sqlite3_step(p->pDelete);
+     rc = sqlite3_reset(p->pDelete);
+-    if( rc==SQLITE_OK && sqlite3_changes(p->db)==0 ){
++    if( rc==SQLITE_OK && sqlite3_changes(p->db)==0 && p->bIgnoreNoop==0 ){
+       rc = sessionConflictHandler(
+           SQLITE_CHANGESET_DATA, p, pIter, xConflict, pCtx, pbRetry
+       );
+@@ -217127,7 +228113,7 @@ static int sessionApplyOneOp(
+       /* Check if there is a conflicting row. For sqlite_stat1, this needs
+       ** to be done using a SELECT, as there is no PRIMARY KEY in the
+       ** database schema to throw an exception if a duplicate is inserted.  */
+-      rc = sessionSeekToRow(p->db, pIter, p->abPK, p->pSelect);
++      rc = sessionSeekToRow(pIter, p);
+       if( rc==SQLITE_ROW ){
+         rc = SQLITE_CONSTRAINT;
+         sqlite3_reset(p->pSelect);
+@@ -217304,6 +228290,7 @@ static int sessionChangesetApply(
+   memset(&sApply, 0, sizeof(sApply));
+   sApply.bRebase = (ppRebase && pnRebase);
+   sApply.bInvertConstraints = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
++  sApply.bIgnoreNoop = !!(flags & SQLITE_CHANGESETAPPLY_IGNORENOOP);
+   sqlite3_mutex_enter(sqlite3_db_mutex(db));
+   if( (flags & SQLITE_CHANGESETAPPLY_NOSAVEPOINT)==0 ){
+     rc = sqlite3_exec(db, "SAVEPOINT changeset_apply", 0, 0, 0);
+@@ -217341,6 +228328,7 @@ static int sessionChangesetApply(
+       sApply.bStat1 = 0;
+       sApply.bDeferConstraints = 1;
+       sApply.bRebaseStarted = 0;
++      sApply.bRowid = 0;
+       memset(&sApply.constraints, 0, sizeof(SessionBuffer));
+ 
+       /* If an xFilter() callback was specified, invoke it now. If the
+@@ -217360,8 +228348,8 @@ static int sessionChangesetApply(
+         int i;
+ 
+         sqlite3changeset_pk(pIter, &abPK, 0);
+-        rc = sessionTableInfo(0,
+-            db, "main", zNew, &sApply.nCol, &zTab, &sApply.azCol, &sApply.abPK
++        rc = sessionTableInfo(0, db, "main", zNew,
++            &sApply.nCol, &zTab, &sApply.azCol, 0, &sApply.abPK, &sApply.bRowid
+         );
+         if( rc!=SQLITE_OK ) break;
+         for(i=0; iflags & SQLITE_FkNoAction;
++
++  if( flags & SQLITE_CHANGESETAPPLY_FKNOACTION ){
++    db->flags |= ((u64)SQLITE_FkNoAction);
++    db->aDb[0].pSchema->schema_cookie -= 32;
++  }
++
+   if( rc==SQLITE_OK ){
+     rc = sessionChangesetApply(
+         db, pIter, xFilter, xConflict, pCtx, ppRebase, pnRebase, flags
+     );
+   }
++
++  if( (flags & SQLITE_CHANGESETAPPLY_FKNOACTION) && savedFlag==0 ){
++    assert( db->flags & SQLITE_FkNoAction );
++    db->flags &= ~((u64)SQLITE_FkNoAction);
++    db->aDb[0].pSchema->schema_cookie -= 32;
++  }
+   return rc;
+ }
+ 
+@@ -217585,6 +228586,9 @@ struct sqlite3_changegroup {
+   int rc;                         /* Error code */
+   int bPatch;                     /* True to accumulate patchsets */
+   SessionTable *pList;            /* List of tables in current patch */
++
++  sqlite3 *db;                    /* Configured by changegroup_schema() */
++  char *zDb;                      /* Configured by changegroup_schema() */
+ };
+ 
+ /*
+@@ -217605,6 +228609,7 @@ static int sessionChangeMerge(
+ ){
+   SessionChange *pNew = 0;
+   int rc = SQLITE_OK;
++  assert( aRec!=0 );
+ 
+   if( !pExist ){
+     pNew = (SessionChange *)sqlite3_malloc64(sizeof(SessionChange) + nRec);
+@@ -217770,6 +228775,114 @@ static int sessionChangeMerge(
+   return rc;
+ }
+ 
++/*
++** Check if a changeset entry with nCol columns and the PK array passed
++** as the final argument to this function is compatible with SessionTable
++** pTab. If so, return 1. Otherwise, if they are incompatible in some way,
++** return 0.
++*/
++static int sessionChangesetCheckCompat(
++  SessionTable *pTab,
++  int nCol,
++  u8 *abPK
++){
++  if( pTab->azCol && nColnCol ){
++    int ii;
++    for(ii=0; iinCol; ii++){
++      u8 bPK = (ii < nCol) ? abPK[ii] : 0;
++      if( pTab->abPK[ii]!=bPK ) return 0;
++    }
++    return 1;
++  }
++  return (pTab->nCol==nCol && 0==memcmp(abPK, pTab->abPK, nCol));
++}
++
++static int sessionChangesetExtendRecord(
++  sqlite3_changegroup *pGrp,
++  SessionTable *pTab,
++  int nCol,
++  int op,
++  const u8 *aRec,
++  int nRec,
++  SessionBuffer *pOut
++){
++  int rc = SQLITE_OK;
++  int ii = 0;
++
++  assert( pTab->azCol );
++  assert( nColnCol );
++
++  pOut->nBuf = 0;
++  if( op==SQLITE_INSERT || (op==SQLITE_DELETE && pGrp->bPatch==0) ){
++    /* Append the missing default column values to the record. */
++    sessionAppendBlob(pOut, aRec, nRec, &rc);
++    if( rc==SQLITE_OK && pTab->pDfltStmt==0 ){
++      rc = sessionPrepareDfltStmt(pGrp->db, pTab, &pTab->pDfltStmt);
++    }
++    for(ii=nCol; rc==SQLITE_OK && iinCol; ii++){
++      int eType = sqlite3_column_type(pTab->pDfltStmt, ii);
++      sessionAppendByte(pOut, eType, &rc);
++      switch( eType ){
++        case SQLITE_FLOAT:
++        case SQLITE_INTEGER: {
++          i64 iVal;
++          if( eType==SQLITE_INTEGER ){
++            iVal = sqlite3_column_int64(pTab->pDfltStmt, ii);
++          }else{
++            double rVal = sqlite3_column_int64(pTab->pDfltStmt, ii);
++            memcpy(&iVal, &rVal, sizeof(i64));
++          }
++          if( SQLITE_OK==sessionBufferGrow(pOut, 8, &rc) ){
++            sessionPutI64(&pOut->aBuf[pOut->nBuf], iVal);
++          }
++          break;
++        }
++
++        case SQLITE_BLOB:
++        case SQLITE_TEXT: {
++          int n = sqlite3_column_bytes(pTab->pDfltStmt, ii);
++          sessionAppendVarint(pOut, n, &rc);
++          if( eType==SQLITE_TEXT ){
++            const u8 *z = (const u8*)sqlite3_column_text(pTab->pDfltStmt, ii);
++            sessionAppendBlob(pOut, z, n, &rc);
++          }else{
++            const u8 *z = (const u8*)sqlite3_column_blob(pTab->pDfltStmt, ii);
++            sessionAppendBlob(pOut, z, n, &rc);
++          }
++          break;
++        }
++
++        default:
++          assert( eType==SQLITE_NULL );
++          break;
++      }
++    }
++  }else if( op==SQLITE_UPDATE ){
++    /* Append missing "undefined" entries to the old.* record. And, if this
++    ** is an UPDATE, to the new.* record as well.  */
++    int iOff = 0;
++    if( pGrp->bPatch==0 ){
++      for(ii=0; iinCol-nCol); ii++){
++        sessionAppendByte(pOut, 0x00, &rc);
++      }
++    }
++
++    sessionAppendBlob(pOut, &aRec[iOff], nRec-iOff, &rc);
++    for(ii=0; ii<(pTab->nCol-nCol); ii++){
++      sessionAppendByte(pOut, 0x00, &rc);
++    }
++  }else{
++    assert( op==SQLITE_DELETE && pGrp->bPatch );
++    sessionAppendBlob(pOut, aRec, nRec, &rc);
++  }
++
++  return rc;
++}
++
+ /*
+ ** Add all changes in the changeset traversed by the iterator passed as
+ ** the first argument to the changegroup hash tables.
+@@ -217783,6 +228896,7 @@ static int sessionChangesetToHash(
+   int nRec;
+   int rc = SQLITE_OK;
+   SessionTable *pTab = 0;
++  SessionBuffer rec = {0, 0, 0};
+ 
+   while( SQLITE_ROW==sessionChangesetNext(pIter, &aRec, &nRec, 0) ){
+     const char *zNew;
+@@ -217794,6 +228908,9 @@ static int sessionChangesetToHash(
+     SessionChange *pExist = 0;
+     SessionChange **pp;
+ 
++    /* Ensure that only changesets, or only patchsets, but not a mixture
++    ** of both, are being combined. It is an error to try to combine a
++    ** changeset and a patchset.  */
+     if( pGrp->pList==0 ){
+       pGrp->bPatch = pIter->bPatchset;
+     }else if( pIter->bPatchset!=pGrp->bPatch ){
+@@ -217826,18 +228943,38 @@ static int sessionChangesetToHash(
+         pTab->zName = (char*)&pTab->abPK[nCol];
+         memcpy(pTab->zName, zNew, nNew+1);
+ 
++        if( pGrp->db ){
++          pTab->nCol = 0;
++          rc = sessionInitTable(0, pTab, pGrp->db, pGrp->zDb);
++          if( rc ){
++            assert( pTab->azCol==0 );
++            sqlite3_free(pTab);
++            break;
++          }
++        }
++
+         /* The new object must be linked on to the end of the list, not
+         ** simply added to the start of it. This is to ensure that the
+         ** tables within the output of sqlite3changegroup_output() are in
+         ** the right order.  */
+         for(ppTab=&pGrp->pList; *ppTab; ppTab=&(*ppTab)->pNext);
+         *ppTab = pTab;
+-      }else if( pTab->nCol!=nCol || memcmp(pTab->abPK, abPK, nCol) ){
++      }
++
++      if( !sessionChangesetCheckCompat(pTab, nCol, abPK) ){
+         rc = SQLITE_SCHEMA;
+         break;
+       }
+     }
+ 
++    if( nColnCol ){
++      assert( pGrp->db );
++      rc = sessionChangesetExtendRecord(pGrp, pTab, nCol, op, aRec, nRec, &rec);
++      if( rc ) break;
++      aRec = rec.aBuf;
++      nRec = rec.nBuf;
++    }
++
+     if( sessionGrowHash(0, pIter->bPatchset, pTab) ){
+       rc = SQLITE_NOMEM;
+       break;
+@@ -217875,6 +229012,7 @@ static int sessionChangesetToHash(
+     }
+   }
+ 
++  sqlite3_free(rec.aBuf);
+   if( rc==SQLITE_OK ) rc = pIter->rc;
+   return rc;
+ }
+@@ -217961,6 +229099,31 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp){
+   return rc;
+ }
+ 
++/*
++** Provide a database schema to the changegroup object.
++*/
++SQLITE_API int sqlite3changegroup_schema(
++  sqlite3_changegroup *pGrp,
++  sqlite3 *db,
++  const char *zDb
++){
++  int rc = SQLITE_OK;
++
++  if( pGrp->pList || pGrp->db ){
++    /* Cannot add a schema after one or more calls to sqlite3changegroup_add(),
++    ** or after sqlite3changegroup_schema() has already been called. */
++    rc = SQLITE_MISUSE;
++  }else{
++    pGrp->zDb = sqlite3_mprintf("%s", zDb);
++    if( pGrp->zDb==0 ){
++      rc = SQLITE_NOMEM;
++    }else{
++      pGrp->db = db;
++    }
++  }
++  return rc;
++}
++
+ /*
+ ** Add the changeset currently stored in buffer pData, size nData bytes,
+ ** to changeset-group p.
+@@ -218024,6 +229187,7 @@ SQLITE_API int sqlite3changegroup_output_strm(
+ */
+ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup *pGrp){
+   if( pGrp ){
++    sqlite3_free(pGrp->zDb);
+     sessionDeleteTable(0, pGrp->pList);
+     sqlite3_free(pGrp);
+   }
+@@ -218173,7 +229337,7 @@ static void sessionAppendPartialUpdate(
+         if( !pIter->abPK[i] && a1[0] ) bData = 1;
+         memcpy(pOut, a1, n1);
+         pOut += n1;
+-      }else if( a2[0]!=0xFF ){
++      }else if( a2[0]!=0xFF && a1[0] ){
+         bData = 1;
+         memcpy(pOut, a2, n2);
+         pOut += n2;
+@@ -218556,8 +229720,11 @@ struct Fts5PhraseIter {
+ **   created with the "columnsize=0" option.
+ **
+ ** xColumnText:
+-**   This function attempts to retrieve the text of column iCol of the
+-**   current document. If successful, (*pz) is set to point to a buffer
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of columns in the table, SQLITE_RANGE is returned.
++**
++**   Otherwise, this function attempts to retrieve the text of column iCol of
++**   the current document. If successful, (*pz) is set to point to a buffer
+ **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
+ **   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
+ **   if an error occurs, an SQLite error code is returned and the final values
+@@ -218567,8 +229734,10 @@ struct Fts5PhraseIter {
+ **   Returns the number of phrases in the current query expression.
+ **
+ ** xPhraseSize:
+-**   Returns the number of tokens in phrase iPhrase of the query. Phrases
+-**   are numbered starting from zero.
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of phrases in the current query, as returned by xPhraseCount,
++**   0 is returned. Otherwise, this function returns the number of tokens in
++**   phrase iPhrase of the query. Phrases are numbered starting from zero.
+ **
+ ** xInstCount:
+ **   Set *pnInst to the total number of occurrences of all phrases within
+@@ -218584,12 +229753,13 @@ struct Fts5PhraseIter {
+ **   Query for the details of phrase match iIdx within the current row.
+ **   Phrase matches are numbered starting from zero, so the iIdx argument
+ **   should be greater than or equal to zero and smaller than the value
+-**   output by xInstCount().
++**   output by xInstCount(). If iIdx is less than zero or greater than
++**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
+ **
+-**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
++**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
+ **   to the column in which it occurs and *piOff the token offset of the
+-**   first token of the phrase. Returns SQLITE_OK if successful, or an error
+-**   code (i.e. SQLITE_NOMEM) if an error occurs.
++**   first token of the phrase. SQLITE_OK is returned if successful, or an
++**   error code (i.e. SQLITE_NOMEM) if an error occurs.
+ **
+ **   This API can be quite slow if used with an FTS5 table created with the
+ **   "detail=none" or "detail=column" option.
+@@ -218615,6 +229785,10 @@ struct Fts5PhraseIter {
+ **   Invoking Api.xUserData() returns a copy of the pointer passed as
+ **   the third argument to pUserData.
+ **
++**   If parameter iPhrase is less than zero, or greater than or equal to
++**   the number of phrases in the query, as returned by xPhraseCount(),
++**   this function returns SQLITE_RANGE.
++**
+ **   If the callback function returns any value other than SQLITE_OK, the
+ **   query is abandoned and the xQueryPhrase function returns immediately.
+ **   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
+@@ -218729,6 +229903,39 @@ struct Fts5PhraseIter {
+ **
+ ** xPhraseNextColumn()
+ **   See xPhraseFirstColumn above.
++**
++** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase iPhrase of the current
++**   query. Before returning, output parameter *ppToken is set to point
++**   to a buffer containing the requested token, and *pnToken to the
++**   size of this buffer in bytes.
++**
++**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
++**   or equal to the number of phrases in the query as reported by
++**   xPhraseCount(), or if iToken is equal to or greater than the number of
++**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
++     are both zeroed.
++**
++**   The output text is not a copy of the query text that specified the
++**   token. It is the output of the tokenizer module. For tokendata=1
++**   tables, this includes any embedded 0x00 and trailing data.
++**
++** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase hit iIdx within the
++**   current row. If iIdx is less than zero or greater than or equal to the
++**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
++**   output variable (*ppToken) is set to point to a buffer containing the
++**   matching document token, and (*pnToken) to the size of that buffer in
++**   bytes. This API is not available if the specified token matches a
++**   prefix query term. In that case both output variables are always set
++**   to 0.
++**
++**   The output text is not a copy of the document text that was tokenized.
++**   It is the output of the tokenizer module. For tokendata=1 tables, this
++**   includes any embedded 0x00 and trailing data.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option.
+ */
+ struct Fts5ExtensionApi {
+   int iVersion;                   /* Currently always set to 3 */
+@@ -218766,6 +229973,13 @@ struct Fts5ExtensionApi {
+ 
+   int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
+   void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
++
++  /* Below this point are iVersion>=3 only */
++  int (*xQueryToken)(Fts5Context*,
++      int iPhrase, int iToken,
++      const char **ppToken, int *pnToken
++  );
++  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
+ };
+ 
+ /*
+@@ -218960,8 +230174,8 @@ struct Fts5ExtensionApi {
+ **   as separate queries of the FTS index are required for each synonym.
+ **
+ **   When using methods (2) or (3), it is important that the tokenizer only
+-**   provide synonyms when tokenizing document text (method (2)) or query
+-**   text (method (3)), not both. Doing so will not cause any errors, but is
++**   provide synonyms when tokenizing document text (method (3)) or query
++**   text (method (2)), not both. Doing so will not cause any errors, but is
+ **   inefficient.
+ */
+ typedef struct Fts5Tokenizer Fts5Tokenizer;
+@@ -219009,7 +230223,7 @@ struct fts5_api {
+   int (*xCreateTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_tokenizer *pTokenizer,
+     void (*xDestroy)(void*)
+   );
+@@ -219018,7 +230232,7 @@ struct fts5_api {
+   int (*xFindTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void **ppContext,
++    void **ppUserData,
+     fts5_tokenizer *pTokenizer
+   );
+ 
+@@ -219026,7 +230240,7 @@ struct fts5_api {
+   int (*xCreateFunction)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_extension_function xFunction,
+     void (*xDestroy)(void*)
+   );
+@@ -219198,6 +230412,10 @@ typedef struct Fts5Config Fts5Config;
+ **   attempt to merge together. A value of 1 sets the object to use the
+ **   compile time default. Zero disables auto-merge altogether.
+ **
++** bContentlessDelete:
++**   True if the contentless_delete option was present in the CREATE
++**   VIRTUAL TABLE statement.
++**
+ ** zContent:
+ **
+ ** zContentRowid:
+@@ -219232,9 +230450,11 @@ struct Fts5Config {
+   int nPrefix;                    /* Number of prefix indexes */
+   int *aPrefix;                   /* Sizes in bytes of nPrefix prefix indexes */
+   int eContent;                   /* An FTS5_CONTENT value */
++  int bContentlessDelete;         /* "contentless_delete=" option (dflt==0) */
+   char *zContent;                 /* content table */
+   char *zContentRowid;            /* "content_rowid=" option value */
+   int bColumnsize;                /* "columnsize=" option value (dflt==1) */
++  int bTokendata;                 /* "tokendata=" option value (dflt==0) */
+   int eDetail;                    /* FTS5_DETAIL_XXX value */
+   char *zContentExprlist;
+   Fts5Tokenizer *pTok;
+@@ -219243,6 +230463,7 @@ struct Fts5Config {
+   int ePattern;                   /* FTS_PATTERN_XXX constant */
+ 
+   /* Values loaded from the %_config table */
++  int iVersion;                   /* fts5 file format 'version' */
+   int iCookie;                    /* Incremented when %_config is modified */
+   int pgsz;                       /* Approximate page size used in %_data */
+   int nAutomerge;                 /* 'automerge' setting */
+@@ -219251,6 +230472,8 @@ struct Fts5Config {
+   int nHashSize;                  /* Bytes of memory for in-memory hash */
+   char *zRank;                    /* Name of rank function */
+   char *zRankArgs;                /* Arguments to rank function */
++  int bSecureDelete;              /* 'secure-delete' */
++  int nDeleteMerge;           /* 'deletemerge' */
+ 
+   /* If non-NULL, points to sqlite3_vtab.base.zErrmsg. Often NULL. */
+   char **pzErrmsg;
+@@ -219260,8 +230483,11 @@ struct Fts5Config {
+ #endif
+ };
+ 
+-/* Current expected value of %_config table 'version' field */
+-#define FTS5_CURRENT_VERSION  4
++/* Current expected value of %_config table 'version' field. And
++** the expected version if the 'secure-delete' option has ever been
++** set on the table.  */
++#define FTS5_CURRENT_VERSION               4
++#define FTS5_CURRENT_VERSION_SECUREDELETE  5
+ 
+ #define FTS5_CONTENT_NORMAL   0
+ #define FTS5_CONTENT_NONE     1
+@@ -219330,7 +230556,7 @@ static void sqlite3Fts5BufferAppendPrintf(int *, Fts5Buffer*, char *zFmt, ...);
+ static char *sqlite3Fts5Mprintf(int *pRc, const char *zFmt, ...);
+ 
+ #define fts5BufferZero(x)             sqlite3Fts5BufferZero(x)
+-#define fts5BufferAppendVarint(a,b,c) sqlite3Fts5BufferAppendVarint(a,b,c)
++#define fts5BufferAppendVarint(a,b,c) sqlite3Fts5BufferAppendVarint(a,b,(i64)c)
+ #define fts5BufferFree(a)             sqlite3Fts5BufferFree(a)
+ #define fts5BufferAppendBlob(a,b,c,d) sqlite3Fts5BufferAppendBlob(a,b,c,d)
+ #define fts5BufferSet(a,b,c,d)        sqlite3Fts5BufferSet(a,b,c,d)
+@@ -219417,16 +230643,19 @@ struct Fts5IndexIter {
+ /*
+ ** Values used as part of the flags argument passed to IndexQuery().
+ */
+-#define FTS5INDEX_QUERY_PREFIX     0x0001   /* Prefix query */
+-#define FTS5INDEX_QUERY_DESC       0x0002   /* Docs in descending rowid order */
+-#define FTS5INDEX_QUERY_TEST_NOIDX 0x0004   /* Do not use prefix index */
+-#define FTS5INDEX_QUERY_SCAN       0x0008   /* Scan query (fts5vocab) */
++#define FTS5INDEX_QUERY_PREFIX      0x0001  /* Prefix query */
++#define FTS5INDEX_QUERY_DESC        0x0002  /* Docs in descending rowid order */
++#define FTS5INDEX_QUERY_TEST_NOIDX  0x0004  /* Do not use prefix index */
++#define FTS5INDEX_QUERY_SCAN        0x0008  /* Scan query (fts5vocab) */
+ 
+ /* The following are used internally by the fts5_index.c module. They are
+ ** defined here only to make it easier to avoid clashes with the flags
+ ** above. */
+-#define FTS5INDEX_QUERY_SKIPEMPTY  0x0010
+-#define FTS5INDEX_QUERY_NOOUTPUT   0x0020
++#define FTS5INDEX_QUERY_SKIPEMPTY   0x0010
++#define FTS5INDEX_QUERY_NOOUTPUT    0x0020
++#define FTS5INDEX_QUERY_SKIPHASH    0x0040
++#define FTS5INDEX_QUERY_NOTOKENDATA 0x0080
++#define FTS5INDEX_QUERY_SCANONETERM 0x0100
+ 
+ /*
+ ** Create/destroy an Fts5Index object.
+@@ -219495,6 +230724,10 @@ static void *sqlite3Fts5StructureRef(Fts5Index*);
+ static void sqlite3Fts5StructureRelease(void*);
+ static int sqlite3Fts5StructureTest(Fts5Index*, void*);
+ 
++/*
++** Used by xInstToken():
++*/
++static int sqlite3Fts5IterToken(Fts5IndexIter*, i64, int, int, const char**, int*);
+ 
+ /*
+ ** Insert or remove data to or from the index. Each time a document is
+@@ -219569,6 +230802,16 @@ static int sqlite3Fts5IndexReset(Fts5Index *p);
+ 
+ static int sqlite3Fts5IndexLoadConfig(Fts5Index *p);
+ 
++static int sqlite3Fts5IndexGetOrigin(Fts5Index *p, i64 *piOrigin);
++static int sqlite3Fts5IndexContentlessDelete(Fts5Index *p, i64 iOrigin, i64 iRowid);
++
++static void sqlite3Fts5IndexIterClearTokendata(Fts5IndexIter*);
++
++/* Used to populate hash tables for xInstToken in detail=none/column mode. */
++static int sqlite3Fts5IndexIterWriteTokendata(
++    Fts5IndexIter*, const char*, int, i64 iRowid, int iCol, int iOff
++);
++
+ /*
+ ** End of interface to code in fts5_index.c.
+ **************************************************************************/
+@@ -219581,7 +230824,7 @@ static int sqlite3Fts5GetVarintLen(u32 iVal);
+ static u8 sqlite3Fts5GetVarint(const unsigned char*, u64*);
+ static int sqlite3Fts5PutVarint(unsigned char *p, u64 v);
+ 
+-#define fts5GetVarint32(a,b) sqlite3Fts5GetVarint32(a,(u32*)&b)
++#define fts5GetVarint32(a,b) sqlite3Fts5GetVarint32(a,(u32*)&(b))
+ #define fts5GetVarint    sqlite3Fts5GetVarint
+ 
+ #define fts5FastGetVarint32(a, iOff, nVal) {      \
+@@ -219653,6 +230896,11 @@ static int sqlite3Fts5HashWrite(
+ */
+ static void sqlite3Fts5HashClear(Fts5Hash*);
+ 
++/*
++** Return true if the hash is empty, false otherwise.
++*/
++static int sqlite3Fts5HashIsEmpty(Fts5Hash*);
++
+ static int sqlite3Fts5HashQuery(
+   Fts5Hash*,                      /* Hash table to query */
+   int nPre,
+@@ -219669,11 +230917,13 @@ static void sqlite3Fts5HashScanNext(Fts5Hash*);
+ static int sqlite3Fts5HashScanEof(Fts5Hash*);
+ static void sqlite3Fts5HashScanEntry(Fts5Hash *,
+   const char **pzTerm,            /* OUT: term (nul-terminated) */
++  int *pnTerm,                    /* OUT: Size of term in bytes */
+   const u8 **ppDoclist,           /* OUT: pointer to doclist */
+   int *pnDoclist                  /* OUT: size of doclist in bytes */
+ );
+ 
+ 
++
+ /*
+ ** End of interface to code in fts5_hash.c.
+ **************************************************************************/
+@@ -219794,6 +231044,10 @@ static int sqlite3Fts5ExprClonePhrase(Fts5Expr*, int, Fts5Expr**);
+ 
+ static int sqlite3Fts5ExprPhraseCollist(Fts5Expr *, int, const u8 **, int *);
+ 
++static int sqlite3Fts5ExprQueryToken(Fts5Expr*, int, int, const char**, int*);
++static int sqlite3Fts5ExprInstToken(Fts5Expr*, i64, int, int, int, int, const char**, int*);
++static void sqlite3Fts5ExprClearTokens(Fts5Expr*);
++
+ /*******************************************
+ ** The fts5_expr.c API above this point is used by the other hand-written
+ ** C code in this module. The interfaces below this point are called by
+@@ -219917,7 +231171,8 @@ static void sqlite3Fts5UnicodeAscii(u8*, u8*);
+ #define FTS5_STAR                            15
+ 
+ /* This file is automatically generated by Lemon from input grammar
+-** source file "fts5parse.y". */
++** source file "fts5parse.y".
++*/
+ /*
+ ** 2000-05-29
+ **
+@@ -221507,15 +232762,19 @@ static int fts5CInstIterInit(
+ */
+ typedef struct HighlightContext HighlightContext;
+ struct HighlightContext {
+-  CInstIter iter;                 /* Coalesced Instance Iterator */
+-  int iPos;                       /* Current token offset in zIn[] */
++  /* Constant parameters to fts5HighlightCb() */
+   int iRangeStart;                /* First token to include */
+   int iRangeEnd;                  /* If non-zero, last token to include */
+   const char *zOpen;              /* Opening highlight */
+   const char *zClose;             /* Closing highlight */
+   const char *zIn;                /* Input text */
+   int nIn;                        /* Size of input text in bytes */
+-  int iOff;                       /* Current offset within zIn[] */
++
++  /* Variables modified by fts5HighlightCb() */
++  CInstIter iter;                 /* Coalesced Instance Iterator */
++  int iPos;                       /* Current token offset in zIn[] */
++  int iOff;                       /* Have copied up to this offset in zIn[] */
++  int bOpen;                      /* True if highlight is open */
+   char *zOut;                     /* Output value */
+ };
+ 
+@@ -221548,8 +232807,8 @@ static int fts5HighlightCb(
+   int tflags,                     /* Mask of FTS5_TOKEN_* flags */
+   const char *pToken,             /* Buffer containing token */
+   int nToken,                     /* Size of token in bytes */
+-  int iStartOff,                  /* Start offset of token */
+-  int iEndOff                     /* End offset of token */
++  int iStartOff,                  /* Start byte offset of token */
++  int iEndOff                     /* End byte offset of token */
+ ){
+   HighlightContext *p = (HighlightContext*)pContext;
+   int rc = SQLITE_OK;
+@@ -221560,35 +232819,60 @@ static int fts5HighlightCb(
+   if( tflags & FTS5_TOKEN_COLOCATED ) return SQLITE_OK;
+   iPos = p->iPos++;
+ 
+-  if( p->iRangeEnd>0 ){
++  if( p->iRangeEnd>=0 ){
+     if( iPosiRangeStart || iPos>p->iRangeEnd ) return SQLITE_OK;
+     if( p->iRangeStart && iPos==p->iRangeStart ) p->iOff = iStartOff;
+   }
+ 
+-  if( iPos==p->iter.iStart ){
++  /* If the parenthesis is open, and this token is not part of the current
++  ** phrase, and the starting byte offset of this token is past the point
++  ** that has currently been copied into the output buffer, close the
++  ** parenthesis. */
++  if( p->bOpen
++   && (iPos<=p->iter.iStart || p->iter.iStart<0)
++   && iStartOff>p->iOff
++  ){
++    fts5HighlightAppend(&rc, p, p->zClose, -1);
++    p->bOpen = 0;
++  }
++
++  /* If this is the start of a new phrase, and the highlight is not open:
++  **
++  **   * copy text from the input up to the start of the phrase, and
++  **   * open the highlight.
++  */
++  if( iPos==p->iter.iStart && p->bOpen==0 ){
+     fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iStartOff - p->iOff);
+     fts5HighlightAppend(&rc, p, p->zOpen, -1);
+     p->iOff = iStartOff;
++    p->bOpen = 1;
+   }
+ 
+   if( iPos==p->iter.iEnd ){
+-    if( p->iRangeEnd && p->iter.iStartiRangeStart ){
++    if( p->bOpen==0 ){
++      assert( p->iRangeEnd>=0 );
+       fts5HighlightAppend(&rc, p, p->zOpen, -1);
++      p->bOpen = 1;
+     }
+     fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
+-    fts5HighlightAppend(&rc, p, p->zClose, -1);
+     p->iOff = iEndOff;
++
+     if( rc==SQLITE_OK ){
+       rc = fts5CInstIterNext(&p->iter);
+     }
+   }
+ 
+-  if( p->iRangeEnd>0 && iPos==p->iRangeEnd ){
+-    fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
+-    p->iOff = iEndOff;
+-    if( iPos>=p->iter.iStart && iPositer.iEnd ){
++  if( iPos==p->iRangeEnd ){
++    if( p->bOpen ){
++      if( p->iter.iStart>=0 && iPos>=p->iter.iStart ){
++        fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
++        p->iOff = iEndOff;
++      }
+       fts5HighlightAppend(&rc, p, p->zClose, -1);
++      p->bOpen = 0;
+     }
++    fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
++    p->iOff = iEndOff;
+   }
+ 
+   return rc;
+@@ -221618,9 +232902,12 @@ static void fts5HighlightFunction(
+   memset(&ctx, 0, sizeof(HighlightContext));
+   ctx.zOpen = (const char*)sqlite3_value_text(apVal[1]);
+   ctx.zClose = (const char*)sqlite3_value_text(apVal[2]);
++  ctx.iRangeEnd = -1;
+   rc = pApi->xColumnText(pFts, iCol, &ctx.zIn, &ctx.nIn);
+-
+-  if( ctx.zIn ){
++  if( rc==SQLITE_RANGE ){
++    sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
++    rc = SQLITE_OK;
++  }else if( ctx.zIn ){
+     if( rc==SQLITE_OK ){
+       rc = fts5CInstIterInit(pApi, pFts, iCol, &ctx.iter);
+     }
+@@ -221628,6 +232915,9 @@ static void fts5HighlightFunction(
+     if( rc==SQLITE_OK ){
+       rc = pApi->xTokenize(pFts, ctx.zIn, ctx.nIn, (void*)&ctx,fts5HighlightCb);
+     }
++    if( ctx.bOpen ){
++      fts5HighlightAppend(&rc, &ctx, ctx.zClose, -1);
++    }
+     fts5HighlightAppend(&rc, &ctx, &ctx.zIn[ctx.iOff], ctx.nIn - ctx.iOff);
+ 
+     if( rc==SQLITE_OK ){
+@@ -221803,6 +233093,7 @@ static void fts5SnippetFunction(
+   iCol = sqlite3_value_int(apVal[0]);
+   ctx.zOpen = fts5ValueToText(apVal[1]);
+   ctx.zClose = fts5ValueToText(apVal[2]);
++  ctx.iRangeEnd = -1;
+   zEllips = fts5ValueToText(apVal[3]);
+   nToken = sqlite3_value_int(apVal[4]);
+ 
+@@ -221905,6 +233196,9 @@ static void fts5SnippetFunction(
+     if( rc==SQLITE_OK ){
+       rc = pApi->xTokenize(pFts, ctx.zIn, ctx.nIn, (void*)&ctx,fts5HighlightCb);
+     }
++    if( ctx.bOpen ){
++      fts5HighlightAppend(&rc, &ctx, ctx.zClose, -1);
++    }
+     if( ctx.iRangeEnd>=(nColSize-1) ){
+       fts5HighlightAppend(&rc, &ctx, &ctx.zIn[ctx.iOff], ctx.nIn - ctx.iOff);
+     }else{
+@@ -222180,6 +233474,7 @@ static void sqlite3Fts5BufferAppendBlob(
+ ){
+   if( nData ){
+     if( fts5BufferGrow(pRc, pBuf, nData) ) return;
++    assert( pBuf->p!=0 );
+     memcpy(&pBuf->p[pBuf->n], pData, nData);
+     pBuf->n += nData;
+   }
+@@ -222281,6 +233576,7 @@ static int sqlite3Fts5PoslistNext64(
+   i64 *piOff                      /* IN/OUT: Current offset */
+ ){
+   int i = *pi;
++  assert( a!=0 || i==0 );
+   if( i>=n ){
+     /* EOF */
+     *piOff = -1;
+@@ -222288,6 +233584,7 @@ static int sqlite3Fts5PoslistNext64(
+   }else{
+     i64 iOff = *piOff;
+     u32 iVal;
++    assert( a!=0 );
+     fts5FastGetVarint32(a, i, iVal);
+     if( iVal<=1 ){
+       if( iVal==0 ){
+@@ -222543,6 +233840,8 @@ static void sqlite3Fts5TermsetFree(Fts5Termset *p){
+ #define FTS5_DEFAULT_CRISISMERGE   16
+ #define FTS5_DEFAULT_HASHSIZE    (1024*1024)
+ 
++#define FTS5_DEFAULT_DELETE_AUTOMERGE 10      /* default 10% */
++
+ /* Maximum allowed page size */
+ #define FTS5_MAX_PAGE_SIZE (64*1024)
+ 
+@@ -222873,6 +234172,16 @@ static int fts5ConfigParseSpecial(
+     return rc;
+   }
+ 
++  if( sqlite3_strnicmp("contentless_delete", zCmd, nCmd)==0 ){
++    if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1]!='\0' ){
++      *pzErr = sqlite3_mprintf("malformed contentless_delete=... directive");
++      rc = SQLITE_ERROR;
++    }else{
++      pConfig->bContentlessDelete = (zArg[0]=='1');
++    }
++    return rc;
++  }
++
+   if( sqlite3_strnicmp("content_rowid", zCmd, nCmd)==0 ){
+     if( pConfig->zContentRowid ){
+       *pzErr = sqlite3_mprintf("multiple content_rowid=... directives");
+@@ -222907,6 +234216,16 @@ static int fts5ConfigParseSpecial(
+     return rc;
+   }
+ 
++  if( sqlite3_strnicmp("tokendata", zCmd, nCmd)==0 ){
++    if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1]!='\0' ){
++      *pzErr = sqlite3_mprintf("malformed tokendata=... directive");
++      rc = SQLITE_ERROR;
++    }else{
++      pConfig->bTokendata = (zArg[0]=='1');
++    }
++    return rc;
++  }
++
+   *pzErr = sqlite3_mprintf("unrecognized option: \"%.*s\"", nCmd, zCmd);
+   return SQLITE_ERROR;
+ }
+@@ -223071,6 +234390,7 @@ static int sqlite3Fts5ConfigParse(
+     rc = SQLITE_ERROR;
+   }
+ 
++  assert( (pRet->abUnindexed && pRet->azCol) || rc!=SQLITE_OK );
+   for(i=3; rc==SQLITE_OK && ibContentlessDelete
++   && pRet->eContent!=FTS5_CONTENT_NONE
++  ){
++    *pzErr = sqlite3_mprintf(
++        "contentless_delete=1 requires a contentless table"
++    );
++    rc = SQLITE_ERROR;
++  }
++
++  /* We only allow contentless_delete=1 if columnsize=0 is not present.
++  **
++  ** This restriction may be removed at some point.
++  */
++  if( rc==SQLITE_OK && pRet->bContentlessDelete && pRet->bColumnsize==0 ){
++    *pzErr = sqlite3_mprintf(
++        "contentless_delete=1 is incompatible with columnsize=0"
++    );
++    rc = SQLITE_ERROR;
++  }
++
+   /* If a tokenizer= option was successfully parsed, the tokenizer has
+   ** already been allocated. Otherwise, allocate an instance of the default
+   ** tokenizer (unicode61) now.  */
+@@ -223410,6 +234752,18 @@ static int sqlite3Fts5ConfigSetValue(
+     }
+   }
+ 
++  else if( 0==sqlite3_stricmp(zKey, "deletemerge") ){
++    int nVal = -1;
++    if( SQLITE_INTEGER==sqlite3_value_numeric_type(pVal) ){
++      nVal = sqlite3_value_int(pVal);
++    }else{
++      *pbBadkey = 1;
++    }
++    if( nVal<0 ) nVal = FTS5_DEFAULT_DELETE_AUTOMERGE;
++    if( nVal>100 ) nVal = 0;
++    pConfig->nDeleteMerge = nVal;
++  }
++
+   else if( 0==sqlite3_stricmp(zKey, "rank") ){
+     const char *zIn = (const char*)sqlite3_value_text(pVal);
+     char *zRank;
+@@ -223424,6 +234778,18 @@ static int sqlite3Fts5ConfigSetValue(
+       rc = SQLITE_OK;
+       *pbBadkey = 1;
+     }
++  }
++
++  else if( 0==sqlite3_stricmp(zKey, "secure-delete") ){
++    int bVal = -1;
++    if( SQLITE_INTEGER==sqlite3_value_numeric_type(pVal) ){
++      bVal = sqlite3_value_int(pVal);
++    }
++    if( bVal<0 ){
++      *pbBadkey = 1;
++    }else{
++      pConfig->bSecureDelete = (bVal ? 1 : 0);
++    }
+   }else{
+     *pbBadkey = 1;
+   }
+@@ -223446,6 +234812,7 @@ static int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
+   pConfig->nUsermerge = FTS5_DEFAULT_USERMERGE;
+   pConfig->nCrisisMerge = FTS5_DEFAULT_CRISISMERGE;
+   pConfig->nHashSize = FTS5_DEFAULT_HASHSIZE;
++  pConfig->nDeleteMerge = FTS5_DEFAULT_DELETE_AUTOMERGE;
+ 
+   zSql = sqlite3Fts5Mprintf(&rc, zSelect, pConfig->zDb, pConfig->zName);
+   if( zSql ){
+@@ -223468,15 +234835,20 @@ static int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
+     rc = sqlite3_finalize(p);
+   }
+ 
+-  if( rc==SQLITE_OK && iVersion!=FTS5_CURRENT_VERSION ){
++  if( rc==SQLITE_OK
++   && iVersion!=FTS5_CURRENT_VERSION
++   && iVersion!=FTS5_CURRENT_VERSION_SECUREDELETE
++  ){
+     rc = SQLITE_ERROR;
+     if( pConfig->pzErrmsg ){
+       assert( 0==*pConfig->pzErrmsg );
+-      *pConfig->pzErrmsg = sqlite3_mprintf(
+-          "invalid fts5 file format (found %d, expected %d) - run 'rebuild'",
+-          iVersion, FTS5_CURRENT_VERSION
++      *pConfig->pzErrmsg = sqlite3_mprintf("invalid fts5 file format "
++          "(found %d, expected %d or %d) - run 'rebuild'",
++          iVersion, FTS5_CURRENT_VERSION, FTS5_CURRENT_VERSION_SECUREDELETE
+       );
+     }
++  }else{
++    pConfig->iVersion = iVersion;
+   }
+ 
+   if( rc==SQLITE_OK ){
+@@ -223504,6 +234876,10 @@ static int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
+ /* #include "fts5Int.h" */
+ /* #include "fts5parse.h" */
+ 
++#ifndef SQLITE_FTS5_MAX_EXPR_DEPTH
++# define SQLITE_FTS5_MAX_EXPR_DEPTH 256
++#endif
++
+ /*
+ ** All token types in the generated fts5parse.h file are greater than 0.
+ */
+@@ -223544,11 +234920,17 @@ struct Fts5Expr {
+ **       FTS5_NOT                 (nChild, apChild valid)
+ **       FTS5_STRING              (pNear valid)
+ **       FTS5_TERM                (pNear valid)
++**
++** iHeight:
++**   Distance from this node to furthest leaf. This is always 0 for nodes
++**   of type FTS5_STRING and FTS5_TERM. For all other nodes it is one
++**   greater than the largest child value.
+ */
+ struct Fts5ExprNode {
+   int eType;                      /* Node type */
+   int bEof;                       /* True at EOF */
+   int bNomatch;                   /* True if entry is not a match */
++  int iHeight;                    /* Distance to tree leaf nodes */
+ 
+   /* Next method for this node. */
+   int (*xNext)(Fts5Expr*, Fts5ExprNode*, int, i64);
+@@ -223577,7 +234959,9 @@ struct Fts5ExprNode {
+ struct Fts5ExprTerm {
+   u8 bPrefix;                     /* True for a prefix term */
+   u8 bFirst;                      /* True if token must be first in column */
+-  char *zTerm;                    /* nul-terminated term */
++  char *pTerm;                    /* Term data */
++  int nQueryTerm;                 /* Effective size of term in bytes */
++  int nFullTerm;                  /* Size of term in bytes incl. tokendata */
+   Fts5IndexIter *pIter;           /* Iterator for this term */
+   Fts5ExprTerm *pSynonym;         /* Pointer to first in list of synonyms */
+ };
+@@ -223618,6 +235002,31 @@ struct Fts5Parse {
+   int bPhraseToAnd;               /* Convert "a+b" to "a AND b" */
+ };
+ 
++/*
++** Check that the Fts5ExprNode.iHeight variables are set correctly in
++** the expression tree passed as the only argument.
++*/
++#ifndef NDEBUG
++static void assert_expr_depth_ok(int rc, Fts5ExprNode *p){
++  if( rc==SQLITE_OK ){
++    if( p->eType==FTS5_TERM || p->eType==FTS5_STRING || p->eType==0 ){
++      assert( p->iHeight==0 );
++    }else{
++      int ii;
++      int iMaxChild = 0;
++      for(ii=0; iinChild; ii++){
++        Fts5ExprNode *pChild = p->apChild[ii];
++        iMaxChild = MAX(iMaxChild, pChild->iHeight);
++        assert_expr_depth_ok(SQLITE_OK, pChild);
++      }
++      assert( p->iHeight==iMaxChild+1 );
++    }
++  }
++}
++#else
++# define assert_expr_depth_ok(rc, p)
++#endif
++
+ static void sqlite3Fts5ParseError(Fts5Parse *pParse, const char *zFmt, ...){
+   va_list ap;
+   va_start(ap, zFmt);
+@@ -223732,6 +235141,8 @@ static int sqlite3Fts5ExprNew(
+   }while( sParse.rc==SQLITE_OK && t!=FTS5_EOF );
+   sqlite3Fts5ParserFree(pEngine, fts5ParseFree);
+ 
++  assert_expr_depth_ok(sParse.rc, sParse.pExpr);
++
+   /* If the LHS of the MATCH expression was a user column, apply the
+   ** implicit column-filter.  */
+   if( iColnCol && sParse.pExpr && sParse.rc==SQLITE_OK ){
+@@ -223776,6 +235187,19 @@ static int sqlite3Fts5ExprNew(
+   return sParse.rc;
+ }
+ 
++/*
++** Assuming that buffer z is at least nByte bytes in size and contains a
++** valid utf-8 string, return the number of characters in the string.
++*/
++static int fts5ExprCountChar(const char *z, int nByte){
++  int nRet = 0;
++  int ii;
++  for(ii=0; ii=3 ){
++
++        if( fts5ExprCountChar(&zText[iFirst], i-iFirst)>=3 ){
+           int jj;
+           zExpr[iOut++] = '"';
+           for(jj=iFirst; jjnPhrase + p2->nPhrase;
+ 
+@@ -223905,7 +235330,7 @@ static int sqlite3Fts5ExprAnd(Fts5Expr **pp1, Fts5Expr *p2){
+     }
+     sqlite3_free(p2->apExprPhrase);
+     sqlite3_free(p2);
+-  }else{
++  }else if( p2 ){
+     *pp1 = p2;
+   }
+ 
+@@ -224403,7 +235828,7 @@ static int fts5ExprNearInitAll(
+             p->pIter = 0;
+           }
+           rc = sqlite3Fts5IndexQuery(
+-              pExpr->pIndex, p->zTerm, (int)strlen(p->zTerm),
++              pExpr->pIndex, p->pTerm, p->nQueryTerm,
+               (pTerm->bPrefix ? FTS5INDEX_QUERY_PREFIX : 0) |
+               (pExpr->bDesc ? FTS5INDEX_QUERY_DESC : 0),
+               pNear->pColset,
+@@ -225040,7 +236465,7 @@ static void fts5ExprPhraseFree(Fts5ExprPhrase *pPhrase){
+       Fts5ExprTerm *pSyn;
+       Fts5ExprTerm *pNext;
+       Fts5ExprTerm *pTerm = &pPhrase->aTerm[i];
+-      sqlite3_free(pTerm->zTerm);
++      sqlite3_free(pTerm->pTerm);
+       sqlite3Fts5IterClose(pTerm->pIter);
+       for(pSyn=pTerm->pSynonym; pSyn; pSyn=pNext){
+         pNext = pSyn->pSynonym;
+@@ -225138,6 +236563,7 @@ static Fts5ExprNearset *sqlite3Fts5ParseNearset(
+ typedef struct TokenCtx TokenCtx;
+ struct TokenCtx {
+   Fts5ExprPhrase *pPhrase;
++  Fts5Config *pConfig;
+   int rc;
+ };
+ 
+@@ -225171,8 +236597,12 @@ static int fts5ParseTokenize(
+       rc = SQLITE_NOMEM;
+     }else{
+       memset(pSyn, 0, (size_t)nByte);
+-      pSyn->zTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer);
+-      memcpy(pSyn->zTerm, pToken, nToken);
++      pSyn->pTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer);
++      pSyn->nFullTerm = pSyn->nQueryTerm = nToken;
++      if( pCtx->pConfig->bTokendata ){
++        pSyn->nQueryTerm = (int)strlen(pSyn->pTerm);
++      }
++      memcpy(pSyn->pTerm, pToken, nToken);
+       pSyn->pSynonym = pPhrase->aTerm[pPhrase->nTerm-1].pSynonym;
+       pPhrase->aTerm[pPhrase->nTerm-1].pSynonym = pSyn;
+     }
+@@ -225197,7 +236627,11 @@ static int fts5ParseTokenize(
+     if( rc==SQLITE_OK ){
+       pTerm = &pPhrase->aTerm[pPhrase->nTerm++];
+       memset(pTerm, 0, sizeof(Fts5ExprTerm));
+-      pTerm->zTerm = sqlite3Fts5Strndup(&rc, pToken, nToken);
++      pTerm->pTerm = sqlite3Fts5Strndup(&rc, pToken, nToken);
++      pTerm->nFullTerm = pTerm->nQueryTerm = nToken;
++      if( pCtx->pConfig->bTokendata && rc==SQLITE_OK ){
++        pTerm->nQueryTerm = (int)strlen(pTerm->pTerm);
++      }
+     }
+   }
+ 
+@@ -225264,6 +236698,7 @@ static Fts5ExprPhrase *sqlite3Fts5ParseTerm(
+ 
+   memset(&sCtx, 0, sizeof(TokenCtx));
+   sCtx.pPhrase = pAppend;
++  sCtx.pConfig = pConfig;
+ 
+   rc = fts5ParseStringFromToken(pToken, &z);
+   if( rc==SQLITE_OK ){
+@@ -225311,12 +236746,15 @@ static int sqlite3Fts5ExprClonePhrase(
+   Fts5Expr **ppNew
+ ){
+   int rc = SQLITE_OK;             /* Return code */
+-  Fts5ExprPhrase *pOrig;          /* The phrase extracted from pExpr */
++  Fts5ExprPhrase *pOrig = 0;      /* The phrase extracted from pExpr */
+   Fts5Expr *pNew = 0;             /* Expression to return via *ppNew */
+-  TokenCtx sCtx = {0,0};          /* Context object for fts5ParseTokenize */
+-
+-  pOrig = pExpr->apExprPhrase[iPhrase];
+-  pNew = (Fts5Expr*)sqlite3Fts5MallocZero(&rc, sizeof(Fts5Expr));
++  TokenCtx sCtx = {0,0,0};        /* Context object for fts5ParseTokenize */
++  if( iPhrase<0 || iPhrase>=pExpr->nPhrase ){
++    rc = SQLITE_RANGE;
++  }else{
++    pOrig = pExpr->apExprPhrase[iPhrase];
++    pNew = (Fts5Expr*)sqlite3Fts5MallocZero(&rc, sizeof(Fts5Expr));
++  }
+   if( rc==SQLITE_OK ){
+     pNew->apExprPhrase = (Fts5ExprPhrase**)sqlite3Fts5MallocZero(&rc,
+         sizeof(Fts5ExprPhrase*));
+@@ -225329,7 +236767,7 @@ static int sqlite3Fts5ExprClonePhrase(
+     pNew->pRoot->pNear = (Fts5ExprNearset*)sqlite3Fts5MallocZero(&rc,
+         sizeof(Fts5ExprNearset) + sizeof(Fts5ExprPhrase*));
+   }
+-  if( rc==SQLITE_OK ){
++  if( rc==SQLITE_OK && ALWAYS(pOrig!=0) ){
+     Fts5Colset *pColsetOrig = pOrig->pNode->pNear->pColset;
+     if( pColsetOrig ){
+       sqlite3_int64 nByte;
+@@ -225343,26 +236781,27 @@ static int sqlite3Fts5ExprClonePhrase(
+     }
+   }
+ 
+-  if( pOrig->nTerm ){
+-    int i;                          /* Used to iterate through phrase terms */
+-    for(i=0; rc==SQLITE_OK && inTerm; i++){
+-      int tflags = 0;
+-      Fts5ExprTerm *p;
+-      for(p=&pOrig->aTerm[i]; p && rc==SQLITE_OK; p=p->pSynonym){
+-        const char *zTerm = p->zTerm;
+-        rc = fts5ParseTokenize((void*)&sCtx, tflags, zTerm, (int)strlen(zTerm),
+-            0, 0);
+-        tflags = FTS5_TOKEN_COLOCATED;
+-      }
+-      if( rc==SQLITE_OK ){
+-        sCtx.pPhrase->aTerm[i].bPrefix = pOrig->aTerm[i].bPrefix;
+-        sCtx.pPhrase->aTerm[i].bFirst = pOrig->aTerm[i].bFirst;
++  if( rc==SQLITE_OK ){
++    if( pOrig->nTerm ){
++      int i;                          /* Used to iterate through phrase terms */
++      sCtx.pConfig = pExpr->pConfig;
++      for(i=0; rc==SQLITE_OK && inTerm; i++){
++        int tflags = 0;
++        Fts5ExprTerm *p;
++        for(p=&pOrig->aTerm[i]; p && rc==SQLITE_OK; p=p->pSynonym){
++          rc = fts5ParseTokenize((void*)&sCtx,tflags,p->pTerm,p->nFullTerm,0,0);
++          tflags = FTS5_TOKEN_COLOCATED;
++        }
++        if( rc==SQLITE_OK ){
++          sCtx.pPhrase->aTerm[i].bPrefix = pOrig->aTerm[i].bPrefix;
++          sCtx.pPhrase->aTerm[i].bFirst = pOrig->aTerm[i].bFirst;
++        }
+       }
++    }else{
++      /* This happens when parsing a token or quoted phrase that contains
++      ** no token characters at all. (e.g ... MATCH '""'). */
++      sCtx.pPhrase = sqlite3Fts5MallocZero(&rc, sizeof(Fts5ExprPhrase));
+     }
+-  }else{
+-    /* This happens when parsing a token or quoted phrase that contains
+-    ** no token characters at all. (e.g ... MATCH '""'). */
+-    sCtx.pPhrase = sqlite3Fts5MallocZero(&rc, sizeof(Fts5ExprPhrase));
+   }
+ 
+   if( rc==SQLITE_OK && ALWAYS(sCtx.pPhrase) ){
+@@ -225679,6 +237118,7 @@ static void fts5ExprAssignXNext(Fts5ExprNode *pNode){
+ }
+ 
+ static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){
++  int ii = p->nChild;
+   if( p->eType!=FTS5_NOT && pSub->eType==p->eType ){
+     int nByte = sizeof(Fts5ExprNode*) * pSub->nChild;
+     memcpy(&p->apChild[p->nChild], pSub->apChild, nByte);
+@@ -225687,6 +237127,9 @@ static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){
+   }else{
+     p->apChild[p->nChild++] = pSub;
+   }
++  for( ; iinChild; ii++){
++    p->iHeight = MAX(p->iHeight, p->apChild[ii]->iHeight + 1);
++  }
+ }
+ 
+ /*
+@@ -225717,6 +237160,7 @@ static Fts5ExprNode *fts5ParsePhraseToAnd(
+   if( pRet ){
+     pRet->eType = FTS5_AND;
+     pRet->nChild = nTerm;
++    pRet->iHeight = 1;
+     fts5ExprAssignXNext(pRet);
+     pParse->nPhrase--;
+     for(ii=0; iiapPhrase[0]->aTerm[ii];
++          Fts5ExprTerm *pTo = &pPhrase->aTerm[0];
+           pParse->apPhrase[pParse->nPhrase++] = pPhrase;
+           pPhrase->nTerm = 1;
+-          pPhrase->aTerm[0].zTerm = sqlite3Fts5Strndup(
+-              &pParse->rc, pNear->apPhrase[0]->aTerm[ii].zTerm, -1
+-          );
++          pTo->pTerm = sqlite3Fts5Strndup(&pParse->rc, p->pTerm, p->nFullTerm);
++          pTo->nQueryTerm = p->nQueryTerm;
++          pTo->nFullTerm = p->nFullTerm;
+           pRet->apChild[ii] = sqlite3Fts5ParseNode(pParse, FTS5_STRING,
+               0, 0, sqlite3Fts5ParseNearset(pParse, 0, pPhrase)
+           );
+@@ -225822,6 +237268,14 @@ static Fts5ExprNode *sqlite3Fts5ParseNode(
+         }else{
+           fts5ExprAddChildren(pRet, pLeft);
+           fts5ExprAddChildren(pRet, pRight);
++          if( pRet->iHeight>SQLITE_FTS5_MAX_EXPR_DEPTH ){
++            sqlite3Fts5ParseError(pParse,
++                "fts5 expression tree is too large (maximum depth %d)",
++                SQLITE_FTS5_MAX_EXPR_DEPTH
++            );
++            sqlite3_free(pRet);
++            pRet = 0;
++          }
+         }
+       }
+     }
+@@ -225900,7 +237354,7 @@ static Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
+   return pRet;
+ }
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ static char *fts5ExprTermPrint(Fts5ExprTerm *pTerm){
+   sqlite3_int64 nByte = 0;
+   Fts5ExprTerm *p;
+@@ -225908,16 +237362,17 @@ static char *fts5ExprTermPrint(Fts5ExprTerm *pTerm){
+ 
+   /* Determine the maximum amount of space required. */
+   for(p=pTerm; p; p=p->pSynonym){
+-    nByte += (int)strlen(pTerm->zTerm) * 2 + 3 + 2;
++    nByte += pTerm->nQueryTerm * 2 + 3 + 2;
+   }
+   zQuoted = sqlite3_malloc64(nByte);
+ 
+   if( zQuoted ){
+     int i = 0;
+     for(p=pTerm; p; p=p->pSynonym){
+-      char *zIn = p->zTerm;
++      char *zIn = p->pTerm;
++      char *zEnd = &zIn[p->nQueryTerm];
+       zQuoted[i++] = '"';
+-      while( *zIn ){
++      while( zInnTerm; iTerm++){
+-        char *zTerm = pPhrase->aTerm[iTerm].zTerm;
+-        zRet = fts5PrintfAppend(zRet, "%s%s", iTerm==0?"":" ", zTerm);
++        Fts5ExprTerm *p = &pPhrase->aTerm[iTerm];
++        zRet = fts5PrintfAppend(zRet, "%s%.*s", iTerm==0?"":" ",
++            p->nQueryTerm, p->pTerm
++        );
+         if( pPhrase->aTerm[iTerm].bPrefix ){
+           zRet = fts5PrintfAppend(zRet, "*");
+         }
+@@ -226006,6 +237463,8 @@ static char *fts5ExprPrintTcl(
+       if( zRet==0 ) return 0;
+     }
+ 
++  }else if( pExpr->eType==0 ){
++    zRet = sqlite3_mprintf("{}");
+   }else{
+     char const *zOp = 0;
+     int i;
+@@ -226267,14 +237726,14 @@ static void fts5ExprFold(
+     sqlite3_result_int(pCtx, sqlite3Fts5UnicodeFold(iCode, bRemoveDiacritics));
+   }
+ }
+-#endif /* ifdef SQLITE_TEST */
++#endif /* if SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+ /*
+ ** This is called during initialization to register the fts5_expr() scalar
+ ** UDF with the SQLite handle passed as the only argument.
+ */
+ static int sqlite3Fts5ExprInit(Fts5Global *pGlobal, sqlite3 *db){
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+   struct Fts5ExprFunc {
+     const char *z;
+     void (*x)(sqlite3_context*,int,sqlite3_value**);
+@@ -226395,6 +237854,17 @@ static int fts5ExprColsetTest(Fts5Colset *pColset, int iCol){
+   return 0;
+ }
+ 
++/*
++** pToken is a buffer nToken bytes in size that may or may not contain
++** an embedded 0x00 byte. If it does, return the number of bytes in
++** the buffer before the 0x00. If it does not, return nToken.
++*/
++static int fts5QueryTerm(const char *pToken, int nToken){
++  int ii;
++  for(ii=0; iipExpr;
+   int i;
++  int nQuery = nToken;
++  i64 iRowid = pExpr->pRoot->iRowid;
+ 
+   UNUSED_PARAM2(iUnused1, iUnused2);
+ 
+-  if( nToken>FTS5_MAX_TOKEN_SIZE ) nToken = FTS5_MAX_TOKEN_SIZE;
++  if( nQuery>FTS5_MAX_TOKEN_SIZE ) nQuery = FTS5_MAX_TOKEN_SIZE;
++  if( pExpr->pConfig->bTokendata ){
++    nQuery = fts5QueryTerm(pToken, nQuery);
++  }
+   if( (tflags & FTS5_TOKEN_COLOCATED)==0 ) p->iOff++;
+   for(i=0; inPhrase; i++){
+-    Fts5ExprTerm *pTerm;
++    Fts5ExprTerm *pT;
+     if( p->aPopulator[i].bOk==0 ) continue;
+-    for(pTerm=&pExpr->apExprPhrase[i]->aTerm[0]; pTerm; pTerm=pTerm->pSynonym){
+-      int nTerm = (int)strlen(pTerm->zTerm);
+-      if( (nTerm==nToken || (nTermbPrefix))
+-       && memcmp(pTerm->zTerm, pToken, nTerm)==0
++    for(pT=&pExpr->apExprPhrase[i]->aTerm[0]; pT; pT=pT->pSynonym){
++      if( (pT->nQueryTerm==nQuery || (pT->nQueryTermbPrefix))
++       && memcmp(pT->pTerm, pToken, pT->nQueryTerm)==0
+       ){
+         int rc = sqlite3Fts5PoslistWriterAppend(
+             &pExpr->apExprPhrase[i]->poslist, &p->aPopulator[i].writer, p->iOff
+         );
++        if( rc==SQLITE_OK && pExpr->pConfig->bTokendata && !pT->bPrefix ){
++          int iCol = p->iOff>>32;
++          int iTokOff = p->iOff & 0x7FFFFFFF;
++          rc = sqlite3Fts5IndexIterWriteTokendata(
++              pT->pIter, pToken, nToken, iRowid, iCol, iTokOff
++          );
++        }
+         if( rc ) return rc;
+         break;
+       }
+@@ -226557,6 +238038,83 @@ static int sqlite3Fts5ExprPhraseCollist(
+   return rc;
+ }
+ 
++/*
++** Does the work of the fts5_api.xQueryToken() API method.
++*/
++static int sqlite3Fts5ExprQueryToken(
++  Fts5Expr *pExpr,
++  int iPhrase,
++  int iToken,
++  const char **ppOut,
++  int *pnOut
++){
++  Fts5ExprPhrase *pPhrase = 0;
++
++  if( iPhrase<0 || iPhrase>=pExpr->nPhrase ){
++    return SQLITE_RANGE;
++  }
++  pPhrase = pExpr->apExprPhrase[iPhrase];
++  if( iToken<0 || iToken>=pPhrase->nTerm ){
++    return SQLITE_RANGE;
++  }
++
++  *ppOut = pPhrase->aTerm[iToken].pTerm;
++  *pnOut = pPhrase->aTerm[iToken].nFullTerm;
++  return SQLITE_OK;
++}
++
++/*
++** Does the work of the fts5_api.xInstToken() API method.
++*/
++static int sqlite3Fts5ExprInstToken(
++  Fts5Expr *pExpr,
++  i64 iRowid,
++  int iPhrase,
++  int iCol,
++  int iOff,
++  int iToken,
++  const char **ppOut,
++  int *pnOut
++){
++  Fts5ExprPhrase *pPhrase = 0;
++  Fts5ExprTerm *pTerm = 0;
++  int rc = SQLITE_OK;
++
++  if( iPhrase<0 || iPhrase>=pExpr->nPhrase ){
++    return SQLITE_RANGE;
++  }
++  pPhrase = pExpr->apExprPhrase[iPhrase];
++  if( iToken<0 || iToken>=pPhrase->nTerm ){
++    return SQLITE_RANGE;
++  }
++  pTerm = &pPhrase->aTerm[iToken];
++  if( pTerm->bPrefix==0 ){
++    if( pExpr->pConfig->bTokendata ){
++      rc = sqlite3Fts5IterToken(
++          pTerm->pIter, iRowid, iCol, iOff+iToken, ppOut, pnOut
++      );
++    }else{
++      *ppOut = pTerm->pTerm;
++      *pnOut = pTerm->nFullTerm;
++    }
++  }
++  return rc;
++}
++
++/*
++** Clear the token mappings for all Fts5IndexIter objects mannaged by
++** the expression passed as the only argument.
++*/
++static void sqlite3Fts5ExprClearTokens(Fts5Expr *pExpr){
++  int ii;
++  for(ii=0; iinPhrase; ii++){
++    Fts5ExprTerm *pT;
++    for(pT=&pExpr->apExprPhrase[ii]->aTerm[0]; pT; pT=pT->pSynonym){
++      sqlite3Fts5IndexIterClearTokendata(pT->pIter);
++    }
++  }
++}
++
+ /*
+ ** 2014 August 11
+ **
+@@ -226595,10 +238153,15 @@ struct Fts5Hash {
+ 
+ /*
+ ** Each entry in the hash table is represented by an object of the
+-** following type. Each object, its key (a nul-terminated string) and
+-** its current data are stored in a single memory allocation. The
+-** key immediately follows the object in memory. The position list
+-** data immediately follows the key data in memory.
++** following type. Each object, its key, and its current data are stored
++** in a single memory allocation. The key immediately follows the object
++** in memory. The position list data immediately follows the key data
++** in memory.
++**
++** The key is Fts5HashEntry.nKey bytes in size. It consists of a single
++** byte identifying the index (either the main term index or a prefix-index),
++** followed by the term data. For example: "0token". There is no
++** nul-terminator - in this case nKey=6.
+ **
+ ** The data that follows the key is in a similar, but not identical format
+ ** to the doclist data stored in the database. It is:
+@@ -226733,8 +238296,7 @@ static int fts5HashResize(Fts5Hash *pHash){
+       unsigned int iHash;
+       Fts5HashEntry *p = apOld[i];
+       apOld[i] = p->pHashNext;
+-      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p),
+-                          (int)strlen(fts5EntryKey(p)));
++      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p), p->nKey);
+       p->pHashNext = apNew[iHash];
+       apNew[iHash] = p;
+     }
+@@ -226818,7 +238380,7 @@ static int sqlite3Fts5HashWrite(
+   for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
+     char *zKey = fts5EntryKey(p);
+     if( zKey[0]==bByte
+-     && p->nKey==nToken
++     && p->nKey==nToken+1
+      && memcmp(&zKey[1], pToken, nToken)==0
+     ){
+       break;
+@@ -226848,9 +238410,9 @@ static int sqlite3Fts5HashWrite(
+     zKey[0] = bByte;
+     memcpy(&zKey[1], pToken, nToken);
+     assert( iHash==fts5HashKey(pHash->nSlot, (u8*)zKey, nToken+1) );
+-    p->nKey = nToken;
++    p->nKey = nToken+1;
+     zKey[nToken+1] = '\0';
+-    p->nData = nToken+1 + 1 + sizeof(Fts5HashEntry);
++    p->nData = nToken+1 + sizeof(Fts5HashEntry);
+     p->pHashNext = pHash->aSlot[iHash];
+     pHash->aSlot[iHash] = p;
+     pHash->nEntry++;
+@@ -226967,12 +238529,17 @@ static Fts5HashEntry *fts5HashEntryMerge(
+       *ppOut = p1;
+       p1 = 0;
+     }else{
+-      int i = 0;
+       char *zKey1 = fts5EntryKey(p1);
+       char *zKey2 = fts5EntryKey(p2);
+-      while( zKey1[i]==zKey2[i] ) i++;
++      int nMin = MIN(p1->nKey, p2->nKey);
++
++      int cmp = memcmp(zKey1, zKey2, nMin);
++      if( cmp==0 ){
++        cmp = p1->nKey - p2->nKey;
++      }
++      assert( cmp!=0 );
+ 
+-      if( ((u8)zKey1[i])>((u8)zKey2[i]) ){
++      if( cmp>0 ){
+         /* p2 is smaller */
+         *ppOut = p2;
+         ppOut = &p2->pScanNext;
+@@ -226991,10 +238558,8 @@ static Fts5HashEntry *fts5HashEntryMerge(
+ }
+ 
+ /*
+-** Extract all tokens from hash table iHash and link them into a list
+-** in sorted order. The hash table is cleared before returning. It is
+-** the responsibility of the caller to free the elements of the returned
+-** list.
++** Link all tokens from hash table iHash into a list in sorted order. The
++** tokens are not removed from the hash table.
+ */
+ static int fts5HashEntrySort(
+   Fts5Hash *pHash,
+@@ -227016,7 +238581,7 @@ static int fts5HashEntrySort(
+     Fts5HashEntry *pIter;
+     for(pIter=pHash->aSlot[iSlot]; pIter; pIter=pIter->pHashNext){
+       if( pTerm==0
+-       || (pIter->nKey+1>=nTerm && 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm))
++       || (pIter->nKey>=nTerm && 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm))
+       ){
+         Fts5HashEntry *pEntry = pIter;
+         pEntry->pScanNext = 0;
+@@ -227034,7 +238599,6 @@ static int fts5HashEntrySort(
+     pList = fts5HashEntryMerge(pList, ap[i]);
+   }
+ 
+-  pHash->nEntry = 0;
+   sqlite3_free(ap);
+   *ppSorted = pList;
+   return SQLITE_OK;
+@@ -227056,12 +238620,11 @@ static int sqlite3Fts5HashQuery(
+ 
+   for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
+     zKey = fts5EntryKey(p);
+-    assert( p->nKey+1==(int)strlen(zKey) );
+-    if( nTerm==p->nKey+1 && memcmp(zKey, pTerm, nTerm)==0 ) break;
++    if( nTerm==p->nKey && memcmp(zKey, pTerm, nTerm)==0 ) break;
+   }
+ 
+   if( p ){
+-    int nHashPre = sizeof(Fts5HashEntry) + nTerm + 1;
++    int nHashPre = sizeof(Fts5HashEntry) + nTerm;
+     int nList = p->nData - nHashPre;
+     u8 *pRet = (u8*)(*ppOut = sqlite3_malloc64(nPre + nList + 10));
+     if( pRet ){
+@@ -227088,6 +238651,28 @@ static int sqlite3Fts5HashScanInit(
+   return fts5HashEntrySort(p, pTerm, nTerm, &p->pScan);
+ }
+ 
++#ifdef SQLITE_DEBUG
++static int fts5HashCount(Fts5Hash *pHash){
++  int nEntry = 0;
++  int ii;
++  for(ii=0; iinSlot; ii++){
++    Fts5HashEntry *p = 0;
++    for(p=pHash->aSlot[ii]; p; p=p->pHashNext){
++      nEntry++;
++    }
++  }
++  return nEntry;
++}
++#endif
++
++/*
++** Return true if the hash table is empty, false otherwise.
++*/
++static int sqlite3Fts5HashIsEmpty(Fts5Hash *pHash){
++  assert( pHash->nEntry==fts5HashCount(pHash) );
++  return pHash->nEntry==0;
++}
++
+ static void sqlite3Fts5HashScanNext(Fts5Hash *p){
+   assert( !sqlite3Fts5HashScanEof(p) );
+   p->pScan = p->pScan->pScanNext;
+@@ -227100,19 +238685,22 @@ static int sqlite3Fts5HashScanEof(Fts5Hash *p){
+ static void sqlite3Fts5HashScanEntry(
+   Fts5Hash *pHash,
+   const char **pzTerm,            /* OUT: term (nul-terminated) */
++  int *pnTerm,                    /* OUT: Size of term in bytes */
+   const u8 **ppDoclist,           /* OUT: pointer to doclist */
+   int *pnDoclist                  /* OUT: size of doclist in bytes */
+ ){
+   Fts5HashEntry *p;
+   if( (p = pHash->pScan) ){
+     char *zKey = fts5EntryKey(p);
+-    int nTerm = (int)strlen(zKey);
++    int nTerm = p->nKey;
+     fts5HashAddPoslistSize(pHash, p, 0);
+     *pzTerm = zKey;
+-    *ppDoclist = (const u8*)&zKey[nTerm+1];
+-    *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm + 1);
++    *pnTerm = nTerm;
++    *ppDoclist = (const u8*)&zKey[nTerm];
++    *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm);
+   }else{
+     *pzTerm = 0;
++    *pnTerm = 0;
+     *ppDoclist = 0;
+     *pnDoclist = 0;
+   }
+@@ -227174,6 +238762,26 @@ static void sqlite3Fts5HashScanEntry(
+ # error "FTS5_MAX_PREFIX_INDEXES is too large"
+ #endif
+ 
++#define FTS5_MAX_LEVEL 64
++
++/*
++** There are two versions of the format used for the structure record:
++**
++**   1. the legacy format, that may be read by all fts5 versions, and
++**
++**   2. the V2 format, which is used by contentless_delete=1 databases.
++**
++** Both begin with a 4-byte "configuration cookie" value. Then, a legacy
++** format structure record contains a varint - the number of levels in
++** the structure. Whereas a V2 structure record contains the constant
++** 4 bytes [0xff 0x00 0x00 0x01]. This is unambiguous as the value of a
++** varint has to be at least 16256 to begin with "0xFF". And the default
++** maximum number of levels is 64.
++**
++** See below for more on structure record formats.
++*/
++#define FTS5_STRUCTURE_V2 "\xFF\x00\x00\x01"
++
+ /*
+ ** Details:
+ **
+@@ -227181,7 +238789,7 @@ static void sqlite3Fts5HashScanEntry(
+ **
+ **     CREATE TABLE %_data(id INTEGER PRIMARY KEY, block BLOB);
+ **
+-** , contains the following 5 types of records. See the comments surrounding
++** , contains the following 6 types of records. See the comments surrounding
+ ** the FTS5_*_ROWID macros below for a description of how %_data rowids are
+ ** assigned to each fo them.
+ **
+@@ -227190,12 +238798,12 @@ static void sqlite3Fts5HashScanEntry(
+ **   The set of segments that make up an index - the index structure - are
+ **   recorded in a single record within the %_data table. The record consists
+ **   of a single 32-bit configuration cookie value followed by a list of
+-**   SQLite varints. If the FTS table features more than one index (because
+-**   there are one or more prefix indexes), it is guaranteed that all share
+-**   the same cookie value.
++**   SQLite varints.
+ **
+-**   Immediately following the configuration cookie, the record begins with
+-**   three varints:
++**   If the structure record is a V2 record, the configuration cookie is
++**   followed by the following 4 bytes: [0xFF 0x00 0x00 0x01].
++**
++**   Next, the record continues with three varints:
+ **
+ **     + number of levels,
+ **     + total number of segments on all levels,
+@@ -227210,6 +238818,12 @@ static void sqlite3Fts5HashScanEntry(
+ **         + first leaf page number (often 1, always greater than 0)
+ **         + final leaf page number
+ **
++**      Then, for V2 structures only:
++**
++**         + lower origin counter value,
++**         + upper origin counter value,
++**         + the number of tombstone hash pages.
++**
+ ** 2. The Averages Record:
+ **
+ **   A single record within the %_data table. The data is a list of varints.
+@@ -227325,6 +238939,38 @@ static void sqlite3Fts5HashScanEntry(
+ **     * A list of delta-encoded varints - the first rowid on each subsequent
+ **       child page.
+ **
++** 6. Tombstone Hash Page
++**
++**   These records are only ever present in contentless_delete=1 tables.
++**   There are zero or more of these associated with each segment. They
++**   are used to store the tombstone rowids for rows contained in the
++**   associated segments.
++**
++**   The set of nHashPg tombstone hash pages associated with a single
++**   segment together form a single hash table containing tombstone rowids.
++**   To find the page of the hash on which a key might be stored:
++**
++**       iPg = (rowid % nHashPg)
++**
++**   Then, within page iPg, which has nSlot slots:
++**
++**       iSlot = (rowid / nHashPg) % nSlot
++**
++**   Each tombstone hash page begins with an 8 byte header:
++**
++**     1-byte:  Key-size (the size in bytes of each slot). Either 4 or 8.
++**     1-byte:  rowid-0-tombstone flag. This flag is only valid on the
++**              first tombstone hash page for each segment (iPg=0). If set,
++**              the hash table contains rowid 0. If clear, it does not.
++**              Rowid 0 is handled specially.
++**     2-bytes: unused.
++**     4-bytes: Big-endian integer containing number of entries on page.
++**
++**   Following this are nSlot 4 or 8 byte slots (depending on the key-size
++**   in the first byte of the page header). The number of slots may be
++**   determined based on the size of the page record and the key-size:
++**
++**     nSlot = (nByte - 8) / key-size
+ */
+ 
+ /*
+@@ -227358,6 +239004,7 @@ static void sqlite3Fts5HashScanEntry(
+ 
+ #define FTS5_SEGMENT_ROWID(segid, pgno)       fts5_dri(segid, 0, 0, pgno)
+ #define FTS5_DLIDX_ROWID(segid, height, pgno) fts5_dri(segid, 1, height, pgno)
++#define FTS5_TOMBSTONE_ROWID(segid,ipg)       fts5_dri(segid+(1<<16), 0, 0, ipg)
+ 
+ #ifdef SQLITE_DEBUG
+ static int sqlite3Fts5Corrupt() { return SQLITE_CORRUPT_VTAB; }
+@@ -227384,6 +239031,9 @@ typedef struct Fts5SegWriter Fts5SegWriter;
+ typedef struct Fts5Structure Fts5Structure;
+ typedef struct Fts5StructureLevel Fts5StructureLevel;
+ typedef struct Fts5StructureSegment Fts5StructureSegment;
++typedef struct Fts5TokenDataIter Fts5TokenDataIter;
++typedef struct Fts5TokenDataMap Fts5TokenDataMap;
++typedef struct Fts5TombstoneArray Fts5TombstoneArray;
+ 
+ struct Fts5Data {
+   u8 *p;                          /* Pointer to buffer containing record */
+@@ -227393,6 +239043,12 @@ struct Fts5Data {
+ 
+ /*
+ ** One object per %_data table.
++**
++** nContentlessDelete:
++**   The number of contentless delete operations since the most recent
++**   call to fts5IndexFlush() or fts5IndexDiscardData(). This is tracked
++**   so that extra auto-merge work can be done by fts5IndexFlush() to
++**   account for the delete operations.
+ */
+ struct Fts5Index {
+   Fts5Config *pConfig;            /* Virtual table configuration */
+@@ -227407,9 +239063,12 @@ struct Fts5Index {
+   int nPendingData;               /* Current bytes of pending data */
+   i64 iWriteRowid;                /* Rowid for current doc being written */
+   int bDelete;                    /* Current write is a delete */
++  int nContentlessDelete;         /* Number of contentless delete ops */
++  int nPendingRow;                /* Number of INSERT in hash table */
+ 
+   /* Error state. */
+   int rc;                         /* Current error code */
++  int flushRc;
+ 
+   /* State used by the fts5DataXXX() functions. */
+   sqlite3_blob *pReader;          /* RO incr-blob open on %_data table */
+@@ -227418,8 +239077,11 @@ struct Fts5Index {
+   sqlite3_stmt *pIdxWriter;       /* "INSERT ... %_idx VALUES(?,?,?,?)" */
+   sqlite3_stmt *pIdxDeleter;      /* "DELETE FROM %_idx WHERE segid=?" */
+   sqlite3_stmt *pIdxSelect;
++  sqlite3_stmt *pIdxNextSelect;
+   int nRead;                      /* Total number of blocks read */
+ 
++  sqlite3_stmt *pDeleteFromIdx;
++
+   sqlite3_stmt *pDataVersion;
+   i64 iStructVersion;             /* data_version when pStruct read */
+   Fts5Structure *pStruct;         /* Current db structure (or NULL) */
+@@ -227439,11 +239101,23 @@ struct Fts5DoclistIter {
+ ** The contents of the "structure" record for each index are represented
+ ** using an Fts5Structure record in memory. Which uses instances of the
+ ** other Fts5StructureXXX types as components.
++**
++** nOriginCntr:
++**   This value is set to non-zero for structure records created for
++**   contentlessdelete=1 tables only. In that case it represents the
++**   origin value to apply to the next top-level segment created.
+ */
+ struct Fts5StructureSegment {
+   int iSegid;                     /* Segment id */
+   int pgnoFirst;                  /* First leaf page number in segment */
+   int pgnoLast;                   /* Last leaf page number in segment */
++
++  /* contentlessdelete=1 tables only: */
++  u64 iOrigin1;
++  u64 iOrigin2;
++  int nPgTombstone;               /* Number of tombstone hash table pages */
++  u64 nEntryTombstone;            /* Number of tombstone entries that "count" */
++  u64 nEntry;                     /* Number of rows in this segment */
+ };
+ struct Fts5StructureLevel {
+   int nMerge;                     /* Number of segments in incr-merge */
+@@ -227453,6 +239127,7 @@ struct Fts5StructureLevel {
+ struct Fts5Structure {
+   int nRef;                       /* Object reference count */
+   u64 nWriteCounter;              /* Total leaves written to level 0 */
++  u64 nOriginCntr;                /* Origin value for next top-level segment */
+   int nSegment;                   /* Total segments in this structure */
+   int nLevel;                     /* Number of levels in this index */
+   Fts5StructureLevel aLevel[1];   /* Array of nLevel level objects */
+@@ -227512,9 +239187,6 @@ struct Fts5CResult {
+ ** iLeafOffset:
+ **   Byte offset within the current leaf that is the first byte of the
+ **   position list data (one byte passed the position-list size field).
+-**   rowid field of the current entry. Usually this is the size field of the
+-**   position list data. The exception is if the rowid for the current entry
+-**   is the last thing on the leaf page.
+ **
+ ** pLeaf:
+ **   Buffer containing current leaf page data. Set to NULL at EOF.
+@@ -227544,6 +239216,13 @@ struct Fts5CResult {
+ **
+ ** iTermIdx:
+ **     Index of current term on iTermLeafPgno.
++**
++** apTombstone/nTombstone:
++**     These are used for contentless_delete=1 tables only. When the cursor
++**     is first allocated, the apTombstone[] array is allocated so that it
++**     is large enough for all tombstones hash pages associated with the
++**     segment. The pages themselves are loaded lazily from the database as
++**     they are required.
+ */
+ struct Fts5SegIter {
+   Fts5StructureSegment *pSeg;     /* Segment to iterate through */
+@@ -227552,6 +239231,7 @@ struct Fts5SegIter {
+   Fts5Data *pLeaf;                /* Current leaf data */
+   Fts5Data *pNextLeaf;            /* Leaf page (iLeafPgno+1) */
+   i64 iLeafOffset;                /* Byte offset within current leaf */
++  Fts5TombstoneArray *pTombArray; /* Array of tombstone pages */
+ 
+   /* Next method */
+   void (*xNext)(Fts5Index*, Fts5SegIter*, int*);
+@@ -227578,6 +239258,15 @@ struct Fts5SegIter {
+   u8 bDel;                        /* True if the delete flag is set */
+ };
+ 
++/*
++** Array of tombstone pages. Reference counted.
++*/
++struct Fts5TombstoneArray {
++  int nRef;                       /* Number of pointers to this object */
++  int nTombstone;
++  Fts5Data *apTombstone[1];       /* Array of tombstone pages */
++};
++
+ /*
+ ** Argument is a pointer to an Fts5Data structure that contains a
+ ** leaf page.
+@@ -227622,9 +239311,16 @@ struct Fts5SegIter {
+ ** poslist:
+ **   Used by sqlite3Fts5IterPoslist() when the poslist needs to be buffered.
+ **   There is no way to tell if this is populated or not.
++**
++** pColset:
++**   If not NULL, points to an object containing a set of column indices.
++**   Only matches that occur in one of these columns will be returned.
++**   The Fts5Iter does not own the Fts5Colset object, and so it is not
++**   freed when the iterator is closed - it is owned by the upper layer.
+ */
+ struct Fts5Iter {
+   Fts5IndexIter base;             /* Base class containing output vars */
++  Fts5TokenDataIter *pTokenDataIter;
+ 
+   Fts5Index *pIndex;              /* Index that owns this iterator */
+   Fts5Buffer poslist;             /* Buffer containing current poslist */
+@@ -227642,7 +239338,6 @@ struct Fts5Iter {
+   Fts5SegIter aSeg[1];            /* Array of segment iterators */
+ };
+ 
+-
+ /*
+ ** An instance of the following type is used to iterate through the contents
+ ** of a doclist-index record.
+@@ -227681,6 +239376,60 @@ static u16 fts5GetU16(const u8 *aIn){
+   return ((u16)aIn[0] << 8) + aIn[1];
+ }
+ 
++/*
++** The only argument points to a buffer at least 8 bytes in size. This
++** function interprets the first 8 bytes of the buffer as a 64-bit big-endian
++** unsigned integer and returns the result.
++*/
++static u64 fts5GetU64(u8 *a){
++  return ((u64)a[0] << 56)
++       + ((u64)a[1] << 48)
++       + ((u64)a[2] << 40)
++       + ((u64)a[3] << 32)
++       + ((u64)a[4] << 24)
++       + ((u64)a[5] << 16)
++       + ((u64)a[6] << 8)
++       + ((u64)a[7] << 0);
++}
++
++/*
++** The only argument points to a buffer at least 4 bytes in size. This
++** function interprets the first 4 bytes of the buffer as a 32-bit big-endian
++** unsigned integer and returns the result.
++*/
++static u32 fts5GetU32(const u8 *a){
++  return ((u32)a[0] << 24)
++       + ((u32)a[1] << 16)
++       + ((u32)a[2] << 8)
++       + ((u32)a[3] << 0);
++}
++
++/*
++** Write iVal, formated as a 64-bit big-endian unsigned integer, to the
++** buffer indicated by the first argument.
++*/
++static void fts5PutU64(u8 *a, u64 iVal){
++  a[0] = ((iVal >> 56) & 0xFF);
++  a[1] = ((iVal >> 48) & 0xFF);
++  a[2] = ((iVal >> 40) & 0xFF);
++  a[3] = ((iVal >> 32) & 0xFF);
++  a[4] = ((iVal >> 24) & 0xFF);
++  a[5] = ((iVal >> 16) & 0xFF);
++  a[6] = ((iVal >>  8) & 0xFF);
++  a[7] = ((iVal >>  0) & 0xFF);
++}
++
++/*
++** Write iVal, formated as a 32-bit big-endian unsigned integer, to the
++** buffer indicated by the first argument.
++*/
++static void fts5PutU32(u8 *a, u32 iVal){
++  a[0] = ((iVal >> 24) & 0xFF);
++  a[1] = ((iVal >> 16) & 0xFF);
++  a[2] = ((iVal >>  8) & 0xFF);
++  a[3] = ((iVal >>  0) & 0xFF);
++}
++
+ /*
+ ** Allocate and return a buffer at least nByte bytes in size.
+ **
+@@ -227908,10 +239657,17 @@ static void fts5DataDelete(Fts5Index *p, i64 iFirst, i64 iLast){
+ /*
+ ** Remove all records associated with segment iSegid.
+ */
+-static void fts5DataRemoveSegment(Fts5Index *p, int iSegid){
++static void fts5DataRemoveSegment(Fts5Index *p, Fts5StructureSegment *pSeg){
++  int iSegid = pSeg->iSegid;
+   i64 iFirst = FTS5_SEGMENT_ROWID(iSegid, 0);
+   i64 iLast = FTS5_SEGMENT_ROWID(iSegid+1, 0)-1;
+   fts5DataDelete(p, iFirst, iLast);
++
++  if( pSeg->nPgTombstone ){
++    i64 iTomb1 = FTS5_TOMBSTONE_ROWID(iSegid, 0);
++    i64 iTomb2 = FTS5_TOMBSTONE_ROWID(iSegid, pSeg->nPgTombstone-1);
++    fts5DataDelete(p, iTomb1, iTomb2);
++  }
+   if( p->pIdxDeleter==0 ){
+     Fts5Config *pConfig = p->pConfig;
+     fts5IndexPrepareStmt(p, &p->pIdxDeleter, sqlite3_mprintf(
+@@ -228022,11 +239778,19 @@ static int fts5StructureDecode(
+   int nSegment = 0;
+   sqlite3_int64 nByte;            /* Bytes of space to allocate at pRet */
+   Fts5Structure *pRet = 0;        /* Structure object to return */
++  int bStructureV2 = 0;           /* True for FTS5_STRUCTURE_V2 */
++  u64 nOriginCntr = 0;            /* Largest origin value seen so far */
+ 
+   /* Grab the cookie value */
+   if( piCookie ) *piCookie = sqlite3Fts5Get32(pData);
+   i = 4;
+ 
++  /* Check if this is a V2 structure record. Set bStructureV2 if it is. */
++  if( 0==memcmp(&pData[i], FTS5_STRUCTURE_V2, 4) ){
++    i += 4;
++    bStructureV2 = 1;
++  }
++
+   /* Read the total number of levels and segments from the start of the
+   ** structure record.  */
+   i += fts5GetVarint32(&pData[i], nLevel);
+@@ -228073,9 +239837,18 @@ static int fts5StructureDecode(
+             rc = FTS5_CORRUPT;
+             break;
+           }
++          assert( pSeg!=0 );
+           i += fts5GetVarint32(&pData[i], pSeg->iSegid);
+           i += fts5GetVarint32(&pData[i], pSeg->pgnoFirst);
+           i += fts5GetVarint32(&pData[i], pSeg->pgnoLast);
++          if( bStructureV2 ){
++            i += fts5GetVarint(&pData[i], &pSeg->iOrigin1);
++            i += fts5GetVarint(&pData[i], &pSeg->iOrigin2);
++            i += fts5GetVarint32(&pData[i], pSeg->nPgTombstone);
++            i += fts5GetVarint(&pData[i], &pSeg->nEntryTombstone);
++            i += fts5GetVarint(&pData[i], &pSeg->nEntry);
++            nOriginCntr = MAX(nOriginCntr, pSeg->iOrigin2);
++          }
+           if( pSeg->pgnoLastpgnoFirst ){
+             rc = FTS5_CORRUPT;
+             break;
+@@ -228086,6 +239859,9 @@ static int fts5StructureDecode(
+       }
+     }
+     if( nSegment!=0 && rc==SQLITE_OK ) rc = FTS5_CORRUPT;
++    if( bStructureV2 ){
++      pRet->nOriginCntr = nOriginCntr+1;
++    }
+ 
+     if( rc!=SQLITE_OK ){
+       fts5StructureRelease(pRet);
+@@ -228103,6 +239879,7 @@ static int fts5StructureDecode(
+ */
+ static void fts5StructureAddLevel(int *pRc, Fts5Structure **ppStruct){
+   fts5StructureMakeWritable(pRc, ppStruct);
++  assert( (ppStruct!=0 && (*ppStruct)!=0) || (*pRc)!=SQLITE_OK );
+   if( *pRc==SQLITE_OK ){
+     Fts5Structure *pStruct = *ppStruct;
+     int nLevel = pStruct->nLevel;
+@@ -228297,6 +240074,7 @@ static void fts5StructureWrite(Fts5Index *p, Fts5Structure *pStruct){
+     Fts5Buffer buf;               /* Buffer to serialize record into */
+     int iLvl;                     /* Used to iterate through levels */
+     int iCookie;                  /* Cookie value to store */
++    int nHdr = (pStruct->nOriginCntr>0 ? (4+4+9+9+9) : (4+9+9));
+ 
+     assert( pStruct->nSegment==fts5StructureCountSegments(pStruct) );
+     memset(&buf, 0, sizeof(Fts5Buffer));
+@@ -228305,9 +240083,12 @@ static void fts5StructureWrite(Fts5Index *p, Fts5Structure *pStruct){
+     iCookie = p->pConfig->iCookie;
+     if( iCookie<0 ) iCookie = 0;
+ 
+-    if( 0==sqlite3Fts5BufferSize(&p->rc, &buf, 4+9+9+9) ){
++    if( 0==sqlite3Fts5BufferSize(&p->rc, &buf, nHdr) ){
+       sqlite3Fts5Put32(buf.p, iCookie);
+       buf.n = 4;
++      if( pStruct->nOriginCntr>0 ){
++        fts5BufferSafeAppendBlob(&buf, FTS5_STRUCTURE_V2, 4);
++      }
+       fts5BufferSafeAppendVarint(&buf, pStruct->nLevel);
+       fts5BufferSafeAppendVarint(&buf, pStruct->nSegment);
+       fts5BufferSafeAppendVarint(&buf, (i64)pStruct->nWriteCounter);
+@@ -228321,9 +240102,17 @@ static void fts5StructureWrite(Fts5Index *p, Fts5Structure *pStruct){
+       assert( pLvl->nMerge<=pLvl->nSeg );
+ 
+       for(iSeg=0; iSegnSeg; iSeg++){
+-        fts5BufferAppendVarint(&p->rc, &buf, pLvl->aSeg[iSeg].iSegid);
+-        fts5BufferAppendVarint(&p->rc, &buf, pLvl->aSeg[iSeg].pgnoFirst);
+-        fts5BufferAppendVarint(&p->rc, &buf, pLvl->aSeg[iSeg].pgnoLast);
++        Fts5StructureSegment *pSeg = &pLvl->aSeg[iSeg];
++        fts5BufferAppendVarint(&p->rc, &buf, pSeg->iSegid);
++        fts5BufferAppendVarint(&p->rc, &buf, pSeg->pgnoFirst);
++        fts5BufferAppendVarint(&p->rc, &buf, pSeg->pgnoLast);
++        if( pStruct->nOriginCntr>0 ){
++          fts5BufferAppendVarint(&p->rc, &buf, pSeg->iOrigin1);
++          fts5BufferAppendVarint(&p->rc, &buf, pSeg->iOrigin2);
++          fts5BufferAppendVarint(&p->rc, &buf, pSeg->nPgTombstone);
++          fts5BufferAppendVarint(&p->rc, &buf, pSeg->nEntryTombstone);
++          fts5BufferAppendVarint(&p->rc, &buf, pSeg->nEntry);
++        }
+       }
+     }
+ 
+@@ -228466,9 +240255,9 @@ static int fts5DlidxLvlNext(Fts5DlidxLvl *pLvl){
+     }
+ 
+     if( iOffnn ){
+-      i64 iVal;
++      u64 iVal;
+       pLvl->iLeafPgno += (iOff - pLvl->iOff) + 1;
+-      iOff += fts5GetVarint(&pData->p[iOff], (u64*)&iVal);
++      iOff += fts5GetVarint(&pData->p[iOff], &iVal);
+       pLvl->iRowid += iVal;
+       pLvl->iOff = iOff;
+     }else{
+@@ -228561,42 +240350,25 @@ static int fts5DlidxLvlPrev(Fts5DlidxLvl *pLvl){
+     pLvl->bEof = 1;
+   }else{
+     u8 *a = pLvl->pData->p;
+-    i64 iVal;
+-    int iLimit;
+-    int ii;
+-    int nZero = 0;
+-
+-    /* Currently iOff points to the first byte of a varint. This block
+-    ** decrements iOff until it points to the first byte of the previous
+-    ** varint. Taking care not to read any memory locations that occur
+-    ** before the buffer in memory.  */
+-    iLimit = (iOff>9 ? iOff-9 : 0);
+-    for(iOff--; iOff>iLimit; iOff--){
+-      if( (a[iOff-1] & 0x80)==0 ) break;
+-    }
+-
+-    fts5GetVarint(&a[iOff], (u64*)&iVal);
+-    pLvl->iRowid -= iVal;
+-    pLvl->iLeafPgno--;
+-
+-    /* Skip backwards past any 0x00 varints. */
+-    for(ii=iOff-1; ii>=pLvl->iFirstOff && a[ii]==0x00; ii--){
+-      nZero++;
+-    }
+-    if( ii>=pLvl->iFirstOff && (a[ii] & 0x80) ){
+-      /* The byte immediately before the last 0x00 byte has the 0x80 bit
+-      ** set. So the last 0x00 is only a varint 0 if there are 8 more 0x80
+-      ** bytes before a[ii]. */
+-      int bZero = 0;              /* True if last 0x00 counts */
+-      if( (ii-8)>=pLvl->iFirstOff ){
+-        int j;
+-        for(j=1; j<=8 && (a[ii-j] & 0x80); j++);
+-        bZero = (j>8);
++
++    pLvl->iOff = 0;
++    fts5DlidxLvlNext(pLvl);
++    while( 1 ){
++      int nZero = 0;
++      int ii = pLvl->iOff;
++      u64 delta = 0;
++
++      while( a[ii]==0 ){
++        nZero++;
++        ii++;
+       }
+-      if( bZero==0 ) nZero--;
++      ii += sqlite3Fts5GetVarint(&a[ii], &delta);
++
++      if( ii>=iOff ) break;
++      pLvl->iLeafPgno += nZero+1;
++      pLvl->iRowid += delta;
++      pLvl->iOff = ii;
+     }
+-    pLvl->iLeafPgno -= nZero;
+-    pLvl->iOff = iOff - nZero;
+   }
+ 
+   return pLvl->bEof;
+@@ -228792,7 +240564,7 @@ static void fts5SegIterLoadRowid(Fts5Index *p, Fts5SegIter *pIter){
+   i64 iOff = pIter->iLeafOffset;
+ 
+   ASSERT_SZLEAF_OK(pIter->pLeaf);
+-  if( iOff>=pIter->pLeaf->szLeaf ){
++  while( iOff>=pIter->pLeaf->szLeaf ){
+     fts5SegIterNextPage(p, pIter);
+     if( pIter->pLeaf==0 ){
+       if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
+@@ -228863,6 +240635,25 @@ static void fts5SegIterSetNext(Fts5Index *p, Fts5SegIter *pIter){
+   }
+ }
+ 
++/*
++** Allocate a tombstone hash page array object (pIter->pTombArray) for
++** the iterator passed as the second argument. If an OOM error occurs,
++** leave an error in the Fts5Index object.
++*/
++static void fts5SegIterAllocTombstone(Fts5Index *p, Fts5SegIter *pIter){
++  const int nTomb = pIter->pSeg->nPgTombstone;
++  if( nTomb>0 ){
++    int nByte = nTomb * sizeof(Fts5Data*) + sizeof(Fts5TombstoneArray);
++    Fts5TombstoneArray *pNew;
++    pNew = (Fts5TombstoneArray*)sqlite3Fts5MallocZero(&p->rc, nByte);
++    if( pNew ){
++      pNew->nTombstone = nTomb;
++      pNew->nRef = 1;
++      pIter->pTombArray = pNew;
++    }
++  }
++}
++
+ /*
+ ** Initialize the iterator object pIter to iterate through the entries in
+ ** segment pSeg. The iterator is left pointing to the first entry when
+@@ -228891,10 +240682,12 @@ static void fts5SegIterInit(
+     fts5SegIterSetNext(p, pIter);
+     pIter->pSeg = pSeg;
+     pIter->iLeafPgno = pSeg->pgnoFirst-1;
+-    fts5SegIterNextPage(p, pIter);
++    do {
++      fts5SegIterNextPage(p, pIter);
++    }while( p->rc==SQLITE_OK && pIter->pLeaf && pIter->pLeaf->nn==4 );
+   }
+ 
+-  if( p->rc==SQLITE_OK ){
++  if( p->rc==SQLITE_OK && pIter->pLeaf ){
+     pIter->iLeafOffset = 4;
+     assert( pIter->pLeaf!=0 );
+     assert_nc( pIter->pLeaf->nn>4 );
+@@ -228902,6 +240695,7 @@ static void fts5SegIterInit(
+     pIter->iPgidxOff = pIter->pLeaf->szLeaf+1;
+     fts5SegIterLoadTerm(p, pIter, 0);
+     fts5SegIterLoadNPos(p, pIter);
++    fts5SegIterAllocTombstone(p, pIter);
+   }
+ }
+ 
+@@ -229088,7 +240882,7 @@ static void fts5SegIterNext_None(
+   iOff = pIter->iLeafOffset;
+ 
+   /* Next entry is on the next page */
+-  if( pIter->pSeg && iOff>=pIter->pLeaf->szLeaf ){
++  while( pIter->pSeg && iOff>=pIter->pLeaf->szLeaf ){
+     fts5SegIterNextPage(p, pIter);
+     if( p->rc || pIter->pLeaf==0 ) return;
+     pIter->iRowid = 0;
+@@ -229112,15 +240906,16 @@ static void fts5SegIterNext_None(
+     }else{
+       const u8 *pList = 0;
+       const char *zTerm = 0;
++      int nTerm = 0;
+       int nList;
+       sqlite3Fts5HashScanNext(p->pHash);
+-      sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList);
++      sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &nTerm, &pList, &nList);
+       if( pList==0 ) goto next_none_eof;
+       pIter->pLeaf->p = (u8*)pList;
+       pIter->pLeaf->nn = nList;
+       pIter->pLeaf->szLeaf = nList;
+       pIter->iEndofDoclist = nList;
+-      sqlite3Fts5BufferSet(&p->rc,&pIter->term, (int)strlen(zTerm), (u8*)zTerm);
++      sqlite3Fts5BufferSet(&p->rc,&pIter->term, nTerm, (u8*)zTerm);
+       pIter->iLeafOffset = fts5GetVarint(pList, (u64*)&pIter->iRowid);
+     }
+ 
+@@ -229186,11 +240981,12 @@ static void fts5SegIterNext(
+   }else if( pIter->pSeg==0 ){
+     const u8 *pList = 0;
+     const char *zTerm = 0;
++    int nTerm = 0;
+     int nList = 0;
+     assert( (pIter->flags & FTS5_SEGITER_ONETERM) || pbNewTerm );
+     if( 0==(pIter->flags & FTS5_SEGITER_ONETERM) ){
+       sqlite3Fts5HashScanNext(p->pHash);
+-      sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList);
++      sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &nTerm, &pList, &nList);
+     }
+     if( pList==0 ){
+       fts5DataRelease(pIter->pLeaf);
+@@ -229200,8 +240996,7 @@ static void fts5SegIterNext(
+       pIter->pLeaf->nn = nList;
+       pIter->pLeaf->szLeaf = nList;
+       pIter->iEndofDoclist = nList+1;
+-      sqlite3Fts5BufferSet(&p->rc, &pIter->term, (int)strlen(zTerm),
+-          (u8*)zTerm);
++      sqlite3Fts5BufferSet(&p->rc, &pIter->term, nTerm, (u8*)zTerm);
+       pIter->iLeafOffset = fts5GetVarint(pList, (u64*)&pIter->iRowid);
+       *pbNewTerm = 1;
+     }
+@@ -229281,7 +241076,7 @@ static void fts5SegIterReverse(Fts5Index *p, Fts5SegIter *pIter){
+   Fts5Data *pLast = 0;
+   int pgnoLast = 0;
+ 
+-  if( pDlidx ){
++  if( pDlidx && p->pConfig->iVersion==FTS5_CURRENT_VERSION ){
+     int iSegid = pIter->pSeg->iSegid;
+     pgnoLast = fts5DlidxIterPgno(pDlidx);
+     pLast = fts5LeafRead(p, FTS5_SEGMENT_ROWID(iSegid, pgnoLast));
+@@ -229587,7 +241382,7 @@ static void fts5SegIterSeekInit(
+     fts5LeafSeek(p, bGe, pIter, pTerm, nTerm);
+   }
+ 
+-  if( p->rc==SQLITE_OK && bGe==0 ){
++  if( p->rc==SQLITE_OK && (bGe==0 || (flags & FTS5INDEX_QUERY_SCANONETERM)) ){
+     pIter->flags |= FTS5_SEGITER_ONETERM;
+     if( pIter->pLeaf ){
+       if( flags & FTS5INDEX_QUERY_DESC ){
+@@ -229603,6 +241398,9 @@ static void fts5SegIterSeekInit(
+   }
+ 
+   fts5SegIterSetNext(p, pIter);
++  if( 0==(flags & FTS5INDEX_QUERY_SCANONETERM) ){
++    fts5SegIterAllocTombstone(p, pIter);
++  }
+ 
+   /* Either:
+   **
+@@ -229619,6 +241417,79 @@ static void fts5SegIterSeekInit(
+   );
+ }
+ 
++
++/*
++** SQL used by fts5SegIterNextInit() to find the page to open.
++*/
++static sqlite3_stmt *fts5IdxNextStmt(Fts5Index *p){
++  if( p->pIdxNextSelect==0 ){
++    Fts5Config *pConfig = p->pConfig;
++    fts5IndexPrepareStmt(p, &p->pIdxNextSelect, sqlite3_mprintf(
++          "SELECT pgno FROM '%q'.'%q_idx' WHERE "
++          "segid=? AND term>? ORDER BY term ASC LIMIT 1",
++          pConfig->zDb, pConfig->zName
++    ));
++
++  }
++  return p->pIdxNextSelect;
++}
++
++/*
++** This is similar to fts5SegIterSeekInit(), except that it initializes
++** the segment iterator to point to the first term following the page
++** with pToken/nToken on it.
++*/
++static void fts5SegIterNextInit(
++  Fts5Index *p,
++  const char *pTerm, int nTerm,
++  Fts5StructureSegment *pSeg,     /* Description of segment */
++  Fts5SegIter *pIter              /* Object to populate */
++){
++  int iPg = -1;                   /* Page of segment to open */
++  int bDlidx = 0;
++  sqlite3_stmt *pSel = 0;         /* SELECT to find iPg */
++
++  pSel = fts5IdxNextStmt(p);
++  if( pSel ){
++    assert( p->rc==SQLITE_OK );
++    sqlite3_bind_int(pSel, 1, pSeg->iSegid);
++    sqlite3_bind_blob(pSel, 2, pTerm, nTerm, SQLITE_STATIC);
++
++    if( sqlite3_step(pSel)==SQLITE_ROW ){
++      i64 val = sqlite3_column_int64(pSel, 0);
++      iPg = (int)(val>>1);
++      bDlidx = (val & 0x0001);
++    }
++    p->rc = sqlite3_reset(pSel);
++    sqlite3_bind_null(pSel, 2);
++    if( p->rc ) return;
++  }
++
++  memset(pIter, 0, sizeof(*pIter));
++  pIter->pSeg = pSeg;
++  pIter->flags |= FTS5_SEGITER_ONETERM;
++  if( iPg>=0 ){
++    pIter->iLeafPgno = iPg - 1;
++    fts5SegIterNextPage(p, pIter);
++    fts5SegIterSetNext(p, pIter);
++  }
++  if( pIter->pLeaf ){
++    const u8 *a = pIter->pLeaf->p;
++    int iTermOff = 0;
++
++    pIter->iPgidxOff = pIter->pLeaf->szLeaf;
++    pIter->iPgidxOff += fts5GetVarint32(&a[pIter->iPgidxOff], iTermOff);
++    pIter->iLeafOffset = iTermOff;
++    fts5SegIterLoadTerm(p, pIter, 0);
++    fts5SegIterLoadNPos(p, pIter);
++    if( bDlidx ) fts5SegIterLoadDlidx(p, pIter);
++
++    assert( p->rc!=SQLITE_OK ||
++        fts5BufferCompareBlob(&pIter->term, (const u8*)pTerm, nTerm)>0
++    );
++  }
++}
++
+ /*
+ ** Initialize the object pIter to point to term pTerm/nTerm within the
+ ** in-memory hash table. If there is no such term in the hash-table, the
+@@ -229645,14 +241516,21 @@ static void fts5SegIterHashInit(
+     const u8 *pList = 0;
+ 
+     p->rc = sqlite3Fts5HashScanInit(p->pHash, (const char*)pTerm, nTerm);
+-    sqlite3Fts5HashScanEntry(p->pHash, (const char**)&z, &pList, &nList);
+-    n = (z ? (int)strlen((const char*)z) : 0);
++    sqlite3Fts5HashScanEntry(p->pHash, (const char**)&z, &n, &pList, &nList);
+     if( pList ){
+       pLeaf = fts5IdxMalloc(p, sizeof(Fts5Data));
+       if( pLeaf ){
+         pLeaf->p = (u8*)pList;
+       }
+     }
++
++    /* The call to sqlite3Fts5HashScanInit() causes the hash table to
++    ** fill the size field of all existing position lists. This means they
++    ** can no longer be appended to. Since the only scenario in which they
++    ** can be appended to is if the previous operation on this table was
++    ** a DELETE, by clearing the Fts5Index.bDelete flag we can avoid this
++    ** possibility altogether.  */
++    p->bDelete = 0;
+   }else{
+     p->rc = sqlite3Fts5HashQuery(p->pHash, sizeof(Fts5Data),
+         (const char*)pTerm, nTerm, (void**)&pLeaf, &nList
+@@ -229683,6 +241561,37 @@ static void fts5SegIterHashInit(
+   fts5SegIterSetNext(p, pIter);
+ }
+ 
++/*
++** Array ap[] contains n elements. Release each of these elements using
++** fts5DataRelease(). Then free the array itself using sqlite3_free().
++*/
++static void fts5IndexFreeArray(Fts5Data **ap, int n){
++  if( ap ){
++    int ii;
++    for(ii=0; iinRef--;
++    if( p->nRef<=0 ){
++      int ii;
++      for(ii=0; iinTombstone; ii++){
++        fts5DataRelease(p->apTombstone[ii]);
++      }
++      sqlite3_free(p);
++    }
++  }
++}
++
+ /*
+ ** Zero the iterator passed as the only argument.
+ */
+@@ -229690,6 +241599,7 @@ static void fts5SegIterClear(Fts5SegIter *pIter){
+   fts5BufferFree(&pIter->term);
+   fts5DataRelease(pIter->pLeaf);
+   fts5DataRelease(pIter->pNextLeaf);
++  fts5TombstoneArrayDelete(pIter->pTombArray);
+   fts5DlidxIterFree(pIter->pDlidx);
+   sqlite3_free(pIter->aRowidOffset);
+   memset(pIter, 0, sizeof(Fts5SegIter));
+@@ -229823,7 +241733,6 @@ static int fts5MultiIterDoCompare(Fts5Iter *pIter, int iOut){
+       assert_nc( i2!=0 );
+       pRes->bTermEq = 1;
+       if( p1->iRowid==p2->iRowid ){
+-        p1->bDel = p2->bDel;
+         return i2;
+       }
+       res = ((p1->iRowid > p2->iRowid)==pIter->bRev) ? -1 : +1;
+@@ -229842,7 +241751,8 @@ static int fts5MultiIterDoCompare(Fts5Iter *pIter, int iOut){
+ 
+ /*
+ ** Move the seg-iter so that it points to the first rowid on page iLeafPgno.
+-** It is an error if leaf iLeafPgno does not exist or contains no rowids.
++** It is an error if leaf iLeafPgno does not exist. Unless the db is
++** a 'secure-delete' db, if it contains no rowids then this is also an error.
+ */
+ static void fts5SegIterGotoPage(
+   Fts5Index *p,                   /* FTS5 backend object */
+@@ -229857,21 +241767,23 @@ static void fts5SegIterGotoPage(
+     fts5DataRelease(pIter->pNextLeaf);
+     pIter->pNextLeaf = 0;
+     pIter->iLeafPgno = iLeafPgno-1;
+-    fts5SegIterNextPage(p, pIter);
+-    assert( p->rc!=SQLITE_OK || pIter->iLeafPgno==iLeafPgno );
+ 
+-    if( p->rc==SQLITE_OK && ALWAYS(pIter->pLeaf!=0) ){
++    while( p->rc==SQLITE_OK ){
+       int iOff;
+-      u8 *a = pIter->pLeaf->p;
+-      int n = pIter->pLeaf->szLeaf;
+-
++      fts5SegIterNextPage(p, pIter);
++      if( pIter->pLeaf==0 ) break;
+       iOff = fts5LeafFirstRowidOff(pIter->pLeaf);
+-      if( iOff<4 || iOff>=n ){
+-        p->rc = FTS5_CORRUPT;
+-      }else{
+-        iOff += fts5GetVarint(&a[iOff], (u64*)&pIter->iRowid);
+-        pIter->iLeafOffset = iOff;
+-        fts5SegIterLoadNPos(p, pIter);
++      if( iOff>0 ){
++        u8 *a = pIter->pLeaf->p;
++        int n = pIter->pLeaf->szLeaf;
++        if( iOff<4 || iOff>=n ){
++          p->rc = FTS5_CORRUPT;
++        }else{
++          iOff += fts5GetVarint(&a[iOff], (u64*)&pIter->iRowid);
++          pIter->iLeafOffset = iOff;
++          fts5SegIterLoadNPos(p, pIter);
++        }
++        break;
+       }
+     }
+   }
+@@ -229932,7 +241844,6 @@ static void fts5SegIterNextFrom(
+   }while( p->rc==SQLITE_OK );
+ }
+ 
+-
+ /*
+ ** Free the iterator object passed as the second argument.
+ */
+@@ -230024,6 +241935,85 @@ static void fts5MultiIterSetEof(Fts5Iter *pIter){
+   pIter->iSwitchRowid = pSeg->iRowid;
+ }
+ 
++/*
++** The argument to this macro must be an Fts5Data structure containing a
++** tombstone hash page. This macro returns the key-size of the hash-page.
++*/
++#define TOMBSTONE_KEYSIZE(pPg) (pPg->p[0]==4 ? 4 : 8)
++
++#define TOMBSTONE_NSLOT(pPg)   \
++  ((pPg->nn > 16) ? ((pPg->nn-8) / TOMBSTONE_KEYSIZE(pPg)) : 1)
++
++/*
++** Query a single tombstone hash table for rowid iRowid. Return true if
++** it is found or false otherwise. The tombstone hash table is one of
++** nHashTable tables.
++*/
++static int fts5IndexTombstoneQuery(
++  Fts5Data *pHash,                /* Hash table page to query */
++  int nHashTable,                 /* Number of pages attached to segment */
++  u64 iRowid                      /* Rowid to query hash for */
++){
++  const int szKey = TOMBSTONE_KEYSIZE(pHash);
++  const int nSlot = TOMBSTONE_NSLOT(pHash);
++  int iSlot = (iRowid / nHashTable) % nSlot;
++  int nCollide = nSlot;
++
++  if( iRowid==0 ){
++    return pHash->p[1];
++  }else if( szKey==4 ){
++    u32 *aSlot = (u32*)&pHash->p[8];
++    while( aSlot[iSlot] ){
++      if( fts5GetU32((u8*)&aSlot[iSlot])==iRowid ) return 1;
++      if( nCollide--==0 ) break;
++      iSlot = (iSlot+1)%nSlot;
++    }
++  }else{
++    u64 *aSlot = (u64*)&pHash->p[8];
++    while( aSlot[iSlot] ){
++      if( fts5GetU64((u8*)&aSlot[iSlot])==iRowid ) return 1;
++      if( nCollide--==0 ) break;
++      iSlot = (iSlot+1)%nSlot;
++    }
++  }
++
++  return 0;
++}
++
++/*
++** Return true if the iterator passed as the only argument points
++** to an segment entry for which there is a tombstone. Return false
++** if there is no tombstone or if the iterator is already at EOF.
++*/
++static int fts5MultiIterIsDeleted(Fts5Iter *pIter){
++  int iFirst = pIter->aFirst[1].iFirst;
++  Fts5SegIter *pSeg = &pIter->aSeg[iFirst];
++  Fts5TombstoneArray *pArray = pSeg->pTombArray;
++
++  if( pSeg->pLeaf && pArray ){
++    /* Figure out which page the rowid might be present on. */
++    int iPg = ((u64)pSeg->iRowid) % pArray->nTombstone;
++    assert( iPg>=0 );
++
++    /* If tombstone hash page iPg has not yet been loaded from the
++    ** database, load it now. */
++    if( pArray->apTombstone[iPg]==0 ){
++      pArray->apTombstone[iPg] = fts5DataRead(pIter->pIndex,
++          FTS5_TOMBSTONE_ROWID(pSeg->pSeg->iSegid, iPg)
++      );
++      if( pArray->apTombstone[iPg]==0 ) return 0;
++    }
++
++    return fts5IndexTombstoneQuery(
++        pArray->apTombstone[iPg],
++        pArray->nTombstone,
++        pSeg->iRowid
++    );
++  }
++
++  return 0;
++}
++
+ /*
+ ** Move the iterator to the next entry.
+ **
+@@ -230061,7 +242051,9 @@ static void fts5MultiIterNext(
+ 
+     fts5AssertMultiIterSetup(p, pIter);
+     assert( pSeg==&pIter->aSeg[pIter->aFirst[1].iFirst] && pSeg->pLeaf );
+-    if( pIter->bSkipEmpty==0 || pSeg->nPos ){
++    if( (pIter->bSkipEmpty==0 || pSeg->nPos)
++      && 0==fts5MultiIterIsDeleted(pIter)
++    ){
+       pIter->xSetOutputs(pIter, pSeg);
+       return;
+     }
+@@ -230093,7 +242085,9 @@ static void fts5MultiIterNext2(
+       }
+       fts5AssertMultiIterSetup(p, pIter);
+ 
+-    }while( fts5MultiIterIsEmpty(p, pIter) );
++    }while( (fts5MultiIterIsEmpty(p, pIter) || fts5MultiIterIsDeleted(pIter))
++         && (p->rc==SQLITE_OK)
++    );
+   }
+ }
+ 
+@@ -230106,7 +242100,7 @@ static Fts5Iter *fts5MultiIterAlloc(
+   int nSeg
+ ){
+   Fts5Iter *pNew;
+-  int nSlot;                      /* Power of two >= nSeg */
++  i64 nSlot;                      /* Power of two >= nSeg */
+ 
+   for(nSlot=2; nSlotnSeg-1; iIter>0; iIter--){
++    int iEq;
++    if( (iEq = fts5MultiIterDoCompare(pIter, iIter)) ){
++      Fts5SegIter *pSeg = &pIter->aSeg[iEq];
++      if( p->rc==SQLITE_OK ) pSeg->xNext(p, pSeg, 0);
++      fts5MultiIterAdvanced(p, pIter, iEq, iIter);
++    }
++  }
++  fts5MultiIterSetEof(pIter);
++  fts5AssertMultiIterSetup(p, pIter);
++
++  if( (pIter->bSkipEmpty && fts5MultiIterIsEmpty(p, pIter))
++   || fts5MultiIterIsDeleted(pIter)
++  ){
++    fts5MultiIterNext(p, pIter, 0, 0);
++  }else if( pIter->base.bEof==0 ){
++    Fts5SegIter *pSeg = &pIter->aSeg[pIter->aFirst[1].iFirst];
++    pIter->xSetOutputs(pIter, pSeg);
++  }
++}
+ 
+ /*
+ ** Allocate a new Fts5Iter object.
+@@ -230586,7 +242606,7 @@ static void fts5MultiIterNew(
+     if( iLevel<0 ){
+       assert( pStruct->nSegment==fts5StructureCountSegments(pStruct) );
+       nSeg = pStruct->nSegment;
+-      nSeg += (p->pHash ? 1 : 0);
++      nSeg += (p->pHash && 0==(flags & FTS5INDEX_QUERY_SKIPHASH));
+     }else{
+       nSeg = MIN(pStruct->aLevel[iLevel].nSeg, nSegment);
+     }
+@@ -230607,7 +242627,7 @@ static void fts5MultiIterNew(
+   if( p->rc==SQLITE_OK ){
+     if( iLevel<0 ){
+       Fts5StructureLevel *pEnd = &pStruct->aLevel[pStruct->nLevel];
+-      if( p->pHash ){
++      if( p->pHash && 0==(flags & FTS5INDEX_QUERY_SKIPHASH) ){
+         /* Add a segment iterator for the current contents of the hash table. */
+         Fts5SegIter *pIter = &pNew->aSeg[iIter++];
+         fts5SegIterHashInit(p, pTerm, nTerm, flags, pIter);
+@@ -230632,29 +242652,12 @@ static void fts5MultiIterNew(
+     assert( iIter==nSeg );
+   }
+ 
+-  /* If the above was successful, each component iterators now points
++  /* If the above was successful, each component iterator now points
+   ** to the first entry in its segment. In this case initialize the
+   ** aFirst[] array. Or, if an error has occurred, free the iterator
+   ** object and set the output variable to NULL.  */
+   if( p->rc==SQLITE_OK ){
+-    for(iIter=pNew->nSeg-1; iIter>0; iIter--){
+-      int iEq;
+-      if( (iEq = fts5MultiIterDoCompare(pNew, iIter)) ){
+-        Fts5SegIter *pSeg = &pNew->aSeg[iEq];
+-        if( p->rc==SQLITE_OK ) pSeg->xNext(p, pSeg, 0);
+-        fts5MultiIterAdvanced(p, pNew, iEq, iIter);
+-      }
+-    }
+-    fts5MultiIterSetEof(pNew);
+-    fts5AssertMultiIterSetup(p, pNew);
+-
+-    if( pNew->bSkipEmpty && fts5MultiIterIsEmpty(p, pNew) ){
+-      fts5MultiIterNext(p, pNew, 0, 0);
+-    }else if( pNew->base.bEof==0 ){
+-      Fts5SegIter *pSeg = &pNew->aSeg[pNew->aFirst[1].iFirst];
+-      pNew->xSetOutputs(pNew, pSeg);
+-    }
+-
++    fts5MultiIterFinishSetup(p, pNew);
+   }else{
+     fts5MultiIterFree(pNew);
+     *ppOut = 0;
+@@ -230679,7 +242682,6 @@ static void fts5MultiIterNew2(
+   pNew = fts5MultiIterAlloc(p, 2);
+   if( pNew ){
+     Fts5SegIter *pIter = &pNew->aSeg[1];
+-
+     pIter->flags = FTS5_SEGITER_ONETERM;
+     if( pData->szLeaf>0 ){
+       pIter->pLeaf = pData;
+@@ -230826,7 +242828,10 @@ static void fts5IndexDiscardData(Fts5Index *p){
+   if( p->pHash ){
+     sqlite3Fts5HashClear(p->pHash);
+     p->nPendingData = 0;
++    p->nPendingRow = 0;
++    p->flushRc = SQLITE_OK;
+   }
++  p->nContentlessDelete = 0;
+ }
+ 
+ /*
+@@ -231040,7 +243045,7 @@ static void fts5WriteDlidxAppend(
+     }
+ 
+     if( pDlidx->bPrevValid ){
+-      iVal = iRowid - pDlidx->iPrev;
++      iVal = (u64)iRowid - (u64)pDlidx->iPrev;
+     }else{
+       i64 iPgno = (i==0 ? pWriter->writer.pgno : pDlidx[-1].pgno);
+       assert( pDlidx->buf.n==0 );
+@@ -231207,7 +243212,9 @@ static void fts5WriteAppendRowid(
+       fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid);
+     }else{
+       assert_nc( p->rc || iRowid>pWriter->iPrevRowid );
+-      fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid - pWriter->iPrevRowid);
++      fts5BufferAppendVarint(&p->rc, &pPage->buf,
++          (u64)iRowid - (u64)pWriter->iPrevRowid
++      );
+     }
+     pWriter->iPrevRowid = iRowid;
+     pWriter->bFirstRowidInDoclist = 0;
+@@ -231225,7 +243232,7 @@ static void fts5WriteAppendPoslistData(
+   const u8 *a = aData;
+   int n = nData;
+ 
+-  assert( p->pConfig->pgsz>0 );
++  assert( p->pConfig->pgsz>0 || p->rc!=SQLITE_OK );
+   while( p->rc==SQLITE_OK
+      && (pPage->buf.n + pPage->pgidx.n + n)>=p->pConfig->pgsz
+   ){
+@@ -231360,7 +243367,7 @@ static void fts5TrimSegments(Fts5Index *p, Fts5Iter *pIter){
+           fts5BufferAppendBlob(&p->rc, &buf, sizeof(aHdr), aHdr);
+           fts5BufferAppendVarint(&p->rc, &buf, pSeg->term.n);
+           fts5BufferAppendBlob(&p->rc, &buf, pSeg->term.n, pSeg->term.p);
+-          fts5BufferAppendBlob(&p->rc, &buf, pData->szLeaf-iOff,&pData->p[iOff]);
++          fts5BufferAppendBlob(&p->rc, &buf,pData->szLeaf-iOff,&pData->p[iOff]);
+           if( p->rc==SQLITE_OK ){
+             /* Set the szLeaf field */
+             fts5PutU16(&buf.p[2], (u16)buf.n);
+@@ -231461,6 +243468,12 @@ static void fts5IndexMergeLevel(
+ 
+     /* Read input from all segments in the input level */
+     nInput = pLvl->nSeg;
++
++    /* Set the range of origins that will go into the output segment. */
++    if( pStruct->nOriginCntr>0 ){
++      pSeg->iOrigin1 = pLvl->aSeg[0].iOrigin1;
++      pSeg->iOrigin2 = pLvl->aSeg[pLvl->nSeg-1].iOrigin2;
++    }
+   }
+   bOldest = (pLvlOut->nSeg==1 && pStruct->nLevel==iLvl+2);
+ 
+@@ -231520,8 +243533,11 @@ static void fts5IndexMergeLevel(
+     int i;
+ 
+     /* Remove the redundant segments from the %_data table */
++    assert( pSeg->nEntry==0 );
+     for(i=0; iaSeg[i].iSegid);
++      Fts5StructureSegment *pOld = &pLvl->aSeg[i];
++      pSeg->nEntry += (pOld->nEntry - pOld->nEntryTombstone);
++      fts5DataRemoveSegment(p, pOld);
+     }
+ 
+     /* Remove the redundant segments from the input level */
+@@ -231547,6 +243563,43 @@ static void fts5IndexMergeLevel(
+   if( pnRem ) *pnRem -= writer.nLeafWritten;
+ }
+ 
++/*
++** If this is not a contentless_delete=1 table, or if the 'deletemerge'
++** configuration option is set to 0, then this function always returns -1.
++** Otherwise, it searches the structure object passed as the second argument
++** for a level suitable for merging due to having a large number of
++** tombstones in the tombstone hash. If one is found, its index is returned.
++** Otherwise, if there is no suitable level, -1.
++*/
++static int fts5IndexFindDeleteMerge(Fts5Index *p, Fts5Structure *pStruct){
++  Fts5Config *pConfig = p->pConfig;
++  int iRet = -1;
++  if( pConfig->bContentlessDelete && pConfig->nDeleteMerge>0 ){
++    int ii;
++    int nBest = 0;
++
++    for(ii=0; iinLevel; ii++){
++      Fts5StructureLevel *pLvl = &pStruct->aLevel[ii];
++      i64 nEntry = 0;
++      i64 nTomb = 0;
++      int iSeg;
++      for(iSeg=0; iSegnSeg; iSeg++){
++        nEntry += pLvl->aSeg[iSeg].nEntry;
++        nTomb += pLvl->aSeg[iSeg].nEntryTombstone;
++      }
++      assert_nc( nEntry>0 || pLvl->nSeg==0 );
++      if( nEntry>0 ){
++        int nPercent = (nTomb * 100) / nEntry;
++        if( nPercent>=pConfig->nDeleteMerge && nPercent>nBest ){
++          iRet = ii;
++          nBest = nPercent;
++        }
++      }
++    }
++  }
++  return iRet;
++}
++
+ /*
+ ** Do up to nPg pages of automerge work on the index.
+ **
+@@ -231566,14 +243619,15 @@ static int fts5IndexMerge(
+     int iBestLvl = 0;           /* Level offering the most input segments */
+     int nBest = 0;              /* Number of input segments on best level */
+ 
+-    /* Set iBestLvl to the level to read input segments from. */
++    /* Set iBestLvl to the level to read input segments from. Or to -1 if
++    ** there is no level suitable to merge segments from.  */
+     assert( pStruct->nLevel>0 );
+     for(iLvl=0; iLvlnLevel; iLvl++){
+       Fts5StructureLevel *pLvl = &pStruct->aLevel[iLvl];
+       if( pLvl->nMerge ){
+         if( pLvl->nMerge>nBest ){
+           iBestLvl = iLvl;
+-          nBest = pLvl->nMerge;
++          nBest = nMin;
+         }
+         break;
+       }
+@@ -231582,22 +243636,18 @@ static int fts5IndexMerge(
+         iBestLvl = iLvl;
+       }
+     }
+-
+-    /* If nBest is still 0, then the index must be empty. */
+-#ifdef SQLITE_DEBUG
+-    for(iLvl=0; nBest==0 && iLvlnLevel; iLvl++){
+-      assert( pStruct->aLevel[iLvl].nSeg==0 );
++    if( nBestaLevel[iBestLvl].nMerge==0 ){
+-      break;
+-    }
++    if( iBestLvl<0 ) break;
+     bRet = 1;
+     fts5IndexMergeLevel(p, &pStruct, iBestLvl, &nRem);
+     if( p->rc==SQLITE_OK && pStruct->aLevel[iBestLvl].nMerge==0 ){
+       fts5StructurePromote(p, iBestLvl+1, pStruct);
+     }
++
++    if( nMin==1 ) nMin = 2;
+   }
+   *ppStruct = pStruct;
+   return bRet;
+@@ -231638,16 +243688,16 @@ static void fts5IndexCrisismerge(
+ ){
+   const int nCrisis = p->pConfig->nCrisisMerge;
+   Fts5Structure *pStruct = *ppStruct;
+-  int iLvl = 0;
+-
+-  assert( p->rc!=SQLITE_OK || pStruct->nLevel>0 );
+-  while( p->rc==SQLITE_OK && pStruct->aLevel[iLvl].nSeg>=nCrisis ){
+-    fts5IndexMergeLevel(p, &pStruct, iLvl, 0);
+-    assert( p->rc!=SQLITE_OK || pStruct->nLevel>(iLvl+1) );
+-    fts5StructurePromote(p, iLvl+1, pStruct);
+-    iLvl++;
++  if( pStruct && pStruct->nLevel>0 ){
++    int iLvl = 0;
++    while( p->rc==SQLITE_OK && pStruct->aLevel[iLvl].nSeg>=nCrisis ){
++      fts5IndexMergeLevel(p, &pStruct, iLvl, 0);
++      assert( p->rc!=SQLITE_OK || pStruct->nLevel>(iLvl+1) );
++      fts5StructurePromote(p, iLvl+1, pStruct);
++      iLvl++;
++    }
++    *ppStruct = pStruct;
+   }
+-  *ppStruct = pStruct;
+ }
+ 
+ static int fts5IndexReturn(Fts5Index *p){
+@@ -231681,6 +243731,469 @@ static int fts5PoslistPrefix(const u8 *aBuf, int nMax){
+   return ret;
+ }
+ 
++/*
++** Execute the SQL statement:
++**
++**    DELETE FROM %_idx WHERE (segid, (pgno/2)) = ($iSegid, $iPgno);
++**
++** This is used when a secure-delete operation removes the last term
++** from a segment leaf page. In that case the %_idx entry is removed
++** too. This is done to ensure that if all instances of a token are
++** removed from an fts5 database in secure-delete mode, no trace of
++** the token itself remains in the database.
++*/
++static void fts5SecureDeleteIdxEntry(
++  Fts5Index *p,                   /* FTS5 backend object */
++  int iSegid,                     /* Id of segment to delete entry for */
++  int iPgno                       /* Page number within segment */
++){
++  if( iPgno!=1 ){
++    assert( p->pConfig->iVersion==FTS5_CURRENT_VERSION_SECUREDELETE );
++    if( p->pDeleteFromIdx==0 ){
++      fts5IndexPrepareStmt(p, &p->pDeleteFromIdx, sqlite3_mprintf(
++          "DELETE FROM '%q'.'%q_idx' WHERE (segid, (pgno/2)) = (?1, ?2)",
++          p->pConfig->zDb, p->pConfig->zName
++      ));
++    }
++    if( p->rc==SQLITE_OK ){
++      sqlite3_bind_int(p->pDeleteFromIdx, 1, iSegid);
++      sqlite3_bind_int(p->pDeleteFromIdx, 2, iPgno);
++      sqlite3_step(p->pDeleteFromIdx);
++      p->rc = sqlite3_reset(p->pDeleteFromIdx);
++    }
++  }
++}
++
++/*
++** This is called when a secure-delete operation removes a position-list
++** that overflows onto segment page iPgno of segment pSeg. This function
++** rewrites node iPgno, and possibly one or more of its right-hand peers,
++** to remove this portion of the position list.
++**
++** Output variable (*pbLastInDoclist) is set to true if the position-list
++** removed is followed by a new term or the end-of-segment, or false if
++** it is followed by another rowid/position list.
++*/
++static void fts5SecureDeleteOverflow(
++  Fts5Index *p,
++  Fts5StructureSegment *pSeg,
++  int iPgno,
++  int *pbLastInDoclist
++){
++  const int bDetailNone = (p->pConfig->eDetail==FTS5_DETAIL_NONE);
++  int pgno;
++  Fts5Data *pLeaf = 0;
++  assert( iPgno!=1 );
++
++  *pbLastInDoclist = 1;
++  for(pgno=iPgno; p->rc==SQLITE_OK && pgno<=pSeg->pgnoLast; pgno++){
++    i64 iRowid = FTS5_SEGMENT_ROWID(pSeg->iSegid, pgno);
++    int iNext = 0;
++    u8 *aPg = 0;
++
++    pLeaf = fts5DataRead(p, iRowid);
++    if( pLeaf==0 ) break;
++    aPg = pLeaf->p;
++
++    iNext = fts5GetU16(&aPg[0]);
++    if( iNext!=0 ){
++      *pbLastInDoclist = 0;
++    }
++    if( iNext==0 && pLeaf->szLeaf!=pLeaf->nn ){
++      fts5GetVarint32(&aPg[pLeaf->szLeaf], iNext);
++    }
++
++    if( iNext==0 ){
++      /* The page contains no terms or rowids. Replace it with an empty
++      ** page and move on to the right-hand peer.  */
++      const u8 aEmpty[] = {0x00, 0x00, 0x00, 0x04};
++      assert_nc( bDetailNone==0 || pLeaf->nn==4 );
++      if( bDetailNone==0 ) fts5DataWrite(p, iRowid, aEmpty, sizeof(aEmpty));
++      fts5DataRelease(pLeaf);
++      pLeaf = 0;
++    }else if( bDetailNone ){
++      break;
++    }else if( iNext>=pLeaf->szLeaf || pLeaf->nnszLeaf || iNext<4 ){
++      p->rc = FTS5_CORRUPT;
++      break;
++    }else{
++      int nShift = iNext - 4;
++      int nPg;
++
++      int nIdx = 0;
++      u8 *aIdx = 0;
++
++      /* Unless the current page footer is 0 bytes in size (in which case
++      ** the new page footer will be as well), allocate and populate a
++      ** buffer containing the new page footer. Set stack variables aIdx
++      ** and nIdx accordingly.  */
++      if( pLeaf->nn>pLeaf->szLeaf ){
++        int iFirst = 0;
++        int i1 = pLeaf->szLeaf;
++        int i2 = 0;
++
++        i1 += fts5GetVarint32(&aPg[i1], iFirst);
++        if( iFirstrc = FTS5_CORRUPT;
++          break;
++        }
++        aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2);
++        if( aIdx==0 ) break;
++        i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift);
++        if( i1nn ){
++          memcpy(&aIdx[i2], &aPg[i1], pLeaf->nn-i1);
++          i2 += (pLeaf->nn-i1);
++        }
++        nIdx = i2;
++      }
++
++      /* Modify the contents of buffer aPg[]. Set nPg to the new size
++      ** in bytes. The new page is always smaller than the old.  */
++      nPg = pLeaf->szLeaf - nShift;
++      memmove(&aPg[4], &aPg[4+nShift], nPg-4);
++      fts5PutU16(&aPg[2], nPg);
++      if( fts5GetU16(&aPg[0]) ) fts5PutU16(&aPg[0], 4);
++      if( nIdx>0 ){
++        memcpy(&aPg[nPg], aIdx, nIdx);
++        nPg += nIdx;
++      }
++      sqlite3_free(aIdx);
++
++      /* Write the new page to disk and exit the loop */
++      assert( nPg>4 || fts5GetU16(aPg)==0 );
++      fts5DataWrite(p, iRowid, aPg, nPg);
++      break;
++    }
++  }
++  fts5DataRelease(pLeaf);
++}
++
++/*
++** Completely remove the entry that pSeg currently points to from
++** the database.
++*/
++static void fts5DoSecureDelete(
++  Fts5Index *p,
++  Fts5SegIter *pSeg
++){
++  const int bDetailNone = (p->pConfig->eDetail==FTS5_DETAIL_NONE);
++  int iSegid = pSeg->pSeg->iSegid;
++  u8 *aPg = pSeg->pLeaf->p;
++  int nPg = pSeg->pLeaf->nn;
++  int iPgIdx = pSeg->pLeaf->szLeaf;
++
++  u64 iDelta = 0;
++  int iNextOff = 0;
++  int iOff = 0;
++  int nIdx = 0;
++  u8 *aIdx = 0;
++  int bLastInDoclist = 0;
++  int iIdx = 0;
++  int iStart = 0;
++  int iDelKeyOff = 0;       /* Offset of deleted key, if any */
++
++  nIdx = nPg-iPgIdx;
++  aIdx = sqlite3Fts5MallocZero(&p->rc, nIdx+16);
++  if( p->rc ) return;
++  memcpy(aIdx, &aPg[iPgIdx], nIdx);
++
++  /* At this point segment iterator pSeg points to the entry
++  ** this function should remove from the b-tree segment.
++  **
++  ** In detail=full or detail=column mode, pSeg->iLeafOffset is the
++  ** offset of the first byte in the position-list for the entry to
++  ** remove. Immediately before this comes two varints that will also
++  ** need to be removed:
++  **
++  **     + the rowid or delta rowid value for the entry, and
++  **     + the size of the position list in bytes.
++  **
++  ** Or, in detail=none mode, there is a single varint prior to
++  ** pSeg->iLeafOffset - the rowid or delta rowid value.
++  **
++  ** This block sets the following variables:
++  **
++  **   iStart:
++  **     The offset of the first byte of the rowid or delta-rowid
++  **     value for the doclist entry being removed.
++  **
++  **   iDelta:
++  **     The value of the rowid or delta-rowid value for the doclist
++  **     entry being removed.
++  **
++  **   iNextOff:
++  **     The offset of the next entry following the position list
++  **     for the one being removed. If the position list for this
++  **     entry overflows onto the next leaf page, this value will be
++  **     greater than pLeaf->szLeaf.
++  */
++  {
++    int iSOP;                     /* Start-Of-Position-list */
++    if( pSeg->iLeafPgno==pSeg->iTermLeafPgno ){
++      iStart = pSeg->iTermLeafOffset;
++    }else{
++      iStart = fts5GetU16(&aPg[0]);
++    }
++
++    iSOP = iStart + fts5GetVarint(&aPg[iStart], &iDelta);
++    assert_nc( iSOP<=pSeg->iLeafOffset );
++
++    if( bDetailNone ){
++      while( iSOPiLeafOffset ){
++        if( aPg[iSOP]==0x00 ) iSOP++;
++        if( aPg[iSOP]==0x00 ) iSOP++;
++        iStart = iSOP;
++        iSOP = iStart + fts5GetVarint(&aPg[iStart], &iDelta);
++      }
++
++      iNextOff = iSOP;
++      if( iNextOffiEndofDoclist && aPg[iNextOff]==0x00 ) iNextOff++;
++      if( iNextOffiEndofDoclist && aPg[iNextOff]==0x00 ) iNextOff++;
++
++    }else{
++      int nPos = 0;
++      iSOP += fts5GetVarint32(&aPg[iSOP], nPos);
++      while( iSOPiLeafOffset ){
++        iStart = iSOP + (nPos/2);
++        iSOP = iStart + fts5GetVarint(&aPg[iStart], &iDelta);
++        iSOP += fts5GetVarint32(&aPg[iSOP], nPos);
++      }
++      assert_nc( iSOP==pSeg->iLeafOffset );
++      iNextOff = pSeg->iLeafOffset + pSeg->nPos;
++    }
++  }
++
++  iOff = iStart;
++
++  /* If the position-list for the entry being removed flows over past
++  ** the end of this page, delete the portion of the position-list on the
++  ** next page and beyond.
++  **
++  ** Set variable bLastInDoclist to true if this entry happens
++  ** to be the last rowid in the doclist for its term.  */
++  if( iNextOff>=iPgIdx ){
++    int pgno = pSeg->iLeafPgno+1;
++    fts5SecureDeleteOverflow(p, pSeg->pSeg, pgno, &bLastInDoclist);
++    iNextOff = iPgIdx;
++  }
++
++  if( pSeg->bDel==0 ){
++    if( iNextOff!=iPgIdx ){
++      /* Loop through the page-footer. If iNextOff (offset of the
++      ** entry following the one we are removing) is equal to the
++      ** offset of a key on this page, then the entry is the last
++      ** in its doclist. */
++      int iKeyOff = 0;
++      for(iIdx=0; iIdxbDel ){
++    iOff += sqlite3Fts5PutVarint(&aPg[iOff], iDelta);
++    aPg[iOff++] = 0x01;
++  }else if( bLastInDoclist==0 ){
++    if( iNextOff!=iPgIdx ){
++      u64 iNextDelta = 0;
++      iNextOff += fts5GetVarint(&aPg[iNextOff], &iNextDelta);
++      iOff += sqlite3Fts5PutVarint(&aPg[iOff], iDelta + iNextDelta);
++    }
++  }else if(
++      pSeg->iLeafPgno==pSeg->iTermLeafPgno
++   && iStart==pSeg->iTermLeafOffset
++  ){
++    /* The entry being removed was the only position list in its
++    ** doclist. Therefore the term needs to be removed as well. */
++    int iKey = 0;
++    int iKeyOff = 0;
++
++    /* Set iKeyOff to the offset of the term that will be removed - the
++    ** last offset in the footer that is not greater than iStart. */
++    for(iIdx=0; iIdx(u32)iStart ) break;
++      iKeyOff += iVal;
++    }
++    assert_nc( iKey>=1 );
++
++    /* Set iDelKeyOff to the value of the footer entry to remove from
++    ** the page. */
++    iDelKeyOff = iOff = iKeyOff;
++
++    if( iNextOff!=iPgIdx ){
++      /* This is the only position-list associated with the term, and there
++      ** is another term following it on this page. So the subsequent term
++      ** needs to be moved to replace the term associated with the entry
++      ** being removed. */
++      int nPrefix = 0;
++      int nSuffix = 0;
++      int nPrefix2 = 0;
++      int nSuffix2 = 0;
++
++      iDelKeyOff = iNextOff;
++      iNextOff += fts5GetVarint32(&aPg[iNextOff], nPrefix2);
++      iNextOff += fts5GetVarint32(&aPg[iNextOff], nSuffix2);
++
++      if( iKey!=1 ){
++        iKeyOff += fts5GetVarint32(&aPg[iKeyOff], nPrefix);
++      }
++      iKeyOff += fts5GetVarint32(&aPg[iKeyOff], nSuffix);
++
++      nPrefix = MIN(nPrefix, nPrefix2);
++      nSuffix = (nPrefix2 + nSuffix2) - nPrefix;
++
++      if( (iKeyOff+nSuffix)>iPgIdx || (iNextOff+nSuffix2)>iPgIdx ){
++        p->rc = FTS5_CORRUPT;
++      }else{
++        if( iKey!=1 ){
++          iOff += sqlite3Fts5PutVarint(&aPg[iOff], nPrefix);
++        }
++        iOff += sqlite3Fts5PutVarint(&aPg[iOff], nSuffix);
++        if( nPrefix2>pSeg->term.n ){
++          p->rc = FTS5_CORRUPT;
++        }else if( nPrefix2>nPrefix ){
++          memcpy(&aPg[iOff], &pSeg->term.p[nPrefix], nPrefix2-nPrefix);
++          iOff += (nPrefix2-nPrefix);
++        }
++        memmove(&aPg[iOff], &aPg[iNextOff], nSuffix2);
++        iOff += nSuffix2;
++        iNextOff += nSuffix2;
++      }
++    }
++  }else if( iStart==4 ){
++    int iPgno;
++
++    assert_nc( pSeg->iLeafPgno>pSeg->iTermLeafPgno );
++    /* The entry being removed may be the only position list in
++    ** its doclist. */
++    for(iPgno=pSeg->iLeafPgno-1; iPgno>pSeg->iTermLeafPgno; iPgno-- ){
++      Fts5Data *pPg = fts5DataRead(p, FTS5_SEGMENT_ROWID(iSegid, iPgno));
++      int bEmpty = (pPg && pPg->nn==4);
++      fts5DataRelease(pPg);
++      if( bEmpty==0 ) break;
++    }
++
++    if( iPgno==pSeg->iTermLeafPgno ){
++      i64 iId = FTS5_SEGMENT_ROWID(iSegid, pSeg->iTermLeafPgno);
++      Fts5Data *pTerm = fts5DataRead(p, iId);
++      if( pTerm && pTerm->szLeaf==pSeg->iTermLeafOffset ){
++        u8 *aTermIdx = &pTerm->p[pTerm->szLeaf];
++        int nTermIdx = pTerm->nn - pTerm->szLeaf;
++        int iTermIdx = 0;
++        int iTermOff = 0;
++
++        while( 1 ){
++          u32 iVal = 0;
++          int nByte = fts5GetVarint32(&aTermIdx[iTermIdx], iVal);
++          iTermOff += iVal;
++          if( (iTermIdx+nByte)>=nTermIdx ) break;
++          iTermIdx += nByte;
++        }
++        nTermIdx = iTermIdx;
++
++        memmove(&pTerm->p[iTermOff], &pTerm->p[pTerm->szLeaf], nTermIdx);
++        fts5PutU16(&pTerm->p[2], iTermOff);
++
++        fts5DataWrite(p, iId, pTerm->p, iTermOff+nTermIdx);
++        if( nTermIdx==0 ){
++          fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iTermLeafPgno);
++        }
++      }
++      fts5DataRelease(pTerm);
++    }
++  }
++
++  /* Assuming no error has occurred, this block does final edits to the
++  ** leaf page before writing it back to disk. Input variables are:
++  **
++  **   nPg: Total initial size of leaf page.
++  **   iPgIdx: Initial offset of page footer.
++  **
++  **   iOff: Offset to move data to
++  **   iNextOff: Offset to move data from
++  */
++  if( p->rc==SQLITE_OK ){
++    const int nMove = nPg - iNextOff;     /* Number of bytes to move */
++    int nShift = iNextOff - iOff;         /* Distance to move them */
++
++    int iPrevKeyOut = 0;
++    int iKeyIn = 0;
++
++    memmove(&aPg[iOff], &aPg[iNextOff], nMove);
++    iPgIdx -= nShift;
++    nPg = iPgIdx;
++    fts5PutU16(&aPg[2], iPgIdx);
++
++    for(iIdx=0; iIdxiOff ? nShift : 0));
++        nPg += sqlite3Fts5PutVarint(&aPg[nPg], iKeyOut - iPrevKeyOut);
++        iPrevKeyOut = iKeyOut;
++      }
++    }
++
++    if( iPgIdx==nPg && nIdx>0 && pSeg->iLeafPgno!=1 ){
++      fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iLeafPgno);
++    }
++
++    assert_nc( nPg>4 || fts5GetU16(aPg)==0 );
++    fts5DataWrite(p, FTS5_SEGMENT_ROWID(iSegid,pSeg->iLeafPgno), aPg, nPg);
++  }
++  sqlite3_free(aIdx);
++}
++
++/*
++** This is called as part of flushing a delete to disk in 'secure-delete'
++** mode. It edits the segments within the database described by argument
++** pStruct to remove the entries for term zTerm, rowid iRowid.
++*/
++static void fts5FlushSecureDelete(
++  Fts5Index *p,
++  Fts5Structure *pStruct,
++  const char *zTerm,
++  int nTerm,
++  i64 iRowid
++){
++  const int f = FTS5INDEX_QUERY_SKIPHASH;
++  Fts5Iter *pIter = 0;            /* Used to find term instance */
++
++  fts5MultiIterNew(p, pStruct, f, 0, (const u8*)zTerm, nTerm, -1, 0, &pIter);
++  if( fts5MultiIterEof(p, pIter)==0 ){
++    i64 iThis = fts5MultiIterRowid(pIter);
++    if( iThisrc==SQLITE_OK
++     && fts5MultiIterEof(p, pIter)==0
++     && iRowid==fts5MultiIterRowid(pIter)
++    ){
++      Fts5SegIter *pSeg = &pIter->aSeg[pIter->aFirst[1].iFirst];
++      fts5DoSecureDelete(p, pSeg);
++    }
++  }
++
++  fts5MultiIterFree(pIter);
++}
++
++
+ /*
+ ** Flush the contents of in-memory hash table iHash to a new level-0
+ ** segment on disk. Also update the corresponding structure record.
+@@ -231697,143 +244210,197 @@ static void fts5FlushOneHash(Fts5Index *p){
+   /* Obtain a reference to the index structure and allocate a new segment-id
+   ** for the new level-0 segment.  */
+   pStruct = fts5StructureRead(p);
+-  iSegid = fts5AllocateSegid(p, pStruct);
+   fts5StructureInvalidate(p);
+ 
+-  if( iSegid ){
+-    const int pgsz = p->pConfig->pgsz;
+-    int eDetail = p->pConfig->eDetail;
+-    Fts5StructureSegment *pSeg;   /* New segment within pStruct */
+-    Fts5Buffer *pBuf;             /* Buffer in which to assemble leaf page */
+-    Fts5Buffer *pPgidx;           /* Buffer in which to assemble pgidx */
++  if( sqlite3Fts5HashIsEmpty(pHash)==0 ){
++    iSegid = fts5AllocateSegid(p, pStruct);
++    if( iSegid ){
++      const int pgsz = p->pConfig->pgsz;
++      int eDetail = p->pConfig->eDetail;
++      int bSecureDelete = p->pConfig->bSecureDelete;
++      Fts5StructureSegment *pSeg; /* New segment within pStruct */
++      Fts5Buffer *pBuf;           /* Buffer in which to assemble leaf page */
++      Fts5Buffer *pPgidx;         /* Buffer in which to assemble pgidx */
++
++      Fts5SegWriter writer;
++      fts5WriteInit(p, &writer, iSegid);
++
++      pBuf = &writer.writer.buf;
++      pPgidx = &writer.writer.pgidx;
++
++      /* fts5WriteInit() should have initialized the buffers to (most likely)
++      ** the maximum space required. */
++      assert( p->rc || pBuf->nSpace>=(pgsz + FTS5_DATA_PADDING) );
++      assert( p->rc || pPgidx->nSpace>=(pgsz + FTS5_DATA_PADDING) );
++
++      /* Begin scanning through hash table entries. This loop runs once for each
++      ** term/doclist currently stored within the hash table. */
++      if( p->rc==SQLITE_OK ){
++        p->rc = sqlite3Fts5HashScanInit(pHash, 0, 0);
++      }
++      while( p->rc==SQLITE_OK && 0==sqlite3Fts5HashScanEof(pHash) ){
++        const char *zTerm;        /* Buffer containing term */
++        int nTerm;                /* Size of zTerm in bytes */
++        const u8 *pDoclist;       /* Pointer to doclist for this term */
++        int nDoclist;             /* Size of doclist in bytes */
+ 
+-    Fts5SegWriter writer;
+-    fts5WriteInit(p, &writer, iSegid);
++        /* Get the term and doclist for this entry. */
++        sqlite3Fts5HashScanEntry(pHash, &zTerm, &nTerm, &pDoclist, &nDoclist);
++        if( bSecureDelete==0 ){
++          fts5WriteAppendTerm(p, &writer, nTerm, (const u8*)zTerm);
++          if( p->rc!=SQLITE_OK ) break;
++          assert( writer.bFirstRowidInPage==0 );
++        }
+ 
+-    pBuf = &writer.writer.buf;
+-    pPgidx = &writer.writer.pgidx;
++        if( !bSecureDelete && pgsz>=(pBuf->n + pPgidx->n + nDoclist + 1) ){
++          /* The entire doclist will fit on the current leaf. */
++          fts5BufferSafeAppendBlob(pBuf, pDoclist, nDoclist);
++        }else{
++          int bTermWritten = !bSecureDelete;
++          i64 iRowid = 0;
++          i64 iPrev = 0;
++          int iOff = 0;
++
++          /* The entire doclist will not fit on this leaf. The following
++          ** loop iterates through the poslists that make up the current
++          ** doclist.  */
++          while( p->rc==SQLITE_OK && iOffrc!=SQLITE_OK || pDoclist[iOff]==0x01 ){
++                  iOff++;
++                  continue;
++                }
++              }
++            }
+ 
+-    /* fts5WriteInit() should have initialized the buffers to (most likely)
+-    ** the maximum space required. */
+-    assert( p->rc || pBuf->nSpace>=(pgsz + FTS5_DATA_PADDING) );
+-    assert( p->rc || pPgidx->nSpace>=(pgsz + FTS5_DATA_PADDING) );
++            if( p->rc==SQLITE_OK && bTermWritten==0 ){
++              fts5WriteAppendTerm(p, &writer, nTerm, (const u8*)zTerm);
++              bTermWritten = 1;
++              assert( p->rc!=SQLITE_OK || writer.bFirstRowidInPage==0 );
++            }
+ 
+-    /* Begin scanning through hash table entries. This loop runs once for each
+-    ** term/doclist currently stored within the hash table. */
+-    if( p->rc==SQLITE_OK ){
+-      p->rc = sqlite3Fts5HashScanInit(pHash, 0, 0);
+-    }
+-    while( p->rc==SQLITE_OK && 0==sqlite3Fts5HashScanEof(pHash) ){
+-      const char *zTerm;          /* Buffer containing term */
+-      const u8 *pDoclist;         /* Pointer to doclist for this term */
+-      int nDoclist;               /* Size of doclist in bytes */
+-
+-      /* Write the term for this entry to disk. */
+-      sqlite3Fts5HashScanEntry(pHash, &zTerm, &pDoclist, &nDoclist);
+-      fts5WriteAppendTerm(p, &writer, (int)strlen(zTerm), (const u8*)zTerm);
+-      if( p->rc!=SQLITE_OK ) break;
+-
+-      assert( writer.bFirstRowidInPage==0 );
+-      if( pgsz>=(pBuf->n + pPgidx->n + nDoclist + 1) ){
+-        /* The entire doclist will fit on the current leaf. */
+-        fts5BufferSafeAppendBlob(pBuf, pDoclist, nDoclist);
+-      }else{
+-        i64 iRowid = 0;
+-        u64 iDelta = 0;
+-        int iOff = 0;
+-
+-        /* The entire doclist will not fit on this leaf. The following
+-        ** loop iterates through the poslists that make up the current
+-        ** doclist.  */
+-        while( p->rc==SQLITE_OK && iOffp[0], (u16)pBuf->n);   /* first rowid on page */
+-            pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid);
+-            writer.bFirstRowidInPage = 0;
+-            fts5WriteDlidxAppend(p, &writer, iRowid);
++            if( writer.bFirstRowidInPage ){
++              fts5PutU16(&pBuf->p[0], (u16)pBuf->n);   /* first rowid on page */
++              pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid);
++              writer.bFirstRowidInPage = 0;
++              fts5WriteDlidxAppend(p, &writer, iRowid);
++            }else{
++              u64 iRowidDelta = (u64)iRowid - (u64)iPrev;
++              pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowidDelta);
++            }
+             if( p->rc!=SQLITE_OK ) break;
+-          }else{
+-            pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iDelta);
+-          }
+-          assert( pBuf->n<=pBuf->nSpace );
++            assert( pBuf->n<=pBuf->nSpace );
++            iPrev = iRowid;
+ 
+-          if( eDetail==FTS5_DETAIL_NONE ){
+-            if( iOffp[pBuf->n++] = 0;
+-              iOff++;
++            if( eDetail==FTS5_DETAIL_NONE ){
+               if( iOffp[pBuf->n++] = 0;
+                 iOff++;
++                if( iOffp[pBuf->n++] = 0;
++                  iOff++;
++                }
++              }
++              if( (pBuf->n + pPgidx->n)>=pgsz ){
++                fts5WriteFlushLeaf(p, &writer);
+               }
+-            }
+-            if( (pBuf->n + pPgidx->n)>=pgsz ){
+-              fts5WriteFlushLeaf(p, &writer);
+-            }
+-          }else{
+-            int bDummy;
+-            int nPos;
+-            int nCopy = fts5GetPoslistSize(&pDoclist[iOff], &nPos, &bDummy);
+-            nCopy += nPos;
+-            if( (pBuf->n + pPgidx->n + nCopy) <= pgsz ){
+-              /* The entire poslist will fit on the current leaf. So copy
+-              ** it in one go. */
+-              fts5BufferSafeAppendBlob(pBuf, &pDoclist[iOff], nCopy);
+             }else{
+-              /* The entire poslist will not fit on this leaf. So it needs
+-              ** to be broken into sections. The only qualification being
+-              ** that each varint must be stored contiguously.  */
+-              const u8 *pPoslist = &pDoclist[iOff];
+-              int iPos = 0;
+-              while( p->rc==SQLITE_OK ){
+-                int nSpace = pgsz - pBuf->n - pPgidx->n;
+-                int n = 0;
+-                if( (nCopy - iPos)<=nSpace ){
+-                  n = nCopy - iPos;
+-                }else{
+-                  n = fts5PoslistPrefix(&pPoslist[iPos], nSpace);
+-                }
+-                assert( n>0 );
+-                fts5BufferSafeAppendBlob(pBuf, &pPoslist[iPos], n);
+-                iPos += n;
+-                if( (pBuf->n + pPgidx->n)>=pgsz ){
+-                  fts5WriteFlushLeaf(p, &writer);
++              int bDel = 0;
++              int nPos = 0;
++              int nCopy = fts5GetPoslistSize(&pDoclist[iOff], &nPos, &bDel);
++              if( bDel && bSecureDelete ){
++                fts5BufferAppendVarint(&p->rc, pBuf, nPos*2);
++                iOff += nCopy;
++                nCopy = nPos;
++              }else{
++                nCopy += nPos;
++              }
++              if( (pBuf->n + pPgidx->n + nCopy) <= pgsz ){
++                /* The entire poslist will fit on the current leaf. So copy
++                ** it in one go. */
++                fts5BufferSafeAppendBlob(pBuf, &pDoclist[iOff], nCopy);
++              }else{
++                /* The entire poslist will not fit on this leaf. So it needs
++                ** to be broken into sections. The only qualification being
++                ** that each varint must be stored contiguously.  */
++                const u8 *pPoslist = &pDoclist[iOff];
++                int iPos = 0;
++                while( p->rc==SQLITE_OK ){
++                  int nSpace = pgsz - pBuf->n - pPgidx->n;
++                  int n = 0;
++                  if( (nCopy - iPos)<=nSpace ){
++                    n = nCopy - iPos;
++                  }else{
++                    n = fts5PoslistPrefix(&pPoslist[iPos], nSpace);
++                  }
++                  assert( n>0 );
++                  fts5BufferSafeAppendBlob(pBuf, &pPoslist[iPos], n);
++                  iPos += n;
++                  if( (pBuf->n + pPgidx->n)>=pgsz ){
++                    fts5WriteFlushLeaf(p, &writer);
++                  }
++                  if( iPos>=nCopy ) break;
+                 }
+-                if( iPos>=nCopy ) break;
+               }
++              iOff += nCopy;
+             }
+-            iOff += nCopy;
+           }
+         }
+-      }
+ 
+-      /* TODO2: Doclist terminator written here. */
+-      /* pBuf->p[pBuf->n++] = '\0'; */
+-      assert( pBuf->n<=pBuf->nSpace );
+-      if( p->rc==SQLITE_OK ) sqlite3Fts5HashScanNext(pHash);
+-    }
+-    sqlite3Fts5HashClear(pHash);
+-    fts5WriteFinish(p, &writer, &pgnoLast);
++        /* TODO2: Doclist terminator written here. */
++        /* pBuf->p[pBuf->n++] = '\0'; */
++        assert( pBuf->n<=pBuf->nSpace );
++        if( p->rc==SQLITE_OK ) sqlite3Fts5HashScanNext(pHash);
++      }
++      fts5WriteFinish(p, &writer, &pgnoLast);
+ 
+-    /* Update the Fts5Structure. It is written back to the database by the
+-    ** fts5StructureRelease() call below.  */
+-    if( pStruct->nLevel==0 ){
+-      fts5StructureAddLevel(&p->rc, &pStruct);
+-    }
+-    fts5StructureExtendLevel(&p->rc, pStruct, 0, 1, 0);
+-    if( p->rc==SQLITE_OK ){
+-      pSeg = &pStruct->aLevel[0].aSeg[ pStruct->aLevel[0].nSeg++ ];
+-      pSeg->iSegid = iSegid;
+-      pSeg->pgnoFirst = 1;
+-      pSeg->pgnoLast = pgnoLast;
+-      pStruct->nSegment++;
++      assert( p->rc!=SQLITE_OK || bSecureDelete || pgnoLast>0 );
++      if( pgnoLast>0 ){
++        /* Update the Fts5Structure. It is written back to the database by the
++        ** fts5StructureRelease() call below.  */
++        if( pStruct->nLevel==0 ){
++          fts5StructureAddLevel(&p->rc, &pStruct);
++        }
++        fts5StructureExtendLevel(&p->rc, pStruct, 0, 1, 0);
++        if( p->rc==SQLITE_OK ){
++          pSeg = &pStruct->aLevel[0].aSeg[ pStruct->aLevel[0].nSeg++ ];
++          pSeg->iSegid = iSegid;
++          pSeg->pgnoFirst = 1;
++          pSeg->pgnoLast = pgnoLast;
++          if( pStruct->nOriginCntr>0 ){
++            pSeg->iOrigin1 = pStruct->nOriginCntr;
++            pSeg->iOrigin2 = pStruct->nOriginCntr;
++            pSeg->nEntry = p->nPendingRow;
++            pStruct->nOriginCntr++;
++          }
++          pStruct->nSegment++;
++        }
++        fts5StructurePromote(p, 0, pStruct);
++      }
+     }
+-    fts5StructurePromote(p, 0, pStruct);
+   }
+ 
+-  fts5IndexAutomerge(p, &pStruct, pgnoLast);
++  fts5IndexAutomerge(p, &pStruct, pgnoLast + p->nContentlessDelete);
+   fts5IndexCrisismerge(p, &pStruct);
+   fts5StructureWrite(p, pStruct);
+   fts5StructureRelease(pStruct);
+@@ -231844,10 +244411,21 @@ static void fts5FlushOneHash(Fts5Index *p){
+ */
+ static void fts5IndexFlush(Fts5Index *p){
+   /* Unless it is empty, flush the hash table to disk */
+-  if( p->nPendingData ){
++  if( p->flushRc ){
++    p->rc = p->flushRc;
++    return;
++  }
++  if( p->nPendingData || p->nContentlessDelete ){
+     assert( p->pHash );
+-    p->nPendingData = 0;
+     fts5FlushOneHash(p);
++    if( p->rc==SQLITE_OK ){
++      sqlite3Fts5HashClear(p->pHash);
++      p->nPendingData = 0;
++      p->nPendingRow = 0;
++      p->nContentlessDelete = 0;
++    }else if( p->nPendingData || p->nContentlessDelete ){
++      p->flushRc = p->rc;
++    }
+   }
+ }
+ 
+@@ -231863,17 +244441,22 @@ static Fts5Structure *fts5IndexOptimizeStruct(
+   /* Figure out if this structure requires optimization. A structure does
+   ** not require optimization if either:
+   **
+-  **  + it consists of fewer than two segments, or
+-  **  + all segments are on the same level, or
+-  **  + all segments except one are currently inputs to a merge operation.
++  **  1. it consists of fewer than two segments, or
++  **  2. all segments are on the same level, or
++  **  3. all segments except one are currently inputs to a merge operation.
+   **
+-  ** In the first case, return NULL. In the second, increment the ref-count
+-  ** on *pStruct and return a copy of the pointer to it.
++  ** In the first case, if there are no tombstone hash pages, return NULL. In
++  ** the second, increment the ref-count on *pStruct and return a copy of the
++  ** pointer to it.
+   */
+-  if( nSeg<2 ) return 0;
++  if( nSeg==0 ) return 0;
+   for(i=0; inLevel; i++){
+     int nThis = pStruct->aLevel[i].nSeg;
+-    if( nThis==nSeg || (nThis==nSeg-1 && pStruct->aLevel[i].nMerge==nThis) ){
++    int nMerge = pStruct->aLevel[i].nMerge;
++    if( nThis>0 && (nThis==nSeg || (nThis==nSeg-1 && nMerge==nThis)) ){
++      if( nSeg==1 && nThis==1 && pStruct->aLevel[i].aSeg[0].nPgTombstone==0 ){
++        return 0;
++      }
+       fts5StructureRef(pStruct);
+       return pStruct;
+     }
+@@ -231886,10 +244469,11 @@ static Fts5Structure *fts5IndexOptimizeStruct(
+   if( pNew ){
+     Fts5StructureLevel *pLvl;
+     nByte = nSeg * sizeof(Fts5StructureSegment);
+-    pNew->nLevel = pStruct->nLevel+1;
++    pNew->nLevel = MIN(pStruct->nLevel+1, FTS5_MAX_LEVEL);
+     pNew->nRef = 1;
+     pNew->nWriteCounter = pStruct->nWriteCounter;
+-    pLvl = &pNew->aLevel[pStruct->nLevel];
++    pNew->nOriginCntr = pStruct->nOriginCntr;
++    pLvl = &pNew->aLevel[pNew->nLevel-1];
+     pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(&p->rc, nByte);
+     if( pLvl->aSeg ){
+       int iLvl, iSeg;
+@@ -231919,7 +244503,9 @@ static int sqlite3Fts5IndexOptimize(Fts5Index *p){
+ 
+   assert( p->rc==SQLITE_OK );
+   fts5IndexFlush(p);
++  assert( p->rc!=SQLITE_OK || p->nContentlessDelete==0 );
+   pStruct = fts5StructureRead(p);
++  assert( p->rc!=SQLITE_OK || pStruct!=0 );
+   fts5StructureInvalidate(p);
+ 
+   if( pStruct ){
+@@ -231948,7 +244534,10 @@ static int sqlite3Fts5IndexOptimize(Fts5Index *p){
+ ** INSERT command.
+ */
+ static int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
+-  Fts5Structure *pStruct = fts5StructureRead(p);
++  Fts5Structure *pStruct = 0;
++
++  fts5IndexFlush(p);
++  pStruct = fts5StructureRead(p);
+   if( pStruct ){
+     int nMin = p->pConfig->nUsermerge;
+     fts5StructureInvalidate(p);
+@@ -231956,7 +244545,7 @@ static int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
+       Fts5Structure *pNew = fts5IndexOptimizeStruct(p, pStruct);
+       fts5StructureRelease(pStruct);
+       pStruct = pNew;
+-      nMin = 2;
++      nMin = 1;
+       nMerge = nMerge*-1;
+     }
+     if( pStruct && pStruct->nLevel ){
+@@ -231971,7 +244560,7 @@ static int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
+ 
+ static void fts5AppendRowid(
+   Fts5Index *p,
+-  i64 iDelta,
++  u64 iDelta,
+   Fts5Iter *pUnused,
+   Fts5Buffer *pBuf
+ ){
+@@ -231981,7 +244570,7 @@ static void fts5AppendRowid(
+ 
+ static void fts5AppendPoslist(
+   Fts5Index *p,
+-  i64 iDelta,
++  u64 iDelta,
+   Fts5Iter *pMulti,
+   Fts5Buffer *pBuf
+ ){
+@@ -232056,10 +244645,10 @@ static void fts5MergeAppendDocid(
+ }
+ #endif
+ 
+-#define fts5MergeAppendDocid(pBuf, iLastRowid, iRowid) {       \
+-  assert( (pBuf)->n!=0 || (iLastRowid)==0 );                   \
+-  fts5BufferSafeAppendVarint((pBuf), (iRowid) - (iLastRowid)); \
+-  (iLastRowid) = (iRowid);                                     \
++#define fts5MergeAppendDocid(pBuf, iLastRowid, iRowid) {                 \
++  assert( (pBuf)->n!=0 || (iLastRowid)==0 );                             \
++  fts5BufferSafeAppendVarint((pBuf), (u64)(iRowid) - (u64)(iLastRowid)); \
++  (iLastRowid) = (iRowid);                                               \
+ }
+ 
+ /*
+@@ -232191,7 +244780,7 @@ static void fts5MergePrefixLists(
+   /* Initialize a doclist-iterator for each input buffer. Arrange them in
+   ** a linked-list starting at pHead in ascending order of rowid. Avoid
+   ** linking any iterators already at EOF into the linked list at all. */
+-  assert( nBuf+1<=sizeof(aMerger)/sizeof(aMerger[0]) );
++  assert( nBuf+1<=(int)(sizeof(aMerger)/sizeof(aMerger[0])) );
+   memset(aMerger, 0, sizeof(PrefixMerger)*(nBuf+1));
+   pHead = &aMerger[nBuf];
+   fts5DoclistIterInit(p1, &pHead->iter);
+@@ -232322,7 +244911,7 @@ static void fts5SetupPrefixIter(
+   u8 *pToken,                     /* Buffer containing prefix to match */
+   int nToken,                     /* Size of buffer pToken in bytes */
+   Fts5Colset *pColset,            /* Restrict matches to these columns */
+-  Fts5Iter **ppIter          /* OUT: New iterator */
++  Fts5Iter **ppIter               /* OUT: New iterator */
+ ){
+   Fts5Structure *pStruct;
+   Fts5Buffer *aBuf;
+@@ -232330,7 +244919,7 @@ static void fts5SetupPrefixIter(
+   int nMerge = 1;
+ 
+   void (*xMerge)(Fts5Index*, Fts5Buffer*, int, Fts5Buffer*);
+-  void (*xAppend)(Fts5Index*, i64, Fts5Iter*, Fts5Buffer*);
++  void (*xAppend)(Fts5Index*, u64, Fts5Iter*, Fts5Buffer*);
+   if( p->pConfig->eDetail==FTS5_DETAIL_NONE ){
+     xMerge = fts5MergeRowidLists;
+     xAppend = fts5AppendRowid;
+@@ -232343,8 +244932,9 @@ static void fts5SetupPrefixIter(
+ 
+   aBuf = (Fts5Buffer*)fts5IdxMalloc(p, sizeof(Fts5Buffer)*nBuf);
+   pStruct = fts5StructureRead(p);
++  assert( p->rc!=SQLITE_OK || (aBuf && pStruct) );
+ 
+-  if( aBuf && pStruct ){
++  if( p->rc==SQLITE_OK ){
+     const int flags = FTS5INDEX_QUERY_SCAN
+                     | FTS5INDEX_QUERY_SKIPEMPTY
+                     | FTS5INDEX_QUERY_NOOUTPUT;
+@@ -232356,6 +244946,12 @@ static void fts5SetupPrefixIter(
+     int bNewTerm = 1;
+ 
+     memset(&doclist, 0, sizeof(doclist));
++
++    /* If iIdx is non-zero, then it is the number of a prefix-index for
++    ** prefixes 1 character longer than the prefix being queried for. That
++    ** index contains all the doclists required, except for the one
++    ** corresponding to the prefix itself. That one is extracted from the
++    ** main term index here.  */
+     if( iIdx!=0 ){
+       int dummy = 0;
+       const int f2 = FTS5INDEX_QUERY_SKIPEMPTY|FTS5INDEX_QUERY_NOOUTPUT;
+@@ -232369,7 +244965,7 @@ static void fts5SetupPrefixIter(
+         Fts5SegIter *pSeg = &p1->aSeg[ p1->aFirst[1].iFirst ];
+         p1->xSetOutputs(p1, pSeg);
+         if( p1->base.nData ){
+-          xAppend(p, p1->base.iRowid-iLastRowid, p1, &doclist);
++          xAppend(p, (u64)p1->base.iRowid-(u64)iLastRowid, p1, &doclist);
+           iLastRowid = p1->base.iRowid;
+         }
+       }
+@@ -232379,6 +244975,7 @@ static void fts5SetupPrefixIter(
+     pToken[0] = FTS5_MAIN_PREFIX + iIdx;
+     fts5MultiIterNew(p, pStruct, flags, pColset, pToken, nToken, -1, 0, &p1);
+     fts5IterSetOutputCb(&p->rc, p1);
++
+     for( /* no-op */ ;
+         fts5MultiIterEof(p, p1)==0;
+         fts5MultiIterNext2(p, p1, &bNewTerm)
+@@ -232394,7 +244991,6 @@ static void fts5SetupPrefixIter(
+       }
+ 
+       if( p1->base.nData==0 ) continue;
+-
+       if( p1->base.iRowid<=iLastRowid && doclist.n>0 ){
+         for(i=0; p->rc==SQLITE_OK && doclist.n; i++){
+           int i1 = i*nMerge;
+@@ -232417,7 +245013,7 @@ static void fts5SetupPrefixIter(
+         iLastRowid = 0;
+       }
+ 
+-      xAppend(p, p1->base.iRowid-iLastRowid, p1, &doclist);
++      xAppend(p, (u64)p1->base.iRowid-(u64)iLastRowid, p1, &doclist);
+       iLastRowid = p1->base.iRowid;
+     }
+ 
+@@ -232433,7 +245029,7 @@ static void fts5SetupPrefixIter(
+     }
+     fts5MultiIterFree(p1);
+ 
+-    pData = fts5IdxMalloc(p, sizeof(Fts5Data)+doclist.n+FTS5_DATA_ZERO_PADDING);
++    pData = fts5IdxMalloc(p, sizeof(*pData)+doclist.n+FTS5_DATA_ZERO_PADDING);
+     if( pData ){
+       pData->p = (u8*)&pData[1];
+       pData->nn = pData->szLeaf = doclist.n;
+@@ -232470,6 +245066,9 @@ static int sqlite3Fts5IndexBeginWrite(Fts5Index *p, int bDelete, i64 iRowid){
+ 
+   p->iWriteRowid = iRowid;
+   p->bDelete = bDelete;
++  if( bDelete==0 ){
++    p->nPendingRow++;
++  }
+   return fts5IndexReturn(p);
+ }
+ 
+@@ -232507,6 +245106,9 @@ static int sqlite3Fts5IndexReinit(Fts5Index *p){
+   fts5StructureInvalidate(p);
+   fts5IndexDiscardData(p);
+   memset(&s, 0, sizeof(Fts5Structure));
++  if( p->pConfig->bContentlessDelete ){
++    s.nOriginCntr = 1;
++  }
+   fts5DataWrite(p, FTS5_AVERAGES_ROWID, (const u8*)"", 0);
+   fts5StructureWrite(p, &s);
+   return fts5IndexReturn(p);
+@@ -232570,7 +245172,9 @@ static int sqlite3Fts5IndexClose(Fts5Index *p){
+     sqlite3_finalize(p->pIdxWriter);
+     sqlite3_finalize(p->pIdxDeleter);
+     sqlite3_finalize(p->pIdxSelect);
++    sqlite3_finalize(p->pIdxNextSelect);
+     sqlite3_finalize(p->pDataVersion);
++    sqlite3_finalize(p->pDeleteFromIdx);
+     sqlite3Fts5HashFree(p->pHash);
+     sqlite3_free(p->zDataTbl);
+     sqlite3_free(p);
+@@ -232664,6 +245268,454 @@ static int sqlite3Fts5IndexWrite(
+   return rc;
+ }
+ 
++/*
++** pToken points to a buffer of size nToken bytes containing a search
++** term, including the index number at the start, used on a tokendata=1
++** table. This function returns true if the term in buffer pBuf matches
++** token pToken/nToken.
++*/
++static int fts5IsTokendataPrefix(
++  Fts5Buffer *pBuf,
++  const u8 *pToken,
++  int nToken
++){
++  return (
++      pBuf->n>=nToken
++   && 0==memcmp(pBuf->p, pToken, nToken)
++   && (pBuf->n==nToken || pBuf->p[nToken]==0x00)
++  );
++}
++
++/*
++** Ensure the segment-iterator passed as the only argument points to EOF.
++*/
++static void fts5SegIterSetEOF(Fts5SegIter *pSeg){
++  fts5DataRelease(pSeg->pLeaf);
++  pSeg->pLeaf = 0;
++}
++
++/*
++** Usually, a tokendata=1 iterator (struct Fts5TokenDataIter) accumulates an
++** array of these for each row it visits. Or, for an iterator used by an
++** "ORDER BY rank" query, it accumulates an array of these for the entire
++** query.
++**
++** Each instance in the array indicates the iterator (and therefore term)
++** associated with position iPos of rowid iRowid. This is used by the
++** xInstToken() API.
++*/
++struct Fts5TokenDataMap {
++  i64 iRowid;                     /* Row this token is located in */
++  i64 iPos;                       /* Position of token */
++  int iIter;                      /* Iterator token was read from */
++};
++
++/*
++** An object used to supplement Fts5Iter for tokendata=1 iterators.
++*/
++struct Fts5TokenDataIter {
++  int nIter;
++  int nIterAlloc;
++
++  int nMap;
++  int nMapAlloc;
++  Fts5TokenDataMap *aMap;
++
++  Fts5PoslistReader *aPoslistReader;
++  int *aPoslistToIter;
++  Fts5Iter *apIter[1];
++};
++
++/*
++** This function appends iterator pAppend to Fts5TokenDataIter pIn and
++** returns the result.
++*/
++static Fts5TokenDataIter *fts5AppendTokendataIter(
++  Fts5Index *p,                   /* Index object (for error code) */
++  Fts5TokenDataIter *pIn,         /* Current Fts5TokenDataIter struct */
++  Fts5Iter *pAppend               /* Append this iterator */
++){
++  Fts5TokenDataIter *pRet = pIn;
++
++  if( p->rc==SQLITE_OK ){
++    if( pIn==0 || pIn->nIter==pIn->nIterAlloc ){
++      int nAlloc = pIn ? pIn->nIterAlloc*2 : 16;
++      int nByte = nAlloc * sizeof(Fts5Iter*) + sizeof(Fts5TokenDataIter);
++      Fts5TokenDataIter *pNew = (Fts5TokenDataIter*)sqlite3_realloc(pIn, nByte);
++
++      if( pNew==0 ){
++        p->rc = SQLITE_NOMEM;
++      }else{
++        if( pIn==0 ) memset(pNew, 0, nByte);
++        pRet = pNew;
++        pNew->nIterAlloc = nAlloc;
++      }
++    }
++  }
++  if( p->rc ){
++    sqlite3Fts5IterClose((Fts5IndexIter*)pAppend);
++  }else{
++    pRet->apIter[pRet->nIter++] = pAppend;
++  }
++  assert( pRet==0 || pRet->nIter<=pRet->nIterAlloc );
++
++  return pRet;
++}
++
++/*
++** Delete an Fts5TokenDataIter structure and its contents.
++*/
++static void fts5TokendataIterDelete(Fts5TokenDataIter *pSet){
++  if( pSet ){
++    int ii;
++    for(ii=0; iinIter; ii++){
++      fts5MultiIterFree(pSet->apIter[ii]);
++    }
++    sqlite3_free(pSet->aPoslistReader);
++    sqlite3_free(pSet->aMap);
++    sqlite3_free(pSet);
++  }
++}
++
++/*
++** Append a mapping to the token-map belonging to object pT.
++*/
++static void fts5TokendataIterAppendMap(
++  Fts5Index *p,
++  Fts5TokenDataIter *pT,
++  int iIter,
++  i64 iRowid,
++  i64 iPos
++){
++  if( p->rc==SQLITE_OK ){
++    if( pT->nMap==pT->nMapAlloc ){
++      int nNew = pT->nMapAlloc ? pT->nMapAlloc*2 : 64;
++      int nByte = nNew * sizeof(Fts5TokenDataMap);
++      Fts5TokenDataMap *aNew;
++
++      aNew = (Fts5TokenDataMap*)sqlite3_realloc(pT->aMap, nByte);
++      if( aNew==0 ){
++        p->rc = SQLITE_NOMEM;
++        return;
++      }
++
++      pT->aMap = aNew;
++      pT->nMapAlloc = nNew;
++    }
++
++    pT->aMap[pT->nMap].iRowid = iRowid;
++    pT->aMap[pT->nMap].iPos = iPos;
++    pT->aMap[pT->nMap].iIter = iIter;
++    pT->nMap++;
++  }
++}
++
++/*
++** The iterator passed as the only argument must be a tokendata=1 iterator
++** (pIter->pTokenDataIter!=0). This function sets the iterator output
++** variables (pIter->base.*) according to the contents of the current
++** row.
++*/
++static void fts5IterSetOutputsTokendata(Fts5Iter *pIter){
++  int ii;
++  int nHit = 0;
++  i64 iRowid = SMALLEST_INT64;
++  int iMin = 0;
++
++  Fts5TokenDataIter *pT = pIter->pTokenDataIter;
++
++  pIter->base.nData = 0;
++  pIter->base.pData = 0;
++
++  for(ii=0; iinIter; ii++){
++    Fts5Iter *p = pT->apIter[ii];
++    if( p->base.bEof==0 ){
++      if( nHit==0 || p->base.iRowidbase.iRowid;
++        nHit = 1;
++        pIter->base.pData = p->base.pData;
++        pIter->base.nData = p->base.nData;
++        iMin = ii;
++      }else if( p->base.iRowid==iRowid ){
++        nHit++;
++      }
++    }
++  }
++
++  if( nHit==0 ){
++    pIter->base.bEof = 1;
++  }else{
++    int eDetail = pIter->pIndex->pConfig->eDetail;
++    pIter->base.bEof = 0;
++    pIter->base.iRowid = iRowid;
++
++    if( nHit==1 && eDetail==FTS5_DETAIL_FULL ){
++      fts5TokendataIterAppendMap(pIter->pIndex, pT, iMin, iRowid, -1);
++    }else
++    if( nHit>1 && eDetail!=FTS5_DETAIL_NONE ){
++      int nReader = 0;
++      int nByte = 0;
++      i64 iPrev = 0;
++
++      /* Allocate array of iterators if they are not already allocated. */
++      if( pT->aPoslistReader==0 ){
++        pT->aPoslistReader = (Fts5PoslistReader*)sqlite3Fts5MallocZero(
++            &pIter->pIndex->rc,
++            pT->nIter * (sizeof(Fts5PoslistReader) + sizeof(int))
++        );
++        if( pT->aPoslistReader==0 ) return;
++        pT->aPoslistToIter = (int*)&pT->aPoslistReader[pT->nIter];
++      }
++
++      /* Populate an iterator for each poslist that will be merged */
++      for(ii=0; iinIter; ii++){
++        Fts5Iter *p = pT->apIter[ii];
++        if( iRowid==p->base.iRowid ){
++          pT->aPoslistToIter[nReader] = ii;
++          sqlite3Fts5PoslistReaderInit(
++              p->base.pData, p->base.nData, &pT->aPoslistReader[nReader++]
++          );
++          nByte += p->base.nData;
++        }
++      }
++
++      /* Ensure the output buffer is large enough */
++      if( fts5BufferGrow(&pIter->pIndex->rc, &pIter->poslist, nByte+nHit*10) ){
++        return;
++      }
++
++      /* Ensure the token-mapping is large enough */
++      if( eDetail==FTS5_DETAIL_FULL && pT->nMapAlloc<(pT->nMap + nByte) ){
++        int nNew = (pT->nMapAlloc + nByte) * 2;
++        Fts5TokenDataMap *aNew = (Fts5TokenDataMap*)sqlite3_realloc(
++            pT->aMap, nNew*sizeof(Fts5TokenDataMap)
++        );
++        if( aNew==0 ){
++          pIter->pIndex->rc = SQLITE_NOMEM;
++          return;
++        }
++        pT->aMap = aNew;
++        pT->nMapAlloc = nNew;
++      }
++
++      pIter->poslist.n = 0;
++
++      while( 1 ){
++        i64 iMinPos = LARGEST_INT64;
++
++        /* Find smallest position */
++        iMin = 0;
++        for(ii=0; iiaPoslistReader[ii];
++          if( pReader->bEof==0 ){
++            if( pReader->iPosiPos;
++              iMin = ii;
++            }
++          }
++        }
++
++        /* If all readers were at EOF, break out of the loop. */
++        if( iMinPos==LARGEST_INT64 ) break;
++
++        sqlite3Fts5PoslistSafeAppend(&pIter->poslist, &iPrev, iMinPos);
++        sqlite3Fts5PoslistReaderNext(&pT->aPoslistReader[iMin]);
++
++        if( eDetail==FTS5_DETAIL_FULL ){
++          pT->aMap[pT->nMap].iPos = iMinPos;
++          pT->aMap[pT->nMap].iIter = pT->aPoslistToIter[iMin];
++          pT->aMap[pT->nMap].iRowid = iRowid;
++          pT->nMap++;
++        }
++      }
++
++      pIter->base.pData = pIter->poslist.p;
++      pIter->base.nData = pIter->poslist.n;
++    }
++  }
++}
++
++/*
++** The iterator passed as the only argument must be a tokendata=1 iterator
++** (pIter->pTokenDataIter!=0). This function advances the iterator. If
++** argument bFrom is false, then the iterator is advanced to the next
++** entry. Or, if bFrom is true, it is advanced to the first entry with
++** a rowid of iFrom or greater.
++*/
++static void fts5TokendataIterNext(Fts5Iter *pIter, int bFrom, i64 iFrom){
++  int ii;
++  Fts5TokenDataIter *pT = pIter->pTokenDataIter;
++
++  for(ii=0; iinIter; ii++){
++    Fts5Iter *p = pT->apIter[ii];
++    if( p->base.bEof==0
++     && (p->base.iRowid==pIter->base.iRowid || (bFrom && p->base.iRowidpIndex, p, bFrom, iFrom);
++      while( bFrom && p->base.bEof==0
++          && p->base.iRowidpIndex->rc==SQLITE_OK
++      ){
++        fts5MultiIterNext(p->pIndex, p, 0, 0);
++      }
++    }
++  }
++
++  fts5IterSetOutputsTokendata(pIter);
++}
++
++/*
++** If the segment-iterator passed as the first argument is at EOF, then
++** set pIter->term to a copy of buffer pTerm.
++*/
++static void fts5TokendataSetTermIfEof(Fts5Iter *pIter, Fts5Buffer *pTerm){
++  if( pIter && pIter->aSeg[0].pLeaf==0 ){
++    fts5BufferSet(&pIter->pIndex->rc, &pIter->aSeg[0].term, pTerm->n, pTerm->p);
++  }
++}
++
++/*
++** This function sets up an iterator to use for a non-prefix query on a
++** tokendata=1 table.
++*/
++static Fts5Iter *fts5SetupTokendataIter(
++  Fts5Index *p,                   /* FTS index to query */
++  const u8 *pToken,               /* Buffer containing query term */
++  int nToken,                     /* Size of buffer pToken in bytes */
++  Fts5Colset *pColset             /* Colset to filter on */
++){
++  Fts5Iter *pRet = 0;
++  Fts5TokenDataIter *pSet = 0;
++  Fts5Structure *pStruct = 0;
++  const int flags = FTS5INDEX_QUERY_SCANONETERM | FTS5INDEX_QUERY_SCAN;
++
++  Fts5Buffer bSeek = {0, 0, 0};
++  Fts5Buffer *pSmall = 0;
++
++  fts5IndexFlush(p);
++  pStruct = fts5StructureRead(p);
++
++  while( p->rc==SQLITE_OK ){
++    Fts5Iter *pPrev = pSet ? pSet->apIter[pSet->nIter-1] : 0;
++    Fts5Iter *pNew = 0;
++    Fts5SegIter *pNewIter = 0;
++    Fts5SegIter *pPrevIter = 0;
++
++    int iLvl, iSeg, ii;
++
++    pNew = fts5MultiIterAlloc(p, pStruct->nSegment);
++    if( pSmall ){
++      fts5BufferSet(&p->rc, &bSeek, pSmall->n, pSmall->p);
++      fts5BufferAppendBlob(&p->rc, &bSeek, 1, (const u8*)"\0");
++    }else{
++      fts5BufferSet(&p->rc, &bSeek, nToken, pToken);
++    }
++    if( p->rc ){
++      sqlite3Fts5IterClose((Fts5IndexIter*)pNew);
++      break;
++    }
++
++    pNewIter = &pNew->aSeg[0];
++    pPrevIter = (pPrev ? &pPrev->aSeg[0] : 0);
++    for(iLvl=0; iLvlnLevel; iLvl++){
++      for(iSeg=pStruct->aLevel[iLvl].nSeg-1; iSeg>=0; iSeg--){
++        Fts5StructureSegment *pSeg = &pStruct->aLevel[iLvl].aSeg[iSeg];
++        int bDone = 0;
++
++        if( pPrevIter ){
++          if( fts5BufferCompare(pSmall, &pPrevIter->term) ){
++            memcpy(pNewIter, pPrevIter, sizeof(Fts5SegIter));
++            memset(pPrevIter, 0, sizeof(Fts5SegIter));
++            bDone = 1;
++          }else if( pPrevIter->iEndofDoclist>pPrevIter->pLeaf->szLeaf ){
++            fts5SegIterNextInit(p,(const char*)bSeek.p,bSeek.n-1,pSeg,pNewIter);
++            bDone = 1;
++          }
++        }
++
++        if( bDone==0 ){
++          fts5SegIterSeekInit(p, bSeek.p, bSeek.n, flags, pSeg, pNewIter);
++        }
++
++        if( pPrevIter ){
++          if( pPrevIter->pTombArray ){
++            pNewIter->pTombArray = pPrevIter->pTombArray;
++            pNewIter->pTombArray->nRef++;
++          }
++        }else{
++          fts5SegIterAllocTombstone(p, pNewIter);
++        }
++
++        pNewIter++;
++        if( pPrevIter ) pPrevIter++;
++        if( p->rc ) break;
++      }
++    }
++    fts5TokendataSetTermIfEof(pPrev, pSmall);
++
++    pNew->bSkipEmpty = 1;
++    pNew->pColset = pColset;
++    fts5IterSetOutputCb(&p->rc, pNew);
++
++    /* Loop through all segments in the new iterator. Find the smallest
++    ** term that any segment-iterator points to. Iterator pNew will be
++    ** used for this term. Also, set any iterator that points to a term that
++    ** does not match pToken/nToken to point to EOF */
++    pSmall = 0;
++    for(ii=0; iinSeg; ii++){
++      Fts5SegIter *pII = &pNew->aSeg[ii];
++      if( 0==fts5IsTokendataPrefix(&pII->term, pToken, nToken) ){
++        fts5SegIterSetEOF(pII);
++      }
++      if( pII->pLeaf && (!pSmall || fts5BufferCompare(pSmall, &pII->term)>0) ){
++        pSmall = &pII->term;
++      }
++    }
++
++    /* If pSmall is still NULL at this point, then the new iterator does
++    ** not point to any terms that match the query. So delete it and break
++    ** out of the loop - all required iterators have been collected.  */
++    if( pSmall==0 ){
++      sqlite3Fts5IterClose((Fts5IndexIter*)pNew);
++      break;
++    }
++
++    /* Append this iterator to the set and continue. */
++    pSet = fts5AppendTokendataIter(p, pSet, pNew);
++  }
++
++  if( p->rc==SQLITE_OK && pSet ){
++    int ii;
++    for(ii=0; iinIter; ii++){
++      Fts5Iter *pIter = pSet->apIter[ii];
++      int iSeg;
++      for(iSeg=0; iSegnSeg; iSeg++){
++        pIter->aSeg[iSeg].flags |= FTS5_SEGITER_ONETERM;
++      }
++      fts5MultiIterFinishSetup(p, pIter);
++    }
++  }
++
++  if( p->rc==SQLITE_OK ){
++    pRet = fts5MultiIterAlloc(p, 0);
++  }
++  if( pRet ){
++    pRet->pTokenDataIter = pSet;
++    if( pSet ){
++      fts5IterSetOutputsTokendata(pRet);
++    }else{
++      pRet->base.bEof = 1;
++    }
++  }else{
++    fts5TokendataIterDelete(pSet);
++  }
++
++  fts5StructureRelease(pStruct);
++  fts5BufferFree(&bSeek);
++  return pRet;
++}
++
++
+ /*
+ ** Open a new iterator to iterate though all rowid that match the
+ ** specified token or token prefix.
+@@ -232685,8 +245737,13 @@ static int sqlite3Fts5IndexQuery(
+   if( sqlite3Fts5BufferSize(&p->rc, &buf, nToken+1)==0 ){
+     int iIdx = 0;                 /* Index to search */
+     int iPrefixIdx = 0;           /* +1 prefix index */
++    int bTokendata = pConfig->bTokendata;
+     if( nToken>0 ) memcpy(&buf.p[1], pToken, nToken);
+ 
++    if( flags & (FTS5INDEX_QUERY_NOTOKENDATA|FTS5INDEX_QUERY_SCAN) ){
++      bTokendata = 0;
++    }
++
+     /* Figure out which index to search and set iIdx accordingly. If this
+     ** is a prefix query for which there is no prefix index, set iIdx to
+     ** greater than pConfig->nPrefix to indicate that the query will be
+@@ -232712,7 +245769,10 @@ static int sqlite3Fts5IndexQuery(
+       }
+     }
+ 
+-    if( iIdx<=pConfig->nPrefix ){
++    if( bTokendata && iIdx==0 ){
++      buf.p[0] = '0';
++      pRet = fts5SetupTokendataIter(p, buf.p, nToken+1, pColset);
++    }else if( iIdx<=pConfig->nPrefix ){
+       /* Straight index lookup */
+       Fts5Structure *pStruct = fts5StructureRead(p);
+       buf.p[0] = (u8)(FTS5_MAIN_PREFIX + iIdx);
+@@ -232759,7 +245819,11 @@ static int sqlite3Fts5IndexQuery(
+ static int sqlite3Fts5IterNext(Fts5IndexIter *pIndexIter){
+   Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
+   assert( pIter->pIndex->rc==SQLITE_OK );
+-  fts5MultiIterNext(pIter->pIndex, pIter, 0, 0);
++  if( pIter->pTokenDataIter ){
++    fts5TokendataIterNext(pIter, 0, 0);
++  }else{
++    fts5MultiIterNext(pIter->pIndex, pIter, 0, 0);
++  }
+   return fts5IndexReturn(pIter->pIndex);
+ }
+ 
+@@ -232792,7 +245856,11 @@ static int sqlite3Fts5IterNextScan(Fts5IndexIter *pIndexIter){
+ */
+ static int sqlite3Fts5IterNextFrom(Fts5IndexIter *pIndexIter, i64 iMatch){
+   Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
+-  fts5MultiIterNextFrom(pIter->pIndex, pIter, iMatch);
++  if( pIter->pTokenDataIter ){
++    fts5TokendataIterNext(pIter, 1, iMatch);
++  }else{
++    fts5MultiIterNextFrom(pIter->pIndex, pIter, iMatch);
++  }
+   return fts5IndexReturn(pIter->pIndex);
+ }
+ 
+@@ -232807,6 +245875,99 @@ static const char *sqlite3Fts5IterTerm(Fts5IndexIter *pIndexIter, int *pn){
+   return (z ? &z[1] : 0);
+ }
+ 
++/*
++** This is used by xInstToken() to access the token at offset iOff, column
++** iCol of row iRowid. The token is returned via output variables *ppOut
++** and *pnOut. The iterator passed as the first argument must be a tokendata=1
++** iterator (pIter->pTokenDataIter!=0).
++*/
++static int sqlite3Fts5IterToken(
++  Fts5IndexIter *pIndexIter,
++  i64 iRowid,
++  int iCol,
++  int iOff,
++  const char **ppOut, int *pnOut
++){
++  Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
++  Fts5TokenDataIter *pT = pIter->pTokenDataIter;
++  Fts5TokenDataMap *aMap = pT->aMap;
++  i64 iPos = (((i64)iCol)<<32) + iOff;
++
++  int i1 = 0;
++  int i2 = pT->nMap;
++  int iTest = 0;
++
++  while( i2>i1 ){
++    iTest = (i1 + i2) / 2;
++
++    if( aMap[iTest].iRowidiRowid ){
++      i2 = iTest;
++    }else{
++      if( aMap[iTest].iPosiPos ){
++        i2 = iTest;
++      }else{
++        break;
++      }
++    }
++  }
++
++  if( i2>i1 ){
++    Fts5Iter *pMap = pT->apIter[aMap[iTest].iIter];
++    *ppOut = (const char*)pMap->aSeg[0].term.p+1;
++    *pnOut = pMap->aSeg[0].term.n-1;
++  }
++
++  return SQLITE_OK;
++}
++
++/*
++** Clear any existing entries from the token-map associated with the
++** iterator passed as the only argument.
++*/
++static void sqlite3Fts5IndexIterClearTokendata(Fts5IndexIter *pIndexIter){
++  Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
++  if( pIter && pIter->pTokenDataIter ){
++    pIter->pTokenDataIter->nMap = 0;
++  }
++}
++
++/*
++** Set a token-mapping for the iterator passed as the first argument. This
++** is used in detail=column or detail=none mode when a token is requested
++** using the xInstToken() API. In this case the caller tokenizers the
++** current row and configures the token-mapping via multiple calls to this
++** function.
++*/
++static int sqlite3Fts5IndexIterWriteTokendata(
++  Fts5IndexIter *pIndexIter,
++  const char *pToken, int nToken,
++  i64 iRowid, int iCol, int iOff
++){
++  Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
++  Fts5TokenDataIter *pT = pIter->pTokenDataIter;
++  Fts5Index *p = pIter->pIndex;
++  int ii;
++
++  assert( p->pConfig->eDetail!=FTS5_DETAIL_FULL );
++  assert( pIter->pTokenDataIter );
++
++  for(ii=0; iinIter; ii++){
++    Fts5Buffer *pTerm = &pT->apIter[ii]->aSeg[0].term;
++    if( nToken==pTerm->n-1 && memcmp(pToken, pTerm->p+1, nToken)==0 ) break;
++  }
++  if( iinIter ){
++    fts5TokendataIterAppendMap(p, pT, ii, iRowid, (((i64)iCol)<<32) + iOff);
++  }
++  return fts5IndexReturn(p);
++}
++
+ /*
+ ** Close an iterator opened by an earlier call to sqlite3Fts5IndexQuery().
+ */
+@@ -232814,6 +245975,7 @@ static void sqlite3Fts5IterClose(Fts5IndexIter *pIndexIter){
+   if( pIndexIter ){
+     Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
+     Fts5Index *pIndex = pIter->pIndex;
++    fts5TokendataIterDelete(pIter->pTokenDataIter);
+     fts5MultiIterFree(pIter);
+     sqlite3Fts5IndexCloseReader(pIndex);
+   }
+@@ -232897,6 +246059,347 @@ static int sqlite3Fts5IndexLoadConfig(Fts5Index *p){
+   return fts5IndexReturn(p);
+ }
+ 
++/*
++** Retrieve the origin value that will be used for the segment currently
++** being accumulated in the in-memory hash table when it is flushed to
++** disk. If successful, SQLITE_OK is returned and (*piOrigin) set to
++** the queried value. Or, if an error occurs, an error code is returned
++** and the final value of (*piOrigin) is undefined.
++*/
++static int sqlite3Fts5IndexGetOrigin(Fts5Index *p, i64 *piOrigin){
++  Fts5Structure *pStruct;
++  pStruct = fts5StructureRead(p);
++  if( pStruct ){
++    *piOrigin = pStruct->nOriginCntr;
++    fts5StructureRelease(pStruct);
++  }
++  return fts5IndexReturn(p);
++}
++
++/*
++** Buffer pPg contains a page of a tombstone hash table - one of nPg pages
++** associated with the same segment. This function adds rowid iRowid to
++** the hash table. The caller is required to guarantee that there is at
++** least one free slot on the page.
++**
++** If parameter bForce is false and the hash table is deemed to be full
++** (more than half of the slots are occupied), then non-zero is returned
++** and iRowid not inserted. Or, if bForce is true or if the hash table page
++** is not full, iRowid is inserted and zero returned.
++*/
++static int fts5IndexTombstoneAddToPage(
++  Fts5Data *pPg,
++  int bForce,
++  int nPg,
++  u64 iRowid
++){
++  const int szKey = TOMBSTONE_KEYSIZE(pPg);
++  const int nSlot = TOMBSTONE_NSLOT(pPg);
++  const int nElem = fts5GetU32(&pPg->p[4]);
++  int iSlot = (iRowid / nPg) % nSlot;
++  int nCollide = nSlot;
++
++  if( szKey==4 && iRowid>0xFFFFFFFF ) return 2;
++  if( iRowid==0 ){
++    pPg->p[1] = 0x01;
++    return 0;
++  }
++
++  if( bForce==0 && nElem>=(nSlot/2) ){
++    return 1;
++  }
++
++  fts5PutU32(&pPg->p[4], nElem+1);
++  if( szKey==4 ){
++    u32 *aSlot = (u32*)&pPg->p[8];
++    while( aSlot[iSlot] ){
++      iSlot = (iSlot + 1) % nSlot;
++      if( nCollide--==0 ) return 0;
++    }
++    fts5PutU32((u8*)&aSlot[iSlot], (u32)iRowid);
++  }else{
++    u64 *aSlot = (u64*)&pPg->p[8];
++    while( aSlot[iSlot] ){
++      iSlot = (iSlot + 1) % nSlot;
++      if( nCollide--==0 ) return 0;
++    }
++    fts5PutU64((u8*)&aSlot[iSlot], iRowid);
++  }
++
++  return 0;
++}
++
++/*
++** This function attempts to build a new hash containing all the keys
++** currently in the tombstone hash table for segment pSeg. The new
++** hash will be stored in the nOut buffers passed in array apOut[].
++** All pages of the new hash use key-size szKey (4 or 8).
++**
++** Return 0 if the hash is successfully rebuilt into the nOut pages.
++** Or non-zero if it is not (because one page became overfull). In this
++** case the caller should retry with a larger nOut parameter.
++**
++** Parameter pData1 is page iPg1 of the hash table being rebuilt.
++*/
++static int fts5IndexTombstoneRehash(
++  Fts5Index *p,
++  Fts5StructureSegment *pSeg,     /* Segment to rebuild hash of */
++  Fts5Data *pData1,               /* One page of current hash - or NULL */
++  int iPg1,                       /* Which page of the current hash is pData1 */
++  int szKey,                      /* 4 or 8, the keysize */
++  int nOut,                       /* Number of output pages */
++  Fts5Data **apOut                /* Array of output hash pages */
++){
++  int ii;
++  int res = 0;
++
++  /* Initialize the headers of all the output pages */
++  for(ii=0; iip[0] = szKey;
++    fts5PutU32(&apOut[ii]->p[4], 0);
++  }
++
++  /* Loop through the current pages of the hash table. */
++  for(ii=0; res==0 && iinPgTombstone; ii++){
++    Fts5Data *pData = 0;          /* Page ii of the current hash table */
++    Fts5Data *pFree = 0;          /* Free this at the end of the loop */
++
++    if( iPg1==ii ){
++      pData = pData1;
++    }else{
++      pFree = pData = fts5DataRead(p, FTS5_TOMBSTONE_ROWID(pSeg->iSegid, ii));
++    }
++
++    if( pData ){
++      int szKeyIn = TOMBSTONE_KEYSIZE(pData);
++      int nSlotIn = (pData->nn - 8) / szKeyIn;
++      int iIn;
++      for(iIn=0; iInp[8];
++          if( aSlot[iIn] ) iVal = fts5GetU32((u8*)&aSlot[iIn]);
++        }else{
++          u64 *aSlot = (u64*)&pData->p[8];
++          if( aSlot[iIn] ) iVal = fts5GetU64((u8*)&aSlot[iIn]);
++        }
++
++        /* If iVal is not 0 at this point, insert it into the new hash table */
++        if( iVal ){
++          Fts5Data *pPg = apOut[(iVal % nOut)];
++          res = fts5IndexTombstoneAddToPage(pPg, 0, nOut, iVal);
++          if( res ) break;
++        }
++      }
++
++      /* If this is page 0 of the old hash, copy the rowid-0-flag from the
++      ** old hash to the new.  */
++      if( ii==0 ){
++        apOut[0]->p[1] = pData->p[1];
++      }
++    }
++    fts5DataRelease(pFree);
++  }
++
++  return res;
++}
++
++/*
++** This is called to rebuild the hash table belonging to segment pSeg.
++** If parameter pData1 is not NULL, then one page of the existing hash table
++** has already been loaded - pData1, which is page iPg1. The key-size for
++** the new hash table is szKey (4 or 8).
++**
++** If successful, the new hash table is not written to disk. Instead,
++** output parameter (*pnOut) is set to the number of pages in the new
++** hash table, and (*papOut) to point to an array of buffers containing
++** the new page data.
++**
++** If an error occurs, an error code is left in the Fts5Index object and
++** both output parameters set to 0 before returning.
++*/
++static void fts5IndexTombstoneRebuild(
++  Fts5Index *p,
++  Fts5StructureSegment *pSeg,     /* Segment to rebuild hash of */
++  Fts5Data *pData1,               /* One page of current hash - or NULL */
++  int iPg1,                       /* Which page of the current hash is pData1 */
++  int szKey,                      /* 4 or 8, the keysize */
++  int *pnOut,                     /* OUT: Number of output pages */
++  Fts5Data ***papOut              /* OUT: Output hash pages */
++){
++  const int MINSLOT = 32;
++  int nSlotPerPage = MAX(MINSLOT, (p->pConfig->pgsz - 8) / szKey);
++  int nSlot = 0;                  /* Number of slots in each output page */
++  int nOut = 0;
++
++  /* Figure out how many output pages (nOut) and how many slots per
++  ** page (nSlot).  There are three possibilities:
++  **
++  **   1. The hash table does not yet exist. In this case the new hash
++  **      table will consist of a single page with MINSLOT slots.
++  **
++  **   2. The hash table exists but is currently a single page. In this
++  **      case an attempt is made to grow the page to accommodate the new
++  **      entry. The page is allowed to grow up to nSlotPerPage (see above)
++  **      slots.
++  **
++  **   3. The hash table already consists of more than one page, or of
++  **      a single page already so large that it cannot be grown. In this
++  **      case the new hash consists of (nPg*2+1) pages of nSlotPerPage
++  **      slots each, where nPg is the current number of pages in the
++  **      hash table.
++  */
++  if( pSeg->nPgTombstone==0 ){
++    /* Case 1. */
++    nOut = 1;
++    nSlot = MINSLOT;
++  }else if( pSeg->nPgTombstone==1 ){
++    /* Case 2. */
++    int nElem = (int)fts5GetU32(&pData1->p[4]);
++    assert( pData1 && iPg1==0 );
++    nOut = 1;
++    nSlot = MAX(nElem*4, MINSLOT);
++    if( nSlot>nSlotPerPage ) nOut = 0;
++  }
++  if( nOut==0 ){
++    /* Case 3. */
++    nOut = (pSeg->nPgTombstone * 2 + 1);
++    nSlot = nSlotPerPage;
++  }
++
++  /* Allocate the required array and output pages */
++  while( 1 ){
++    int res = 0;
++    int ii = 0;
++    int szPage = 0;
++    Fts5Data **apOut = 0;
++
++    /* Allocate space for the new hash table */
++    assert( nSlot>=MINSLOT );
++    apOut = (Fts5Data**)sqlite3Fts5MallocZero(&p->rc, sizeof(Fts5Data*) * nOut);
++    szPage = 8 + nSlot*szKey;
++    for(ii=0; iirc,
++          sizeof(Fts5Data)+szPage
++      );
++      if( pNew ){
++        pNew->nn = szPage;
++        pNew->p = (u8*)&pNew[1];
++        apOut[ii] = pNew;
++      }
++    }
++
++    /* Rebuild the hash table. */
++    if( p->rc==SQLITE_OK ){
++      res = fts5IndexTombstoneRehash(p, pSeg, pData1, iPg1, szKey, nOut, apOut);
++    }
++    if( res==0 ){
++      if( p->rc ){
++        fts5IndexFreeArray(apOut, nOut);
++        apOut = 0;
++        nOut = 0;
++      }
++      *pnOut = nOut;
++      *papOut = apOut;
++      break;
++    }
++
++    /* If control flows to here, it was not possible to rebuild the hash
++    ** table. Free all buffers and then try again with more pages. */
++    assert( p->rc==SQLITE_OK );
++    fts5IndexFreeArray(apOut, nOut);
++    nSlot = nSlotPerPage;
++    nOut = nOut*2 + 1;
++  }
++}
++
++
++/*
++** Add a tombstone for rowid iRowid to segment pSeg.
++*/
++static void fts5IndexTombstoneAdd(
++  Fts5Index *p,
++  Fts5StructureSegment *pSeg,
++  u64 iRowid
++){
++  Fts5Data *pPg = 0;
++  int iPg = -1;
++  int szKey = 0;
++  int nHash = 0;
++  Fts5Data **apHash = 0;
++
++  p->nContentlessDelete++;
++
++  if( pSeg->nPgTombstone>0 ){
++    iPg = iRowid % pSeg->nPgTombstone;
++    pPg = fts5DataRead(p, FTS5_TOMBSTONE_ROWID(pSeg->iSegid,iPg));
++    if( pPg==0 ){
++      assert( p->rc!=SQLITE_OK );
++      return;
++    }
++
++    if( 0==fts5IndexTombstoneAddToPage(pPg, 0, pSeg->nPgTombstone, iRowid) ){
++      fts5DataWrite(p, FTS5_TOMBSTONE_ROWID(pSeg->iSegid,iPg), pPg->p, pPg->nn);
++      fts5DataRelease(pPg);
++      return;
++    }
++  }
++
++  /* Have to rebuild the hash table. First figure out the key-size (4 or 8). */
++  szKey = pPg ? TOMBSTONE_KEYSIZE(pPg) : 4;
++  if( iRowid>0xFFFFFFFF ) szKey = 8;
++
++  /* Rebuild the hash table */
++  fts5IndexTombstoneRebuild(p, pSeg, pPg, iPg, szKey, &nHash, &apHash);
++  assert( p->rc==SQLITE_OK || (nHash==0 && apHash==0) );
++
++  /* If all has succeeded, write the new rowid into one of the new hash
++  ** table pages, then write them all out to disk. */
++  if( nHash ){
++    int ii = 0;
++    fts5IndexTombstoneAddToPage(apHash[iRowid % nHash], 1, nHash, iRowid);
++    for(ii=0; iiiSegid, ii);
++      fts5DataWrite(p, iTombstoneRowid, apHash[ii]->p, apHash[ii]->nn);
++    }
++    pSeg->nPgTombstone = nHash;
++    fts5StructureWrite(p, p->pStruct);
++  }
++
++  fts5DataRelease(pPg);
++  fts5IndexFreeArray(apHash, nHash);
++}
++
++/*
++** Add iRowid to the tombstone list of the segment or segments that contain
++** rows from origin iOrigin. Return SQLITE_OK if successful, or an SQLite
++** error code otherwise.
++*/
++static int sqlite3Fts5IndexContentlessDelete(Fts5Index *p, i64 iOrigin, i64 iRowid){
++  Fts5Structure *pStruct;
++  pStruct = fts5StructureRead(p);
++  if( pStruct ){
++    int bFound = 0;               /* True after pSeg->nEntryTombstone incr. */
++    int iLvl;
++    for(iLvl=pStruct->nLevel-1; iLvl>=0; iLvl--){
++      int iSeg;
++      for(iSeg=pStruct->aLevel[iLvl].nSeg-1; iSeg>=0; iSeg--){
++        Fts5StructureSegment *pSeg = &pStruct->aLevel[iLvl].aSeg[iSeg];
++        if( pSeg->iOrigin1<=(u64)iOrigin && pSeg->iOrigin2>=(u64)iOrigin ){
++          if( bFound==0 ){
++            pSeg->nEntryTombstone++;
++            bFound = 1;
++          }
++          fts5IndexTombstoneAdd(p, pSeg, iRowid);
++        }
++      }
++    }
++    fts5StructureRelease(pStruct);
++  }
++  return fts5IndexReturn(p);
++}
+ 
+ /*************************************************************************
+ **************************************************************************
+@@ -232980,7 +246483,9 @@ static int fts5QueryCksum(
+   int eDetail = p->pConfig->eDetail;
+   u64 cksum = *pCksum;
+   Fts5IndexIter *pIter = 0;
+-  int rc = sqlite3Fts5IndexQuery(p, z, n, flags, 0, &pIter);
++  int rc = sqlite3Fts5IndexQuery(
++      p, z, n, (flags | FTS5INDEX_QUERY_NOTOKENDATA), 0, &pIter
++  );
+ 
+   while( rc==SQLITE_OK && ALWAYS(pIter!=0) && 0==sqlite3Fts5IterEof(pIter) ){
+     i64 rowid = pIter->iRowid;
+@@ -233147,7 +246652,7 @@ static void fts5IndexIntegrityCheckEmpty(
+ }
+ 
+ static void fts5IntegrityCheckPgidx(Fts5Index *p, Fts5Data *pLeaf){
+-  int iTermOff = 0;
++  i64 iTermOff = 0;
+   int ii;
+ 
+   Fts5Buffer buf1 = {0,0,0};
+@@ -233156,7 +246661,7 @@ static void fts5IntegrityCheckPgidx(Fts5Index *p, Fts5Data *pLeaf){
+   ii = pLeaf->szLeaf;
+   while( iinn && p->rc==SQLITE_OK ){
+     int res;
+-    int iOff;
++    i64 iOff;
+     int nIncr;
+ 
+     ii += fts5GetVarint32(&pLeaf->p[ii], nIncr);
+@@ -233201,6 +246706,7 @@ static void fts5IndexIntegrityCheckSegment(
+   Fts5StructureSegment *pSeg      /* Segment to check internal consistency */
+ ){
+   Fts5Config *pConfig = p->pConfig;
++  int bSecureDelete = (pConfig->iVersion==FTS5_CURRENT_VERSION_SECUREDELETE);
+   sqlite3_stmt *pStmt = 0;
+   int rc2;
+   int iIdxPrevLeaf = pSeg->pgnoFirst-1;
+@@ -233236,7 +246742,19 @@ static void fts5IndexIntegrityCheckSegment(
+     ** is also a rowid pointer within the leaf page header, it points to a
+     ** location before the term.  */
+     if( pLeaf->nn<=pLeaf->szLeaf ){
+-      p->rc = FTS5_CORRUPT;
++
++      if( nIdxTerm==0
++       && pConfig->iVersion==FTS5_CURRENT_VERSION_SECUREDELETE
++       && pLeaf->nn==pLeaf->szLeaf
++       && pLeaf->nn==4
++      ){
++        /* special case - the very first page in a segment keeps its %_idx
++        ** entry even if all the terms are removed from it by secure-delete
++        ** operations. */
++      }else{
++        p->rc = FTS5_CORRUPT;
++      }
++
+     }else{
+       int iOff;                   /* Offset of first term on leaf */
+       int iRowidOff;              /* Offset of first rowid on leaf */
+@@ -233300,9 +246818,12 @@ static void fts5IndexIntegrityCheckSegment(
+           ASSERT_SZLEAF_OK(pLeaf);
+           if( iRowidOff>=pLeaf->szLeaf ){
+             p->rc = FTS5_CORRUPT;
+-          }else{
++          }else if( bSecureDelete==0 || iRowidOff>0 ){
++            i64 iDlRowid = fts5DlidxIterRowid(pDlidx);
+             fts5GetVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid);
+-            if( iRowid!=fts5DlidxIterRowid(pDlidx) ) p->rc = FTS5_CORRUPT;
++            if( iRowidrc = FTS5_CORRUPT;
++            }
+           }
+           fts5DataRelease(pLeaf);
+         }
+@@ -233396,6 +246917,7 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum
+ 
+     /* If this is a new term, query for it. Update cksum3 with the results. */
+     fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
++    if( p->rc ) break;
+ 
+     if( eDetail==FTS5_DETAIL_NONE ){
+       if( 0==fts5MultiIterIsEmpty(p, pIter) ){
+@@ -233431,13 +246953,14 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum
+ ** function only.
+ */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** Decode a segment-data rowid from the %_data table. This function is
+ ** the opposite of macro FTS5_SEGMENT_ROWID().
+ */
+ static void fts5DecodeRowid(
+   i64 iRowid,                     /* Rowid from %_data table */
++  int *pbTombstone,               /* OUT: Tombstone hash flag */
+   int *piSegid,                   /* OUT: Segment id */
+   int *pbDlidx,                   /* OUT: Dlidx flag */
+   int *piHeight,                  /* OUT: Height */
+@@ -233453,13 +246976,16 @@ static void fts5DecodeRowid(
+   iRowid >>= FTS5_DATA_DLI_B;
+ 
+   *piSegid = (int)(iRowid & (((i64)1 << FTS5_DATA_ID_B) - 1));
++  iRowid >>= FTS5_DATA_ID_B;
++
++  *pbTombstone = (int)(iRowid & 0x0001);
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){
+-  int iSegid, iHeight, iPgno, bDlidx;       /* Rowid compenents */
+-  fts5DecodeRowid(iKey, &iSegid, &bDlidx, &iHeight, &iPgno);
++  int iSegid, iHeight, iPgno, bDlidx, bTomb;     /* Rowid compenents */
++  fts5DecodeRowid(iKey, &bTomb, &iSegid, &bDlidx, &iHeight, &iPgno);
+ 
+   if( iSegid==0 ){
+     if( iKey==FTS5_AVERAGES_ROWID ){
+@@ -233469,14 +246995,16 @@ static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){
+     }
+   }
+   else{
+-    sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "{%ssegid=%d h=%d pgno=%d}",
+-        bDlidx ? "dlidx " : "", iSegid, iHeight, iPgno
++    sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "{%s%ssegid=%d h=%d pgno=%d}",
++        bDlidx ? "dlidx " : "",
++        bTomb ? "tombstone " : "",
++        iSegid, iHeight, iPgno
+     );
+   }
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ static void fts5DebugStructure(
+   int *pRc,                       /* IN/OUT: error code */
+   Fts5Buffer *pBuf,
+@@ -233491,16 +247019,22 @@ static void fts5DebugStructure(
+     );
+     for(iSeg=0; iSegnSeg; iSeg++){
+       Fts5StructureSegment *pSeg = &pLvl->aSeg[iSeg];
+-      sqlite3Fts5BufferAppendPrintf(pRc, pBuf, " {id=%d leaves=%d..%d}",
++      sqlite3Fts5BufferAppendPrintf(pRc, pBuf, " {id=%d leaves=%d..%d",
+           pSeg->iSegid, pSeg->pgnoFirst, pSeg->pgnoLast
+       );
++      if( pSeg->iOrigin1>0 ){
++        sqlite3Fts5BufferAppendPrintf(pRc, pBuf, " origin=%lld..%lld",
++            pSeg->iOrigin1, pSeg->iOrigin2
++        );
++      }
++      sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "}");
+     }
+     sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "}");
+   }
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** This is part of the fts5_decode() debugging aid.
+ **
+@@ -233525,9 +247059,9 @@ static void fts5DecodeStructure(
+   fts5DebugStructure(pRc, pBuf, p);
+   fts5StructureRelease(p);
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** This is part of the fts5_decode() debugging aid.
+ **
+@@ -233550,9 +247084,9 @@ static void fts5DecodeAverages(
+     zSpace = " ";
+   }
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** Buffer (a/n) is assumed to contain a list of serialized varints. Read
+ ** each varint and append its string representation to buffer pBuf. Return
+@@ -233569,9 +247103,9 @@ static int fts5DecodePoslist(int *pRc, Fts5Buffer *pBuf, const u8 *a, int n){
+   }
+   return iOff;
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** The start of buffer (a/n) contains the start of a doclist. The doclist
+ ** may or may not finish within the buffer. This function appends a text
+@@ -233604,9 +247138,9 @@ static int fts5DecodeDoclist(int *pRc, Fts5Buffer *pBuf, const u8 *a, int n){
+ 
+   return iOff;
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** This function is part of the fts5_decode() debugging function. It is
+ ** only ever used with detail=none tables.
+@@ -233647,9 +247181,27 @@ static void fts5DecodeRowidList(
+     sqlite3Fts5BufferAppendPrintf(pRc, pBuf, " %lld%s", iRowid, zApp);
+   }
+ }
+-#endif /* SQLITE_TEST */
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
++static void fts5BufferAppendTerm(int *pRc, Fts5Buffer *pBuf, Fts5Buffer *pTerm){
++  int ii;
++  fts5BufferGrow(pRc, pBuf, pTerm->n*2 + 1);
++  if( *pRc==SQLITE_OK ){
++    for(ii=0; iin; ii++){
++      if( pTerm->p[ii]==0x00 ){
++        pBuf->p[pBuf->n++] = '\\';
++        pBuf->p[pBuf->n++] = '0';
++      }else{
++        pBuf->p[pBuf->n++] = pTerm->p[ii];
++      }
++    }
++    pBuf->p[pBuf->n] = 0x00;
++  }
++}
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
++
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+ /*
+ ** The implementation of user-defined scalar function fts5_decode().
+ */
+@@ -233660,6 +247212,7 @@ static void fts5DecodeFunction(
+ ){
+   i64 iRowid;                     /* Rowid for record being decoded */
+   int iSegid,iHeight,iPgno,bDlidx;/* Rowid components */
++  int bTomb;
+   const u8 *aBlob; int n;         /* Record to decode */
+   u8 *a = 0;
+   Fts5Buffer s;                   /* Build up text to return here */
+@@ -233682,7 +247235,7 @@ static void fts5DecodeFunction(
+   if( a==0 ) goto decode_out;
+   if( n>0 ) memcpy(a, aBlob, n);
+ 
+-  fts5DecodeRowid(iRowid, &iSegid, &bDlidx, &iHeight, &iPgno);
++  fts5DecodeRowid(iRowid, &bTomb, &iSegid, &bDlidx, &iHeight, &iPgno);
+ 
+   fts5DebugRowid(&rc, &s, iRowid);
+   if( bDlidx ){
+@@ -233701,6 +247254,28 @@ static void fts5DecodeFunction(
+           " %d(%lld)", lvl.iLeafPgno, lvl.iRowid
+       );
+     }
++  }else if( bTomb ){
++    u32 nElem  = fts5GetU32(&a[4]);
++    int szKey = (aBlob[0]==4 || aBlob[0]==8) ? aBlob[0] : 8;
++    int nSlot = (n - 8) / szKey;
++    int ii;
++    sqlite3Fts5BufferAppendPrintf(&rc, &s, " nElem=%d", (int)nElem);
++    if( aBlob[1] ){
++      sqlite3Fts5BufferAppendPrintf(&rc, &s, " 0");
++    }
++    for(ii=0; iiestimatedCost = (double)100;
++  pIdxInfo->estimatedRows = 100;
++  pIdxInfo->idxNum = 0;
++  for(i=0, p=pIdxInfo->aConstraint; inConstraint; i++, p++){
++    if( p->usable==0 ) continue;
++    if( p->op==SQLITE_INDEX_CONSTRAINT_EQ && p->iColumn==11 ){
++      rc = SQLITE_OK;
++      pIdxInfo->aConstraintUsage[i].omit = 1;
++      pIdxInfo->aConstraintUsage[i].argvIndex = 1;
++      break;
++    }
++  }
++  return rc;
++}
++
++/*
++** This method is the destructor for bytecodevtab objects.
++*/
++static int fts5structDisconnectMethod(sqlite3_vtab *pVtab){
++  Fts5StructVtab *p = (Fts5StructVtab*)pVtab;
++  sqlite3_free(p);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new bytecodevtab_cursor object.
++*/
++static int fts5structOpenMethod(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCsr){
++  int rc = SQLITE_OK;
++  Fts5StructVcsr *pNew = 0;
++
++  pNew = sqlite3Fts5MallocZero(&rc, sizeof(*pNew));
++  *ppCsr = (sqlite3_vtab_cursor*)pNew;
++
++  return SQLITE_OK;
++}
++
++/*
++** Destructor for a bytecodevtab_cursor.
++*/
++static int fts5structCloseMethod(sqlite3_vtab_cursor *cur){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr*)cur;
++  fts5StructureRelease(pCsr->pStruct);
++  sqlite3_free(pCsr);
++  return SQLITE_OK;
++}
++
++
++/*
++** Advance a bytecodevtab_cursor to its next row of output.
++*/
++static int fts5structNextMethod(sqlite3_vtab_cursor *cur){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr*)cur;
++  Fts5Structure *p = pCsr->pStruct;
++
++  assert( pCsr->pStruct );
++  pCsr->iSeg++;
++  pCsr->iRowid++;
++  while( pCsr->iLevelnLevel && pCsr->iSeg>=p->aLevel[pCsr->iLevel].nSeg ){
++    pCsr->iLevel++;
++    pCsr->iSeg = 0;
++  }
++  if( pCsr->iLevel>=p->nLevel ){
++    fts5StructureRelease(pCsr->pStruct);
++    pCsr->pStruct = 0;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the cursor has been moved off of the last
++** row of output.
++*/
++static int fts5structEofMethod(sqlite3_vtab_cursor *cur){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr*)cur;
++  return pCsr->pStruct==0;
++}
++
++static int fts5structRowidMethod(
++  sqlite3_vtab_cursor *cur,
++  sqlite_int64 *piRowid
++){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr*)cur;
++  *piRowid = pCsr->iRowid;
++  return SQLITE_OK;
++}
++
++/*
++** Return values of columns for the row at which the bytecodevtab_cursor
++** is currently pointing.
++*/
++static int fts5structColumnMethod(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr*)cur;
++  Fts5Structure *p = pCsr->pStruct;
++  Fts5StructureSegment *pSeg = &p->aLevel[pCsr->iLevel].aSeg[pCsr->iSeg];
++
++  switch( i ){
++    case 0: /* level */
++      sqlite3_result_int(ctx, pCsr->iLevel);
++      break;
++    case 1: /* segment */
++      sqlite3_result_int(ctx, pCsr->iSeg);
++      break;
++    case 2: /* merge */
++      sqlite3_result_int(ctx, pCsr->iSeg < p->aLevel[pCsr->iLevel].nMerge);
++      break;
++    case 3: /* segid */
++      sqlite3_result_int(ctx, pSeg->iSegid);
++      break;
++    case 4: /* leaf1 */
++      sqlite3_result_int(ctx, pSeg->pgnoFirst);
++      break;
++    case 5: /* leaf2 */
++      sqlite3_result_int(ctx, pSeg->pgnoLast);
++      break;
++    case 6: /* origin1 */
++      sqlite3_result_int64(ctx, pSeg->iOrigin1);
++      break;
++    case 7: /* origin2 */
++      sqlite3_result_int64(ctx, pSeg->iOrigin2);
++      break;
++    case 8: /* npgtombstone */
++      sqlite3_result_int(ctx, pSeg->nPgTombstone);
++      break;
++    case 9: /* nentrytombstone */
++      sqlite3_result_int64(ctx, pSeg->nEntryTombstone);
++      break;
++    case 10: /* nentry */
++      sqlite3_result_int64(ctx, pSeg->nEntry);
++      break;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Initialize a cursor.
++**
++**    idxNum==0     means show all subprograms
++**    idxNum==1     means show only the main bytecode and omit subprograms.
++*/
++static int fts5structFilterMethod(
++  sqlite3_vtab_cursor *pVtabCursor,
++  int idxNum, const char *idxStr,
++  int argc, sqlite3_value **argv
++){
++  Fts5StructVcsr *pCsr = (Fts5StructVcsr *)pVtabCursor;
++  int rc = SQLITE_OK;
++
++  const u8 *aBlob = 0;
++  int nBlob = 0;
++
++  assert( argc==1 );
++  fts5StructureRelease(pCsr->pStruct);
++  pCsr->pStruct = 0;
++
++  nBlob = sqlite3_value_bytes(argv[0]);
++  aBlob = (const u8*)sqlite3_value_blob(argv[0]);
++  rc = fts5StructureDecode(aBlob, nBlob, 0, &pCsr->pStruct);
++  if( rc==SQLITE_OK ){
++    pCsr->iLevel = 0;
++    pCsr->iRowid = 0;
++    pCsr->iSeg = -1;
++    rc = fts5structNextMethod(pVtabCursor);
++  }
++
++  return rc;
++}
++
++#endif /* SQLITE_TEST || SQLITE_FTS5_DEBUG */
+ 
+ /*
+ ** This is called as part of registering the FTS5 module with database
+@@ -233905,7 +247709,7 @@ static void fts5RowidFunction(
+ ** SQLite error code is returned instead.
+ */
+ static int sqlite3Fts5IndexInit(sqlite3 *db){
+-#ifdef SQLITE_TEST
++#if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG)
+   int rc = sqlite3_create_function(
+       db, "fts5_decode", 2, SQLITE_UTF8, 0, fts5DecodeFunction, 0, 0
+   );
+@@ -233922,6 +247726,37 @@ static int sqlite3Fts5IndexInit(sqlite3 *db){
+         db, "fts5_rowid", -1, SQLITE_UTF8, 0, fts5RowidFunction, 0, 0
+     );
+   }
++
++  if( rc==SQLITE_OK ){
++    static const sqlite3_module fts5structure_module = {
++      0,                           /* iVersion      */
++      0,                           /* xCreate       */
++      fts5structConnectMethod,     /* xConnect      */
++      fts5structBestIndexMethod,   /* xBestIndex    */
++      fts5structDisconnectMethod,  /* xDisconnect   */
++      0,                           /* xDestroy      */
++      fts5structOpenMethod,        /* xOpen         */
++      fts5structCloseMethod,       /* xClose        */
++      fts5structFilterMethod,      /* xFilter       */
++      fts5structNextMethod,        /* xNext         */
++      fts5structEofMethod,         /* xEof          */
++      fts5structColumnMethod,      /* xColumn       */
++      fts5structRowidMethod,       /* xRowid        */
++      0,                           /* xUpdate       */
++      0,                           /* xBegin        */
++      0,                           /* xSync         */
++      0,                           /* xCommit       */
++      0,                           /* xRollback     */
++      0,                           /* xFindFunction */
++      0,                           /* xRename       */
++      0,                           /* xSavepoint    */
++      0,                           /* xRelease      */
++      0,                           /* xRollbackTo   */
++      0,                           /* xShadowName   */
++      0                            /* xIntegrity    */
++    };
++    rc = sqlite3_create_module(db, "fts5_structure", &fts5structure_module, 0);
++  }
+   return rc;
+ #else
+   return SQLITE_OK;
+@@ -234057,6 +247892,8 @@ struct Fts5FullTable {
+   Fts5Storage *pStorage;          /* Document store */
+   Fts5Global *pGlobal;            /* Global (connection wide) data */
+   Fts5Cursor *pSortCsr;           /* Sort data from this cursor */
++  int iSavepoint;                 /* Successful xSavepoint()+1 */
++
+ #ifdef SQLITE_DEBUG
+   struct Fts5TransactionState ts;
+ #endif
+@@ -234200,7 +248037,7 @@ static void fts5CheckTransactionState(Fts5FullTable *p, int op, int iSavepoint){
+       break;
+ 
+     case FTS5_SYNC:
+-      assert( p->ts.eState==1 );
++      assert( p->ts.eState==1 || p->ts.eState==2 );
+       p->ts.eState = 2;
+       break;
+ 
+@@ -234215,21 +248052,21 @@ static void fts5CheckTransactionState(Fts5FullTable *p, int op, int iSavepoint){
+       break;
+ 
+     case FTS5_SAVEPOINT:
+-      assert( p->ts.eState==1 );
++      assert( p->ts.eState>=1 );
+       assert( iSavepoint>=0 );
+       assert( iSavepoint>=p->ts.iSavepoint );
+       p->ts.iSavepoint = iSavepoint;
+       break;
+ 
+     case FTS5_RELEASE:
+-      assert( p->ts.eState==1 );
++      assert( p->ts.eState>=1 );
+       assert( iSavepoint>=0 );
+       assert( iSavepoint<=p->ts.iSavepoint );
+       p->ts.iSavepoint = iSavepoint-1;
+       break;
+ 
+     case FTS5_ROLLBACKTO:
+-      assert( p->ts.eState==1 );
++      assert( p->ts.eState>=1 );
+       assert( iSavepoint>=-1 );
+       /* The following assert() can fail if another vtab strikes an error
+       ** within an xSavepoint() call then SQLite calls xRollbackTo() - without
+@@ -234345,6 +248182,13 @@ static int fts5InitVtab(
+     pConfig->pzErrmsg = 0;
+   }
+ 
++  if( rc==SQLITE_OK && pConfig->eContent==FTS5_CONTENT_NORMAL ){
++    rc = sqlite3_vtab_config(db, SQLITE_VTAB_CONSTRAINT_SUPPORT, (int)1);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
++  }
++
+   if( rc!=SQLITE_OK ){
+     fts5FreeVtab(pTab);
+     pTab = 0;
+@@ -234587,12 +248431,15 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
+   }
+   idxStr[iIdxStr] = '\0';
+ 
+-  /* Set idxFlags flags for the ORDER BY clause */
++  /* Set idxFlags flags for the ORDER BY clause
++  **
++  ** Note that tokendata=1 tables cannot currently handle "ORDER BY rowid DESC".
++  */
+   if( pInfo->nOrderBy==1 ){
+     int iSort = pInfo->aOrderBy[0].iColumn;
+     if( iSort==(pConfig->nCol+1) && bSeenMatch ){
+       idxFlags |= FTS5_BI_ORDER_RANK;
+-    }else if( iSort==-1 ){
++    }else if( iSort==-1 && (!pInfo->aOrderBy[0].desc || !pConfig->bTokendata) ){
+       idxFlags |= FTS5_BI_ORDER_ROWID;
+     }
+     if( BitFlagTest(idxFlags, FTS5_BI_ORDER_RANK|FTS5_BI_ORDER_ROWID) ){
+@@ -234844,6 +248691,16 @@ static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){
+   );
+   assert( !CsrFlagTest(pCsr, FTS5CSR_EOF) );
+ 
++  /* If this cursor uses FTS5_PLAN_MATCH and this is a tokendata=1 table,
++  ** clear any token mappings accumulated at the fts5_index.c level. In
++  ** other cases, specifically FTS5_PLAN_SOURCE and FTS5_PLAN_SORTED_MATCH,
++  ** we need to retain the mappings for the entire query.  */
++  if( pCsr->ePlan==FTS5_PLAN_MATCH
++   && ((Fts5Table*)pCursor->pVtab)->pConfig->bTokendata
++  ){
++    sqlite3Fts5ExprClearTokens(pCsr->pExpr);
++  }
++
+   if( pCsr->ePlan<3 ){
+     int bSkip = 0;
+     if( (rc = fts5CursorReseek(pCsr, &bSkip)) || bSkip ) return rc;
+@@ -235269,6 +249126,9 @@ static int fts5FilterMethod(
+     pCsr->iFirstRowid = fts5GetRowidLimit(pRowidGe, SMALLEST_INT64);
+   }
+ 
++  rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
++  if( rc!=SQLITE_OK ) goto filter_out;
++
+   if( pTab->pSortCsr ){
+     /* If pSortCsr is non-NULL, then this call is being made as part of
+     ** processing for a "... MATCH  ORDER BY rank" query (ePlan is
+@@ -235291,6 +249151,7 @@ static int fts5FilterMethod(
+     pCsr->pExpr = pTab->pSortCsr->pExpr;
+     rc = fts5CursorFirst(pTab, pCsr, bDesc);
+   }else if( pCsr->pExpr ){
++    assert( rc==SQLITE_OK );
+     rc = fts5CursorParseRank(pConfig, pCsr, pRank);
+     if( rc==SQLITE_OK ){
+       if( bOrderByRank ){
+@@ -235462,6 +249323,7 @@ static int fts5SpecialInsert(
+   Fts5Config *pConfig = pTab->p.pConfig;
+   int rc = SQLITE_OK;
+   int bError = 0;
++  int bLoadConfig = 0;
+ 
+   if( 0==sqlite3_stricmp("delete-all", zCmd) ){
+     if( pConfig->eContent==FTS5_CONTENT_NORMAL ){
+@@ -235473,6 +249335,7 @@ static int fts5SpecialInsert(
+     }else{
+       rc = sqlite3Fts5StorageDeleteAll(pTab->pStorage);
+     }
++    bLoadConfig = 1;
+   }else if( 0==sqlite3_stricmp("rebuild", zCmd) ){
+     if( pConfig->eContent==FTS5_CONTENT_NONE ){
+       fts5SetVtabError(pTab,
+@@ -235482,6 +249345,7 @@ static int fts5SpecialInsert(
+     }else{
+       rc = sqlite3Fts5StorageRebuild(pTab->pStorage);
+     }
++    bLoadConfig = 1;
+   }else if( 0==sqlite3_stricmp("optimize", zCmd) ){
+     rc = sqlite3Fts5StorageOptimize(pTab->pStorage);
+   }else if( 0==sqlite3_stricmp("merge", zCmd) ){
+@@ -235494,8 +249358,13 @@ static int fts5SpecialInsert(
+   }else if( 0==sqlite3_stricmp("prefix-index", zCmd) ){
+     pConfig->bPrefixIndex = sqlite3_value_int(pVal);
+ #endif
++  }else if( 0==sqlite3_stricmp("flush", zCmd) ){
++    rc = sqlite3Fts5FlushToDisk(&pTab->p);
+   }else{
+-    rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
++    rc = sqlite3Fts5FlushToDisk(&pTab->p);
++    if( rc==SQLITE_OK ){
++      rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
++    }
+     if( rc==SQLITE_OK ){
+       rc = sqlite3Fts5ConfigSetValue(pTab->p.pConfig, zCmd, pVal, &bError);
+     }
+@@ -235507,6 +249376,12 @@ static int fts5SpecialInsert(
+       }
+     }
+   }
++
++  if( rc==SQLITE_OK && bLoadConfig ){
++    pTab->p.pConfig->iCookie--;
++    rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
++  }
++
+   return rc;
+ }
+ 
+@@ -235563,9 +249438,10 @@ static int fts5UpdateMethod(
+   Fts5Config *pConfig = pTab->p.pConfig;
+   int eType0;                     /* value_type() of apVal[0] */
+   int rc = SQLITE_OK;             /* Return code */
++  int bUpdateOrDelete = 0;
+ 
+   /* A transaction must be open when this is called. */
+-  assert( pTab->ts.eState==1 );
++  assert( pTab->ts.eState==1 || pTab->ts.eState==2 );
+ 
+   assert( pVtab->zErrMsg==0 );
+   assert( nArg==1 || nArg==(2+pConfig->nCol+2) );
+@@ -235573,6 +249449,11 @@ static int fts5UpdateMethod(
+        || sqlite3_value_type(apVal[0])==SQLITE_NULL
+   );
+   assert( pTab->p.pConfig->pzErrmsg==0 );
++  if( pConfig->pgsz==0 ){
++    rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
++    if( rc!=SQLITE_OK ) return rc;
++  }
++
+   pTab->p.pConfig->pzErrmsg = &pTab->p.base.zErrMsg;
+ 
+   /* Put any active cursors into REQUIRE_SEEK state. */
+@@ -235587,7 +249468,14 @@ static int fts5UpdateMethod(
+     if( pConfig->eContent!=FTS5_CONTENT_NORMAL
+       && 0==sqlite3_stricmp("delete", z)
+     ){
+-      rc = fts5SpecialDelete(pTab, apVal);
++      if( pConfig->bContentlessDelete ){
++        fts5SetVtabError(pTab,
++            "'delete' may not be used with a contentless_delete=1 table"
++        );
++        rc = SQLITE_ERROR;
++      }else{
++        rc = fts5SpecialDelete(pTab, apVal);
++      }
+     }else{
+       rc = fts5SpecialInsert(pTab, z, apVal[2 + pConfig->nCol + 1]);
+     }
+@@ -235604,7 +249492,7 @@ static int fts5UpdateMethod(
+     ** Cases 3 and 4 may violate the rowid constraint.
+     */
+     int eConflict = SQLITE_ABORT;
+-    if( pConfig->eContent==FTS5_CONTENT_NORMAL ){
++    if( pConfig->eContent==FTS5_CONTENT_NORMAL || pConfig->bContentlessDelete ){
+       eConflict = sqlite3_vtab_on_conflict(pConfig->db);
+     }
+ 
+@@ -235612,8 +249500,12 @@ static int fts5UpdateMethod(
+     assert( nArg!=1 || eType0==SQLITE_INTEGER );
+ 
+     /* Filter out attempts to run UPDATE or DELETE on contentless tables.
+-    ** This is not suported.  */
+-    if( eType0==SQLITE_INTEGER && fts5IsContentless(pTab) ){
++    ** This is not suported. Except - they are both supported if the CREATE
++    ** VIRTUAL TABLE statement contained "contentless_delete=1". */
++    if( eType0==SQLITE_INTEGER
++     && pConfig->eContent==FTS5_CONTENT_NONE
++     && pConfig->bContentlessDelete==0
++    ){
+       pTab->p.base.zErrMsg = sqlite3_mprintf(
+           "cannot %s contentless fts5 table: %s",
+           (nArg>1 ? "UPDATE" : "DELETE from"), pConfig->zName
+@@ -235625,6 +249517,7 @@ static int fts5UpdateMethod(
+     else if( nArg==1 ){
+       i64 iDel = sqlite3_value_int64(apVal[0]);  /* Rowid to delete */
+       rc = sqlite3Fts5StorageDelete(pTab->pStorage, iDel, 0);
++      bUpdateOrDelete = 1;
+     }
+ 
+     /* INSERT or UPDATE */
+@@ -235636,10 +249529,12 @@ static int fts5UpdateMethod(
+       }
+ 
+       else if( eType0!=SQLITE_INTEGER ){
+-        /* If this is a REPLACE, first remove the current entry (if any) */
++        /* An INSERT statement. If the conflict-mode is REPLACE, first remove
++        ** the current entry (if any). */
+         if( eConflict==SQLITE_REPLACE && eType1==SQLITE_INTEGER ){
+           i64 iNew = sqlite3_value_int64(apVal[1]);  /* Rowid to delete */
+           rc = sqlite3Fts5StorageDelete(pTab->pStorage, iNew, 0);
++          bUpdateOrDelete = 1;
+         }
+         fts5StorageInsert(&rc, pTab, apVal, pRowid);
+       }
+@@ -235668,10 +249563,24 @@ static int fts5UpdateMethod(
+           rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld, 0);
+           fts5StorageInsert(&rc, pTab, apVal, pRowid);
+         }
++        bUpdateOrDelete = 1;
+       }
+     }
+   }
+ 
++  if( rc==SQLITE_OK
++   && bUpdateOrDelete
++   && pConfig->bSecureDelete
++   && pConfig->iVersion==FTS5_CURRENT_VERSION
++  ){
++    rc = sqlite3Fts5StorageConfigValue(
++        pTab->pStorage, "version", 0, FTS5_CURRENT_VERSION_SECUREDELETE
++    );
++    if( rc==SQLITE_OK ){
++      pConfig->iVersion = FTS5_CURRENT_VERSION_SECUREDELETE;
++    }
++  }
++
+   pTab->p.pConfig->pzErrmsg = 0;
+   return rc;
+ }
+@@ -235684,8 +249593,7 @@ static int fts5SyncMethod(sqlite3_vtab *pVtab){
+   Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
+   fts5CheckTransactionState(pTab, FTS5_SYNC, 0);
+   pTab->p.pConfig->pzErrmsg = &pTab->p.base.zErrMsg;
+-  fts5TripCursors(pTab);
+-  rc = sqlite3Fts5StorageSync(pTab->pStorage);
++  rc = sqlite3Fts5FlushToDisk(&pTab->p);
+   pTab->p.pConfig->pzErrmsg = 0;
+   return rc;
+ }
+@@ -235781,7 +249689,10 @@ static int fts5ApiColumnText(
+ ){
+   int rc = SQLITE_OK;
+   Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
+-  if( fts5IsContentless((Fts5FullTable*)(pCsr->base.pVtab))
++  Fts5Table *pTab = (Fts5Table*)(pCsr->base.pVtab);
++  if( iCol<0 || iCol>=pTab->pConfig->nCol ){
++    rc = SQLITE_RANGE;
++  }else if( fts5IsContentless((Fts5FullTable*)(pCsr->base.pVtab))
+    || pCsr->ePlan==FTS5_PLAN_SPECIAL
+   ){
+     *pz = 0;
+@@ -235806,8 +249717,9 @@ static int fts5CsrPoslist(
+   int rc = SQLITE_OK;
+   int bLive = (pCsr->pSorter==0);
+ 
+-  if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_POSLIST) ){
+-
++  if( iPhrase<0 || iPhrase>=sqlite3Fts5ExprPhraseCount(pCsr->pExpr) ){
++    rc = SQLITE_RANGE;
++  }else if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_POSLIST) ){
+     if( pConfig->eDetail!=FTS5_DETAIL_FULL ){
+       Fts5PoslistPopulator *aPopulator;
+       int i;
+@@ -235831,15 +249743,21 @@ static int fts5CsrPoslist(
+     CsrFlagClear(pCsr, FTS5CSR_REQUIRE_POSLIST);
+   }
+ 
+-  if( pCsr->pSorter && pConfig->eDetail==FTS5_DETAIL_FULL ){
+-    Fts5Sorter *pSorter = pCsr->pSorter;
+-    int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]);
+-    *pn = pSorter->aIdx[iPhrase] - i1;
+-    *pa = &pSorter->aPoslist[i1];
++  if( rc==SQLITE_OK ){
++    if( pCsr->pSorter && pConfig->eDetail==FTS5_DETAIL_FULL ){
++      Fts5Sorter *pSorter = pCsr->pSorter;
++      int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]);
++      *pn = pSorter->aIdx[iPhrase] - i1;
++      *pa = &pSorter->aPoslist[i1];
++    }else{
++      *pn = sqlite3Fts5ExprPoslist(pCsr->pExpr, iPhrase, pa);
++    }
+   }else{
+-    *pn = sqlite3Fts5ExprPoslist(pCsr->pExpr, iPhrase, pa);
++    *pa = 0;
++    *pn = 0;
+   }
+ 
++
+   return rc;
+ }
+ 
+@@ -235946,12 +249864,6 @@ static int fts5ApiInst(
+   ){
+     if( iIdx<0 || iIdx>=pCsr->nInstCount ){
+       rc = SQLITE_RANGE;
+-#if 0
+-    }else if( fts5IsOffsetless((Fts5Table*)pCsr->base.pVtab) ){
+-      *piPhrase = pCsr->aInst[iIdx*3];
+-      *piCol = pCsr->aInst[iIdx*3 + 2];
+-      *piOff = -1;
+-#endif
+     }else{
+       *piPhrase = pCsr->aInst[iIdx*3];
+       *piCol = pCsr->aInst[iIdx*3 + 1];
+@@ -236206,13 +250118,56 @@ static int fts5ApiPhraseFirstColumn(
+   return rc;
+ }
+ 
++/*
++** xQueryToken() API implemenetation.
++*/
++static int fts5ApiQueryToken(
++  Fts5Context* pCtx,
++  int iPhrase,
++  int iToken,
++  const char **ppOut,
++  int *pnOut
++){
++  Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
++  return sqlite3Fts5ExprQueryToken(pCsr->pExpr, iPhrase, iToken, ppOut, pnOut);
++}
++
++/*
++** xInstToken() API implemenetation.
++*/
++static int fts5ApiInstToken(
++  Fts5Context *pCtx,
++  int iIdx,
++  int iToken,
++  const char **ppOut, int *pnOut
++){
++  Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
++  int rc = SQLITE_OK;
++  if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_INST)==0
++   || SQLITE_OK==(rc = fts5CacheInstArray(pCsr))
++  ){
++    if( iIdx<0 || iIdx>=pCsr->nInstCount ){
++      rc = SQLITE_RANGE;
++    }else{
++      int iPhrase = pCsr->aInst[iIdx*3];
++      int iCol = pCsr->aInst[iIdx*3 + 1];
++      int iOff = pCsr->aInst[iIdx*3 + 2];
++      i64 iRowid = fts5CursorRowid(pCsr);
++      rc = sqlite3Fts5ExprInstToken(
++          pCsr->pExpr, iRowid, iPhrase, iCol, iOff, iToken, ppOut, pnOut
++      );
++    }
++  }
++  return rc;
++}
++
+ 
+ static int fts5ApiQueryPhrase(Fts5Context*, int, void*,
+     int(*)(const Fts5ExtensionApi*, Fts5Context*, void*)
+ );
+ 
+ static const Fts5ExtensionApi sFts5Api = {
+-  2,                            /* iVersion */
++  3,                            /* iVersion */
+   fts5ApiUserData,
+   fts5ApiColumnCount,
+   fts5ApiRowCount,
+@@ -236232,6 +250187,8 @@ static const Fts5ExtensionApi sFts5Api = {
+   fts5ApiPhraseNext,
+   fts5ApiPhraseFirstColumn,
+   fts5ApiPhraseNextColumn,
++  fts5ApiQueryToken,
++  fts5ApiInstToken
+ };
+ 
+ /*
+@@ -236452,6 +250409,12 @@ static int fts5ColumnMethod(
+       sqlite3_result_value(pCtx, sqlite3_column_value(pCsr->pStmt, iCol+1));
+     }
+     pConfig->pzErrmsg = 0;
++  }else if( pConfig->bContentlessDelete && sqlite3_vtab_nochange(pCtx) ){
++    char *zErr = sqlite3_mprintf("cannot UPDATE a subset of "
++        "columns on fts5 contentless-delete table: %s", pConfig->zName
++    );
++    sqlite3_result_error(pCtx, zErr, -1);
++    sqlite3_free(zErr);
+   }
+   return rc;
+ }
+@@ -236490,8 +250453,10 @@ static int fts5RenameMethod(
+   sqlite3_vtab *pVtab,            /* Virtual table handle */
+   const char *zName               /* New name of table */
+ ){
++  int rc;
+   Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
+-  return sqlite3Fts5StorageRename(pTab->pStorage, zName);
++  rc = sqlite3Fts5StorageRename(pTab->pStorage, zName);
++  return rc;
+ }
+ 
+ static int sqlite3Fts5FlushToDisk(Fts5Table *pTab){
+@@ -236505,9 +250470,15 @@ static int sqlite3Fts5FlushToDisk(Fts5Table *pTab){
+ ** Flush the contents of the pending-terms table to disk.
+ */
+ static int fts5SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
+-  UNUSED_PARAM(iSavepoint);  /* Call below is a no-op for NDEBUG builds */
+-  fts5CheckTransactionState((Fts5FullTable*)pVtab, FTS5_SAVEPOINT, iSavepoint);
+-  return sqlite3Fts5FlushToDisk((Fts5Table*)pVtab);
++  Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
++  int rc = SQLITE_OK;
++
++  fts5CheckTransactionState(pTab, FTS5_SAVEPOINT, iSavepoint);
++  rc = sqlite3Fts5FlushToDisk((Fts5Table*)pVtab);
++  if( rc==SQLITE_OK ){
++    pTab->iSavepoint = iSavepoint+1;
++  }
++  return rc;
+ }
+ 
+ /*
+@@ -236516,9 +250487,16 @@ static int fts5SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
+ ** This is a no-op.
+ */
+ static int fts5ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
+-  UNUSED_PARAM(iSavepoint);  /* Call below is a no-op for NDEBUG builds */
+-  fts5CheckTransactionState((Fts5FullTable*)pVtab, FTS5_RELEASE, iSavepoint);
+-  return sqlite3Fts5FlushToDisk((Fts5Table*)pVtab);
++  Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
++  int rc = SQLITE_OK;
++  fts5CheckTransactionState(pTab, FTS5_RELEASE, iSavepoint);
++  if( (iSavepoint+1)iSavepoint ){
++    rc = sqlite3Fts5FlushToDisk(&pTab->p);
++    if( rc==SQLITE_OK ){
++      pTab->iSavepoint = iSavepoint;
++    }
++  }
++  return rc;
+ }
+ 
+ /*
+@@ -236528,10 +250506,14 @@ static int fts5ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
+ */
+ static int fts5RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){
+   Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
+-  UNUSED_PARAM(iSavepoint);  /* Call below is a no-op for NDEBUG builds */
++  int rc = SQLITE_OK;
+   fts5CheckTransactionState(pTab, FTS5_ROLLBACKTO, iSavepoint);
+   fts5TripCursors(pTab);
+-  return sqlite3Fts5StorageRollback(pTab->pStorage);
++  if( (iSavepoint+1)<=pTab->iSavepoint ){
++    pTab->p.pConfig->pgsz = 0;
++    rc = sqlite3Fts5StorageRollback(pTab->pStorage);
++  }
++  return rc;
+ }
+ 
+ /*
+@@ -236733,7 +250715,7 @@ static void fts5SourceIdFunc(
+ ){
+   assert( nArg==0 );
+   UNUSED_PARAM2(nArg, apUnused);
+-  sqlite3_result_text(pCtx, "fts5: 2022-09-29 15:55:41 a29f9949895322123f7c38fbe94c649a9d6e6c9cd0c3b41c96d694552f26b309", -1, SQLITE_TRANSIENT);
++  sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT);
+ }
+ 
+ /*
+@@ -236751,9 +250733,40 @@ static int fts5ShadowName(const char *zName){
+   return 0;
+ }
+ 
++/*
++** Run an integrity check on the FTS5 data structures.  Return a string
++** if anything is found amiss.  Return a NULL pointer if everything is
++** OK.
++*/
++static int fts5IntegrityMethod(
++  sqlite3_vtab *pVtab,    /* the FTS5 virtual table to check */
++  const char *zSchema,    /* Name of schema in which this table lives */
++  const char *zTabname,   /* Name of the table itself */
++  int isQuick,            /* True if this is a quick-check */
++  char **pzErr            /* Write error message here */
++){
++  Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
++  int rc;
++
++  assert( pzErr!=0 && *pzErr==0 );
++  UNUSED_PARAM(isQuick);
++  rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0);
++  if( (rc&0xff)==SQLITE_CORRUPT ){
++    *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s",
++                zSchema, zTabname);
++  }else if( rc!=SQLITE_OK ){
++    *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
++                             " FTS5 table %s.%s: %s",
++                zSchema, zTabname, sqlite3_errstr(rc));
++  }
++  sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
++
++  return SQLITE_OK;
++}
++
+ static int fts5Init(sqlite3 *db){
+   static const sqlite3_module fts5Mod = {
+-    /* iVersion      */ 3,
++    /* iVersion      */ 4,
+     /* xCreate       */ fts5CreateMethod,
+     /* xConnect      */ fts5ConnectMethod,
+     /* xBestIndex    */ fts5BestIndexMethod,
+@@ -236776,7 +250789,8 @@ static int fts5Init(sqlite3 *db){
+     /* xSavepoint    */ fts5SavepointMethod,
+     /* xRelease      */ fts5ReleaseMethod,
+     /* xRollbackTo   */ fts5RollbackToMethod,
+-    /* xShadowName   */ fts5ShadowName
++    /* xShadowName   */ fts5ShadowName,
++    /* xIntegrity    */ fts5IntegrityMethod
+   };
+ 
+   int rc;
+@@ -236806,7 +250820,9 @@ static int fts5Init(sqlite3 *db){
+     }
+     if( rc==SQLITE_OK ){
+       rc = sqlite3_create_function(
+-          db, "fts5_source_id", 0, SQLITE_UTF8, p, fts5SourceIdFunc, 0, 0
++          db, "fts5_source_id", 0,
++          SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
++          p, fts5SourceIdFunc, 0, 0
+       );
+     }
+   }
+@@ -236944,10 +250960,10 @@ static int fts5StorageGetStmt(
+       "INSERT INTO %Q.'%q_content' VALUES(%s)",         /* INSERT_CONTENT  */
+       "REPLACE INTO %Q.'%q_content' VALUES(%s)",        /* REPLACE_CONTENT */
+       "DELETE FROM %Q.'%q_content' WHERE id=?",         /* DELETE_CONTENT  */
+-      "REPLACE INTO %Q.'%q_docsize' VALUES(?,?)",       /* REPLACE_DOCSIZE  */
++      "REPLACE INTO %Q.'%q_docsize' VALUES(?,?%s)",     /* REPLACE_DOCSIZE  */
+       "DELETE FROM %Q.'%q_docsize' WHERE id=?",         /* DELETE_DOCSIZE  */
+ 
+-      "SELECT sz FROM %Q.'%q_docsize' WHERE id=?",      /* LOOKUP_DOCSIZE  */
++      "SELECT sz%s FROM %Q.'%q_docsize' WHERE id=?",    /* LOOKUP_DOCSIZE  */
+ 
+       "REPLACE INTO %Q.'%q_config' VALUES(?,?)",        /* REPLACE_CONFIG */
+       "SELECT %s FROM %s AS T",                         /* SCAN */
+@@ -236995,6 +251011,19 @@ static int fts5StorageGetStmt(
+         break;
+       }
+ 
++      case FTS5_STMT_REPLACE_DOCSIZE:
++        zSql = sqlite3_mprintf(azStmt[eStmt], pC->zDb, pC->zName,
++          (pC->bContentlessDelete ? ",?" : "")
++        );
++        break;
++
++      case FTS5_STMT_LOOKUP_DOCSIZE:
++        zSql = sqlite3_mprintf(azStmt[eStmt],
++            (pC->bContentlessDelete ? ",origin" : ""),
++            pC->zDb, pC->zName
++        );
++        break;
++
+       default:
+         zSql = sqlite3_mprintf(azStmt[eStmt], pC->zDb, pC->zName);
+         break;
+@@ -237184,9 +251213,11 @@ static int sqlite3Fts5StorageOpen(
+     }
+ 
+     if( rc==SQLITE_OK && pConfig->bColumnsize ){
+-      rc = sqlite3Fts5CreateTable(
+-          pConfig, "docsize", "id INTEGER PRIMARY KEY, sz BLOB", 0, pzErr
+-      );
++      const char *zCols = "id INTEGER PRIMARY KEY, sz BLOB";
++      if( pConfig->bContentlessDelete ){
++        zCols = "id INTEGER PRIMARY KEY, sz BLOB, origin INTEGER";
++      }
++      rc = sqlite3Fts5CreateTable(pConfig, "docsize", zCols, 0, pzErr);
+     }
+     if( rc==SQLITE_OK ){
+       rc = sqlite3Fts5CreateTable(
+@@ -237263,7 +251294,7 @@ static int fts5StorageDeleteFromIndex(
+ ){
+   Fts5Config *pConfig = p->pConfig;
+   sqlite3_stmt *pSeek = 0;        /* SELECT to read row iDel from %_data */
+-  int rc;                         /* Return code */
++  int rc = SQLITE_OK;             /* Return code */
+   int rc2;                        /* sqlite3_reset() return code */
+   int iCol;
+   Fts5InsertCtx ctx;
+@@ -237279,7 +251310,6 @@ static int fts5StorageDeleteFromIndex(
+ 
+   ctx.pStorage = p;
+   ctx.iCol = -1;
+-  rc = sqlite3Fts5IndexBeginWrite(p->pIndex, 1, iDel);
+   for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){
+     if( pConfig->abUnindexed[iCol-1]==0 ){
+       const char *zText;
+@@ -237316,6 +251346,37 @@ static int fts5StorageDeleteFromIndex(
+   return rc;
+ }
+ 
++/*
++** This function is called to process a DELETE on a contentless_delete=1
++** table. It adds the tombstone required to delete the entry with rowid
++** iDel. If successful, SQLITE_OK is returned. Or, if an error occurs,
++** an SQLite error code.
++*/
++static int fts5StorageContentlessDelete(Fts5Storage *p, i64 iDel){
++  i64 iOrigin = 0;
++  sqlite3_stmt *pLookup = 0;
++  int rc = SQLITE_OK;
++
++  assert( p->pConfig->bContentlessDelete );
++  assert( p->pConfig->eContent==FTS5_CONTENT_NONE );
++
++  /* Look up the origin of the document in the %_docsize table. Store
++  ** this in stack variable iOrigin.  */
++  rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP_DOCSIZE, &pLookup, 0);
++  if( rc==SQLITE_OK ){
++    sqlite3_bind_int64(pLookup, 1, iDel);
++    if( SQLITE_ROW==sqlite3_step(pLookup) ){
++      iOrigin = sqlite3_column_int64(pLookup, 1);
++    }
++    rc = sqlite3_reset(pLookup);
++  }
++
++  if( rc==SQLITE_OK && iOrigin!=0 ){
++    rc = sqlite3Fts5IndexContentlessDelete(p->pIndex, iOrigin, iDel);
++  }
++
++  return rc;
++}
+ 
+ /*
+ ** Insert a record into the %_docsize table. Specifically, do:
+@@ -237336,10 +251397,17 @@ static int fts5StorageInsertDocsize(
+     rc = fts5StorageGetStmt(p, FTS5_STMT_REPLACE_DOCSIZE, &pReplace, 0);
+     if( rc==SQLITE_OK ){
+       sqlite3_bind_int64(pReplace, 1, iRowid);
+-      sqlite3_bind_blob(pReplace, 2, pBuf->p, pBuf->n, SQLITE_STATIC);
+-      sqlite3_step(pReplace);
+-      rc = sqlite3_reset(pReplace);
+-      sqlite3_bind_null(pReplace, 2);
++      if( p->pConfig->bContentlessDelete ){
++        i64 iOrigin = 0;
++        rc = sqlite3Fts5IndexGetOrigin(p->pIndex, &iOrigin);
++        sqlite3_bind_int64(pReplace, 3, iOrigin);
++      }
++      if( rc==SQLITE_OK ){
++        sqlite3_bind_blob(pReplace, 2, pBuf->p, pBuf->n, SQLITE_STATIC);
++        sqlite3_step(pReplace);
++        rc = sqlite3_reset(pReplace);
++        sqlite3_bind_null(pReplace, 2);
++      }
+     }
+   }
+   return rc;
+@@ -237403,7 +251471,15 @@ static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel, sqlite3_value **ap
+ 
+   /* Delete the index records */
+   if( rc==SQLITE_OK ){
+-    rc = fts5StorageDeleteFromIndex(p, iDel, apVal);
++    rc = sqlite3Fts5IndexBeginWrite(p->pIndex, 1, iDel);
++  }
++
++  if( rc==SQLITE_OK ){
++    if( p->pConfig->bContentlessDelete ){
++      rc = fts5StorageContentlessDelete(p, iDel);
++    }else{
++      rc = fts5StorageDeleteFromIndex(p, iDel, apVal);
++    }
+   }
+ 
+   /* Delete the %_docsize record */
+@@ -237480,7 +251556,7 @@ static int sqlite3Fts5StorageRebuild(Fts5Storage *p){
+   }
+ 
+   if( rc==SQLITE_OK ){
+-    rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, 0);
++    rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, pConfig->pzErrmsg);
+   }
+ 
+   while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pScan) ){
+@@ -237991,7 +252067,9 @@ static int sqlite3Fts5StorageSync(Fts5Storage *p){
+   i64 iLastRowid = sqlite3_last_insert_rowid(p->pConfig->db);
+   if( p->bTotalsValid ){
+     rc = fts5StorageSaveTotals(p);
+-    p->bTotalsValid = 0;
++    if( rc==SQLITE_OK ){
++      p->bTotalsValid = 0;
++    }
+   }
+   if( rc==SQLITE_OK ){
+     rc = sqlite3Fts5IndexSync(p->pIndex);
+@@ -238265,6 +252343,12 @@ static const unsigned char sqlite3Utf8Trans1[] = {
+ 
+ #endif /* ifndef SQLITE_AMALGAMATION */
+ 
++#define FTS5_SKIP_UTF8(zIn) {                               \
++  if( ((unsigned char)(*(zIn++)))>=0xc0 ){                              \
++    while( (((unsigned char)*zIn) & 0xc0)==0x80 ){ zIn++; }             \
++  }                                                    \
++}
++
+ typedef struct Unicode61Tokenizer Unicode61Tokenizer;
+ struct Unicode61Tokenizer {
+   unsigned char aTokenChar[128];  /* ASCII range token characters */
+@@ -239300,6 +253384,7 @@ static int fts5PorterTokenize(
+ typedef struct TrigramTokenizer TrigramTokenizer;
+ struct TrigramTokenizer {
+   int bFold;                      /* True to fold to lower-case */
++  int iFoldParam;                 /* Parameter to pass to Fts5UnicodeFold() */
+ };
+ 
+ /*
+@@ -239326,6 +253411,7 @@ static int fts5TriCreate(
+   }else{
+     int i;
+     pNew->bFold = 1;
++    pNew->iFoldParam = 0;
+     for(i=0; rc==SQLITE_OK && ibFold = (zArg[0]=='0');
+         }
++      }else if( 0==sqlite3_stricmp(azArg[i], "remove_diacritics") ){
++        if( (zArg[0]!='0' && zArg[0]!='1' && zArg[0]!='2') || zArg[1] ){
++          rc = SQLITE_ERROR;
++        }else{
++          pNew->iFoldParam = (zArg[0]!='0') ? 2 : 0;
++        }
+       }else{
+         rc = SQLITE_ERROR;
+       }
+     }
++
++    if( pNew->iFoldParam!=0 && pNew->bFold==0 ){
++      rc = SQLITE_ERROR;
++    }
++
+     if( rc!=SQLITE_OK ){
+       fts5TriDelete((Fts5Tokenizer*)pNew);
+       pNew = 0;
+@@ -239360,40 +253457,62 @@ static int fts5TriTokenize(
+   TrigramTokenizer *p = (TrigramTokenizer*)pTok;
+   int rc = SQLITE_OK;
+   char aBuf[32];
++  char *zOut = aBuf;
++  int ii;
+   const unsigned char *zIn = (const unsigned char*)pText;
+   const unsigned char *zEof = &zIn[nText];
+   u32 iCode;
++  int aStart[3];                  /* Input offset of each character in aBuf[] */
+ 
+   UNUSED_PARAM(unusedFlags);
+-  while( 1 ){
+-    char *zOut = aBuf;
+-    int iStart = zIn - (const unsigned char*)pText;
+-    const unsigned char *zNext;
+-
+-    READ_UTF8(zIn, zEof, iCode);
+-    if( iCode==0 ) break;
+-    zNext = zIn;
+-    if( zInbFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+-      WRITE_UTF8(zOut, iCode);
++
++  /* Populate aBuf[] with the characters for the first trigram. */
++  for(ii=0; ii<3; ii++){
++    do {
++      aStart[ii] = zIn - (const unsigned char*)pText;
+       READ_UTF8(zIn, zEof, iCode);
+-      if( iCode==0 ) break;
+-    }else{
+-      break;
+-    }
+-    if( zInbFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+-      WRITE_UTF8(zOut, iCode);
++      if( iCode==0 ) return SQLITE_OK;
++      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
++    }while( iCode==0 );
++    WRITE_UTF8(zOut, iCode);
++  }
++
++  /* At the start of each iteration of this loop:
++  **
++  **  aBuf:      Contains 3 characters. The 3 characters of the next trigram.
++  **  zOut:      Points to the byte following the last character in aBuf.
++  **  aStart[3]: Contains the byte offset in the input text corresponding
++  **             to the start of each of the three characters in the buffer.
++  */
++  assert( zIn<=zEof );
++  while( 1 ){
++    int iNext;                    /* Start of character following current tri */
++    const char *z1;
++
++    /* Read characters from the input up until the first non-diacritic */
++    do {
++      iNext = zIn - (const unsigned char*)pText;
+       READ_UTF8(zIn, zEof, iCode);
+       if( iCode==0 ) break;
+-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+-      WRITE_UTF8(zOut, iCode);
+-    }else{
+-      break;
+-    }
+-    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, iStart, iStart + zOut-aBuf);
+-    if( rc!=SQLITE_OK ) break;
+-    zIn = zNext;
++      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
++    }while( iCode==0 );
++
++    /* Pass the current trigram back to fts5 */
++    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, aStart[0], iNext);
++    if( iCode==0 || rc!=SQLITE_OK ) break;
++
++    /* Remove the first character from buffer aBuf[]. Append the character
++    ** with codepoint iCode.  */
++    z1 = aBuf;
++    FTS5_SKIP_UTF8(z1);
++    memmove(aBuf, z1, zOut - z1);
++    zOut -= (z1 - aBuf);
++    WRITE_UTF8(zOut, iCode);
++
++    /* Update the aStart[] array */
++    aStart[0] = aStart[1];
++    aStart[1] = aStart[2];
++    aStart[2] = iNext;
+   }
+ 
+   return rc;
+@@ -239416,7 +253535,9 @@ static int sqlite3Fts5TokenizerPattern(
+ ){
+   if( xCreate==fts5TriCreate ){
+     TrigramTokenizer *p = (TrigramTokenizer*)pTok;
+-    return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
++    if( p->iFoldParam==0 ){
++      return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
++    }
+   }
+   return FTS5_PATTERN_NONE;
+ }
+@@ -241205,7 +255326,7 @@ static int fts5VocabFilterMethod(
+   if( pEq ){
+     zTerm = (const char *)sqlite3_value_text(pEq);
+     nTerm = sqlite3_value_bytes(pEq);
+-    f = 0;
++    f = FTS5INDEX_QUERY_NOTOKENDATA;
+   }else{
+     if( pGe ){
+       zTerm = (const char *)sqlite3_value_text(pGe);
+@@ -241359,7 +255480,8 @@ static int sqlite3Fts5VocabInit(Fts5Global *pGlobal, sqlite3 *db){
+     /* xSavepoint    */ 0,
+     /* xRelease      */ 0,
+     /* xRollbackTo   */ 0,
+-    /* xShadowName   */ 0
++    /* xShadowName   */ 0,
++    /* xIntegrity    */ 0
+   };
+   void *p = (void*)pGlobal;
+ 
+@@ -241471,6 +255593,10 @@ static int stmtConnect(
+ #define STMT_COLUMN_MEM    10   /* SQLITE_STMTSTATUS_MEMUSED */
+ 
+ 
++  (void)pAux;
++  (void)argc;
++  (void)argv;
++  (void)pzErr;
+   rc = sqlite3_declare_vtab(db,
+      "CREATE TABLE x(sql,ncol,ro,busy,nscan,nsort,naidx,nstep,"
+                     "reprep,run,mem)");
+@@ -241590,6 +255716,10 @@ static int stmtFilter(
+   sqlite3_int64 iRowid = 1;
+   StmtRow **ppRow = 0;
+ 
++  (void)idxNum;
++  (void)idxStr;
++  (void)argc;
++  (void)argv;
+   stmtCsrReset(pCur);
+   ppRow = &pCur->pRow;
+   for(p=sqlite3_next_stmt(pCur->db, 0); p; p=sqlite3_next_stmt(pCur->db, p)){
+@@ -241645,6 +255775,7 @@ static int stmtBestIndex(
+   sqlite3_vtab *tab,
+   sqlite3_index_info *pIdxInfo
+ ){
++  (void)tab;
+   pIdxInfo->estimatedCost = (double)500;
+   pIdxInfo->estimatedRows = 500;
+   return SQLITE_OK;
+@@ -241679,6 +255810,7 @@ static sqlite3_module stmtModule = {
+   0,                         /* xRelease */
+   0,                         /* xRollbackTo */
+   0,                         /* xShadowName */
++  0                          /* xIntegrity */
+ };
+ 
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+@@ -241714,3 +255846,54617 @@ SQLITE_API int sqlite3_stmt_init(
+ /* Return the source-id for this library */
+ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
+ /************************** End of sqlite3.c ******************************/
++/*** End of #include "sqlite3patched.c" ***/
++
++
++/*
++** Include SQLite3MultiCipher components 
++*/
++/* #include "sqlite3mc_config.h" */
++/*** Begin of #include "sqlite3mc_config.h" ***/
++/*
++** Name:        sqlite3mc_config.h
++** Purpose:     Header file for SQLite3 Multiple Ciphers compile-time configuration
++** Author:      Ulrich Telle
++** Created:     2021-09-27
++** Copyright:   (c) 2019-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef SQLITE3MC_CONFIG_H_
++#define SQLITE3MC_CONFIG_H_
++
++/*
++** Definitions of supported ciphers
++*/
++
++/*
++** Compatibility with wxSQLite3
++*/
++#ifdef WXSQLITE3_HAVE_CIPHER_AES_128_CBC
++#define HAVE_CIPHER_AES_128_CBC WXSQLITE3_HAVE_CIPHER_AES_128_CBC
++#endif
++
++#ifdef WXSQLITE3_HAVE_CIPHER_AES_256_CBC
++#define HAVE_CIPHER_AES_256_CBC WXSQLITE3_HAVE_CIPHER_AES_256_CBC
++#endif
++
++#ifdef WXSQLITE3_HAVE_CIPHER_CHACHA20
++#define HAVE_CIPHER_CHACHA20 WXSQLITE3_HAVE_CIPHER_CHACHA20
++#endif
++
++#ifdef WXSQLITE3_HAVE_CIPHER_SQLCIPHER
++#define HAVE_CIPHER_SQLCIPHER WXSQLITE3_HAVE_CIPHER_SQLCIPHER
++#endif
++
++#ifdef WXSQLITE3_HAVE_CIPHER_RC4
++#define HAVE_CIPHER_RC4 WXSQLITE3_HAVE_CIPHER_RC4
++#endif
++
++#ifdef WXSQLITE3_HAVE_CIPHER_ASCON128
++#define HAVE_CIPHER_ASCON128 WXSQLITE3_HAVE_CIPHER_ASCON128
++#endif
++
++/*
++** Actual definitions of supported ciphers
++*/
++#ifndef HAVE_CIPHER_AES_128_CBC
++#define HAVE_CIPHER_AES_128_CBC 1
++#endif
++
++#ifndef HAVE_CIPHER_AES_256_CBC
++#define HAVE_CIPHER_AES_256_CBC 1
++#endif
++
++#ifndef HAVE_CIPHER_CHACHA20
++#define HAVE_CIPHER_CHACHA20 1
++#endif
++
++#ifndef HAVE_CIPHER_SQLCIPHER
++#define HAVE_CIPHER_SQLCIPHER 1
++#endif
++
++#ifndef HAVE_CIPHER_RC4
++#define HAVE_CIPHER_RC4 1
++#endif
++
++#ifndef HAVE_CIPHER_ASCON128
++#define HAVE_CIPHER_ASCON128 1
++#endif
++
++/*
++** Disable all built-in ciphers on request
++*/
++
++#if 0
++#define SQLITE3MC_OMIT_BUILTIN_CIPHERS
++#endif
++
++#ifdef SQLITE3MC_OMIT_BUILTIN_CIPHERS
++#undef HAVE_CIPHER_AES_128_CBC
++#undef HAVE_CIPHER_AES_256_CBC
++#undef HAVE_CIPHER_CHACHA20
++#undef HAVE_CIPHER_SQLCIPHER
++#undef HAVE_CIPHER_RC4
++#undef HAVE_CIPHER_ASCON128
++#define HAVE_CIPHER_AES_128_CBC 0
++#define HAVE_CIPHER_AES_256_CBC 0
++#define HAVE_CIPHER_CHACHA20    0
++#define HAVE_CIPHER_SQLCIPHER   0
++#define HAVE_CIPHER_RC4         0
++#define HAVE_CIPHER_ASCON128    0
++#endif
++
++/*
++** Check that at least one cipher is be supported
++*/
++#if HAVE_CIPHER_AES_128_CBC == 0 &&  \
++    HAVE_CIPHER_AES_256_CBC == 0 &&  \
++    HAVE_CIPHER_CHACHA20    == 0 &&  \
++    HAVE_CIPHER_SQLCIPHER   == 0 &&  \
++    HAVE_CIPHER_RC4         == 0
++#pragma message ("sqlite3mc_config.h: WARNING - No built-in cipher scheme enabled!")
++#endif
++
++/*
++** Compile-time configuration
++*/
++
++/*
++** Selection of default cipher scheme
++**
++** A specific default cipher scheme can be selected by defining
++** the symbol CODEC_TYPE using one of the cipher scheme values
++** CODEC_TYPE_AES128, CODEC_TYPE_AES256, CODEC_TYPE_CHACHA20,
++** CODEC_TYPE_SQLCIPHER, or CODEC_TYPE_RC4.
++**
++** If the symbol CODEC_TYPE is not defined, CODEC_TYPE_CHACHA20
++** is selected as the default cipher scheme.
++*/
++#if 0
++#define CODEC_TYPE CODEC_TYPE_CHACHA20
++#endif
++
++/*
++** Selection of legacy mode
++**
++** A) CODEC_TYPE_AES128 and CODEC_TYPE_AES256
++**    Defining the symbol WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
++**    selects the legacy mode for both cipher schemes.
++**
++** B) CODEC_TYPE_CHACHA20
++**    Defining the symbol SQLITE3MC_USE_SQLEET_LEGACY
++**    selects the legacy mode.
++**
++** C) CODEC_TYPE_SQLCIPHER
++**    Defining the symbol SQLITE3MC_USE_SQLEET_LEGACY
++**    selects the legacy mode.
++**
++** D) CODEC_TYPE_RC4
++**    This cipher scheme is available in legacy mode only.
++*/
++
++#if 0
++#define WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
++#endif
++
++#if 0
++#define SQLITE3MC_USE_SQLEET_LEGACY
++#endif
++
++#if 0
++#define SQLITE3MC_USE_SQLCIPHER_LEGACY
++#endif
++
++/*
++** Selection of default version for SQLCipher scheme
++**
++** A specific default version can be selected by defining
++** the symbol SQLCIPHER_VERSION_DEFAULT using one of the
++** supported version values (SQLCIPHER_VERSION_1,
++** SQLCIPHER_VERSION_2, SQLCIPHER_VERSION_3, SQLCIPHER_VERSION_4).
++**
++** If the symbol SQLCIPHER_VERSION_DEFAULT is not defined,
++** version 4 (SQLCIPHER_VERSION_4) is selected as the default value.
++*/
++
++#if 0
++#define SQLCIPHER_VERSION_DEFAULT SQLCIPHER_VERSION_4
++#endif
++
++#endif
++/*** End of #include "sqlite3mc_config.h" ***/
++
++/* #include "sqlite3mc.h" */
++/*** Begin of #include "sqlite3mc.h" ***/
++/*
++** Name:        sqlite3mc.h
++** Purpose:     Header file for SQLite3 Multiple Ciphers support
++** Author:      Ulrich Telle
++** Created:     2020-03-01
++** Copyright:   (c) 2019-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef SQLITE3MC_H_
++#define SQLITE3MC_H_
++
++/*
++** Define SQLite3 Multiple Ciphers version information
++*/
++/* #include "sqlite3mc_version.h" */
++/*** Begin of #include "sqlite3mc_version.h" ***/
++/*
++** Name:        sqlite3mc_version.h
++** Purpose:     SQLite3 Multiple Ciphers version numbers
++** Author:      Ulrich Telle
++** Created:     2020-08-05
++** Copyright:   (c) 2020-2024 Ulrich Telle
++** License:     MIT
++*/
++
++/// \file sqlite3mc_version.h Version information for the SQLite3 Multiple Ciphers library
++
++#ifndef SQLITE3MC_VERSION_H_
++#define SQLITE3MC_VERSION_H_
++
++#define SQLITE3MC_VERSION_MAJOR      1
++#define SQLITE3MC_VERSION_MINOR      8
++#define SQLITE3MC_VERSION_RELEASE    3
++#define SQLITE3MC_VERSION_SUBRELEASE 0
++#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.8.3"
++
++#endif /* SQLITE3MC_VERSION_H_ */
++/*** End of #include "sqlite3mc_version.h" ***/
++
++
++/*
++** Define SQLite3 API
++*/
++/* #include "sqlite3.h" */
++/*** Begin of #include "sqlite3.h" ***/
++/*
++** 2001-09-15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the SQLite library
++** presents to client programs.  If a C-function, structure, datatype,
++** or constant definition does not appear in this file, then it is
++** not a published API of SQLite, is subject to change without
++** notice, and should not be referenced by programs that use SQLite.
++**
++** Some of the definitions that are in this file are marked as
++** "experimental".  Experimental interfaces are normally new
++** features recently added to SQLite.  We do not anticipate changes
++** to experimental interfaces but reserve the right to make minor changes
++** if experience from use "in the wild" suggest such changes are prudent.
++**
++** The official C-language API documentation for SQLite is derived
++** from comments in this file.  This file is the authoritative source
++** on how SQLite interfaces are supposed to operate.
++**
++** The name of this file under configuration management is "sqlite.h.in".
++** The makefile makes some minor changes to this file (such as inserting
++** the version number) and changes its name to "sqlite3.h" as
++** part of the build process.
++*/
++#ifndef SQLITE3_H
++#define SQLITE3_H
++#include      /* Needed for the definition of va_list */
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/*
++** Facilitate override of interface linkage and calling conventions.
++** Be aware that these macros may not be used within this particular
++** translation of the amalgamation and its associated header file.
++**
++** The SQLITE_EXTERN and SQLITE_API macros are used to instruct the
++** compiler that the target identifier should have external linkage.
++**
++** The SQLITE_CDECL macro is used to set the calling convention for
++** public functions that accept a variable number of arguments.
++**
++** The SQLITE_APICALL macro is used to set the calling convention for
++** public functions that accept a fixed number of arguments.
++**
++** The SQLITE_STDCALL macro is no longer used and is now deprecated.
++**
++** The SQLITE_CALLBACK macro is used to set the calling convention for
++** function pointers.
++**
++** The SQLITE_SYSAPI macro is used to set the calling convention for
++** functions provided by the operating system.
++**
++** Currently, the SQLITE_CDECL, SQLITE_APICALL, SQLITE_CALLBACK, and
++** SQLITE_SYSAPI macros are used only when building for environments
++** that require non-default calling conventions.
++*/
++#ifndef SQLITE_EXTERN
++# define SQLITE_EXTERN extern
++#endif
++#ifndef SQLITE_API
++# define SQLITE_API
++#endif
++#ifndef SQLITE_CDECL
++# define SQLITE_CDECL
++#endif
++#ifndef SQLITE_APICALL
++# define SQLITE_APICALL
++#endif
++#ifndef SQLITE_STDCALL
++# define SQLITE_STDCALL SQLITE_APICALL
++#endif
++#ifndef SQLITE_CALLBACK
++# define SQLITE_CALLBACK
++#endif
++#ifndef SQLITE_SYSAPI
++# define SQLITE_SYSAPI
++#endif
++
++/*
++** These no-op macros are used in front of interfaces to mark those
++** interfaces as either deprecated or experimental.  New applications
++** should not use deprecated interfaces - they are supported for backwards
++** compatibility only.  Application writers should be aware that
++** experimental interfaces are subject to change in point releases.
++**
++** These macros used to resolve to various kinds of compiler magic that
++** would generate warning messages when they were used.  But that
++** compiler magic ended up generating such a flurry of bug reports
++** that we have taken it all out and gone back to using simple
++** noop macros.
++*/
++#define SQLITE_DEPRECATED
++#define SQLITE_EXPERIMENTAL
++
++/*
++** Ensure these symbols were not defined by some previous header file.
++*/
++#ifdef SQLITE_VERSION
++# undef SQLITE_VERSION
++#endif
++#ifdef SQLITE_VERSION_NUMBER
++# undef SQLITE_VERSION_NUMBER
++#endif
++
++/*
++** CAPI3REF: Compile-Time Library Version Numbers
++**
++** ^(The [SQLITE_VERSION] C preprocessor macro in the sqlite3.h header
++** evaluates to a string literal that is the SQLite version in the
++** format "X.Y.Z" where X is the major version number (always 3 for
++** SQLite3) and Y is the minor version number and Z is the release number.)^
++** ^(The [SQLITE_VERSION_NUMBER] C preprocessor macro resolves to an integer
++** with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
++** numbers used in [SQLITE_VERSION].)^
++** The SQLITE_VERSION_NUMBER for any given release of SQLite will also
++** be larger than the release from which it is derived.  Either Y will
++** be held constant and Z will be incremented or else Y will be incremented
++** and Z will be reset to zero.
++**
++** Since [version 3.6.18] ([dateof:3.6.18]),
++** SQLite source code has been stored in the
++** Fossil configuration management
++** system.  ^The SQLITE_SOURCE_ID macro evaluates to
++** a string which identifies a particular check-in of SQLite
++** within its configuration management system.  ^The SQLITE_SOURCE_ID
++** string contains the date and time of the check-in (UTC) and a SHA1
++** or SHA3-256 hash of the entire source tree.  If the source code has
++** been edited in any way since it was last checked in, then the last
++** four hexadecimal digits of the hash may be modified.
++**
++** See also: [sqlite3_libversion()],
++** [sqlite3_libversion_number()], [sqlite3_sourceid()],
++** [sqlite_version()] and [sqlite_source_id()].
++*/
++#define SQLITE_VERSION        "3.45.1"
++#define SQLITE_VERSION_NUMBER 3045001
++#define SQLITE_SOURCE_ID      "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a"
++
++/*
++** CAPI3REF: Run-Time Library Version Numbers
++** KEYWORDS: sqlite3_version sqlite3_sourceid
++**
++** These interfaces provide the same information as the [SQLITE_VERSION],
++** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
++** but are associated with the library instead of the header file.  ^(Cautious
++** programmers might include assert() statements in their application to
++** verify that values returned by these interfaces match the macros in
++** the header, and thus ensure that the application is
++** compiled with matching library and header files.
++**
++** 
      ++** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
++** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
++** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
++** 
      )^
++**
++** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
++** macro.  ^The sqlite3_libversion() function returns a pointer to the
++** to the sqlite3_version[] string constant.  The sqlite3_libversion()
++** function is provided for use in DLLs since DLL users usually do not have
++** direct access to string constants within the DLL.  ^The
++** sqlite3_libversion_number() function returns an integer equal to
++** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
++** a pointer to a string constant whose value is the same as the
++** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
++** using an edited copy of [the amalgamation], then the last four characters
++** of the hash might be different from [SQLITE_SOURCE_ID].)^
++**
++** See also: [sqlite_version()] and [sqlite_source_id()].
++*/
++SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
++SQLITE_API const char *sqlite3_libversion(void);
++SQLITE_API const char *sqlite3_sourceid(void);
++SQLITE_API int sqlite3_libversion_number(void);
++
++/*
++** CAPI3REF: Run-Time Library Compilation Options Diagnostics
++**
++** ^The sqlite3_compileoption_used() function returns 0 or 1
++** indicating whether the specified option was defined at
++** compile time.  ^The SQLITE_ prefix may be omitted from the
++** option name passed to sqlite3_compileoption_used().
++**
++** ^The sqlite3_compileoption_get() function allows iterating
++** over the list of options that were defined at compile time by
++** returning the N-th compile time option string.  ^If N is out of range,
++** sqlite3_compileoption_get() returns a NULL pointer.  ^The SQLITE_
++** prefix is omitted from any strings returned by
++** sqlite3_compileoption_get().
++**
++** ^Support for the diagnostic functions sqlite3_compileoption_used()
++** and sqlite3_compileoption_get() may be omitted by specifying the
++** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
++**
++** See also: SQL functions [sqlite_compileoption_used()] and
++** [sqlite_compileoption_get()] and the [compile_options pragma].
++*/
++#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
++SQLITE_API int sqlite3_compileoption_used(const char *zOptName);
++SQLITE_API const char *sqlite3_compileoption_get(int N);
++#else
++# define sqlite3_compileoption_used(X) 0
++# define sqlite3_compileoption_get(X)  ((void*)0)
++#endif
++
++/*
++** CAPI3REF: Test To See If The Library Is Threadsafe
++**
++** ^The sqlite3_threadsafe() function returns zero if and only if
++** SQLite was compiled with mutexing code omitted due to the
++** [SQLITE_THREADSAFE] compile-time option being set to 0.
++**
++** SQLite can be compiled with or without mutexes.  When
++** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
++** are enabled and SQLite is threadsafe.  When the
++** [SQLITE_THREADSAFE] macro is 0,
++** the mutexes are omitted.  Without the mutexes, it is not safe
++** to use SQLite concurrently from more than one thread.
++**
++** Enabling mutexes incurs a measurable performance penalty.
++** So if speed is of utmost importance, it makes sense to disable
++** the mutexes.  But for maximum safety, mutexes should be enabled.
++** ^The default behavior is for mutexes to be enabled.
++**
++** This interface can be used by an application to make sure that the
++** version of SQLite that it is linking against was compiled with
++** the desired setting of the [SQLITE_THREADSAFE] macro.
++**
++** This interface only reports on the compile-time mutex setting
++** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
++** SQLITE_THREADSAFE=1 or =2 then mutexes are enabled by default but
++** can be fully or partially disabled using a call to [sqlite3_config()]
++** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
++** or [SQLITE_CONFIG_SERIALIZED].  ^(The return value of the
++** sqlite3_threadsafe() function shows only the compile-time setting of
++** thread safety, not any run-time changes to that setting made by
++** sqlite3_config(). In other words, the return value from sqlite3_threadsafe()
++** is unchanged by calls to sqlite3_config().)^
++**
++** See the [threading mode] documentation for additional information.
++*/
++SQLITE_API int sqlite3_threadsafe(void);
++
++/*
++** CAPI3REF: Database Connection Handle
++** KEYWORDS: {database connection} {database connections}
++**
++** Each open SQLite database is represented by a pointer to an instance of
++** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
++** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
++** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
++** and [sqlite3_close_v2()] are its destructors.  There are many other
++** interfaces (such as
++** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
++** [sqlite3_busy_timeout()] to name but three) that are methods on an
++** sqlite3 object.
++*/
++typedef struct sqlite3 sqlite3;
++
++/*
++** CAPI3REF: 64-Bit Integer Types
++** KEYWORDS: sqlite_int64 sqlite_uint64
++**
++** Because there is no cross-platform way to specify 64-bit integer types
++** SQLite includes typedefs for 64-bit signed and unsigned integers.
++**
++** The sqlite3_int64 and sqlite3_uint64 are the preferred type definitions.
++** The sqlite_int64 and sqlite_uint64 types are supported for backwards
++** compatibility only.
++**
++** ^The sqlite3_int64 and sqlite_int64 types can store integer values
++** between -9223372036854775808 and +9223372036854775807 inclusive.  ^The
++** sqlite3_uint64 and sqlite_uint64 types can store integer values
++** between 0 and +18446744073709551615 inclusive.
++*/
++#ifdef SQLITE_INT64_TYPE
++  typedef SQLITE_INT64_TYPE sqlite_int64;
++# ifdef SQLITE_UINT64_TYPE
++    typedef SQLITE_UINT64_TYPE sqlite_uint64;
++# else
++    typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
++# endif
++#elif defined(_MSC_VER) || defined(__BORLANDC__)
++  typedef __int64 sqlite_int64;
++  typedef unsigned __int64 sqlite_uint64;
++#else
++  typedef long long int sqlite_int64;
++  typedef unsigned long long int sqlite_uint64;
++#endif
++typedef sqlite_int64 sqlite3_int64;
++typedef sqlite_uint64 sqlite3_uint64;
++
++/*
++** If compiling for a processor that lacks floating point support,
++** substitute integer for floating-point.
++*/
++#ifdef SQLITE_OMIT_FLOATING_POINT
++# define double sqlite3_int64
++#endif
++
++/*
++** CAPI3REF: Closing A Database Connection
++** DESTRUCTOR: sqlite3
++**
++** ^The sqlite3_close() and sqlite3_close_v2() routines are destructors
++** for the [sqlite3] object.
++** ^Calls to sqlite3_close() and sqlite3_close_v2() return [SQLITE_OK] if
++** the [sqlite3] object is successfully destroyed and all associated
++** resources are deallocated.
++**
++** Ideally, applications should [sqlite3_finalize | finalize] all
++** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
++** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
++** with the [sqlite3] object prior to attempting to close the object.
++** ^If the database connection is associated with unfinalized prepared
++** statements, BLOB handlers, and/or unfinished sqlite3_backup objects then
++** sqlite3_close() will leave the database connection open and return
++** [SQLITE_BUSY]. ^If sqlite3_close_v2() is called with unfinalized prepared
++** statements, unclosed BLOB handlers, and/or unfinished sqlite3_backups,
++** it returns [SQLITE_OK] regardless, but instead of deallocating the database
++** connection immediately, it marks the database connection as an unusable
++** "zombie" and makes arrangements to automatically deallocate the database
++** connection after all prepared statements are finalized, all BLOB handles
++** are closed, and all backups have finished. The sqlite3_close_v2() interface
++** is intended for use with host languages that are garbage collected, and
++** where the order in which destructors are called is arbitrary.
++**
++** ^If an [sqlite3] object is destroyed while a transaction is open,
++** the transaction is automatically rolled back.
++**
++** The C parameter to [sqlite3_close(C)] and [sqlite3_close_v2(C)]
++** must be either a NULL
++** pointer or an [sqlite3] object pointer obtained
++** from [sqlite3_open()], [sqlite3_open16()], or
++** [sqlite3_open_v2()], and not previously closed.
++** ^Calling sqlite3_close() or sqlite3_close_v2() with a NULL pointer
++** argument is a harmless no-op.
++*/
++SQLITE_API int sqlite3_close(sqlite3*);
++SQLITE_API int sqlite3_close_v2(sqlite3*);
++
++/*
++** The type for a callback function.
++** This is legacy and deprecated.  It is included for historical
++** compatibility and is not documented.
++*/
++typedef int (*sqlite3_callback)(void*,int,char**, char**);
++
++/*
++** CAPI3REF: One-Step Query Execution Interface
++** METHOD: sqlite3
++**
++** The sqlite3_exec() interface is a convenience wrapper around
++** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
++** that allows an application to run multiple statements of SQL
++** without having to use a lot of C code.
++**
++** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
++** semicolon-separate SQL statements passed into its 2nd argument,
++** in the context of the [database connection] passed in as its 1st
++** argument.  ^If the callback function of the 3rd argument to
++** sqlite3_exec() is not NULL, then it is invoked for each result row
++** coming out of the evaluated SQL statements.  ^The 4th argument to
++** sqlite3_exec() is relayed through to the 1st argument of each
++** callback invocation.  ^If the callback pointer to sqlite3_exec()
++** is NULL, then no callback is ever invoked and result rows are
++** ignored.
++**
++** ^If an error occurs while evaluating the SQL statements passed into
++** sqlite3_exec(), then execution of the current statement stops and
++** subsequent statements are skipped.  ^If the 5th parameter to sqlite3_exec()
++** is not NULL then any error message is written into memory obtained
++** from [sqlite3_malloc()] and passed back through the 5th parameter.
++** To avoid memory leaks, the application should invoke [sqlite3_free()]
++** on error message strings returned through the 5th parameter of
++** sqlite3_exec() after the error message string is no longer needed.
++** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors
++** occur, then sqlite3_exec() sets the pointer in its 5th parameter to
++** NULL before returning.
++**
++** ^If an sqlite3_exec() callback returns non-zero, the sqlite3_exec()
++** routine returns SQLITE_ABORT without invoking the callback again and
++** without running any subsequent SQL statements.
++**
++** ^The 2nd argument to the sqlite3_exec() callback function is the
++** number of columns in the result.  ^The 3rd argument to the sqlite3_exec()
++** callback is an array of pointers to strings obtained as if from
++** [sqlite3_column_text()], one for each column.  ^If an element of a
++** result row is NULL then the corresponding string pointer for the
++** sqlite3_exec() callback is a NULL pointer.  ^The 4th argument to the
++** sqlite3_exec() callback is an array of pointers to strings where each
++** entry represents the name of corresponding result column as obtained
++** from [sqlite3_column_name()].
++**
++** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
++** to an empty string, or a pointer that contains only whitespace and/or
++** SQL comments, then no SQL statements are evaluated and the database
++** is not changed.
++**
++** Restrictions:
++**
++** 
        
++** 
      •  The application must ensure that the 1st parameter to sqlite3_exec()
++**      is a valid and open [database connection].
++** 
      •  The application must not close the [database connection] specified by
++**      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
++** 
      •  The application must not modify the SQL statement text passed into
++**      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
++** 
      
++*/
++SQLITE_API int sqlite3_exec(
++  sqlite3*,                                  /* An open database */
++  const char *sql,                           /* SQL to be evaluated */
++  int (*callback)(void*,int,char**,char**),  /* Callback function */
++  void *,                                    /* 1st argument to callback */
++  char **errmsg                              /* Error msg written here */
++);
++
++/*
++** CAPI3REF: Result Codes
++** KEYWORDS: {result code definitions}
++**
++** Many SQLite functions return an integer result code from the set shown
++** here in order to indicate success or failure.
++**
++** New error codes may be added in future versions of SQLite.
++**
++** See also: [extended result code definitions]
++*/
++#define SQLITE_OK           0   /* Successful result */
++/* beginning-of-error-codes */
++#define SQLITE_ERROR        1   /* Generic error */
++#define SQLITE_INTERNAL     2   /* Internal logic error in SQLite */
++#define SQLITE_PERM         3   /* Access permission denied */
++#define SQLITE_ABORT        4   /* Callback routine requested an abort */
++#define SQLITE_BUSY         5   /* The database file is locked */
++#define SQLITE_LOCKED       6   /* A table in the database is locked */
++#define SQLITE_NOMEM        7   /* A malloc() failed */
++#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
++#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite3_interrupt()*/
++#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
++#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
++#define SQLITE_NOTFOUND    12   /* Unknown opcode in sqlite3_file_control() */
++#define SQLITE_FULL        13   /* Insertion failed because database is full */
++#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
++#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
++#define SQLITE_EMPTY       16   /* Internal use only */
++#define SQLITE_SCHEMA      17   /* The database schema changed */
++#define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
++#define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
++#define SQLITE_MISMATCH    20   /* Data type mismatch */
++#define SQLITE_MISUSE      21   /* Library used incorrectly */
++#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
++#define SQLITE_AUTH        23   /* Authorization denied */
++#define SQLITE_FORMAT      24   /* Not used */
++#define SQLITE_RANGE       25   /* 2nd parameter to sqlite3_bind out of range */
++#define SQLITE_NOTADB      26   /* File opened that is not a database file */
++#define SQLITE_NOTICE      27   /* Notifications from sqlite3_log() */
++#define SQLITE_WARNING     28   /* Warnings from sqlite3_log() */
++#define SQLITE_ROW         100  /* sqlite3_step() has another row ready */
++#define SQLITE_DONE        101  /* sqlite3_step() has finished executing */
++/* end-of-error-codes */
++
++/*
++** CAPI3REF: Extended Result Codes
++** KEYWORDS: {extended result code definitions}
++**
++** In its default configuration, SQLite API routines return one of 30 integer
++** [result codes].  However, experience has shown that many of
++** these result codes are too coarse-grained.  They do not provide as
++** much information about problems as programmers might like.  In an effort to
++** address this, newer versions of SQLite (version 3.3.8 [dateof:3.3.8]
++** and later) include
++** support for additional result codes that provide more detailed information
++** about errors. These [extended result codes] are enabled or disabled
++** on a per database connection basis using the
++** [sqlite3_extended_result_codes()] API.  Or, the extended code for
++** the most recent error can be obtained using
++** [sqlite3_extended_errcode()].
++*/
++#define SQLITE_ERROR_MISSING_COLLSEQ   (SQLITE_ERROR | (1<<8))
++#define SQLITE_ERROR_RETRY             (SQLITE_ERROR | (2<<8))
++#define SQLITE_ERROR_SNAPSHOT          (SQLITE_ERROR | (3<<8))
++#define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
++#define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
++#define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
++#define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
++#define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
++#define SQLITE_IOERR_TRUNCATE          (SQLITE_IOERR | (6<<8))
++#define SQLITE_IOERR_FSTAT             (SQLITE_IOERR | (7<<8))
++#define SQLITE_IOERR_UNLOCK            (SQLITE_IOERR | (8<<8))
++#define SQLITE_IOERR_RDLOCK            (SQLITE_IOERR | (9<<8))
++#define SQLITE_IOERR_DELETE            (SQLITE_IOERR | (10<<8))
++#define SQLITE_IOERR_BLOCKED           (SQLITE_IOERR | (11<<8))
++#define SQLITE_IOERR_NOMEM             (SQLITE_IOERR | (12<<8))
++#define SQLITE_IOERR_ACCESS            (SQLITE_IOERR | (13<<8))
++#define SQLITE_IOERR_CHECKRESERVEDLOCK (SQLITE_IOERR | (14<<8))
++#define SQLITE_IOERR_LOCK              (SQLITE_IOERR | (15<<8))
++#define SQLITE_IOERR_CLOSE             (SQLITE_IOERR | (16<<8))
++#define SQLITE_IOERR_DIR_CLOSE         (SQLITE_IOERR | (17<<8))
++#define SQLITE_IOERR_SHMOPEN           (SQLITE_IOERR | (18<<8))
++#define SQLITE_IOERR_SHMSIZE           (SQLITE_IOERR | (19<<8))
++#define SQLITE_IOERR_SHMLOCK           (SQLITE_IOERR | (20<<8))
++#define SQLITE_IOERR_SHMMAP            (SQLITE_IOERR | (21<<8))
++#define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
++#define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
++#define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
++#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
++#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
++#define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
++#define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
++#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
++#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
++#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
++#define SQLITE_IOERR_DATA              (SQLITE_IOERR | (32<<8))
++#define SQLITE_IOERR_CORRUPTFS         (SQLITE_IOERR | (33<<8))
++#define SQLITE_IOERR_IN_PAGE           (SQLITE_IOERR | (34<<8))
++#define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
++#define SQLITE_LOCKED_VTAB             (SQLITE_LOCKED |  (2<<8))
++#define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
++#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
++#define SQLITE_BUSY_TIMEOUT            (SQLITE_BUSY   |  (3<<8))
++#define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
++#define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
++#define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
++#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
++#define SQLITE_CANTOPEN_DIRTYWAL       (SQLITE_CANTOPEN | (5<<8)) /* Not Used */
++#define SQLITE_CANTOPEN_SYMLINK        (SQLITE_CANTOPEN | (6<<8))
++#define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
++#define SQLITE_CORRUPT_SEQUENCE        (SQLITE_CORRUPT | (2<<8))
++#define SQLITE_CORRUPT_INDEX           (SQLITE_CORRUPT | (3<<8))
++#define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
++#define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
++#define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
++#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
++#define SQLITE_READONLY_CANTINIT       (SQLITE_READONLY | (5<<8))
++#define SQLITE_READONLY_DIRECTORY      (SQLITE_READONLY | (6<<8))
++#define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
++#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
++#define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
++#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
++#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
++#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
++#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))
++#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
++#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
++#define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
++#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
++#define SQLITE_CONSTRAINT_PINNED       (SQLITE_CONSTRAINT |(11<<8))
++#define SQLITE_CONSTRAINT_DATATYPE     (SQLITE_CONSTRAINT |(12<<8))
++#define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
++#define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
++#define SQLITE_NOTICE_RBU              (SQLITE_NOTICE | (3<<8))
++#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
++#define SQLITE_AUTH_USER               (SQLITE_AUTH | (1<<8))
++#define SQLITE_OK_LOAD_PERMANENTLY     (SQLITE_OK | (1<<8))
++#define SQLITE_OK_SYMLINK              (SQLITE_OK | (2<<8)) /* internal use only */
++
++/*
++** CAPI3REF: Flags For File Open Operations
++**
++** These bit values are intended for use in the
++** 3rd parameter to the [sqlite3_open_v2()] interface and
++** in the 4th parameter to the [sqlite3_vfs.xOpen] method.
++**
++** Only those flags marked as "Ok for sqlite3_open_v2()" may be
++** used as the third argument to the [sqlite3_open_v2()] interface.
++** The other flags have historically been ignored by sqlite3_open_v2(),
++** though future versions of SQLite might change so that an error is
++** raised if any of the disallowed bits are passed into sqlite3_open_v2().
++** Applications should not depend on the historical behavior.
++**
++** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
++** [sqlite3_open_v2()] does *not* cause the underlying database file
++** to be opened using O_EXCL.  Passing SQLITE_OPEN_EXCLUSIVE into
++** [sqlite3_open_v2()] has historically be a no-op and might become an
++** error in future versions of SQLite.
++*/
++#define SQLITE_OPEN_READONLY         0x00000001  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_READWRITE        0x00000002  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_CREATE           0x00000004  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_DELETEONCLOSE    0x00000008  /* VFS only */
++#define SQLITE_OPEN_EXCLUSIVE        0x00000010  /* VFS only */
++#define SQLITE_OPEN_AUTOPROXY        0x00000020  /* VFS only */
++#define SQLITE_OPEN_URI              0x00000040  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_MEMORY           0x00000080  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_MAIN_DB          0x00000100  /* VFS only */
++#define SQLITE_OPEN_TEMP_DB          0x00000200  /* VFS only */
++#define SQLITE_OPEN_TRANSIENT_DB     0x00000400  /* VFS only */
++#define SQLITE_OPEN_MAIN_JOURNAL     0x00000800  /* VFS only */
++#define SQLITE_OPEN_TEMP_JOURNAL     0x00001000  /* VFS only */
++#define SQLITE_OPEN_SUBJOURNAL       0x00002000  /* VFS only */
++#define SQLITE_OPEN_SUPER_JOURNAL    0x00004000  /* VFS only */
++#define SQLITE_OPEN_NOMUTEX          0x00008000  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_FULLMUTEX        0x00010000  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_SHAREDCACHE      0x00020000  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
++#define SQLITE_OPEN_NOFOLLOW         0x01000000  /* Ok for sqlite3_open_v2() */
++#define SQLITE_OPEN_EXRESCODE        0x02000000  /* Extended result codes */
++
++/* Reserved:                         0x00F00000 */
++/* Legacy compatibility: */
++#define SQLITE_OPEN_MASTER_JOURNAL   0x00004000  /* VFS only */
++
++
++/*
++** CAPI3REF: Device Characteristics
++**
++** The xDeviceCharacteristics method of the [sqlite3_io_methods]
++** object returns an integer which is a vector of these
++** bit values expressing I/O characteristics of the mass storage
++** device that holds the file that the [sqlite3_io_methods]
++** refers to.
++**
++** The SQLITE_IOCAP_ATOMIC property means that all writes of
++** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
++** mean that writes of blocks that are nnn bytes in size and
++** are aligned to an address which is an integer multiple of
++** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
++** that when data is appended to a file, the data is appended
++** first then the size of the file is extended, never the other
++** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
++** information is written to disk in the same order as calls
++** to xWrite().  The SQLITE_IOCAP_POWERSAFE_OVERWRITE property means that
++** after reboot following a crash or power loss, the only bytes in a
++** file that were written at the application level might have changed
++** and that adjacent bytes, even bytes within the same sector are
++** guaranteed to be unchanged.  The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
++** flag indicates that a file cannot be deleted when open.  The
++** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
++** read-only media and cannot be changed even by processes with
++** elevated privileges.
++**
++** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
++** filesystem supports doing multiple write operations atomically when those
++** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
++** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
++*/
++#define SQLITE_IOCAP_ATOMIC                 0x00000001
++#define SQLITE_IOCAP_ATOMIC512              0x00000002
++#define SQLITE_IOCAP_ATOMIC1K               0x00000004
++#define SQLITE_IOCAP_ATOMIC2K               0x00000008
++#define SQLITE_IOCAP_ATOMIC4K               0x00000010
++#define SQLITE_IOCAP_ATOMIC8K               0x00000020
++#define SQLITE_IOCAP_ATOMIC16K              0x00000040
++#define SQLITE_IOCAP_ATOMIC32K              0x00000080
++#define SQLITE_IOCAP_ATOMIC64K              0x00000100
++#define SQLITE_IOCAP_SAFE_APPEND            0x00000200
++#define SQLITE_IOCAP_SEQUENTIAL             0x00000400
++#define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
++#define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
++#define SQLITE_IOCAP_IMMUTABLE              0x00002000
++#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
++
++/*
++** CAPI3REF: File Locking Levels
++**
++** SQLite uses one of these integer values as the second
++** argument to calls it makes to the xLock() and xUnlock() methods
++** of an [sqlite3_io_methods] object.  These values are ordered from
++** lest restrictive to most restrictive.
++**
++** The argument to xLock() is always SHARED or higher.  The argument to
++** xUnlock is either SHARED or NONE.
++*/
++#define SQLITE_LOCK_NONE          0       /* xUnlock() only */
++#define SQLITE_LOCK_SHARED        1       /* xLock() or xUnlock() */
++#define SQLITE_LOCK_RESERVED      2       /* xLock() only */
++#define SQLITE_LOCK_PENDING       3       /* xLock() only */
++#define SQLITE_LOCK_EXCLUSIVE     4       /* xLock() only */
++
++/*
++** CAPI3REF: Synchronization Type Flags
++**
++** When SQLite invokes the xSync() method of an
++** [sqlite3_io_methods] object it uses a combination of
++** these integer values as the second argument.
++**
++** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
++** sync operation only needs to flush data to mass storage.  Inode
++** information need not be flushed. If the lower four bits of the flag
++** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
++** If the lower four bits equal SQLITE_SYNC_FULL, that means
++** to use Mac OS X style fullsync instead of fsync().
++**
++** Do not confuse the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
++** with the [PRAGMA synchronous]=NORMAL and [PRAGMA synchronous]=FULL
++** settings.  The [synchronous pragma] determines when calls to the
++** xSync VFS method occur and applies uniformly across all platforms.
++** The SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags determine how
++** energetic or rigorous or forceful the sync operations are and
++** only make a difference on Mac OSX for the default SQLite code.
++** (Third-party VFS implementations might also make the distinction
++** between SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL, but among the
++** operating systems natively supported by SQLite, only Mac OSX
++** cares about the difference.)
++*/
++#define SQLITE_SYNC_NORMAL        0x00002
++#define SQLITE_SYNC_FULL          0x00003
++#define SQLITE_SYNC_DATAONLY      0x00010
++
++/*
++** CAPI3REF: OS Interface Open File Handle
++**
++** An [sqlite3_file] object represents an open file in the
++** [sqlite3_vfs | OS interface layer].  Individual OS interface
++** implementations will
++** want to subclass this object by appending additional fields
++** for their own use.  The pMethods entry is a pointer to an
++** [sqlite3_io_methods] object that defines methods for performing
++** I/O operations on the open file.
++*/
++typedef struct sqlite3_file sqlite3_file;
++struct sqlite3_file {
++  const struct sqlite3_io_methods *pMethods;  /* Methods for an open file */
++};
++
++/*
++** CAPI3REF: OS Interface File Virtual Methods Object
++**
++** Every file opened by the [sqlite3_vfs.xOpen] method populates an
++** [sqlite3_file] object (or, more commonly, a subclass of the
++** [sqlite3_file] object) with a pointer to an instance of this object.
++** This object defines the methods used to perform various operations
++** against the open file represented by the [sqlite3_file] object.
++**
++** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
++** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
++** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed.  The
++** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
++** is for the [sqlite3_vfs.xOpen] to set the sqlite3_file.pMethods element
++** to NULL.
++**
++** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
++** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
++** The second choice is a Mac OS X style fullsync.  The [SQLITE_SYNC_DATAONLY]
++** flag may be ORed in to indicate that only the data of the file
++** and not its inode needs to be synced.
++**
++** The integer values to xLock() and xUnlock() are one of
++** 
        
++** 
      •  [SQLITE_LOCK_NONE],
++** 
      •  [SQLITE_LOCK_SHARED],
++** 
      •  [SQLITE_LOCK_RESERVED],
++** 
      •  [SQLITE_LOCK_PENDING], or
++** 
      •  [SQLITE_LOCK_EXCLUSIVE].
++** 
      
++** xLock() upgrades the database file lock.  In other words, xLock() moves the
++** database file lock in the direction NONE toward EXCLUSIVE. The argument to
++** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never
++** SQLITE_LOCK_NONE.  If the database file lock is already at or above the
++** requested lock, then the call to xLock() is a no-op.
++** xUnlock() downgrades the database file lock to either SHARED or NONE.
++*  If the lock is already at or below the requested lock state, then the call
++** to xUnlock() is a no-op.
++** The xCheckReservedLock() method checks whether any database connection,
++** either in this process or in some other process, is holding a RESERVED,
++** PENDING, or EXCLUSIVE lock on the file.  It returns true
++** if such a lock exists and false otherwise.
++**
++** The xFileControl() method is a generic interface that allows custom
++** VFS implementations to directly control an open file using the
++** [sqlite3_file_control()] interface.  The second "op" argument is an
++** integer opcode.  The third argument is a generic pointer intended to
++** point to a structure that may contain arguments or space in which to
++** write return values.  Potential uses for xFileControl() might be
++** functions to enable blocking locks with timeouts, to change the
++** locking strategy (for example to use dot-file locks), to inquire
++** about the status of a lock, or to break stale locks.  The SQLite
++** core reserves all opcodes less than 100 for its own use.
++** A [file control opcodes | list of opcodes] less than 100 is available.
++** Applications that define a custom xFileControl method should use opcodes
++** greater than 100 to avoid conflicts.  VFS implementations should
++** return [SQLITE_NOTFOUND] for file control opcodes that they do not
++** recognize.
++**
++** The xSectorSize() method returns the sector size of the
++** device that underlies the file.  The sector size is the
++** minimum write that can be performed without disturbing
++** other bytes in the file.  The xDeviceCharacteristics()
++** method returns a bit vector describing behaviors of the
++** underlying device:
++**
++** 
        
++** 
      •  [SQLITE_IOCAP_ATOMIC]
++** 
      •  [SQLITE_IOCAP_ATOMIC512]
++** 
      •  [SQLITE_IOCAP_ATOMIC1K]
++** 
      •  [SQLITE_IOCAP_ATOMIC2K]
++** 
      •  [SQLITE_IOCAP_ATOMIC4K]
++** 
      •  [SQLITE_IOCAP_ATOMIC8K]
++** 
      •  [SQLITE_IOCAP_ATOMIC16K]
++** 
      •  [SQLITE_IOCAP_ATOMIC32K]
++** 
      •  [SQLITE_IOCAP_ATOMIC64K]
++** 
      •  [SQLITE_IOCAP_SAFE_APPEND]
++** 
      •  [SQLITE_IOCAP_SEQUENTIAL]
++** 
      •  [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
++** 
      •  [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
++** 
      •  [SQLITE_IOCAP_IMMUTABLE]
++** 
      •  [SQLITE_IOCAP_BATCH_ATOMIC]
++** 
      
++**
++** The SQLITE_IOCAP_ATOMIC property means that all writes of
++** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
++** mean that writes of blocks that are nnn bytes in size and
++** are aligned to an address which is an integer multiple of
++** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
++** that when data is appended to a file, the data is appended
++** first then the size of the file is extended, never the other
++** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
++** information is written to disk in the same order as calls
++** to xWrite().
++**
++** If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill
++** in the unread portions of the buffer with zeros.  A VFS that
++** fails to zero-fill short reads might seem to work.  However,
++** failure to zero-fill short reads will eventually lead to
++** database corruption.
++*/
++typedef struct sqlite3_io_methods sqlite3_io_methods;
++struct sqlite3_io_methods {
++  int iVersion;
++  int (*xClose)(sqlite3_file*);
++  int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
++  int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
++  int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
++  int (*xSync)(sqlite3_file*, int flags);
++  int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize);
++  int (*xLock)(sqlite3_file*, int);
++  int (*xUnlock)(sqlite3_file*, int);
++  int (*xCheckReservedLock)(sqlite3_file*, int *pResOut);
++  int (*xFileControl)(sqlite3_file*, int op, void *pArg);
++  int (*xSectorSize)(sqlite3_file*);
++  int (*xDeviceCharacteristics)(sqlite3_file*);
++  /* Methods above are valid for version 1 */
++  int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
++  int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
++  void (*xShmBarrier)(sqlite3_file*);
++  int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
++  /* Methods above are valid for version 2 */
++  int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
++  int (*xUnfetch)(sqlite3_file*, sqlite3_int64 iOfst, void *p);
++  /* Methods above are valid for version 3 */
++  /* Additional methods may be added in future releases */
++};
++
++/*
++** CAPI3REF: Standard File Control Opcodes
++** KEYWORDS: {file control opcodes} {file control opcode}
++**
++** These integer constants are opcodes for the xFileControl method
++** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
++** interface.
++**
++** 
        
++** 
      • [[SQLITE_FCNTL_LOCKSTATE]]
++** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging.  This
++** opcode causes the xFileControl method to write the current state of
++** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
++** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
++** into an integer that the pArg argument points to.
++** This capability is only available if SQLite is compiled with [SQLITE_DEBUG].
++**
++** 
      • [[SQLITE_FCNTL_SIZE_HINT]]
++** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
++** layer a hint of how large the database file will grow to be during the
++** current transaction.  This hint is not guaranteed to be accurate but it
++** is often close.  The underlying VFS might choose to preallocate database
++** file space based on this hint in order to help writes to the database
++** file run faster.
++**
++** 
      • [[SQLITE_FCNTL_SIZE_LIMIT]]
++** The [SQLITE_FCNTL_SIZE_LIMIT] opcode is used by in-memory VFS that
++** implements [sqlite3_deserialize()] to set an upper bound on the size
++** of the in-memory database.  The argument is a pointer to a [sqlite3_int64].
++** If the integer pointed to is negative, then it is filled in with the
++** current limit.  Otherwise the limit is set to the larger of the value
++** of the integer pointed to and the current database size.  The integer
++** pointed to is set to the new limit.
++**
++** 
      • [[SQLITE_FCNTL_CHUNK_SIZE]]
++** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
++** extends and truncates the database file in chunks of a size specified
++** by the user. The fourth argument to [sqlite3_file_control()] should
++** point to an integer (type int) containing the new chunk-size to use
++** for the nominated database. Allocating database file space in large
++** chunks (say 1MB at a time), may reduce file-system fragmentation and
++** improve performance on some systems.
++**
++** 
      • [[SQLITE_FCNTL_FILE_POINTER]]
++** The [SQLITE_FCNTL_FILE_POINTER] opcode is used to obtain a pointer
++** to the [sqlite3_file] object associated with a particular database
++** connection.  See also [SQLITE_FCNTL_JOURNAL_POINTER].
++**
++** 
      • [[SQLITE_FCNTL_JOURNAL_POINTER]]
++** The [SQLITE_FCNTL_JOURNAL_POINTER] opcode is used to obtain a pointer
++** to the [sqlite3_file] object associated with the journal file (either
++** the [rollback journal] or the [write-ahead log]) for a particular database
++** connection.  See also [SQLITE_FCNTL_FILE_POINTER].
++**
++** 
      • [[SQLITE_FCNTL_SYNC_OMITTED]]
++** No longer in use.
++**
++** 
      • [[SQLITE_FCNTL_SYNC]]
++** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
++** sent to the VFS immediately before the xSync method is invoked on a
++** database file descriptor. Or, if the xSync method is not invoked
++** because the user has configured SQLite with
++** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place
++** of the xSync method. In most cases, the pointer argument passed with
++** this file-control is NULL. However, if the database file is being synced
++** as part of a multi-database commit, the argument points to a nul-terminated
++** string containing the transactions super-journal file name. VFSes that
++** do not need this signal should silently ignore this opcode. Applications
++** should not call [sqlite3_file_control()] with this opcode as doing so may
++** disrupt the operation of the specialized VFSes that do require it.
++**
++** 
      • [[SQLITE_FCNTL_COMMIT_PHASETWO]]
++** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
++** and sent to the VFS after a transaction has been committed immediately
++** but before the database is unlocked. VFSes that do not need this signal
++** should silently ignore this opcode. Applications should not call
++** [sqlite3_file_control()] with this opcode as doing so may disrupt the
++** operation of the specialized VFSes that do require it.
++**
++** 
      • [[SQLITE_FCNTL_WIN32_AV_RETRY]]
++** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
++** retry counts and intervals for certain disk I/O operations for the
++** windows [VFS] in order to provide robustness in the presence of
++** anti-virus programs.  By default, the windows VFS will retry file read,
++** file write, and file delete operations up to 10 times, with a delay
++** of 25 milliseconds before the first retry and with the delay increasing
++** by an additional 25 milliseconds with each subsequent retry.  This
++** opcode allows these two values (10 retries and 25 milliseconds of delay)
++** to be adjusted.  The values are changed for all database connections
++** within the same process.  The argument is a pointer to an array of two
++** integers where the first integer is the new retry count and the second
++** integer is the delay.  If either integer is negative, then the setting
++** is not changed but instead the prior value of that setting is written
++** into the array entry, allowing the current retry settings to be
++** interrogated.  The zDbName parameter is ignored.
++**
++** 
      • [[SQLITE_FCNTL_PERSIST_WAL]]
++** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the
++** persistent [WAL | Write Ahead Log] setting.  By default, the auxiliary
++** write ahead log ([WAL file]) and shared memory
++** files used for transaction control
++** are automatically deleted when the latest connection to the database
++** closes.  Setting persistent WAL mode causes those files to persist after
++** close.  Persisting the files is useful when other processes that do not
++** have write permission on the directory containing the database file want
++** to read the database file, as the WAL and shared memory files must exist
++** in order for the database to be readable.  The fourth parameter to
++** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
++** That integer is 0 to disable persistent WAL mode or 1 to enable persistent
++** WAL mode.  If the integer is -1, then it is overwritten with the current
++** WAL persistence setting.
++**
++** 
      • [[SQLITE_FCNTL_POWERSAFE_OVERWRITE]]
++** ^The [SQLITE_FCNTL_POWERSAFE_OVERWRITE] opcode is used to set or query the
++** persistent "powersafe-overwrite" or "PSOW" setting.  The PSOW setting
++** determines the [SQLITE_IOCAP_POWERSAFE_OVERWRITE] bit of the
++** xDeviceCharacteristics methods. The fourth parameter to
++** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
++** That integer is 0 to disable zero-damage mode or 1 to enable zero-damage
++** mode.  If the integer is -1, then it is overwritten with the current
++** zero-damage mode setting.
++**
++** 
      • [[SQLITE_FCNTL_OVERWRITE]]
++** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening
++** a write transaction to indicate that, unless it is rolled back for some
++** reason, the entire database file will be overwritten by the current
++** transaction. This is used by VACUUM operations.
++**
++** 
      • [[SQLITE_FCNTL_VFSNAME]]
++** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
++** all [VFSes] in the VFS stack.  The names are of all VFS shims and the
++** final bottom-level VFS are written into memory obtained from
++** [sqlite3_malloc()] and the result is stored in the char* variable
++** that the fourth parameter of [sqlite3_file_control()] points to.
++** The caller is responsible for freeing the memory when done.  As with
++** all file-control actions, there is no guarantee that this will actually
++** do anything.  Callers should initialize the char* variable to a NULL
++** pointer in case this file-control is not implemented.  This file-control
++** is intended for diagnostic use only.
++**
++** 
      • [[SQLITE_FCNTL_VFS_POINTER]]
++** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
++** [VFSes] currently in use.  ^(The argument X in
++** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
++** of type "[sqlite3_vfs] **".  This opcodes will set *X
++** to a pointer to the top-level VFS.)^
++** ^When there are multiple VFS shims in the stack, this opcode finds the
++** upper-most shim only.
++**
++** 
      • [[SQLITE_FCNTL_PRAGMA]]
++** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA]
++** file control is sent to the open [sqlite3_file] object corresponding
++** to the database file to which the pragma statement refers. ^The argument
++** to the [SQLITE_FCNTL_PRAGMA] file control is an array of
++** pointers to strings (char**) in which the second element of the array
++** is the name of the pragma and the third element is the argument to the
++** pragma or NULL if the pragma has no argument.  ^The handler for an
++** [SQLITE_FCNTL_PRAGMA] file control can optionally make the first element
++** of the char** argument point to a string obtained from [sqlite3_mprintf()]
++** or the equivalent and that string will become the result of the pragma or
++** the error message if the pragma fails. ^If the
++** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
++** [PRAGMA] processing continues.  ^If the [SQLITE_FCNTL_PRAGMA]
++** file control returns [SQLITE_OK], then the parser assumes that the
++** VFS has handled the PRAGMA itself and the parser generates a no-op
++** prepared statement if result string is NULL, or that returns a copy
++** of the result string if the string is non-NULL.
++** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
++** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
++** that the VFS encountered an error while handling the [PRAGMA] and the
++** compilation of the PRAGMA fails with an error.  ^The [SQLITE_FCNTL_PRAGMA]
++** file control occurs at the beginning of pragma statement analysis and so
++** it is able to override built-in [PRAGMA] statements.
++**
++** 
      • [[SQLITE_FCNTL_BUSYHANDLER]]
++** ^The [SQLITE_FCNTL_BUSYHANDLER]
++** file-control may be invoked by SQLite on the database file handle
++** shortly after it is opened in order to provide a custom VFS with access
++** to the connection's busy-handler callback. The argument is of type (void**)
++** - an array of two (void *) values. The first (void *) actually points
++** to a function of type (int (*)(void *)). In order to invoke the connection's
++** busy-handler, this function should be invoked with the second (void *) in
++** the array as the only argument. If it returns non-zero, then the operation
++** should be retried. If it returns zero, the custom VFS should abandon the
++** current operation.
++**
++** 
      • [[SQLITE_FCNTL_TEMPFILENAME]]
++** ^Applications can invoke the [SQLITE_FCNTL_TEMPFILENAME] file-control
++** to have SQLite generate a
++** temporary filename using the same algorithm that is followed to generate
++** temporary filenames for TEMP tables and other internal uses.  The
++** argument should be a char** which will be filled with the filename
++** written into memory obtained from [sqlite3_malloc()].  The caller should
++** invoke [sqlite3_free()] on the result to avoid a memory leak.
++**
++** 
      • [[SQLITE_FCNTL_MMAP_SIZE]]
++** The [SQLITE_FCNTL_MMAP_SIZE] file control is used to query or set the
++** maximum number of bytes that will be used for memory-mapped I/O.
++** The argument is a pointer to a value of type sqlite3_int64 that
++** is an advisory maximum number of bytes in the file to memory map.  The
++** pointer is overwritten with the old value.  The limit is not changed if
++** the value originally pointed to is negative, and so the current limit
++** can be queried by passing in a pointer to a negative number.  This
++** file-control is used internally to implement [PRAGMA mmap_size].
++**
++** 
      • [[SQLITE_FCNTL_TRACE]]
++** The [SQLITE_FCNTL_TRACE] file control provides advisory information
++** to the VFS about what the higher layers of the SQLite stack are doing.
++** This file control is used by some VFS activity tracing [shims].
++** The argument is a zero-terminated string.  Higher layers in the
++** SQLite stack may generate instances of this file control if
++** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled.
++**
++** 
      • [[SQLITE_FCNTL_HAS_MOVED]]
++** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a
++** pointer to an integer and it writes a boolean into that integer depending
++** on whether or not the file has been renamed, moved, or deleted since it
++** was first opened.
++**
++** 
      • [[SQLITE_FCNTL_WIN32_GET_HANDLE]]
++** The [SQLITE_FCNTL_WIN32_GET_HANDLE] opcode can be used to obtain the
++** underlying native file handle associated with a file handle.  This file
++** control interprets its argument as a pointer to a native file handle and
++** writes the resulting value there.
++**
++** 
      • [[SQLITE_FCNTL_WIN32_SET_HANDLE]]
++** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
++** opcode causes the xFileControl method to swap the file handle with the one
++** pointed to by the pArg argument.  This capability is used during testing
++** and only needs to be supported when SQLITE_TEST is defined.
++**
++** 
      • [[SQLITE_FCNTL_WAL_BLOCK]]
++** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
++** be advantageous to block on the next WAL lock if the lock is not immediately
++** available.  The WAL subsystem issues this signal during rare
++** circumstances in order to fix a problem with priority inversion.
++** Applications should not use this file-control.
++**
++** 
      • [[SQLITE_FCNTL_ZIPVFS]]
++** The [SQLITE_FCNTL_ZIPVFS] opcode is implemented by zipvfs only. All other
++** VFS should return SQLITE_NOTFOUND for this opcode.
++**
++** 
      • [[SQLITE_FCNTL_RBU]]
++** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
++** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
++** this opcode.
++**
++** 
      • [[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
++** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
++** the file descriptor is placed in "batch write mode", which
++** means all subsequent write operations will be deferred and done
++** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
++** that do not support batch atomic writes will return SQLITE_NOTFOUND.
++** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
++** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
++** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
++** no VFS interface calls on the same [sqlite3_file] file descriptor
++** except for calls to the xWrite method and the xFileControl method
++** with [SQLITE_FCNTL_SIZE_HINT].
++**
++** 
      • [[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
++** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
++** operations since the previous successful call to
++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
++** This file control returns [SQLITE_OK] if and only if the writes were
++** all performed successfully and have been committed to persistent storage.
++** ^Regardless of whether or not it is successful, this file control takes
++** the file descriptor out of batch write mode so that all subsequent
++** write operations are independent.
++** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
++**
++** 
      • [[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
++** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
++** operations since the previous successful call to
++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
++** ^This file control takes the file descriptor out of batch write mode
++** so that all subsequent write operations are independent.
++** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
++**
++** 
      • [[SQLITE_FCNTL_LOCK_TIMEOUT]]
++** The [SQLITE_FCNTL_LOCK_TIMEOUT] opcode is used to configure a VFS
++** to block for up to M milliseconds before failing when attempting to
++** obtain a file lock using the xLock or xShmLock methods of the VFS.
++** The parameter is a pointer to a 32-bit signed integer that contains
++** the value that M is to be set to. Before returning, the 32-bit signed
++** integer is overwritten with the previous value of M.
++**
++** 
      • [[SQLITE_FCNTL_DATA_VERSION]]
++** The [SQLITE_FCNTL_DATA_VERSION] opcode is used to detect changes to
++** a database file.  The argument is a pointer to a 32-bit unsigned integer.
++** The "data version" for the pager is written into the pointer.  The
++** "data version" changes whenever any change occurs to the corresponding
++** database file, either through SQL statements on the same database
++** connection or through transactions committed by separate database
++** connections possibly in other processes. The [sqlite3_total_changes()]
++** interface can be used to find if any database on the connection has changed,
++** but that interface responds to changes on TEMP as well as MAIN and does
++** not provide a mechanism to detect changes to MAIN only.  Also, the
++** [sqlite3_total_changes()] interface responds to internal changes only and
++** omits changes made by other database connections.  The
++** [PRAGMA data_version] command provides a mechanism to detect changes to
++** a single attached database that occur due to other database connections,
++** but omits changes implemented by the database connection on which it is
++** called.  This file control is the only mechanism to detect changes that
++** happen either internally or externally and that are associated with
++** a particular attached database.
++**
++** 
      • [[SQLITE_FCNTL_CKPT_START]]
++** The [SQLITE_FCNTL_CKPT_START] opcode is invoked from within a checkpoint
++** in wal mode before the client starts to copy pages from the wal
++** file to the database file.
++**
++** 
      • [[SQLITE_FCNTL_CKPT_DONE]]
++** The [SQLITE_FCNTL_CKPT_DONE] opcode is invoked from within a checkpoint
++** in wal mode after the client has finished copying pages from the wal
++** file to the database file, but before the *-shm file is updated to
++** record the fact that the pages have been checkpointed.
++**
++** 
      • [[SQLITE_FCNTL_EXTERNAL_READER]]
++** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
++** whether or not there is a database client in another process with a wal-mode
++** transaction open on the database or not. It is only available on unix.The
++** (void*) argument passed with this file-control should be a pointer to a
++** value of type (int). The integer value is set to 1 if the database is a wal
++** mode database and there exists at least one client in another process that
++** currently has an SQL transaction open on the database. It is set to 0 if
++** the database is not a wal-mode db, or if there is no such connection in any
++** other process. This opcode cannot be used to detect transactions opened
++** by clients within the current process, only within other processes.
++**
++** 
      • [[SQLITE_FCNTL_CKSM_FILE]]
++** The [SQLITE_FCNTL_CKSM_FILE] opcode is for use internally by the
++** [checksum VFS shim] only.
++**
++** 
      • [[SQLITE_FCNTL_RESET_CACHE]]
++** If there is currently no transaction open on the database, and the
++** database is not a temp db, then the [SQLITE_FCNTL_RESET_CACHE] file-control
++** purges the contents of the in-memory page cache. If there is an open
++** transaction, or if the db is a temp-db, this opcode is a no-op, not an error.
++** 
      
++*/
++#define SQLITE_FCNTL_LOCKSTATE               1
++#define SQLITE_FCNTL_GET_LOCKPROXYFILE       2
++#define SQLITE_FCNTL_SET_LOCKPROXYFILE       3
++#define SQLITE_FCNTL_LAST_ERRNO              4
++#define SQLITE_FCNTL_SIZE_HINT               5
++#define SQLITE_FCNTL_CHUNK_SIZE              6
++#define SQLITE_FCNTL_FILE_POINTER            7
++#define SQLITE_FCNTL_SYNC_OMITTED            8
++#define SQLITE_FCNTL_WIN32_AV_RETRY          9
++#define SQLITE_FCNTL_PERSIST_WAL            10
++#define SQLITE_FCNTL_OVERWRITE              11
++#define SQLITE_FCNTL_VFSNAME                12
++#define SQLITE_FCNTL_POWERSAFE_OVERWRITE    13
++#define SQLITE_FCNTL_PRAGMA                 14
++#define SQLITE_FCNTL_BUSYHANDLER            15
++#define SQLITE_FCNTL_TEMPFILENAME           16
++#define SQLITE_FCNTL_MMAP_SIZE              18
++#define SQLITE_FCNTL_TRACE                  19
++#define SQLITE_FCNTL_HAS_MOVED              20
++#define SQLITE_FCNTL_SYNC                   21
++#define SQLITE_FCNTL_COMMIT_PHASETWO        22
++#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
++#define SQLITE_FCNTL_WAL_BLOCK              24
++#define SQLITE_FCNTL_ZIPVFS                 25
++#define SQLITE_FCNTL_RBU                    26
++#define SQLITE_FCNTL_VFS_POINTER            27
++#define SQLITE_FCNTL_JOURNAL_POINTER        28
++#define SQLITE_FCNTL_WIN32_GET_HANDLE       29
++#define SQLITE_FCNTL_PDB                    30
++#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
++#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
++#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
++#define SQLITE_FCNTL_LOCK_TIMEOUT           34
++#define SQLITE_FCNTL_DATA_VERSION           35
++#define SQLITE_FCNTL_SIZE_LIMIT             36
++#define SQLITE_FCNTL_CKPT_DONE              37
++#define SQLITE_FCNTL_RESERVE_BYTES          38
++#define SQLITE_FCNTL_CKPT_START             39
++#define SQLITE_FCNTL_EXTERNAL_READER        40
++#define SQLITE_FCNTL_CKSM_FILE              41
++#define SQLITE_FCNTL_RESET_CACHE            42
++
++/* deprecated names */
++#define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
++#define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
++#define SQLITE_LAST_ERRNO             SQLITE_FCNTL_LAST_ERRNO
++
++
++/*
++** CAPI3REF: Mutex Handle
++**
++** The mutex module within SQLite defines [sqlite3_mutex] to be an
++** abstract type for a mutex object.  The SQLite core never looks
++** at the internal representation of an [sqlite3_mutex].  It only
++** deals with pointers to the [sqlite3_mutex] object.
++**
++** Mutexes are created using [sqlite3_mutex_alloc()].
++*/
++typedef struct sqlite3_mutex sqlite3_mutex;
++
++/*
++** CAPI3REF: Loadable Extension Thunk
++**
++** A pointer to the opaque sqlite3_api_routines structure is passed as
++** the third parameter to entry points of [loadable extensions].  This
++** structure must be typedefed in order to work around compiler warnings
++** on some platforms.
++*/
++typedef struct sqlite3_api_routines sqlite3_api_routines;
++
++/*
++** CAPI3REF: File Name
++**
++** Type [sqlite3_filename] is used by SQLite to pass filenames to the
++** xOpen method of a [VFS]. It may be cast to (const char*) and treated
++** as a normal, nul-terminated, UTF-8 buffer containing the filename, but
++** may also be passed to special APIs such as:
++**
++** 
        
++** 
      •   sqlite3_filename_database()
++** 
      •   sqlite3_filename_journal()
++** 
      •   sqlite3_filename_wal()
++** 
      •   sqlite3_uri_parameter()
++** 
      •   sqlite3_uri_boolean()
++** 
      •   sqlite3_uri_int64()
++** 
      •   sqlite3_uri_key()
++** 
      
++*/
++typedef const char *sqlite3_filename;
++
++/*
++** CAPI3REF: OS Interface Object
++**
++** An instance of the sqlite3_vfs object defines the interface between
++** the SQLite core and the underlying operating system.  The "vfs"
++** in the name of the object stands for "virtual file system".  See
++** the [VFS | VFS documentation] for further information.
++**
++** The VFS interface is sometimes extended by adding new methods onto
++** the end.  Each time such an extension occurs, the iVersion field
++** is incremented.  The iVersion value started out as 1 in
++** SQLite [version 3.5.0] on [dateof:3.5.0], then increased to 2
++** with SQLite [version 3.7.0] on [dateof:3.7.0], and then increased
++** to 3 with SQLite [version 3.7.6] on [dateof:3.7.6].  Additional fields
++** may be appended to the sqlite3_vfs object and the iVersion value
++** may increase again in future versions of SQLite.
++** Note that due to an oversight, the structure
++** of the sqlite3_vfs object changed in the transition from
++** SQLite [version 3.5.9] to [version 3.6.0] on [dateof:3.6.0]
++** and yet the iVersion field was not increased.
++**
++** The szOsFile field is the size of the subclassed [sqlite3_file]
++** structure used by this VFS.  mxPathname is the maximum length of
++** a pathname in this VFS.
++**
++** Registered sqlite3_vfs objects are kept on a linked list formed by
++** the pNext pointer.  The [sqlite3_vfs_register()]
++** and [sqlite3_vfs_unregister()] interfaces manage this list
++** in a thread-safe way.  The [sqlite3_vfs_find()] interface
++** searches the list.  Neither the application code nor the VFS
++** implementation should use the pNext pointer.
++**
++** The pNext field is the only field in the sqlite3_vfs
++** structure that SQLite will ever modify.  SQLite will only access
++** or modify this field while holding a particular static mutex.
++** The application should never modify anything within the sqlite3_vfs
++** object once the object has been registered.
++**
++** The zName field holds the name of the VFS module.  The name must
++** be unique across all VFS modules.
++**
++** [[sqlite3_vfs.xOpen]]
++** ^SQLite guarantees that the zFilename parameter to xOpen
++** is either a NULL pointer or string obtained
++** from xFullPathname() with an optional suffix added.
++** ^If a suffix is added to the zFilename parameter, it will
++** consist of a single "-" character followed by no more than
++** 11 alphanumeric and/or "-" characters.
++** ^SQLite further guarantees that
++** the string will be valid and unchanged until xClose() is
++** called. Because of the previous sentence,
++** the [sqlite3_file] can safely store a pointer to the
++** filename if it needs to remember the filename for some reason.
++** If the zFilename parameter to xOpen is a NULL pointer then xOpen
++** must invent its own temporary name for the file.  ^Whenever the
++** xFilename parameter is NULL it will also be the case that the
++** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
++**
++** The flags argument to xOpen() includes all bits set in
++** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
++** or [sqlite3_open16()] is used, then flags includes at least
++** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
++** If xOpen() opens a file read-only then it sets *pOutFlags to
++** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be set.
++**
++** ^(SQLite will also add one of the following flags to the xOpen()
++** call, depending on the object being opened:
++**
++** 
        
++** 
      •   [SQLITE_OPEN_MAIN_DB]
++** 
      •   [SQLITE_OPEN_MAIN_JOURNAL]
++** 
      •   [SQLITE_OPEN_TEMP_DB]
++** 
      •   [SQLITE_OPEN_TEMP_JOURNAL]
++** 
      •   [SQLITE_OPEN_TRANSIENT_DB]
++** 
      •   [SQLITE_OPEN_SUBJOURNAL]
++** 
      •   [SQLITE_OPEN_SUPER_JOURNAL]
++** 
      •   [SQLITE_OPEN_WAL]
++** 
      )^
++**
++** The file I/O implementation can use the object type flags to
++** change the way it deals with files.  For example, an application
++** that does not care about crash recovery or rollback might make
++** the open of a journal file a no-op.  Writes to this journal would
++** also be no-ops, and any attempt to read the journal would return
++** SQLITE_IOERR.  Or the implementation might recognize that a database
++** file will be doing page-aligned sector reads and writes in a random
++** order and set up its I/O subsystem accordingly.
++**
++** SQLite might also add one of the following flags to the xOpen method:
++**
++** 
        
++** 
      •  [SQLITE_OPEN_DELETEONCLOSE]
++** 
      •  [SQLITE_OPEN_EXCLUSIVE]
++** 
      
++**
++** The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
++** deleted when it is closed.  ^The [SQLITE_OPEN_DELETEONCLOSE]
++** will be set for TEMP databases and their journals, transient
++** databases, and subjournals.
++**
++** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
++** with the [SQLITE_OPEN_CREATE] flag, which are both directly
++** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
++** API.  The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
++** SQLITE_OPEN_CREATE, is used to indicate that file should always
++** be created, and that it is an error if it already exists.
++** It is not used to indicate the file should be opened
++** for exclusive access.
++**
++** ^At least szOsFile bytes of memory are allocated by SQLite
++** to hold the [sqlite3_file] structure passed as the third
++** argument to xOpen.  The xOpen method does not have to
++** allocate the structure; it should just fill it in.  Note that
++** the xOpen method must set the sqlite3_file.pMethods to either
++** a valid [sqlite3_io_methods] object or to NULL.  xOpen must do
++** this even if the open fails.  SQLite expects that the sqlite3_file.pMethods
++** element will be valid after xOpen returns regardless of the success
++** or failure of the xOpen call.
++**
++** [[sqlite3_vfs.xAccess]]
++** ^The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
++** to test for the existence of a file, or [SQLITE_ACCESS_READWRITE] to
++** test whether a file is readable and writable, or [SQLITE_ACCESS_READ]
++** to test whether a file is at least readable.  The SQLITE_ACCESS_READ
++** flag is never actually used and is not implemented in the built-in
++** VFSes of SQLite.  The file is named by the second argument and can be a
++** directory. The xAccess method returns [SQLITE_OK] on success or some
++** non-zero error code if there is an I/O error or if the name of
++** the file given in the second argument is illegal.  If SQLITE_OK
++** is returned, then non-zero or zero is written into *pResOut to indicate
++** whether or not the file is accessible.
++**
++** ^SQLite will always allocate at least mxPathname+1 bytes for the
++** output buffer xFullPathname.  The exact size of the output buffer
++** is also passed as a parameter to both  methods. If the output buffer
++** is not large enough, [SQLITE_CANTOPEN] should be returned. Since this is
++** handled as a fatal error by SQLite, vfs implementations should endeavor
++** to prevent this by setting mxPathname to a sufficiently large value.
++**
++** The xRandomness(), xSleep(), xCurrentTime(), and xCurrentTimeInt64()
++** interfaces are not strictly a part of the filesystem, but they are
++** included in the VFS structure for completeness.
++** The xRandomness() function attempts to return nBytes bytes
++** of good-quality randomness into zOut.  The return value is
++** the actual number of bytes of randomness obtained.
++** The xSleep() method causes the calling thread to sleep for at
++** least the number of microseconds given.  ^The xCurrentTime()
++** method returns a Julian Day Number for the current date and time as
++** a floating point value.
++** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
++** Day Number multiplied by 86400000 (the number of milliseconds in
++** a 24-hour day).
++** ^SQLite will use the xCurrentTimeInt64() method to get the current
++** date and time if that method is available (if iVersion is 2 or
++** greater and the function pointer is not NULL) and will fall back
++** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
++**
++** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
++** are not used by the SQLite core.  These optional interfaces are provided
++** by some VFSes to facilitate testing of the VFS code. By overriding
++** system calls with functions under its control, a test program can
++** simulate faults and error conditions that would otherwise be difficult
++** or impossible to induce.  The set of system calls that can be overridden
++** varies from one VFS to another, and from one version of the same VFS to the
++** next.  Applications that use these interfaces must be prepared for any
++** or all of these interfaces to be NULL or for their behavior to change
++** from one release to the next.  Applications must not attempt to access
++** any of these methods if the iVersion of the VFS is less than 3.
++*/
++typedef struct sqlite3_vfs sqlite3_vfs;
++typedef void (*sqlite3_syscall_ptr)(void);
++struct sqlite3_vfs {
++  int iVersion;            /* Structure version number (currently 3) */
++  int szOsFile;            /* Size of subclassed sqlite3_file */
++  int mxPathname;          /* Maximum file pathname length */
++  sqlite3_vfs *pNext;      /* Next registered VFS */
++  const char *zName;       /* Name of this virtual file system */
++  void *pAppData;          /* Pointer to application-specific data */
++  int (*xOpen)(sqlite3_vfs*, sqlite3_filename zName, sqlite3_file*,
++               int flags, int *pOutFlags);
++  int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
++  int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
++  int (*xFullPathname)(sqlite3_vfs*, const char *zName, int nOut, char *zOut);
++  void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
++  void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
++  void (*(*xDlSym)(sqlite3_vfs*,void*, const char *zSymbol))(void);
++  void (*xDlClose)(sqlite3_vfs*, void*);
++  int (*xRandomness)(sqlite3_vfs*, int nByte, char *zOut);
++  int (*xSleep)(sqlite3_vfs*, int microseconds);
++  int (*xCurrentTime)(sqlite3_vfs*, double*);
++  int (*xGetLastError)(sqlite3_vfs*, int, char *);
++  /*
++  ** The methods above are in version 1 of the sqlite_vfs object
++  ** definition.  Those that follow are added in version 2 or later
++  */
++  int (*xCurrentTimeInt64)(sqlite3_vfs*, sqlite3_int64*);
++  /*
++  ** The methods above are in versions 1 and 2 of the sqlite_vfs object.
++  ** Those below are for version 3 and greater.
++  */
++  int (*xSetSystemCall)(sqlite3_vfs*, const char *zName, sqlite3_syscall_ptr);
++  sqlite3_syscall_ptr (*xGetSystemCall)(sqlite3_vfs*, const char *zName);
++  const char *(*xNextSystemCall)(sqlite3_vfs*, const char *zName);
++  /*
++  ** The methods above are in versions 1 through 3 of the sqlite_vfs object.
++  ** New fields may be appended in future versions.  The iVersion
++  ** value will increment whenever this happens.
++  */
++};
++
++/*
++** CAPI3REF: Flags for the xAccess VFS method
++**
++** These integer constants can be used as the third parameter to
++** the xAccess method of an [sqlite3_vfs] object.  They determine
++** what kind of permissions the xAccess method is looking for.
++** With SQLITE_ACCESS_EXISTS, the xAccess method
++** simply checks whether the file exists.
++** With SQLITE_ACCESS_READWRITE, the xAccess method
++** checks whether the named directory is both readable and writable
++** (in other words, if files can be added, removed, and renamed within
++** the directory).
++** The SQLITE_ACCESS_READWRITE constant is currently used only by the
++** [temp_store_directory pragma], though this could change in a future
++** release of SQLite.
++** With SQLITE_ACCESS_READ, the xAccess method
++** checks whether the file is readable.  The SQLITE_ACCESS_READ constant is
++** currently unused, though it might be used in a future release of
++** SQLite.
++*/
++#define SQLITE_ACCESS_EXISTS    0
++#define SQLITE_ACCESS_READWRITE 1   /* Used by PRAGMA temp_store_directory */
++#define SQLITE_ACCESS_READ      2   /* Unused */
++
++/*
++** CAPI3REF: Flags for the xShmLock VFS method
++**
++** These integer constants define the various locking operations
++** allowed by the xShmLock method of [sqlite3_io_methods].  The
++** following are the only legal combinations of flags to the
++** xShmLock method:
++**
++** 
        
++** 
      •   SQLITE_SHM_LOCK | SQLITE_SHM_SHARED
++** 
      •   SQLITE_SHM_LOCK | SQLITE_SHM_EXCLUSIVE
++** 
      •   SQLITE_SHM_UNLOCK | SQLITE_SHM_SHARED
++** 
      •   SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE
++** 
      
++**
++** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as
++** was given on the corresponding lock.
++**
++** The xShmLock method can transition between unlocked and SHARED or
++** between unlocked and EXCLUSIVE.  It cannot transition between SHARED
++** and EXCLUSIVE.
++*/
++#define SQLITE_SHM_UNLOCK       1
++#define SQLITE_SHM_LOCK         2
++#define SQLITE_SHM_SHARED       4
++#define SQLITE_SHM_EXCLUSIVE    8
++
++/*
++** CAPI3REF: Maximum xShmLock index
++**
++** The xShmLock method on [sqlite3_io_methods] may use values
++** between 0 and this upper bound as its "offset" argument.
++** The SQLite core will never attempt to acquire or release a
++** lock outside of this range
++*/
++#define SQLITE_SHM_NLOCK        8
++
++
++/*
++** CAPI3REF: Initialize The SQLite Library
++**
++** ^The sqlite3_initialize() routine initializes the
++** SQLite library.  ^The sqlite3_shutdown() routine
++** deallocates any resources that were allocated by sqlite3_initialize().
++** These routines are designed to aid in process initialization and
++** shutdown on embedded systems.  Workstation applications using
++** SQLite normally do not need to invoke either of these routines.
++**
++** A call to sqlite3_initialize() is an "effective" call if it is
++** the first time sqlite3_initialize() is invoked during the lifetime of
++** the process, or if it is the first time sqlite3_initialize() is invoked
++** following a call to sqlite3_shutdown().  ^(Only an effective call
++** of sqlite3_initialize() does any initialization.  All other calls
++** are harmless no-ops.)^
++**
++** A call to sqlite3_shutdown() is an "effective" call if it is the first
++** call to sqlite3_shutdown() since the last sqlite3_initialize().  ^(Only
++** an effective call to sqlite3_shutdown() does any deinitialization.
++** All other valid calls to sqlite3_shutdown() are harmless no-ops.)^
++**
++** The sqlite3_initialize() interface is threadsafe, but sqlite3_shutdown()
++** is not.  The sqlite3_shutdown() interface must only be called from a
++** single thread.  All open [database connections] must be closed and all
++** other SQLite resources must be deallocated prior to invoking
++** sqlite3_shutdown().
++**
++** Among other things, ^sqlite3_initialize() will invoke
++** sqlite3_os_init().  Similarly, ^sqlite3_shutdown()
++** will invoke sqlite3_os_end().
++**
++** ^The sqlite3_initialize() routine returns [SQLITE_OK] on success.
++** ^If for some reason, sqlite3_initialize() is unable to initialize
++** the library (perhaps it is unable to allocate a needed resource such
++** as a mutex) it returns an [error code] other than [SQLITE_OK].
++**
++** ^The sqlite3_initialize() routine is called internally by many other
++** SQLite interfaces so that an application usually does not need to
++** invoke sqlite3_initialize() directly.  For example, [sqlite3_open()]
++** calls sqlite3_initialize() so the SQLite library will be automatically
++** initialized when [sqlite3_open()] is called if it has not be initialized
++** already.  ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
++** compile-time option, then the automatic calls to sqlite3_initialize()
++** are omitted and the application must call sqlite3_initialize() directly
++** prior to using any other SQLite interface.  For maximum portability,
++** it is recommended that applications always invoke sqlite3_initialize()
++** directly prior to using any other SQLite interface.  Future releases
++** of SQLite may require this.  In other words, the behavior exhibited
++** when SQLite is compiled with [SQLITE_OMIT_AUTOINIT] might become the
++** default behavior in some future release of SQLite.
++**
++** The sqlite3_os_init() routine does operating-system specific
++** initialization of the SQLite library.  The sqlite3_os_end()
++** routine undoes the effect of sqlite3_os_init().  Typical tasks
++** performed by these routines include allocation or deallocation
++** of static resources, initialization of global variables,
++** setting up a default [sqlite3_vfs] module, or setting up
++** a default configuration using [sqlite3_config()].
++**
++** The application should never invoke either sqlite3_os_init()
++** or sqlite3_os_end() directly.  The application should only invoke
++** sqlite3_initialize() and sqlite3_shutdown().  The sqlite3_os_init()
++** interface is called automatically by sqlite3_initialize() and
++** sqlite3_os_end() is called by sqlite3_shutdown().  Appropriate
++** implementations for sqlite3_os_init() and sqlite3_os_end()
++** are built into SQLite when it is compiled for Unix, Windows, or OS/2.
++** When [custom builds | built for other platforms]
++** (using the [SQLITE_OS_OTHER=1] compile-time
++** option) the application must supply a suitable implementation for
++** sqlite3_os_init() and sqlite3_os_end().  An application-supplied
++** implementation of sqlite3_os_init() or sqlite3_os_end()
++** must return [SQLITE_OK] on success and some other [error code] upon
++** failure.
++*/
++SQLITE_API int sqlite3_initialize(void);
++SQLITE_API int sqlite3_shutdown(void);
++SQLITE_API int sqlite3_os_init(void);
++SQLITE_API int sqlite3_os_end(void);
++
++/*
++** CAPI3REF: Configuring The SQLite Library
++**
++** The sqlite3_config() interface is used to make global configuration
++** changes to SQLite in order to tune SQLite to the specific needs of
++** the application.  The default configuration is recommended for most
++** applications and so this routine is usually not necessary.  It is
++** provided to support rare applications with unusual needs.
++**
++** The sqlite3_config() interface is not threadsafe. The application
++** must ensure that no other SQLite interfaces are invoked by other
++** threads while sqlite3_config() is running.
++**
++** The first argument to sqlite3_config() is an integer
++** [configuration option] that determines
++** what property of SQLite is to be configured.  Subsequent arguments
++** vary depending on the [configuration option]
++** in the first argument.
++**
++** For most configuration options, the sqlite3_config() interface
++** may only be invoked prior to library initialization using
++** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
++** The exceptional configuration options that may be invoked at any time
++** are called "anytime configuration options".
++** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
++** [sqlite3_shutdown()] with a first argument that is not an anytime
++** configuration option, then the sqlite3_config() call will return SQLITE_MISUSE.
++** Note, however, that ^sqlite3_config() can be called as part of the
++** implementation of an application-defined [sqlite3_os_init()].
++**
++** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
++** ^If the option is unknown or SQLite is unable to set the option
++** then this routine returns a non-zero [error code].
++*/
++SQLITE_API int sqlite3_config(int, ...);
++
++/*
++** CAPI3REF: Configure database connections
++** METHOD: sqlite3
++**
++** The sqlite3_db_config() interface is used to make configuration
++** changes to a [database connection].  The interface is similar to
++** [sqlite3_config()] except that the changes apply to a single
++** [database connection] (specified in the first argument).
++**
++** The second argument to sqlite3_db_config(D,V,...)  is the
++** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
++** that indicates what aspect of the [database connection] is being configured.
++** Subsequent arguments vary depending on the configuration verb.
++**
++** ^Calls to sqlite3_db_config() return SQLITE_OK if and only if
++** the call is considered successful.
++*/
++SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
++
++/*
++** CAPI3REF: Memory Allocation Routines
++**
++** An instance of this object defines the interface between SQLite
++** and low-level memory allocation routines.
++**
++** This object is used in only one place in the SQLite interface.
++** A pointer to an instance of this object is the argument to
++** [sqlite3_config()] when the configuration option is
++** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
++** By creating an instance of this object
++** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
++** during configuration, an application can specify an alternative
++** memory allocation subsystem for SQLite to use for all of its
++** dynamic memory needs.
++**
++** Note that SQLite comes with several [built-in memory allocators]
++** that are perfectly adequate for the overwhelming majority of applications
++** and that this object is only useful to a tiny minority of applications
++** with specialized memory allocation requirements.  This object is
++** also used during testing of SQLite in order to specify an alternative
++** memory allocator that simulates memory out-of-memory conditions in
++** order to verify that SQLite recovers gracefully from such
++** conditions.
++**
++** The xMalloc, xRealloc, and xFree methods must work like the
++** malloc(), realloc() and free() functions from the standard C library.
++** ^SQLite guarantees that the second argument to
++** xRealloc is always a value returned by a prior call to xRoundup.
++**
++** xSize should return the allocated size of a memory allocation
++** previously obtained from xMalloc or xRealloc.  The allocated size
++** is always at least as big as the requested size but may be larger.
++**
++** The xRoundup method returns what would be the allocated size of
++** a memory allocation given a particular requested size.  Most memory
++** allocators round up memory allocations at least to the next multiple
++** of 8.  Some allocators round up to a larger multiple or to a power of 2.
++** Every memory allocation request coming in through [sqlite3_malloc()]
++** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0,
++** that causes the corresponding memory allocation to fail.
++**
++** The xInit method initializes the memory allocator.  For example,
++** it might allocate any required mutexes or initialize internal data
++** structures.  The xShutdown method is invoked (indirectly) by
++** [sqlite3_shutdown()] and should deallocate any resources acquired
++** by xInit.  The pAppData pointer is used as the only parameter to
++** xInit and xShutdown.
++**
++** SQLite holds the [SQLITE_MUTEX_STATIC_MAIN] mutex when it invokes
++** the xInit method, so the xInit method need not be threadsafe.  The
++** xShutdown method is only called from [sqlite3_shutdown()] so it does
++** not need to be threadsafe either.  For all other methods, SQLite
++** holds the [SQLITE_MUTEX_STATIC_MEM] mutex as long as the
++** [SQLITE_CONFIG_MEMSTATUS] configuration option is turned on (which
++** it is by default) and so the methods are automatically serialized.
++** However, if [SQLITE_CONFIG_MEMSTATUS] is disabled, then the other
++** methods must be threadsafe or else make their own arrangements for
++** serialization.
++**
++** SQLite will never invoke xInit() more than once without an intervening
++** call to xShutdown().
++*/
++typedef struct sqlite3_mem_methods sqlite3_mem_methods;
++struct sqlite3_mem_methods {
++  void *(*xMalloc)(int);         /* Memory allocation function */
++  void (*xFree)(void*);          /* Free a prior allocation */
++  void *(*xRealloc)(void*,int);  /* Resize an allocation */
++  int (*xSize)(void*);           /* Return the size of an allocation */
++  int (*xRoundup)(int);          /* Round up request size to allocation size */
++  int (*xInit)(void*);           /* Initialize the memory allocator */
++  void (*xShutdown)(void*);      /* Deinitialize the memory allocator */
++  void *pAppData;                /* Argument to xInit() and xShutdown() */
++};
++
++/*
++** CAPI3REF: Configuration Options
++** KEYWORDS: {configuration option}
++**
++** These constants are the available integer configuration options that
++** can be passed as the first argument to the [sqlite3_config()] interface.
++**
++** Most of the configuration options for sqlite3_config()
++** will only work if invoked prior to [sqlite3_initialize()] or after
++** [sqlite3_shutdown()].  The few exceptions to this rule are called
++** "anytime configuration options".
++** ^Calling [sqlite3_config()] with a first argument that is not an
++** anytime configuration option in between calls to [sqlite3_initialize()] and
++** [sqlite3_shutdown()] is a no-op that returns SQLITE_MISUSE.
++**
++** The set of anytime configuration options can change (by insertions
++** and/or deletions) from one release of SQLite to the next.
++** As of SQLite version 3.42.0, the complete set of anytime configuration
++** options is:
++** 
        
++** 
      •  SQLITE_CONFIG_LOG
++** 
      •  SQLITE_CONFIG_PCACHE_HDRSZ
++** 
      
++**
++** New configuration options may be added in future releases of SQLite.
++** Existing configuration options might be discontinued.  Applications
++** should check the return code from [sqlite3_config()] to make sure that
++** the call worked.  The [sqlite3_config()] interface will return a
++** non-zero [error code] if a discontinued or unsupported configuration option
++** is invoked.
++**
++** 
      
++** [[SQLITE_CONFIG_SINGLETHREAD]] 
      SQLITE_CONFIG_SINGLETHREAD
      
++** 
      There are no arguments to this option.  ^This option sets the
++** [threading mode] to Single-thread.  In other words, it disables
++** all mutexing and puts SQLite into a mode where it can only be used
++** by a single thread.   ^If SQLite is compiled with
++** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
++** it is not possible to change the [threading mode] from its default
++** value of Single-thread and so [sqlite3_config()] will return
++** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD
++** configuration option.
      
++**
++** [[SQLITE_CONFIG_MULTITHREAD]] 
      SQLITE_CONFIG_MULTITHREAD
      
++** 
      There are no arguments to this option.  ^This option sets the
++** [threading mode] to Multi-thread.  In other words, it disables
++** mutexing on [database connection] and [prepared statement] objects.
++** The application is responsible for serializing access to
++** [database connections] and [prepared statements].  But other mutexes
++** are enabled so that SQLite will be safe to use in a multi-threaded
++** environment as long as no two threads attempt to use the same
++** [database connection] at the same time.  ^If SQLite is compiled with
++** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
++** it is not possible to set the Multi-thread [threading mode] and
++** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
++** SQLITE_CONFIG_MULTITHREAD configuration option.
      
++**
++** [[SQLITE_CONFIG_SERIALIZED]] 
      SQLITE_CONFIG_SERIALIZED
      
++** 
      There are no arguments to this option.  ^This option sets the
++** [threading mode] to Serialized. In other words, this option enables
++** all mutexes including the recursive
++** mutexes on [database connection] and [prepared statement] objects.
++** In this mode (which is the default when SQLite is compiled with
++** [SQLITE_THREADSAFE=1]) the SQLite library will itself serialize access
++** to [database connections] and [prepared statements] so that the
++** application is free to use the same [database connection] or the
++** same [prepared statement] in different threads at the same time.
++** ^If SQLite is compiled with
++** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
++** it is not possible to set the Serialized [threading mode] and
++** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
++** SQLITE_CONFIG_SERIALIZED configuration option.
      
++**
++** [[SQLITE_CONFIG_MALLOC]] 
      SQLITE_CONFIG_MALLOC
      
++** 
       ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is
++** a pointer to an instance of the [sqlite3_mem_methods] structure.
++** The argument specifies
++** alternative low-level memory allocation routines to be used in place of
++** the memory allocation routines built into SQLite.)^ ^SQLite makes
++** its own private copy of the content of the [sqlite3_mem_methods] structure
++** before the [sqlite3_config()] call returns.
      
++**
++** [[SQLITE_CONFIG_GETMALLOC]] 
      SQLITE_CONFIG_GETMALLOC
      
++** 
       ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
++** is a pointer to an instance of the [sqlite3_mem_methods] structure.
++** The [sqlite3_mem_methods]
++** structure is filled with the currently defined memory allocation routines.)^
++** This option can be used to overload the default memory allocation
++** routines with a wrapper that simulations memory allocation failure or
++** tracks memory usage, for example. 
      
++**
++** [[SQLITE_CONFIG_SMALL_MALLOC]] 
      SQLITE_CONFIG_SMALL_MALLOC
      
++** 
       ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
++** type int, interpreted as a boolean, which if true provides a hint to
++** SQLite that it should avoid large memory allocations if possible.
++** SQLite will run faster if it is free to make large memory allocations,
++** but some application might prefer to run slower in exchange for
++** guarantees about memory fragmentation that are possible if large
++** allocations are avoided.  This hint is normally off.
++** 
      
++**
++** [[SQLITE_CONFIG_MEMSTATUS]] 
      SQLITE_CONFIG_MEMSTATUS
      
++** 
       ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
++** interpreted as a boolean, which enables or disables the collection of
++** memory allocation statistics. ^(When memory allocation statistics are
++** disabled, the following SQLite interfaces become non-operational:
++**   
        
++**   
      •  [sqlite3_hard_heap_limit64()]
++**   
      •  [sqlite3_memory_used()]
++**   
      •  [sqlite3_memory_highwater()]
++**   
      •  [sqlite3_soft_heap_limit64()]
++**   
      •  [sqlite3_status64()]
++**   
      )^
++** ^Memory allocation statistics are enabled by default unless SQLite is
++** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
++** allocation statistics are disabled by default.
++** 
      
++**
++** [[SQLITE_CONFIG_SCRATCH]] 
      SQLITE_CONFIG_SCRATCH
      
++** 
       The SQLITE_CONFIG_SCRATCH option is no longer used.
++** 
      
++**
++** [[SQLITE_CONFIG_PAGECACHE]] 
      SQLITE_CONFIG_PAGECACHE
      
++** 
       ^The SQLITE_CONFIG_PAGECACHE option specifies a memory pool
++** that SQLite can use for the database page cache with the default page
++** cache implementation.
++** This configuration option is a no-op if an application-defined page
++** cache implementation is loaded using the [SQLITE_CONFIG_PCACHE2].
++** ^There are three arguments to SQLITE_CONFIG_PAGECACHE: A pointer to
++** 8-byte aligned memory (pMem), the size of each page cache line (sz),
++** and the number of cache lines (N).
++** The sz argument should be the size of the largest database page
++** (a power of two between 512 and 65536) plus some extra bytes for each
++** page header.  ^The number of extra bytes needed by the page header
++** can be determined using [SQLITE_CONFIG_PCACHE_HDRSZ].
++** ^It is harmless, apart from the wasted memory,
++** for the sz parameter to be larger than necessary.  The pMem
++** argument must be either a NULL pointer or a pointer to an 8-byte
++** aligned block of memory of at least sz*N bytes, otherwise
++** subsequent behavior is undefined.
++** ^When pMem is not NULL, SQLite will strive to use the memory provided
++** to satisfy page cache needs, falling back to [sqlite3_malloc()] if
++** a page cache line is larger than sz bytes or if all of the pMem buffer
++** is exhausted.
++** ^If pMem is NULL and N is non-zero, then each database connection
++** does an initial bulk allocation for page cache memory
++** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
++** of -1024*N bytes if N is negative, . ^If additional
++** page cache memory is needed beyond what is provided by the initial
++** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
++** additional cache line. 
      
++**
++** [[SQLITE_CONFIG_HEAP]] 
      SQLITE_CONFIG_HEAP
      
++** 
       ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
++** that SQLite will use for all of its dynamic memory allocation needs
++** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
++** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
++** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
++** [SQLITE_ERROR] if invoked otherwise.
++** ^There are three arguments to SQLITE_CONFIG_HEAP:
++** An 8-byte aligned pointer to the memory,
++** the number of bytes in the memory buffer, and the minimum allocation size.
++** ^If the first pointer (the memory pointer) is NULL, then SQLite reverts
++** to using its default memory allocator (the system malloc() implementation),
++** undoing any prior invocation of [SQLITE_CONFIG_MALLOC].  ^If the
++** memory pointer is not NULL then the alternative memory
++** allocator is engaged to handle all of SQLites memory allocation needs.
++** The first pointer (the memory pointer) must be aligned to an 8-byte
++** boundary or subsequent behavior of SQLite will be undefined.
++** The minimum allocation size is capped at 2**12. Reasonable values
++** for the minimum allocation size are 2**5 through 2**8.
      
++**
++** [[SQLITE_CONFIG_MUTEX]] 
      SQLITE_CONFIG_MUTEX
      
++** 
       ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
++** pointer to an instance of the [sqlite3_mutex_methods] structure.
++** The argument specifies alternative low-level mutex routines to be used
++** in place the mutex routines built into SQLite.)^  ^SQLite makes a copy of
++** the content of the [sqlite3_mutex_methods] structure before the call to
++** [sqlite3_config()] returns. ^If SQLite is compiled with
++** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
++** the entire mutexing subsystem is omitted from the build and hence calls to
++** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
++** return [SQLITE_ERROR].
      
++**
++** [[SQLITE_CONFIG_GETMUTEX]] 
      SQLITE_CONFIG_GETMUTEX
      
++** 
       ^(The SQLITE_CONFIG_GETMUTEX option takes a single argument which
++** is a pointer to an instance of the [sqlite3_mutex_methods] structure.  The
++** [sqlite3_mutex_methods]
++** structure is filled with the currently defined mutex routines.)^
++** This option can be used to overload the default mutex allocation
++** routines with a wrapper used to track mutex usage for performance
++** profiling or testing, for example.   ^If SQLite is compiled with
++** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
++** the entire mutexing subsystem is omitted from the build and hence calls to
++** [sqlite3_config()] with the SQLITE_CONFIG_GETMUTEX configuration option will
++** return [SQLITE_ERROR].
      
++**
++** [[SQLITE_CONFIG_LOOKASIDE]] 
      SQLITE_CONFIG_LOOKASIDE
      
++** 
       ^(The SQLITE_CONFIG_LOOKASIDE option takes two arguments that determine
++** the default size of lookaside memory on each [database connection].
++** The first argument is the
++** size of each lookaside buffer slot and the second is the number of
++** slots allocated to each database connection.)^  ^(SQLITE_CONFIG_LOOKASIDE
++** sets the default lookaside size. The [SQLITE_DBCONFIG_LOOKASIDE]
++** option to [sqlite3_db_config()] can be used to change the lookaside
++** configuration on individual connections.)^ 
      
++**
++** [[SQLITE_CONFIG_PCACHE2]] 
      SQLITE_CONFIG_PCACHE2
      
++** 
       ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is
++** a pointer to an [sqlite3_pcache_methods2] object.  This object specifies
++** the interface to a custom page cache implementation.)^
++** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.
      
++**
++** [[SQLITE_CONFIG_GETPCACHE2]] 
      SQLITE_CONFIG_GETPCACHE2
      
++** 
       ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
++** is a pointer to an [sqlite3_pcache_methods2] object.  SQLite copies of
++** the current page cache implementation into that object.)^ 
      
++**
++** [[SQLITE_CONFIG_LOG]] 
      SQLITE_CONFIG_LOG
      
++** 
       The SQLITE_CONFIG_LOG option is used to configure the SQLite
++** global [error log].
++** (^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a
++** function with a call signature of void(*)(void*,int,const char*),
++** and a pointer to void. ^If the function pointer is not NULL, it is
++** invoked by [sqlite3_log()] to process each logging event.  ^If the
++** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op.
++** ^The void pointer that is the second argument to SQLITE_CONFIG_LOG is
++** passed through as the first parameter to the application-defined logger
++** function whenever that function is invoked.  ^The second parameter to
++** the logger function is a copy of the first parameter to the corresponding
++** [sqlite3_log()] call and is intended to be a [result code] or an
++** [extended result code].  ^The third parameter passed to the logger is
++** log message after formatting via [sqlite3_snprintf()].
++** The SQLite logging interface is not reentrant; the logger function
++** supplied by the application must not invoke any SQLite interface.
++** In a multi-threaded application, the application-defined logger
++** function must be threadsafe. 
      
++**
++** [[SQLITE_CONFIG_URI]] 
      SQLITE_CONFIG_URI
++** 
      ^(The SQLITE_CONFIG_URI option takes a single argument of type int.
++** If non-zero, then URI handling is globally enabled. If the parameter is zero,
++** then URI handling is globally disabled.)^ ^If URI handling is globally
++** enabled, all filenames passed to [sqlite3_open()], [sqlite3_open_v2()],
++** [sqlite3_open16()] or
++** specified as part of [ATTACH] commands are interpreted as URIs, regardless
++** of whether or not the [SQLITE_OPEN_URI] flag is set when the database
++** connection is opened. ^If it is globally disabled, filenames are
++** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the
++** database connection is opened. ^(By default, URI handling is globally
++** disabled. The default value may be changed by compiling with the
++** [SQLITE_USE_URI] symbol defined.)^
++**
++** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] 
      SQLITE_CONFIG_COVERING_INDEX_SCAN
++** 
      ^The SQLITE_CONFIG_COVERING_INDEX_SCAN option takes a single integer
++** argument which is interpreted as a boolean in order to enable or disable
++** the use of covering indices for full table scans in the query optimizer.
++** ^The default setting is determined
++** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
++** if that compile-time option is omitted.
++** The ability to disable the use of covering indices for full table scans
++** is because some incorrectly coded legacy applications might malfunction
++** when the optimization is enabled.  Providing the ability to
++** disable the optimization allows the older, buggy application code to work
++** without change even with newer versions of SQLite.
++**
++** [[SQLITE_CONFIG_PCACHE]] [[SQLITE_CONFIG_GETPCACHE]]
++** 
      SQLITE_CONFIG_PCACHE and SQLITE_CONFIG_GETPCACHE
++** 
       These options are obsolete and should not be used by new code.
++** They are retained for backwards compatibility but are now no-ops.
++** 
      
++**
++** [[SQLITE_CONFIG_SQLLOG]]
++** 
      SQLITE_CONFIG_SQLLOG
++** 
      This option is only available if sqlite is compiled with the
++** [SQLITE_ENABLE_SQLLOG] pre-processor macro defined. The first argument should
++** be a pointer to a function of type void(*)(void*,sqlite3*,const char*, int).
++** The second should be of type (void*). The callback is invoked by the library
++** in three separate circumstances, identified by the value passed as the
++** fourth parameter. If the fourth parameter is 0, then the database connection
++** passed as the second argument has just been opened. The third argument
++** points to a buffer containing the name of the main database file. If the
++** fourth parameter is 1, then the SQL statement that the third parameter
++** points to has just been executed. Or, if the fourth parameter is 2, then
++** the connection being passed as the second parameter is being closed. The
++** third parameter is passed NULL In this case.  An example of using this
++** configuration option can be seen in the "test_sqllog.c" source file in
++** the canonical SQLite source tree.
      
++**
++** [[SQLITE_CONFIG_MMAP_SIZE]]
++** 
      SQLITE_CONFIG_MMAP_SIZE
++** 
      ^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
++** that are the default mmap size limit (the default setting for
++** [PRAGMA mmap_size]) and the maximum allowed mmap size limit.
++** ^The default setting can be overridden by each database connection using
++** either the [PRAGMA mmap_size] command, or by using the
++** [SQLITE_FCNTL_MMAP_SIZE] file control.  ^(The maximum allowed mmap size
++** will be silently truncated if necessary so that it does not exceed the
++** compile-time maximum mmap size set by the
++** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
++** ^If either argument to this option is negative, then that argument is
++** changed to its compile-time default.
++**
++** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
++** 
      SQLITE_CONFIG_WIN32_HEAPSIZE
++** 
      ^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
++** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
++** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
++** that specifies the maximum size of the created heap.
++**
++** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
++** 
      SQLITE_CONFIG_PCACHE_HDRSZ
++** 
      ^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
++** is a pointer to an integer and writes into that integer the number of extra
++** bytes per page required for each page in [SQLITE_CONFIG_PAGECACHE].
++** The amount of extra space required can change depending on the compiler,
++** target platform, and SQLite version.
++**
++** [[SQLITE_CONFIG_PMASZ]]
++** 
      SQLITE_CONFIG_PMASZ
++** 
      ^The SQLITE_CONFIG_PMASZ option takes a single parameter which
++** is an unsigned integer and sets the "Minimum PMA Size" for the multithreaded
++** sorter to that integer.  The default minimum PMA Size is set by the
++** [SQLITE_SORTER_PMASZ] compile-time option.  New threads are launched
++** to help with sort operations when multithreaded sorting
++** is enabled (using the [PRAGMA threads] command) and the amount of content
++** to be sorted exceeds the page size times the minimum of the
++** [PRAGMA cache_size] setting and this value.
++**
++** [[SQLITE_CONFIG_STMTJRNL_SPILL]]
++** 
      SQLITE_CONFIG_STMTJRNL_SPILL
++** 
      ^The SQLITE_CONFIG_STMTJRNL_SPILL option takes a single parameter which
++** becomes the [statement journal] spill-to-disk threshold.
++** [Statement journals] are held in memory until their size (in bytes)
++** exceeds this threshold, at which point they are written to disk.
++** Or if the threshold is -1, statement journals are always held
++** exclusively in memory.
++** Since many statement journals never become large, setting the spill
++** threshold to a value such as 64KiB can greatly reduce the amount of
++** I/O required to support statement rollback.
++** The default value for this setting is controlled by the
++** [SQLITE_STMTJRNL_SPILL] compile-time option.
++**
++** [[SQLITE_CONFIG_SORTERREF_SIZE]]
++** 
      SQLITE_CONFIG_SORTERREF_SIZE
++** 
      The SQLITE_CONFIG_SORTERREF_SIZE option accepts a single parameter
++** of type (int) - the new value of the sorter-reference size threshold.
++** Usually, when SQLite uses an external sort to order records according
++** to an ORDER BY clause, all fields required by the caller are present in the
++** sorted records. However, if SQLite determines based on the declared type
++** of a table column that its values are likely to be very large - larger
++** than the configured sorter-reference size threshold - then a reference
++** is stored in each sorted record and the required column values loaded
++** from the database as records are returned in sorted order. The default
++** value for this option is to never use this optimization. Specifying a
++** negative value for this option restores the default behavior.
++** This option is only available if SQLite is compiled with the
++** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
++**
++** [[SQLITE_CONFIG_MEMDB_MAXSIZE]]
++** 
      SQLITE_CONFIG_MEMDB_MAXSIZE
++** 
      The SQLITE_CONFIG_MEMDB_MAXSIZE option accepts a single parameter
++** [sqlite3_int64] parameter which is the default maximum size for an in-memory
++** database created using [sqlite3_deserialize()].  This default maximum
++** size can be adjusted up or down for individual databases using the
++** [SQLITE_FCNTL_SIZE_LIMIT] [sqlite3_file_control|file-control].  If this
++** configuration setting is never used, then the default maximum is determined
++** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
++** compile-time option is not set, then the default maximum is 1073741824.
++** 
      
++*/
++#define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
++#define SQLITE_CONFIG_MULTITHREAD          2  /* nil */
++#define SQLITE_CONFIG_SERIALIZED           3  /* nil */
++#define SQLITE_CONFIG_MALLOC               4  /* sqlite3_mem_methods* */
++#define SQLITE_CONFIG_GETMALLOC            5  /* sqlite3_mem_methods* */
++#define SQLITE_CONFIG_SCRATCH              6  /* No longer used */
++#define SQLITE_CONFIG_PAGECACHE            7  /* void*, int sz, int N */
++#define SQLITE_CONFIG_HEAP                 8  /* void*, int nByte, int min */
++#define SQLITE_CONFIG_MEMSTATUS            9  /* boolean */
++#define SQLITE_CONFIG_MUTEX               10  /* sqlite3_mutex_methods* */
++#define SQLITE_CONFIG_GETMUTEX            11  /* sqlite3_mutex_methods* */
++/* previously SQLITE_CONFIG_CHUNKALLOC    12 which is now unused. */
++#define SQLITE_CONFIG_LOOKASIDE           13  /* int int */
++#define SQLITE_CONFIG_PCACHE              14  /* no-op */
++#define SQLITE_CONFIG_GETPCACHE           15  /* no-op */
++#define SQLITE_CONFIG_LOG                 16  /* xFunc, void* */
++#define SQLITE_CONFIG_URI                 17  /* int */
++#define SQLITE_CONFIG_PCACHE2             18  /* sqlite3_pcache_methods2* */
++#define SQLITE_CONFIG_GETPCACHE2          19  /* sqlite3_pcache_methods2* */
++#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
++#define SQLITE_CONFIG_SQLLOG              21  /* xSqllog, void* */
++#define SQLITE_CONFIG_MMAP_SIZE           22  /* sqlite3_int64, sqlite3_int64 */
++#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
++#define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
++#define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
++#define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
++#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
++#define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
++#define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
++
++/*
++** CAPI3REF: Database Connection Configuration Options
++**
++** These constants are the available integer configuration options that
++** can be passed as the second argument to the [sqlite3_db_config()] interface.
++**
++** New configuration options may be added in future releases of SQLite.
++** Existing configuration options might be discontinued.  Applications
++** should check the return code from [sqlite3_db_config()] to make sure that
++** the call worked.  ^The [sqlite3_db_config()] interface will return a
++** non-zero [error code] if a discontinued or unsupported configuration option
++** is invoked.
++**
++** 
      
++** [[SQLITE_DBCONFIG_LOOKASIDE]]
++** 
      SQLITE_DBCONFIG_LOOKASIDE
      
++** 
       ^This option takes three additional arguments that determine the
++** [lookaside memory allocator] configuration for the [database connection].
++** ^The first argument (the third parameter to [sqlite3_db_config()] is a
++** pointer to a memory buffer to use for lookaside memory.
++** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb
++** may be NULL in which case SQLite will allocate the
++** lookaside buffer itself using [sqlite3_malloc()]. ^The second argument is the
++** size of each lookaside buffer slot.  ^The third argument is the number of
++** slots.  The size of the buffer in the first argument must be greater than
++** or equal to the product of the second and third arguments.  The buffer
++** must be aligned to an 8-byte boundary.  ^If the second argument to
++** SQLITE_DBCONFIG_LOOKASIDE is not a multiple of 8, it is internally
++** rounded down to the next smaller multiple of 8.  ^(The lookaside memory
++** configuration for a database connection can only be changed when that
++** connection is not currently using lookaside memory, or in other words
++** when the "current value" returned by
++** [sqlite3_db_status](D,[SQLITE_DBSTATUS_LOOKASIDE_USED],...) is zero.
++** Any attempt to change the lookaside memory configuration when lookaside
++** memory is in use leaves the configuration unchanged and returns
++** [SQLITE_BUSY].)^
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_FKEY]]
++** 
      SQLITE_DBCONFIG_ENABLE_FKEY
      
++** 
       ^This option is used to enable or disable the enforcement of
++** [foreign key constraints].  There should be two additional arguments.
++** The first argument is an integer which is 0 to disable FK enforcement,
++** positive to enable FK enforcement or negative to leave FK enforcement
++** unchanged.  The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether FK enforcement is off or on
++** following this call.  The second parameter may be a NULL pointer, in
++** which case the FK enforcement setting is not reported back. 
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_TRIGGER]]
++** 
      SQLITE_DBCONFIG_ENABLE_TRIGGER
      
++** 
       ^This option is used to enable or disable [CREATE TRIGGER | triggers].
++** There should be two additional arguments.
++** The first argument is an integer which is 0 to disable triggers,
++** positive to enable triggers or negative to leave the setting unchanged.
++** The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether triggers are disabled or enabled
++** following this call.  The second parameter may be a NULL pointer, in
++** which case the trigger setting is not reported back.
++**
++** 
      Originally this option disabled all triggers.  ^(However, since
++** SQLite version 3.35.0, TEMP triggers are still allowed even if
++** this option is off.  So, in other words, this option now only disables
++** triggers in the main database schema or in the schemas of ATTACH-ed
++** databases.)^ 
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_VIEW]]
++** 
      SQLITE_DBCONFIG_ENABLE_VIEW
      
++** 
       ^This option is used to enable or disable [CREATE VIEW | views].
++** There should be two additional arguments.
++** The first argument is an integer which is 0 to disable views,
++** positive to enable views or negative to leave the setting unchanged.
++** The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether views are disabled or enabled
++** following this call.  The second parameter may be a NULL pointer, in
++** which case the view setting is not reported back.
++**
++** 
      Originally this option disabled all views.  ^(However, since
++** SQLite version 3.35.0, TEMP views are still allowed even if
++** this option is off.  So, in other words, this option now only disables
++** views in the main database schema or in the schemas of ATTACH-ed
++** databases.)^ 
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER]]
++** 
      SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
      
++** 
       ^This option is used to enable or disable the
++** [fts3_tokenizer()] function which is part of the
++** [FTS3] full-text search engine extension.
++** There should be two additional arguments.
++** The first argument is an integer which is 0 to disable fts3_tokenizer() or
++** positive to enable fts3_tokenizer() or negative to leave the setting
++** unchanged.
++** The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
++** following this call.  The second parameter may be a NULL pointer, in
++** which case the new setting is not reported back. 
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION]]
++** 
      SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION
      
++** 
       ^This option is used to enable or disable the [sqlite3_load_extension()]
++** interface independently of the [load_extension()] SQL function.
++** The [sqlite3_enable_load_extension()] API enables or disables both the
++** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
++** There should be two additional arguments.
++** When the first argument to this interface is 1, then only the C-API is
++** enabled and the SQL function remains disabled.  If the first argument to
++** this interface is 0, then both the C-API and the SQL function are disabled.
++** If the first argument is -1, then no changes are made to state of either the
++** C-API or the SQL function.
++** The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
++** is disabled or enabled following this call.  The second parameter may
++** be a NULL pointer, in which case the new setting is not reported back.
++** 
      
++**
++** [[SQLITE_DBCONFIG_MAINDBNAME]] 
      SQLITE_DBCONFIG_MAINDBNAME
      
++** 
       ^This option is used to change the name of the "main" database
++** schema.  ^The sole argument is a pointer to a constant UTF8 string
++** which will become the new schema name in place of "main".  ^SQLite
++** does not make a copy of the new main schema name string, so the application
++** must ensure that the argument passed into this DBCONFIG option is unchanged
++** until after the database connection closes.
++** 
      
++**
++** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]
++** 
      SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE
      
++** 
       Usually, when a database in wal mode is closed or detached from a
++** database handle, SQLite checks if this will mean that there are now no
++** connections at all to the database. If so, it performs a checkpoint
++** operation before closing the connection. This option may be used to
++** override this behavior. The first parameter passed to this operation
++** is an integer - positive to disable checkpoints-on-close, or zero (the
++** default) to enable them, and negative to leave the setting unchanged.
++** The second parameter is a pointer to an integer
++** into which is written 0 or 1 to indicate whether checkpoints-on-close
++** have been disabled - 0 if they are not disabled, 1 if they are.
++** 
      
++**
++** [[SQLITE_DBCONFIG_ENABLE_QPSG]] 
      SQLITE_DBCONFIG_ENABLE_QPSG
      
++** 
      ^(The SQLITE_DBCONFIG_ENABLE_QPSG option activates or deactivates
++** the [query planner stability guarantee] (QPSG).  When the QPSG is active,
++** a single SQL query statement will always use the same algorithm regardless
++** of values of [bound parameters].)^ The QPSG disables some query optimizations
++** that look at the values of bound parameters, which can make some queries
++** slower.  But the QPSG has the advantage of more predictable behavior.  With
++** the QPSG active, SQLite will always use the same query plan in the field as
++** was used during testing in the lab.
++** The first argument to this setting is an integer which is 0 to disable
++** the QPSG, positive to enable QPSG, or negative to leave the setting
++** unchanged. The second parameter is a pointer to an integer into which
++** is written 0 or 1 to indicate whether the QPSG is disabled or enabled
++** following this call.
++** 
      
++**
++** [[SQLITE_DBCONFIG_TRIGGER_EQP]] 
      SQLITE_DBCONFIG_TRIGGER_EQP
      
++** 
       By default, the output of EXPLAIN QUERY PLAN commands does not
++** include output for any operations performed by trigger programs. This
++** option is used to set or clear (the default) a flag that governs this
++** behavior. The first parameter passed to this operation is an integer -
++** positive to enable output for trigger programs, or zero to disable it,
++** or negative to leave the setting unchanged.
++** The second parameter is a pointer to an integer into which is written
++** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if
++** it is not disabled, 1 if it is.
++** 
      
++**
++** [[SQLITE_DBCONFIG_RESET_DATABASE]] 
      SQLITE_DBCONFIG_RESET_DATABASE
      
++** 
       Set the SQLITE_DBCONFIG_RESET_DATABASE flag and then run
++** [VACUUM] in order to reset a database back to an empty database
++** with no schema and no content. The following process works even for
++** a badly corrupted database file:
++** 
        
++** 
      1.  If the database connection is newly opened, make sure it has read the
++**      database schema by preparing then discarding some query against the
++**      database, or calling sqlite3_table_column_metadata(), ignoring any
++**      errors.  This step is only necessary if the application desires to keep
++**      the database in WAL mode after the reset if it was in WAL mode before
++**      the reset.
++** 
      2.  sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
++** 
      3.  [sqlite3_exec](db, "[VACUUM]", 0, 0, 0);
++** 
      4.  sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
++** 
      
++** Because resetting a database is destructive and irreversible, the
++** process requires the use of this obscure API and multiple steps to
++** help ensure that it does not happen by accident. Because this
++** feature must be capable of resetting corrupt databases, and
++** shutting down virtual tables may require access to that corrupt
++** storage, the library must abandon any installed virtual tables
++** without calling their xDestroy() methods.
++**
++** [[SQLITE_DBCONFIG_DEFENSIVE]] 
      SQLITE_DBCONFIG_DEFENSIVE
      
++** 
      The SQLITE_DBCONFIG_DEFENSIVE option activates or deactivates the
++** "defensive" flag for a database connection.  When the defensive
++** flag is enabled, language features that allow ordinary SQL to
++** deliberately corrupt the database file are disabled.  The disabled
++** features include but are not limited to the following:
++** 
        
++** 
      •  The [PRAGMA writable_schema=ON] statement.
++** 
      •  The [PRAGMA journal_mode=OFF] statement.
++** 
      •  The [PRAGMA schema_version=N] statement.
++** 
      •  Writes to the [sqlite_dbpage] virtual table.
++** 
      •  Direct writes to [shadow tables].
++** 
      
++** 
      
++**
++** [[SQLITE_DBCONFIG_WRITABLE_SCHEMA]] 
      SQLITE_DBCONFIG_WRITABLE_SCHEMA
      
++** 
      The SQLITE_DBCONFIG_WRITABLE_SCHEMA option activates or deactivates the
++** "writable_schema" flag. This has the same effect and is logically equivalent
++** to setting [PRAGMA writable_schema=ON] or [PRAGMA writable_schema=OFF].
++** The first argument to this setting is an integer which is 0 to disable
++** the writable_schema, positive to enable writable_schema, or negative to
++** leave the setting unchanged. The second parameter is a pointer to an
++** integer into which is written 0 or 1 to indicate whether the writable_schema
++** is enabled or disabled following this call.
++** 
      
++**
++** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
++** 
      SQLITE_DBCONFIG_LEGACY_ALTER_TABLE
      
++** 
      The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
++** the legacy behavior of the [ALTER TABLE RENAME] command such it
++** behaves as it did prior to [version 3.24.0] (2018-06-04).  See the
++** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
++** additional information. This feature can also be turned on and off
++** using the [PRAGMA legacy_alter_table] statement.
++** 
      
++**
++** [[SQLITE_DBCONFIG_DQS_DML]]
++** 
      SQLITE_DBCONFIG_DQS_DML
      
++** 
      The SQLITE_DBCONFIG_DQS_DML option activates or deactivates
++** the legacy [double-quoted string literal] misfeature for DML statements
++** only, that is DELETE, INSERT, SELECT, and UPDATE statements. The
++** default value of this setting is determined by the [-DSQLITE_DQS]
++** compile-time option.
++** 
      
++**
++** [[SQLITE_DBCONFIG_DQS_DDL]]
++** 
      SQLITE_DBCONFIG_DQS_DDL
      
++** 
      The SQLITE_DBCONFIG_DQS option activates or deactivates
++** the legacy [double-quoted string literal] misfeature for DDL statements,
++** such as CREATE TABLE and CREATE INDEX. The
++** default value of this setting is determined by the [-DSQLITE_DQS]
++** compile-time option.
++** 
      
++**
++** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]]
++** 
      SQLITE_DBCONFIG_TRUSTED_SCHEMA
      
++** 
      The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to
++** assume that database schemas are untainted by malicious content.
++** When the SQLITE_DBCONFIG_TRUSTED_SCHEMA option is disabled, SQLite
++** takes additional defensive steps to protect the application from harm
++** including:
++** 
        
++** 
      •  Prohibit the use of SQL functions inside triggers, views,
++** CHECK constraints, DEFAULT clauses, expression indexes,
++** partial indexes, or generated columns
++** unless those functions are tagged with [SQLITE_INNOCUOUS].
++** 
      •  Prohibit the use of virtual tables inside of triggers or views
++** unless those virtual tables are tagged with [SQLITE_VTAB_INNOCUOUS].
++** 
      
++** This setting defaults to "on" for legacy compatibility, however
++** all applications are advised to turn it off if possible. This setting
++** can also be controlled using the [PRAGMA trusted_schema] statement.
++** 
      
++**
++** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
++** 
      SQLITE_DBCONFIG_LEGACY_FILE_FORMAT
      
++** 
      The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
++** the legacy file format flag.  When activated, this flag causes all newly
++** created database file to have a schema format version number (the 4-byte
++** integer found at offset 44 into the database header) of 1.  This in turn
++** means that the resulting database file will be readable and writable by
++** any SQLite version back to 3.0.0 ([dateof:3.0.0]).  Without this setting,
++** newly created databases are generally not understandable by SQLite versions
++** prior to 3.3.0 ([dateof:3.3.0]).  As these words are written, there
++** is now scarcely any need to generate database files that are compatible
++** all the way back to version 3.0.0, and so this setting is of little
++** practical use, but is provided so that SQLite can continue to claim the
++** ability to generate new database files that are compatible with  version
++** 3.0.0.
++** 
      Note that when the SQLITE_DBCONFIG_LEGACY_FILE_FORMAT setting is on,
++** the [VACUUM] command will fail with an obscure error when attempting to
++** process a table with generated columns and a descending index.  This is
++** not considered a bug since SQLite versions 3.3.0 and earlier do not support
++** either generated columns or descending indexes.
++** 
      
++**
++** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]]
++** 
      SQLITE_DBCONFIG_STMT_SCANSTATUS
      
++** 
      The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in
++** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears
++** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
++** statistics. For statistics to be collected, the flag must be set on
++** the database handle both when the SQL statement is prepared and when it
++** is stepped. The flag is set (collection of statistics is enabled)
++** by default.  This option takes two arguments: an integer and a pointer to
++** an integer..  The first argument is 1, 0, or -1 to enable, disable, or
++** leave unchanged the statement scanstatus option.  If the second argument
++** is not NULL, then the value of the statement scanstatus setting after
++** processing the first argument is written into the integer that the second
++** argument points to.
++** 
      
++**
++** [[SQLITE_DBCONFIG_REVERSE_SCANORDER]]
++** 
      SQLITE_DBCONFIG_REVERSE_SCANORDER
      
++** 
      The SQLITE_DBCONFIG_REVERSE_SCANORDER option changes the default order
++** in which tables and indexes are scanned so that the scans start at the end
++** and work toward the beginning rather than starting at the beginning and
++** working toward the end. Setting SQLITE_DBCONFIG_REVERSE_SCANORDER is the
++** same as setting [PRAGMA reverse_unordered_selects].  This option takes
++** two arguments which are an integer and a pointer to an integer.  The first
++** argument is 1, 0, or -1 to enable, disable, or leave unchanged the
++** reverse scan order flag, respectively.  If the second argument is not NULL,
++** then 0 or 1 is written into the integer that the second argument points to
++** depending on if the reverse scan order flag is set after processing the
++** first argument.
++** 
      
++**
++** 
      
++*/
++#define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
++#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
++#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
++#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
++#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
++#define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */
++#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      1006 /* int int* */
++#define SQLITE_DBCONFIG_ENABLE_QPSG           1007 /* int int* */
++#define SQLITE_DBCONFIG_TRIGGER_EQP           1008 /* int int* */
++#define SQLITE_DBCONFIG_RESET_DATABASE        1009 /* int int* */
++#define SQLITE_DBCONFIG_DEFENSIVE             1010 /* int int* */
++#define SQLITE_DBCONFIG_WRITABLE_SCHEMA       1011 /* int int* */
++#define SQLITE_DBCONFIG_LEGACY_ALTER_TABLE    1012 /* int int* */
++#define SQLITE_DBCONFIG_DQS_DML               1013 /* int int* */
++#define SQLITE_DBCONFIG_DQS_DDL               1014 /* int int* */
++#define SQLITE_DBCONFIG_ENABLE_VIEW           1015 /* int int* */
++#define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    1016 /* int int* */
++#define SQLITE_DBCONFIG_TRUSTED_SCHEMA        1017 /* int int* */
++#define SQLITE_DBCONFIG_STMT_SCANSTATUS       1018 /* int int* */
++#define SQLITE_DBCONFIG_REVERSE_SCANORDER     1019 /* int int* */
++#define SQLITE_DBCONFIG_MAX                   1019 /* Largest DBCONFIG */
++
++/*
++** CAPI3REF: Enable Or Disable Extended Result Codes
++** METHOD: sqlite3
++**
++** ^The sqlite3_extended_result_codes() routine enables or disables the
++** [extended result codes] feature of SQLite. ^The extended result
++** codes are disabled by default for historical compatibility.
++*/
++SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
++
++/*
++** CAPI3REF: Last Insert Rowid
++** METHOD: sqlite3
++**
++** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
++** has a unique 64-bit signed
++** integer key called the [ROWID | "rowid"]. ^The rowid is always available
++** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
++** names are not also used by explicitly declared columns. ^If
++** the table has a column of type [INTEGER PRIMARY KEY] then that column
++** is another alias for the rowid.
++**
++** ^The sqlite3_last_insert_rowid(D) interface usually returns the [rowid] of
++** the most recent successful [INSERT] into a rowid table or [virtual table]
++** on database connection D. ^Inserts into [WITHOUT ROWID] tables are not
++** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
++** on the database connection D, then sqlite3_last_insert_rowid(D) returns
++** zero.
++**
++** As well as being set automatically as rows are inserted into database
++** tables, the value returned by this function may be set explicitly by
++** [sqlite3_set_last_insert_rowid()]
++**
++** Some virtual table implementations may INSERT rows into rowid tables as
++** part of committing a transaction (e.g. to flush data accumulated in memory
++** to disk). In this case subsequent calls to this function return the rowid
++** associated with these internal INSERT operations, which leads to
++** unintuitive results. Virtual table implementations that do write to rowid
++** tables in this way can avoid this problem by restoring the original
++** rowid value using [sqlite3_set_last_insert_rowid()] before returning
++** control to the user.
++**
++** ^(If an [INSERT] occurs within a trigger then this routine will
++** return the [rowid] of the inserted row as long as the trigger is
++** running. Once the trigger program ends, the value returned
++** by this routine reverts to what it was before the trigger was fired.)^
++**
++** ^An [INSERT] that fails due to a constraint violation is not a
++** successful [INSERT] and does not change the value returned by this
++** routine.  ^Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
++** and INSERT OR ABORT make no changes to the return value of this
++** routine when their insertion fails.  ^(When INSERT OR REPLACE
++** encounters a constraint violation, it does not fail.  The
++** INSERT continues to completion after deleting rows that caused
++** the constraint problem so INSERT OR REPLACE will always change
++** the return value of this interface.)^
++**
++** ^For the purposes of this routine, an [INSERT] is considered to
++** be successful even if it is subsequently rolled back.
++**
++** This function is accessible to SQL statements via the
++** [last_insert_rowid() SQL function].
++**
++** If a separate thread performs a new [INSERT] on the same
++** database connection while the [sqlite3_last_insert_rowid()]
++** function is running and thus changes the last insert [rowid],
++** then the value returned by [sqlite3_last_insert_rowid()] is
++** unpredictable and might not equal either the old or the new
++** last insert [rowid].
++*/
++SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
++
++/*
++** CAPI3REF: Set the Last Insert Rowid value.
++** METHOD: sqlite3
++**
++** The sqlite3_set_last_insert_rowid(D, R) method allows the application to
++** set the value returned by calling sqlite3_last_insert_rowid(D) to R
++** without inserting a row into the database.
++*/
++SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);
++
++/*
++** CAPI3REF: Count The Number Of Rows Modified
++** METHOD: sqlite3
++**
++** ^These functions return the number of rows modified, inserted or
++** deleted by the most recently completed INSERT, UPDATE or DELETE
++** statement on the database connection specified by the only parameter.
++** The two functions are identical except for the type of the return value
++** and that if the number of rows modified by the most recent INSERT, UPDATE
++** or DELETE is greater than the maximum value supported by type "int", then
++** the return value of sqlite3_changes() is undefined. ^Executing any other
++** type of SQL statement does not modify the value returned by these functions.
++**
++** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
++** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
++** [foreign key actions] or [REPLACE] constraint resolution are not counted.
++**
++** Changes to a view that are intercepted by
++** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
++** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
++** DELETE statement run on a view is always zero. Only changes made to real
++** tables are counted.
++**
++** Things are more complicated if the sqlite3_changes() function is
++** executed while a trigger program is running. This may happen if the
++** program uses the [changes() SQL function], or if some other callback
++** function invokes sqlite3_changes() directly. Essentially:
++**
++** 
        
++**   
      •  ^(Before entering a trigger program the value returned by
++**        sqlite3_changes() function is saved. After the trigger program
++**        has finished, the original value is restored.)^
++**
++**   
      •  ^(Within a trigger program each INSERT, UPDATE and DELETE
++**        statement sets the value returned by sqlite3_changes()
++**        upon completion as normal. Of course, this value will not include
++**        any changes performed by sub-triggers, as the sqlite3_changes()
++**        value will be saved and restored after each sub-trigger has run.)^
++** 
      
++**
++** ^This means that if the changes() SQL function (or similar) is used
++** by the first INSERT, UPDATE or DELETE statement within a trigger, it
++** returns the value as set when the calling statement began executing.
++** ^If it is used by the second or subsequent such statement within a trigger
++** program, the value returned reflects the number of rows modified by the
++** previous INSERT, UPDATE or DELETE statement within the same trigger.
++**
++** If a separate thread makes changes on the same database connection
++** while [sqlite3_changes()] is running then the value returned
++** is unpredictable and not meaningful.
++**
++** See also:
++** 
        
++** 
      •  the [sqlite3_total_changes()] interface
++** 
      •  the [count_changes pragma]
++** 
      •  the [changes() SQL function]
++** 
      •  the [data_version pragma]
++** 
      
++*/
++SQLITE_API int sqlite3_changes(sqlite3*);
++SQLITE_API sqlite3_int64 sqlite3_changes64(sqlite3*);
++
++/*
++** CAPI3REF: Total Number Of Rows Modified
++** METHOD: sqlite3
++**
++** ^These functions return the total number of rows inserted, modified or
++** deleted by all [INSERT], [UPDATE] or [DELETE] statements completed
++** since the database connection was opened, including those executed as
++** part of trigger programs. The two functions are identical except for the
++** type of the return value and that if the number of rows modified by the
++** connection exceeds the maximum value supported by type "int", then
++** the return value of sqlite3_total_changes() is undefined. ^Executing
++** any other type of SQL statement does not affect the value returned by
++** sqlite3_total_changes().
++**
++** ^Changes made as part of [foreign key actions] are included in the
++** count, but those made as part of REPLACE constraint resolution are
++** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
++** are not counted.
++**
++** The [sqlite3_total_changes(D)] interface only reports the number
++** of rows that changed due to SQL statement run against database
++** connection D.  Any changes by other database connections are ignored.
++** To detect changes against a database file from other database
++** connections use the [PRAGMA data_version] command or the
++** [SQLITE_FCNTL_DATA_VERSION] [file control].
++**
++** If a separate thread makes changes on the same database connection
++** while [sqlite3_total_changes()] is running then the value
++** returned is unpredictable and not meaningful.
++**
++** See also:
++** 
        
++** 
      •  the [sqlite3_changes()] interface
++** 
      •  the [count_changes pragma]
++** 
      •  the [changes() SQL function]
++** 
      •  the [data_version pragma]
++** 
      •  the [SQLITE_FCNTL_DATA_VERSION] [file control]
++** 
      
++*/
++SQLITE_API int sqlite3_total_changes(sqlite3*);
++SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*);
++
++/*
++** CAPI3REF: Interrupt A Long-Running Query
++** METHOD: sqlite3
++**
++** ^This function causes any pending database operation to abort and
++** return at its earliest opportunity. This routine is typically
++** called in response to a user action such as pressing "Cancel"
++** or Ctrl-C where the user wants a long query operation to halt
++** immediately.
++**
++** ^It is safe to call this routine from a thread different from the
++** thread that is currently running the database operation.  But it
++** is not safe to call this routine with a [database connection] that
++** is closed or might close before sqlite3_interrupt() returns.
++**
++** ^If an SQL operation is very nearly finished at the time when
++** sqlite3_interrupt() is called, then it might not have an opportunity
++** to be interrupted and might continue to completion.
++**
++** ^An SQL operation that is interrupted will return [SQLITE_INTERRUPT].
++** ^If the interrupted SQL operation is an INSERT, UPDATE, or DELETE
++** that is inside an explicit transaction, then the entire transaction
++** will be rolled back automatically.
++**
++** ^The sqlite3_interrupt(D) call is in effect until all currently running
++** SQL statements on [database connection] D complete.  ^Any new SQL statements
++** that are started after the sqlite3_interrupt() call and before the
++** running statement count reaches zero are interrupted as if they had been
++** running prior to the sqlite3_interrupt() call.  ^New SQL statements
++** that are started after the running statement count reaches zero are
++** not effected by the sqlite3_interrupt().
++** ^A call to sqlite3_interrupt(D) that occurs when there are no running
++** SQL statements is a no-op and has no effect on SQL statements
++** that are started after the sqlite3_interrupt() call returns.
++**
++** ^The [sqlite3_is_interrupted(D)] interface can be used to determine whether
++** or not an interrupt is currently in effect for [database connection] D.
++** It returns 1 if an interrupt is currently in effect, or 0 otherwise.
++*/
++SQLITE_API void sqlite3_interrupt(sqlite3*);
++SQLITE_API int sqlite3_is_interrupted(sqlite3*);
++
++/*
++** CAPI3REF: Determine If An SQL Statement Is Complete
++**
++** These routines are useful during command-line input to determine if the
++** currently entered text seems to form a complete SQL statement or
++** if additional input is needed before sending the text into
++** SQLite for parsing.  ^These routines return 1 if the input string
++** appears to be a complete SQL statement.  ^A statement is judged to be
++** complete if it ends with a semicolon token and is not a prefix of a
++** well-formed CREATE TRIGGER statement.  ^Semicolons that are embedded within
++** string literals or quoted identifier names or comments are not
++** independent tokens (they are part of the token in which they are
++** embedded) and thus do not count as a statement terminator.  ^Whitespace
++** and comments that follow the final semicolon are ignored.
++**
++** ^These routines return 0 if the statement is incomplete.  ^If a
++** memory allocation fails, then SQLITE_NOMEM is returned.
++**
++** ^These routines do not parse the SQL statements thus
++** will not detect syntactically incorrect SQL.
++**
++** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
++** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
++** automatically by sqlite3_complete16().  If that initialization fails,
++** then the return value from sqlite3_complete16() will be non-zero
++** regardless of whether or not the input SQL is complete.)^
++**
++** The input to [sqlite3_complete()] must be a zero-terminated
++** UTF-8 string.
++**
++** The input to [sqlite3_complete16()] must be a zero-terminated
++** UTF-16 string in native byte order.
++*/
++SQLITE_API int sqlite3_complete(const char *sql);
++SQLITE_API int sqlite3_complete16(const void *sql);
++
++/*
++** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors
++** KEYWORDS: {busy-handler callback} {busy handler}
++** METHOD: sqlite3
++**
++** ^The sqlite3_busy_handler(D,X,P) routine sets a callback function X
++** that might be invoked with argument P whenever
++** an attempt is made to access a database table associated with
++** [database connection] D when another thread
++** or process has the table locked.
++** The sqlite3_busy_handler() interface is used to implement
++** [sqlite3_busy_timeout()] and [PRAGMA busy_timeout].
++**
++** ^If the busy callback is NULL, then [SQLITE_BUSY]
++** is returned immediately upon encountering the lock.  ^If the busy callback
++** is not NULL, then the callback might be invoked with two arguments.
++**
++** ^The first argument to the busy handler is a copy of the void* pointer which
++** is the third argument to sqlite3_busy_handler().  ^The second argument to
++** the busy handler callback is the number of times that the busy handler has
++** been invoked previously for the same locking event.  ^If the
++** busy callback returns 0, then no additional attempts are made to
++** access the database and [SQLITE_BUSY] is returned
++** to the application.
++** ^If the callback returns non-zero, then another attempt
++** is made to access the database and the cycle repeats.
++**
++** The presence of a busy handler does not guarantee that it will be invoked
++** when there is lock contention. ^If SQLite determines that invoking the busy
++** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
++** to the application instead of invoking the
++** busy handler.
++** Consider a scenario where one process is holding a read lock that
++** it is trying to promote to a reserved lock and
++** a second process is holding a reserved lock that it is trying
++** to promote to an exclusive lock.  The first process cannot proceed
++** because it is blocked by the second and the second process cannot
++** proceed because it is blocked by the first.  If both processes
++** invoke the busy handlers, neither will make any progress.  Therefore,
++** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
++** will induce the first process to release its read lock and allow
++** the second process to proceed.
++**
++** ^The default busy callback is NULL.
++**
++** ^(There can only be a single busy handler defined for each
++** [database connection].  Setting a new busy handler clears any
++** previously set handler.)^  ^Note that calling [sqlite3_busy_timeout()]
++** or evaluating [PRAGMA busy_timeout=N] will change the
++** busy handler and thus clear any previously set busy handler.
++**
++** The busy callback should not take any actions which modify the
++** database connection that invoked the busy handler.  In other words,
++** the busy handler is not reentrant.  Any such actions
++** result in undefined behavior.
++**
++** A busy handler must not close the database connection
++** or [prepared statement] that invoked the busy handler.
++*/
++SQLITE_API int sqlite3_busy_handler(sqlite3*,int(*)(void*,int),void*);
++
++/*
++** CAPI3REF: Set A Busy Timeout
++** METHOD: sqlite3
++**
++** ^This routine sets a [sqlite3_busy_handler | busy handler] that sleeps
++** for a specified amount of time when a table is locked.  ^The handler
++** will sleep multiple times until at least "ms" milliseconds of sleeping
++** have accumulated.  ^After at least "ms" milliseconds of sleeping,
++** the handler returns 0 which causes [sqlite3_step()] to return
++** [SQLITE_BUSY].
++**
++** ^Calling this routine with an argument less than or equal to zero
++** turns off all busy handlers.
++**
++** ^(There can only be a single busy handler for a particular
++** [database connection] at any given moment.  If another busy handler
++** was defined  (using [sqlite3_busy_handler()]) prior to calling
++** this routine, that other busy handler is cleared.)^
++**
++** See also:  [PRAGMA busy_timeout]
++*/
++SQLITE_API int sqlite3_busy_timeout(sqlite3*, int ms);
++
++/*
++** CAPI3REF: Convenience Routines For Running Queries
++** METHOD: sqlite3
++**
++** This is a legacy interface that is preserved for backwards compatibility.
++** Use of this interface is not recommended.
++**
++** Definition: A result table is memory data structure created by the
++** [sqlite3_get_table()] interface.  A result table records the
++** complete query results from one or more queries.
++**
++** The table conceptually has a number of rows and columns.  But
++** these numbers are not part of the result table itself.  These
++** numbers are obtained separately.  Let N be the number of rows
++** and M be the number of columns.
++**
++** A result table is an array of pointers to zero-terminated UTF-8 strings.
++** There are (N+1)*M elements in the array.  The first M pointers point
++** to zero-terminated strings that  contain the names of the columns.
++** The remaining entries all point to query results.  NULL values result
++** in NULL pointers.  All other values are in their UTF-8 zero-terminated
++** string representation as returned by [sqlite3_column_text()].
++**
++** A result table might consist of one or more memory allocations.
++** It is not safe to pass a result table directly to [sqlite3_free()].
++** A result table should be deallocated using [sqlite3_free_table()].
++**
++** ^(As an example of the result table format, suppose a query result
++** is as follows:
++**
++** 
      ++**        Name        | Age
++**        -----------------------
++**        Alice       | 43
++**        Bob         | 28
++**        Cindy       | 21
++** 
      
++**
++** There are two columns (M==2) and three rows (N==3).  Thus the
++** result table has 8 entries.  Suppose the result table is stored
++** in an array named azResult.  Then azResult holds this content:
++**
++** 
      ++**        azResult[0] = "Name";
++**        azResult[1] = "Age";
++**        azResult[2] = "Alice";
++**        azResult[3] = "43";
++**        azResult[4] = "Bob";
++**        azResult[5] = "28";
++**        azResult[6] = "Cindy";
++**        azResult[7] = "21";
++** 
      )^
++**
++** ^The sqlite3_get_table() function evaluates one or more
++** semicolon-separated SQL statements in the zero-terminated UTF-8
++** string of its 2nd parameter and returns a result table to the
++** pointer given in its 3rd parameter.
++**
++** After the application has finished with the result from sqlite3_get_table(),
++** it must pass the result table pointer to sqlite3_free_table() in order to
++** release the memory that was malloced.  Because of the way the
++** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
++** function must not try to call [sqlite3_free()] directly.  Only
++** [sqlite3_free_table()] is able to release the memory properly and safely.
++**
++** The sqlite3_get_table() interface is implemented as a wrapper around
++** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
++** to any internal data structures of SQLite.  It uses only the public
++** interface defined here.  As a consequence, errors that occur in the
++** wrapper layer outside of the internal [sqlite3_exec()] call are not
++** reflected in subsequent calls to [sqlite3_errcode()] or
++** [sqlite3_errmsg()].
++*/
++SQLITE_API int sqlite3_get_table(
++  sqlite3 *db,          /* An open database */
++  const char *zSql,     /* SQL to be evaluated */
++  char ***pazResult,    /* Results of the query */
++  int *pnRow,           /* Number of result rows written here */
++  int *pnColumn,        /* Number of result columns written here */
++  char **pzErrmsg       /* Error msg written here */
++);
++SQLITE_API void sqlite3_free_table(char **result);
++
++/*
++** CAPI3REF: Formatted String Printing Functions
++**
++** These routines are work-alikes of the "printf()" family of functions
++** from the standard C library.
++** These routines understand most of the common formatting options from
++** the standard library printf()
++** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).
++** See the [built-in printf()] documentation for details.
++**
++** ^The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
++** results into memory obtained from [sqlite3_malloc64()].
++** The strings returned by these two routines should be
++** released by [sqlite3_free()].  ^Both routines return a
++** NULL pointer if [sqlite3_malloc64()] is unable to allocate enough
++** memory to hold the resulting string.
++**
++** ^(The sqlite3_snprintf() routine is similar to "snprintf()" from
++** the standard C library.  The result is written into the
++** buffer supplied as the second parameter whose size is given by
++** the first parameter. Note that the order of the
++** first two parameters is reversed from snprintf().)^  This is an
++** historical accident that cannot be fixed without breaking
++** backwards compatibility.  ^(Note also that sqlite3_snprintf()
++** returns a pointer to its buffer instead of the number of
++** characters actually written into the buffer.)^  We admit that
++** the number of characters written would be a more useful return
++** value but we cannot change the implementation of sqlite3_snprintf()
++** now without breaking compatibility.
++**
++** ^As long as the buffer size is greater than zero, sqlite3_snprintf()
++** guarantees that the buffer is always zero-terminated.  ^The first
++** parameter "n" is the total size of the buffer, including space for
++** the zero terminator.  So the longest string that can be completely
++** written will be n-1 characters.
++**
++** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
++**
++** See also:  [built-in printf()], [printf() SQL function]
++*/
++SQLITE_API char *sqlite3_mprintf(const char*,...);
++SQLITE_API char *sqlite3_vmprintf(const char*, va_list);
++SQLITE_API char *sqlite3_snprintf(int,char*,const char*, ...);
++SQLITE_API char *sqlite3_vsnprintf(int,char*,const char*, va_list);
++
++/*
++** CAPI3REF: Memory Allocation Subsystem
++**
++** The SQLite core uses these three routines for all of its own
++** internal memory allocation needs. "Core" in the previous sentence
++** does not include operating-system specific [VFS] implementation.  The
++** Windows VFS uses native malloc() and free() for some operations.
++**
++** ^The sqlite3_malloc() routine returns a pointer to a block
++** of memory at least N bytes in length, where N is the parameter.
++** ^If sqlite3_malloc() is unable to obtain sufficient free
++** memory, it returns a NULL pointer.  ^If the parameter N to
++** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
++** a NULL pointer.
++**
++** ^The sqlite3_malloc64(N) routine works just like
++** sqlite3_malloc(N) except that N is an unsigned 64-bit integer instead
++** of a signed 32-bit integer.
++**
++** ^Calling sqlite3_free() with a pointer previously returned
++** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
++** that it might be reused.  ^The sqlite3_free() routine is
++** a no-op if is called with a NULL pointer.  Passing a NULL pointer
++** to sqlite3_free() is harmless.  After being freed, memory
++** should neither be read nor written.  Even reading previously freed
++** memory might result in a segmentation fault or other severe error.
++** Memory corruption, a segmentation fault, or other severe error
++** might result if sqlite3_free() is called with a non-NULL pointer that
++** was not obtained from sqlite3_malloc() or sqlite3_realloc().
++**
++** ^The sqlite3_realloc(X,N) interface attempts to resize a
++** prior memory allocation X to be at least N bytes.
++** ^If the X parameter to sqlite3_realloc(X,N)
++** is a NULL pointer then its behavior is identical to calling
++** sqlite3_malloc(N).
++** ^If the N parameter to sqlite3_realloc(X,N) is zero or
++** negative then the behavior is exactly the same as calling
++** sqlite3_free(X).
++** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
++** of at least N bytes in size or NULL if insufficient memory is available.
++** ^If M is the size of the prior allocation, then min(N,M) bytes
++** of the prior allocation are copied into the beginning of buffer returned
++** by sqlite3_realloc(X,N) and the prior allocation is freed.
++** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
++** prior allocation is not freed.
++**
++** ^The sqlite3_realloc64(X,N) interfaces works the same as
++** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
++** of a 32-bit signed integer.
++**
++** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
++** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
++** sqlite3_msize(X) returns the size of that memory allocation in bytes.
++** ^The value returned by sqlite3_msize(X) might be larger than the number
++** of bytes requested when X was allocated.  ^If X is a NULL pointer then
++** sqlite3_msize(X) returns zero.  If X points to something that is not
++** the beginning of memory allocation, or if it points to a formerly
++** valid memory allocation that has now been freed, then the behavior
++** of sqlite3_msize(X) is undefined and possibly harmful.
++**
++** ^The memory returned by sqlite3_malloc(), sqlite3_realloc(),
++** sqlite3_malloc64(), and sqlite3_realloc64()
++** is always aligned to at least an 8 byte boundary, or to a
++** 4 byte boundary if the [SQLITE_4_BYTE_ALIGNED_MALLOC] compile-time
++** option is used.
++**
++** The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
++** must be either NULL or else pointers obtained from a prior
++** invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that have
++** not yet been released.
++**
++** The application must not read or write any part of
++** a block of memory after it has been released using
++** [sqlite3_free()] or [sqlite3_realloc()].
++*/
++SQLITE_API void *sqlite3_malloc(int);
++SQLITE_API void *sqlite3_malloc64(sqlite3_uint64);
++SQLITE_API void *sqlite3_realloc(void*, int);
++SQLITE_API void *sqlite3_realloc64(void*, sqlite3_uint64);
++SQLITE_API void sqlite3_free(void*);
++SQLITE_API sqlite3_uint64 sqlite3_msize(void*);
++
++/*
++** CAPI3REF: Memory Allocator Statistics
++**
++** SQLite provides these two interfaces for reporting on the status
++** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
++** routines, which form the built-in memory allocation subsystem.
++**
++** ^The [sqlite3_memory_used()] routine returns the number of bytes
++** of memory currently outstanding (malloced but not freed).
++** ^The [sqlite3_memory_highwater()] routine returns the maximum
++** value of [sqlite3_memory_used()] since the high-water mark
++** was last reset.  ^The values returned by [sqlite3_memory_used()] and
++** [sqlite3_memory_highwater()] include any overhead
++** added by SQLite in its implementation of [sqlite3_malloc()],
++** but not overhead added by the any underlying system library
++** routines that [sqlite3_malloc()] may call.
++**
++** ^The memory high-water mark is reset to the current value of
++** [sqlite3_memory_used()] if and only if the parameter to
++** [sqlite3_memory_highwater()] is true.  ^The value returned
++** by [sqlite3_memory_highwater(1)] is the high-water mark
++** prior to the reset.
++*/
++SQLITE_API sqlite3_int64 sqlite3_memory_used(void);
++SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
++
++/*
++** CAPI3REF: Pseudo-Random Number Generator
++**
++** SQLite contains a high-quality pseudo-random number generator (PRNG) used to
++** select random [ROWID | ROWIDs] when inserting new records into a table that
++** already uses the largest possible [ROWID].  The PRNG is also used for
++** the built-in random() and randomblob() SQL functions.  This interface allows
++** applications to access the same PRNG for other purposes.
++**
++** ^A call to this routine stores N bytes of randomness into buffer P.
++** ^The P parameter can be a NULL pointer.
++**
++** ^If this routine has not been previously called or if the previous
++** call had N less than one or a NULL pointer for P, then the PRNG is
++** seeded using randomness obtained from the xRandomness method of
++** the default [sqlite3_vfs] object.
++** ^If the previous call to this routine had an N of 1 or more and a
++** non-NULL P then the pseudo-randomness is generated
++** internally and without recourse to the [sqlite3_vfs] xRandomness
++** method.
++*/
++SQLITE_API void sqlite3_randomness(int N, void *P);
++
++/*
++** CAPI3REF: Compile-Time Authorization Callbacks
++** METHOD: sqlite3
++** KEYWORDS: {authorizer callback}
++**
++** ^This routine registers an authorizer callback with a particular
++** [database connection], supplied in the first argument.
++** ^The authorizer callback is invoked as SQL statements are being compiled
++** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
++** [sqlite3_prepare_v3()], [sqlite3_prepare16()], [sqlite3_prepare16_v2()],
++** and [sqlite3_prepare16_v3()].  ^At various
++** points during the compilation process, as logic is being created
++** to perform various actions, the authorizer callback is invoked to
++** see if those actions are allowed.  ^The authorizer callback should
++** return [SQLITE_OK] to allow the action, [SQLITE_IGNORE] to disallow the
++** specific action but allow the SQL statement to continue to be
++** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
++** rejected with an error.  ^If the authorizer callback returns
++** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
++** then the [sqlite3_prepare_v2()] or equivalent call that triggered
++** the authorizer will fail with an error message.
++**
++** When the callback returns [SQLITE_OK], that means the operation
++** requested is ok.  ^When the callback returns [SQLITE_DENY], the
++** [sqlite3_prepare_v2()] or equivalent call that triggered the
++** authorizer will fail with an error message explaining that
++** access is denied.
++**
++** ^The first parameter to the authorizer callback is a copy of the third
++** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
++** to the callback is an integer [SQLITE_COPY | action code] that specifies
++** the particular action to be authorized. ^The third through sixth parameters
++** to the callback are either NULL pointers or zero-terminated strings
++** that contain additional details about the action to be authorized.
++** Applications must always be prepared to encounter a NULL pointer in any
++** of the third through the sixth parameters of the authorization callback.
++**
++** ^If the action code is [SQLITE_READ]
++** and the callback returns [SQLITE_IGNORE] then the
++** [prepared statement] statement is constructed to substitute
++** a NULL value in place of the table column that would have
++** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
++** return can be used to deny an untrusted user access to individual
++** columns of a table.
++** ^When a table is referenced by a [SELECT] but no column values are
++** extracted from that table (for example in a query like
++** "SELECT count(*) FROM tab") then the [SQLITE_READ] authorizer callback
++** is invoked once for that table with a column name that is an empty string.
++** ^If the action code is [SQLITE_DELETE] and the callback returns
++** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
++** [truncate optimization] is disabled and all rows are deleted individually.
++**
++** An authorizer is used when [sqlite3_prepare | preparing]
++** SQL statements from an untrusted source, to ensure that the SQL statements
++** do not try to access data they are not allowed to see, or that they do not
++** try to execute malicious statements that damage the database.  For
++** example, an application may allow a user to enter arbitrary
++** SQL queries for evaluation by a database.  But the application does
++** not want the user to be able to make arbitrary changes to the
++** database.  An authorizer could then be put in place while the
++** user-entered SQL is being [sqlite3_prepare | prepared] that
++** disallows everything except [SELECT] statements.
++**
++** Applications that need to process SQL from untrusted sources
++** might also consider lowering resource limits using [sqlite3_limit()]
++** and limiting database size using the [max_page_count] [PRAGMA]
++** in addition to using an authorizer.
++**
++** ^(Only a single authorizer can be in place on a database connection
++** at a time.  Each call to sqlite3_set_authorizer overrides the
++** previous call.)^  ^Disable the authorizer by installing a NULL callback.
++** The authorizer is disabled by default.
++**
++** The authorizer callback must not do anything that will modify
++** the database connection that invoked the authorizer callback.
++** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
++** database connections for the meaning of "modify" in this paragraph.
++**
++** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
++** statement might be re-prepared during [sqlite3_step()] due to a
++** schema change.  Hence, the application should ensure that the
++** correct authorizer callback remains in place during the [sqlite3_step()].
++**
++** ^Note that the authorizer callback is invoked only during
++** [sqlite3_prepare()] or its variants.  Authorization is not
++** performed during statement evaluation in [sqlite3_step()], unless
++** as stated in the previous paragraph, sqlite3_step() invokes
++** sqlite3_prepare_v2() to reprepare a statement after a schema change.
++*/
++SQLITE_API int sqlite3_set_authorizer(
++  sqlite3*,
++  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
++  void *pUserData
++);
++
++/*
++** CAPI3REF: Authorizer Return Codes
++**
++** The [sqlite3_set_authorizer | authorizer callback function] must
++** return either [SQLITE_OK] or one of these two constants in order
++** to signal SQLite whether or not the action is permitted.  See the
++** [sqlite3_set_authorizer | authorizer documentation] for additional
++** information.
++**
++** Note that SQLITE_IGNORE is also used as a [conflict resolution mode]
++** returned from the [sqlite3_vtab_on_conflict()] interface.
++*/
++#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
++#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
++
++/*
++** CAPI3REF: Authorizer Action Codes
++**
++** The [sqlite3_set_authorizer()] interface registers a callback function
++** that is invoked to authorize certain SQL statement actions.  The
++** second parameter to the callback is an integer code that specifies
++** what action is being authorized.  These are the integer action codes that
++** the authorizer callback may be passed.
++**
++** These action code values signify what kind of operation is to be
++** authorized.  The 3rd and 4th parameters to the authorization
++** callback function will be parameters or NULL depending on which of these
++** codes is used as the second parameter.  ^(The 5th parameter to the
++** authorizer callback is the name of the database ("main", "temp",
++** etc.) if applicable.)^  ^The 6th parameter to the authorizer callback
++** is the name of the inner-most trigger or view that is responsible for
++** the access attempt or NULL if this access attempt is directly from
++** top-level SQL code.
++*/
++/******************************************* 3rd ************ 4th ***********/
++#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
++#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
++#define SQLITE_DELETE                9   /* Table Name      NULL            */
++#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
++#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
++#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
++#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
++#define SQLITE_INSERT               18   /* Table Name      NULL            */
++#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
++#define SQLITE_READ                 20   /* Table Name      Column Name     */
++#define SQLITE_SELECT               21   /* NULL            NULL            */
++#define SQLITE_TRANSACTION          22   /* Operation       NULL            */
++#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
++#define SQLITE_ATTACH               24   /* Filename        NULL            */
++#define SQLITE_DETACH               25   /* Database Name   NULL            */
++#define SQLITE_ALTER_TABLE          26   /* Database Name   Table Name      */
++#define SQLITE_REINDEX              27   /* Index Name      NULL            */
++#define SQLITE_ANALYZE              28   /* Table Name      NULL            */
++#define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
++#define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
++#define SQLITE_FUNCTION             31   /* NULL            Function Name   */
++#define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
++#define SQLITE_COPY                  0   /* No longer used */
++#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
++
++/*
++** CAPI3REF: Tracing And Profiling Functions
++** METHOD: sqlite3
++**
++** These routines are deprecated. Use the [sqlite3_trace_v2()] interface
++** instead of the routines described here.
++**
++** These routines register callback functions that can be used for
++** tracing and profiling the execution of SQL statements.
++**
++** ^The callback function registered by sqlite3_trace() is invoked at
++** various times when an SQL statement is being run by [sqlite3_step()].
++** ^The sqlite3_trace() callback is invoked with a UTF-8 rendering of the
++** SQL statement text as the statement first begins executing.
++** ^(Additional sqlite3_trace() callbacks might occur
++** as each triggered subprogram is entered.  The callbacks for triggers
++** contain a UTF-8 SQL comment that identifies the trigger.)^
++**
++** The [SQLITE_TRACE_SIZE_LIMIT] compile-time option can be used to limit
++** the length of [bound parameter] expansion in the output of sqlite3_trace().
++**
++** ^The callback function registered by sqlite3_profile() is invoked
++** as each SQL statement finishes.  ^The profile callback contains
++** the original statement text and an estimate of wall-clock time
++** of how long that statement took to run.  ^The profile callback
++** time is in units of nanoseconds, however the current implementation
++** is only capable of millisecond resolution so the six least significant
++** digits in the time are meaningless.  Future versions of SQLite
++** might provide greater resolution on the profiler callback.  Invoking
++** either [sqlite3_trace()] or [sqlite3_trace_v2()] will cancel the
++** profile callback.
++*/
++SQLITE_API SQLITE_DEPRECATED void *sqlite3_trace(sqlite3*,
++   void(*xTrace)(void*,const char*), void*);
++SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
++   void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
++
++/*
++** CAPI3REF: SQL Trace Event Codes
++** KEYWORDS: SQLITE_TRACE
++**
++** These constants identify classes of events that can be monitored
++** using the [sqlite3_trace_v2()] tracing logic.  The M argument
++** to [sqlite3_trace_v2(D,M,X,P)] is an OR-ed combination of one or more of
++** the following constants.  ^The first argument to the trace callback
++** is one of the following constants.
++**
++** New tracing constants may be added in future releases.
++**
++** ^A trace callback has four arguments: xCallback(T,C,P,X).
++** ^The T argument is one of the integer type codes above.
++** ^The C argument is a copy of the context pointer passed in as the
++** fourth argument to [sqlite3_trace_v2()].
++** The P and X arguments are pointers whose meanings depend on T.
++**
++** 
      
++** [[SQLITE_TRACE_STMT]] 
      SQLITE_TRACE_STMT
      
++** 
      ^An SQLITE_TRACE_STMT callback is invoked when a prepared statement
++** first begins running and possibly at other times during the
++** execution of the prepared statement, such as at the start of each
++** trigger subprogram. ^The P argument is a pointer to the
++** [prepared statement]. ^The X argument is a pointer to a string which
++** is the unexpanded SQL text of the prepared statement or an SQL comment
++** that indicates the invocation of a trigger.  ^The callback can compute
++** the same text that would have been returned by the legacy [sqlite3_trace()]
++** interface by using the X argument when X begins with "--" and invoking
++** [sqlite3_expanded_sql(P)] otherwise.
++**
++** [[SQLITE_TRACE_PROFILE]] 
      SQLITE_TRACE_PROFILE
      
++** 
      ^An SQLITE_TRACE_PROFILE callback provides approximately the same
++** information as is provided by the [sqlite3_profile()] callback.
++** ^The P argument is a pointer to the [prepared statement] and the
++** X argument points to a 64-bit integer which is approximately
++** the number of nanoseconds that the prepared statement took to run.
++** ^The SQLITE_TRACE_PROFILE callback is invoked when the statement finishes.
++**
++** [[SQLITE_TRACE_ROW]] 
      SQLITE_TRACE_ROW
      
++** 
      ^An SQLITE_TRACE_ROW callback is invoked whenever a prepared
++** statement generates a single row of result.
++** ^The P argument is a pointer to the [prepared statement] and the
++** X argument is unused.
++**
++** [[SQLITE_TRACE_CLOSE]] 
      SQLITE_TRACE_CLOSE
      
++** 
      ^An SQLITE_TRACE_CLOSE callback is invoked when a database
++** connection closes.
++** ^The P argument is a pointer to the [database connection] object
++** and the X argument is unused.
++** 
      
++*/
++#define SQLITE_TRACE_STMT       0x01
++#define SQLITE_TRACE_PROFILE    0x02
++#define SQLITE_TRACE_ROW        0x04
++#define SQLITE_TRACE_CLOSE      0x08
++
++/*
++** CAPI3REF: SQL Trace Hook
++** METHOD: sqlite3
++**
++** ^The sqlite3_trace_v2(D,M,X,P) interface registers a trace callback
++** function X against [database connection] D, using property mask M
++** and context pointer P.  ^If the X callback is
++** NULL or if the M mask is zero, then tracing is disabled.  The
++** M argument should be the bitwise OR-ed combination of
++** zero or more [SQLITE_TRACE] constants.
++**
++** ^Each call to either sqlite3_trace(D,X,P) or sqlite3_trace_v2(D,M,X,P)
++** overrides (cancels) all prior calls to sqlite3_trace(D,X,P) or
++** sqlite3_trace_v2(D,M,X,P) for the [database connection] D.  Each
++** database connection may have at most one trace callback.
++**
++** ^The X callback is invoked whenever any of the events identified by
++** mask M occur.  ^The integer return value from the callback is currently
++** ignored, though this may change in future releases.  Callback
++** implementations should return zero to ensure future compatibility.
++**
++** ^A trace callback is invoked with four arguments: callback(T,C,P,X).
++** ^The T argument is one of the [SQLITE_TRACE]
++** constants to indicate why the callback was invoked.
++** ^The C argument is a copy of the context pointer.
++** The P and X arguments are pointers whose meanings depend on T.
++**
++** The sqlite3_trace_v2() interface is intended to replace the legacy
++** interfaces [sqlite3_trace()] and [sqlite3_profile()], both of which
++** are deprecated.
++*/
++SQLITE_API int sqlite3_trace_v2(
++  sqlite3*,
++  unsigned uMask,
++  int(*xCallback)(unsigned,void*,void*,void*),
++  void *pCtx
++);
++
++/*
++** CAPI3REF: Query Progress Callbacks
++** METHOD: sqlite3
++**
++** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
++** function X to be invoked periodically during long running calls to
++** [sqlite3_step()] and [sqlite3_prepare()] and similar for
++** database connection D.  An example use for this
++** interface is to keep a GUI updated during a large query.
++**
++** ^The parameter P is passed through as the only parameter to the
++** callback function X.  ^The parameter N is the approximate number of
++** [virtual machine instructions] that are evaluated between successive
++** invocations of the callback X.  ^If N is less than one then the progress
++** handler is disabled.
++**
++** ^Only a single progress handler may be defined at one time per
++** [database connection]; setting a new progress handler cancels the
++** old one.  ^Setting parameter X to NULL disables the progress handler.
++** ^The progress handler is also disabled by setting N to a value less
++** than 1.
++**
++** ^If the progress callback returns non-zero, the operation is
++** interrupted.  This feature can be used to implement a
++** "Cancel" button on a GUI progress dialog box.
++**
++** The progress handler callback must not do anything that will modify
++** the database connection that invoked the progress handler.
++** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
++** database connections for the meaning of "modify" in this paragraph.
++**
++** The progress handler callback would originally only be invoked from the
++** bytecode engine.  It still might be invoked during [sqlite3_prepare()]
++** and similar because those routines might force a reparse of the schema
++** which involves running the bytecode engine.  However, beginning with
++** SQLite version 3.41.0, the progress handler callback might also be
++** invoked directly from [sqlite3_prepare()] while analyzing and generating
++** code for complex queries.
++*/
++SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
++
++/*
++** CAPI3REF: Opening A New Database Connection
++** CONSTRUCTOR: sqlite3
++**
++** ^These routines open an SQLite database file as specified by the
++** filename argument. ^The filename argument is interpreted as UTF-8 for
++** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
++** order for sqlite3_open16(). ^(A [database connection] handle is usually
++** returned in *ppDb, even if an error occurs.  The only exception is that
++** if SQLite is unable to allocate memory to hold the [sqlite3] object,
++** a NULL will be written into *ppDb instead of a pointer to the [sqlite3]
++** object.)^ ^(If the database is opened (and/or created) successfully, then
++** [SQLITE_OK] is returned.  Otherwise an [error code] is returned.)^ ^The
++** [sqlite3_errmsg()] or [sqlite3_errmsg16()] routines can be used to obtain
++** an English language description of the error following a failure of any
++** of the sqlite3_open() routines.
++**
++** ^The default encoding will be UTF-8 for databases created using
++** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
++** created using sqlite3_open16() will be UTF-16 in the native byte order.
++**
++** Whether or not an error occurs when it is opened, resources
++** associated with the [database connection] handle should be released by
++** passing it to [sqlite3_close()] when it is no longer required.
++**
++** The sqlite3_open_v2() interface works like sqlite3_open()
++** except that it accepts two additional parameters for additional control
++** over the new database connection.  ^(The flags parameter to
++** sqlite3_open_v2() must include, at a minimum, one of the following
++** three flag combinations:)^
++**
++** 
      
++** ^(
      [SQLITE_OPEN_READONLY]
      
++** 
      The database is opened in read-only mode.  If the database does
++** not already exist, an error is returned.
      )^
++**
++** ^(
      [SQLITE_OPEN_READWRITE]
      
++** 
      The database is opened for reading and writing if possible, or
++** reading only if the file is write protected by the operating
++** system.  In either case the database must already exist, otherwise
++** an error is returned.  For historical reasons, if opening in
++** read-write mode fails due to OS-level permissions, an attempt is
++** made to open it in read-only mode. [sqlite3_db_readonly()] can be
++** used to determine whether the database is actually
++** read-write.
      )^
++**
++** ^(
      [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]
      
++** 
      The database is opened for reading and writing, and is created if
++** it does not already exist. This is the behavior that is always used for
++** sqlite3_open() and sqlite3_open16().
      )^
++** 
      
++**
++** In addition to the required flags, the following optional flags are
++** also supported:
++**
++** 
      
++** ^(
      [SQLITE_OPEN_URI]
      
++** 
      The filename can be interpreted as a URI if this flag is set.
      )^
++**
++** ^(
      [SQLITE_OPEN_MEMORY]
      
++** 
      The database will be opened as an in-memory database.  The database
++** is named by the "filename" argument for the purposes of cache-sharing,
++** if shared cache mode is enabled, but the "filename" is otherwise ignored.
++** 
      )^
++**
++** ^(
      [SQLITE_OPEN_NOMUTEX]
      
++** 
      The new database connection will use the "multi-thread"
++** [threading mode].)^  This means that separate threads are allowed
++** to use SQLite at the same time, as long as each thread is using
++** a different [database connection].
++**
++** ^(
      [SQLITE_OPEN_FULLMUTEX]
      
++** 
      The new database connection will use the "serialized"
++** [threading mode].)^  This means the multiple threads can safely
++** attempt to use the same database connection at the same time.
++** (Mutexes will block any actual concurrency, but in this mode
++** there is no harm in trying.)
++**
++** ^(
      [SQLITE_OPEN_SHAREDCACHE]
      
++** 
      The database is opened [shared cache] enabled, overriding
++** the default shared cache setting provided by
++** [sqlite3_enable_shared_cache()].)^
++** The [use of shared cache mode is discouraged] and hence shared cache
++** capabilities may be omitted from many builds of SQLite.  In such cases,
++** this option is a no-op.
++**
++** ^(
      [SQLITE_OPEN_PRIVATECACHE]
      
++** 
      The database is opened [shared cache] disabled, overriding
++** the default shared cache setting provided by
++** [sqlite3_enable_shared_cache()].)^
++**
++** [[OPEN_EXRESCODE]] ^(
      [SQLITE_OPEN_EXRESCODE]
      
++** 
      The database connection comes up in "extended result code mode".
++** In other words, the database behaves has if
++** [sqlite3_extended_result_codes(db,1)] where called on the database
++** connection as soon as the connection is created. In addition to setting
++** the extended result code mode, this flag also causes [sqlite3_open_v2()]
++** to return an extended result code.
      
++**
++** [[OPEN_NOFOLLOW]] ^(
      [SQLITE_OPEN_NOFOLLOW]
      
++** 
      The database filename is not allowed to contain a symbolic link
      
++** 
      )^
++**
++** If the 3rd parameter to sqlite3_open_v2() is not one of the
++** required combinations shown above optionally combined with other
++** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
++** then the behavior is undefined.  Historic versions of SQLite
++** have silently ignored surplus bits in the flags parameter to
++** sqlite3_open_v2(), however that behavior might not be carried through
++** into future versions of SQLite and so applications should not rely
++** upon it.  Note in particular that the SQLITE_OPEN_EXCLUSIVE flag is a no-op
++** for sqlite3_open_v2().  The SQLITE_OPEN_EXCLUSIVE does *not* cause
++** the open to fail if the database already exists.  The SQLITE_OPEN_EXCLUSIVE
++** flag is intended for use by the [sqlite3_vfs|VFS interface] only, and not
++** by sqlite3_open_v2().
++**
++** ^The fourth parameter to sqlite3_open_v2() is the name of the
++** [sqlite3_vfs] object that defines the operating system interface that
++** the new database connection should use.  ^If the fourth parameter is
++** a NULL pointer then the default [sqlite3_vfs] object is used.
++**
++** ^If the filename is ":memory:", then a private, temporary in-memory database
++** is created for the connection.  ^This in-memory database will vanish when
++** the database connection is closed.  Future versions of SQLite might
++** make use of additional special filenames that begin with the ":" character.
++** It is recommended that when a database filename actually does begin with
++** a ":" character you should prefix the filename with a pathname such as
++** "./" to avoid ambiguity.
++**
++** ^If the filename is an empty string, then a private, temporary
++** on-disk database will be created.  ^This private database will be
++** automatically deleted as soon as the database connection is closed.
++**
++** [[URI filenames in sqlite3_open()]] 
      URI Filenames
      
++**
++** ^If [URI filename] interpretation is enabled, and the filename argument
++** begins with "file:", then the filename is interpreted as a URI. ^URI
++** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
++** set in the third argument to sqlite3_open_v2(), or if it has
++** been enabled globally using the [SQLITE_CONFIG_URI] option with the
++** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
++** URI filename interpretation is turned off
++** by default, but future releases of SQLite might enable URI filename
++** interpretation by default.  See "[URI filenames]" for additional
++** information.
++**
++** URI filenames are parsed according to RFC 3986. ^If the URI contains an
++** authority, then it must be either an empty string or the string
++** "localhost". ^If the authority is not an empty string or "localhost", an
++** error is returned to the caller. ^The fragment component of a URI, if
++** present, is ignored.
++**
++** ^SQLite uses the path component of the URI as the name of the disk file
++** which contains the database. ^If the path begins with a '/' character,
++** then it is interpreted as an absolute path. ^If the path does not begin
++** with a '/' (meaning that the authority section is omitted from the URI)
++** then the path is interpreted as a relative path.
++** ^(On windows, the first component of an absolute path
++** is a drive specification (e.g. "C:").)^
++**
++** [[core URI query parameters]]
++** The query component of a URI may contain parameters that are interpreted
++** either by SQLite itself, or by a [VFS | custom VFS implementation].
++** SQLite and its built-in [VFSes] interpret the
++** following query parameters:
++**
++** 
        
++**   
      •  vfs: ^The "vfs" parameter may be used to specify the name of
++**     a VFS object that provides the operating system interface that should
++**     be used to access the database file on disk. ^If this option is set to
++**     an empty string the default VFS object is used. ^Specifying an unknown
++**     VFS is an error. ^If sqlite3_open_v2() is used and the vfs option is
++**     present, then the VFS specified by the option takes precedence over
++**     the value passed as the fourth parameter to sqlite3_open_v2().
++**
++**   
      •  mode: ^(The mode parameter may be set to either "ro", "rw",
++**     "rwc", or "memory". Attempting to set it to any other value is
++**     an error)^.
++**     ^If "ro" is specified, then the database is opened for read-only
++**     access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
++**     third argument to sqlite3_open_v2(). ^If the mode option is set to
++**     "rw", then the database is opened for read-write (but not create)
++**     access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
++**     been set. ^Value "rwc" is equivalent to setting both
++**     SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE.  ^If the mode option is
++**     set to "memory" then a pure [in-memory database] that never reads
++**     or writes from disk is used. ^It is an error to specify a value for
++**     the mode parameter that is less restrictive than that specified by
++**     the flags passed in the third parameter to sqlite3_open_v2().
++**
++**   
      •  cache: ^The cache parameter may be set to either "shared" or
++**     "private". ^Setting it to "shared" is equivalent to setting the
++**     SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
++**     sqlite3_open_v2(). ^Setting the cache parameter to "private" is
++**     equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
++**     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
++**     a URI filename, its value overrides any behavior requested by setting
++**     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
++**
++**  
      •  psow: ^The psow parameter indicates whether or not the
++**     [powersafe overwrite] property does or does not apply to the
++**     storage media on which the database file resides.
++**
++**  
      •  nolock: ^The nolock parameter is a boolean query parameter
++**     which if set disables file locking in rollback journal modes.  This
++**     is useful for accessing a database on a filesystem that does not
++**     support locking.  Caution:  Database corruption might result if two
++**     or more processes write to the same database and any one of those
++**     processes uses nolock=1.
++**
++**  
      •  immutable: ^The immutable parameter is a boolean query
++**     parameter that indicates that the database file is stored on
++**     read-only media.  ^When immutable is set, SQLite assumes that the
++**     database file cannot be changed, even by a process with higher
++**     privilege, and so the database is opened read-only and all locking
++**     and change detection is disabled.  Caution: Setting the immutable
++**     property on a database file that does in fact change can result
++**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
++**     See also: [SQLITE_IOCAP_IMMUTABLE].
++**
++** 
      
++**
++** ^Specifying an unknown parameter in the query component of a URI is not an
++** error.  Future versions of SQLite might understand additional query
++** parameters.  See "[query parameters with special meaning to SQLite]" for
++** additional information.
++**
++** [[URI filename examples]] 
      URI filename examples
      
++**
++** 
      
++** 
       URI filenames  Results
++** 
       file:data.db 
++**          Open the file "data.db" in the current directory.
++** 
       file:/home/fred/data.db
      
++**          file:///home/fred/data.db 
      
++**          file://localhost/home/fred/data.db 
             		
++**          Open the database file "/home/fred/data.db".
++** 
       file://darkstar/home/fred/data.db 
++**          An error. "darkstar" is not a recognized authority.
++** 
      
++**          file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
++**      Windows only: Open the file "data.db" on fred's desktop on drive
++**          C:. Note that the %20 escaping in this example is not strictly
++**          necessary - space characters can be used literally
++**          in URI filenames.
++** 
       file:data.db?mode=ro&cache=private 
++**          Open file "data.db" in the current directory for read-only access.
++**          Regardless of whether or not shared-cache mode is enabled by
++**          default, use a private cache.
++** 
       file:/home/fred/data.db?vfs=unix-dotfile 
++**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
++**          that uses dot-files in place of posix advisory locking.
++** 
       file:data.db?mode=readonly 
++**          An error. "readonly" is not a valid option for the "mode" parameter.
++**          Use "ro" instead:  "file:data.db?mode=ro".
++** 
      
++**
++** ^URI hexadecimal escape sequences (%HH) are supported within the path and
++** query components of a URI. A hexadecimal escape sequence consists of a
++** percent sign - "%" - followed by exactly two hexadecimal digits
++** specifying an octet value. ^Before the path or query components of a
++** URI filename are interpreted, they are encoded using UTF-8 and all
++** hexadecimal escape sequences replaced by a single byte containing the
++** corresponding octet. If this process generates an invalid UTF-8 encoding,
++** the results are undefined.
++**
++** Note to Windows users:  The encoding used for the filename argument
++** of sqlite3_open() and sqlite3_open_v2() must be UTF-8, not whatever
++** codepage is currently defined.  Filenames containing international
++** characters must be converted to UTF-8 prior to passing them into
++** sqlite3_open() or sqlite3_open_v2().
++**
++** Note to Windows Runtime users:  The temporary directory must be set
++** prior to calling sqlite3_open() or sqlite3_open_v2().  Otherwise, various
++** features that require the use of temporary files may fail.
++**
++** See also: [sqlite3_temp_directory]
++*/
++SQLITE_API int sqlite3_open(
++  const char *filename,   /* Database filename (UTF-8) */
++  sqlite3 **ppDb          /* OUT: SQLite db handle */
++);
++SQLITE_API int sqlite3_open16(
++  const void *filename,   /* Database filename (UTF-16) */
++  sqlite3 **ppDb          /* OUT: SQLite db handle */
++);
++SQLITE_API int sqlite3_open_v2(
++  const char *filename,   /* Database filename (UTF-8) */
++  sqlite3 **ppDb,         /* OUT: SQLite db handle */
++  int flags,              /* Flags */
++  const char *zVfs        /* Name of VFS module to use */
++);
++
++/*
++** CAPI3REF: Obtain Values For URI Parameters
++**
++** These are utility routines, useful to [VFS|custom VFS implementations],
++** that check if a database file was a URI that contained a specific query
++** parameter, and if so obtains the value of that query parameter.
++**
++** The first parameter to these interfaces (hereafter referred to
++** as F) must be one of:
++** 
        
++** 
      •  A database filename pointer created by the SQLite core and
++** passed into the xOpen() method of a VFS implementation, or
++** 
      •  A filename obtained from [sqlite3_db_filename()], or
++** 
      •  A new filename constructed using [sqlite3_create_filename()].
++** 
      
++** If the F parameter is not one of the above, then the behavior is
++** undefined and probably undesirable.  Older versions of SQLite were
++** more tolerant of invalid F parameters than newer versions.
++**
++** If F is a suitable filename (as described in the previous paragraph)
++** and if P is the name of the query parameter, then
++** sqlite3_uri_parameter(F,P) returns the value of the P
++** parameter if it exists or a NULL pointer if P does not appear as a
++** query parameter on F.  If P is a query parameter of F and it
++** has no explicit value, then sqlite3_uri_parameter(F,P) returns
++** a pointer to an empty string.
++**
++** The sqlite3_uri_boolean(F,P,B) routine assumes that P is a boolean
++** parameter and returns true (1) or false (0) according to the value
++** of P.  The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
++** value of query parameter P is one of "yes", "true", or "on" in any
++** case or if the value begins with a non-zero number.  The
++** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
++** query parameter P is one of "no", "false", or "off" in any case or
++** if the value begins with a numeric zero.  If P is not a query
++** parameter on F or if the value of P does not match any of the
++** above, then sqlite3_uri_boolean(F,P,B) returns (B!=0).
++**
++** The sqlite3_uri_int64(F,P,D) routine converts the value of P into a
++** 64-bit signed integer and returns that integer, or D if P does not
++** exist.  If the value of P is something other than an integer, then
++** zero is returned.
++**
++** The sqlite3_uri_key(F,N) returns a pointer to the name (not
++** the value) of the N-th query parameter for filename F, or a NULL
++** pointer if N is less than zero or greater than the number of query
++** parameters minus 1.  The N value is zero-based so N should be 0 to obtain
++** the name of the first query parameter, 1 for the second parameter, and
++** so forth.
++**
++** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
++** sqlite3_uri_boolean(F,P,B) returns B.  If F is not a NULL pointer and
++** is not a database file pathname pointer that the SQLite core passed
++** into the xOpen VFS method, then the behavior of this routine is undefined
++** and probably undesirable.
++**
++** Beginning with SQLite [version 3.31.0] ([dateof:3.31.0]) the input F
++** parameter can also be the name of a rollback journal file or WAL file
++** in addition to the main database file.  Prior to version 3.31.0, these
++** routines would only work if F was the name of the main database file.
++** When the F parameter is the name of the rollback journal or WAL file,
++** it has access to all the same query parameters as were found on the
++** main database file.
++**
++** See the [URI filename] documentation for additional information.
++*/
++SQLITE_API const char *sqlite3_uri_parameter(sqlite3_filename z, const char *zParam);
++SQLITE_API int sqlite3_uri_boolean(sqlite3_filename z, const char *zParam, int bDefault);
++SQLITE_API sqlite3_int64 sqlite3_uri_int64(sqlite3_filename, const char*, sqlite3_int64);
++SQLITE_API const char *sqlite3_uri_key(sqlite3_filename z, int N);
++
++/*
++** CAPI3REF:  Translate filenames
++**
++** These routines are available to [VFS|custom VFS implementations] for
++** translating filenames between the main database file, the journal file,
++** and the WAL file.
++**
++** If F is the name of an sqlite database file, journal file, or WAL file
++** passed by the SQLite core into the VFS, then sqlite3_filename_database(F)
++** returns the name of the corresponding database file.
++**
++** If F is the name of an sqlite database file, journal file, or WAL file
++** passed by the SQLite core into the VFS, or if F is a database filename
++** obtained from [sqlite3_db_filename()], then sqlite3_filename_journal(F)
++** returns the name of the corresponding rollback journal file.
++**
++** If F is the name of an sqlite database file, journal file, or WAL file
++** that was passed by the SQLite core into the VFS, or if F is a database
++** filename obtained from [sqlite3_db_filename()], then
++** sqlite3_filename_wal(F) returns the name of the corresponding
++** WAL file.
++**
++** In all of the above, if F is not the name of a database, journal or WAL
++** filename passed into the VFS from the SQLite core and F is not the
++** return value from [sqlite3_db_filename()], then the result is
++** undefined and is likely a memory access violation.
++*/
++SQLITE_API const char *sqlite3_filename_database(sqlite3_filename);
++SQLITE_API const char *sqlite3_filename_journal(sqlite3_filename);
++SQLITE_API const char *sqlite3_filename_wal(sqlite3_filename);
++
++/*
++** CAPI3REF:  Database File Corresponding To A Journal
++**
++** ^If X is the name of a rollback or WAL-mode journal file that is
++** passed into the xOpen method of [sqlite3_vfs], then
++** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
++** object that represents the main database file.
++**
++** This routine is intended for use in custom [VFS] implementations
++** only.  It is not a general-purpose interface.
++** The argument sqlite3_file_object(X) must be a filename pointer that
++** has been passed into [sqlite3_vfs].xOpen method where the
++** flags parameter to xOpen contains one of the bits
++** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL].  Any other use
++** of this routine results in undefined and probably undesirable
++** behavior.
++*/
++SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
++
++/*
++** CAPI3REF: Create and Destroy VFS Filenames
++**
++** These interfaces are provided for use by [VFS shim] implementations and
++** are not useful outside of that context.
++**
++** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
++** database filename D with corresponding journal file J and WAL file W and
++** with N URI parameters key/values pairs in the array P.  The result from
++** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
++** is safe to pass to routines like:
++** 
        
++** 
      •  [sqlite3_uri_parameter()],
++** 
      •  [sqlite3_uri_boolean()],
++** 
      •  [sqlite3_uri_int64()],
++** 
      •  [sqlite3_uri_key()],
++** 
      •  [sqlite3_filename_database()],
++** 
      •  [sqlite3_filename_journal()], or
++** 
      •  [sqlite3_filename_wal()].
++** 
      
++** If a memory allocation error occurs, sqlite3_create_filename() might
++** return a NULL pointer.  The memory obtained from sqlite3_create_filename(X)
++** must be released by a corresponding call to sqlite3_free_filename(Y).
++**
++** The P parameter in sqlite3_create_filename(D,J,W,N,P) should be an array
++** of 2*N pointers to strings.  Each pair of pointers in this array corresponds
++** to a key and value for a query parameter.  The P parameter may be a NULL
++** pointer if N is zero.  None of the 2*N pointers in the P array may be
++** NULL pointers and key pointers should not be empty strings.
++** None of the D, J, or W parameters to sqlite3_create_filename(D,J,W,N,P) may
++** be NULL pointers, though they can be empty strings.
++**
++** The sqlite3_free_filename(Y) routine releases a memory allocation
++** previously obtained from sqlite3_create_filename().  Invoking
++** sqlite3_free_filename(Y) where Y is a NULL pointer is a harmless no-op.
++**
++** If the Y parameter to sqlite3_free_filename(Y) is anything other
++** than a NULL pointer or a pointer previously acquired from
++** sqlite3_create_filename(), then bad things such as heap
++** corruption or segfaults may occur. The value Y should not be
++** used again after sqlite3_free_filename(Y) has been called.  This means
++** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
++** then the corresponding [sqlite3_module.xClose() method should also be
++** invoked prior to calling sqlite3_free_filename(Y).
++*/
++SQLITE_API sqlite3_filename sqlite3_create_filename(
++  const char *zDatabase,
++  const char *zJournal,
++  const char *zWal,
++  int nParam,
++  const char **azParam
++);
++SQLITE_API void sqlite3_free_filename(sqlite3_filename);
++
++/*
++** CAPI3REF: Error Codes And Messages
++** METHOD: sqlite3
++**
++** ^If the most recent sqlite3_* API call associated with
++** [database connection] D failed, then the sqlite3_errcode(D) interface
++** returns the numeric [result code] or [extended result code] for that
++** API call.
++** ^The sqlite3_extended_errcode()
++** interface is the same except that it always returns the
++** [extended result code] even when extended result codes are
++** disabled.
++**
++** The values returned by sqlite3_errcode() and/or
++** sqlite3_extended_errcode() might change with each API call.
++** Except, there are some interfaces that are guaranteed to never
++** change the value of the error code.  The error-code preserving
++** interfaces include the following:
++**
++** 
        
++** 
      •  sqlite3_errcode()
++** 
      •  sqlite3_extended_errcode()
++** 
      •  sqlite3_errmsg()
++** 
      •  sqlite3_errmsg16()
++** 
      •  sqlite3_error_offset()
++** 
      
++**
++** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
++** text that describes the error, as either UTF-8 or UTF-16 respectively,
++** or NULL if no error message is available.
++** (See how SQLite handles [invalid UTF] for exceptions to this rule.)
++** ^(Memory to hold the error message string is managed internally.
++** The application does not need to worry about freeing the result.
++** However, the error string might be overwritten or deallocated by
++** subsequent calls to other SQLite interface functions.)^
++**
++** ^The sqlite3_errstr(E) interface returns the English-language text
++** that describes the [result code] E, as UTF-8, or NULL if E is not an
++** result code for which a text error message is available.
++** ^(Memory to hold the error message string is managed internally
++** and must not be freed by the application)^.
++**
++** ^If the most recent error references a specific token in the input
++** SQL, the sqlite3_error_offset() interface returns the byte offset
++** of the start of that token.  ^The byte offset returned by
++** sqlite3_error_offset() assumes that the input SQL is UTF8.
++** ^If the most recent error does not reference a specific token in the input
++** SQL, then the sqlite3_error_offset() function returns -1.
++**
++** When the serialized [threading mode] is in use, it might be the
++** case that a second error occurs on a separate thread in between
++** the time of the first error and the call to these interfaces.
++** When that happens, the second error will be reported since these
++** interfaces always report the most recent result.  To avoid
++** this, each thread can obtain exclusive use of the [database connection] D
++** by invoking [sqlite3_mutex_enter]([sqlite3_db_mutex](D)) before beginning
++** to use D and invoking [sqlite3_mutex_leave]([sqlite3_db_mutex](D)) after
++** all calls to the interfaces listed here are completed.
++**
++** If an interface fails with SQLITE_MISUSE, that means the interface
++** was invoked incorrectly by the application.  In that case, the
++** error code and message may or may not be set.
++*/
++SQLITE_API int sqlite3_errcode(sqlite3 *db);
++SQLITE_API int sqlite3_extended_errcode(sqlite3 *db);
++SQLITE_API const char *sqlite3_errmsg(sqlite3*);
++SQLITE_API const void *sqlite3_errmsg16(sqlite3*);
++SQLITE_API const char *sqlite3_errstr(int);
++SQLITE_API int sqlite3_error_offset(sqlite3 *db);
++
++/*
++** CAPI3REF: Prepared Statement Object
++** KEYWORDS: {prepared statement} {prepared statements}
++**
++** An instance of this object represents a single SQL statement that
++** has been compiled into binary form and is ready to be evaluated.
++**
++** Think of each SQL statement as a separate computer program.  The
++** original SQL text is source code.  A prepared statement object
++** is the compiled object code.  All SQL must be converted into a
++** prepared statement before it can be run.
++**
++** The life-cycle of a prepared statement object usually goes like this:
++**
++** 
        
++** 
      1.  Create the prepared statement object using [sqlite3_prepare_v2()].
++** 
      2.  Bind values to [parameters] using the sqlite3_bind_*()
++**      interfaces.
++** 
      3.  Run the SQL by calling [sqlite3_step()] one or more times.
++** 
      4.  Reset the prepared statement using [sqlite3_reset()] then go back
++**      to step 2.  Do this zero or more times.
++** 
      5.  Destroy the object using [sqlite3_finalize()].
++** 
      
++*/
++typedef struct sqlite3_stmt sqlite3_stmt;
++
++/*
++** CAPI3REF: Run-time Limits
++** METHOD: sqlite3
++**
++** ^(This interface allows the size of various constructs to be limited
++** on a connection by connection basis.  The first parameter is the
++** [database connection] whose limit is to be set or queried.  The
++** second parameter is one of the [limit categories] that define a
++** class of constructs to be size limited.  The third parameter is the
++** new limit for that construct.)^
++**
++** ^If the new limit is a negative number, the limit is unchanged.
++** ^(For each limit category SQLITE_LIMIT_NAME there is a
++** [limits | hard upper bound]
++** set at compile-time by a C preprocessor macro called
++** [limits | SQLITE_MAX_NAME].
++** (The "_LIMIT_" in the name is changed to "_MAX_".))^
++** ^Attempts to increase a limit above its hard upper bound are
++** silently truncated to the hard upper bound.
++**
++** ^Regardless of whether or not the limit was changed, the
++** [sqlite3_limit()] interface returns the prior value of the limit.
++** ^Hence, to find the current value of a limit without changing it,
++** simply invoke this interface with the third parameter set to -1.
++**
++** Run-time limits are intended for use in applications that manage
++** both their own internal database and also databases that are controlled
++** by untrusted external sources.  An example application might be a
++** web browser that has its own databases for storing history and
++** separate databases controlled by JavaScript applications downloaded
++** off the Internet.  The internal databases can be given the
++** large, default limits.  Databases managed by external sources can
++** be given much smaller limits designed to prevent a denial of service
++** attack.  Developers might also want to use the [sqlite3_set_authorizer()]
++** interface to further control untrusted SQL.  The size of the database
++** created by an untrusted script can be contained using the
++** [max_page_count] [PRAGMA].
++**
++** New run-time limit categories may be added in future releases.
++*/
++SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
++
++/*
++** CAPI3REF: Run-Time Limit Categories
++** KEYWORDS: {limit category} {*limit categories}
++**
++** These constants define various performance limits
++** that can be lowered at run-time using [sqlite3_limit()].
++** The synopsis of the meanings of the various limits is shown below.
++** Additional information is available at [limits | Limits in SQLite].
++**
++** 
      
++** [[SQLITE_LIMIT_LENGTH]] ^(
      SQLITE_LIMIT_LENGTH
      
++** 
      The maximum size of any string or BLOB or table row, in bytes.
      )^
++**
++** [[SQLITE_LIMIT_SQL_LENGTH]] ^(
      SQLITE_LIMIT_SQL_LENGTH
      
++** 
      The maximum length of an SQL statement, in bytes.
      )^
++**
++** [[SQLITE_LIMIT_COLUMN]] ^(
      SQLITE_LIMIT_COLUMN
      
++** 
      The maximum number of columns in a table definition or in the
++** result set of a [SELECT] or the maximum number of columns in an index
++** or in an ORDER BY or GROUP BY clause.
      )^
++**
++** [[SQLITE_LIMIT_EXPR_DEPTH]] ^(
      SQLITE_LIMIT_EXPR_DEPTH
      
++** 
      The maximum depth of the parse tree on any expression.
      )^
++**
++** [[SQLITE_LIMIT_COMPOUND_SELECT]] ^(
      SQLITE_LIMIT_COMPOUND_SELECT
      
++** 
      The maximum number of terms in a compound SELECT statement.
      )^
++**
++** [[SQLITE_LIMIT_VDBE_OP]] ^(
      SQLITE_LIMIT_VDBE_OP
      
++** 
      The maximum number of instructions in a virtual machine program
++** used to implement an SQL statement.  If [sqlite3_prepare_v2()] or
++** the equivalent tries to allocate space for more than this many opcodes
++** in a single prepared statement, an SQLITE_NOMEM error is returned.
      )^
++**
++** [[SQLITE_LIMIT_FUNCTION_ARG]] ^(
      SQLITE_LIMIT_FUNCTION_ARG
      
++** 
      The maximum number of arguments on a function.
      )^
++**
++** [[SQLITE_LIMIT_ATTACHED]] ^(
      SQLITE_LIMIT_ATTACHED
      
++** 
      The maximum number of [ATTACH | attached databases].)^
      
++**
++** [[SQLITE_LIMIT_LIKE_PATTERN_LENGTH]]
++** ^(
      SQLITE_LIMIT_LIKE_PATTERN_LENGTH
      
++** 
      The maximum length of the pattern argument to the [LIKE] or
++** [GLOB] operators.
      )^
++**
++** [[SQLITE_LIMIT_VARIABLE_NUMBER]]
++** ^(
      SQLITE_LIMIT_VARIABLE_NUMBER
      
++** 
      The maximum index number of any [parameter] in an SQL statement.)^
++**
++** [[SQLITE_LIMIT_TRIGGER_DEPTH]] ^(
      SQLITE_LIMIT_TRIGGER_DEPTH
      
++** 
      The maximum depth of recursion for triggers.
      )^
++**
++** [[SQLITE_LIMIT_WORKER_THREADS]] ^(
      SQLITE_LIMIT_WORKER_THREADS
      
++** 
      The maximum number of auxiliary worker threads that a single
++** [prepared statement] may start.
      )^
++** 
      
++*/
++#define SQLITE_LIMIT_LENGTH                    0
++#define SQLITE_LIMIT_SQL_LENGTH                1
++#define SQLITE_LIMIT_COLUMN                    2
++#define SQLITE_LIMIT_EXPR_DEPTH                3
++#define SQLITE_LIMIT_COMPOUND_SELECT           4
++#define SQLITE_LIMIT_VDBE_OP                   5
++#define SQLITE_LIMIT_FUNCTION_ARG              6
++#define SQLITE_LIMIT_ATTACHED                  7
++#define SQLITE_LIMIT_LIKE_PATTERN_LENGTH       8
++#define SQLITE_LIMIT_VARIABLE_NUMBER           9
++#define SQLITE_LIMIT_TRIGGER_DEPTH            10
++#define SQLITE_LIMIT_WORKER_THREADS           11
++
++/*
++** CAPI3REF: Prepare Flags
++**
++** These constants define various flags that can be passed into
++** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
++** [sqlite3_prepare16_v3()] interfaces.
++**
++** New flags may be added in future releases of SQLite.
++**
++** 
      
++** [[SQLITE_PREPARE_PERSISTENT]] ^(
      SQLITE_PREPARE_PERSISTENT
      
++** 
      The SQLITE_PREPARE_PERSISTENT flag is a hint to the query planner
++** that the prepared statement will be retained for a long time and
++** probably reused many times.)^ ^Without this flag, [sqlite3_prepare_v3()]
++** and [sqlite3_prepare16_v3()] assume that the prepared statement will
++** be used just once or at most a few times and then destroyed using
++** [sqlite3_finalize()] relatively soon. The current implementation acts
++** on this hint by avoiding the use of [lookaside memory] so as not to
++** deplete the limited store of lookaside memory. Future versions of
++** SQLite may act on this hint differently.
++**
++** [[SQLITE_PREPARE_NORMALIZE]] 
      SQLITE_PREPARE_NORMALIZE
      
++** 
      The SQLITE_PREPARE_NORMALIZE flag is a no-op. This flag used
++** to be required for any prepared statement that wanted to use the
++** [sqlite3_normalized_sql()] interface.  However, the
++** [sqlite3_normalized_sql()] interface is now available to all
++** prepared statements, regardless of whether or not they use this
++** flag.
++**
++** [[SQLITE_PREPARE_NO_VTAB]] 
      SQLITE_PREPARE_NO_VTAB
      
++** 
      The SQLITE_PREPARE_NO_VTAB flag causes the SQL compiler
++** to return an error (error code SQLITE_ERROR) if the statement uses
++** any virtual tables.
++** 
      
++*/
++#define SQLITE_PREPARE_PERSISTENT              0x01
++#define SQLITE_PREPARE_NORMALIZE               0x02
++#define SQLITE_PREPARE_NO_VTAB                 0x04
++
++/*
++** CAPI3REF: Compiling An SQL Statement
++** KEYWORDS: {SQL statement compiler}
++** METHOD: sqlite3
++** CONSTRUCTOR: sqlite3_stmt
++**
++** To execute an SQL statement, it must first be compiled into a byte-code
++** program using one of these routines.  Or, in other words, these routines
++** are constructors for the [prepared statement] object.
++**
++** The preferred routine to use is [sqlite3_prepare_v2()].  The
++** [sqlite3_prepare()] interface is legacy and should be avoided.
++** [sqlite3_prepare_v3()] has an extra "prepFlags" option that is used
++** for special purposes.
++**
++** The use of the UTF-8 interfaces is preferred, as SQLite currently
++** does all parsing using UTF-8.  The UTF-16 interfaces are provided
++** as a convenience.  The UTF-16 interfaces work by converting the
++** input text into UTF-8, then invoking the corresponding UTF-8 interface.
++**
++** The first argument, "db", is a [database connection] obtained from a
++** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
++** [sqlite3_open16()].  The database connection must not have been closed.
++**
++** The second argument, "zSql", is the statement to be compiled, encoded
++** as either UTF-8 or UTF-16.  The sqlite3_prepare(), sqlite3_prepare_v2(),
++** and sqlite3_prepare_v3()
++** interfaces use UTF-8, and sqlite3_prepare16(), sqlite3_prepare16_v2(),
++** and sqlite3_prepare16_v3() use UTF-16.
++**
++** ^If the nByte argument is negative, then zSql is read up to the
++** first zero terminator. ^If nByte is positive, then it is the
++** number of bytes read from zSql.  ^If nByte is zero, then no prepared
++** statement is generated.
++** If the caller knows that the supplied string is nul-terminated, then
++** there is a small performance advantage to passing an nByte parameter that
++** is the number of bytes in the input string including
++** the nul-terminator.
++**
++** ^If pzTail is not NULL then *pzTail is made to point to the first byte
++** past the end of the first SQL statement in zSql.  These routines only
++** compile the first statement in zSql, so *pzTail is left pointing to
++** what remains uncompiled.
++**
++** ^*ppStmt is left pointing to a compiled [prepared statement] that can be
++** executed using [sqlite3_step()].  ^If there is an error, *ppStmt is set
++** to NULL.  ^If the input text contains no SQL (if the input is an empty
++** string or a comment) then *ppStmt is set to NULL.
++** The calling procedure is responsible for deleting the compiled
++** SQL statement using [sqlite3_finalize()] after it has finished with it.
++** ppStmt may not be NULL.
++**
++** ^On success, the sqlite3_prepare() family of routines return [SQLITE_OK];
++** otherwise an [error code] is returned.
++**
++** The sqlite3_prepare_v2(), sqlite3_prepare_v3(), sqlite3_prepare16_v2(),
++** and sqlite3_prepare16_v3() interfaces are recommended for all new programs.
++** The older interfaces (sqlite3_prepare() and sqlite3_prepare16())
++** are retained for backwards compatibility, but their use is discouraged.
++** ^In the "vX" interfaces, the prepared statement
++** that is returned (the [sqlite3_stmt] object) contains a copy of the
++** original SQL text. This causes the [sqlite3_step()] interface to
++** behave differently in three ways:
++**
++** 
        
++** 
      1. 
++** ^If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
++** always used to do, [sqlite3_step()] will automatically recompile the SQL
++** statement and try to run it again. As many as [SQLITE_MAX_SCHEMA_RETRY]
++** retries will occur before sqlite3_step() gives up and returns an error.
++** 
        2. 
++**
++** 
      2. 
++** ^When an error occurs, [sqlite3_step()] will return one of the detailed
++** [error codes] or [extended error codes].  ^The legacy behavior was that
++** [sqlite3_step()] would only return a generic [SQLITE_ERROR] result code
++** and the application would have to make a second call to [sqlite3_reset()]
++** in order to find the underlying cause of the problem. With the "v2" prepare
++** interfaces, the underlying reason for the error is returned immediately.
++** 
        3. 
++**
++** 
      3. 
++** ^If the specific value bound to a [parameter | host parameter] in the
++** WHERE clause might influence the choice of query plan for a statement,
++** then the statement will be automatically recompiled, as if there had been
++** a schema change, on the first [sqlite3_step()] call following any change
++** to the [sqlite3_bind_text | bindings] of that [parameter].
++** ^The specific value of a WHERE-clause [parameter] might influence the
++** choice of query plan if the parameter is the left-hand side of a [LIKE]
++** or [GLOB] operator or if the parameter is compared to an indexed column
++** and the [SQLITE_ENABLE_STAT4] compile-time option is enabled.
++** 
        4. 
++** 
      
++**
++** 
      ^sqlite3_prepare_v3() differs from sqlite3_prepare_v2() only in having
++** the extra prepFlags parameter, which is a bit array consisting of zero or
++** more of the [SQLITE_PREPARE_PERSISTENT|SQLITE_PREPARE_*] flags.  ^The
++** sqlite3_prepare_v2() interface works exactly the same as
++** sqlite3_prepare_v3() with a zero prepFlags parameter.
++*/
++SQLITE_API int sqlite3_prepare(
++  sqlite3 *db,            /* Database handle */
++  const char *zSql,       /* SQL statement, UTF-8 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++SQLITE_API int sqlite3_prepare_v2(
++  sqlite3 *db,            /* Database handle */
++  const char *zSql,       /* SQL statement, UTF-8 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++SQLITE_API int sqlite3_prepare_v3(
++  sqlite3 *db,            /* Database handle */
++  const char *zSql,       /* SQL statement, UTF-8 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++SQLITE_API int sqlite3_prepare16(
++  sqlite3 *db,            /* Database handle */
++  const void *zSql,       /* SQL statement, UTF-16 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++SQLITE_API int sqlite3_prepare16_v2(
++  sqlite3 *db,            /* Database handle */
++  const void *zSql,       /* SQL statement, UTF-16 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++SQLITE_API int sqlite3_prepare16_v3(
++  sqlite3 *db,            /* Database handle */
++  const void *zSql,       /* SQL statement, UTF-16 encoded */
++  int nByte,              /* Maximum length of zSql in bytes. */
++  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
++  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
++  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
++);
++
++/*
++** CAPI3REF: Retrieving Statement SQL
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_sql(P) interface returns a pointer to a copy of the UTF-8
++** SQL text used to create [prepared statement] P if P was
++** created by [sqlite3_prepare_v2()], [sqlite3_prepare_v3()],
++** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
++** ^The sqlite3_expanded_sql(P) interface returns a pointer to a UTF-8
++** string containing the SQL text of prepared statement P with
++** [bound parameters] expanded.
++** ^The sqlite3_normalized_sql(P) interface returns a pointer to a UTF-8
++** string containing the normalized SQL text of prepared statement P.  The
++** semantics used to normalize a SQL statement are unspecified and subject
++** to change.  At a minimum, literal values will be replaced with suitable
++** placeholders.
++**
++** ^(For example, if a prepared statement is created using the SQL
++** text "SELECT $abc,:xyz" and if parameter $abc is bound to integer 2345
++** and parameter :xyz is unbound, then sqlite3_sql() will return
++** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
++** will return "SELECT 2345,NULL".)^
++**
++** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
++** is available to hold the result, or if the result would exceed the
++** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
++**
++** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
++** bound parameter expansions.  ^The [SQLITE_OMIT_TRACE] compile-time
++** option causes sqlite3_expanded_sql() to always return NULL.
++**
++** ^The strings returned by sqlite3_sql(P) and sqlite3_normalized_sql(P)
++** are managed by SQLite and are automatically freed when the prepared
++** statement is finalized.
++** ^The string returned by sqlite3_expanded_sql(P), on the other hand,
++** is obtained from [sqlite3_malloc()] and must be freed by the application
++** by passing it to [sqlite3_free()].
++**
++** ^The sqlite3_normalized_sql() interface is only available if
++** the [SQLITE_ENABLE_NORMALIZE] compile-time option is defined.
++*/
++SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt);
++SQLITE_API char *sqlite3_expanded_sql(sqlite3_stmt *pStmt);
++#ifdef SQLITE_ENABLE_NORMALIZE
++SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);
++#endif
++
++/*
++** CAPI3REF: Determine If An SQL Statement Writes The Database
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
++** and only if the [prepared statement] X makes no direct changes to
++** the content of the database file.
++**
++** Note that [application-defined SQL functions] or
++** [virtual tables] might change the database indirectly as a side effect.
++** ^(For example, if an application defines a function "eval()" that
++** calls [sqlite3_exec()], then the following SQL statement would
++** change the database file through side-effects:
++**
++** 
      ++**    SELECT eval('DELETE FROM t1') FROM t2;
++** 
      
++**
++** But because the [SELECT] statement does not change the database file
++** directly, sqlite3_stmt_readonly() would still return true.)^
++**
++** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
++** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
++** since the statements themselves do not actually modify the database but
++** rather they control the timing of when other statements modify the
++** database.  ^The [ATTACH] and [DETACH] statements also cause
++** sqlite3_stmt_readonly() to return true since, while those statements
++** change the configuration of a database connection, they do not make
++** changes to the content of the database files on disk.
++** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
++** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
++** [BEGIN|BEGIN EXCLUSIVE] commands do touch the database and so
++** sqlite3_stmt_readonly() returns false for those commands.
++**
++** ^This routine returns false if there is any possibility that the
++** statement might change the database file.  ^A false return does
++** not guarantee that the statement will change the database file.
++** ^For example, an UPDATE statement might have a WHERE clause that
++** makes it a no-op, but the sqlite3_stmt_readonly() result would still
++** be false.  ^Similarly, a CREATE TABLE IF NOT EXISTS statement is a
++** read-only no-op if the table already exists, but
++** sqlite3_stmt_readonly() still returns false for such a statement.
++**
++** ^If prepared statement X is an [EXPLAIN] or [EXPLAIN QUERY PLAN]
++** statement, then sqlite3_stmt_readonly(X) returns the same value as
++** if the EXPLAIN or EXPLAIN QUERY PLAN prefix were omitted.
++*/
++SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Query The EXPLAIN Setting For A Prepared Statement
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_stmt_isexplain(S) interface returns 1 if the
++** prepared statement S is an EXPLAIN statement, or 2 if the
++** statement S is an EXPLAIN QUERY PLAN.
++** ^The sqlite3_stmt_isexplain(S) interface returns 0 if S is
++** an ordinary statement or a NULL pointer.
++*/
++SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Change The EXPLAIN Setting For A Prepared Statement
++** METHOD: sqlite3_stmt
++**
++** The sqlite3_stmt_explain(S,E) interface changes the EXPLAIN
++** setting for [prepared statement] S.  If E is zero, then S becomes
++** a normal prepared statement.  If E is 1, then S behaves as if
++** its SQL text began with "[EXPLAIN]".  If E is 2, then S behaves as if
++** its SQL text began with "[EXPLAIN QUERY PLAN]".
++**
++** Calling sqlite3_stmt_explain(S,E) might cause S to be reprepared.
++** SQLite tries to avoid a reprepare, but a reprepare might be necessary
++** on the first transition into EXPLAIN or EXPLAIN QUERY PLAN mode.
++**
++** Because of the potential need to reprepare, a call to
++** sqlite3_stmt_explain(S,E) will fail with SQLITE_ERROR if S cannot be
++** reprepared because it was created using [sqlite3_prepare()] instead of
++** the newer [sqlite3_prepare_v2()] or [sqlite3_prepare_v3()] interfaces and
++** hence has no saved SQL text with which to reprepare.
++**
++** Changing the explain setting for a prepared statement does not change
++** the original SQL text for the statement.  Hence, if the SQL text originally
++** began with EXPLAIN or EXPLAIN QUERY PLAN, but sqlite3_stmt_explain(S,0)
++** is called to convert the statement into an ordinary statement, the EXPLAIN
++** or EXPLAIN QUERY PLAN keywords will still appear in the sqlite3_sql(S)
++** output, even though the statement now acts like a normal SQL statement.
++**
++** This routine returns SQLITE_OK if the explain mode is successfully
++** changed, or an error code if the explain mode could not be changed.
++** The explain mode cannot be changed while a statement is active.
++** Hence, it is good practice to call [sqlite3_reset(S)]
++** immediately prior to calling sqlite3_stmt_explain(S,E).
++*/
++SQLITE_API int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode);
++
++/*
++** CAPI3REF: Determine If A Prepared Statement Has Been Reset
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
++** [prepared statement] S has been stepped at least once using
++** [sqlite3_step(S)] but has neither run to completion (returned
++** [SQLITE_DONE] from [sqlite3_step(S)]) nor
++** been reset using [sqlite3_reset(S)].  ^The sqlite3_stmt_busy(S)
++** interface returns false if S is a NULL pointer.  If S is not a
++** NULL pointer and is not a pointer to a valid [prepared statement]
++** object, then the behavior is undefined and probably undesirable.
++**
++** This interface can be used in combination [sqlite3_next_stmt()]
++** to locate all prepared statements associated with a database
++** connection that are in need of being reset.  This can be used,
++** for example, in diagnostic routines to search for prepared
++** statements that are holding a transaction open.
++*/
++SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Dynamically Typed Value Object
++** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
++**
++** SQLite uses the sqlite3_value object to represent all values
++** that can be stored in a database table. SQLite uses dynamic typing
++** for the values it stores.  ^Values stored in sqlite3_value objects
++** can be integers, floating point values, strings, BLOBs, or NULL.
++**
++** An sqlite3_value object may be either "protected" or "unprotected".
++** Some interfaces require a protected sqlite3_value.  Other interfaces
++** will accept either a protected or an unprotected sqlite3_value.
++** Every interface that accepts sqlite3_value arguments specifies
++** whether or not it requires a protected sqlite3_value.  The
++** [sqlite3_value_dup()] interface can be used to construct a new
++** protected sqlite3_value from an unprotected sqlite3_value.
++**
++** The terms "protected" and "unprotected" refer to whether or not
++** a mutex is held.  An internal mutex is held for a protected
++** sqlite3_value object but no mutex is held for an unprotected
++** sqlite3_value object.  If SQLite is compiled to be single-threaded
++** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
++** or if SQLite is run in one of reduced mutex modes
++** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
++** then there is no distinction between protected and unprotected
++** sqlite3_value objects and they can be used interchangeably.  However,
++** for maximum code portability it is recommended that applications
++** still make the distinction between protected and unprotected
++** sqlite3_value objects even when not strictly required.
++**
++** ^The sqlite3_value objects that are passed as parameters into the
++** implementation of [application-defined SQL functions] are protected.
++** ^The sqlite3_value objects returned by [sqlite3_vtab_rhs_value()]
++** are protected.
++** ^The sqlite3_value object returned by
++** [sqlite3_column_value()] is unprotected.
++** Unprotected sqlite3_value objects may only be used as arguments
++** to [sqlite3_result_value()], [sqlite3_bind_value()], and
++** [sqlite3_value_dup()].
++** The [sqlite3_value_blob | sqlite3_value_type()] family of
++** interfaces require protected sqlite3_value objects.
++*/
++typedef struct sqlite3_value sqlite3_value;
++
++/*
++** CAPI3REF: SQL Function Context Object
++**
++** The context in which an SQL function executes is stored in an
++** sqlite3_context object.  ^A pointer to an sqlite3_context object
++** is always first parameter to [application-defined SQL functions].
++** The application-defined SQL function implementation will pass this
++** pointer through into calls to [sqlite3_result_int | sqlite3_result()],
++** [sqlite3_aggregate_context()], [sqlite3_user_data()],
++** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
++** and/or [sqlite3_set_auxdata()].
++*/
++typedef struct sqlite3_context sqlite3_context;
++
++/*
++** CAPI3REF: Binding Values To Prepared Statements
++** KEYWORDS: {host parameter} {host parameters} {host parameter name}
++** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
++** METHOD: sqlite3_stmt
++**
++** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
++** literals may be replaced by a [parameter] that matches one of following
++** templates:
++**
++** 
        
++** 
      •   ?
++** 
      •   ?NNN
++** 
      •   :VVV
++** 
      •   @VVV
++** 
      •   $VVV
++** 
      
++**
++** In the templates above, NNN represents an integer literal,
++** and VVV represents an alphanumeric identifier.)^  ^The values of these
++** parameters (also called "host parameter names" or "SQL parameters")
++** can be set using the sqlite3_bind_*() routines defined here.
++**
++** ^The first argument to the sqlite3_bind_*() routines is always
++** a pointer to the [sqlite3_stmt] object returned from
++** [sqlite3_prepare_v2()] or its variants.
++**
++** ^The second argument is the index of the SQL parameter to be set.
++** ^The leftmost SQL parameter has an index of 1.  ^When the same named
++** SQL parameter is used more than once, second and subsequent
++** occurrences have the same index as the first occurrence.
++** ^The index for named parameters can be looked up using the
++** [sqlite3_bind_parameter_index()] API if desired.  ^The index
++** for "?NNN" parameters is the value of NNN.
++** ^The NNN value must be between 1 and the [sqlite3_limit()]
++** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 32766).
++**
++** ^The third argument is the value to bind to the parameter.
++** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
++** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
++** is ignored and the end result is the same as sqlite3_bind_null().
++** ^If the third parameter to sqlite3_bind_text() is not NULL, then
++** it should be a pointer to well-formed UTF8 text.
++** ^If the third parameter to sqlite3_bind_text16() is not NULL, then
++** it should be a pointer to well-formed UTF16 text.
++** ^If the third parameter to sqlite3_bind_text64() is not NULL, then
++** it should be a pointer to a well-formed unicode string that is
++** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
++** otherwise.
++**
++** [[byte-order determination rules]] ^The byte-order of
++** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
++** found in first character, which is removed, or in the absence of a BOM
++** the byte order is the native byte order of the host
++** machine for sqlite3_bind_text16() or the byte order specified in
++** the 6th parameter for sqlite3_bind_text64().)^
++** ^If UTF16 input text contains invalid unicode
++** characters, then SQLite might change those invalid characters
++** into the unicode replacement character: U+FFFD.
++**
++** ^(In those routines that have a fourth argument, its value is the
++** number of bytes in the parameter.  To be clear: the value is the
++** number of bytes in the value, not the number of characters.)^
++** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16()
++** is negative, then the length of the string is
++** the number of bytes up to the first zero terminator.
++** If the fourth parameter to sqlite3_bind_blob() is negative, then
++** the behavior is undefined.
++** If a non-negative fourth parameter is provided to sqlite3_bind_text()
++** or sqlite3_bind_text16() or sqlite3_bind_text64() then
++** that parameter must be the byte offset
++** where the NUL terminator would occur assuming the string were NUL
++** terminated.  If any NUL characters occurs at byte offsets less than
++** the value of the fourth parameter then the resulting string value will
++** contain embedded NULs.  The result of expressions involving strings
++** with embedded NULs is undefined.
++**
++** ^The fifth argument to the BLOB and string binding interfaces controls
++** or indicates the lifetime of the object referenced by the third parameter.
++** These three options exist:
++** ^ (1) A destructor to dispose of the BLOB or string after SQLite has finished
++** with it may be passed. ^It is called to dispose of the BLOB or string even
++** if the call to the bind API fails, except the destructor is not called if
++** the third parameter is a NULL pointer or the fourth parameter is negative.
++** ^ (2) The special constant, [SQLITE_STATIC], may be passed to indicate that
++** the application remains responsible for disposing of the object. ^In this
++** case, the object and the provided pointer to it must remain valid until
++** either the prepared statement is finalized or the same SQL parameter is
++** bound to something else, whichever occurs sooner.
++** ^ (3) The constant, [SQLITE_TRANSIENT], may be passed to indicate that the
++** object is to be copied prior to the return from sqlite3_bind_*(). ^The
++** object and pointer to it must remain valid until then. ^SQLite will then
++** manage the lifetime of its private copy.
++**
++** ^The sixth argument to sqlite3_bind_text64() must be one of
++** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
++** to specify the encoding of the text in the third parameter.  If
++** the sixth argument to sqlite3_bind_text64() is not one of the
++** allowed values shown above, or if the text encoding is different
++** from the encoding specified by the sixth parameter, then the behavior
++** is undefined.
++**
++** ^The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
++** is filled with zeroes.  ^A zeroblob uses a fixed amount of memory
++** (just an integer to hold its size) while it is being processed.
++** Zeroblobs are intended to serve as placeholders for BLOBs whose
++** content is later written using
++** [sqlite3_blob_open | incremental BLOB I/O] routines.
++** ^A negative value for the zeroblob results in a zero-length BLOB.
++**
++** ^The sqlite3_bind_pointer(S,I,P,T,D) routine causes the I-th parameter in
++** [prepared statement] S to have an SQL value of NULL, but to also be
++** associated with the pointer P of type T.  ^D is either a NULL pointer or
++** a pointer to a destructor function for P. ^SQLite will invoke the
++** destructor D with a single argument of P when it is finished using
++** P.  The T parameter should be a static string, preferably a string
++** literal. The sqlite3_bind_pointer() routine is part of the
++** [pointer passing interface] added for SQLite 3.20.0.
++**
++** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
++** for the [prepared statement] or with a prepared statement for which
++** [sqlite3_step()] has been called more recently than [sqlite3_reset()],
++** then the call will return [SQLITE_MISUSE].  If any sqlite3_bind_()
++** routine is passed a [prepared statement] that has been finalized, the
++** result is undefined and probably harmful.
++**
++** ^Bindings are not cleared by the [sqlite3_reset()] routine.
++** ^Unbound parameters are interpreted as NULL.
++**
++** ^The sqlite3_bind_* routines return [SQLITE_OK] on success or an
++** [error code] if anything goes wrong.
++** ^[SQLITE_TOOBIG] might be returned if the size of a string or BLOB
++** exceeds limits imposed by [sqlite3_limit]([SQLITE_LIMIT_LENGTH]) or
++** [SQLITE_MAX_LENGTH].
++** ^[SQLITE_RANGE] is returned if the parameter
++** index is out of range.  ^[SQLITE_NOMEM] is returned if malloc() fails.
++**
++** See also: [sqlite3_bind_parameter_count()],
++** [sqlite3_bind_parameter_name()], and [sqlite3_bind_parameter_index()].
++*/
++SQLITE_API int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
++SQLITE_API int sqlite3_bind_blob64(sqlite3_stmt*, int, const void*, sqlite3_uint64,
++                        void(*)(void*));
++SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
++SQLITE_API int sqlite3_bind_int(sqlite3_stmt*, int, int);
++SQLITE_API int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
++SQLITE_API int sqlite3_bind_null(sqlite3_stmt*, int);
++SQLITE_API int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
++SQLITE_API int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
++SQLITE_API int sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
++                         void(*)(void*), unsigned char encoding);
++SQLITE_API int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
++SQLITE_API int sqlite3_bind_pointer(sqlite3_stmt*, int, void*, const char*,void(*)(void*));
++SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
++SQLITE_API int sqlite3_bind_zeroblob64(sqlite3_stmt*, int, sqlite3_uint64);
++
++/*
++** CAPI3REF: Number Of SQL Parameters
++** METHOD: sqlite3_stmt
++**
++** ^This routine can be used to find the number of [SQL parameters]
++** in a [prepared statement].  SQL parameters are tokens of the
++** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
++** placeholders for values that are [sqlite3_bind_blob | bound]
++** to the parameters at a later time.
++**
++** ^(This routine actually returns the index of the largest (rightmost)
++** parameter. For all forms except ?NNN, this will correspond to the
++** number of unique parameters.  If parameters of the ?NNN form are used,
++** there may be gaps in the list.)^
++**
++** See also: [sqlite3_bind_blob|sqlite3_bind()],
++** [sqlite3_bind_parameter_name()], and
++** [sqlite3_bind_parameter_index()].
++*/
++SQLITE_API int sqlite3_bind_parameter_count(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Name Of A Host Parameter
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_bind_parameter_name(P,N) interface returns
++** the name of the N-th [SQL parameter] in the [prepared statement] P.
++** ^(SQL parameters of the form "?NNN" or ":AAA" or "@AAA" or "$AAA"
++** have a name which is the string "?NNN" or ":AAA" or "@AAA" or "$AAA"
++** respectively.
++** In other words, the initial ":" or "$" or "@" or "?"
++** is included as part of the name.)^
++** ^Parameters of the form "?" without a following integer have no name
++** and are referred to as "nameless" or "anonymous parameters".
++**
++** ^The first host parameter has an index of 1, not 0.
++**
++** ^If the value N is out of range or if the N-th parameter is
++** nameless, then NULL is returned.  ^The returned string is
++** always in UTF-8 encoding even if the named parameter was
++** originally specified as UTF-16 in [sqlite3_prepare16()],
++** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
++**
++** See also: [sqlite3_bind_blob|sqlite3_bind()],
++** [sqlite3_bind_parameter_count()], and
++** [sqlite3_bind_parameter_index()].
++*/
++SQLITE_API const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
++
++/*
++** CAPI3REF: Index Of A Parameter With A Given Name
++** METHOD: sqlite3_stmt
++**
++** ^Return the index of an SQL parameter given its name.  ^The
++** index value returned is suitable for use as the second
++** parameter to [sqlite3_bind_blob|sqlite3_bind()].  ^A zero
++** is returned if no matching parameter is found.  ^The parameter
++** name must be given in UTF-8 even if the original statement
++** was prepared from UTF-16 text using [sqlite3_prepare16_v2()] or
++** [sqlite3_prepare16_v3()].
++**
++** See also: [sqlite3_bind_blob|sqlite3_bind()],
++** [sqlite3_bind_parameter_count()], and
++** [sqlite3_bind_parameter_name()].
++*/
++SQLITE_API int sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
++
++/*
++** CAPI3REF: Reset All Bindings On A Prepared Statement
++** METHOD: sqlite3_stmt
++**
++** ^Contrary to the intuition of many, [sqlite3_reset()] does not reset
++** the [sqlite3_bind_blob | bindings] on a [prepared statement].
++** ^Use this routine to reset all host parameters to NULL.
++*/
++SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Number Of Columns In A Result Set
++** METHOD: sqlite3_stmt
++**
++** ^Return the number of columns in the result set returned by the
++** [prepared statement]. ^If this routine returns 0, that means the
++** [prepared statement] returns no data (for example an [UPDATE]).
++** ^However, just because this routine returns a positive number does not
++** mean that one or more rows of data will be returned.  ^A SELECT statement
++** will always have a positive sqlite3_column_count() but depending on the
++** WHERE clause constraints and the table content, it might return no rows.
++**
++** See also: [sqlite3_data_count()]
++*/
++SQLITE_API int sqlite3_column_count(sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Column Names In A Result Set
++** METHOD: sqlite3_stmt
++**
++** ^These routines return the name assigned to a particular column
++** in the result set of a [SELECT] statement.  ^The sqlite3_column_name()
++** interface returns a pointer to a zero-terminated UTF-8 string
++** and sqlite3_column_name16() returns a pointer to a zero-terminated
++** UTF-16 string.  ^The first parameter is the [prepared statement]
++** that implements the [SELECT] statement. ^The second parameter is the
++** column number.  ^The leftmost column is number 0.
++**
++** ^The returned string pointer is valid until either the [prepared statement]
++** is destroyed by [sqlite3_finalize()] or until the statement is automatically
++** reprepared by the first call to [sqlite3_step()] for a particular run
++** or until the next call to
++** sqlite3_column_name() or sqlite3_column_name16() on the same column.
++**
++** ^If sqlite3_malloc() fails during the processing of either routine
++** (for example during a conversion from UTF-8 to UTF-16) then a
++** NULL pointer is returned.
++**
++** ^The name of a result column is the value of the "AS" clause for
++** that column, if there is an AS clause.  If there is no AS clause
++** then the name of the column is unspecified and may change from
++** one release of SQLite to the next.
++*/
++SQLITE_API const char *sqlite3_column_name(sqlite3_stmt*, int N);
++SQLITE_API const void *sqlite3_column_name16(sqlite3_stmt*, int N);
++
++/*
++** CAPI3REF: Source Of Data In A Query Result
++** METHOD: sqlite3_stmt
++**
++** ^These routines provide a means to determine the database, table, and
++** table column that is the origin of a particular result column in
++** [SELECT] statement.
++** ^The name of the database or table or column can be returned as
++** either a UTF-8 or UTF-16 string.  ^The _database_ routines return
++** the database name, the _table_ routines return the table name, and
++** the origin_ routines return the column name.
++** ^The returned string is valid until the [prepared statement] is destroyed
++** using [sqlite3_finalize()] or until the statement is automatically
++** reprepared by the first call to [sqlite3_step()] for a particular run
++** or until the same information is requested
++** again in a different encoding.
++**
++** ^The names returned are the original un-aliased names of the
++** database, table, and column.
++**
++** ^The first argument to these interfaces is a [prepared statement].
++** ^These functions return information about the Nth result column returned by
++** the statement, where N is the second function argument.
++** ^The left-most column is column 0 for these routines.
++**
++** ^If the Nth column returned by the statement is an expression or
++** subquery and is not a column value, then all of these functions return
++** NULL.  ^These routines might also return NULL if a memory allocation error
++** occurs.  ^Otherwise, they return the name of the attached database, table,
++** or column that query result column was extracted from.
++**
++** ^As with all other SQLite APIs, those whose names end with "16" return
++** UTF-16 encoded strings and the other functions return UTF-8.
++**
++** ^These APIs are only available if the library was compiled with the
++** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol.
++**
++** If two or more threads call one or more
++** [sqlite3_column_database_name | column metadata interfaces]
++** for the same [prepared statement] and result column
++** at the same time then the results are undefined.
++*/
++SQLITE_API const char *sqlite3_column_database_name(sqlite3_stmt*,int);
++SQLITE_API const void *sqlite3_column_database_name16(sqlite3_stmt*,int);
++SQLITE_API const char *sqlite3_column_table_name(sqlite3_stmt*,int);
++SQLITE_API const void *sqlite3_column_table_name16(sqlite3_stmt*,int);
++SQLITE_API const char *sqlite3_column_origin_name(sqlite3_stmt*,int);
++SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt*,int);
++
++/*
++** CAPI3REF: Declared Datatype Of A Query Result
++** METHOD: sqlite3_stmt
++**
++** ^(The first parameter is a [prepared statement].
++** If this statement is a [SELECT] statement and the Nth column of the
++** returned result set of that [SELECT] is a table column (not an
++** expression or subquery) then the declared type of the table
++** column is returned.)^  ^If the Nth column of the result set is an
++** expression or subquery, then a NULL pointer is returned.
++** ^The returned string is always UTF-8 encoded.
++**
++** ^(For example, given the database schema:
++**
++** CREATE TABLE t1(c1 VARIANT);
++**
++** and the following statement to be compiled:
++**
++** SELECT c1 + 1, c1 FROM t1;
++**
++** this routine would return the string "VARIANT" for the second result
++** column (i==1), and a NULL pointer for the first result column (i==0).)^
++**
++** ^SQLite uses dynamic run-time typing.  ^So just because a column
++** is declared to contain a particular type does not mean that the
++** data stored in that column is of the declared type.  SQLite is
++** strongly typed, but the typing is dynamic not static.  ^Type
++** is associated with individual values, not with the containers
++** used to hold those values.
++*/
++SQLITE_API const char *sqlite3_column_decltype(sqlite3_stmt*,int);
++SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
++
++/*
++** CAPI3REF: Evaluate An SQL Statement
++** METHOD: sqlite3_stmt
++**
++** After a [prepared statement] has been prepared using any of
++** [sqlite3_prepare_v2()], [sqlite3_prepare_v3()], [sqlite3_prepare16_v2()],
++** or [sqlite3_prepare16_v3()] or one of the legacy
++** interfaces [sqlite3_prepare()] or [sqlite3_prepare16()], this function
++** must be called one or more times to evaluate the statement.
++**
++** The details of the behavior of the sqlite3_step() interface depend
++** on whether the statement was prepared using the newer "vX" interfaces
++** [sqlite3_prepare_v3()], [sqlite3_prepare_v2()], [sqlite3_prepare16_v3()],
++** [sqlite3_prepare16_v2()] or the older legacy
++** interfaces [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
++** new "vX" interface is recommended for new applications but the legacy
++** interface will continue to be supported.
++**
++** ^In the legacy interface, the return value will be either [SQLITE_BUSY],
++** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
++** ^With the "v2" interface, any of the other [result codes] or
++** [extended result codes] might be returned as well.
++**
++** ^[SQLITE_BUSY] means that the database engine was unable to acquire the
++** database locks it needs to do its job.  ^If the statement is a [COMMIT]
++** or occurs outside of an explicit transaction, then you can retry the
++** statement.  If the statement is not a [COMMIT] and occurs within an
++** explicit transaction then you should rollback the transaction before
++** continuing.
++**
++** ^[SQLITE_DONE] means that the statement has finished executing
++** successfully.  sqlite3_step() should not be called again on this virtual
++** machine without first calling [sqlite3_reset()] to reset the virtual
++** machine back to its initial state.
++**
++** ^If the SQL statement being executed returns any data, then [SQLITE_ROW]
++** is returned each time a new row of data is ready for processing by the
++** caller. The values may be accessed using the [column access functions].
++** sqlite3_step() is called again to retrieve the next row of data.
++**
++** ^[SQLITE_ERROR] means that a run-time error (such as a constraint
++** violation) has occurred.  sqlite3_step() should not be called again on
++** the VM. More information may be found by calling [sqlite3_errmsg()].
++** ^With the legacy interface, a more specific error code (for example,
++** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
++** can be obtained by calling [sqlite3_reset()] on the
++** [prepared statement].  ^In the "v2" interface,
++** the more specific error code is returned directly by sqlite3_step().
++**
++** [SQLITE_MISUSE] means that the this routine was called inappropriately.
++** Perhaps it was called on a [prepared statement] that has
++** already been [sqlite3_finalize | finalized] or on one that had
++** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
++** be the case that the same database connection is being used by two or
++** more threads at the same moment in time.
++**
++** For all versions of SQLite up to and including 3.6.23.1, a call to
++** [sqlite3_reset()] was required after sqlite3_step() returned anything
++** other than [SQLITE_ROW] before any subsequent invocation of
++** sqlite3_step().  Failure to reset the prepared statement using
++** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
++** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
++** sqlite3_step() began
++** calling [sqlite3_reset()] automatically in this circumstance rather
++** than returning [SQLITE_MISUSE].  This is not considered a compatibility
++** break because any application that ever receives an SQLITE_MISUSE error
++** is broken by definition.  The [SQLITE_OMIT_AUTORESET] compile-time option
++** can be used to restore the legacy behavior.
++**
++** Goofy Interface Alert: In the legacy interface, the sqlite3_step()
++** API always returns a generic error code, [SQLITE_ERROR], following any
++** error other than [SQLITE_BUSY] and [SQLITE_MISUSE].  You must call
++** [sqlite3_reset()] or [sqlite3_finalize()] in order to find one of the
++** specific [error codes] that better describes the error.
++** We admit that this is a goofy design.  The problem has been fixed
++** with the "v2" interface.  If you prepare all of your SQL statements
++** using [sqlite3_prepare_v3()] or [sqlite3_prepare_v2()]
++** or [sqlite3_prepare16_v2()] or [sqlite3_prepare16_v3()] instead
++** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()] interfaces,
++** then the more specific [error codes] are returned directly
++** by sqlite3_step().  The use of the "vX" interfaces is recommended.
++*/
++SQLITE_API int sqlite3_step(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Number of columns in a result set
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_data_count(P) interface returns the number of columns in the
++** current row of the result set of [prepared statement] P.
++** ^If prepared statement P does not have results ready to return
++** (via calls to the [sqlite3_column_int | sqlite3_column()] family of
++** interfaces) then sqlite3_data_count(P) returns 0.
++** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
++** ^The sqlite3_data_count(P) routine returns 0 if the previous call to
++** [sqlite3_step](P) returned [SQLITE_DONE].  ^The sqlite3_data_count(P)
++** will return non-zero if previous call to [sqlite3_step](P) returned
++** [SQLITE_ROW], except in the case of the [PRAGMA incremental_vacuum]
++** where it always returns zero since each step of that multi-step
++** pragma returns 0 columns of data.
++**
++** See also: [sqlite3_column_count()]
++*/
++SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Fundamental Datatypes
++** KEYWORDS: SQLITE_TEXT
++**
++** ^(Every value in SQLite has one of five fundamental datatypes:
++**
++** 
        
++** 
      •  64-bit signed integer
++** 
      •  64-bit IEEE floating point number
++** 
      •  string
++** 
      •  BLOB
++** 
      •  NULL
++** 
      )^
++**
++** These constants are codes for each of those types.
++**
++** Note that the SQLITE_TEXT constant was also used in SQLite version 2
++** for a completely different meaning.  Software that links against both
++** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT, not
++** SQLITE_TEXT.
++*/
++#define SQLITE_INTEGER  1
++#define SQLITE_FLOAT    2
++#define SQLITE_BLOB     4
++#define SQLITE_NULL     5
++#ifdef SQLITE_TEXT
++# undef SQLITE_TEXT
++#else
++# define SQLITE_TEXT     3
++#endif
++#define SQLITE3_TEXT     3
++
++/*
++** CAPI3REF: Result Values From A Query
++** KEYWORDS: {column access functions}
++** METHOD: sqlite3_stmt
++**
++** Summary:
++** 
      
++** 
      sqlite3_column_blob→BLOB result
++** 
      sqlite3_column_double→REAL result
++** 
      sqlite3_column_int→32-bit INTEGER result
++** 
      sqlite3_column_int64→64-bit INTEGER result
++** 
      sqlite3_column_text→UTF-8 TEXT result
++** 
      sqlite3_column_text16→UTF-16 TEXT result
++** 
      sqlite3_column_value→The result as an
++** [sqlite3_value|unprotected sqlite3_value] object.
++** 
         
++** 
      sqlite3_column_bytes→Size of a BLOB
++** or a UTF-8 TEXT result in bytes
++** 
      sqlite3_column_bytes16  
++** →  Size of UTF-16
++** TEXT in bytes
++** 
      sqlite3_column_type→Default
++** datatype of the result
++** 
      
++**
++** Details:
++**
++** ^These routines return information about a single column of the current
++** result row of a query.  ^In every case the first argument is a pointer
++** to the [prepared statement] that is being evaluated (the [sqlite3_stmt*]
++** that was returned from [sqlite3_prepare_v2()] or one of its variants)
++** and the second argument is the index of the column for which information
++** should be returned. ^The leftmost column of the result set has the index 0.
++** ^The number of columns in the result can be determined using
++** [sqlite3_column_count()].
++**
++** If the SQL statement does not currently point to a valid row, or if the
++** column index is out of range, the result is undefined.
++** These routines may only be called when the most recent call to
++** [sqlite3_step()] has returned [SQLITE_ROW] and neither
++** [sqlite3_reset()] nor [sqlite3_finalize()] have been called subsequently.
++** If any of these routines are called after [sqlite3_reset()] or
++** [sqlite3_finalize()] or after [sqlite3_step()] has returned
++** something other than [SQLITE_ROW], the results are undefined.
++** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
++** are called from a different thread while any of these routines
++** are pending, then the results are undefined.
++**
++** The first six interfaces (_blob, _double, _int, _int64, _text, and _text16)
++** each return the value of a result column in a specific data format.  If
++** the result column is not initially in the requested format (for example,
++** if the query returns an integer but the sqlite3_column_text() interface
++** is used to extract the value) then an automatic type conversion is performed.
++**
++** ^The sqlite3_column_type() routine returns the
++** [SQLITE_INTEGER | datatype code] for the initial data type
++** of the result column.  ^The returned value is one of [SQLITE_INTEGER],
++** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].
++** The return value of sqlite3_column_type() can be used to decide which
++** of the first six interface should be used to extract the column value.
++** The value returned by sqlite3_column_type() is only meaningful if no
++** automatic type conversions have occurred for the value in question.
++** After a type conversion, the result of calling sqlite3_column_type()
++** is undefined, though harmless.  Future
++** versions of SQLite may change the behavior of sqlite3_column_type()
++** following a type conversion.
++**
++** If the result is a BLOB or a TEXT string, then the sqlite3_column_bytes()
++** or sqlite3_column_bytes16() interfaces can be used to determine the size
++** of that BLOB or string.
++**
++** ^If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
++** routine returns the number of bytes in that BLOB or string.
++** ^If the result is a UTF-16 string, then sqlite3_column_bytes() converts
++** the string to UTF-8 and then returns the number of bytes.
++** ^If the result is a numeric value then sqlite3_column_bytes() uses
++** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
++** the number of bytes in that string.
++** ^If the result is NULL, then sqlite3_column_bytes() returns zero.
++**
++** ^If the result is a BLOB or UTF-16 string then the sqlite3_column_bytes16()
++** routine returns the number of bytes in that BLOB or string.
++** ^If the result is a UTF-8 string, then sqlite3_column_bytes16() converts
++** the string to UTF-16 and then returns the number of bytes.
++** ^If the result is a numeric value then sqlite3_column_bytes16() uses
++** [sqlite3_snprintf()] to convert that value to a UTF-16 string and returns
++** the number of bytes in that string.
++** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
++**
++** ^The values returned by [sqlite3_column_bytes()] and
++** [sqlite3_column_bytes16()] do not include the zero terminators at the end
++** of the string.  ^For clarity: the values returned by
++** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
++** bytes in the string, not the number of characters.
++**
++** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
++** even empty strings, are always zero-terminated.  ^The return
++** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
++**
++** ^Strings returned by sqlite3_column_text16() always have the endianness
++** which is native to the platform, regardless of the text encoding set
++** for the database.
++**
++** Warning: ^The object returned by [sqlite3_column_value()] is an
++** [unprotected sqlite3_value] object.  In a multithreaded environment,
++** an unprotected sqlite3_value object may only be used safely with
++** [sqlite3_bind_value()] and [sqlite3_result_value()].
++** If the [unprotected sqlite3_value] object returned by
++** [sqlite3_column_value()] is used in any other way, including calls
++** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
++** or [sqlite3_value_bytes()], the behavior is not threadsafe.
++** Hence, the sqlite3_column_value() interface
++** is normally only useful within the implementation of
++** [application-defined SQL functions] or [virtual tables], not within
++** top-level application code.
++**
++** These routines may attempt to convert the datatype of the result.
++** ^For example, if the internal representation is FLOAT and a text result
++** is requested, [sqlite3_snprintf()] is used internally to perform the
++** conversion automatically.  ^(The following table details the conversions
++** that are applied:
++**
++** 
      
++** 
++** 
       Internal
      Type       		 Requested
      Type       		  Conversion
++**
++** 
        NULL     INTEGER    Result is 0
++** 
        NULL      FLOAT     Result is 0.0
++** 
        NULL       TEXT     Result is a NULL pointer
++** 
        NULL       BLOB     Result is a NULL pointer
++** 
       INTEGER    FLOAT     Convert from integer to float
++** 
       INTEGER     TEXT     ASCII rendering of the integer
++** 
       INTEGER     BLOB     Same as INTEGER->TEXT
++** 
        FLOAT    INTEGER    [CAST] to INTEGER
++** 
        FLOAT      TEXT     ASCII rendering of the float
++** 
        FLOAT      BLOB     [CAST] to BLOB
++** 
        TEXT     INTEGER    [CAST] to INTEGER
++** 
        TEXT      FLOAT     [CAST] to REAL
++** 
        TEXT       BLOB     No change
++** 
        BLOB     INTEGER    [CAST] to INTEGER
++** 
        BLOB      FLOAT     [CAST] to REAL
++** 
        BLOB       TEXT     [CAST] to TEXT, ensure zero terminator
++** 
      
++** 
      )^
++**
++** Note that when type conversions occur, pointers returned by prior
++** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
++** sqlite3_column_text16() may be invalidated.
++** Type conversions and pointer invalidations might occur
++** in the following cases:
++**
++** 
        
++** 
      •  The initial content is a BLOB and sqlite3_column_text() or
++**      sqlite3_column_text16() is called.  A zero-terminator might
++**      need to be added to the string.
        • 
++** 
      •  The initial content is UTF-8 text and sqlite3_column_bytes16() or
++**      sqlite3_column_text16() is called.  The content must be converted
++**      to UTF-16.
        • 
++** 
      •  The initial content is UTF-16 text and sqlite3_column_bytes() or
++**      sqlite3_column_text() is called.  The content must be converted
++**      to UTF-8.
        • 
++** 
      
++**
++** ^Conversions between UTF-16be and UTF-16le are always done in place and do
++** not invalidate a prior pointer, though of course the content of the buffer
++** that the prior pointer references will have been modified.  Other kinds
++** of conversion are done in place when it is possible, but sometimes they
++** are not possible and in those cases prior pointers are invalidated.
++**
++** The safest policy is to invoke these routines
++** in one of the following ways:
++**
++** 
        
++**  
      • sqlite3_column_text() followed by sqlite3_column_bytes()
        • 
++**  
      • sqlite3_column_blob() followed by sqlite3_column_bytes()
        • 
++**  
      • sqlite3_column_text16() followed by sqlite3_column_bytes16()
        • 
++** 
      
++**
++** In other words, you should call sqlite3_column_text(),
++** sqlite3_column_blob(), or sqlite3_column_text16() first to force the result
++** into the desired format, then invoke sqlite3_column_bytes() or
++** sqlite3_column_bytes16() to find the size of the result.  Do not mix calls
++** to sqlite3_column_text() or sqlite3_column_blob() with calls to
++** sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16()
++** with calls to sqlite3_column_bytes().
++**
++** ^The pointers returned are valid until a type conversion occurs as
++** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
++** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
++** and BLOBs is freed automatically.  Do not pass the pointers returned
++** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
++** [sqlite3_free()].
++**
++** As long as the input parameters are correct, these routines will only
++** fail if an out-of-memory error occurs during a format conversion.
++** Only the following subset of interfaces are subject to out-of-memory
++** errors:
++**
++** 
        
++** 
      •  sqlite3_column_blob()
++** 
      •  sqlite3_column_text()
++** 
      •  sqlite3_column_text16()
++** 
      •  sqlite3_column_bytes()
++** 
      •  sqlite3_column_bytes16()
++** 
      
++**
++** If an out-of-memory error occurs, then the return value from these
++** routines is the same as if the column had contained an SQL NULL value.
++** Valid SQL NULL returns can be distinguished from out-of-memory errors
++** by invoking the [sqlite3_errcode()] immediately after the suspect
++** return value is obtained and before any
++** other SQLite interface is called on the same [database connection].
++*/
++SQLITE_API const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
++SQLITE_API double sqlite3_column_double(sqlite3_stmt*, int iCol);
++SQLITE_API int sqlite3_column_int(sqlite3_stmt*, int iCol);
++SQLITE_API sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
++SQLITE_API const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
++SQLITE_API const void *sqlite3_column_text16(sqlite3_stmt*, int iCol);
++SQLITE_API sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol);
++SQLITE_API int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
++SQLITE_API int sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
++SQLITE_API int sqlite3_column_type(sqlite3_stmt*, int iCol);
++
++/*
++** CAPI3REF: Destroy A Prepared Statement Object
++** DESTRUCTOR: sqlite3_stmt
++**
++** ^The sqlite3_finalize() function is called to delete a [prepared statement].
++** ^If the most recent evaluation of the statement encountered no errors
++** or if the statement is never been evaluated, then sqlite3_finalize() returns
++** SQLITE_OK.  ^If the most recent evaluation of statement S failed, then
++** sqlite3_finalize(S) returns the appropriate [error code] or
++** [extended error code].
++**
++** ^The sqlite3_finalize(S) routine can be called at any point during
++** the life cycle of [prepared statement] S:
++** before statement S is ever evaluated, after
++** one or more calls to [sqlite3_reset()], or after any call
++** to [sqlite3_step()] regardless of whether or not the statement has
++** completed execution.
++**
++** ^Invoking sqlite3_finalize() on a NULL pointer is a harmless no-op.
++**
++** The application must finalize every [prepared statement] in order to avoid
++** resource leaks.  It is a grievous error for the application to try to use
++** a prepared statement after it has been finalized.  Any use of a prepared
++** statement after it has been finalized can result in undefined and
++** undesirable behavior such as segfaults and heap corruption.
++*/
++SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Reset A Prepared Statement Object
++** METHOD: sqlite3_stmt
++**
++** The sqlite3_reset() function is called to reset a [prepared statement]
++** object back to its initial state, ready to be re-executed.
++** ^Any SQL statement variables that had values bound to them using
++** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
++** Use [sqlite3_clear_bindings()] to reset the bindings.
++**
++** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
++** back to the beginning of its program.
++**
++** ^The return code from [sqlite3_reset(S)] indicates whether or not
++** the previous evaluation of prepared statement S completed successfully.
++** ^If [sqlite3_step(S)] has never before been called on S or if
++** [sqlite3_step(S)] has not been called since the previous call
++** to [sqlite3_reset(S)], then [sqlite3_reset(S)] will return
++** [SQLITE_OK].
++**
++** ^If the most recent call to [sqlite3_step(S)] for the
++** [prepared statement] S indicated an error, then
++** [sqlite3_reset(S)] returns an appropriate [error code].
++** ^The [sqlite3_reset(S)] interface might also return an [error code]
++** if there were no prior errors but the process of resetting
++** the prepared statement caused a new error. ^For example, if an
++** [INSERT] statement with a [RETURNING] clause is only stepped one time,
++** that one call to [sqlite3_step(S)] might return SQLITE_ROW but
++** the overall statement might still fail and the [sqlite3_reset(S)] call
++** might return SQLITE_BUSY if locking constraints prevent the
++** database change from committing.  Therefore, it is important that
++** applications check the return code from [sqlite3_reset(S)] even if
++** no prior call to [sqlite3_step(S)] indicated a problem.
++**
++** ^The [sqlite3_reset(S)] interface does not change the values
++** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
++*/
++SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
++
++
++/*
++** CAPI3REF: Create Or Redefine SQL Functions
++** KEYWORDS: {function creation routines}
++** METHOD: sqlite3
++**
++** ^These functions (collectively known as "function creation routines")
++** are used to add SQL functions or aggregates or to redefine the behavior
++** of existing SQL functions or aggregates. The only differences between
++** the three "sqlite3_create_function*" routines are the text encoding
++** expected for the second parameter (the name of the function being
++** created) and the presence or absence of a destructor callback for
++** the application data pointer. Function sqlite3_create_window_function()
++** is similar, but allows the user to supply the extra callback functions
++** needed by [aggregate window functions].
++**
++** ^The first parameter is the [database connection] to which the SQL
++** function is to be added.  ^If an application uses more than one database
++** connection then application-defined SQL functions must be added
++** to each database connection separately.
++**
++** ^The second parameter is the name of the SQL function to be created or
++** redefined.  ^The length of the name is limited to 255 bytes in a UTF-8
++** representation, exclusive of the zero-terminator.  ^Note that the name
++** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
++** ^Any attempt to create a function with a longer name
++** will result in [SQLITE_MISUSE] being returned.
++**
++** ^The third parameter (nArg)
++** is the number of arguments that the SQL function or
++** aggregate takes. ^If this parameter is -1, then the SQL function or
++** aggregate may take any number of arguments between 0 and the limit
++** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]).  If the third
++** parameter is less than -1 or greater than 127 then the behavior is
++** undefined.
++**
++** ^The fourth parameter, eTextRep, specifies what
++** [SQLITE_UTF8 | text encoding] this SQL function prefers for
++** its parameters.  The application should set this parameter to
++** [SQLITE_UTF16LE] if the function implementation invokes
++** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
++** implementation invokes [sqlite3_value_text16be()] on an input, or
++** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
++** otherwise.  ^The same SQL function may be registered multiple times using
++** different preferred text encodings, with different implementations for
++** each encoding.
++** ^When multiple implementations of the same function are available, SQLite
++** will pick the one that involves the least amount of data conversion.
++**
++** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
++** to signal that the function will always return the same result given
++** the same inputs within a single SQL statement.  Most SQL functions are
++** deterministic.  The built-in [random()] SQL function is an example of a
++** function that is not deterministic.  The SQLite query planner is able to
++** perform additional optimizations on deterministic functions, so use
++** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
++**
++** ^The fourth parameter may also optionally include the [SQLITE_DIRECTONLY]
++** flag, which if present prevents the function from being invoked from
++** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
++** index expressions, or the WHERE clause of partial indexes.
++**
++** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
++** all application-defined SQL functions that do not need to be
++** used inside of triggers, view, CHECK constraints, or other elements of
++** the database schema.  This flags is especially recommended for SQL
++** functions that have side effects or reveal internal application state.
++** Without this flag, an attacker might be able to modify the schema of
++** a database file to include invocations of the function with parameters
++** chosen by the attacker, which the application will then execute when
++** the database file is opened and read.
++**
++** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
++** function can gain access to this pointer using [sqlite3_user_data()].)^
++**
++** ^The sixth, seventh and eighth parameters passed to the three
++** "sqlite3_create_function*" functions, xFunc, xStep and xFinal, are
++** pointers to C-language functions that implement the SQL function or
++** aggregate. ^A scalar SQL function requires an implementation of the xFunc
++** callback only; NULL pointers must be passed as the xStep and xFinal
++** parameters. ^An aggregate SQL function requires an implementation of xStep
++** and xFinal and NULL pointer must be passed for xFunc. ^To delete an existing
++** SQL function or aggregate, pass NULL pointers for all three function
++** callbacks.
++**
++** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
++** and xInverse) passed to sqlite3_create_window_function are pointers to
++** C-language callbacks that implement the new function. xStep and xFinal
++** must both be non-NULL. xValue and xInverse may either both be NULL, in
++** which case a regular aggregate function is created, or must both be
++** non-NULL, in which case the new function may be used as either an aggregate
++** or aggregate window function. More details regarding the implementation
++** of aggregate window functions are
++** [user-defined window functions|available here].
++**
++** ^(If the final parameter to sqlite3_create_function_v2() or
++** sqlite3_create_window_function() is not NULL, then it is destructor for
++** the application data pointer. The destructor is invoked when the function
++** is deleted, either by being overloaded or when the database connection
++** closes.)^ ^The destructor is also invoked if the call to
++** sqlite3_create_function_v2() fails.  ^When the destructor callback is
++** invoked, it is passed a single argument which is a copy of the application
++** data pointer which was the fifth parameter to sqlite3_create_function_v2().
++**
++** ^It is permitted to register multiple implementations of the same
++** functions with the same name but with either differing numbers of
++** arguments or differing preferred text encodings.  ^SQLite will use
++** the implementation that most closely matches the way in which the
++** SQL function is used.  ^A function implementation with a non-negative
++** nArg parameter is a better match than a function implementation with
++** a negative nArg.  ^A function where the preferred text encoding
++** matches the database encoding is a better
++** match than a function where the encoding is different.
++** ^A function where the encoding difference is between UTF16le and UTF16be
++** is a closer match than a function where the encoding difference is
++** between UTF8 and UTF16.
++**
++** ^Built-in functions may be overloaded by new application-defined functions.
++**
++** ^An application-defined function is permitted to call other
++** SQLite interfaces.  However, such calls must not
++** close the database connection nor finalize or reset the prepared
++** statement in which the function is running.
++*/
++SQLITE_API int sqlite3_create_function(
++  sqlite3 *db,
++  const char *zFunctionName,
++  int nArg,
++  int eTextRep,
++  void *pApp,
++  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++  void (*xFinal)(sqlite3_context*)
++);
++SQLITE_API int sqlite3_create_function16(
++  sqlite3 *db,
++  const void *zFunctionName,
++  int nArg,
++  int eTextRep,
++  void *pApp,
++  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++  void (*xFinal)(sqlite3_context*)
++);
++SQLITE_API int sqlite3_create_function_v2(
++  sqlite3 *db,
++  const char *zFunctionName,
++  int nArg,
++  int eTextRep,
++  void *pApp,
++  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++  void (*xFinal)(sqlite3_context*),
++  void(*xDestroy)(void*)
++);
++SQLITE_API int sqlite3_create_window_function(
++  sqlite3 *db,
++  const char *zFunctionName,
++  int nArg,
++  int eTextRep,
++  void *pApp,
++  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++  void (*xFinal)(sqlite3_context*),
++  void (*xValue)(sqlite3_context*),
++  void (*xInverse)(sqlite3_context*,int,sqlite3_value**),
++  void(*xDestroy)(void*)
++);
++
++/*
++** CAPI3REF: Text Encodings
++**
++** These constant define integer codes that represent the various
++** text encodings supported by SQLite.
++*/
++#define SQLITE_UTF8           1    /* IMP: R-37514-35566 */
++#define SQLITE_UTF16LE        2    /* IMP: R-03371-37637 */
++#define SQLITE_UTF16BE        3    /* IMP: R-51971-34154 */
++#define SQLITE_UTF16          4    /* Use native byte order */
++#define SQLITE_ANY            5    /* Deprecated */
++#define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
++
++/*
++** CAPI3REF: Function Flags
++**
++** These constants may be ORed together with the
++** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
++** to [sqlite3_create_function()], [sqlite3_create_function16()], or
++** [sqlite3_create_function_v2()].
++**
++** 
      
++** [[SQLITE_DETERMINISTIC]] 
      SQLITE_DETERMINISTIC
      
++** The SQLITE_DETERMINISTIC flag means that the new function always gives
++** the same output when the input parameters are the same.
++** The [abs|abs() function] is deterministic, for example, but
++** [randomblob|randomblob()] is not.  Functions must
++** be deterministic in order to be used in certain contexts such as
++** with the WHERE clause of [partial indexes] or in [generated columns].
++** SQLite might also optimize deterministic functions by factoring them
++** out of inner loops.
++** 
      
++**
++** [[SQLITE_DIRECTONLY]] 
      SQLITE_DIRECTONLY
      
++** The SQLITE_DIRECTONLY flag means that the function may only be invoked
++** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in
++** schema structures such as [CHECK constraints], [DEFAULT clauses],
++** [expression indexes], [partial indexes], or [generated columns].
++** 
      
++** The SQLITE_DIRECTONLY flag is recommended for any
++** [application-defined SQL function]
++** that has side-effects or that could potentially leak sensitive information.
++** This will prevent attacks in which an application is tricked
++** into using a database file that has had its schema surreptitiously
++** modified to invoke the application-defined function in ways that are
++** harmful.
++** 
      
++** Some people say it is good practice to set SQLITE_DIRECTONLY on all
++** [application-defined SQL functions], regardless of whether or not they
++** are security sensitive, as doing so prevents those functions from being used
++** inside of the database schema, and thus ensures that the database
++** can be inspected and modified using generic tools (such as the [CLI])
++** that do not have access to the application-defined functions.
++** 
      
++**
++** [[SQLITE_INNOCUOUS]] 
      SQLITE_INNOCUOUS
      
++** The SQLITE_INNOCUOUS flag means that the function is unlikely
++** to cause problems even if misused.  An innocuous function should have
++** no side effects and should not depend on any values other than its
++** input parameters. The [abs|abs() function] is an example of an
++** innocuous function.
++** The [load_extension() SQL function] is not innocuous because of its
++** side effects.
++** 
       SQLITE_INNOCUOUS is similar to SQLITE_DETERMINISTIC, but is not
++** exactly the same.  The [random|random() function] is an example of a
++** function that is innocuous but not deterministic.
++** 
      Some heightened security settings
++** ([SQLITE_DBCONFIG_TRUSTED_SCHEMA] and [PRAGMA trusted_schema=OFF])
++** disable the use of SQL functions inside views and triggers and in
++** schema structures such as [CHECK constraints], [DEFAULT clauses],
++** [expression indexes], [partial indexes], and [generated columns] unless
++** the function is tagged with SQLITE_INNOCUOUS.  Most built-in functions
++** are innocuous.  Developers are advised to avoid using the
++** SQLITE_INNOCUOUS flag for application-defined functions unless the
++** function has been carefully audited and found to be free of potentially
++** security-adverse side-effects and information-leaks.
++** 
      
++**
++** [[SQLITE_SUBTYPE]] 
      SQLITE_SUBTYPE
      
++** The SQLITE_SUBTYPE flag indicates to SQLite that a function might call
++** [sqlite3_value_subtype()] to inspect the sub-types of its arguments.
++** This flag instructs SQLite to omit some corner-case optimizations that
++** might disrupt the operation of the [sqlite3_value_subtype()] function,
++** causing it to return zero rather than the correct subtype().
++** SQL functions that invokes [sqlite3_value_subtype()] should have this
++** property.  If the SQLITE_SUBTYPE property is omitted, then the return
++** value from [sqlite3_value_subtype()] might sometimes be zero even though
++** a non-zero subtype was specified by the function argument expression.
++**
++** [[SQLITE_RESULT_SUBTYPE]] 
      SQLITE_RESULT_SUBTYPE
      
++** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
++** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
++** result.
++** Every function that invokes [sqlite3_result_subtype()] should have this
++** property.  If it does not, then the call to [sqlite3_result_subtype()]
++** might become a no-op if the function is used as term in an
++** [expression index].  On the other hand, SQL functions that never invoke
++** [sqlite3_result_subtype()] should avoid setting this property, as the
++** purpose of this property is to disable certain optimizations that are
++** incompatible with subtypes.
++** 
      
++** 
      
++*/
++#define SQLITE_DETERMINISTIC    0x000000800
++#define SQLITE_DIRECTONLY       0x000080000
++#define SQLITE_SUBTYPE          0x000100000
++#define SQLITE_INNOCUOUS        0x000200000
++#define SQLITE_RESULT_SUBTYPE   0x001000000
++
++/*
++** CAPI3REF: Deprecated Functions
++** DEPRECATED
++**
++** These functions are [deprecated].  In order to maintain
++** backwards compatibility with older code, these functions continue
++** to be supported.  However, new applications should avoid
++** the use of these functions.  To encourage programmers to avoid
++** these functions, we will not explain what they do.
++*/
++#ifndef SQLITE_OMIT_DEPRECATED
++SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
++SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
++SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
++SQLITE_API SQLITE_DEPRECATED int sqlite3_global_recover(void);
++SQLITE_API SQLITE_DEPRECATED void sqlite3_thread_cleanup(void);
++SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),
++                      void*,sqlite3_int64);
++#endif
++
++/*
++** CAPI3REF: Obtaining SQL Values
++** METHOD: sqlite3_value
++**
++** Summary:
++** 
      
++** 
      sqlite3_value_blob→BLOB value
++** 
      sqlite3_value_double→REAL value
++** 
      sqlite3_value_int→32-bit INTEGER value
++** 
      sqlite3_value_int64→64-bit INTEGER value
++** 
      sqlite3_value_pointer→Pointer value
++** 
      sqlite3_value_text→UTF-8 TEXT value
++** 
      sqlite3_value_text16→UTF-16 TEXT value in
++** the native byteorder
++** 
      sqlite3_value_text16be→UTF-16be TEXT value
++** 
      sqlite3_value_text16le→UTF-16le TEXT value
++** 
         
++** 
      sqlite3_value_bytes→Size of a BLOB
++** or a UTF-8 TEXT in bytes
++** 
      sqlite3_value_bytes16  
++** →  Size of UTF-16
++** TEXT in bytes
++** 
      sqlite3_value_type→Default
++** datatype of the value
++** 
      sqlite3_value_numeric_type  
++** →  Best numeric datatype of the value
++** 
      sqlite3_value_nochange  
++** →  True if the column is unchanged in an UPDATE
++** against a virtual table.
++** 
      sqlite3_value_frombind  
++** →  True if value originated from a [bound parameter]
++** 
      
++**
++** Details:
++**
++** These routines extract type, size, and content information from
++** [protected sqlite3_value] objects.  Protected sqlite3_value objects
++** are used to pass parameter information into the functions that
++** implement [application-defined SQL functions] and [virtual tables].
++**
++** These routines work only with [protected sqlite3_value] objects.
++** Any attempt to use these routines on an [unprotected sqlite3_value]
++** is not threadsafe.
++**
++** ^These routines work just like the corresponding [column access functions]
++** except that these routines take a single [protected sqlite3_value] object
++** pointer instead of a [sqlite3_stmt*] pointer and an integer column number.
++**
++** ^The sqlite3_value_text16() interface extracts a UTF-16 string
++** in the native byte-order of the host machine.  ^The
++** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
++** extract UTF-16 strings as big-endian and little-endian respectively.
++**
++** ^If [sqlite3_value] object V was initialized
++** using [sqlite3_bind_pointer(S,I,P,X,D)] or [sqlite3_result_pointer(C,P,X,D)]
++** and if X and Y are strings that compare equal according to strcmp(X,Y),
++** then sqlite3_value_pointer(V,Y) will return the pointer P.  ^Otherwise,
++** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
++** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
++**
++** ^(The sqlite3_value_type(V) interface returns the
++** [SQLITE_INTEGER | datatype code] for the initial datatype of the
++** [sqlite3_value] object V. The returned value is one of [SQLITE_INTEGER],
++** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].)^
++** Other interfaces might change the datatype for an sqlite3_value object.
++** For example, if the datatype is initially SQLITE_INTEGER and
++** sqlite3_value_text(V) is called to extract a text value for that
++** integer, then subsequent calls to sqlite3_value_type(V) might return
++** SQLITE_TEXT.  Whether or not a persistent internal datatype conversion
++** occurs is undefined and may change from one release of SQLite to the next.
++**
++** ^(The sqlite3_value_numeric_type() interface attempts to apply
++** numeric affinity to the value.  This means that an attempt is
++** made to convert the value to an integer or floating point.  If
++** such a conversion is possible without loss of information (in other
++** words, if the value is a string that looks like a number)
++** then the conversion is performed.  Otherwise no conversion occurs.
++** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
++**
++** ^Within the [xUpdate] method of a [virtual table], the
++** sqlite3_value_nochange(X) interface returns true if and only if
++** the column corresponding to X is unchanged by the UPDATE operation
++** that the xUpdate method call was invoked to implement and if
++** and the prior [xColumn] method call that was invoked to extracted
++** the value for that column returned without setting a result (probably
++** because it queried [sqlite3_vtab_nochange()] and found that the column
++** was unchanging).  ^Within an [xUpdate] method, any value for which
++** sqlite3_value_nochange(X) is true will in all other respects appear
++** to be a NULL value.  If sqlite3_value_nochange(X) is invoked anywhere other
++** than within an [xUpdate] method call for an UPDATE statement, then
++** the return value is arbitrary and meaningless.
++**
++** ^The sqlite3_value_frombind(X) interface returns non-zero if the
++** value X originated from one of the [sqlite3_bind_int|sqlite3_bind()]
++** interfaces.  ^If X comes from an SQL literal value, or a table column,
++** or an expression, then sqlite3_value_frombind(X) returns zero.
++**
++** Please pay particular attention to the fact that the pointer returned
++** from [sqlite3_value_blob()], [sqlite3_value_text()], or
++** [sqlite3_value_text16()] can be invalidated by a subsequent call to
++** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
++** or [sqlite3_value_text16()].
++**
++** These routines must be called from the same thread as
++** the SQL function that supplied the [sqlite3_value*] parameters.
++**
++** As long as the input parameter is correct, these routines can only
++** fail if an out-of-memory error occurs during a format conversion.
++** Only the following subset of interfaces are subject to out-of-memory
++** errors:
++**
++** 
        
++** 
      •  sqlite3_value_blob()
++** 
      •  sqlite3_value_text()
++** 
      •  sqlite3_value_text16()
++** 
      •  sqlite3_value_text16le()
++** 
      •  sqlite3_value_text16be()
++** 
      •  sqlite3_value_bytes()
++** 
      •  sqlite3_value_bytes16()
++** 
      
++**
++** If an out-of-memory error occurs, then the return value from these
++** routines is the same as if the column had contained an SQL NULL value.
++** Valid SQL NULL returns can be distinguished from out-of-memory errors
++** by invoking the [sqlite3_errcode()] immediately after the suspect
++** return value is obtained and before any
++** other SQLite interface is called on the same [database connection].
++*/
++SQLITE_API const void *sqlite3_value_blob(sqlite3_value*);
++SQLITE_API double sqlite3_value_double(sqlite3_value*);
++SQLITE_API int sqlite3_value_int(sqlite3_value*);
++SQLITE_API sqlite3_int64 sqlite3_value_int64(sqlite3_value*);
++SQLITE_API void *sqlite3_value_pointer(sqlite3_value*, const char*);
++SQLITE_API const unsigned char *sqlite3_value_text(sqlite3_value*);
++SQLITE_API const void *sqlite3_value_text16(sqlite3_value*);
++SQLITE_API const void *sqlite3_value_text16le(sqlite3_value*);
++SQLITE_API const void *sqlite3_value_text16be(sqlite3_value*);
++SQLITE_API int sqlite3_value_bytes(sqlite3_value*);
++SQLITE_API int sqlite3_value_bytes16(sqlite3_value*);
++SQLITE_API int sqlite3_value_type(sqlite3_value*);
++SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
++SQLITE_API int sqlite3_value_nochange(sqlite3_value*);
++SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
++
++/*
++** CAPI3REF: Report the internal text encoding state of an sqlite3_value object
++** METHOD: sqlite3_value
++**
++** ^(The sqlite3_value_encoding(X) interface returns one of [SQLITE_UTF8],
++** [SQLITE_UTF16BE], or [SQLITE_UTF16LE] according to the current text encoding
++** of the value X, assuming that X has type TEXT.)^  If sqlite3_value_type(X)
++** returns something other than SQLITE_TEXT, then the return value from
++** sqlite3_value_encoding(X) is meaningless.  ^Calls to
++** [sqlite3_value_text(X)], [sqlite3_value_text16(X)], [sqlite3_value_text16be(X)],
++** [sqlite3_value_text16le(X)], [sqlite3_value_bytes(X)], or
++** [sqlite3_value_bytes16(X)] might change the encoding of the value X and
++** thus change the return from subsequent calls to sqlite3_value_encoding(X).
++**
++** This routine is intended for used by applications that test and validate
++** the SQLite implementation.  This routine is inquiring about the opaque
++** internal state of an [sqlite3_value] object.  Ordinary applications should
++** not need to know what the internal state of an sqlite3_value object is and
++** hence should not need to use this interface.
++*/
++SQLITE_API int sqlite3_value_encoding(sqlite3_value*);
++
++/*
++** CAPI3REF: Finding The Subtype Of SQL Values
++** METHOD: sqlite3_value
++**
++** The sqlite3_value_subtype(V) function returns the subtype for
++** an [application-defined SQL function] argument V.  The subtype
++** information can be used to pass a limited amount of context from
++** one SQL function to another.  Use the [sqlite3_result_subtype()]
++** routine to set the subtype for the return value of an SQL function.
++**
++** Every [application-defined SQL function] that invoke this interface
++** should include the [SQLITE_SUBTYPE] property in the text
++** encoding argument when the function is [sqlite3_create_function|registered].
++** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype()
++** might return zero instead of the upstream subtype in some corner cases.
++*/
++SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*);
++
++/*
++** CAPI3REF: Copy And Free SQL Values
++** METHOD: sqlite3_value
++**
++** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
++** object D and returns a pointer to that copy.  ^The [sqlite3_value] returned
++** is a [protected sqlite3_value] object even if the input is not.
++** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
++** memory allocation fails. ^If V is a [pointer value], then the result
++** of sqlite3_value_dup(V) is a NULL value.
++**
++** ^The sqlite3_value_free(V) interface frees an [sqlite3_value] object
++** previously obtained from [sqlite3_value_dup()].  ^If V is a NULL pointer
++** then sqlite3_value_free(V) is a harmless no-op.
++*/
++SQLITE_API sqlite3_value *sqlite3_value_dup(const sqlite3_value*);
++SQLITE_API void sqlite3_value_free(sqlite3_value*);
++
++/*
++** CAPI3REF: Obtain Aggregate Function Context
++** METHOD: sqlite3_context
++**
++** Implementations of aggregate SQL functions use this
++** routine to allocate memory for storing their state.
++**
++** ^The first time the sqlite3_aggregate_context(C,N) routine is called
++** for a particular aggregate function, SQLite allocates
++** N bytes of memory, zeroes out that memory, and returns a pointer
++** to the new memory. ^On second and subsequent calls to
++** sqlite3_aggregate_context() for the same aggregate function instance,
++** the same buffer is returned.  Sqlite3_aggregate_context() is normally
++** called once for each invocation of the xStep callback and then one
++** last time when the xFinal callback is invoked.  ^(When no rows match
++** an aggregate query, the xStep() callback of the aggregate function
++** implementation is never called and xFinal() is called exactly once.
++** In those cases, sqlite3_aggregate_context() might be called for the
++** first time from within xFinal().)^
++**
++** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
++** when first called if N is less than or equal to zero or if a memory
++** allocation error occurs.
++**
++** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
++** determined by the N parameter on first successful call.  Changing the
++** value of N in any subsequent call to sqlite3_aggregate_context() within
++** the same aggregate function instance will not resize the memory
++** allocation.)^  Within the xFinal callback, it is customary to set
++** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
++** pointless memory allocations occur.
++**
++** ^SQLite automatically frees the memory allocated by
++** sqlite3_aggregate_context() when the aggregate query concludes.
++**
++** The first parameter must be a copy of the
++** [sqlite3_context | SQL function context] that is the first parameter
++** to the xStep or xFinal callback routine that implements the aggregate
++** function.
++**
++** This routine must be called from the same thread in which
++** the aggregate SQL function is running.
++*/
++SQLITE_API void *sqlite3_aggregate_context(sqlite3_context*, int nBytes);
++
++/*
++** CAPI3REF: User Data For Functions
++** METHOD: sqlite3_context
++**
++** ^The sqlite3_user_data() interface returns a copy of
++** the pointer that was the pUserData parameter (the 5th parameter)
++** of the [sqlite3_create_function()]
++** and [sqlite3_create_function16()] routines that originally
++** registered the application defined function.
++**
++** This routine must be called from the same thread in which
++** the application-defined function is running.
++*/
++SQLITE_API void *sqlite3_user_data(sqlite3_context*);
++
++/*
++** CAPI3REF: Database Connection For Functions
++** METHOD: sqlite3_context
++**
++** ^The sqlite3_context_db_handle() interface returns a copy of
++** the pointer to the [database connection] (the 1st parameter)
++** of the [sqlite3_create_function()]
++** and [sqlite3_create_function16()] routines that originally
++** registered the application defined function.
++*/
++SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
++
++/*
++** CAPI3REF: Function Auxiliary Data
++** METHOD: sqlite3_context
++**
++** These functions may be used by (non-aggregate) SQL functions to
++** associate auxiliary data with argument values. If the same argument
++** value is passed to multiple invocations of the same SQL function during
++** query execution, under some circumstances the associated auxiliary data
++** might be preserved.  An example of where this might be useful is in a
++** regular-expression matching function. The compiled version of the regular
++** expression can be stored as auxiliary data associated with the pattern string.
++** Then as long as the pattern string remains the same,
++** the compiled regular expression can be reused on multiple
++** invocations of the same function.
++**
++** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data
++** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
++** value to the application-defined function.  ^N is zero for the left-most
++** function argument.  ^If there is no auxiliary data
++** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
++** returns a NULL pointer.
++**
++** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the
++** N-th argument of the application-defined function.  ^Subsequent
++** calls to sqlite3_get_auxdata(C,N) return P from the most recent
++** sqlite3_set_auxdata(C,N,P,X) call if the auxiliary data is still valid or
++** NULL if the auxiliary data has been discarded.
++** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
++** SQLite will invoke the destructor function X with parameter P exactly
++** once, when the auxiliary data is discarded.
++** SQLite is free to discard the auxiliary data at any time, including: 
        
++** 
      •  ^(when the corresponding function parameter changes)^, or
++** 
      •  ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
++**      SQL statement)^, or
++** 
      •  ^(when sqlite3_set_auxdata() is invoked again on the same
++**       parameter)^, or
++** 
      •  ^(during the original sqlite3_set_auxdata() call when a memory
++**      allocation error occurs.)^
++** 
      •  ^(during the original sqlite3_set_auxdata() call if the function
++**      is evaluated during query planning instead of during query execution,
++**      as sometimes happens with [SQLITE_ENABLE_STAT4].)^ 
      
++**
++** Note the last two bullets in particular.  The destructor X in
++** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
++** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
++** should be called near the end of the function implementation and the
++** function implementation should not make any use of P after
++** sqlite3_set_auxdata() has been called.  Furthermore, a call to
++** sqlite3_get_auxdata() that occurs immediately after a corresponding call
++** to sqlite3_set_auxdata() might still return NULL if an out-of-memory
++** condition occurred during the sqlite3_set_auxdata() call or if the
++** function is being evaluated during query planning rather than during
++** query execution.
++**
++** ^(In practice, auxiliary data is preserved between function calls for
++** function parameters that are compile-time constants, including literal
++** values and [parameters] and expressions composed from the same.)^
++**
++** The value of the N parameter to these interfaces should be non-negative.
++** Future enhancements may make use of negative N values to define new
++** kinds of function caching behavior.
++**
++** These routines must be called from the same thread in which
++** the SQL function is running.
++**
++** See also: [sqlite3_get_clientdata()] and [sqlite3_set_clientdata()].
++*/
++SQLITE_API void *sqlite3_get_auxdata(sqlite3_context*, int N);
++SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
++
++/*
++** CAPI3REF: Database Connection Client Data
++** METHOD: sqlite3
++**
++** These functions are used to associate one or more named pointers
++** with a [database connection].
++** A call to sqlite3_set_clientdata(D,N,P,X) causes the pointer P
++** to be attached to [database connection] D using name N.  Subsequent
++** calls to sqlite3_get_clientdata(D,N) will return a copy of pointer P
++** or a NULL pointer if there were no prior calls to
++** sqlite3_set_clientdata() with the same values of D and N.
++** Names are compared using strcmp() and are thus case sensitive.
++**
++** If P and X are both non-NULL, then the destructor X is invoked with
++** argument P on the first of the following occurrences:
++** 
        
++** 
      •  An out-of-memory error occurs during the call to
++**      sqlite3_set_clientdata() which attempts to register pointer P.
++** 
      •  A subsequent call to sqlite3_set_clientdata(D,N,P,X) is made
++**      with the same D and N parameters.
++** 
      •  The database connection closes.  SQLite does not make any guarantees
++**      about the order in which destructors are called, only that all
++**      destructors will be called exactly once at some point during the
++**      database connection closing process.
++** 
      
++**
++** SQLite does not do anything with client data other than invoke
++** destructors on the client data at the appropriate time.  The intended
++** use for client data is to provide a mechanism for wrapper libraries
++** to store additional information about an SQLite database connection.
++**
++** There is no limit (other than available memory) on the number of different
++** client data pointers (with different names) that can be attached to a
++** single database connection.  However, the implementation is optimized
++** for the case of having only one or two different client data names.
++** Applications and wrapper libraries are discouraged from using more than
++** one client data name each.
++**
++** There is no way to enumerate the client data pointers
++** associated with a database connection.  The N parameter can be thought
++** of as a secret key such that only code that knows the secret key is able
++** to access the associated data.
++**
++** Security Warning:  These interfaces should not be exposed in scripting
++** languages or in other circumstances where it might be possible for an
++** an attacker to invoke them.  Any agent that can invoke these interfaces
++** can probably also take control of the process.
++**
++** Database connection client data is only available for SQLite
++** version 3.44.0 ([dateof:3.44.0]) and later.
++**
++** See also: [sqlite3_set_auxdata()] and [sqlite3_get_auxdata()].
++*/
++SQLITE_API void *sqlite3_get_clientdata(sqlite3*,const char*);
++SQLITE_API int sqlite3_set_clientdata(sqlite3*, const char*, void*, void(*)(void*));
++
++/*
++** CAPI3REF: Constants Defining Special Destructor Behavior
++**
++** These are special values for the destructor that is passed in as the
++** final argument to routines like [sqlite3_result_blob()].  ^If the destructor
++** argument is SQLITE_STATIC, it means that the content pointer is constant
++** and will never change.  It does not need to be destroyed.  ^The
++** SQLITE_TRANSIENT value means that the content will likely change in
++** the near future and that SQLite should make its own private copy of
++** the content before returning.
++**
++** The typedef is necessary to work around problems in certain
++** C++ compilers.
++*/
++typedef void (*sqlite3_destructor_type)(void*);
++#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
++#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
++
++/*
++** CAPI3REF: Setting The Result Of An SQL Function
++** METHOD: sqlite3_context
++**
++** These routines are used by the xFunc or xFinal callbacks that
++** implement SQL functions and aggregates.  See
++** [sqlite3_create_function()] and [sqlite3_create_function16()]
++** for additional information.
++**
++** These functions work very much like the [parameter binding] family of
++** functions used to bind values to host parameters in prepared statements.
++** Refer to the [SQL parameter] documentation for additional information.
++**
++** ^The sqlite3_result_blob() interface sets the result from
++** an application-defined function to be the BLOB whose content is pointed
++** to by the second parameter and which is N bytes long where N is the
++** third parameter.
++**
++** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
++** interfaces set the result of the application-defined function to be
++** a BLOB containing all zero bytes and N bytes in size.
++**
++** ^The sqlite3_result_double() interface sets the result from
++** an application-defined function to be a floating point value specified
++** by its 2nd argument.
++**
++** ^The sqlite3_result_error() and sqlite3_result_error16() functions
++** cause the implemented SQL function to throw an exception.
++** ^SQLite uses the string pointed to by the
++** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
++** as the text of an error message.  ^SQLite interprets the error
++** message string from sqlite3_result_error() as UTF-8. ^SQLite
++** interprets the string from sqlite3_result_error16() as UTF-16 using
++** the same [byte-order determination rules] as [sqlite3_bind_text16()].
++** ^If the third parameter to sqlite3_result_error()
++** or sqlite3_result_error16() is negative then SQLite takes as the error
++** message all text up through the first zero character.
++** ^If the third parameter to sqlite3_result_error() or
++** sqlite3_result_error16() is non-negative then SQLite takes that many
++** bytes (not characters) from the 2nd parameter as the error message.
++** ^The sqlite3_result_error() and sqlite3_result_error16()
++** routines make a private copy of the error message text before
++** they return.  Hence, the calling function can deallocate or
++** modify the text after they return without harm.
++** ^The sqlite3_result_error_code() function changes the error code
++** returned by SQLite as a result of an error in a function.  ^By default,
++** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
++** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
++**
++** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
++** error indicating that a string or BLOB is too long to represent.
++**
++** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
++** error indicating that a memory allocation failed.
++**
++** ^The sqlite3_result_int() interface sets the return value
++** of the application-defined function to be the 32-bit signed integer
++** value given in the 2nd argument.
++** ^The sqlite3_result_int64() interface sets the return value
++** of the application-defined function to be the 64-bit signed integer
++** value given in the 2nd argument.
++**
++** ^The sqlite3_result_null() interface sets the return value
++** of the application-defined function to be NULL.
++**
++** ^The sqlite3_result_text(), sqlite3_result_text16(),
++** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
++** set the return value of the application-defined function to be
++** a text string which is represented as UTF-8, UTF-16 native byte order,
++** UTF-16 little endian, or UTF-16 big endian, respectively.
++** ^The sqlite3_result_text64() interface sets the return value of an
++** application-defined function to be a text string in an encoding
++** specified by the fifth (and last) parameter, which must be one
++** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
++** ^SQLite takes the text result from the application from
++** the 2nd parameter of the sqlite3_result_text* interfaces.
++** ^If the 3rd parameter to any of the sqlite3_result_text* interfaces
++** other than sqlite3_result_text64() is negative, then SQLite computes
++** the string length itself by searching the 2nd parameter for the first
++** zero character.
++** ^If the 3rd parameter to the sqlite3_result_text* interfaces
++** is non-negative, then as many bytes (not characters) of the text
++** pointed to by the 2nd parameter are taken as the application-defined
++** function result.  If the 3rd parameter is non-negative, then it
++** must be the byte offset into the string where the NUL terminator would
++** appear if the string where NUL terminated.  If any NUL characters occur
++** in the string at a byte offset that is less than the value of the 3rd
++** parameter, then the resulting string will contain embedded NULs and the
++** result of expressions operating on strings with embedded NULs is undefined.
++** ^If the 4th parameter to the sqlite3_result_text* interfaces
++** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
++** function as the destructor on the text or BLOB result when it has
++** finished using that result.
++** ^If the 4th parameter to the sqlite3_result_text* interfaces or to
++** sqlite3_result_blob is the special constant SQLITE_STATIC, then SQLite
++** assumes that the text or BLOB result is in constant space and does not
++** copy the content of the parameter nor call a destructor on the content
++** when it has finished using that result.
++** ^If the 4th parameter to the sqlite3_result_text* interfaces
++** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
++** then SQLite makes a copy of the result into space obtained
++** from [sqlite3_malloc()] before it returns.
++**
++** ^For the sqlite3_result_text16(), sqlite3_result_text16le(), and
++** sqlite3_result_text16be() routines, and for sqlite3_result_text64()
++** when the encoding is not UTF8, if the input UTF16 begins with a
++** byte-order mark (BOM, U+FEFF) then the BOM is removed from the
++** string and the rest of the string is interpreted according to the
++** byte-order specified by the BOM.  ^The byte-order specified by
++** the BOM at the beginning of the text overrides the byte-order
++** specified by the interface procedure.  ^So, for example, if
++** sqlite3_result_text16le() is invoked with text that begins
++** with bytes 0xfe, 0xff (a big-endian byte-order mark) then the
++** first two bytes of input are skipped and the remaining input
++** is interpreted as UTF16BE text.
++**
++** ^For UTF16 input text to the sqlite3_result_text16(),
++** sqlite3_result_text16be(), sqlite3_result_text16le(), and
++** sqlite3_result_text64() routines, if the text contains invalid
++** UTF16 characters, the invalid characters might be converted
++** into the unicode replacement character, U+FFFD.
++**
++** ^The sqlite3_result_value() interface sets the result of
++** the application-defined function to be a copy of the
++** [unprotected sqlite3_value] object specified by the 2nd parameter.  ^The
++** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
++** so that the [sqlite3_value] specified in the parameter may change or
++** be deallocated after sqlite3_result_value() returns without harm.
++** ^A [protected sqlite3_value] object may always be used where an
++** [unprotected sqlite3_value] object is required, so either
++** kind of [sqlite3_value] object can be used with this interface.
++**
++** ^The sqlite3_result_pointer(C,P,T,D) interface sets the result to an
++** SQL NULL value, just like [sqlite3_result_null(C)], except that it
++** also associates the host-language pointer P or type T with that
++** NULL value such that the pointer can be retrieved within an
++** [application-defined SQL function] using [sqlite3_value_pointer()].
++** ^If the D parameter is not NULL, then it is a pointer to a destructor
++** for the P parameter.  ^SQLite invokes D with P as its only argument
++** when SQLite is finished with P.  The T parameter should be a static
++** string and preferably a string literal. The sqlite3_result_pointer()
++** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
++**
++** If these routines are called from within the different thread
++** than the one containing the application-defined function that received
++** the [sqlite3_context] pointer, the results are undefined.
++*/
++SQLITE_API void sqlite3_result_blob(sqlite3_context*, const void*, int, void(*)(void*));
++SQLITE_API void sqlite3_result_blob64(sqlite3_context*,const void*,
++                           sqlite3_uint64,void(*)(void*));
++SQLITE_API void sqlite3_result_double(sqlite3_context*, double);
++SQLITE_API void sqlite3_result_error(sqlite3_context*, const char*, int);
++SQLITE_API void sqlite3_result_error16(sqlite3_context*, const void*, int);
++SQLITE_API void sqlite3_result_error_toobig(sqlite3_context*);
++SQLITE_API void sqlite3_result_error_nomem(sqlite3_context*);
++SQLITE_API void sqlite3_result_error_code(sqlite3_context*, int);
++SQLITE_API void sqlite3_result_int(sqlite3_context*, int);
++SQLITE_API void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
++SQLITE_API void sqlite3_result_null(sqlite3_context*);
++SQLITE_API void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
++SQLITE_API void sqlite3_result_text64(sqlite3_context*, const char*,sqlite3_uint64,
++                           void(*)(void*), unsigned char encoding);
++SQLITE_API void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
++SQLITE_API void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
++SQLITE_API void sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
++SQLITE_API void sqlite3_result_value(sqlite3_context*, sqlite3_value*);
++SQLITE_API void sqlite3_result_pointer(sqlite3_context*, void*,const char*,void(*)(void*));
++SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n);
++SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
++
++
++/*
++** CAPI3REF: Setting The Subtype Of An SQL Function
++** METHOD: sqlite3_context
++**
++** The sqlite3_result_subtype(C,T) function causes the subtype of
++** the result from the [application-defined SQL function] with
++** [sqlite3_context] C to be the value T.  Only the lower 8 bits
++** of the subtype T are preserved in current versions of SQLite;
++** higher order bits are discarded.
++** The number of subtype bytes preserved by SQLite might increase
++** in future releases of SQLite.
++**
++** Every [application-defined SQL function] that invokes this interface
++** should include the [SQLITE_RESULT_SUBTYPE] property in its
++** text encoding argument when the SQL function is
++** [sqlite3_create_function|registered].  If the [SQLITE_RESULT_SUBTYPE]
++** property is omitted from the function that invokes sqlite3_result_subtype(),
++** then in some cases the sqlite3_result_subtype() might fail to set
++** the result subtype.
++**
++** If SQLite is compiled with -DSQLITE_STRICT_SUBTYPE=1, then any
++** SQL function that invokes the sqlite3_result_subtype() interface
++** and that does not have the SQLITE_RESULT_SUBTYPE property will raise
++** an error.  Future versions of SQLite might enable -DSQLITE_STRICT_SUBTYPE=1
++** by default.
++*/
++SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
++
++/*
++** CAPI3REF: Define New Collating Sequences
++** METHOD: sqlite3
++**
++** ^These functions add, remove, or modify a [collation] associated
++** with the [database connection] specified as the first argument.
++**
++** ^The name of the collation is a UTF-8 string
++** for sqlite3_create_collation() and sqlite3_create_collation_v2()
++** and a UTF-16 string in native byte order for sqlite3_create_collation16().
++** ^Collation names that compare equal according to [sqlite3_strnicmp()] are
++** considered to be the same name.
++**
++** ^(The third argument (eTextRep) must be one of the constants:
++** 
        
++** 
      •  [SQLITE_UTF8],
++** 
      •  [SQLITE_UTF16LE],
++** 
      •  [SQLITE_UTF16BE],
++** 
      •  [SQLITE_UTF16], or
++** 
      •  [SQLITE_UTF16_ALIGNED].
++** 
      )^
++** ^The eTextRep argument determines the encoding of strings passed
++** to the collating function callback, xCompare.
++** ^The [SQLITE_UTF16] and [SQLITE_UTF16_ALIGNED] values for eTextRep
++** force strings to be UTF16 with native byte order.
++** ^The [SQLITE_UTF16_ALIGNED] value for eTextRep forces strings to begin
++** on an even byte address.
++**
++** ^The fourth argument, pArg, is an application data pointer that is passed
++** through as the first argument to the collating function callback.
++**
++** ^The fifth argument, xCompare, is a pointer to the collating function.
++** ^Multiple collating functions can be registered using the same name but
++** with different eTextRep parameters and SQLite will use whichever
++** function requires the least amount of data transformation.
++** ^If the xCompare argument is NULL then the collating function is
++** deleted.  ^When all collating functions having the same name are deleted,
++** that collation is no longer usable.
++**
++** ^The collating function callback is invoked with a copy of the pArg
++** application data pointer and with two strings in the encoding specified
++** by the eTextRep argument.  The two integer parameters to the collating
++** function callback are the length of the two strings, in bytes. The collating
++** function must return an integer that is negative, zero, or positive
++** if the first string is less than, equal to, or greater than the second,
++** respectively.  A collating function must always return the same answer
++** given the same inputs.  If two or more collating functions are registered
++** to the same collation name (using different eTextRep values) then all
++** must give an equivalent answer when invoked with equivalent strings.
++** The collating function must obey the following properties for all
++** strings A, B, and C:
++**
++** 
        
++** 
      1.  If A==B then B==A.
++** 
      2.  If A==B and B==C then A==C.
++** 
      3.  If A<B THEN B>A.
++** 
      4.  If A<B and B<C then A<C.
++** 
      
++**
++** If a collating function fails any of the above constraints and that
++** collating function is registered and used, then the behavior of SQLite
++** is undefined.
++**
++** ^The sqlite3_create_collation_v2() works like sqlite3_create_collation()
++** with the addition that the xDestroy callback is invoked on pArg when
++** the collating function is deleted.
++** ^Collating functions are deleted when they are overridden by later
++** calls to the collation creation functions or when the
++** [database connection] is closed using [sqlite3_close()].
++**
++** ^The xDestroy callback is not called if the
++** sqlite3_create_collation_v2() function fails.  Applications that invoke
++** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
++** check the return code and dispose of the application data pointer
++** themselves rather than expecting SQLite to deal with it for them.
++** This is different from every other SQLite interface.  The inconsistency
++** is unfortunate but cannot be changed without breaking backwards
++** compatibility.
++**
++** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
++*/
++SQLITE_API int sqlite3_create_collation(
++  sqlite3*,
++  const char *zName,
++  int eTextRep,
++  void *pArg,
++  int(*xCompare)(void*,int,const void*,int,const void*)
++);
++SQLITE_API int sqlite3_create_collation_v2(
++  sqlite3*,
++  const char *zName,
++  int eTextRep,
++  void *pArg,
++  int(*xCompare)(void*,int,const void*,int,const void*),
++  void(*xDestroy)(void*)
++);
++SQLITE_API int sqlite3_create_collation16(
++  sqlite3*,
++  const void *zName,
++  int eTextRep,
++  void *pArg,
++  int(*xCompare)(void*,int,const void*,int,const void*)
++);
++
++/*
++** CAPI3REF: Collation Needed Callbacks
++** METHOD: sqlite3
++**
++** ^To avoid having to register all collation sequences before a database
++** can be used, a single callback function may be registered with the
++** [database connection] to be invoked whenever an undefined collation
++** sequence is required.
++**
++** ^If the function is registered using the sqlite3_collation_needed() API,
++** then it is passed the names of undefined collation sequences as strings
++** encoded in UTF-8. ^If sqlite3_collation_needed16() is used,
++** the names are passed as UTF-16 in machine native byte order.
++** ^A call to either function replaces the existing collation-needed callback.
++**
++** ^(When the callback is invoked, the first argument passed is a copy
++** of the second argument to sqlite3_collation_needed() or
++** sqlite3_collation_needed16().  The second argument is the database
++** connection.  The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE],
++** or [SQLITE_UTF16LE], indicating the most desirable form of the collation
++** sequence function required.  The fourth parameter is the name of the
++** required collation sequence.)^
++**
++** The callback function should register the desired collation using
++** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
++** [sqlite3_create_collation_v2()].
++*/
++SQLITE_API int sqlite3_collation_needed(
++  sqlite3*,
++  void*,
++  void(*)(void*,sqlite3*,int eTextRep,const char*)
++);
++SQLITE_API int sqlite3_collation_needed16(
++  sqlite3*,
++  void*,
++  void(*)(void*,sqlite3*,int eTextRep,const void*)
++);
++
++#ifdef SQLITE_ENABLE_CEROD
++/*
++** Specify the activation key for a CEROD database.  Unless
++** activated, none of the CEROD routines will work.
++*/
++SQLITE_API void sqlite3_activate_cerod(
++  const char *zPassPhrase        /* Activation phrase */
++);
++#endif
++
++/*
++** CAPI3REF: Suspend Execution For A Short Time
++**
++** The sqlite3_sleep() function causes the current thread to suspend execution
++** for at least a number of milliseconds specified in its parameter.
++**
++** If the operating system does not support sleep requests with
++** millisecond time resolution, then the time will be rounded up to
++** the nearest second. The number of milliseconds of sleep actually
++** requested from the operating system is returned.
++**
++** ^SQLite implements this interface by calling the xSleep()
++** method of the default [sqlite3_vfs] object.  If the xSleep() method
++** of the default VFS is not implemented correctly, or not implemented at
++** all, then the behavior of sqlite3_sleep() may deviate from the description
++** in the previous paragraphs.
++**
++** If a negative argument is passed to sqlite3_sleep() the results vary by
++** VFS and operating system.  Some system treat a negative argument as an
++** instruction to sleep forever.  Others understand it to mean do not sleep
++** at all. ^In SQLite version 3.42.0 and later, a negative
++** argument passed into sqlite3_sleep() is changed to zero before it is relayed
++** down into the xSleep method of the VFS.
++*/
++SQLITE_API int sqlite3_sleep(int);
++
++/*
++** CAPI3REF: Name Of The Folder Holding Temporary Files
++**
++** ^(If this global variable is made to point to a string which is
++** the name of a folder (a.k.a. directory), then all temporary files
++** created by SQLite when using a built-in [sqlite3_vfs | VFS]
++** will be placed in that directory.)^  ^If this variable
++** is a NULL pointer, then SQLite performs a search for an appropriate
++** temporary file directory.
++**
++** Applications are strongly discouraged from using this global variable.
++** It is required to set a temporary folder on Windows Runtime (WinRT).
++** But for all other platforms, it is highly recommended that applications
++** neither read nor write this variable.  This global variable is a relic
++** that exists for backwards compatibility of legacy applications and should
++** be avoided in new projects.
++**
++** It is not safe to read or modify this variable in more than one
++** thread at a time.  It is not safe to read or modify this variable
++** if a [database connection] is being used at the same time in a separate
++** thread.
++** It is intended that this variable be set once
++** as part of process initialization and before any SQLite interface
++** routines have been called and that this variable remain unchanged
++** thereafter.
++**
++** ^The [temp_store_directory pragma] may modify this variable and cause
++** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
++** the [temp_store_directory pragma] always assumes that any string
++** that this variable points to is held in memory obtained from
++** [sqlite3_malloc] and the pragma may attempt to free that memory
++** using [sqlite3_free].
++** Hence, if this variable is modified directly, either it should be
++** made NULL or made to point to memory obtained from [sqlite3_malloc]
++** or else the use of the [temp_store_directory pragma] should be avoided.
++** Except when requested by the [temp_store_directory pragma], SQLite
++** does not free the memory that sqlite3_temp_directory points to.  If
++** the application wants that memory to be freed, it must do
++** so itself, taking care to only do so after all [database connection]
++** objects have been destroyed.
++**
++** Note to Windows Runtime users:  The temporary directory must be set
++** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various
++** features that require the use of temporary files may fail.  Here is an
++** example of how to do this using C++ with the Windows Runtime:
++**
++** 
      ++** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
++**       TemporaryFolder->Path->Data();
++** char zPathBuf[MAX_PATH + 1];
++** memset(zPathBuf, 0, sizeof(zPathBuf));
++** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
++**       NULL, NULL);
++** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
++** 
      
++*/
++SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory;
++
++/*
++** CAPI3REF: Name Of The Folder Holding Database Files
++**
++** ^(If this global variable is made to point to a string which is
++** the name of a folder (a.k.a. directory), then all database files
++** specified with a relative pathname and created or accessed by
++** SQLite when using a built-in windows [sqlite3_vfs | VFS] will be assumed
++** to be relative to that directory.)^ ^If this variable is a NULL
++** pointer, then SQLite assumes that all database files specified
++** with a relative pathname are relative to the current directory
++** for the process.  Only the windows VFS makes use of this global
++** variable; it is ignored by the unix VFS.
++**
++** Changing the value of this variable while a database connection is
++** open can result in a corrupt database.
++**
++** It is not safe to read or modify this variable in more than one
++** thread at a time.  It is not safe to read or modify this variable
++** if a [database connection] is being used at the same time in a separate
++** thread.
++** It is intended that this variable be set once
++** as part of process initialization and before any SQLite interface
++** routines have been called and that this variable remain unchanged
++** thereafter.
++**
++** ^The [data_store_directory pragma] may modify this variable and cause
++** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
++** the [data_store_directory pragma] always assumes that any string
++** that this variable points to is held in memory obtained from
++** [sqlite3_malloc] and the pragma may attempt to free that memory
++** using [sqlite3_free].
++** Hence, if this variable is modified directly, either it should be
++** made NULL or made to point to memory obtained from [sqlite3_malloc]
++** or else the use of the [data_store_directory pragma] should be avoided.
++*/
++SQLITE_API SQLITE_EXTERN char *sqlite3_data_directory;
++
++/*
++** CAPI3REF: Win32 Specific Interface
++**
++** These interfaces are available only on Windows.  The
++** [sqlite3_win32_set_directory] interface is used to set the value associated
++** with the [sqlite3_temp_directory] or [sqlite3_data_directory] variable, to
++** zValue, depending on the value of the type parameter.  The zValue parameter
++** should be NULL to cause the previous value to be freed via [sqlite3_free];
++** a non-NULL value will be copied into memory obtained from [sqlite3_malloc]
++** prior to being used.  The [sqlite3_win32_set_directory] interface returns
++** [SQLITE_OK] to indicate success, [SQLITE_ERROR] if the type is unsupported,
++** or [SQLITE_NOMEM] if memory could not be allocated.  The value of the
++** [sqlite3_data_directory] variable is intended to act as a replacement for
++** the current directory on the sub-platforms of Win32 where that concept is
++** not present, e.g. WinRT and UWP.  The [sqlite3_win32_set_directory8] and
++** [sqlite3_win32_set_directory16] interfaces behave exactly the same as the
++** sqlite3_win32_set_directory interface except the string parameter must be
++** UTF-8 or UTF-16, respectively.
++*/
++SQLITE_API int sqlite3_win32_set_directory(
++  unsigned long type, /* Identifier for directory being set or reset */
++  void *zValue        /* New value for directory being set or reset */
++);
++SQLITE_API int sqlite3_win32_set_directory8(unsigned long type, const char *zValue);
++SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void *zValue);
++
++/*
++** CAPI3REF: Win32 Directory Types
++**
++** These macros are only available on Windows.  They define the allowed values
++** for the type argument to the [sqlite3_win32_set_directory] interface.
++*/
++#define SQLITE_WIN32_DATA_DIRECTORY_TYPE  1
++#define SQLITE_WIN32_TEMP_DIRECTORY_TYPE  2
++
++/*
++** CAPI3REF: Test For Auto-Commit Mode
++** KEYWORDS: {autocommit mode}
++** METHOD: sqlite3
++**
++** ^The sqlite3_get_autocommit() interface returns non-zero or
++** zero if the given database connection is or is not in autocommit mode,
++** respectively.  ^Autocommit mode is on by default.
++** ^Autocommit mode is disabled by a [BEGIN] statement.
++** ^Autocommit mode is re-enabled by a [COMMIT] or [ROLLBACK].
++**
++** If certain kinds of errors occur on a statement within a multi-statement
++** transaction (errors including [SQLITE_FULL], [SQLITE_IOERR],
++** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
++** transaction might be rolled back automatically.  The only way to
++** find out whether SQLite automatically rolled back the transaction after
++** an error is to use this function.
++**
++** If another thread changes the autocommit status of the database
++** connection while this routine is running, then the return value
++** is undefined.
++*/
++SQLITE_API int sqlite3_get_autocommit(sqlite3*);
++
++/*
++** CAPI3REF: Find The Database Handle Of A Prepared Statement
++** METHOD: sqlite3_stmt
++**
++** ^The sqlite3_db_handle interface returns the [database connection] handle
++** to which a [prepared statement] belongs.  ^The [database connection]
++** returned by sqlite3_db_handle is the same [database connection]
++** that was the first argument
++** to the [sqlite3_prepare_v2()] call (or its variants) that was used to
++** create the statement in the first place.
++*/
++SQLITE_API sqlite3 *sqlite3_db_handle(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Return The Schema Name For A Database Connection
++** METHOD: sqlite3
++**
++** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
++** for the N-th database on database connection D, or a NULL pointer of N is
++** out of range.  An N value of 0 means the main database file.  An N of 1 is
++** the "temp" schema.  Larger values of N correspond to various ATTACH-ed
++** databases.
++**
++** Space to hold the string that is returned by sqlite3_db_name() is managed
++** by SQLite itself.  The string might be deallocated by any operation that
++** changes the schema, including [ATTACH] or [DETACH] or calls to
++** [sqlite3_serialize()] or [sqlite3_deserialize()], even operations that
++** occur on a different thread.  Applications that need to
++** remember the string long-term should make their own copy.  Applications that
++** are accessing the same database connection simultaneously on multiple
++** threads should mutex-protect calls to this API and should make their own
++** private copy of the result prior to releasing the mutex.
++*/
++SQLITE_API const char *sqlite3_db_name(sqlite3 *db, int N);
++
++/*
++** CAPI3REF: Return The Filename For A Database Connection
++** METHOD: sqlite3
++**
++** ^The sqlite3_db_filename(D,N) interface returns a pointer to the filename
++** associated with database N of connection D.
++** ^If there is no attached database N on the database
++** connection D, or if database N is a temporary or in-memory database, then
++** this function will return either a NULL pointer or an empty string.
++**
++** ^The string value returned by this routine is owned and managed by
++** the database connection.  ^The value will be valid until the database N
++** is [DETACH]-ed or until the database connection closes.
++**
++** ^The filename returned by this function is the output of the
++** xFullPathname method of the [VFS].  ^In other words, the filename
++** will be an absolute pathname, even if the filename used
++** to open the database originally was a URI or relative pathname.
++**
++** If the filename pointer returned by this routine is not NULL, then it
++** can be used as the filename input parameter to these routines:
++** 
        
++** 
      •  [sqlite3_uri_parameter()]
++** 
      •  [sqlite3_uri_boolean()]
++** 
      •  [sqlite3_uri_int64()]
++** 
      •  [sqlite3_filename_database()]
++** 
      •  [sqlite3_filename_journal()]
++** 
      •  [sqlite3_filename_wal()]
++** 
      
++*/
++SQLITE_API sqlite3_filename sqlite3_db_filename(sqlite3 *db, const char *zDbName);
++
++/*
++** CAPI3REF: Determine if a database is read-only
++** METHOD: sqlite3
++**
++** ^The sqlite3_db_readonly(D,N) interface returns 1 if the database N
++** of connection D is read-only, 0 if it is read/write, or -1 if N is not
++** the name of a database on connection D.
++*/
++SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
++
++/*
++** CAPI3REF: Determine the transaction state of a database
++** METHOD: sqlite3
++**
++** ^The sqlite3_txn_state(D,S) interface returns the current
++** [transaction state] of schema S in database connection D.  ^If S is NULL,
++** then the highest transaction state of any schema on database connection D
++** is returned.  Transaction states are (in order of lowest to highest):
++** 
        
++** 
      1.  SQLITE_TXN_NONE
++** 
      2.  SQLITE_TXN_READ
++** 
      3.  SQLITE_TXN_WRITE
++** 
      
++** ^If the S argument to sqlite3_txn_state(D,S) is not the name of
++** a valid schema, then -1 is returned.
++*/
++SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema);
++
++/*
++** CAPI3REF: Allowed return values from sqlite3_txn_state()
++** KEYWORDS: {transaction state}
++**
++** These constants define the current transaction state of a database file.
++** ^The [sqlite3_txn_state(D,S)] interface returns one of these
++** constants in order to describe the transaction state of schema S
++** in [database connection] D.
++**
++** 
      
++** [[SQLITE_TXN_NONE]] 
      SQLITE_TXN_NONE
      
++** 
      The SQLITE_TXN_NONE state means that no transaction is currently
++** pending.
      
++**
++** [[SQLITE_TXN_READ]] 
      SQLITE_TXN_READ
      
++** 
      The SQLITE_TXN_READ state means that the database is currently
++** in a read transaction.  Content has been read from the database file
++** but nothing in the database file has changed.  The transaction state
++** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
++** no other conflicting concurrent write transactions.  The transaction
++** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
++** [COMMIT].
      
++**
++** [[SQLITE_TXN_WRITE]] 
      SQLITE_TXN_WRITE
      
++** 
      The SQLITE_TXN_WRITE state means that the database is currently
++** in a write transaction.  Content has been written to the database file
++** but has not yet committed.  The transaction state will change to
++** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].
      
++*/
++#define SQLITE_TXN_NONE  0
++#define SQLITE_TXN_READ  1
++#define SQLITE_TXN_WRITE 2
++
++/*
++** CAPI3REF: Find the next prepared statement
++** METHOD: sqlite3
++**
++** ^This interface returns a pointer to the next [prepared statement] after
++** pStmt associated with the [database connection] pDb.  ^If pStmt is NULL
++** then this interface returns a pointer to the first prepared statement
++** associated with the database connection pDb.  ^If no prepared statement
++** satisfies the conditions of this routine, it returns NULL.
++**
++** The [database connection] pointer D in a call to
++** [sqlite3_next_stmt(D,S)] must refer to an open database
++** connection and in particular must not be a NULL pointer.
++*/
++SQLITE_API sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt);
++
++/*
++** CAPI3REF: Commit And Rollback Notification Callbacks
++** METHOD: sqlite3
++**
++** ^The sqlite3_commit_hook() interface registers a callback
++** function to be invoked whenever a transaction is [COMMIT | committed].
++** ^Any callback set by a previous call to sqlite3_commit_hook()
++** for the same database connection is overridden.
++** ^The sqlite3_rollback_hook() interface registers a callback
++** function to be invoked whenever a transaction is [ROLLBACK | rolled back].
++** ^Any callback set by a previous call to sqlite3_rollback_hook()
++** for the same database connection is overridden.
++** ^The pArg argument is passed through to the callback.
++** ^If the callback on a commit hook function returns non-zero,
++** then the commit is converted into a rollback.
++**
++** ^The sqlite3_commit_hook(D,C,P) and sqlite3_rollback_hook(D,C,P) functions
++** return the P argument from the previous call of the same function
++** on the same [database connection] D, or NULL for
++** the first call for each function on D.
++**
++** The commit and rollback hook callbacks are not reentrant.
++** The callback implementation must not do anything that will modify
++** the database connection that invoked the callback.  Any actions
++** to modify the database connection must be deferred until after the
++** completion of the [sqlite3_step()] call that triggered the commit
++** or rollback hook in the first place.
++** Note that running any other SQL statements, including SELECT statements,
++** or merely calling [sqlite3_prepare_v2()] and [sqlite3_step()] will modify
++** the database connections for the meaning of "modify" in this paragraph.
++**
++** ^Registering a NULL function disables the callback.
++**
++** ^When the commit hook callback routine returns zero, the [COMMIT]
++** operation is allowed to continue normally.  ^If the commit hook
++** returns non-zero, then the [COMMIT] is converted into a [ROLLBACK].
++** ^The rollback hook is invoked on a rollback that results from a commit
++** hook returning non-zero, just as it would be with any other rollback.
++**
++** ^For the purposes of this API, a transaction is said to have been
++** rolled back if an explicit "ROLLBACK" statement is executed, or
++** an error or constraint causes an implicit rollback to occur.
++** ^The rollback callback is not invoked if a transaction is
++** automatically rolled back because the database connection is closed.
++**
++** See also the [sqlite3_update_hook()] interface.
++*/
++SQLITE_API void *sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);
++SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
++
++/*
++** CAPI3REF: Autovacuum Compaction Amount Callback
++** METHOD: sqlite3
++**
++** ^The sqlite3_autovacuum_pages(D,C,P,X) interface registers a callback
++** function C that is invoked prior to each autovacuum of the database
++** file.  ^The callback is passed a copy of the generic data pointer (P),
++** the schema-name of the attached database that is being autovacuumed,
++** the size of the database file in pages, the number of free pages,
++** and the number of bytes per page, respectively.  The callback should
++** return the number of free pages that should be removed by the
++** autovacuum.  ^If the callback returns zero, then no autovacuum happens.
++** ^If the value returned is greater than or equal to the number of
++** free pages, then a complete autovacuum happens.
++**
++** 
      ^If there are multiple ATTACH-ed database files that are being
++** modified as part of a transaction commit, then the autovacuum pages
++** callback is invoked separately for each file.
++**
++** 
      The callback is not reentrant. The callback function should
++** not attempt to invoke any other SQLite interface.  If it does, bad
++** things may happen, including segmentation faults and corrupt database
++** files.  The callback function should be a simple function that
++** does some arithmetic on its input parameters and returns a result.
++**
++** ^The X parameter to sqlite3_autovacuum_pages(D,C,P,X) is an optional
++** destructor for the P parameter.  ^If X is not NULL, then X(P) is
++** invoked whenever the database connection closes or when the callback
++** is overwritten by another invocation of sqlite3_autovacuum_pages().
++**
++** 
      ^There is only one autovacuum pages callback per database connection.
++** ^Each call to the sqlite3_autovacuum_pages() interface overrides all
++** previous invocations for that database connection.  ^If the callback
++** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer,
++** then the autovacuum steps callback is canceled.  The return value
++** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might
++** be some other error code if something goes wrong.  The current
++** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other
++** return codes might be added in future releases.
++**
++** 
      If no autovacuum pages callback is specified (the usual case) or
++** a NULL pointer is provided for the callback,
++** then the default behavior is to vacuum all free pages.  So, in other
++** words, the default behavior is the same as if the callback function
++** were something like this:
++**
++** 
      ++**     unsigned int demonstration_autovac_pages_callback(
++**       void *pClientData,
++**       const char *zSchema,
++**       unsigned int nDbPage,
++**       unsigned int nFreePage,
++**       unsigned int nBytePerPage
++**     ){
++**       return nFreePage;
++**     }
++** 
      
++*/
++SQLITE_API int sqlite3_autovacuum_pages(
++  sqlite3 *db,
++  unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
++  void*,
++  void(*)(void*)
++);
++
++
++/*
++** CAPI3REF: Data Change Notification Callbacks
++** METHOD: sqlite3
++**
++** ^The sqlite3_update_hook() interface registers a callback function
++** with the [database connection] identified by the first argument
++** to be invoked whenever a row is updated, inserted or deleted in
++** a [rowid table].
++** ^Any callback set by a previous call to this function
++** for the same database connection is overridden.
++**
++** ^The second argument is a pointer to the function to invoke when a
++** row is updated, inserted or deleted in a rowid table.
++** ^The first argument to the callback is a copy of the third argument
++** to sqlite3_update_hook().
++** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
++** or [SQLITE_UPDATE], depending on the operation that caused the callback
++** to be invoked.
++** ^The third and fourth arguments to the callback contain pointers to the
++** database and table name containing the affected row.
++** ^The final callback parameter is the [rowid] of the row.
++** ^In the case of an update, this is the [rowid] after the update takes place.
++**
++** ^(The update hook is not invoked when internal system tables are
++** modified (i.e. sqlite_sequence).)^
++** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
++**
++** ^In the current implementation, the update hook
++** is not invoked when conflicting rows are deleted because of an
++** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
++** invoked when rows are deleted using the [truncate optimization].
++** The exceptions defined in this paragraph might change in a future
++** release of SQLite.
++**
++** The update hook implementation must not do anything that will modify
++** the database connection that invoked the update hook.  Any actions
++** to modify the database connection must be deferred until after the
++** completion of the [sqlite3_step()] call that triggered the update hook.
++** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
++** database connections for the meaning of "modify" in this paragraph.
++**
++** ^The sqlite3_update_hook(D,C,P) function
++** returns the P argument from the previous call
++** on the same [database connection] D, or NULL for
++** the first call on D.
++**
++** See also the [sqlite3_commit_hook()], [sqlite3_rollback_hook()],
++** and [sqlite3_preupdate_hook()] interfaces.
++*/
++SQLITE_API void *sqlite3_update_hook(
++  sqlite3*,
++  void(*)(void *,int ,char const *,char const *,sqlite3_int64),
++  void*
++);
++
++/*
++** CAPI3REF: Enable Or Disable Shared Pager Cache
++**
++** ^(This routine enables or disables the sharing of the database cache
++** and schema data structures between [database connection | connections]
++** to the same database. Sharing is enabled if the argument is true
++** and disabled if the argument is false.)^
++**
++** This interface is omitted if SQLite is compiled with
++** [-DSQLITE_OMIT_SHARED_CACHE].  The [-DSQLITE_OMIT_SHARED_CACHE]
++** compile-time option is recommended because the
++** [use of shared cache mode is discouraged].
++**
++** ^Cache sharing is enabled and disabled for an entire process.
++** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
++** In prior versions of SQLite,
++** sharing was enabled or disabled for each thread separately.
++**
++** ^(The cache sharing mode set by this interface effects all subsequent
++** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
++** Existing database connections continue to use the sharing mode
++** that was in effect at the time they were opened.)^
++**
++** ^(This routine returns [SQLITE_OK] if shared cache was enabled or disabled
++** successfully.  An [error code] is returned otherwise.)^
++**
++** ^Shared cache is disabled by default. It is recommended that it stay
++** that way.  In other words, do not use this routine.  This interface
++** continues to be provided for historical compatibility, but its use is
++** discouraged.  Any use of shared cache is discouraged.  If shared cache
++** must be used, it is recommended that shared cache only be enabled for
++** individual database connections using the [sqlite3_open_v2()] interface
++** with the [SQLITE_OPEN_SHAREDCACHE] flag.
++**
++** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
++** and will always return SQLITE_MISUSE. On those systems,
++** shared cache mode should be enabled per-database connection via
++** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
++**
++** This interface is threadsafe on processors where writing a
++** 32-bit integer is atomic.
++**
++** See Also:  [SQLite Shared-Cache Mode]
++*/
++SQLITE_API int sqlite3_enable_shared_cache(int);
++
++/*
++** CAPI3REF: Attempt To Free Heap Memory
++**
++** ^The sqlite3_release_memory() interface attempts to free N bytes
++** of heap memory by deallocating non-essential memory allocations
++** held by the database library.   Memory used to cache database
++** pages to improve performance is an example of non-essential memory.
++** ^sqlite3_release_memory() returns the number of bytes actually freed,
++** which might be more or less than the amount requested.
++** ^The sqlite3_release_memory() routine is a no-op returning zero
++** if SQLite is not compiled with [SQLITE_ENABLE_MEMORY_MANAGEMENT].
++**
++** See also: [sqlite3_db_release_memory()]
++*/
++SQLITE_API int sqlite3_release_memory(int);
++
++/*
++** CAPI3REF: Free Memory Used By A Database Connection
++** METHOD: sqlite3
++**
++** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
++** memory as possible from database connection D. Unlike the
++** [sqlite3_release_memory()] interface, this interface is in effect even
++** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
++** omitted.
++**
++** See also: [sqlite3_release_memory()]
++*/
++SQLITE_API int sqlite3_db_release_memory(sqlite3*);
++
++/*
++** CAPI3REF: Impose A Limit On Heap Size
++**
++** These interfaces impose limits on the amount of heap memory that will be
++** by all database connections within a single process.
++**
++** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
++** soft limit on the amount of heap memory that may be allocated by SQLite.
++** ^SQLite strives to keep heap memory utilization below the soft heap
++** limit by reducing the number of pages held in the page cache
++** as heap memory usages approaches the limit.
++** ^The soft heap limit is "soft" because even though SQLite strives to stay
++** below the limit, it will exceed the limit rather than generate
++** an [SQLITE_NOMEM] error.  In other words, the soft heap limit
++** is advisory only.
++**
++** ^The sqlite3_hard_heap_limit64(N) interface sets a hard upper bound of
++** N bytes on the amount of memory that will be allocated.  ^The
++** sqlite3_hard_heap_limit64(N) interface is similar to
++** sqlite3_soft_heap_limit64(N) except that memory allocations will fail
++** when the hard heap limit is reached.
++**
++** ^The return value from both sqlite3_soft_heap_limit64() and
++** sqlite3_hard_heap_limit64() is the size of
++** the heap limit prior to the call, or negative in the case of an
++** error.  ^If the argument N is negative
++** then no change is made to the heap limit.  Hence, the current
++** size of heap limits can be determined by invoking
++** sqlite3_soft_heap_limit64(-1) or sqlite3_hard_heap_limit(-1).
++**
++** ^Setting the heap limits to zero disables the heap limiter mechanism.
++**
++** ^The soft heap limit may not be greater than the hard heap limit.
++** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N)
++** is invoked with a value of N that is greater than the hard heap limit,
++** the soft heap limit is set to the value of the hard heap limit.
++** ^The soft heap limit is automatically enabled whenever the hard heap
++** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and
++** the soft heap limit is outside the range of 1..N, then the soft heap
++** limit is set to N.  ^Invoking sqlite3_soft_heap_limit64(0) when the
++** hard heap limit is enabled makes the soft heap limit equal to the
++** hard heap limit.
++**
++** The memory allocation limits can also be adjusted using
++** [PRAGMA soft_heap_limit] and [PRAGMA hard_heap_limit].
++**
++** ^(The heap limits are not enforced in the current implementation
++** if one or more of following conditions are true:
++**
++** 
        
++** 
      •  The limit value is set to zero.
++** 
      •  Memory accounting is disabled using a combination of the
++**      [sqlite3_config]([SQLITE_CONFIG_MEMSTATUS],...) start-time option and
++**      the [SQLITE_DEFAULT_MEMSTATUS] compile-time option.
++** 
      •  An alternative page cache implementation is specified using
++**      [sqlite3_config]([SQLITE_CONFIG_PCACHE2],...).
++** 
      •  The page cache allocates from its own memory pool supplied
++**      by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
++**      from the heap.
++** 
      )^
++**
++** The circumstances under which SQLite will enforce the heap limits may
++** changes in future releases of SQLite.
++*/
++SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
++SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
++
++/*
++** CAPI3REF: Deprecated Soft Heap Limit Interface
++** DEPRECATED
++**
++** This is a deprecated version of the [sqlite3_soft_heap_limit64()]
++** interface.  This routine is provided for historical compatibility
++** only.  All new applications should use the
++** [sqlite3_soft_heap_limit64()] interface rather than this one.
++*/
++SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);
++
++
++/*
++** CAPI3REF: Extract Metadata About A Column Of A Table
++** METHOD: sqlite3
++**
++** ^(The sqlite3_table_column_metadata(X,D,T,C,....) routine returns
++** information about column C of table T in database D
++** on [database connection] X.)^  ^The sqlite3_table_column_metadata()
++** interface returns SQLITE_OK and fills in the non-NULL pointers in
++** the final five arguments with appropriate values if the specified
++** column exists.  ^The sqlite3_table_column_metadata() interface returns
++** SQLITE_ERROR if the specified column does not exist.
++** ^If the column-name parameter to sqlite3_table_column_metadata() is a
++** NULL pointer, then this routine simply checks for the existence of the
++** table and returns SQLITE_OK if the table exists and SQLITE_ERROR if it
++** does not.  If the table name parameter T in a call to
++** sqlite3_table_column_metadata(X,D,T,C,...) is NULL then the result is
++** undefined behavior.
++**
++** ^The column is identified by the second, third and fourth parameters to
++** this function. ^(The second parameter is either the name of the database
++** (i.e. "main", "temp", or an attached database) containing the specified
++** table or NULL.)^ ^If it is NULL, then all attached databases are searched
++** for the table using the same algorithm used by the database engine to
++** resolve unqualified table references.
++**
++** ^The third and fourth parameters to this function are the table and column
++** name of the desired column, respectively.
++**
++** ^Metadata is returned by writing to the memory locations passed as the 5th
++** and subsequent parameters to this function. ^Any of these arguments may be
++** NULL, in which case the corresponding element of metadata is omitted.
++**
++** ^(
      
++** 
++** 
       Parameter  Output
      Type       		  Description
++**
++** 
       5th  const char*  Data type
++** 
       6th  const char*  Name of default collation sequence
++** 
       7th  int          True if column has a NOT NULL constraint
++** 
       8th  int          True if column is part of the PRIMARY KEY
++** 
       9th  int          True if column is [AUTOINCREMENT]
++** 
      
++** 
      )^
++**
++** ^The memory pointed to by the character pointers returned for the
++** declaration type and collation sequence is valid until the next
++** call to any SQLite API function.
++**
++** ^If the specified table is actually a view, an [error code] is returned.
++**
++** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
++** is not a [WITHOUT ROWID] table and an
++** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
++** parameters are set for the explicitly declared column. ^(If there is no
++** [INTEGER PRIMARY KEY] column, then the outputs
++** for the [rowid] are set as follows:
++**
++** 
      ++**     data type: "INTEGER"
++**     collation sequence: "BINARY"
++**     not null: 0
++**     primary key: 1
++**     auto increment: 0
++** 
      )^
++**
++** ^This function causes all database schemas to be read from disk and
++** parsed, if that has not already been done, and returns an error if
++** any errors are encountered while loading the schema.
++*/
++SQLITE_API int sqlite3_table_column_metadata(
++  sqlite3 *db,                /* Connection handle */
++  const char *zDbName,        /* Database name or NULL */
++  const char *zTableName,     /* Table name */
++  const char *zColumnName,    /* Column name */
++  char const **pzDataType,    /* OUTPUT: Declared data type */
++  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
++  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
++  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
++  int *pAutoinc               /* OUTPUT: True if column is auto-increment */
++);
++
++/*
++** CAPI3REF: Load An Extension
++** METHOD: sqlite3
++**
++** ^This interface loads an SQLite extension library from the named file.
++**
++** ^The sqlite3_load_extension() interface attempts to load an
++** [SQLite extension] library contained in the file zFile.  If
++** the file cannot be loaded directly, attempts are made to load
++** with various operating-system specific extensions added.
++** So for example, if "samplelib" cannot be loaded, then names like
++** "samplelib.so" or "samplelib.dylib" or "samplelib.dll" might
++** be tried also.
++**
++** ^The entry point is zProc.
++** ^(zProc may be 0, in which case SQLite will try to come up with an
++** entry point name on its own.  It first tries "sqlite3_extension_init".
++** If that does not work, it constructs a name "sqlite3_X_init" where the
++** X is consists of the lower-case equivalent of all ASCII alphabetic
++** characters in the filename from the last "/" to the first following
++** "." and omitting any initial "lib".)^
++** ^The sqlite3_load_extension() interface returns
++** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
++** ^If an error occurs and pzErrMsg is not 0, then the
++** [sqlite3_load_extension()] interface shall attempt to
++** fill *pzErrMsg with error message text stored in memory
++** obtained from [sqlite3_malloc()]. The calling function
++** should free this memory by calling [sqlite3_free()].
++**
++** ^Extension loading must be enabled using
++** [sqlite3_enable_load_extension()] or
++** [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],1,NULL)
++** prior to calling this API,
++** otherwise an error will be returned.
++**
++** Security warning: It is recommended that the
++** [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method be used to enable only this
++** interface.  The use of the [sqlite3_enable_load_extension()] interface
++** should be avoided.  This will keep the SQL function [load_extension()]
++** disabled and prevent SQL injections from giving attackers
++** access to extension loading capabilities.
++**
++** See also the [load_extension() SQL function].
++*/
++SQLITE_API int sqlite3_load_extension(
++  sqlite3 *db,          /* Load the extension into this database connection */
++  const char *zFile,    /* Name of the shared library containing extension */
++  const char *zProc,    /* Entry point.  Derived from zFile if 0 */
++  char **pzErrMsg       /* Put error message here if not 0 */
++);
++
++/*
++** CAPI3REF: Enable Or Disable Extension Loading
++** METHOD: sqlite3
++**
++** ^So as not to open security holes in older applications that are
++** unprepared to deal with [extension loading], and as a means of disabling
++** [extension loading] while evaluating user-entered SQL, the following API
++** is provided to turn the [sqlite3_load_extension()] mechanism on and off.
++**
++** ^Extension loading is off by default.
++** ^Call the sqlite3_enable_load_extension() routine with onoff==1
++** to turn extension loading on and call it with onoff==0 to turn
++** it back off again.
++**
++** ^This interface enables or disables both the C-API
++** [sqlite3_load_extension()] and the SQL function [load_extension()].
++** ^(Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
++** to enable or disable only the C-API.)^
++**
++** Security warning: It is recommended that extension loading
++** be enabled using the [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method
++** rather than this interface, so the [load_extension()] SQL function
++** remains disabled. This will prevent SQL injections from giving attackers
++** access to extension loading capabilities.
++*/
++SQLITE_API int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
++
++/*
++** CAPI3REF: Automatically Load Statically Linked Extensions
++**
++** ^This interface causes the xEntryPoint() function to be invoked for
++** each new [database connection] that is created.  The idea here is that
++** xEntryPoint() is the entry point for a statically linked [SQLite extension]
++** that is to be automatically loaded into all new database connections.
++**
++** ^(Even though the function prototype shows that xEntryPoint() takes
++** no arguments and returns void, SQLite invokes xEntryPoint() with three
++** arguments and expects an integer result as if the signature of the
++** entry point where as follows:
++**
++** 
      ++**    int xEntryPoint(
++**      sqlite3 *db,
++**      const char **pzErrMsg,
++**      const struct sqlite3_api_routines *pThunk
++**    );
++** 
      )^
++**
++** If the xEntryPoint routine encounters an error, it should make *pzErrMsg
++** point to an appropriate error message (obtained from [sqlite3_mprintf()])
++** and return an appropriate [error code].  ^SQLite ensures that *pzErrMsg
++** is NULL before calling the xEntryPoint().  ^SQLite will invoke
++** [sqlite3_free()] on *pzErrMsg after xEntryPoint() returns.  ^If any
++** xEntryPoint() returns an error, the [sqlite3_open()], [sqlite3_open16()],
++** or [sqlite3_open_v2()] call that provoked the xEntryPoint() will fail.
++**
++** ^Calling sqlite3_auto_extension(X) with an entry point X that is already
++** on the list of automatic extensions is a harmless no-op. ^No entry point
++** will be called more than once for each database connection that is opened.
++**
++** See also: [sqlite3_reset_auto_extension()]
++** and [sqlite3_cancel_auto_extension()]
++*/
++SQLITE_API int sqlite3_auto_extension(void(*xEntryPoint)(void));
++
++/*
++** CAPI3REF: Cancel Automatic Extension Loading
++**
++** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
++** initialization routine X that was registered using a prior call to
++** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
++** routine returns 1 if initialization routine X was successfully
++** unregistered and it returns 0 if X was not on the list of initialization
++** routines.
++*/
++SQLITE_API int sqlite3_cancel_auto_extension(void(*xEntryPoint)(void));
++
++/*
++** CAPI3REF: Reset Automatic Extension Loading
++**
++** ^This interface disables all automatic extensions previously
++** registered using [sqlite3_auto_extension()].
++*/
++SQLITE_API void sqlite3_reset_auto_extension(void);
++
++/*
++** Structures used by the virtual table interface
++*/
++typedef struct sqlite3_vtab sqlite3_vtab;
++typedef struct sqlite3_index_info sqlite3_index_info;
++typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
++typedef struct sqlite3_module sqlite3_module;
++
++/*
++** CAPI3REF: Virtual Table Object
++** KEYWORDS: sqlite3_module {virtual table module}
++**
++** This structure, sometimes called a "virtual table module",
++** defines the implementation of a [virtual table].
++** This structure consists mostly of methods for the module.
++**
++** ^A virtual table module is created by filling in a persistent
++** instance of this structure and passing a pointer to that instance
++** to [sqlite3_create_module()] or [sqlite3_create_module_v2()].
++** ^The registration remains valid until it is replaced by a different
++** module or until the [database connection] closes.  The content
++** of this structure must not change while it is registered with
++** any database connection.
++*/
++struct sqlite3_module {
++  int iVersion;
++  int (*xCreate)(sqlite3*, void *pAux,
++               int argc, const char *const*argv,
++               sqlite3_vtab **ppVTab, char**);
++  int (*xConnect)(sqlite3*, void *pAux,
++               int argc, const char *const*argv,
++               sqlite3_vtab **ppVTab, char**);
++  int (*xBestIndex)(sqlite3_vtab *pVTab, sqlite3_index_info*);
++  int (*xDisconnect)(sqlite3_vtab *pVTab);
++  int (*xDestroy)(sqlite3_vtab *pVTab);
++  int (*xOpen)(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor);
++  int (*xClose)(sqlite3_vtab_cursor*);
++  int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
++                int argc, sqlite3_value **argv);
++  int (*xNext)(sqlite3_vtab_cursor*);
++  int (*xEof)(sqlite3_vtab_cursor*);
++  int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
++  int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64 *pRowid);
++  int (*xUpdate)(sqlite3_vtab *, int, sqlite3_value **, sqlite3_int64 *);
++  int (*xBegin)(sqlite3_vtab *pVTab);
++  int (*xSync)(sqlite3_vtab *pVTab);
++  int (*xCommit)(sqlite3_vtab *pVTab);
++  int (*xRollback)(sqlite3_vtab *pVTab);
++  int (*xFindFunction)(sqlite3_vtab *pVtab, int nArg, const char *zName,
++                       void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
++                       void **ppArg);
++  int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
++  /* The methods above are in version 1 of the sqlite_module object. Those
++  ** below are for version 2 and greater. */
++  int (*xSavepoint)(sqlite3_vtab *pVTab, int);
++  int (*xRelease)(sqlite3_vtab *pVTab, int);
++  int (*xRollbackTo)(sqlite3_vtab *pVTab, int);
++  /* The methods above are in versions 1 and 2 of the sqlite_module object.
++  ** Those below are for version 3 and greater. */
++  int (*xShadowName)(const char*);
++  /* The methods above are in versions 1 through 3 of the sqlite_module object.
++  ** Those below are for version 4 and greater. */
++  int (*xIntegrity)(sqlite3_vtab *pVTab, const char *zSchema,
++                    const char *zTabName, int mFlags, char **pzErr);
++};
++
++/*
++** CAPI3REF: Virtual Table Indexing Information
++** KEYWORDS: sqlite3_index_info
++**
++** The sqlite3_index_info structure and its substructures is used as part
++** of the [virtual table] interface to
++** pass information into and receive the reply from the [xBestIndex]
++** method of a [virtual table module].  The fields under **Inputs** are the
++** inputs to xBestIndex and are read-only.  xBestIndex inserts its
++** results into the **Outputs** fields.
++**
++** ^(The aConstraint[] array records WHERE clause constraints of the form:
++**
++** 
      column OP expr
      
++**
++** where OP is =, <, <=, >, or >=.)^  ^(The particular operator is
++** stored in aConstraint[].op using one of the
++** [SQLITE_INDEX_CONSTRAINT_EQ | SQLITE_INDEX_CONSTRAINT_ values].)^
++** ^(The index of the column is stored in
++** aConstraint[].iColumn.)^  ^(aConstraint[].usable is TRUE if the
++** expr on the right-hand side can be evaluated (and thus the constraint
++** is usable) and false if it cannot.)^
++**
++** ^The optimizer automatically inverts terms of the form "expr OP column"
++** and makes other simplifications to the WHERE clause in an attempt to
++** get as many WHERE clause terms into the form shown above as possible.
++** ^The aConstraint[] array only reports WHERE clause terms that are
++** relevant to the particular virtual table being queried.
++**
++** ^Information about the ORDER BY clause is stored in aOrderBy[].
++** ^Each term of aOrderBy records a column of the ORDER BY clause.
++**
++** The colUsed field indicates which columns of the virtual table may be
++** required by the current scan. Virtual table columns are numbered from
++** zero in the order in which they appear within the CREATE TABLE statement
++** passed to sqlite3_declare_vtab(). For the first 63 columns (columns 0-62),
++** the corresponding bit is set within the colUsed mask if the column may be
++** required by SQLite. If the table has at least 64 columns and any column
++** to the right of the first 63 is required, then bit 63 of colUsed is also
++** set. In other words, column iCol may be required if the expression
++** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
++** non-zero.
++**
++** The [xBestIndex] method must fill aConstraintUsage[] with information
++** about what parameters to pass to xFilter.  ^If argvIndex>0 then
++** the right-hand side of the corresponding aConstraint[] is evaluated
++** and becomes the argvIndex-th entry in argv.  ^(If aConstraintUsage[].omit
++** is true, then the constraint is assumed to be fully handled by the
++** virtual table and might not be checked again by the byte code.)^ ^(The
++** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
++** is left in its default setting of false, the constraint will always be
++** checked separately in byte code.  If the omit flag is change to true, then
++** the constraint may or may not be checked in byte code.  In other words,
++** when the omit flag is true there is no guarantee that the constraint will
++** not be checked again using byte code.)^
++**
++** ^The idxNum and idxStr values are recorded and passed into the
++** [xFilter] method.
++** ^[sqlite3_free()] is used to free idxStr if and only if
++** needToFreeIdxStr is true.
++**
++** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
++** the correct order to satisfy the ORDER BY clause so that no separate
++** sorting step is required.
++**
++** ^The estimatedCost value is an estimate of the cost of a particular
++** strategy. A cost of N indicates that the cost of the strategy is similar
++** to a linear scan of an SQLite table with N rows. A cost of log(N)
++** indicates that the expense of the operation is similar to that of a
++** binary search on a unique indexed field of an SQLite table with N rows.
++**
++** ^The estimatedRows value is an estimate of the number of rows that
++** will be returned by the strategy.
++**
++** The xBestIndex method may optionally populate the idxFlags field with a
++** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
++** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
++** assumes that the strategy may visit at most one row.
++**
++** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
++** SQLite also assumes that if a call to the xUpdate() method is made as
++** part of the same statement to delete or update a virtual table row and the
++** implementation returns SQLITE_CONSTRAINT, then there is no need to rollback
++** any database changes. In other words, if the xUpdate() returns
++** SQLITE_CONSTRAINT, the database contents must be exactly as they were
++** before xUpdate was called. By contrast, if SQLITE_INDEX_SCAN_UNIQUE is not
++** set and xUpdate returns SQLITE_CONSTRAINT, any database changes made by
++** the xUpdate method are automatically rolled back by SQLite.
++**
++** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
++** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
++** If a virtual table extension is
++** used with an SQLite version earlier than 3.8.2, the results of attempting
++** to read or write the estimatedRows field are undefined (but are likely
++** to include crashing the application). The estimatedRows field should
++** therefore only be used if [sqlite3_libversion_number()] returns a
++** value greater than or equal to 3008002. Similarly, the idxFlags field
++** was added for [version 3.9.0] ([dateof:3.9.0]).
++** It may therefore only be used if
++** sqlite3_libversion_number() returns a value greater than or equal to
++** 3009000.
++*/
++struct sqlite3_index_info {
++  /* Inputs */
++  int nConstraint;           /* Number of entries in aConstraint */
++  struct sqlite3_index_constraint {
++     int iColumn;              /* Column constrained.  -1 for ROWID */
++     unsigned char op;         /* Constraint operator */
++     unsigned char usable;     /* True if this constraint is usable */
++     int iTermOffset;          /* Used internally - xBestIndex should ignore */
++  } *aConstraint;            /* Table of WHERE clause constraints */
++  int nOrderBy;              /* Number of terms in the ORDER BY clause */
++  struct sqlite3_index_orderby {
++     int iColumn;              /* Column number */
++     unsigned char desc;       /* True for DESC.  False for ASC. */
++  } *aOrderBy;               /* The ORDER BY clause */
++  /* Outputs */
++  struct sqlite3_index_constraint_usage {
++    int argvIndex;           /* if >0, constraint is part of argv to xFilter */
++    unsigned char omit;      /* Do not code a test for this constraint */
++  } *aConstraintUsage;
++  int idxNum;                /* Number used to identify the index */
++  char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
++  int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
++  int orderByConsumed;       /* True if output is already ordered */
++  double estimatedCost;           /* Estimated cost of using this index */
++  /* Fields below are only available in SQLite 3.8.2 and later */
++  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
++  /* Fields below are only available in SQLite 3.9.0 and later */
++  int idxFlags;              /* Mask of SQLITE_INDEX_SCAN_* flags */
++  /* Fields below are only available in SQLite 3.10.0 and later */
++  sqlite3_uint64 colUsed;    /* Input: Mask of columns used by statement */
++};
++
++/*
++** CAPI3REF: Virtual Table Scan Flags
++**
++** Virtual table implementations are allowed to set the
++** [sqlite3_index_info].idxFlags field to some combination of
++** these bits.
++*/
++#define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
++
++/*
++** CAPI3REF: Virtual Table Constraint Operator Codes
++**
++** These macros define the allowed values for the
++** [sqlite3_index_info].aConstraint[].op field.  Each value represents
++** an operator that is part of a constraint term in the WHERE clause of
++** a query that uses a [virtual table].
++**
++** ^The left-hand operand of the operator is given by the corresponding
++** aConstraint[].iColumn field.  ^An iColumn of -1 indicates the left-hand
++** operand is the rowid.
++** The SQLITE_INDEX_CONSTRAINT_LIMIT and SQLITE_INDEX_CONSTRAINT_OFFSET
++** operators have no left-hand operand, and so for those operators the
++** corresponding aConstraint[].iColumn is meaningless and should not be
++** used.
++**
++** All operator values from SQLITE_INDEX_CONSTRAINT_FUNCTION through
++** value 255 are reserved to represent functions that are overloaded
++** by the [xFindFunction|xFindFunction method] of the virtual table
++** implementation.
++**
++** The right-hand operands for each constraint might be accessible using
++** the [sqlite3_vtab_rhs_value()] interface.  Usually the right-hand
++** operand is only available if it appears as a single constant literal
++** in the input SQL.  If the right-hand operand is another column or an
++** expression (even a constant expression) or a parameter, then the
++** sqlite3_vtab_rhs_value() probably will not be able to extract it.
++** ^The SQLITE_INDEX_CONSTRAINT_ISNULL and
++** SQLITE_INDEX_CONSTRAINT_ISNOTNULL operators have no right-hand operand
++** and hence calls to sqlite3_vtab_rhs_value() for those operators will
++** always return SQLITE_NOTFOUND.
++**
++** The collating sequence to be used for comparison can be found using
++** the [sqlite3_vtab_collation()] interface.  For most real-world virtual
++** tables, the collating sequence of constraints does not matter (for example
++** because the constraints are numeric) and so the sqlite3_vtab_collation()
++** interface is not commonly needed.
++*/
++#define SQLITE_INDEX_CONSTRAINT_EQ          2
++#define SQLITE_INDEX_CONSTRAINT_GT          4
++#define SQLITE_INDEX_CONSTRAINT_LE          8
++#define SQLITE_INDEX_CONSTRAINT_LT         16
++#define SQLITE_INDEX_CONSTRAINT_GE         32
++#define SQLITE_INDEX_CONSTRAINT_MATCH      64
++#define SQLITE_INDEX_CONSTRAINT_LIKE       65
++#define SQLITE_INDEX_CONSTRAINT_GLOB       66
++#define SQLITE_INDEX_CONSTRAINT_REGEXP     67
++#define SQLITE_INDEX_CONSTRAINT_NE         68
++#define SQLITE_INDEX_CONSTRAINT_ISNOT      69
++#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL  70
++#define SQLITE_INDEX_CONSTRAINT_ISNULL     71
++#define SQLITE_INDEX_CONSTRAINT_IS         72
++#define SQLITE_INDEX_CONSTRAINT_LIMIT      73
++#define SQLITE_INDEX_CONSTRAINT_OFFSET     74
++#define SQLITE_INDEX_CONSTRAINT_FUNCTION  150
++
++/*
++** CAPI3REF: Register A Virtual Table Implementation
++** METHOD: sqlite3
++**
++** ^These routines are used to register a new [virtual table module] name.
++** ^Module names must be registered before
++** creating a new [virtual table] using the module and before using a
++** preexisting [virtual table] for the module.
++**
++** ^The module name is registered on the [database connection] specified
++** by the first parameter.  ^The name of the module is given by the
++** second parameter.  ^The third parameter is a pointer to
++** the implementation of the [virtual table module].   ^The fourth
++** parameter is an arbitrary client data pointer that is passed through
++** into the [xCreate] and [xConnect] methods of the virtual table module
++** when a new virtual table is be being created or reinitialized.
++**
++** ^The sqlite3_create_module_v2() interface has a fifth parameter which
++** is a pointer to a destructor for the pClientData.  ^SQLite will
++** invoke the destructor function (if it is not NULL) when SQLite
++** no longer needs the pClientData pointer.  ^The destructor will also
++** be invoked if the call to sqlite3_create_module_v2() fails.
++** ^The sqlite3_create_module()
++** interface is equivalent to sqlite3_create_module_v2() with a NULL
++** destructor.
++**
++** ^If the third parameter (the pointer to the sqlite3_module object) is
++** NULL then no new module is created and any existing modules with the
++** same name are dropped.
++**
++** See also: [sqlite3_drop_modules()]
++*/
++SQLITE_API int sqlite3_create_module(
++  sqlite3 *db,               /* SQLite connection to register module with */
++  const char *zName,         /* Name of the module */
++  const sqlite3_module *p,   /* Methods for the module */
++  void *pClientData          /* Client data for xCreate/xConnect */
++);
++SQLITE_API int sqlite3_create_module_v2(
++  sqlite3 *db,               /* SQLite connection to register module with */
++  const char *zName,         /* Name of the module */
++  const sqlite3_module *p,   /* Methods for the module */
++  void *pClientData,         /* Client data for xCreate/xConnect */
++  void(*xDestroy)(void*)     /* Module destructor function */
++);
++
++/*
++** CAPI3REF: Remove Unnecessary Virtual Table Implementations
++** METHOD: sqlite3
++**
++** ^The sqlite3_drop_modules(D,L) interface removes all virtual
++** table modules from database connection D except those named on list L.
++** The L parameter must be either NULL or a pointer to an array of pointers
++** to strings where the array is terminated by a single NULL pointer.
++** ^If the L parameter is NULL, then all virtual table modules are removed.
++**
++** See also: [sqlite3_create_module()]
++*/
++SQLITE_API int sqlite3_drop_modules(
++  sqlite3 *db,                /* Remove modules from this connection */
++  const char **azKeep         /* Except, do not remove the ones named here */
++);
++
++/*
++** CAPI3REF: Virtual Table Instance Object
++** KEYWORDS: sqlite3_vtab
++**
++** Every [virtual table module] implementation uses a subclass
++** of this object to describe a particular instance
++** of the [virtual table].  Each subclass will
++** be tailored to the specific needs of the module implementation.
++** The purpose of this superclass is to define certain fields that are
++** common to all module implementations.
++**
++** ^Virtual tables methods can set an error message by assigning a
++** string obtained from [sqlite3_mprintf()] to zErrMsg.  The method should
++** take care that any prior string is freed by a call to [sqlite3_free()]
++** prior to assigning a new string to zErrMsg.  ^After the error message
++** is delivered up to the client application, the string will be automatically
++** freed by sqlite3_free() and the zErrMsg field will be zeroed.
++*/
++struct sqlite3_vtab {
++  const sqlite3_module *pModule;  /* The module for this virtual table */
++  int nRef;                       /* Number of open cursors */
++  char *zErrMsg;                  /* Error message from sqlite3_mprintf() */
++  /* Virtual table implementations will typically add additional fields */
++};
++
++/*
++** CAPI3REF: Virtual Table Cursor Object
++** KEYWORDS: sqlite3_vtab_cursor {virtual table cursor}
++**
++** Every [virtual table module] implementation uses a subclass of the
++** following structure to describe cursors that point into the
++** [virtual table] and are used
++** to loop through the virtual table.  Cursors are created using the
++** [sqlite3_module.xOpen | xOpen] method of the module and are destroyed
++** by the [sqlite3_module.xClose | xClose] method.  Cursors are used
++** by the [xFilter], [xNext], [xEof], [xColumn], and [xRowid] methods
++** of the module.  Each module implementation will define
++** the content of a cursor structure to suit its own needs.
++**
++** This superclass exists in order to define fields of the cursor that
++** are common to all implementations.
++*/
++struct sqlite3_vtab_cursor {
++  sqlite3_vtab *pVtab;      /* Virtual table of this cursor */
++  /* Virtual table implementations will typically add additional fields */
++};
++
++/*
++** CAPI3REF: Declare The Schema Of A Virtual Table
++**
++** ^The [xCreate] and [xConnect] methods of a
++** [virtual table module] call this interface
++** to declare the format (the names and datatypes of the columns) of
++** the virtual tables they implement.
++*/
++SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);
++
++/*
++** CAPI3REF: Overload A Function For A Virtual Table
++** METHOD: sqlite3
++**
++** ^(Virtual tables can provide alternative implementations of functions
++** using the [xFindFunction] method of the [virtual table module].
++** But global versions of those functions
++** must exist in order to be overloaded.)^
++**
++** ^(This API makes sure a global version of a function with a particular
++** name and number of parameters exists.  If no such function exists
++** before this API is called, a new function is created.)^  ^The implementation
++** of the new function always causes an exception to be thrown.  So
++** the new function is not good for anything by itself.  Its only
++** purpose is to be a placeholder function that can be overloaded
++** by a [virtual table].
++*/
++SQLITE_API int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
++
++/*
++** CAPI3REF: A Handle To An Open BLOB
++** KEYWORDS: {BLOB handle} {BLOB handles}
++**
++** An instance of this object represents an open BLOB on which
++** [sqlite3_blob_open | incremental BLOB I/O] can be performed.
++** ^Objects of this type are created by [sqlite3_blob_open()]
++** and destroyed by [sqlite3_blob_close()].
++** ^The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
++** can be used to read or write small subsections of the BLOB.
++** ^The [sqlite3_blob_bytes()] interface returns the size of the BLOB in bytes.
++*/
++typedef struct sqlite3_blob sqlite3_blob;
++
++/*
++** CAPI3REF: Open A BLOB For Incremental I/O
++** METHOD: sqlite3
++** CONSTRUCTOR: sqlite3_blob
++**
++** ^(This interfaces opens a [BLOB handle | handle] to the BLOB located
++** in row iRow, column zColumn, table zTable in database zDb;
++** in other words, the same BLOB that would be selected by:
++**
++** 
      ++**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
++** 
      )^
++**
++** ^(Parameter zDb is not the filename that contains the database, but
++** rather the symbolic name of the database. For attached databases, this is
++** the name that appears after the AS keyword in the [ATTACH] statement.
++** For the main database file, the database name is "main". For TEMP
++** tables, the database name is "temp".)^
++**
++** ^If the flags parameter is non-zero, then the BLOB is opened for read
++** and write access. ^If the flags parameter is zero, the BLOB is opened for
++** read-only access.
++**
++** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
++** in *ppBlob. Otherwise an [error code] is returned and, unless the error
++** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
++** the API is not misused, it is always safe to call [sqlite3_blob_close()]
++** on *ppBlob after this function it returns.
++**
++** This function fails with SQLITE_ERROR if any of the following are true:
++** 
        
++**   
      •  ^(Database zDb does not exist)^,
++**   
      •  ^(Table zTable does not exist within database zDb)^,
++**   
      •  ^(Table zTable is a WITHOUT ROWID table)^,
++**   
      •  ^(Column zColumn does not exist)^,
++**   
      •  ^(Row iRow is not present in the table)^,
++**   
      •  ^(The specified column of row iRow contains a value that is not
++**         a TEXT or BLOB value)^,
++**   
      •  ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
++**         constraint and the blob is being opened for read/write access)^,
++**   
      •  ^([foreign key constraints | Foreign key constraints] are enabled,
++**         column zColumn is part of a [child key] definition and the blob is
++**         being opened for read/write access)^.
++** 
      
++**
++** ^Unless it returns SQLITE_MISUSE, this function sets the
++** [database connection] error code and message accessible via
++** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
++**
++** A BLOB referenced by sqlite3_blob_open() may be read using the
++** [sqlite3_blob_read()] interface and modified by using
++** [sqlite3_blob_write()].  The [BLOB handle] can be moved to a
++** different row of the same table using the [sqlite3_blob_reopen()]
++** interface.  However, the column, table, or database of a [BLOB handle]
++** cannot be changed after the [BLOB handle] is opened.
++**
++** ^(If the row that a BLOB handle points to is modified by an
++** [UPDATE], [DELETE], or by [ON CONFLICT] side-effects
++** then the BLOB handle is marked as "expired".
++** This is true if any column of the row is changed, even a column
++** other than the one the BLOB handle is open on.)^
++** ^Calls to [sqlite3_blob_read()] and [sqlite3_blob_write()] for
++** an expired BLOB handle fail with a return code of [SQLITE_ABORT].
++** ^(Changes written into a BLOB prior to the BLOB expiring are not
++** rolled back by the expiration of the BLOB.  Such changes will eventually
++** commit if the transaction continues to completion.)^
++**
++** ^Use the [sqlite3_blob_bytes()] interface to determine the size of
++** the opened blob.  ^The size of a blob may not be changed by this
++** interface.  Use the [UPDATE] SQL command to change the size of a
++** blob.
++**
++** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
++** and the built-in [zeroblob] SQL function may be used to create a
++** zero-filled blob to read or write using the incremental-blob interface.
++**
++** To avoid a resource leak, every open [BLOB handle] should eventually
++** be released by a call to [sqlite3_blob_close()].
++**
++** See also: [sqlite3_blob_close()],
++** [sqlite3_blob_reopen()], [sqlite3_blob_read()],
++** [sqlite3_blob_bytes()], [sqlite3_blob_write()].
++*/
++SQLITE_API int sqlite3_blob_open(
++  sqlite3*,
++  const char *zDb,
++  const char *zTable,
++  const char *zColumn,
++  sqlite3_int64 iRow,
++  int flags,
++  sqlite3_blob **ppBlob
++);
++
++/*
++** CAPI3REF: Move a BLOB Handle to a New Row
++** METHOD: sqlite3_blob
++**
++** ^This function is used to move an existing [BLOB handle] so that it points
++** to a different row of the same database table. ^The new row is identified
++** by the rowid value passed as the second argument. Only the row can be
++** changed. ^The database, table and column on which the blob handle is open
++** remain the same. Moving an existing [BLOB handle] to a new row is
++** faster than closing the existing handle and opening a new one.
++**
++** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
++** it must exist and there must be either a blob or text value stored in
++** the nominated column.)^ ^If the new row is not present in the table, or if
++** it does not contain a blob or text value, or if another error occurs, an
++** SQLite error code is returned and the blob handle is considered aborted.
++** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
++** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
++** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
++** always returns zero.
++**
++** ^This function sets the database handle error code and message.
++*/
++SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
++
++/*
++** CAPI3REF: Close A BLOB Handle
++** DESTRUCTOR: sqlite3_blob
++**
++** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
++** unconditionally.  Even if this routine returns an error code, the
++** handle is still closed.)^
++**
++** ^If the blob handle being closed was opened for read-write access, and if
++** the database is in auto-commit mode and there are no other open read-write
++** blob handles or active write statements, the current transaction is
++** committed. ^If an error occurs while committing the transaction, an error
++** code is returned and the transaction rolled back.
++**
++** Calling this function with an argument that is not a NULL pointer or an
++** open blob handle results in undefined behavior. ^Calling this routine
++** with a null pointer (such as would be returned by a failed call to
++** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
++** is passed a valid open blob handle, the values returned by the
++** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
++*/
++SQLITE_API int sqlite3_blob_close(sqlite3_blob *);
++
++/*
++** CAPI3REF: Return The Size Of An Open BLOB
++** METHOD: sqlite3_blob
++**
++** ^Returns the size in bytes of the BLOB accessible via the
++** successfully opened [BLOB handle] in its only argument.  ^The
++** incremental blob I/O routines can only read or overwriting existing
++** blob content; they cannot change the size of a blob.
++**
++** This routine only works on a [BLOB handle] which has been created
++** by a prior successful call to [sqlite3_blob_open()] and which has not
++** been closed by [sqlite3_blob_close()].  Passing any other pointer in
++** to this routine results in undefined and probably undesirable behavior.
++*/
++SQLITE_API int sqlite3_blob_bytes(sqlite3_blob *);
++
++/*
++** CAPI3REF: Read Data From A BLOB Incrementally
++** METHOD: sqlite3_blob
++**
++** ^(This function is used to read data from an open [BLOB handle] into a
++** caller-supplied buffer. N bytes of data are copied into buffer Z
++** from the open BLOB, starting at offset iOffset.)^
++**
++** ^If offset iOffset is less than N bytes from the end of the BLOB,
++** [SQLITE_ERROR] is returned and no data is read.  ^If N or iOffset is
++** less than zero, [SQLITE_ERROR] is returned and no data is read.
++** ^The size of the blob (and hence the maximum value of N+iOffset)
++** can be determined using the [sqlite3_blob_bytes()] interface.
++**
++** ^An attempt to read from an expired [BLOB handle] fails with an
++** error code of [SQLITE_ABORT].
++**
++** ^(On success, sqlite3_blob_read() returns SQLITE_OK.
++** Otherwise, an [error code] or an [extended error code] is returned.)^
++**
++** This routine only works on a [BLOB handle] which has been created
++** by a prior successful call to [sqlite3_blob_open()] and which has not
++** been closed by [sqlite3_blob_close()].  Passing any other pointer in
++** to this routine results in undefined and probably undesirable behavior.
++**
++** See also: [sqlite3_blob_write()].
++*/
++SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
++
++/*
++** CAPI3REF: Write Data Into A BLOB Incrementally
++** METHOD: sqlite3_blob
++**
++** ^(This function is used to write data into an open [BLOB handle] from a
++** caller-supplied buffer. N bytes of data are copied from the buffer Z
++** into the open BLOB, starting at offset iOffset.)^
++**
++** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
++** Otherwise, an  [error code] or an [extended error code] is returned.)^
++** ^Unless SQLITE_MISUSE is returned, this function sets the
++** [database connection] error code and message accessible via
++** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
++**
++** ^If the [BLOB handle] passed as the first argument was not opened for
++** writing (the flags parameter to [sqlite3_blob_open()] was zero),
++** this function returns [SQLITE_READONLY].
++**
++** This function may only modify the contents of the BLOB; it is
++** not possible to increase the size of a BLOB using this API.
++** ^If offset iOffset is less than N bytes from the end of the BLOB,
++** [SQLITE_ERROR] is returned and no data is written. The size of the
++** BLOB (and hence the maximum value of N+iOffset) can be determined
++** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
++** than zero [SQLITE_ERROR] is returned and no data is written.
++**
++** ^An attempt to write to an expired [BLOB handle] fails with an
++** error code of [SQLITE_ABORT].  ^Writes to the BLOB that occurred
++** before the [BLOB handle] expired are not rolled back by the
++** expiration of the handle, though of course those changes might
++** have been overwritten by the statement that expired the BLOB handle
++** or by other independent statements.
++**
++** This routine only works on a [BLOB handle] which has been created
++** by a prior successful call to [sqlite3_blob_open()] and which has not
++** been closed by [sqlite3_blob_close()].  Passing any other pointer in
++** to this routine results in undefined and probably undesirable behavior.
++**
++** See also: [sqlite3_blob_read()].
++*/
++SQLITE_API int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
++
++/*
++** CAPI3REF: Virtual File System Objects
++**
++** A virtual filesystem (VFS) is an [sqlite3_vfs] object
++** that SQLite uses to interact
++** with the underlying operating system.  Most SQLite builds come with a
++** single default VFS that is appropriate for the host computer.
++** New VFSes can be registered and existing VFSes can be unregistered.
++** The following interfaces are provided.
++**
++** ^The sqlite3_vfs_find() interface returns a pointer to a VFS given its name.
++** ^Names are case sensitive.
++** ^Names are zero-terminated UTF-8 strings.
++** ^If there is no match, a NULL pointer is returned.
++** ^If zVfsName is NULL then the default VFS is returned.
++**
++** ^New VFSes are registered with sqlite3_vfs_register().
++** ^Each new VFS becomes the default VFS if the makeDflt flag is set.
++** ^The same VFS can be registered multiple times without injury.
++** ^To make an existing VFS into the default VFS, register it again
++** with the makeDflt flag set.  If two different VFSes with the
++** same name are registered, the behavior is undefined.  If a
++** VFS is registered with a name that is NULL or an empty string,
++** then the behavior is undefined.
++**
++** ^Unregister a VFS with the sqlite3_vfs_unregister() interface.
++** ^(If the default VFS is unregistered, another VFS is chosen as
++** the default.  The choice for the new VFS is arbitrary.)^
++*/
++SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName);
++SQLITE_API int sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
++SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
++
++/*
++** CAPI3REF: Mutexes
++**
++** The SQLite core uses these routines for thread
++** synchronization. Though they are intended for internal
++** use by SQLite, code that links against SQLite is
++** permitted to use any of these routines.
++**
++** The SQLite source code contains multiple implementations
++** of these mutex routines.  An appropriate implementation
++** is selected automatically at compile-time.  The following
++** implementations are available in the SQLite core:
++**
++** 
        
++** 
      •    SQLITE_MUTEX_PTHREADS
++** 
      •    SQLITE_MUTEX_W32
++** 
      •    SQLITE_MUTEX_NOOP
++** 
      
++**
++** The SQLITE_MUTEX_NOOP implementation is a set of routines
++** that does no real locking and is appropriate for use in
++** a single-threaded application.  The SQLITE_MUTEX_PTHREADS and
++** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
++** and Windows.
++**
++** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
++** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
++** implementation is included with the library. In this case the
++** application must supply a custom mutex implementation using the
++** [SQLITE_CONFIG_MUTEX] option of the sqlite3_config() function
++** before calling sqlite3_initialize() or any other public sqlite3_
++** function that calls sqlite3_initialize().
++**
++** ^The sqlite3_mutex_alloc() routine allocates a new
++** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
++** routine returns NULL if it is unable to allocate the requested
++** mutex.  The argument to sqlite3_mutex_alloc() must one of these
++** integer constants:
++**
++** 
        
++** 
      •   SQLITE_MUTEX_FAST
++** 
      •   SQLITE_MUTEX_RECURSIVE
++** 
      •   SQLITE_MUTEX_STATIC_MAIN
++** 
      •   SQLITE_MUTEX_STATIC_MEM
++** 
      •   SQLITE_MUTEX_STATIC_OPEN
++** 
      •   SQLITE_MUTEX_STATIC_PRNG
++** 
      •   SQLITE_MUTEX_STATIC_LRU
++** 
      •   SQLITE_MUTEX_STATIC_PMEM
++** 
      •   SQLITE_MUTEX_STATIC_APP1
++** 
      •   SQLITE_MUTEX_STATIC_APP2
++** 
      •   SQLITE_MUTEX_STATIC_APP3
++** 
      •   SQLITE_MUTEX_STATIC_VFS1
++** 
      •   SQLITE_MUTEX_STATIC_VFS2
++** 
      •   SQLITE_MUTEX_STATIC_VFS3
++** 
      
++**
++** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE)
++** cause sqlite3_mutex_alloc() to create
++** a new mutex.  ^The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
++** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
++** The mutex implementation does not need to make a distinction
++** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
++** not want to.  SQLite will only request a recursive mutex in
++** cases where it really needs one.  If a faster non-recursive mutex
++** implementation is available on the host platform, the mutex subsystem
++** might return such a mutex in response to SQLITE_MUTEX_FAST.
++**
++** ^The other allowed parameters to sqlite3_mutex_alloc() (anything other
++** than SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) each return
++** a pointer to a static preexisting mutex.  ^Nine static mutexes are
++** used by the current version of SQLite.  Future versions of SQLite
++** may add additional static mutexes.  Static mutexes are for internal
++** use by SQLite only.  Applications that use SQLite mutexes should
++** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
++** SQLITE_MUTEX_RECURSIVE.
++**
++** ^Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
++** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
++** returns a different mutex on every call.  ^For the static
++** mutex types, the same mutex is returned on every call that has
++** the same type number.
++**
++** ^The sqlite3_mutex_free() routine deallocates a previously
++** allocated dynamic mutex.  Attempting to deallocate a static
++** mutex results in undefined behavior.
++**
++** ^The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
++** to enter a mutex.  ^If another thread is already within the mutex,
++** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
++** SQLITE_BUSY.  ^The sqlite3_mutex_try() interface returns [SQLITE_OK]
++** upon successful entry.  ^(Mutexes created using
++** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
++** In such cases, the
++** mutex must be exited an equal number of times before another thread
++** can enter.)^  If the same thread tries to enter any mutex other
++** than an SQLITE_MUTEX_RECURSIVE more than once, the behavior is undefined.
++**
++** ^(Some systems (for example, Windows 95) do not support the operation
++** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
++** will always return SQLITE_BUSY. In most cases the SQLite core only uses
++** sqlite3_mutex_try() as an optimization, so this is acceptable
++** behavior. The exceptions are unix builds that set the
++** SQLITE_ENABLE_SETLK_TIMEOUT build option. In that case a working
++** sqlite3_mutex_try() is required.)^
++**
++** ^The sqlite3_mutex_leave() routine exits a mutex that was
++** previously entered by the same thread.   The behavior
++** is undefined if the mutex is not currently entered by the
++** calling thread or is not currently allocated.
++**
++** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(),
++** sqlite3_mutex_leave(), or sqlite3_mutex_free() is a NULL pointer,
++** then any of the four routines behaves as a no-op.
++**
++** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
++*/
++SQLITE_API sqlite3_mutex *sqlite3_mutex_alloc(int);
++SQLITE_API void sqlite3_mutex_free(sqlite3_mutex*);
++SQLITE_API void sqlite3_mutex_enter(sqlite3_mutex*);
++SQLITE_API int sqlite3_mutex_try(sqlite3_mutex*);
++SQLITE_API void sqlite3_mutex_leave(sqlite3_mutex*);
++
++/*
++** CAPI3REF: Mutex Methods Object
++**
++** An instance of this structure defines the low-level routines
++** used to allocate and use mutexes.
++**
++** Usually, the default mutex implementations provided by SQLite are
++** sufficient, however the application has the option of substituting a custom
++** implementation for specialized deployments or systems for which SQLite
++** does not provide a suitable implementation. In this case, the application
++** creates and populates an instance of this structure to pass
++** to sqlite3_config() along with the [SQLITE_CONFIG_MUTEX] option.
++** Additionally, an instance of this structure can be used as an
++** output variable when querying the system for the current mutex
++** implementation, using the [SQLITE_CONFIG_GETMUTEX] option.
++**
++** ^The xMutexInit method defined by this structure is invoked as
++** part of system initialization by the sqlite3_initialize() function.
++** ^The xMutexInit routine is called by SQLite exactly once for each
++** effective call to [sqlite3_initialize()].
++**
++** ^The xMutexEnd method defined by this structure is invoked as
++** part of system shutdown by the sqlite3_shutdown() function. The
++** implementation of this method is expected to release all outstanding
++** resources obtained by the mutex methods implementation, especially
++** those obtained by the xMutexInit method.  ^The xMutexEnd()
++** interface is invoked exactly once for each call to [sqlite3_shutdown()].
++**
++** ^(The remaining seven methods defined by this structure (xMutexAlloc,
++** xMutexFree, xMutexEnter, xMutexTry, xMutexLeave, xMutexHeld and
++** xMutexNotheld) implement the following interfaces (respectively):
++**
++** 
        
++**   
      •   [sqlite3_mutex_alloc()] 
        • 
++**   
      •   [sqlite3_mutex_free()] 
        • 
++**   
      •   [sqlite3_mutex_enter()] 
        • 
++**   
      •   [sqlite3_mutex_try()] 
        • 
++**   
      •   [sqlite3_mutex_leave()] 
        • 
++**   
      •   [sqlite3_mutex_held()] 
        • 
++**   
      •   [sqlite3_mutex_notheld()] 
        • 
++** 
      )^
++**
++** The only difference is that the public sqlite3_XXX functions enumerated
++** above silently ignore any invocations that pass a NULL pointer instead
++** of a valid mutex handle. The implementations of the methods defined
++** by this structure are not required to handle this case. The results
++** of passing a NULL pointer instead of a valid mutex handle are undefined
++** (i.e. it is acceptable to provide an implementation that segfaults if
++** it is passed a NULL pointer).
++**
++** The xMutexInit() method must be threadsafe.  It must be harmless to
++** invoke xMutexInit() multiple times within the same process and without
++** intervening calls to xMutexEnd().  Second and subsequent calls to
++** xMutexInit() must be no-ops.
++**
++** xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
++** and its associates).  Similarly, xMutexAlloc() must not use SQLite memory
++** allocation for a static mutex.  ^However xMutexAlloc() may use SQLite
++** memory allocation for a fast or recursive mutex.
++**
++** ^SQLite will invoke the xMutexEnd() method when [sqlite3_shutdown()] is
++** called, but only if the prior call to xMutexInit returned SQLITE_OK.
++** If xMutexInit fails in any way, it is expected to clean up after itself
++** prior to returning.
++*/
++typedef struct sqlite3_mutex_methods sqlite3_mutex_methods;
++struct sqlite3_mutex_methods {
++  int (*xMutexInit)(void);
++  int (*xMutexEnd)(void);
++  sqlite3_mutex *(*xMutexAlloc)(int);
++  void (*xMutexFree)(sqlite3_mutex *);
++  void (*xMutexEnter)(sqlite3_mutex *);
++  int (*xMutexTry)(sqlite3_mutex *);
++  void (*xMutexLeave)(sqlite3_mutex *);
++  int (*xMutexHeld)(sqlite3_mutex *);
++  int (*xMutexNotheld)(sqlite3_mutex *);
++};
++
++/*
++** CAPI3REF: Mutex Verification Routines
++**
++** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
++** are intended for use inside assert() statements.  The SQLite core
++** never uses these routines except inside an assert() and applications
++** are advised to follow the lead of the core.  The SQLite core only
++** provides implementations for these routines when it is compiled
++** with the SQLITE_DEBUG flag.  External mutex implementations
++** are only required to provide these routines if SQLITE_DEBUG is
++** defined and if NDEBUG is not defined.
++**
++** These routines should return true if the mutex in their argument
++** is held or not held, respectively, by the calling thread.
++**
++** The implementation is not required to provide versions of these
++** routines that actually work. If the implementation does not provide working
++** versions of these routines, it should at least provide stubs that always
++** return true so that one does not get spurious assertion failures.
++**
++** If the argument to sqlite3_mutex_held() is a NULL pointer then
++** the routine should return 1.   This seems counter-intuitive since
++** clearly the mutex cannot be held if it does not exist.  But
++** the reason the mutex does not exist is because the build is not
++** using mutexes.  And we do not want the assert() containing the
++** call to sqlite3_mutex_held() to fail, so a non-zero return is
++** the appropriate thing to do.  The sqlite3_mutex_notheld()
++** interface should also return 1 when given a NULL pointer.
++*/
++#ifndef NDEBUG
++SQLITE_API int sqlite3_mutex_held(sqlite3_mutex*);
++SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
++#endif
++
++/*
++** CAPI3REF: Mutex Types
++**
++** The [sqlite3_mutex_alloc()] interface takes a single argument
++** which is one of these integer constants.
++**
++** The set of static mutexes may change from one SQLite release to the
++** next.  Applications that override the built-in mutex logic must be
++** prepared to accommodate additional static mutexes.
++*/
++#define SQLITE_MUTEX_FAST             0
++#define SQLITE_MUTEX_RECURSIVE        1
++#define SQLITE_MUTEX_STATIC_MAIN      2
++#define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
++#define SQLITE_MUTEX_STATIC_MEM2      4  /* NOT USED */
++#define SQLITE_MUTEX_STATIC_OPEN      4  /* sqlite3BtreeOpen() */
++#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_randomness() */
++#define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
++#define SQLITE_MUTEX_STATIC_LRU2      7  /* NOT USED */
++#define SQLITE_MUTEX_STATIC_PMEM      7  /* sqlite3PageMalloc() */
++#define SQLITE_MUTEX_STATIC_APP1      8  /* For use by application */
++#define SQLITE_MUTEX_STATIC_APP2      9  /* For use by application */
++#define SQLITE_MUTEX_STATIC_APP3     10  /* For use by application */
++#define SQLITE_MUTEX_STATIC_VFS1     11  /* For use by built-in VFS */
++#define SQLITE_MUTEX_STATIC_VFS2     12  /* For use by extension VFS */
++#define SQLITE_MUTEX_STATIC_VFS3     13  /* For use by application VFS */
++
++/* Legacy compatibility: */
++#define SQLITE_MUTEX_STATIC_MASTER    2
++
++
++/*
++** CAPI3REF: Retrieve the mutex for a database connection
++** METHOD: sqlite3
++**
++** ^This interface returns a pointer the [sqlite3_mutex] object that
++** serializes access to the [database connection] given in the argument
++** when the [threading mode] is Serialized.
++** ^If the [threading mode] is Single-thread or Multi-thread then this
++** routine returns a NULL pointer.
++*/
++SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
++
++/*
++** CAPI3REF: Low-Level Control Of Database Files
++** METHOD: sqlite3
++** KEYWORDS: {file control}
++**
++** ^The [sqlite3_file_control()] interface makes a direct call to the
++** xFileControl method for the [sqlite3_io_methods] object associated
++** with a particular database identified by the second argument. ^The
++** name of the database is "main" for the main database or "temp" for the
++** TEMP database, or the name that appears after the AS keyword for
++** databases that are added using the [ATTACH] SQL command.
++** ^A NULL pointer can be used in place of "main" to refer to the
++** main database file.
++** ^The third and fourth parameters to this routine
++** are passed directly through to the second and third parameters of
++** the xFileControl method.  ^The return value of the xFileControl
++** method becomes the return value of this routine.
++**
++** A few opcodes for [sqlite3_file_control()] are handled directly
++** by the SQLite core and never invoke the
++** sqlite3_io_methods.xFileControl method.
++** ^The [SQLITE_FCNTL_FILE_POINTER] value for the op parameter causes
++** a pointer to the underlying [sqlite3_file] object to be written into
++** the space pointed to by the 4th parameter.  The
++** [SQLITE_FCNTL_JOURNAL_POINTER] works similarly except that it returns
++** the [sqlite3_file] object associated with the journal file instead of
++** the main database.  The [SQLITE_FCNTL_VFS_POINTER] opcode returns
++** a pointer to the underlying [sqlite3_vfs] object for the file.
++** The [SQLITE_FCNTL_DATA_VERSION] returns the data version counter
++** from the pager.
++**
++** ^If the second parameter (zDbName) does not match the name of any
++** open database file, then SQLITE_ERROR is returned.  ^This error
++** code is not remembered and will not be recalled by [sqlite3_errcode()]
++** or [sqlite3_errmsg()].  The underlying xFileControl method might
++** also return SQLITE_ERROR.  There is no way to distinguish between
++** an incorrect zDbName and an SQLITE_ERROR return from the underlying
++** xFileControl method.
++**
++** See also: [file control opcodes]
++*/
++SQLITE_API int sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
++
++/*
++** CAPI3REF: Testing Interface
++**
++** ^The sqlite3_test_control() interface is used to read out internal
++** state of SQLite and to inject faults into SQLite for testing
++** purposes.  ^The first parameter is an operation code that determines
++** the number, meaning, and operation of all subsequent parameters.
++**
++** This interface is not for use by applications.  It exists solely
++** for verifying the correct operation of the SQLite library.  Depending
++** on how the SQLite library is compiled, this interface might not exist.
++**
++** The details of the operation codes, their meanings, the parameters
++** they take, and what they do are all subject to change without notice.
++** Unlike most of the SQLite API, this function is not guaranteed to
++** operate consistently from one release to the next.
++*/
++SQLITE_API int sqlite3_test_control(int op, ...);
++
++/*
++** CAPI3REF: Testing Interface Operation Codes
++**
++** These constants are the valid operation code parameters used
++** as the first argument to [sqlite3_test_control()].
++**
++** These parameters and their meanings are subject to change
++** without notice.  These values are for testing purposes only.
++** Applications should not use any of these parameters or the
++** [sqlite3_test_control()] interface.
++*/
++#define SQLITE_TESTCTRL_FIRST                    5
++#define SQLITE_TESTCTRL_PRNG_SAVE                5
++#define SQLITE_TESTCTRL_PRNG_RESTORE             6
++#define SQLITE_TESTCTRL_PRNG_RESET               7  /* NOT USED */
++#define SQLITE_TESTCTRL_FK_NO_ACTION             7
++#define SQLITE_TESTCTRL_BITVEC_TEST              8
++#define SQLITE_TESTCTRL_FAULT_INSTALL            9
++#define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
++#define SQLITE_TESTCTRL_PENDING_BYTE            11
++#define SQLITE_TESTCTRL_ASSERT                  12
++#define SQLITE_TESTCTRL_ALWAYS                  13
++#define SQLITE_TESTCTRL_RESERVE                 14  /* NOT USED */
++#define SQLITE_TESTCTRL_JSON_SELFCHECK          14
++#define SQLITE_TESTCTRL_OPTIMIZATIONS           15
++#define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
++#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
++#define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS      17
++#define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
++#define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
++#define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
++#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
++#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
++#define SQLITE_TESTCTRL_BYTEORDER               22
++#define SQLITE_TESTCTRL_ISINIT                  23
++#define SQLITE_TESTCTRL_SORTER_MMAP             24
++#define SQLITE_TESTCTRL_IMPOSTER                25
++#define SQLITE_TESTCTRL_PARSER_COVERAGE         26
++#define SQLITE_TESTCTRL_RESULT_INTREAL          27
++#define SQLITE_TESTCTRL_PRNG_SEED               28
++#define SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS     29
++#define SQLITE_TESTCTRL_SEEK_COUNT              30
++#define SQLITE_TESTCTRL_TRACEFLAGS              31
++#define SQLITE_TESTCTRL_TUNE                    32
++#define SQLITE_TESTCTRL_LOGEST                  33
++#define SQLITE_TESTCTRL_USELONGDOUBLE           34
++#define SQLITE_TESTCTRL_LAST                    34  /* Largest TESTCTRL */
++
++/*
++** CAPI3REF: SQL Keyword Checking
++**
++** These routines provide access to the set of SQL language keywords
++** recognized by SQLite.  Applications can uses these routines to determine
++** whether or not a specific identifier needs to be escaped (for example,
++** by enclosing in double-quotes) so as not to confuse the parser.
++**
++** The sqlite3_keyword_count() interface returns the number of distinct
++** keywords understood by SQLite.
++**
++** The sqlite3_keyword_name(N,Z,L) interface finds the N-th keyword and
++** makes *Z point to that keyword expressed as UTF8 and writes the number
++** of bytes in the keyword into *L.  The string that *Z points to is not
++** zero-terminated.  The sqlite3_keyword_name(N,Z,L) routine returns
++** SQLITE_OK if N is within bounds and SQLITE_ERROR if not. If either Z
++** or L are NULL or invalid pointers then calls to
++** sqlite3_keyword_name(N,Z,L) result in undefined behavior.
++**
++** The sqlite3_keyword_check(Z,L) interface checks to see whether or not
++** the L-byte UTF8 identifier that Z points to is a keyword, returning non-zero
++** if it is and zero if not.
++**
++** The parser used by SQLite is forgiving.  It is often possible to use
++** a keyword as an identifier as long as such use does not result in a
++** parsing ambiguity.  For example, the statement
++** "CREATE TABLE BEGIN(REPLACE,PRAGMA,END);" is accepted by SQLite, and
++** creates a new table named "BEGIN" with three columns named
++** "REPLACE", "PRAGMA", and "END".  Nevertheless, best practice is to avoid
++** using keywords as identifiers.  Common techniques used to avoid keyword
++** name collisions include:
++** 
        
++** 
      •  Put all identifier names inside double-quotes.  This is the official
++**      SQL way to escape identifier names.
++** 
      •  Put identifier names inside [...].  This is not standard SQL,
++**      but it is what SQL Server does and so lots of programmers use this
++**      technique.
++** 
      •  Begin every identifier with the letter "Z" as no SQL keywords start
++**      with "Z".
++** 
      •  Include a digit somewhere in every identifier name.
++** 
      
++**
++** Note that the number of keywords understood by SQLite can depend on
++** compile-time options.  For example, "VACUUM" is not a keyword if
++** SQLite is compiled with the [-DSQLITE_OMIT_VACUUM] option.  Also,
++** new keywords may be added to future releases of SQLite.
++*/
++SQLITE_API int sqlite3_keyword_count(void);
++SQLITE_API int sqlite3_keyword_name(int,const char**,int*);
++SQLITE_API int sqlite3_keyword_check(const char*,int);
++
++/*
++** CAPI3REF: Dynamic String Object
++** KEYWORDS: {dynamic string}
++**
++** An instance of the sqlite3_str object contains a dynamically-sized
++** string under construction.
++**
++** The lifecycle of an sqlite3_str object is as follows:
++** 
        
++** 
      1.  ^The sqlite3_str object is created using [sqlite3_str_new()].
++** 
      2.  ^Text is appended to the sqlite3_str object using various
++** methods, such as [sqlite3_str_appendf()].
++** 
      3.  ^The sqlite3_str object is destroyed and the string it created
++** is returned using the [sqlite3_str_finish()] interface.
++** 
      
++*/
++typedef struct sqlite3_str sqlite3_str;
++
++/*
++** CAPI3REF: Create A New Dynamic String Object
++** CONSTRUCTOR: sqlite3_str
++**
++** ^The [sqlite3_str_new(D)] interface allocates and initializes
++** a new [sqlite3_str] object.  To avoid memory leaks, the object returned by
++** [sqlite3_str_new()] must be freed by a subsequent call to
++** [sqlite3_str_finish(X)].
++**
++** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
++** valid [sqlite3_str] object, though in the event of an out-of-memory
++** error the returned object might be a special singleton that will
++** silently reject new text, always return SQLITE_NOMEM from
++** [sqlite3_str_errcode()], always return 0 for
++** [sqlite3_str_length()], and always return NULL from
++** [sqlite3_str_finish(X)].  It is always safe to use the value
++** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
++** to any of the other [sqlite3_str] methods.
++**
++** The D parameter to [sqlite3_str_new(D)] may be NULL.  If the
++** D parameter in [sqlite3_str_new(D)] is not NULL, then the maximum
++** length of the string contained in the [sqlite3_str] object will be
++** the value set for [sqlite3_limit](D,[SQLITE_LIMIT_LENGTH]) instead
++** of [SQLITE_MAX_LENGTH].
++*/
++SQLITE_API sqlite3_str *sqlite3_str_new(sqlite3*);
++
++/*
++** CAPI3REF: Finalize A Dynamic String
++** DESTRUCTOR: sqlite3_str
++**
++** ^The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
++** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
++** that contains the constructed string.  The calling application should
++** pass the returned value to [sqlite3_free()] to avoid a memory leak.
++** ^The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
++** errors were encountered during construction of the string.  ^The
++** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
++** string in [sqlite3_str] object X is zero bytes long.
++*/
++SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
++
++/*
++** CAPI3REF: Add Content To A Dynamic String
++** METHOD: sqlite3_str
++**
++** These interfaces add content to an sqlite3_str object previously obtained
++** from [sqlite3_str_new()].
++**
++** ^The [sqlite3_str_appendf(X,F,...)] and
++** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
++** functionality of SQLite to append formatted text onto the end of
++** [sqlite3_str] object X.
++**
++** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
++** onto the end of the [sqlite3_str] object X.  N must be non-negative.
++** S must contain at least N non-zero bytes of content.  To append a
++** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
++** method instead.
++**
++** ^The [sqlite3_str_appendall(X,S)] method appends the complete content of
++** zero-terminated string S onto the end of [sqlite3_str] object X.
++**
++** ^The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
++** single-byte character C onto the end of [sqlite3_str] object X.
++** ^This method can be used, for example, to add whitespace indentation.
++**
++** ^The [sqlite3_str_reset(X)] method resets the string under construction
++** inside [sqlite3_str] object X back to zero bytes in length.
++**
++** These methods do not return a result code.  ^If an error occurs, that fact
++** is recorded in the [sqlite3_str] object and can be recovered by a
++** subsequent call to [sqlite3_str_errcode(X)].
++*/
++SQLITE_API void sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
++SQLITE_API void sqlite3_str_vappendf(sqlite3_str*, const char *zFormat, va_list);
++SQLITE_API void sqlite3_str_append(sqlite3_str*, const char *zIn, int N);
++SQLITE_API void sqlite3_str_appendall(sqlite3_str*, const char *zIn);
++SQLITE_API void sqlite3_str_appendchar(sqlite3_str*, int N, char C);
++SQLITE_API void sqlite3_str_reset(sqlite3_str*);
++
++/*
++** CAPI3REF: Status Of A Dynamic String
++** METHOD: sqlite3_str
++**
++** These interfaces return the current status of an [sqlite3_str] object.
++**
++** ^If any prior errors have occurred while constructing the dynamic string
++** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
++** an appropriate error code.  ^The [sqlite3_str_errcode(X)] method returns
++** [SQLITE_NOMEM] following any out-of-memory error, or
++** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
++** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
++**
++** ^The [sqlite3_str_length(X)] method returns the current length, in bytes,
++** of the dynamic string under construction in [sqlite3_str] object X.
++** ^The length returned by [sqlite3_str_length(X)] does not include the
++** zero-termination byte.
++**
++** ^The [sqlite3_str_value(X)] method returns a pointer to the current
++** content of the dynamic string under construction in X.  The value
++** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
++** and might be freed or altered by any subsequent method on the same
++** [sqlite3_str] object.  Applications must not used the pointer returned
++** [sqlite3_str_value(X)] after any subsequent method call on the same
++** object.  ^Applications may change the content of the string returned
++** by [sqlite3_str_value(X)] as long as they do not write into any bytes
++** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
++** write any byte after any subsequent sqlite3_str method call.
++*/
++SQLITE_API int sqlite3_str_errcode(sqlite3_str*);
++SQLITE_API int sqlite3_str_length(sqlite3_str*);
++SQLITE_API char *sqlite3_str_value(sqlite3_str*);
++
++/*
++** CAPI3REF: SQLite Runtime Status
++**
++** ^These interfaces are used to retrieve runtime status information
++** about the performance of SQLite, and optionally to reset various
++** highwater marks.  ^The first argument is an integer code for
++** the specific parameter to measure.  ^(Recognized integer codes
++** are of the form [status parameters | SQLITE_STATUS_...].)^
++** ^The current value of the parameter is returned into *pCurrent.
++** ^The highest recorded value is returned in *pHighwater.  ^If the
++** resetFlag is true, then the highest record value is reset after
++** *pHighwater is written.  ^(Some parameters do not record the highest
++** value.  For those parameters
++** nothing is written into *pHighwater and the resetFlag is ignored.)^
++** ^(Other parameters record only the highwater mark and not the current
++** value.  For these latter parameters nothing is written into *pCurrent.)^
++**
++** ^The sqlite3_status() and sqlite3_status64() routines return
++** SQLITE_OK on success and a non-zero [error code] on failure.
++**
++** If either the current value or the highwater mark is too large to
++** be represented by a 32-bit integer, then the values returned by
++** sqlite3_status() are undefined.
++**
++** See also: [sqlite3_db_status()]
++*/
++SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
++SQLITE_API int sqlite3_status64(
++  int op,
++  sqlite3_int64 *pCurrent,
++  sqlite3_int64 *pHighwater,
++  int resetFlag
++);
++
++
++/*
++** CAPI3REF: Status Parameters
++** KEYWORDS: {status parameters}
++**
++** These integer constants designate various run-time status parameters
++** that can be returned by [sqlite3_status()].
++**
++** 
      
++** [[SQLITE_STATUS_MEMORY_USED]] ^(
      SQLITE_STATUS_MEMORY_USED
      
++** 
      This parameter is the current amount of memory checked out
++** using [sqlite3_malloc()], either directly or indirectly.  The
++** figure includes calls made to [sqlite3_malloc()] by the application
++** and internal memory usage by the SQLite library.  Auxiliary page-cache
++** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
++** this parameter.  The amount returned is the sum of the allocation
++** sizes as reported by the xSize method in [sqlite3_mem_methods].
      )^
++**
++** [[SQLITE_STATUS_MALLOC_SIZE]] ^(
      SQLITE_STATUS_MALLOC_SIZE
      
++** 
      This parameter records the largest memory allocation request
++** handed to [sqlite3_malloc()] or [sqlite3_realloc()] (or their
++** internal equivalents).  Only the value returned in the
++** *pHighwater parameter to [sqlite3_status()] is of interest.
++** The value written into the *pCurrent parameter is undefined.
      )^
++**
++** [[SQLITE_STATUS_MALLOC_COUNT]] ^(
      SQLITE_STATUS_MALLOC_COUNT
      
++** 
      This parameter records the number of separate memory allocations
++** currently checked out.
      )^
++**
++** [[SQLITE_STATUS_PAGECACHE_USED]] ^(
      SQLITE_STATUS_PAGECACHE_USED
      
++** 
      This parameter returns the number of pages used out of the
++** [pagecache memory allocator] that was configured using
++** [SQLITE_CONFIG_PAGECACHE].  The
++** value returned is in pages, not in bytes.
      )^
++**
++** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]
++** ^(
      SQLITE_STATUS_PAGECACHE_OVERFLOW
      
++** 
      This parameter returns the number of bytes of page cache
++** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
++** buffer and where forced to overflow to [sqlite3_malloc()].  The
++** returned value includes allocations that overflowed because they
++** where too large (they were larger than the "sz" parameter to
++** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
++** no space was left in the page cache.
      )^
++**
++** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(
      SQLITE_STATUS_PAGECACHE_SIZE
      
++** 
      This parameter records the largest memory allocation request
++** handed to the [pagecache memory allocator].  Only the value returned in the
++** *pHighwater parameter to [sqlite3_status()] is of interest.
++** The value written into the *pCurrent parameter is undefined.
      )^
++**
++** [[SQLITE_STATUS_SCRATCH_USED]] 
      SQLITE_STATUS_SCRATCH_USED
      
++** 
      No longer used.
      
++**
++** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(
      SQLITE_STATUS_SCRATCH_OVERFLOW
      
++** 
      No longer used.
      
++**
++** [[SQLITE_STATUS_SCRATCH_SIZE]] 
      SQLITE_STATUS_SCRATCH_SIZE
      
++** 
      No longer used.
      
++**
++** [[SQLITE_STATUS_PARSER_STACK]] ^(
      SQLITE_STATUS_PARSER_STACK
      
++** 
      The *pHighwater parameter records the deepest parser stack.
++** The *pCurrent value is undefined.  The *pHighwater value is only
++** meaningful if SQLite is compiled with [YYTRACKMAXSTACKDEPTH].
      )^
++** 
      
++**
++** New status parameters may be added from time to time.
++*/
++#define SQLITE_STATUS_MEMORY_USED          0
++#define SQLITE_STATUS_PAGECACHE_USED       1
++#define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
++#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
++#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
++#define SQLITE_STATUS_MALLOC_SIZE          5
++#define SQLITE_STATUS_PARSER_STACK         6
++#define SQLITE_STATUS_PAGECACHE_SIZE       7
++#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
++#define SQLITE_STATUS_MALLOC_COUNT         9
++
++/*
++** CAPI3REF: Database Connection Status
++** METHOD: sqlite3
++**
++** ^This interface is used to retrieve runtime status information
++** about a single [database connection].  ^The first argument is the
++** database connection object to be interrogated.  ^The second argument
++** is an integer constant, taken from the set of
++** [SQLITE_DBSTATUS options], that
++** determines the parameter to interrogate.  The set of
++** [SQLITE_DBSTATUS options] is likely
++** to grow in future releases of SQLite.
++**
++** ^The current value of the requested parameter is written into *pCur
++** and the highest instantaneous value is written into *pHiwtr.  ^If
++** the resetFlg is true, then the highest instantaneous value is
++** reset back down to the current value.
++**
++** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
++** non-zero [error code] on failure.
++**
++** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
++*/
++SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
++
++/*
++** CAPI3REF: Status Parameters for database connections
++** KEYWORDS: {SQLITE_DBSTATUS options}
++**
++** These constants are the available integer "verbs" that can be passed as
++** the second argument to the [sqlite3_db_status()] interface.
++**
++** New verbs may be added in future releases of SQLite. Existing verbs
++** might be discontinued. Applications should check the return code from
++** [sqlite3_db_status()] to make sure that the call worked.
++** The [sqlite3_db_status()] interface will return a non-zero error code
++** if a discontinued or unsupported verb is invoked.
++**
++** 
      
++** [[SQLITE_DBSTATUS_LOOKASIDE_USED]] ^(
      SQLITE_DBSTATUS_LOOKASIDE_USED
      
++** 
      This parameter returns the number of lookaside memory slots currently
++** checked out.
      )^
++**
++** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(
      SQLITE_DBSTATUS_LOOKASIDE_HIT
      
++** 
      This parameter returns the number of malloc attempts that were
++** satisfied using lookaside memory. Only the high-water value is meaningful;
++** the current value is always zero.)^
++**
++** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
++** ^(
      SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE
      
++** 
      This parameter returns the number malloc attempts that might have
++** been satisfied using lookaside memory but failed due to the amount of
++** memory requested being larger than the lookaside slot size.
++** Only the high-water value is meaningful;
++** the current value is always zero.)^
++**
++** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
++** ^(
      SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL
      
++** 
      This parameter returns the number malloc attempts that might have
++** been satisfied using lookaside memory but failed due to all lookaside
++** memory already being in use.
++** Only the high-water value is meaningful;
++** the current value is always zero.)^
++**
++** [[SQLITE_DBSTATUS_CACHE_USED]] ^(
      SQLITE_DBSTATUS_CACHE_USED
      
++** 
      This parameter returns the approximate number of bytes of heap
++** memory used by all pager caches associated with the database connection.)^
++** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
++**
++** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
++** ^(
      SQLITE_DBSTATUS_CACHE_USED_SHARED
      
++** 
      This parameter is similar to DBSTATUS_CACHE_USED, except that if a
++** pager cache is shared between two or more connections the bytes of heap
++** memory used by that pager cache is divided evenly between the attached
++** connections.)^  In other words, if none of the pager caches associated
++** with the database connection are shared, this request returns the same
++** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
++** shared, the value returned by this call will be smaller than that returned
++** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
++** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
++**
++** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(
      SQLITE_DBSTATUS_SCHEMA_USED
      
++** 
      This parameter returns the approximate number of bytes of heap
++** memory used to store the schema for all databases associated
++** with the connection - main, temp, and any [ATTACH]-ed databases.)^
++** ^The full amount of memory used by the schemas is reported, even if the
++** schema memory is shared with other database connections due to
++** [shared cache mode] being enabled.
++** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
++**
++** [[SQLITE_DBSTATUS_STMT_USED]] ^(
      SQLITE_DBSTATUS_STMT_USED
      
++** 
      This parameter returns the approximate number of bytes of heap
++** and lookaside memory used by all prepared statements associated with
++** the database connection.)^
++** ^The highwater mark associated with SQLITE_DBSTATUS_STMT_USED is always 0.
++** 
      
++**
++** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(
      SQLITE_DBSTATUS_CACHE_HIT
      
++** 
      This parameter returns the number of pager cache hits that have
++** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT
++** is always 0.
++** 
      
++**
++** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(
      SQLITE_DBSTATUS_CACHE_MISS
      
++** 
      This parameter returns the number of pager cache misses that have
++** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS
++** is always 0.
++** 
      
++**
++** [[SQLITE_DBSTATUS_CACHE_WRITE]] ^(
      SQLITE_DBSTATUS_CACHE_WRITE
      
++** 
      This parameter returns the number of dirty cache entries that have
++** been written to disk. Specifically, the number of pages written to the
++** wal file in wal mode databases, or the number of pages written to the
++** database file in rollback mode databases. Any pages written as part of
++** transaction rollback or database recovery operations are not included.
++** If an IO or other error occurs while writing a page to disk, the effect
++** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The
++** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
++** 
      
++**
++** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(
      SQLITE_DBSTATUS_CACHE_SPILL
      
++** 
      This parameter returns the number of dirty cache entries that have
++** been written to disk in the middle of a transaction due to the page
++** cache overflowing. Transactions are more efficient if they are written
++** to disk all at once. When pages spill mid-transaction, that introduces
++** additional overhead. This parameter can be used help identify
++** inefficiencies that can be resolved by increasing the cache size.
++** 
      
++**
++** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(
      SQLITE_DBSTATUS_DEFERRED_FKS
      
++** 
      This parameter returns zero for the current value if and only if
++** all foreign key constraints (deferred or immediate) have been
++** resolved.)^  ^The highwater mark is always 0.
++** 
      
++** 
      
++*/
++#define SQLITE_DBSTATUS_LOOKASIDE_USED       0
++#define SQLITE_DBSTATUS_CACHE_USED           1
++#define SQLITE_DBSTATUS_SCHEMA_USED          2
++#define SQLITE_DBSTATUS_STMT_USED            3
++#define SQLITE_DBSTATUS_LOOKASIDE_HIT        4
++#define SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE  5
++#define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL  6
++#define SQLITE_DBSTATUS_CACHE_HIT            7
++#define SQLITE_DBSTATUS_CACHE_MISS           8
++#define SQLITE_DBSTATUS_CACHE_WRITE          9
++#define SQLITE_DBSTATUS_DEFERRED_FKS        10
++#define SQLITE_DBSTATUS_CACHE_USED_SHARED   11
++#define SQLITE_DBSTATUS_CACHE_SPILL         12
++#define SQLITE_DBSTATUS_MAX                 12   /* Largest defined DBSTATUS */
++
++
++/*
++** CAPI3REF: Prepared Statement Status
++** METHOD: sqlite3_stmt
++**
++** ^(Each prepared statement maintains various
++** [SQLITE_STMTSTATUS counters] that measure the number
++** of times it has performed specific operations.)^  These counters can
++** be used to monitor the performance characteristics of the prepared
++** statements.  For example, if the number of table steps greatly exceeds
++** the number of table searches or result rows, that would tend to indicate
++** that the prepared statement is using a full table scan rather than
++** an index.
++**
++** ^(This interface is used to retrieve and reset counter values from
++** a [prepared statement].  The first argument is the prepared statement
++** object to be interrogated.  The second argument
++** is an integer code for a specific [SQLITE_STMTSTATUS counter]
++** to be interrogated.)^
++** ^The current value of the requested counter is returned.
++** ^If the resetFlg is true, then the counter is reset to zero after this
++** interface call returns.
++**
++** See also: [sqlite3_status()] and [sqlite3_db_status()].
++*/
++SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
++
++/*
++** CAPI3REF: Status Parameters for prepared statements
++** KEYWORDS: {SQLITE_STMTSTATUS counter} {SQLITE_STMTSTATUS counters}
++**
++** These preprocessor macros define integer codes that name counter
++** values associated with the [sqlite3_stmt_status()] interface.
++** The meanings of the various counters are as follows:
++**
++** 
      
++** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]] 
      SQLITE_STMTSTATUS_FULLSCAN_STEP
      
++** 
      ^This is the number of times that SQLite has stepped forward in
++** a table as part of a full table scan.  Large numbers for this counter
++** may indicate opportunities for performance improvement through
++** careful use of indices.
      
++**
++** [[SQLITE_STMTSTATUS_SORT]] 
      SQLITE_STMTSTATUS_SORT
      
++** 
      ^This is the number of sort operations that have occurred.
++** A non-zero value in this counter may indicate an opportunity to
++** improvement performance through careful use of indices.
      
++**
++** [[SQLITE_STMTSTATUS_AUTOINDEX]] 
      SQLITE_STMTSTATUS_AUTOINDEX
      
++** 
      ^This is the number of rows inserted into transient indices that
++** were created automatically in order to help joins run faster.
++** A non-zero value in this counter may indicate an opportunity to
++** improvement performance by adding permanent indices that do not
++** need to be reinitialized each time the statement is run.
      
++**
++** [[SQLITE_STMTSTATUS_VM_STEP]] 
      SQLITE_STMTSTATUS_VM_STEP
      
++** 
      ^This is the number of virtual machine operations executed
++** by the prepared statement if that number is less than or equal
++** to 2147483647.  The number of virtual machine operations can be
++** used as a proxy for the total work done by the prepared statement.
++** If the number of virtual machine operations exceeds 2147483647
++** then the value returned by this statement status code is undefined.
++**
++** [[SQLITE_STMTSTATUS_REPREPARE]] 
      SQLITE_STMTSTATUS_REPREPARE
      
++** 
      ^This is the number of times that the prepare statement has been
++** automatically regenerated due to schema changes or changes to
++** [bound parameters] that might affect the query plan.
++**
++** [[SQLITE_STMTSTATUS_RUN]] 
      SQLITE_STMTSTATUS_RUN
      
++** 
      ^This is the number of times that the prepared statement has
++** been run.  A single "run" for the purposes of this counter is one
++** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
++** The counter is incremented on the first [sqlite3_step()] call of each
++** cycle.
++**
++** [[SQLITE_STMTSTATUS_FILTER_MISS]]
++** [[SQLITE_STMTSTATUS_FILTER HIT]]
++** 
      SQLITE_STMTSTATUS_FILTER_HIT
      
++** SQLITE_STMTSTATUS_FILTER_MISS
      
++** 
      ^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
++** step was bypassed because a Bloom filter returned not-found.  The
++** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
++** times that the Bloom filter returned a find, and thus the join step
++** had to be processed as normal.
++**
++** [[SQLITE_STMTSTATUS_MEMUSED]] 
      SQLITE_STMTSTATUS_MEMUSED
      
++** 
      ^This is the approximate number of bytes of heap memory
++** used to store the prepared statement.  ^This value is not actually
++** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
++** is ignored when the opcode is SQLITE_STMTSTATUS_MEMUSED.
++** 
      
++** 
      
++*/
++#define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
++#define SQLITE_STMTSTATUS_SORT              2
++#define SQLITE_STMTSTATUS_AUTOINDEX         3
++#define SQLITE_STMTSTATUS_VM_STEP           4
++#define SQLITE_STMTSTATUS_REPREPARE         5
++#define SQLITE_STMTSTATUS_RUN               6
++#define SQLITE_STMTSTATUS_FILTER_MISS       7
++#define SQLITE_STMTSTATUS_FILTER_HIT        8
++#define SQLITE_STMTSTATUS_MEMUSED           99
++
++/*
++** CAPI3REF: Custom Page Cache Object
++**
++** The sqlite3_pcache type is opaque.  It is implemented by
++** the pluggable module.  The SQLite core has no knowledge of
++** its size or internal structure and never deals with the
++** sqlite3_pcache object except by holding and passing pointers
++** to the object.
++**
++** See [sqlite3_pcache_methods2] for additional information.
++*/
++typedef struct sqlite3_pcache sqlite3_pcache;
++
++/*
++** CAPI3REF: Custom Page Cache Object
++**
++** The sqlite3_pcache_page object represents a single page in the
++** page cache.  The page cache will allocate instances of this
++** object.  Various methods of the page cache use pointers to instances
++** of this object as parameters or as their return value.
++**
++** See [sqlite3_pcache_methods2] for additional information.
++*/
++typedef struct sqlite3_pcache_page sqlite3_pcache_page;
++struct sqlite3_pcache_page {
++  void *pBuf;        /* The content of the page */
++  void *pExtra;      /* Extra information associated with the page */
++};
++
++/*
++** CAPI3REF: Application Defined Page Cache.
++** KEYWORDS: {page cache}
++**
++** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
++** register an alternative page cache implementation by passing in an
++** instance of the sqlite3_pcache_methods2 structure.)^
++** In many applications, most of the heap memory allocated by
++** SQLite is used for the page cache.
++** By implementing a
++** custom page cache using this API, an application can better control
++** the amount of memory consumed by SQLite, the way in which
++** that memory is allocated and released, and the policies used to
++** determine exactly which parts of a database file are cached and for
++** how long.
++**
++** The alternative page cache mechanism is an
++** extreme measure that is only needed by the most demanding applications.
++** The built-in page cache is recommended for most uses.
++**
++** ^(The contents of the sqlite3_pcache_methods2 structure are copied to an
++** internal buffer by SQLite within the call to [sqlite3_config].  Hence
++** the application may discard the parameter after the call to
++** [sqlite3_config()] returns.)^
++**
++** [[the xInit() page cache method]]
++** ^(The xInit() method is called once for each effective
++** call to [sqlite3_initialize()])^
++** (usually only once during the lifetime of the process). ^(The xInit()
++** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
++** The intent of the xInit() method is to set up global data structures
++** required by the custom page cache implementation.
++** ^(If the xInit() method is NULL, then the
++** built-in default page cache is used instead of the application defined
++** page cache.)^
++**
++** [[the xShutdown() page cache method]]
++** ^The xShutdown() method is called by [sqlite3_shutdown()].
++** It can be used to clean up
++** any outstanding resources before process shutdown, if required.
++** ^The xShutdown() method may be NULL.
++**
++** ^SQLite automatically serializes calls to the xInit method,
++** so the xInit method need not be threadsafe.  ^The
++** xShutdown method is only called from [sqlite3_shutdown()] so it does
++** not need to be threadsafe either.  All other methods must be threadsafe
++** in multithreaded applications.
++**
++** ^SQLite will never invoke xInit() more than once without an intervening
++** call to xShutdown().
++**
++** [[the xCreate() page cache methods]]
++** ^SQLite invokes the xCreate() method to construct a new cache instance.
++** SQLite will typically create one cache instance for each open database file,
++** though this is not guaranteed. ^The
++** first parameter, szPage, is the size in bytes of the pages that must
++** be allocated by the cache.  ^szPage will always a power of two.  ^The
++** second parameter szExtra is a number of bytes of extra storage
++** associated with each page cache entry.  ^The szExtra parameter will
++** a number less than 250.  SQLite will use the
++** extra szExtra bytes on each page to store metadata about the underlying
++** database page on disk.  The value passed into szExtra depends
++** on the SQLite version, the target platform, and how SQLite was compiled.
++** ^The third argument to xCreate(), bPurgeable, is true if the cache being
++** created will be used to cache database pages of a file stored on disk, or
++** false if it is used for an in-memory database. The cache implementation
++** does not have to do anything special based with the value of bPurgeable;
++** it is purely advisory.  ^On a cache where bPurgeable is false, SQLite will
++** never invoke xUnpin() except to deliberately delete a page.
++** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
++** false will always have the "discard" flag set to true.
++** ^Hence, a cache created with bPurgeable false will
++** never contain any unpinned pages.
++**
++** [[the xCachesize() page cache method]]
++** ^(The xCachesize() method may be called at any time by SQLite to set the
++** suggested maximum cache-size (number of pages stored by) the cache
++** instance passed as the first argument. This is the value configured using
++** the SQLite "[PRAGMA cache_size]" command.)^  As with the bPurgeable
++** parameter, the implementation is not required to do anything with this
++** value; it is advisory only.
++**
++** [[the xPagecount() page cache methods]]
++** The xPagecount() method must return the number of pages currently
++** stored in the cache, both pinned and unpinned.
++**
++** [[the xFetch() page cache methods]]
++** The xFetch() method locates a page in the cache and returns a pointer to
++** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
++** The pBuf element of the returned sqlite3_pcache_page object will be a
++** pointer to a buffer of szPage bytes used to store the content of a
++** single database page.  The pExtra element of sqlite3_pcache_page will be
++** a pointer to the szExtra bytes of extra storage that SQLite has requested
++** for each entry in the page cache.
++**
++** The page to be fetched is determined by the key. ^The minimum key value
++** is 1.  After it has been retrieved using xFetch, the page is considered
++** to be "pinned".
++**
++** If the requested page is already in the page cache, then the page cache
++** implementation must return a pointer to the page buffer with its content
++** intact.  If the requested page is not already in the cache, then the
++** cache implementation should use the value of the createFlag
++** parameter to help it determined what action to take:
++**
++** 
++** 
       createFlag  Behavior when page is not already in cache
++** 
       0  Do not allocate a new page.  Return NULL.
++** 
       1  Allocate a new page if it easy and convenient to do so.
++**                 Otherwise return NULL.
++** 
       2  Make every effort to allocate a new page.  Only return
++**                 NULL if allocating a new page is effectively impossible.
++** 
      
++**
++** ^(SQLite will normally invoke xFetch() with a createFlag of 0 or 1.  SQLite
++** will only use a createFlag of 2 after a prior call with a createFlag of 1
++** failed.)^  In between the xFetch() calls, SQLite may
++** attempt to unpin one or more cache pages by spilling the content of
++** pinned pages to disk and synching the operating system disk cache.
++**
++** [[the xUnpin() page cache method]]
++** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
++** as its second argument.  If the third parameter, discard, is non-zero,
++** then the page must be evicted from the cache.
++** ^If the discard parameter is
++** zero, then the page may be discarded or retained at the discretion of
++** page cache implementation. ^The page cache implementation
++** may choose to evict unpinned pages at any time.
++**
++** The cache must not perform any reference counting. A single
++** call to xUnpin() unpins the page regardless of the number of prior calls
++** to xFetch().
++**
++** [[the xRekey() page cache methods]]
++** The xRekey() method is used to change the key value associated with the
++** page passed as the second argument. If the cache
++** previously contains an entry associated with newKey, it must be
++** discarded. ^Any prior cache entry associated with newKey is guaranteed not
++** to be pinned.
++**
++** When SQLite calls the xTruncate() method, the cache must discard all
++** existing cache entries with page numbers (keys) greater than or equal
++** to the value of the iLimit parameter passed to xTruncate(). If any
++** of these pages are pinned, they are implicitly unpinned, meaning that
++** they can be safely discarded.
++**
++** [[the xDestroy() page cache method]]
++** ^The xDestroy() method is used to delete a cache allocated by xCreate().
++** All resources associated with the specified cache should be freed. ^After
++** calling the xDestroy() method, SQLite considers the [sqlite3_pcache*]
++** handle invalid, and will not use it with any other sqlite3_pcache_methods2
++** functions.
++**
++** [[the xShrink() page cache method]]
++** ^SQLite invokes the xShrink() method when it wants the page cache to
++** free up as much of heap memory as possible.  The page cache implementation
++** is not obligated to free any memory, but well-behaved implementations should
++** do their best.
++*/
++typedef struct sqlite3_pcache_methods2 sqlite3_pcache_methods2;
++struct sqlite3_pcache_methods2 {
++  int iVersion;
++  void *pArg;
++  int (*xInit)(void*);
++  void (*xShutdown)(void*);
++  sqlite3_pcache *(*xCreate)(int szPage, int szExtra, int bPurgeable);
++  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
++  int (*xPagecount)(sqlite3_pcache*);
++  sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
++  void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
++  void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,
++      unsigned oldKey, unsigned newKey);
++  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
++  void (*xDestroy)(sqlite3_pcache*);
++  void (*xShrink)(sqlite3_pcache*);
++};
++
++/*
++** This is the obsolete pcache_methods object that has now been replaced
++** by sqlite3_pcache_methods2.  This object is not used by SQLite.  It is
++** retained in the header file for backwards compatibility only.
++*/
++typedef struct sqlite3_pcache_methods sqlite3_pcache_methods;
++struct sqlite3_pcache_methods {
++  void *pArg;
++  int (*xInit)(void*);
++  void (*xShutdown)(void*);
++  sqlite3_pcache *(*xCreate)(int szPage, int bPurgeable);
++  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
++  int (*xPagecount)(sqlite3_pcache*);
++  void *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
++  void (*xUnpin)(sqlite3_pcache*, void*, int discard);
++  void (*xRekey)(sqlite3_pcache*, void*, unsigned oldKey, unsigned newKey);
++  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
++  void (*xDestroy)(sqlite3_pcache*);
++};
++
++
++/*
++** CAPI3REF: Online Backup Object
++**
++** The sqlite3_backup object records state information about an ongoing
++** online backup operation.  ^The sqlite3_backup object is created by
++** a call to [sqlite3_backup_init()] and is destroyed by a call to
++** [sqlite3_backup_finish()].
++**
++** See Also: [Using the SQLite Online Backup API]
++*/
++typedef struct sqlite3_backup sqlite3_backup;
++
++/*
++** CAPI3REF: Online Backup API.
++**
++** The backup API copies the content of one database into another.
++** It is useful either for creating backups of databases or
++** for copying in-memory databases to or from persistent files.
++**
++** See Also: [Using the SQLite Online Backup API]
++**
++** ^SQLite holds a write transaction open on the destination database file
++** for the duration of the backup operation.
++** ^The source database is read-locked only while it is being read;
++** it is not locked continuously for the entire backup operation.
++** ^Thus, the backup may be performed on a live source database without
++** preventing other database connections from
++** reading or writing to the source database while the backup is underway.
++**
++** ^(To perform a backup operation:
++**   
        
++**     
      1. sqlite3_backup_init() is called once to initialize the
++**         backup,
++**     
      2. sqlite3_backup_step() is called one or more times to transfer
++**         the data between the two databases, and finally
++**     
      3. sqlite3_backup_finish() is called to release all resources
++**         associated with the backup operation.
++**   
      )^
++** There should be exactly one call to sqlite3_backup_finish() for each
++** successful call to sqlite3_backup_init().
++**
++** [[sqlite3_backup_init()]] sqlite3_backup_init()
++**
++** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
++** [database connection] associated with the destination database
++** and the database name, respectively.
++** ^The database name is "main" for the main database, "temp" for the
++** temporary database, or the name specified after the AS keyword in
++** an [ATTACH] statement for an attached database.
++** ^The S and M arguments passed to
++** sqlite3_backup_init(D,N,S,M) identify the [database connection]
++** and database name of the source database, respectively.
++** ^The source and destination [database connections] (parameters S and D)
++** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
++** an error.
++**
++** ^A call to sqlite3_backup_init() will fail, returning NULL, if
++** there is already a read or read-write transaction open on the
++** destination database.
++**
++** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
++** returned and an error code and error message are stored in the
++** destination [database connection] D.
++** ^The error code and message for the failed call to sqlite3_backup_init()
++** can be retrieved using the [sqlite3_errcode()], [sqlite3_errmsg()], and/or
++** [sqlite3_errmsg16()] functions.
++** ^A successful call to sqlite3_backup_init() returns a pointer to an
++** [sqlite3_backup] object.
++** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
++** sqlite3_backup_finish() functions to perform the specified backup
++** operation.
++**
++** [[sqlite3_backup_step()]] sqlite3_backup_step()
++**
++** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
++** the source and destination databases specified by [sqlite3_backup] object B.
++** ^If N is negative, all remaining source pages are copied.
++** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
++** are still more pages to be copied, then the function returns [SQLITE_OK].
++** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
++** from source to destination, then it returns [SQLITE_DONE].
++** ^If an error occurs while running sqlite3_backup_step(B,N),
++** then an [error code] is returned. ^As well as [SQLITE_OK] and
++** [SQLITE_DONE], a call to sqlite3_backup_step() may return [SQLITE_READONLY],
++** [SQLITE_NOMEM], [SQLITE_BUSY], [SQLITE_LOCKED], or an
++** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX] extended error code.
++**
++** ^(The sqlite3_backup_step() might return [SQLITE_READONLY] if
++** 
        
++** 
      1.  the destination database was opened read-only, or
++** 
      2.  the destination database is using write-ahead-log journaling
++** and the destination and source page sizes differ, or
++** 
      3.  the destination database is an in-memory database and the
++** destination and source page sizes differ.
++** 
      )^
++**
++** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
++** the [sqlite3_busy_handler | busy-handler function]
++** is invoked (if one is specified). ^If the
++** busy-handler returns non-zero before the lock is available, then
++** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
++** sqlite3_backup_step() can be retried later. ^If the source
++** [database connection]
++** is being used to write to the source database when sqlite3_backup_step()
++** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
++** case the call to sqlite3_backup_step() can be retried later on. ^(If
++** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
++** [SQLITE_READONLY] is returned, then
++** there is no point in retrying the call to sqlite3_backup_step(). These
++** errors are considered fatal.)^  The application must accept
++** that the backup operation has failed and pass the backup operation handle
++** to the sqlite3_backup_finish() to release associated resources.
++**
++** ^The first call to sqlite3_backup_step() obtains an exclusive lock
++** on the destination file. ^The exclusive lock is not released until either
++** sqlite3_backup_finish() is called or the backup operation is complete
++** and sqlite3_backup_step() returns [SQLITE_DONE].  ^Every call to
++** sqlite3_backup_step() obtains a [shared lock] on the source database that
++** lasts for the duration of the sqlite3_backup_step() call.
++** ^Because the source database is not locked between calls to
++** sqlite3_backup_step(), the source database may be modified mid-way
++** through the backup process.  ^If the source database is modified by an
++** external process or via a database connection other than the one being
++** used by the backup operation, then the backup will be automatically
++** restarted by the next call to sqlite3_backup_step(). ^If the source
++** database is modified by the using the same database connection as is used
++** by the backup operation, then the backup database is automatically
++** updated at the same time.
++**
++** [[sqlite3_backup_finish()]] sqlite3_backup_finish()
++**
++** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
++** application wishes to abandon the backup operation, the application
++** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
++** ^The sqlite3_backup_finish() interfaces releases all
++** resources associated with the [sqlite3_backup] object.
++** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
++** active write-transaction on the destination database is rolled back.
++** The [sqlite3_backup] object is invalid
++** and may not be used following a call to sqlite3_backup_finish().
++**
++** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
++** sqlite3_backup_step() errors occurred, regardless or whether or not
++** sqlite3_backup_step() completed.
++** ^If an out-of-memory condition or IO error occurred during any prior
++** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
++** sqlite3_backup_finish() returns the corresponding [error code].
++**
++** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
++** is not a permanent error and does not affect the return value of
++** sqlite3_backup_finish().
++**
++** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
++** sqlite3_backup_remaining() and sqlite3_backup_pagecount()
++**
++** ^The sqlite3_backup_remaining() routine returns the number of pages still
++** to be backed up at the conclusion of the most recent sqlite3_backup_step().
++** ^The sqlite3_backup_pagecount() routine returns the total number of pages
++** in the source database at the conclusion of the most recent
++** sqlite3_backup_step().
++** ^(The values returned by these functions are only updated by
++** sqlite3_backup_step(). If the source database is modified in a way that
++** changes the size of the source database or the number of pages remaining,
++** those changes are not reflected in the output of sqlite3_backup_pagecount()
++** and sqlite3_backup_remaining() until after the next
++** sqlite3_backup_step().)^
++**
++** Concurrent Usage of Database Handles
++**
++** ^The source [database connection] may be used by the application for other
++** purposes while a backup operation is underway or being initialized.
++** ^If SQLite is compiled and configured to support threadsafe database
++** connections, then the source database connection may be used concurrently
++** from within other threads.
++**
++** However, the application must guarantee that the destination
++** [database connection] is not passed to any other API (by any thread) after
++** sqlite3_backup_init() is called and before the corresponding call to
++** sqlite3_backup_finish().  SQLite does not currently check to see
++** if the application incorrectly accesses the destination [database connection]
++** and so no error code is reported, but the operations may malfunction
++** nevertheless.  Use of the destination database connection while a
++** backup is in progress might also cause a mutex deadlock.
++**
++** If running in [shared cache mode], the application must
++** guarantee that the shared cache used by the destination database
++** is not accessed while the backup is running. In practice this means
++** that the application must guarantee that the disk file being
++** backed up to is not accessed by any connection within the process,
++** not just the specific connection that was passed to sqlite3_backup_init().
++**
++** The [sqlite3_backup] object itself is partially threadsafe. Multiple
++** threads may safely make multiple concurrent calls to sqlite3_backup_step().
++** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
++** APIs are not strictly speaking threadsafe. If they are invoked at the
++** same time as another thread is invoking sqlite3_backup_step() it is
++** possible that they return invalid values.
++*/
++SQLITE_API sqlite3_backup *sqlite3_backup_init(
++  sqlite3 *pDest,                        /* Destination database handle */
++  const char *zDestName,                 /* Destination database name */
++  sqlite3 *pSource,                      /* Source database handle */
++  const char *zSourceName                /* Source database name */
++);
++SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage);
++SQLITE_API int sqlite3_backup_finish(sqlite3_backup *p);
++SQLITE_API int sqlite3_backup_remaining(sqlite3_backup *p);
++SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
++
++/*
++** CAPI3REF: Unlock Notification
++** METHOD: sqlite3
++**
++** ^When running in shared-cache mode, a database operation may fail with
++** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
++** individual tables within the shared-cache cannot be obtained. See
++** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
++** ^This API may be used to register a callback that SQLite will invoke
++** when the connection currently holding the required lock relinquishes it.
++** ^This API is only available if the library was compiled with the
++** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
++**
++** See Also: [Using the SQLite Unlock Notification Feature].
++**
++** ^Shared-cache locks are released when a database connection concludes
++** its current transaction, either by committing it or rolling it back.
++**
++** ^When a connection (known as the blocked connection) fails to obtain a
++** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
++** identity of the database connection (the blocking connection) that
++** has locked the required resource is stored internally. ^After an
++** application receives an SQLITE_LOCKED error, it may call the
++** sqlite3_unlock_notify() method with the blocked connection handle as
++** the first argument to register for a callback that will be invoked
++** when the blocking connections current transaction is concluded. ^The
++** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
++** call that concludes the blocking connection's transaction.
++**
++** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
++** there is a chance that the blocking connection will have already
++** concluded its transaction by the time sqlite3_unlock_notify() is invoked.
++** If this happens, then the specified callback is invoked immediately,
++** from within the call to sqlite3_unlock_notify().)^
++**
++** ^If the blocked connection is attempting to obtain a write-lock on a
++** shared-cache table, and more than one other connection currently holds
++** a read-lock on the same table, then SQLite arbitrarily selects one of
++** the other connections to use as the blocking connection.
++**
++** ^(There may be at most one unlock-notify callback registered by a
++** blocked connection. If sqlite3_unlock_notify() is called when the
++** blocked connection already has a registered unlock-notify callback,
++** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
++** called with a NULL pointer as its second argument, then any existing
++** unlock-notify callback is canceled. ^The blocked connections
++** unlock-notify callback may also be canceled by closing the blocked
++** connection using [sqlite3_close()].
++**
++** The unlock-notify callback is not reentrant. If an application invokes
++** any sqlite3_xxx API functions from within an unlock-notify callback, a
++** crash or deadlock may be the result.
++**
++** ^Unless deadlock is detected (see below), sqlite3_unlock_notify() always
++** returns SQLITE_OK.
++**
++** Callback Invocation Details
++**
++** When an unlock-notify callback is registered, the application provides a
++** single void* pointer that is passed to the callback when it is invoked.
++** However, the signature of the callback function allows SQLite to pass
++** it an array of void* context pointers. The first argument passed to
++** an unlock-notify callback is a pointer to an array of void* pointers,
++** and the second is the number of entries in the array.
++**
++** When a blocking connection's transaction is concluded, there may be
++** more than one blocked connection that has registered for an unlock-notify
++** callback. ^If two or more such blocked connections have specified the
++** same callback function, then instead of invoking the callback function
++** multiple times, it is invoked once with the set of void* context pointers
++** specified by the blocked connections bundled together into an array.
++** This gives the application an opportunity to prioritize any actions
++** related to the set of unblocked database connections.
++**
++** Deadlock Detection
++**
++** Assuming that after registering for an unlock-notify callback a
++** database waits for the callback to be issued before taking any further
++** action (a reasonable assumption), then using this API may cause the
++** application to deadlock. For example, if connection X is waiting for
++** connection Y's transaction to be concluded, and similarly connection
++** Y is waiting on connection X's transaction, then neither connection
++** will proceed and the system may remain deadlocked indefinitely.
++**
++** To avoid this scenario, the sqlite3_unlock_notify() performs deadlock
++** detection. ^If a given call to sqlite3_unlock_notify() would put the
++** system in a deadlocked state, then SQLITE_LOCKED is returned and no
++** unlock-notify callback is registered. The system is said to be in
++** a deadlocked state if connection A has registered for an unlock-notify
++** callback on the conclusion of connection B's transaction, and connection
++** B has itself registered for an unlock-notify callback when connection
++** A's transaction is concluded. ^Indirect deadlock is also detected, so
++** the system is also considered to be deadlocked if connection B has
++** registered for an unlock-notify callback on the conclusion of connection
++** C's transaction, where connection C is waiting on connection A. ^Any
++** number of levels of indirection are allowed.
++**
++** The "DROP TABLE" Exception
++**
++** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost
++** always appropriate to call sqlite3_unlock_notify(). There is however,
++** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement,
++** SQLite checks if there are any currently executing SELECT statements
++** that belong to the same connection. If there are, SQLITE_LOCKED is
++** returned. In this case there is no "blocking connection", so invoking
++** sqlite3_unlock_notify() results in the unlock-notify callback being
++** invoked immediately. If the application then re-attempts the "DROP TABLE"
++** or "DROP INDEX" query, an infinite loop might be the result.
++**
++** One way around this problem is to check the extended error code returned
++** by an sqlite3_step() call. ^(If there is a blocking connection, then the
++** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in
++** the special "DROP TABLE/INDEX" case, the extended error code is just
++** SQLITE_LOCKED.)^
++*/
++SQLITE_API int sqlite3_unlock_notify(
++  sqlite3 *pBlocked,                          /* Waiting connection */
++  void (*xNotify)(void **apArg, int nArg),    /* Callback function to invoke */
++  void *pNotifyArg                            /* Argument to pass to xNotify */
++);
++
++
++/*
++** CAPI3REF: String Comparison
++**
++** ^The [sqlite3_stricmp()] and [sqlite3_strnicmp()] APIs allow applications
++** and extensions to compare the contents of two buffers containing UTF-8
++** strings in a case-independent fashion, using the same definition of "case
++** independence" that SQLite uses internally when comparing identifiers.
++*/
++SQLITE_API int sqlite3_stricmp(const char *, const char *);
++SQLITE_API int sqlite3_strnicmp(const char *, const char *, int);
++
++/*
++** CAPI3REF: String Globbing
++*
++** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if
++** string X matches the [GLOB] pattern P.
++** ^The definition of [GLOB] pattern matching used in
++** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the
++** SQL dialect understood by SQLite.  ^The [sqlite3_strglob(P,X)] function
++** is case sensitive.
++**
++** Note that this routine returns zero on a match and non-zero if the strings
++** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
++**
++** See also: [sqlite3_strlike()].
++*/
++SQLITE_API int sqlite3_strglob(const char *zGlob, const char *zStr);
++
++/*
++** CAPI3REF: String LIKE Matching
++*
++** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if
++** string X matches the [LIKE] pattern P with escape character E.
++** ^The definition of [LIKE] pattern matching used in
++** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E"
++** operator in the SQL dialect understood by SQLite.  ^For "X LIKE P" without
++** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0.
++** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case
++** insensitive - equivalent upper and lower case ASCII characters match
++** one another.
++**
++** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though
++** only ASCII characters are case folded.
++**
++** Note that this routine returns zero on a match and non-zero if the strings
++** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
++**
++** See also: [sqlite3_strglob()].
++*/
++SQLITE_API int sqlite3_strlike(const char *zGlob, const char *zStr, unsigned int cEsc);
++
++/*
++** CAPI3REF: Error Logging Interface
++**
++** ^The [sqlite3_log()] interface writes a message into the [error log]
++** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
++** ^If logging is enabled, the zFormat string and subsequent arguments are
++** used with [sqlite3_snprintf()] to generate the final output string.
++**
++** The sqlite3_log() interface is intended for use by extensions such as
++** virtual tables, collating functions, and SQL functions.  While there is
++** nothing to prevent an application from calling sqlite3_log(), doing so
++** is considered bad form.
++**
++** The zFormat string must not be NULL.
++**
++** To avoid deadlocks and other threading problems, the sqlite3_log() routine
++** will not use dynamically allocated memory.  The log message is stored in
++** a fixed-length buffer on the stack.  If the log message is longer than
++** a few hundred characters, it will be truncated to the length of the
++** buffer.
++*/
++SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);
++
++/*
++** CAPI3REF: Write-Ahead Log Commit Hook
++** METHOD: sqlite3
++**
++** ^The [sqlite3_wal_hook()] function is used to register a callback that
++** is invoked each time data is committed to a database in wal mode.
++**
++** ^(The callback is invoked by SQLite after the commit has taken place and
++** the associated write-lock on the database released)^, so the implementation
++** may read, write or [checkpoint] the database as required.
++**
++** ^The first parameter passed to the callback function when it is invoked
++** is a copy of the third parameter passed to sqlite3_wal_hook() when
++** registering the callback. ^The second is a copy of the database handle.
++** ^The third parameter is the name of the database that was written to -
++** either "main" or the name of an [ATTACH]-ed database. ^The fourth parameter
++** is the number of pages currently in the write-ahead log file,
++** including those that were just committed.
++**
++** The callback function should normally return [SQLITE_OK].  ^If an error
++** code is returned, that error will propagate back up through the
++** SQLite code base to cause the statement that provoked the callback
++** to report an error, though the commit will have still occurred. If the
++** callback returns [SQLITE_ROW] or [SQLITE_DONE], or if it returns a value
++** that does not correspond to any valid SQLite error code, the results
++** are undefined.
++**
++** A single database handle may have at most a single write-ahead log callback
++** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any
++** previously registered write-ahead log callback. ^The return value is
++** a copy of the third parameter from the previous call, if any, or 0.
++** ^Note that the [sqlite3_wal_autocheckpoint()] interface and the
++** [wal_autocheckpoint pragma] both invoke [sqlite3_wal_hook()] and will
++** overwrite any prior [sqlite3_wal_hook()] settings.
++*/
++SQLITE_API void *sqlite3_wal_hook(
++  sqlite3*,
++  int(*)(void *,sqlite3*,const char*,int),
++  void*
++);
++
++/*
++** CAPI3REF: Configure an auto-checkpoint
++** METHOD: sqlite3
++**
++** ^The [sqlite3_wal_autocheckpoint(D,N)] is a wrapper around
++** [sqlite3_wal_hook()] that causes any database on [database connection] D
++** to automatically [checkpoint]
++** after committing a transaction if there are N or
++** more frames in the [write-ahead log] file.  ^Passing zero or
++** a negative value as the nFrame parameter disables automatic
++** checkpoints entirely.
++**
++** ^The callback registered by this function replaces any existing callback
++** registered using [sqlite3_wal_hook()].  ^Likewise, registering a callback
++** using [sqlite3_wal_hook()] disables the automatic checkpoint mechanism
++** configured by this function.
++**
++** ^The [wal_autocheckpoint pragma] can be used to invoke this interface
++** from SQL.
++**
++** ^Checkpoints initiated by this mechanism are
++** [sqlite3_wal_checkpoint_v2|PASSIVE].
++**
++** ^Every new [database connection] defaults to having the auto-checkpoint
++** enabled with a threshold of 1000 or [SQLITE_DEFAULT_WAL_AUTOCHECKPOINT]
++** pages.  The use of this interface
++** is only necessary if the default setting is found to be suboptimal
++** for a particular application.
++*/
++SQLITE_API int sqlite3_wal_autocheckpoint(sqlite3 *db, int N);
++
++/*
++** CAPI3REF: Checkpoint a database
++** METHOD: sqlite3
++**
++** ^(The sqlite3_wal_checkpoint(D,X) is equivalent to
++** [sqlite3_wal_checkpoint_v2](D,X,[SQLITE_CHECKPOINT_PASSIVE],0,0).)^
++**
++** In brief, sqlite3_wal_checkpoint(D,X) causes the content in the
++** [write-ahead log] for database X on [database connection] D to be
++** transferred into the database file and for the write-ahead log to
++** be reset.  See the [checkpointing] documentation for addition
++** information.
++**
++** This interface used to be the only way to cause a checkpoint to
++** occur.  But then the newer and more powerful [sqlite3_wal_checkpoint_v2()]
++** interface was added.  This interface is retained for backwards
++** compatibility and as a convenience for applications that need to manually
++** start a callback but which do not need the full power (and corresponding
++** complication) of [sqlite3_wal_checkpoint_v2()].
++*/
++SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);
++
++/*
++** CAPI3REF: Checkpoint a database
++** METHOD: sqlite3
++**
++** ^(The sqlite3_wal_checkpoint_v2(D,X,M,L,C) interface runs a checkpoint
++** operation on database X of [database connection] D in mode M.  Status
++** information is written back into integers pointed to by L and C.)^
++** ^(The M parameter must be a valid [checkpoint mode]:)^
++**
++** 
      
++** 
      SQLITE_CHECKPOINT_PASSIVE
      
++**   ^Checkpoint as many frames as possible without waiting for any database
++**   readers or writers to finish, then sync the database file if all frames
++**   in the log were checkpointed. ^The [busy-handler callback]
++**   is never invoked in the SQLITE_CHECKPOINT_PASSIVE mode.
++**   ^On the other hand, passive mode might leave the checkpoint unfinished
++**   if there are concurrent readers or writers.
++**
++** 
      SQLITE_CHECKPOINT_FULL
      
++**   ^This mode blocks (it invokes the
++**   [sqlite3_busy_handler|busy-handler callback]) until there is no
++**   database writer and all readers are reading from the most recent database
++**   snapshot. ^It then checkpoints all frames in the log file and syncs the
++**   database file. ^This mode blocks new database writers while it is pending,
++**   but new database readers are allowed to continue unimpeded.
++**
++** 
      SQLITE_CHECKPOINT_RESTART
      
++**   ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition
++**   that after checkpointing the log file it blocks (calls the
++**   [busy-handler callback])
++**   until all readers are reading from the database file only. ^This ensures
++**   that the next writer will restart the log file from the beginning.
++**   ^Like SQLITE_CHECKPOINT_FULL, this mode blocks new
++**   database writer attempts while it is pending, but does not impede readers.
++**
++** 
      SQLITE_CHECKPOINT_TRUNCATE
      
++**   ^This mode works the same way as SQLITE_CHECKPOINT_RESTART with the
++**   addition that it also truncates the log file to zero bytes just prior
++**   to a successful return.
++** 
      
++**
++** ^If pnLog is not NULL, then *pnLog is set to the total number of frames in
++** the log file or to -1 if the checkpoint could not run because
++** of an error or because the database is not in [WAL mode]. ^If pnCkpt is not
++** NULL,then *pnCkpt is set to the total number of checkpointed frames in the
++** log file (including any that were already checkpointed before the function
++** was called) or to -1 if the checkpoint could not run due to an error or
++** because the database is not in WAL mode. ^Note that upon successful
++** completion of an SQLITE_CHECKPOINT_TRUNCATE, the log file will have been
++** truncated to zero bytes and so both *pnLog and *pnCkpt will be set to zero.
++**
++** ^All calls obtain an exclusive "checkpoint" lock on the database file. ^If
++** any other process is running a checkpoint operation at the same time, the
++** lock cannot be obtained and SQLITE_BUSY is returned. ^Even if there is a
++** busy-handler configured, it will not be invoked in this case.
++**
++** ^The SQLITE_CHECKPOINT_FULL, RESTART and TRUNCATE modes also obtain the
++** exclusive "writer" lock on the database file. ^If the writer lock cannot be
++** obtained immediately, and a busy-handler is configured, it is invoked and
++** the writer lock retried until either the busy-handler returns 0 or the lock
++** is successfully obtained. ^The busy-handler is also invoked while waiting for
++** database readers as described above. ^If the busy-handler returns 0 before
++** the writer lock is obtained or while waiting for database readers, the
++** checkpoint operation proceeds from that point in the same way as
++** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible
++** without blocking any further. ^SQLITE_BUSY is returned in this case.
++**
++** ^If parameter zDb is NULL or points to a zero length string, then the
++** specified operation is attempted on all WAL databases [attached] to
++** [database connection] db.  In this case the
++** values written to output parameters *pnLog and *pnCkpt are undefined. ^If
++** an SQLITE_BUSY error is encountered when processing one or more of the
++** attached WAL databases, the operation is still attempted on any remaining
++** attached databases and SQLITE_BUSY is returned at the end. ^If any other
++** error occurs while processing an attached database, processing is abandoned
++** and the error code is returned to the caller immediately. ^If no error
++** (SQLITE_BUSY or otherwise) is encountered while processing the attached
++** databases, SQLITE_OK is returned.
++**
++** ^If database zDb is the name of an attached database that is not in WAL
++** mode, SQLITE_OK is returned and both *pnLog and *pnCkpt set to -1. ^If
++** zDb is not NULL (or a zero length string) and is not the name of any
++** attached database, SQLITE_ERROR is returned to the caller.
++**
++** ^Unless it returns SQLITE_MISUSE,
++** the sqlite3_wal_checkpoint_v2() interface
++** sets the error information that is queried by
++** [sqlite3_errcode()] and [sqlite3_errmsg()].
++**
++** ^The [PRAGMA wal_checkpoint] command can be used to invoke this interface
++** from SQL.
++*/
++SQLITE_API int sqlite3_wal_checkpoint_v2(
++  sqlite3 *db,                    /* Database handle */
++  const char *zDb,                /* Name of attached database (or NULL) */
++  int eMode,                      /* SQLITE_CHECKPOINT_* value */
++  int *pnLog,                     /* OUT: Size of WAL log in frames */
++  int *pnCkpt                     /* OUT: Total number of frames checkpointed */
++);
++
++/*
++** CAPI3REF: Checkpoint Mode Values
++** KEYWORDS: {checkpoint mode}
++**
++** These constants define all valid values for the "checkpoint mode" passed
++** as the third parameter to the [sqlite3_wal_checkpoint_v2()] interface.
++** See the [sqlite3_wal_checkpoint_v2()] documentation for details on the
++** meaning of each of these checkpoint modes.
++*/
++#define SQLITE_CHECKPOINT_PASSIVE  0  /* Do as much as possible w/o blocking */
++#define SQLITE_CHECKPOINT_FULL     1  /* Wait for writers, then checkpoint */
++#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for readers */
++#define SQLITE_CHECKPOINT_TRUNCATE 3  /* Like RESTART but also truncate WAL */
++
++/*
++** CAPI3REF: Virtual Table Interface Configuration
++**
++** This function may be called by either the [xConnect] or [xCreate] method
++** of a [virtual table] implementation to configure
++** various facets of the virtual table interface.
++**
++** If this interface is invoked outside the context of an xConnect or
++** xCreate virtual table method then the behavior is undefined.
++**
++** In the call sqlite3_vtab_config(D,C,...) the D parameter is the
++** [database connection] in which the virtual table is being created and
++** which is passed in as the first argument to the [xConnect] or [xCreate]
++** method that is invoking sqlite3_vtab_config().  The C parameter is one
++** of the [virtual table configuration options].  The presence and meaning
++** of parameters after C depend on which [virtual table configuration option]
++** is used.
++*/
++SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
++
++/*
++** CAPI3REF: Virtual Table Configuration Options
++** KEYWORDS: {virtual table configuration options}
++** KEYWORDS: {virtual table configuration option}
++**
++** These macros define the various options to the
++** [sqlite3_vtab_config()] interface that [virtual table] implementations
++** can use to customize and optimize their behavior.
++**
++** 
      
++** [[SQLITE_VTAB_CONSTRAINT_SUPPORT]]
++** 
      SQLITE_VTAB_CONSTRAINT_SUPPORT
      
++** 
      Calls of the form
++** [sqlite3_vtab_config](db,SQLITE_VTAB_CONSTRAINT_SUPPORT,X) are supported,
++** where X is an integer.  If X is zero, then the [virtual table] whose
++** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
++** support constraints.  In this configuration (which is the default) if
++** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
++** statement is rolled back as if [ON CONFLICT | OR ABORT] had been
++** specified as part of the users SQL statement, regardless of the actual
++** ON CONFLICT mode specified.
++**
++** If X is non-zero, then the virtual table implementation guarantees
++** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
++** any modifications to internal or persistent data structures have been made.
++** If the [ON CONFLICT] mode is ABORT, FAIL, IGNORE or ROLLBACK, SQLite
++** is able to roll back a statement or database transaction, and abandon
++** or continue processing the current SQL statement as appropriate.
++** If the ON CONFLICT mode is REPLACE and the [xUpdate] method returns
++** [SQLITE_CONSTRAINT], SQLite handles this as if the ON CONFLICT mode
++** had been ABORT.
++**
++** Virtual table implementations that are required to handle OR REPLACE
++** must do so within the [xUpdate] method. If a call to the
++** [sqlite3_vtab_on_conflict()] function indicates that the current ON
++** CONFLICT policy is REPLACE, the virtual table implementation should
++** silently replace the appropriate rows within the xUpdate callback and
++** return SQLITE_OK. Or, if this is not possible, it may return
++** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT
++** constraint handling.
++** 
      
++**
++** [[SQLITE_VTAB_DIRECTONLY]]
      SQLITE_VTAB_DIRECTONLY
      
++** 
      Calls of the form
++** [sqlite3_vtab_config](db,SQLITE_VTAB_DIRECTONLY) from within the
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
++** prohibits that virtual table from being used from within triggers and
++** views.
++** 
      
++**
++** [[SQLITE_VTAB_INNOCUOUS]]
      SQLITE_VTAB_INNOCUOUS
      
++** 
      Calls of the form
++** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
++** identify that virtual table as being safe to use from within triggers
++** and views.  Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
++** virtual table can do no serious harm even if it is controlled by a
++** malicious hacker.  Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
++** flag unless absolutely necessary.
++** 
      
++**
++** [[SQLITE_VTAB_USES_ALL_SCHEMAS]]
      SQLITE_VTAB_USES_ALL_SCHEMAS
      
++** 
      Calls of the form
++** [sqlite3_vtab_config](db,SQLITE_VTAB_USES_ALL_SCHEMA) from within the
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
++** instruct the query planner to begin at least a read transaction on
++** all schemas ("main", "temp", and any ATTACH-ed databases) whenever the
++** virtual table is used.
++** 
      
++** 
      
++*/
++#define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
++#define SQLITE_VTAB_INNOCUOUS          2
++#define SQLITE_VTAB_DIRECTONLY         3
++#define SQLITE_VTAB_USES_ALL_SCHEMAS   4
++
++/*
++** CAPI3REF: Determine The Virtual Table Conflict Policy
++**
++** This function may only be called from within a call to the [xUpdate] method
++** of a [virtual table] implementation for an INSERT or UPDATE operation. ^The
++** value returned is one of [SQLITE_ROLLBACK], [SQLITE_IGNORE], [SQLITE_FAIL],
++** [SQLITE_ABORT], or [SQLITE_REPLACE], according to the [ON CONFLICT] mode
++** of the SQL statement that triggered the call to the [xUpdate] method of the
++** [virtual table].
++*/
++SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
++
++/*
++** CAPI3REF: Determine If Virtual Table Column Access Is For UPDATE
++**
++** If the sqlite3_vtab_nochange(X) routine is called within the [xColumn]
++** method of a [virtual table], then it might return true if the
++** column is being fetched as part of an UPDATE operation during which the
++** column value will not change.  The virtual table implementation can use
++** this hint as permission to substitute a return value that is less
++** expensive to compute and that the corresponding
++** [xUpdate] method understands as a "no-change" value.
++**
++** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
++** the column is not changed by the UPDATE statement, then the xColumn
++** method can optionally return without setting a result, without calling
++** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
++** In that case, [sqlite3_value_nochange(X)] will return true for the
++** same column in the [xUpdate] method.
++**
++** The sqlite3_vtab_nochange() routine is an optimization.  Virtual table
++** implementations should continue to give a correct answer even if the
++** sqlite3_vtab_nochange() interface were to always return false.  In the
++** current implementation, the sqlite3_vtab_nochange() interface does always
++** returns false for the enhanced [UPDATE FROM] statement.
++*/
++SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);
++
++/*
++** CAPI3REF: Determine The Collation For a Virtual Table Constraint
++** METHOD: sqlite3_index_info
++**
++** This function may only be called from within a call to the [xBestIndex]
++** method of a [virtual table].  This function returns a pointer to a string
++** that is the name of the appropriate collation sequence to use for text
++** comparisons on the constraint identified by its arguments.
++**
++** The first argument must be the pointer to the [sqlite3_index_info] object
++** that is the first parameter to the xBestIndex() method. The second argument
++** must be an index into the aConstraint[] array belonging to the
++** sqlite3_index_info structure passed to xBestIndex.
++**
++** Important:
++** The first parameter must be the same pointer that is passed into the
++** xBestMethod() method.  The first parameter may not be a pointer to a
++** different [sqlite3_index_info] object, even an exact copy.
++**
++** The return value is computed as follows:
++**
++** 
        
++** 
      1.  If the constraint comes from a WHERE clause expression that contains
++**         a [COLLATE operator], then the name of the collation specified by
++**         that COLLATE operator is returned.
++** 
      2.  If there is no COLLATE operator, but the column that is the subject
++**         of the constraint specifies an alternative collating sequence via
++**         a [COLLATE clause] on the column definition within the CREATE TABLE
++**         statement that was passed into [sqlite3_declare_vtab()], then the
++**         name of that alternative collating sequence is returned.
++** 
      3.  Otherwise, "BINARY" is returned.
++** 
      
++*/
++SQLITE_API const char *sqlite3_vtab_collation(sqlite3_index_info*,int);
++
++/*
++** CAPI3REF: Determine if a virtual table query is DISTINCT
++** METHOD: sqlite3_index_info
++**
++** This API may only be used from within an [xBestIndex|xBestIndex method]
++** of a [virtual table] implementation. The result of calling this
++** interface from outside of xBestIndex() is undefined and probably harmful.
++**
++** ^The sqlite3_vtab_distinct() interface returns an integer between 0 and
++** 3.  The integer returned by sqlite3_vtab_distinct()
++** gives the virtual table additional information about how the query
++** planner wants the output to be ordered. As long as the virtual table
++** can meet the ordering requirements of the query planner, it may set
++** the "orderByConsumed" flag.
++**
++** 
      1. 
++** ^If the sqlite3_vtab_distinct() interface returns 0, that means
++** that the query planner needs the virtual table to return all rows in the
++** sort order defined by the "nOrderBy" and "aOrderBy" fields of the
++** [sqlite3_index_info] object.  This is the default expectation.  If the
++** virtual table outputs all rows in sorted order, then it is always safe for
++** the xBestIndex method to set the "orderByConsumed" flag, regardless of
++** the return value from sqlite3_vtab_distinct().
++** 
      2. 
++** ^(If the sqlite3_vtab_distinct() interface returns 1, that means
++** that the query planner does not need the rows to be returned in sorted order
++** as long as all rows with the same values in all columns identified by the
++** "aOrderBy" field are adjacent.)^  This mode is used when the query planner
++** is doing a GROUP BY.
++** 
      3. 
++** ^(If the sqlite3_vtab_distinct() interface returns 2, that means
++** that the query planner does not need the rows returned in any particular
++** order, as long as rows with the same values in all "aOrderBy" columns
++** are adjacent.)^  ^(Furthermore, only a single row for each particular
++** combination of values in the columns identified by the "aOrderBy" field
++** needs to be returned.)^  ^It is always ok for two or more rows with the same
++** values in all "aOrderBy" columns to be returned, as long as all such rows
++** are adjacent.  ^The virtual table may, if it chooses, omit extra rows
++** that have the same value for all columns identified by "aOrderBy".
++** ^However omitting the extra rows is optional.
++** This mode is used for a DISTINCT query.
++** 
      4. 
++** ^(If the sqlite3_vtab_distinct() interface returns 3, that means
++** that the query planner needs only distinct rows but it does need the
++** rows to be sorted.)^ ^The virtual table implementation is free to omit
++** rows that are identical in all aOrderBy columns, if it wants to, but
++** it is not required to omit any rows.  This mode is used for queries
++** that have both DISTINCT and ORDER BY clauses.
++** 
      
++**
++** ^For the purposes of comparing virtual table output values to see if the
++** values are same value for sorting purposes, two NULL values are considered
++** to be the same.  In other words, the comparison operator is "IS"
++** (or "IS NOT DISTINCT FROM") and not "==".
++**
++** If a virtual table implementation is unable to meet the requirements
++** specified above, then it must not set the "orderByConsumed" flag in the
++** [sqlite3_index_info] object or an incorrect answer may result.
++**
++** ^A virtual table implementation is always free to return rows in any order
++** it wants, as long as the "orderByConsumed" flag is not set.  ^When the
++** the "orderByConsumed" flag is unset, the query planner will add extra
++** [bytecode] to ensure that the final results returned by the SQL query are
++** ordered correctly.  The use of the "orderByConsumed" flag and the
++** sqlite3_vtab_distinct() interface is merely an optimization.  ^Careful
++** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
++** flag might help queries against a virtual table to run faster.  Being
++** overly aggressive and setting the "orderByConsumed" flag when it is not
++** valid to do so, on the other hand, might cause SQLite to return incorrect
++** results.
++*/
++SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*);
++
++/*
++** CAPI3REF: Identify and handle IN constraints in xBestIndex
++**
++** This interface may only be used from within an
++** [xBestIndex|xBestIndex() method] of a [virtual table] implementation.
++** The result of invoking this interface from any other context is
++** undefined and probably harmful.
++**
++** ^(A constraint on a virtual table of the form
++** "[IN operator|column IN (...)]" is
++** communicated to the xBestIndex method as a
++** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^  If xBestIndex wants to use
++** this constraint, it must set the corresponding
++** aConstraintUsage[].argvIndex to a positive integer.  ^(Then, under
++** the usual mode of handling IN operators, SQLite generates [bytecode]
++** that invokes the [xFilter|xFilter() method] once for each value
++** on the right-hand side of the IN operator.)^  Thus the virtual table
++** only sees a single value from the right-hand side of the IN operator
++** at a time.
++**
++** In some cases, however, it would be advantageous for the virtual
++** table to see all values on the right-hand of the IN operator all at
++** once.  The sqlite3_vtab_in() interfaces facilitates this in two ways:
++**
++** 
        
++** 
      1. 
++**   ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero)
++**   if and only if the [sqlite3_index_info|P->aConstraint][N] constraint
++**   is an [IN operator] that can be processed all at once.  ^In other words,
++**   sqlite3_vtab_in() with -1 in the third argument is a mechanism
++**   by which the virtual table can ask SQLite if all-at-once processing
++**   of the IN operator is even possible.
++**
++** 
      2. 
++**   ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates
++**   to SQLite that the virtual table does or does not want to process
++**   the IN operator all-at-once, respectively.  ^Thus when the third
++**   parameter (F) is non-negative, this interface is the mechanism by
++**   which the virtual table tells SQLite how it wants to process the
++**   IN operator.
++** 
      
++**
++** ^The sqlite3_vtab_in(P,N,F) interface can be invoked multiple times
++** within the same xBestIndex method call.  ^For any given P,N pair,
++** the return value from sqlite3_vtab_in(P,N,F) will always be the same
++** within the same xBestIndex call.  ^If the interface returns true
++** (non-zero), that means that the constraint is an IN operator
++** that can be processed all-at-once.  ^If the constraint is not an IN
++** operator or cannot be processed all-at-once, then the interface returns
++** false.
++**
++** ^(All-at-once processing of the IN operator is selected if both of the
++** following conditions are met:
++**
++** 
        
++** 
      1.  The P->aConstraintUsage[N].argvIndex value is set to a positive
++** integer.  This is how the virtual table tells SQLite that it wants to
++** use the N-th constraint.
++**
++** 
      2.  The last call to sqlite3_vtab_in(P,N,F) for which F was
++** non-negative had F>=1.
++** 
      )^
++**
++** ^If either or both of the conditions above are false, then SQLite uses
++** the traditional one-at-a-time processing strategy for the IN constraint.
++** ^If both conditions are true, then the argvIndex-th parameter to the
++** xFilter method will be an [sqlite3_value] that appears to be NULL,
++** but which can be passed to [sqlite3_vtab_in_first()] and
++** [sqlite3_vtab_in_next()] to find all values on the right-hand side
++** of the IN constraint.
++*/
++SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle);
++
++/*
++** CAPI3REF: Find all elements on the right-hand side of an IN constraint.
++**
++** These interfaces are only useful from within the
++** [xFilter|xFilter() method] of a [virtual table] implementation.
++** The result of invoking these interfaces from any other context
++** is undefined and probably harmful.
++**
++** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
++** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
++** xFilter method which invokes these routines, and specifically
++** a parameter that was previously selected for all-at-once IN constraint
++** processing use the [sqlite3_vtab_in()] interface in the
++** [xBestIndex|xBestIndex method].  ^(If the X parameter is not
++** an xFilter argument that was selected for all-at-once IN constraint
++** processing, then these routines return [SQLITE_ERROR].)^
++**
++** ^(Use these routines to access all values on the right-hand side
++** of the IN constraint using code like the following:
++**
++** 
      ++**    for(rc=sqlite3_vtab_in_first(pList, &pVal);
++**        rc==SQLITE_OK && pVal;
++**        rc=sqlite3_vtab_in_next(pList, &pVal)
++**    ){
++**      // do something with pVal
++**    }
++**    if( rc!=SQLITE_OK ){
++**      // an error has occurred
++**    }
++** 
      )^
++**
++** ^On success, the sqlite3_vtab_in_first(X,P) and sqlite3_vtab_in_next(X,P)
++** routines return SQLITE_OK and set *P to point to the first or next value
++** on the RHS of the IN constraint.  ^If there are no more values on the
++** right hand side of the IN constraint, then *P is set to NULL and these
++** routines return [SQLITE_DONE].  ^The return value might be
++** some other value, such as SQLITE_NOMEM, in the event of a malfunction.
++**
++** The *ppOut values returned by these routines are only valid until the
++** next call to either of these routines or until the end of the xFilter
++** method from which these routines were called.  If the virtual table
++** implementation needs to retain the *ppOut values for longer, it must make
++** copies.  The *ppOut values are [protected sqlite3_value|protected].
++*/
++SQLITE_API int sqlite3_vtab_in_first(sqlite3_value *pVal, sqlite3_value **ppOut);
++SQLITE_API int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut);
++
++/*
++** CAPI3REF: Constraint values in xBestIndex()
++** METHOD: sqlite3_index_info
++**
++** This API may only be used from within the [xBestIndex|xBestIndex method]
++** of a [virtual table] implementation. The result of calling this interface
++** from outside of an xBestIndex method are undefined and probably harmful.
++**
++** ^When the sqlite3_vtab_rhs_value(P,J,V) interface is invoked from within
++** the [xBestIndex] method of a [virtual table] implementation, with P being
++** a copy of the [sqlite3_index_info] object pointer passed into xBestIndex and
++** J being a 0-based index into P->aConstraint[], then this routine
++** attempts to set *V to the value of the right-hand operand of
++** that constraint if the right-hand operand is known.  ^If the
++** right-hand operand is not known, then *V is set to a NULL pointer.
++** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
++** and only if *V is set to a value.  ^The sqlite3_vtab_rhs_value(P,J,V)
++** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
++** constraint is not available.  ^The sqlite3_vtab_rhs_value() interface
++** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
++** something goes wrong.
++**
++** The sqlite3_vtab_rhs_value() interface is usually only successful if
++** the right-hand operand of a constraint is a literal value in the original
++** SQL statement.  If the right-hand operand is an expression or a reference
++** to some other column or a [host parameter], then sqlite3_vtab_rhs_value()
++** will probably return [SQLITE_NOTFOUND].
++**
++** ^(Some constraints, such as [SQLITE_INDEX_CONSTRAINT_ISNULL] and
++** [SQLITE_INDEX_CONSTRAINT_ISNOTNULL], have no right-hand operand.  For such
++** constraints, sqlite3_vtab_rhs_value() always returns SQLITE_NOTFOUND.)^
++**
++** ^The [sqlite3_value] object returned in *V is a protected sqlite3_value
++** and remains valid for the duration of the xBestIndex method call.
++** ^When xBestIndex returns, the sqlite3_value object returned by
++** sqlite3_vtab_rhs_value() is automatically deallocated.
++**
++** The "_rhs_" in the name of this routine is an abbreviation for
++** "Right-Hand Side".
++*/
++SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **ppVal);
++
++/*
++** CAPI3REF: Conflict resolution modes
++** KEYWORDS: {conflict resolution mode}
++**
++** These constants are returned by [sqlite3_vtab_on_conflict()] to
++** inform a [virtual table] implementation what the [ON CONFLICT] mode
++** is for the SQL statement being evaluated.
++**
++** Note that the [SQLITE_IGNORE] constant is also used as a potential
++** return value from the [sqlite3_set_authorizer()] callback and that
++** [SQLITE_ABORT] is also a [result code].
++*/
++#define SQLITE_ROLLBACK 1
++/* #define SQLITE_IGNORE 2 // Also used by sqlite3_authorizer() callback */
++#define SQLITE_FAIL     3
++/* #define SQLITE_ABORT 4  // Also an error code */
++#define SQLITE_REPLACE  5
++
++/*
++** CAPI3REF: Prepared Statement Scan Status Opcodes
++** KEYWORDS: {scanstatus options}
++**
++** The following constants can be used for the T parameter to the
++** [sqlite3_stmt_scanstatus(S,X,T,V)] interface.  Each constant designates a
++** different metric for sqlite3_stmt_scanstatus() to return.
++**
++** When the value returned to V is a string, space to hold that string is
++** managed by the prepared statement S and will be automatically freed when
++** S is finalized.
++**
++** Not all values are available for all query elements. When a value is
++** not available, the output variable is set to -1 if the value is numeric,
++** or to NULL if it is a string (SQLITE_SCANSTAT_NAME).
++**
++** 
      
++** [[SQLITE_SCANSTAT_NLOOP]] 
      SQLITE_SCANSTAT_NLOOP
      
++** 
      ^The [sqlite3_int64] variable pointed to by the V parameter will be
++** set to the total number of times that the X-th loop has run.
      
++**
++** [[SQLITE_SCANSTAT_NVISIT]] 
      SQLITE_SCANSTAT_NVISIT
      
++** 
      ^The [sqlite3_int64] variable pointed to by the V parameter will be set
++** to the total number of rows examined by all iterations of the X-th loop.
      
++**
++** [[SQLITE_SCANSTAT_EST]] 
      SQLITE_SCANSTAT_EST
      
++** 
      ^The "double" variable pointed to by the V parameter will be set to the
++** query planner's estimate for the average number of rows output from each
++** iteration of the X-th loop.  If the query planner's estimates was accurate,
++** then this value will approximate the quotient NVISIT/NLOOP and the
++** product of this value for all prior loops with the same SELECTID will
++** be the NLOOP value for the current loop.
++**
++** [[SQLITE_SCANSTAT_NAME]] 
      SQLITE_SCANSTAT_NAME
      
++** 
      ^The "const char *" variable pointed to by the V parameter will be set
++** to a zero-terminated UTF-8 string containing the name of the index or table
++** used for the X-th loop.
++**
++** [[SQLITE_SCANSTAT_EXPLAIN]] 
      SQLITE_SCANSTAT_EXPLAIN
      
++** 
      ^The "const char *" variable pointed to by the V parameter will be set
++** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
++** description for the X-th loop.
++**
++** [[SQLITE_SCANSTAT_SELECTID]] 
      SQLITE_SCANSTAT_SELECTID
      
++** 
      ^The "int" variable pointed to by the V parameter will be set to the
++** id for the X-th query plan element. The id value is unique within the
++** statement. The select-id is the same value as is output in the first
++** column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_PARENTID]] 
      SQLITE_SCANSTAT_PARENTID
      
++** 
      The "int" variable pointed to by the V parameter will be set to the
++** the id of the parent of the current query element, if applicable, or
++** to zero if the query element has no parent. This is the same value as
++** returned in the second column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_NCYCLE]] 
      SQLITE_SCANSTAT_NCYCLE
      
++** 
      The sqlite3_int64 output value is set to the number of cycles,
++** according to the processor time-stamp counter, that elapsed while the
++** query element was being processed. This value is not available for
++** all query elements - if it is unavailable the output variable is
++** set to -1.
++** 
      
++*/
++#define SQLITE_SCANSTAT_NLOOP    0
++#define SQLITE_SCANSTAT_NVISIT   1
++#define SQLITE_SCANSTAT_EST      2
++#define SQLITE_SCANSTAT_NAME     3
++#define SQLITE_SCANSTAT_EXPLAIN  4
++#define SQLITE_SCANSTAT_SELECTID 5
++#define SQLITE_SCANSTAT_PARENTID 6
++#define SQLITE_SCANSTAT_NCYCLE   7
++
++/*
++** CAPI3REF: Prepared Statement Scan Status
++** METHOD: sqlite3_stmt
++**
++** These interfaces return information about the predicted and measured
++** performance for pStmt.  Advanced applications can use this
++** interface to compare the predicted and the measured performance and
++** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
++**
++** Since this interface is expected to be rarely used, it is only
++** available if SQLite is compiled using the [SQLITE_ENABLE_STMT_SCANSTATUS]
++** compile-time option.
++**
++** The "iScanStatusOp" parameter determines which status information to return.
++** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
++** of this interface is undefined. ^The requested measurement is written into
++** a variable pointed to by the "pOut" parameter.
++**
++** The "flags" parameter must be passed a mask of flags. At present only
++** one flag is defined - SQLITE_SCANSTAT_COMPLEX. If SQLITE_SCANSTAT_COMPLEX
++** is specified, then status information is available for all elements
++** of a query plan that are reported by "EXPLAIN QUERY PLAN" output. If
++** SQLITE_SCANSTAT_COMPLEX is not specified, then only query plan elements
++** that correspond to query loops (the "SCAN..." and "SEARCH..." elements of
++** the EXPLAIN QUERY PLAN output) are available. Invoking API
++** sqlite3_stmt_scanstatus() is equivalent to calling
++** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
++**
++** Parameter "idx" identifies the specific query element to retrieve statistics
++** for. Query elements are numbered starting from zero. A value of -1 may be
++** to query for statistics regarding the entire query. ^If idx is out of range
++** - less than -1 or greater than or equal to the total number of query
++** elements used to implement the statement - a non-zero value is returned and
++** the variable that pOut points to is unchanged.
++**
++** See also: [sqlite3_stmt_scanstatus_reset()]
++*/
++SQLITE_API int sqlite3_stmt_scanstatus(
++  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
++  int idx,                  /* Index of loop to report on */
++  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
++  void *pOut                /* Result written here */
++);
++SQLITE_API int sqlite3_stmt_scanstatus_v2(
++  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
++  int idx,                  /* Index of loop to report on */
++  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
++  int flags,                /* Mask of flags defined below */
++  void *pOut                /* Result written here */
++);
++
++/*
++** CAPI3REF: Prepared Statement Scan Status
++** KEYWORDS: {scan status flags}
++*/
++#define SQLITE_SCANSTAT_COMPLEX 0x0001
++
++/*
++** CAPI3REF: Zero Scan-Status Counters
++** METHOD: sqlite3_stmt
++**
++** ^Zero all [sqlite3_stmt_scanstatus()] related event counters.
++**
++** This API is only available if the library is built with pre-processor
++** symbol [SQLITE_ENABLE_STMT_SCANSTATUS] defined.
++*/
++SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
++
++/*
++** CAPI3REF: Flush caches to disk mid-transaction
++** METHOD: sqlite3
++**
++** ^If a write-transaction is open on [database connection] D when the
++** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
++** pages in the pager-cache that are not currently in use are written out
++** to disk. A dirty page may be in use if a database cursor created by an
++** active SQL statement is reading from it, or if it is page 1 of a database
++** file (page 1 is always "in use").  ^The [sqlite3_db_cacheflush(D)]
++** interface flushes caches for all schemas - "main", "temp", and
++** any [attached] databases.
++**
++** ^If this function needs to obtain extra database locks before dirty pages
++** can be flushed to disk, it does so. ^If those locks cannot be obtained
++** immediately and there is a busy-handler callback configured, it is invoked
++** in the usual manner. ^If the required lock still cannot be obtained, then
++** the database is skipped and an attempt made to flush any dirty pages
++** belonging to the next (if any) database. ^If any databases are skipped
++** because locks cannot be obtained, but no other error occurs, this
++** function returns SQLITE_BUSY.
++**
++** ^If any other error occurs while flushing dirty pages to disk (for
++** example an IO error or out-of-memory condition), then processing is
++** abandoned and an SQLite [error code] is returned to the caller immediately.
++**
++** ^Otherwise, if no error occurs, [sqlite3_db_cacheflush()] returns SQLITE_OK.
++**
++** ^This function does not set the database handle error code or message
++** returned by the [sqlite3_errcode()] and [sqlite3_errmsg()] functions.
++*/
++SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
++
++/*
++** CAPI3REF: The pre-update hook.
++** METHOD: sqlite3
++**
++** ^These interfaces are only available if SQLite is compiled using the
++** [SQLITE_ENABLE_PREUPDATE_HOOK] compile-time option.
++**
++** ^The [sqlite3_preupdate_hook()] interface registers a callback function
++** that is invoked prior to each [INSERT], [UPDATE], and [DELETE] operation
++** on a database table.
++** ^At most one preupdate hook may be registered at a time on a single
++** [database connection]; each call to [sqlite3_preupdate_hook()] overrides
++** the previous setting.
++** ^The preupdate hook is disabled by invoking [sqlite3_preupdate_hook()]
++** with a NULL pointer as the second parameter.
++** ^The third parameter to [sqlite3_preupdate_hook()] is passed through as
++** the first parameter to callbacks.
++**
++** ^The preupdate hook only fires for changes to real database tables; the
++** preupdate hook is not invoked for changes to [virtual tables] or to
++** system tables like sqlite_sequence or sqlite_stat1.
++**
++** ^The second parameter to the preupdate callback is a pointer to
++** the [database connection] that registered the preupdate hook.
++** ^The third parameter to the preupdate callback is one of the constants
++** [SQLITE_INSERT], [SQLITE_DELETE], or [SQLITE_UPDATE] to identify the
++** kind of update operation that is about to occur.
++** ^(The fourth parameter to the preupdate callback is the name of the
++** database within the database connection that is being modified.  This
++** will be "main" for the main database or "temp" for TEMP tables or
++** the name given after the AS keyword in the [ATTACH] statement for attached
++** databases.)^
++** ^The fifth parameter to the preupdate callback is the name of the
++** table that is being modified.
++**
++** For an UPDATE or DELETE operation on a [rowid table], the sixth
++** parameter passed to the preupdate callback is the initial [rowid] of the
++** row being modified or deleted. For an INSERT operation on a rowid table,
++** or any operation on a WITHOUT ROWID table, the value of the sixth
++** parameter is undefined. For an INSERT or UPDATE on a rowid table the
++** seventh parameter is the final rowid value of the row being inserted
++** or updated. The value of the seventh parameter passed to the callback
++** function is not defined for operations on WITHOUT ROWID tables, or for
++** DELETE operations on rowid tables.
++**
++** ^The sqlite3_preupdate_hook(D,C,P) function returns the P argument from
++** the previous call on the same [database connection] D, or NULL for
++** the first call on D.
++**
++** The [sqlite3_preupdate_old()], [sqlite3_preupdate_new()],
++** [sqlite3_preupdate_count()], and [sqlite3_preupdate_depth()] interfaces
++** provide additional information about a preupdate event. These routines
++** may only be called from within a preupdate callback.  Invoking any of
++** these routines from outside of a preupdate callback or with a
++** [database connection] pointer that is different from the one supplied
++** to the preupdate callback results in undefined and probably undesirable
++** behavior.
++**
++** ^The [sqlite3_preupdate_count(D)] interface returns the number of columns
++** in the row that is being inserted, updated, or deleted.
++**
++** ^The [sqlite3_preupdate_old(D,N,P)] interface writes into P a pointer to
++** a [protected sqlite3_value] that contains the value of the Nth column of
++** the table row before it is updated.  The N parameter must be between 0
++** and one less than the number of columns or the behavior will be
++** undefined. This must only be used within SQLITE_UPDATE and SQLITE_DELETE
++** preupdate callbacks; if it is used by an SQLITE_INSERT callback then the
++** behavior is undefined.  The [sqlite3_value] that P points to
++** will be destroyed when the preupdate callback returns.
++**
++** ^The [sqlite3_preupdate_new(D,N,P)] interface writes into P a pointer to
++** a [protected sqlite3_value] that contains the value of the Nth column of
++** the table row after it is updated.  The N parameter must be between 0
++** and one less than the number of columns or the behavior will be
++** undefined. This must only be used within SQLITE_INSERT and SQLITE_UPDATE
++** preupdate callbacks; if it is used by an SQLITE_DELETE callback then the
++** behavior is undefined.  The [sqlite3_value] that P points to
++** will be destroyed when the preupdate callback returns.
++**
++** ^The [sqlite3_preupdate_depth(D)] interface returns 0 if the preupdate
++** callback was invoked as a result of a direct insert, update, or delete
++** operation; or 1 for inserts, updates, or deletes invoked by top-level
++** triggers; or 2 for changes resulting from triggers called by top-level
++** triggers; and so forth.
++**
++** When the [sqlite3_blob_write()] API is used to update a blob column,
++** the pre-update hook is invoked with SQLITE_DELETE. This is because the
++** in this case the new values are not available. In this case, when a
++** callback made with op==SQLITE_DELETE is actually a write using the
++** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
++** the index of the column being written. In other cases, where the
++** pre-update hook is being invoked for some other reason, including a
++** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
++**
++** See also:  [sqlite3_update_hook()]
++*/
++#if defined(SQLITE_ENABLE_PREUPDATE_HOOK)
++SQLITE_API void *sqlite3_preupdate_hook(
++  sqlite3 *db,
++  void(*xPreUpdate)(
++    void *pCtx,                   /* Copy of third arg to preupdate_hook() */
++    sqlite3 *db,                  /* Database handle */
++    int op,                       /* SQLITE_UPDATE, DELETE or INSERT */
++    char const *zDb,              /* Database name */
++    char const *zName,            /* Table name */
++    sqlite3_int64 iKey1,          /* Rowid of row about to be deleted/updated */
++    sqlite3_int64 iKey2           /* New rowid value (for a rowid UPDATE) */
++  ),
++  void*
++);
++SQLITE_API int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **);
++SQLITE_API int sqlite3_preupdate_count(sqlite3 *);
++SQLITE_API int sqlite3_preupdate_depth(sqlite3 *);
++SQLITE_API int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);
++SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3 *);
++#endif
++
++/*
++** CAPI3REF: Low-level system error code
++** METHOD: sqlite3
++**
++** ^Attempt to return the underlying operating system error code or error
++** number that caused the most recent I/O error or failure to open a file.
++** The return value is OS-dependent.  For example, on unix systems, after
++** [sqlite3_open_v2()] returns [SQLITE_CANTOPEN], this interface could be
++** called to get back the underlying "errno" that caused the problem, such
++** as ENOSPC, EAUTH, EISDIR, and so forth.
++*/
++SQLITE_API int sqlite3_system_errno(sqlite3*);
++
++/*
++** CAPI3REF: Database Snapshot
++** KEYWORDS: {snapshot} {sqlite3_snapshot}
++**
++** An instance of the snapshot object records the state of a [WAL mode]
++** database for some specific point in history.
++**
++** In [WAL mode], multiple [database connections] that are open on the
++** same database file can each be reading a different historical version
++** of the database file.  When a [database connection] begins a read
++** transaction, that connection sees an unchanging copy of the database
++** as it existed for the point in time when the transaction first started.
++** Subsequent changes to the database from other connections are not seen
++** by the reader until a new read transaction is started.
++**
++** The sqlite3_snapshot object records state information about an historical
++** version of the database file so that it is possible to later open a new read
++** transaction that sees that historical version of the database rather than
++** the most recent version.
++*/
++typedef struct sqlite3_snapshot {
++  unsigned char hidden[48];
++} sqlite3_snapshot;
++
++/*
++** CAPI3REF: Record A Database Snapshot
++** CONSTRUCTOR: sqlite3_snapshot
++**
++** ^The [sqlite3_snapshot_get(D,S,P)] interface attempts to make a
++** new [sqlite3_snapshot] object that records the current state of
++** schema S in database connection D.  ^On success, the
++** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
++** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
++** If there is not already a read-transaction open on schema S when
++** this function is called, one is opened automatically.
++**
++** The following must be true for this function to succeed. If any of
++** the following statements are false when sqlite3_snapshot_get() is
++** called, SQLITE_ERROR is returned. The final value of *P is undefined
++** in this case.
++**
++** 
        
++**   
      •  The database handle must not be in [autocommit mode].
++**
++**   
      •  Schema S of [database connection] D must be a [WAL mode] database.
++**
++**   
      •  There must not be a write transaction open on schema S of database
++**        connection D.
++**
++**   
      •  One or more transactions must have been written to the current wal
++**        file since it was created on disk (by any connection). This means
++**        that a snapshot cannot be taken on a wal mode database with no wal
++**        file immediately after it is first opened. At least one transaction
++**        must be written to it first.
++** 
      
++**
++** This function may also return SQLITE_NOMEM.  If it is called with the
++** database handle in autocommit mode but fails for some other reason,
++** whether or not a read transaction is opened on schema S is undefined.
++**
++** The [sqlite3_snapshot] object returned from a successful call to
++** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
++** to avoid a memory leak.
++**
++** The [sqlite3_snapshot_get()] interface is only available when the
++** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
++*/
++SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(
++  sqlite3 *db,
++  const char *zSchema,
++  sqlite3_snapshot **ppSnapshot
++);
++
++/*
++** CAPI3REF: Start a read transaction on an historical snapshot
++** METHOD: sqlite3_snapshot
++**
++** ^The [sqlite3_snapshot_open(D,S,P)] interface either starts a new read
++** transaction or upgrades an existing one for schema S of
++** [database connection] D such that the read transaction refers to
++** historical [snapshot] P, rather than the most recent change to the
++** database. ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK
++** on success or an appropriate [error code] if it fails.
++**
++** ^In order to succeed, the database connection must not be in
++** [autocommit mode] when [sqlite3_snapshot_open(D,S,P)] is called. If there
++** is already a read transaction open on schema S, then the database handle
++** must have no active statements (SELECT statements that have been passed
++** to sqlite3_step() but not sqlite3_reset() or sqlite3_finalize()).
++** SQLITE_ERROR is returned if either of these conditions is violated, or
++** if schema S does not exist, or if the snapshot object is invalid.
++**
++** ^A call to sqlite3_snapshot_open() will fail to open if the specified
++** snapshot has been overwritten by a [checkpoint]. In this case
++** SQLITE_ERROR_SNAPSHOT is returned.
++**
++** If there is already a read transaction open when this function is
++** invoked, then the same read transaction remains open (on the same
++** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
++** is returned. If another error code - for example SQLITE_PROTOCOL or an
++** SQLITE_IOERR error code - is returned, then the final state of the
++** read transaction is undefined. If SQLITE_OK is returned, then the
++** read transaction is now open on database snapshot P.
++**
++** ^(A call to [sqlite3_snapshot_open(D,S,P)] will fail if the
++** database connection D does not know that the database file for
++** schema S is in [WAL mode].  A database connection might not know
++** that the database file is in [WAL mode] if there has been no prior
++** I/O on that database connection, or if the database entered [WAL mode]
++** after the most recent I/O on the database connection.)^
++** (Hint: Run "[PRAGMA application_id]" against a newly opened
++** database connection in order to make it ready to use snapshots.)
++**
++** The [sqlite3_snapshot_open()] interface is only available when the
++** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
++*/
++SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(
++  sqlite3 *db,
++  const char *zSchema,
++  sqlite3_snapshot *pSnapshot
++);
++
++/*
++** CAPI3REF: Destroy a snapshot
++** DESTRUCTOR: sqlite3_snapshot
++**
++** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
++** The application must eventually free every [sqlite3_snapshot] object
++** using this routine to avoid a memory leak.
++**
++** The [sqlite3_snapshot_free()] interface is only available when the
++** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
++*/
++SQLITE_API SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);
++
++/*
++** CAPI3REF: Compare the ages of two snapshot handles.
++** METHOD: sqlite3_snapshot
++**
++** The sqlite3_snapshot_cmp(P1, P2) interface is used to compare the ages
++** of two valid snapshot handles.
++**
++** If the two snapshot handles are not associated with the same database
++** file, the result of the comparison is undefined.
++**
++** Additionally, the result of the comparison is only valid if both of the
++** snapshot handles were obtained by calling sqlite3_snapshot_get() since the
++** last time the wal file was deleted. The wal file is deleted when the
++** database is changed back to rollback mode or when the number of database
++** clients drops to zero. If either snapshot handle was obtained before the
++** wal file was last deleted, the value returned by this function
++** is undefined.
++**
++** Otherwise, this API returns a negative value if P1 refers to an older
++** snapshot than P2, zero if the two handles refer to the same database
++** snapshot, and a positive value if P1 is a newer snapshot than P2.
++**
++** This interface is only available if SQLite is compiled with the
++** [SQLITE_ENABLE_SNAPSHOT] option.
++*/
++SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
++  sqlite3_snapshot *p1,
++  sqlite3_snapshot *p2
++);
++
++/*
++** CAPI3REF: Recover snapshots from a wal file
++** METHOD: sqlite3_snapshot
++**
++** If a [WAL file] remains on disk after all database connections close
++** (either through the use of the [SQLITE_FCNTL_PERSIST_WAL] [file control]
++** or because the last process to have the database opened exited without
++** calling [sqlite3_close()]) and a new connection is subsequently opened
++** on that database and [WAL file], the [sqlite3_snapshot_open()] interface
++** will only be able to open the last transaction added to the WAL file
++** even though the WAL file contains other valid transactions.
++**
++** This function attempts to scan the WAL file associated with database zDb
++** of database handle db and make all valid snapshots available to
++** sqlite3_snapshot_open(). It is an error if there is already a read
++** transaction open on the database, or if the database is not a WAL mode
++** database.
++**
++** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
++**
++** This interface is only available if SQLite is compiled with the
++** [SQLITE_ENABLE_SNAPSHOT] option.
++*/
++SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
++
++/*
++** CAPI3REF: Serialize a database
++**
++** The sqlite3_serialize(D,S,P,F) interface returns a pointer to memory
++** that is a serialization of the S database on [database connection] D.
++** If P is not a NULL pointer, then the size of the database in bytes
++** is written into *P.
++**
++** For an ordinary on-disk database file, the serialization is just a
++** copy of the disk file.  For an in-memory database or a "TEMP" database,
++** the serialization is the same sequence of bytes which would be written
++** to disk if that database where backed up to disk.
++**
++** The usual case is that sqlite3_serialize() copies the serialization of
++** the database into memory obtained from [sqlite3_malloc64()] and returns
++** a pointer to that memory.  The caller is responsible for freeing the
++** returned value to avoid a memory leak.  However, if the F argument
++** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
++** are made, and the sqlite3_serialize() function will return a pointer
++** to the contiguous memory representation of the database that SQLite
++** is currently using for that database, or NULL if the no such contiguous
++** memory representation of the database exists.  A contiguous memory
++** representation of the database will usually only exist if there has
++** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
++** values of D and S.
++** The size of the database is written into *P even if the
++** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
++** of the database exists.
++**
++** After the call, if the SQLITE_SERIALIZE_NOCOPY bit had been set,
++** the returned buffer content will remain accessible and unchanged
++** until either the next write operation on the connection or when
++** the connection is closed, and applications must not modify the
++** buffer. If the bit had been clear, the returned buffer will not
++** be accessed by SQLite after the call.
++**
++** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
++** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
++** allocation error occurs.
++**
++** This interface is omitted if SQLite is compiled with the
++** [SQLITE_OMIT_DESERIALIZE] option.
++*/
++SQLITE_API unsigned char *sqlite3_serialize(
++  sqlite3 *db,           /* The database connection */
++  const char *zSchema,   /* Which DB to serialize. ex: "main", "temp", ... */
++  sqlite3_int64 *piSize, /* Write size of the DB here, if not NULL */
++  unsigned int mFlags    /* Zero or more SQLITE_SERIALIZE_* flags */
++);
++
++/*
++** CAPI3REF: Flags for sqlite3_serialize
++**
++** Zero or more of the following constants can be OR-ed together for
++** the F argument to [sqlite3_serialize(D,S,P,F)].
++**
++** SQLITE_SERIALIZE_NOCOPY means that [sqlite3_serialize()] will return
++** a pointer to contiguous in-memory database that it is currently using,
++** without making a copy of the database.  If SQLite is not currently using
++** a contiguous in-memory database, then this option causes
++** [sqlite3_serialize()] to return a NULL pointer.  SQLite will only be
++** using a contiguous in-memory database if it has been initialized by a
++** prior call to [sqlite3_deserialize()].
++*/
++#define SQLITE_SERIALIZE_NOCOPY 0x001   /* Do no memory allocations */
++
++/*
++** CAPI3REF: Deserialize a database
++**
++** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the
++** [database connection] D to disconnect from database S and then
++** reopen S as an in-memory database based on the serialization contained
++** in P.  The serialized database P is N bytes in size.  M is the size of
++** the buffer P, which might be larger than N.  If M is larger than N, and
++** the SQLITE_DESERIALIZE_READONLY bit is not set in F, then SQLite is
++** permitted to add content to the in-memory database as long as the total
++** size does not exceed M bytes.
++**
++** If the SQLITE_DESERIALIZE_FREEONCLOSE bit is set in F, then SQLite will
++** invoke sqlite3_free() on the serialization buffer when the database
++** connection closes.  If the SQLITE_DESERIALIZE_RESIZEABLE bit is set, then
++** SQLite will try to increase the buffer size using sqlite3_realloc64()
++** if writes on the database cause it to grow larger than M bytes.
++**
++** Applications must not modify the buffer P or invalidate it before
++** the database connection D is closed.
++**
++** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
++** database is currently in a read transaction or is involved in a backup
++** operation.
++**
++** It is not possible to deserialized into the TEMP database.  If the
++** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
++** function returns SQLITE_ERROR.
++**
++** The deserialized database should not be in [WAL mode].  If the database
++** is in WAL mode, then any attempt to use the database file will result
++** in an [SQLITE_CANTOPEN] error.  The application can set the
++** [file format version numbers] (bytes 18 and 19) of the input database P
++** to 0x01 prior to invoking sqlite3_deserialize(D,S,P,N,M,F) to force the
++** database file into rollback mode and work around this limitation.
++**
++** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
++** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
++** [sqlite3_free()] is invoked on argument P prior to returning.
++**
++** This interface is omitted if SQLite is compiled with the
++** [SQLITE_OMIT_DESERIALIZE] option.
++*/
++SQLITE_API int sqlite3_deserialize(
++  sqlite3 *db,            /* The database connection */
++  const char *zSchema,    /* Which DB to reopen with the deserialization */
++  unsigned char *pData,   /* The serialized database content */
++  sqlite3_int64 szDb,     /* Number bytes in the deserialization */
++  sqlite3_int64 szBuf,    /* Total size of buffer pData[] */
++  unsigned mFlags         /* Zero or more SQLITE_DESERIALIZE_* flags */
++);
++
++/*
++** CAPI3REF: Flags for sqlite3_deserialize()
++**
++** The following are allowed values for 6th argument (the F argument) to
++** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
++**
++** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
++** in the P argument is held in memory obtained from [sqlite3_malloc64()]
++** and that SQLite should take ownership of this memory and automatically
++** free it when it has finished using it.  Without this flag, the caller
++** is responsible for freeing any dynamically allocated memory.
++**
++** The SQLITE_DESERIALIZE_RESIZEABLE flag means that SQLite is allowed to
++** grow the size of the database using calls to [sqlite3_realloc64()].  This
++** flag should only be used if SQLITE_DESERIALIZE_FREEONCLOSE is also used.
++** Without this flag, the deserialized database cannot increase in size beyond
++** the number of bytes specified by the M parameter.
++**
++** The SQLITE_DESERIALIZE_READONLY flag means that the deserialized database
++** should be treated as read-only.
++*/
++#define SQLITE_DESERIALIZE_FREEONCLOSE 1 /* Call sqlite3_free() on close */
++#define SQLITE_DESERIALIZE_RESIZEABLE  2 /* Resize using sqlite3_realloc64() */
++#define SQLITE_DESERIALIZE_READONLY    4 /* Database is read-only */
++
++/*
++** Undo the hack that converts floating point types to integer for
++** builds on processors without floating point support.
++*/
++#ifdef SQLITE_OMIT_FLOATING_POINT
++# undef double
++#endif
++
++#if defined(__wasi__)
++# undef SQLITE_WASI
++# define SQLITE_WASI 1
++# undef SQLITE_OMIT_WAL
++# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */
++# ifndef SQLITE_OMIT_LOAD_EXTENSION
++#  define SQLITE_OMIT_LOAD_EXTENSION
++# endif
++# ifndef SQLITE_THREADSAFE
++#  define SQLITE_THREADSAFE 0
++# endif
++#endif
++
++#ifdef __cplusplus
++}  /* End of the 'extern "C"' block */
++#endif
++#endif /* SQLITE3_H */
++
++/******** Begin file sqlite3rtree.h *********/
++/*
++** 2010 August 30
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++*/
++
++#ifndef _SQLITE3RTREE_H_
++#define _SQLITE3RTREE_H_
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
++typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
++
++/* The double-precision datatype used by RTree depends on the
++** SQLITE_RTREE_INT_ONLY compile-time option.
++*/
++#ifdef SQLITE_RTREE_INT_ONLY
++  typedef sqlite3_int64 sqlite3_rtree_dbl;
++#else
++  typedef double sqlite3_rtree_dbl;
++#endif
++
++/*
++** Register a geometry callback named zGeom that can be used as part of an
++** R-Tree geometry query as follows:
++**
++**   SELECT ... FROM  WHERE  MATCH $zGeom(... params ...)
++*/
++SQLITE_API int sqlite3_rtree_geometry_callback(
++  sqlite3 *db,
++  const char *zGeom,
++  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
++  void *pContext
++);
++
++
++/*
++** A pointer to a structure of the following type is passed as the first
++** argument to callbacks registered using rtree_geometry_callback().
++*/
++struct sqlite3_rtree_geometry {
++  void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
++  int nParam;                     /* Size of array aParam[] */
++  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
++  void *pUser;                    /* Callback implementation user data */
++  void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
++};
++
++/*
++** Register a 2nd-generation geometry callback named zScore that can be
++** used as part of an R-Tree geometry query as follows:
++**
++**   SELECT ... FROM  WHERE  MATCH $zQueryFunc(... params ...)
++*/
++SQLITE_API int sqlite3_rtree_query_callback(
++  sqlite3 *db,
++  const char *zQueryFunc,
++  int (*xQueryFunc)(sqlite3_rtree_query_info*),
++  void *pContext,
++  void (*xDestructor)(void*)
++);
++
++
++/*
++** A pointer to a structure of the following type is passed as the
++** argument to scored geometry callback registered using
++** sqlite3_rtree_query_callback().
++**
++** Note that the first 5 fields of this structure are identical to
++** sqlite3_rtree_geometry.  This structure is a subclass of
++** sqlite3_rtree_geometry.
++*/
++struct sqlite3_rtree_query_info {
++  void *pContext;                   /* pContext from when function registered */
++  int nParam;                       /* Number of function parameters */
++  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
++  void *pUser;                      /* callback can use this, if desired */
++  void (*xDelUser)(void*);          /* function to free pUser */
++  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
++  unsigned int *anQueue;            /* Number of pending entries in the queue */
++  int nCoord;                       /* Number of coordinates */
++  int iLevel;                       /* Level of current node or entry */
++  int mxLevel;                      /* The largest iLevel value in the tree */
++  sqlite3_int64 iRowid;             /* Rowid for current entry */
++  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
++  int eParentWithin;                /* Visibility of parent node */
++  int eWithin;                      /* OUT: Visibility */
++  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
++  /* The following fields are only available in 3.8.11 and later */
++  sqlite3_value **apSqlParam;       /* Original SQL values of parameters */
++};
++
++/*
++** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
++*/
++#define NOT_WITHIN       0   /* Object completely outside of query region */
++#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
++#define FULLY_WITHIN     2   /* Object fully contained within query region */
++
++
++#ifdef __cplusplus
++}  /* end of the 'extern "C"' block */
++#endif
++
++#endif  /* ifndef _SQLITE3RTREE_H_ */
++
++/******** End of sqlite3rtree.h *********/
++/******** Begin file sqlite3session.h *********/
++
++#if !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION)
++#define __SQLITESESSION_H_ 1
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/*
++** CAPI3REF: Session Object Handle
++**
++** An instance of this object is a [session] that can be used to
++** record changes to a database.
++*/
++typedef struct sqlite3_session sqlite3_session;
++
++/*
++** CAPI3REF: Changeset Iterator Handle
++**
++** An instance of this object acts as a cursor for iterating
++** over the elements of a [changeset] or [patchset].
++*/
++typedef struct sqlite3_changeset_iter sqlite3_changeset_iter;
++
++/*
++** CAPI3REF: Create A New Session Object
++** CONSTRUCTOR: sqlite3_session
++**
++** Create a new session object attached to database handle db. If successful,
++** a pointer to the new object is written to *ppSession and SQLITE_OK is
++** returned. If an error occurs, *ppSession is set to NULL and an SQLite
++** error code (e.g. SQLITE_NOMEM) is returned.
++**
++** It is possible to create multiple session objects attached to a single
++** database handle.
++**
++** Session objects created using this function should be deleted using the
++** [sqlite3session_delete()] function before the database handle that they
++** are attached to is itself closed. If the database handle is closed before
++** the session object is deleted, then the results of calling any session
++** module function, including [sqlite3session_delete()] on the session object
++** are undefined.
++**
++** Because the session module uses the [sqlite3_preupdate_hook()] API, it
++** is not possible for an application to register a pre-update hook on a
++** database handle that has one or more session objects attached. Nor is
++** it possible to create a session object attached to a database handle for
++** which a pre-update hook is already defined. The results of attempting
++** either of these things are undefined.
++**
++** The session object will be used to create changesets for tables in
++** database zDb, where zDb is either "main", or "temp", or the name of an
++** attached database. It is not an error if database zDb is not attached
++** to the database when the session object is created.
++*/
++SQLITE_API int sqlite3session_create(
++  sqlite3 *db,                    /* Database handle */
++  const char *zDb,                /* Name of db (e.g. "main") */
++  sqlite3_session **ppSession     /* OUT: New session object */
++);
++
++/*
++** CAPI3REF: Delete A Session Object
++** DESTRUCTOR: sqlite3_session
++**
++** Delete a session object previously allocated using
++** [sqlite3session_create()]. Once a session object has been deleted, the
++** results of attempting to use pSession with any other session module
++** function are undefined.
++**
++** Session objects must be deleted before the database handle to which they
++** are attached is closed. Refer to the documentation for
++** [sqlite3session_create()] for details.
++*/
++SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
++
++/*
++** CAPI3REF: Configure a Session Object
++** METHOD: sqlite3_session
++**
++** This method is used to configure a session object after it has been
++** created. At present the only valid values for the second parameter are
++** [SQLITE_SESSION_OBJCONFIG_SIZE] and [SQLITE_SESSION_OBJCONFIG_ROWID].
++**
++*/
++SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
++
++/*
++** CAPI3REF: Options for sqlite3session_object_config
++**
++** The following values may passed as the the 2nd parameter to
++** sqlite3session_object_config().
++**
++** 
      SQLITE_SESSION_OBJCONFIG_SIZE 
      
++**   This option is used to set, clear or query the flag that enables
++**   the [sqlite3session_changeset_size()] API. Because it imposes some
++**   computational overhead, this API is disabled by default. Argument
++**   pArg must point to a value of type (int). If the value is initially
++**   0, then the sqlite3session_changeset_size() API is disabled. If it
++**   is greater than 0, then the same API is enabled. Or, if the initial
++**   value is less than zero, no change is made. In all cases the (int)
++**   variable is set to 1 if the sqlite3session_changeset_size() API is
++**   enabled following the current call, or 0 otherwise.
++**
++**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
++**   the first table has been attached to the session object.
++**
++** 
      SQLITE_SESSION_OBJCONFIG_ROWID 
      
++**   This option is used to set, clear or query the flag that enables
++**   collection of data for tables with no explicit PRIMARY KEY.
++**
++**   Normally, tables with no explicit PRIMARY KEY are simply ignored
++**   by the sessions module. However, if this flag is set, it behaves
++**   as if such tables have a column "_rowid_ INTEGER PRIMARY KEY" inserted
++**   as their leftmost columns.
++**
++**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
++**   the first table has been attached to the session object.
++*/
++#define SQLITE_SESSION_OBJCONFIG_SIZE  1
++#define SQLITE_SESSION_OBJCONFIG_ROWID 2
++
++/*
++** CAPI3REF: Enable Or Disable A Session Object
++** METHOD: sqlite3_session
++**
++** Enable or disable the recording of changes by a session object. When
++** enabled, a session object records changes made to the database. When
++** disabled - it does not. A newly created session object is enabled.
++** Refer to the documentation for [sqlite3session_changeset()] for further
++** details regarding how enabling and disabling a session object affects
++** the eventual changesets.
++**
++** Passing zero to this function disables the session. Passing a value
++** greater than zero enables it. Passing a value less than zero is a
++** no-op, and may be used to query the current state of the session.
++**
++** The return value indicates the final state of the session object: 0 if
++** the session is disabled, or 1 if it is enabled.
++*/
++SQLITE_API int sqlite3session_enable(sqlite3_session *pSession, int bEnable);
++
++/*
++** CAPI3REF: Set Or Clear the Indirect Change Flag
++** METHOD: sqlite3_session
++**
++** Each change recorded by a session object is marked as either direct or
++** indirect. A change is marked as indirect if either:
++**
++** 
        
++**   
      •  The session object "indirect" flag is set when the change is
++**        made, or
++**   
      •  The change is made by an SQL trigger or foreign key action
++**        instead of directly as a result of a users SQL statement.
++** 
      
++**
++** If a single row is affected by more than one operation within a session,
++** then the change is considered indirect if all operations meet the criteria
++** for an indirect change above, or direct otherwise.
++**
++** This function is used to set, clear or query the session object indirect
++** flag.  If the second argument passed to this function is zero, then the
++** indirect flag is cleared. If it is greater than zero, the indirect flag
++** is set. Passing a value less than zero does not modify the current value
++** of the indirect flag, and may be used to query the current state of the
++** indirect flag for the specified session object.
++**
++** The return value indicates the final state of the indirect flag: 0 if
++** it is clear, or 1 if it is set.
++*/
++SQLITE_API int sqlite3session_indirect(sqlite3_session *pSession, int bIndirect);
++
++/*
++** CAPI3REF: Attach A Table To A Session Object
++** METHOD: sqlite3_session
++**
++** If argument zTab is not NULL, then it is the name of a table to attach
++** to the session object passed as the first argument. All subsequent changes
++** made to the table while the session object is enabled will be recorded. See
++** documentation for [sqlite3session_changeset()] for further details.
++**
++** Or, if argument zTab is NULL, then changes are recorded for all tables
++** in the database. If additional tables are added to the database (by
++** executing "CREATE TABLE" statements) after this call is made, changes for
++** the new tables are also recorded.
++**
++** Changes can only be recorded for tables that have a PRIMARY KEY explicitly
++** defined as part of their CREATE TABLE statement. It does not matter if the
++** PRIMARY KEY is an "INTEGER PRIMARY KEY" (rowid alias) or not. The PRIMARY
++** KEY may consist of a single column, or may be a composite key.
++**
++** It is not an error if the named table does not exist in the database. Nor
++** is it an error if the named table does not have a PRIMARY KEY. However,
++** no changes will be recorded in either of these scenarios.
++**
++** Changes are not recorded for individual rows that have NULL values stored
++** in one or more of their PRIMARY KEY columns.
++**
++** SQLITE_OK is returned if the call completes without error. Or, if an error
++** occurs, an SQLite error code (e.g. SQLITE_NOMEM) is returned.
++**
++** 
      Special sqlite_stat1 Handling
      
++**
++** As of SQLite version 3.22.0, the "sqlite_stat1" table is an exception to
++** some of the rules above. In SQLite, the schema of sqlite_stat1 is:
++**  
      ++**        CREATE TABLE sqlite_stat1(tbl,idx,stat)
++**  
      
++**
++** Even though sqlite_stat1 does not have a PRIMARY KEY, changes are
++** recorded for it as if the PRIMARY KEY is (tbl,idx). Additionally, changes
++** are recorded for rows for which (idx IS NULL) is true. However, for such
++** rows a zero-length blob (SQL value X'') is stored in the changeset or
++** patchset instead of a NULL value. This allows such changesets to be
++** manipulated by legacy implementations of sqlite3changeset_invert(),
++** concat() and similar.
++**
++** The sqlite3changeset_apply() function automatically converts the
++** zero-length blob back to a NULL value when updating the sqlite_stat1
++** table. However, if the application calls sqlite3changeset_new(),
++** sqlite3changeset_old() or sqlite3changeset_conflict on a changeset
++** iterator directly (including on a changeset iterator passed to a
++** conflict-handler callback) then the X'' value is returned. The application
++** must translate X'' to NULL itself if required.
++**
++** Legacy (older than 3.22.0) versions of the sessions module cannot capture
++** changes made to the sqlite_stat1 table. Legacy versions of the
++** sqlite3changeset_apply() function silently ignore any modifications to the
++** sqlite_stat1 table that are part of a changeset or patchset.
++*/
++SQLITE_API int sqlite3session_attach(
++  sqlite3_session *pSession,      /* Session object */
++  const char *zTab                /* Table name */
++);
++
++/*
++** CAPI3REF: Set a table filter on a Session Object.
++** METHOD: sqlite3_session
++**
++** The second argument (xFilter) is the "filter callback". For changes to rows
++** in tables that are not attached to the Session object, the filter is called
++** to determine whether changes to the table's rows should be tracked or not.
++** If xFilter returns 0, changes are not tracked. Note that once a table is
++** attached, xFilter will not be called again.
++*/
++SQLITE_API void sqlite3session_table_filter(
++  sqlite3_session *pSession,      /* Session object */
++  int(*xFilter)(
++    void *pCtx,                   /* Copy of third arg to _filter_table() */
++    const char *zTab              /* Table name */
++  ),
++  void *pCtx                      /* First argument passed to xFilter */
++);
++
++/*
++** CAPI3REF: Generate A Changeset From A Session Object
++** METHOD: sqlite3_session
++**
++** Obtain a changeset containing changes to the tables attached to the
++** session object passed as the first argument. If successful,
++** set *ppChangeset to point to a buffer containing the changeset
++** and *pnChangeset to the size of the changeset in bytes before returning
++** SQLITE_OK. If an error occurs, set both *ppChangeset and *pnChangeset to
++** zero and return an SQLite error code.
++**
++** A changeset consists of zero or more INSERT, UPDATE and/or DELETE changes,
++** each representing a change to a single row of an attached table. An INSERT
++** change contains the values of each field of a new database row. A DELETE
++** contains the original values of each field of a deleted database row. An
++** UPDATE change contains the original values of each field of an updated
++** database row along with the updated values for each updated non-primary-key
++** column. It is not possible for an UPDATE change to represent a change that
++** modifies the values of primary key columns. If such a change is made, it
++** is represented in a changeset as a DELETE followed by an INSERT.
++**
++** Changes are not recorded for rows that have NULL values stored in one or
++** more of their PRIMARY KEY columns. If such a row is inserted or deleted,
++** no corresponding change is present in the changesets returned by this
++** function. If an existing row with one or more NULL values stored in
++** PRIMARY KEY columns is updated so that all PRIMARY KEY columns are non-NULL,
++** only an INSERT is appears in the changeset. Similarly, if an existing row
++** with non-NULL PRIMARY KEY values is updated so that one or more of its
++** PRIMARY KEY columns are set to NULL, the resulting changeset contains a
++** DELETE change only.
++**
++** The contents of a changeset may be traversed using an iterator created
++** using the [sqlite3changeset_start()] API. A changeset may be applied to
++** a database with a compatible schema using the [sqlite3changeset_apply()]
++** API.
++**
++** Within a changeset generated by this function, all changes related to a
++** single table are grouped together. In other words, when iterating through
++** a changeset or when applying a changeset to a database, all changes related
++** to a single table are processed before moving on to the next table. Tables
++** are sorted in the same order in which they were attached (or auto-attached)
++** to the sqlite3_session object. The order in which the changes related to
++** a single table are stored is undefined.
++**
++** Following a successful call to this function, it is the responsibility of
++** the caller to eventually free the buffer that *ppChangeset points to using
++** [sqlite3_free()].
++**
++** 
      Changeset Generation
      
++**
++** Once a table has been attached to a session object, the session object
++** records the primary key values of all new rows inserted into the table.
++** It also records the original primary key and other column values of any
++** deleted or updated rows. For each unique primary key value, data is only
++** recorded once - the first time a row with said primary key is inserted,
++** updated or deleted in the lifetime of the session.
++**
++** There is one exception to the previous paragraph: when a row is inserted,
++** updated or deleted, if one or more of its primary key columns contain a
++** NULL value, no record of the change is made.
++**
++** The session object therefore accumulates two types of records - those
++** that consist of primary key values only (created when the user inserts
++** a new record) and those that consist of the primary key values and the
++** original values of other table columns (created when the users deletes
++** or updates a record).
++**
++** When this function is called, the requested changeset is created using
++** both the accumulated records and the current contents of the database
++** file. Specifically:
++**
++** 
        
++**   
      •  For each record generated by an insert, the database is queried
++**        for a row with a matching primary key. If one is found, an INSERT
++**        change is added to the changeset. If no such row is found, no change
++**        is added to the changeset.
++**
++**   
      •  For each record generated by an update or delete, the database is
++**        queried for a row with a matching primary key. If such a row is
++**        found and one or more of the non-primary key fields have been
++**        modified from their original values, an UPDATE change is added to
++**        the changeset. Or, if no such row is found in the table, a DELETE
++**        change is added to the changeset. If there is a row with a matching
++**        primary key in the database, but all fields contain their original
++**        values, no change is added to the changeset.
++** 
      
++**
++** This means, amongst other things, that if a row is inserted and then later
++** deleted while a session object is active, neither the insert nor the delete
++** will be present in the changeset. Or if a row is deleted and then later a
++** row with the same primary key values inserted while a session object is
++** active, the resulting changeset will contain an UPDATE change instead of
++** a DELETE and an INSERT.
++**
++** When a session object is disabled (see the [sqlite3session_enable()] API),
++** it does not accumulate records when rows are inserted, updated or deleted.
++** This may appear to have some counter-intuitive effects if a single row
++** is written to more than once during a session. For example, if a row
++** is inserted while a session object is enabled, then later deleted while
++** the same session object is disabled, no INSERT record will appear in the
++** changeset, even though the delete took place while the session was disabled.
++** Or, if one field of a row is updated while a session is disabled, and
++** another field of the same row is updated while the session is enabled, the
++** resulting changeset will contain an UPDATE change that updates both fields.
++*/
++SQLITE_API int sqlite3session_changeset(
++  sqlite3_session *pSession,      /* Session object */
++  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
++  void **ppChangeset              /* OUT: Buffer containing changeset */
++);
++
++/*
++** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
++** METHOD: sqlite3_session
++**
++** By default, this function always returns 0. For it to return
++** a useful result, the sqlite3_session object must have been configured
++** to enable this API using sqlite3session_object_config() with the
++** SQLITE_SESSION_OBJCONFIG_SIZE verb.
++**
++** When enabled, this function returns an upper limit, in bytes, for the size
++** of the changeset that might be produced if sqlite3session_changeset() were
++** called. The final changeset size might be equal to or smaller than the
++** size in bytes returned by this function.
++*/
++SQLITE_API sqlite3_int64 sqlite3session_changeset_size(sqlite3_session *pSession);
++
++/*
++** CAPI3REF: Load The Difference Between Tables Into A Session
++** METHOD: sqlite3_session
++**
++** If it is not already attached to the session object passed as the first
++** argument, this function attaches table zTbl in the same manner as the
++** [sqlite3session_attach()] function. If zTbl does not exist, or if it
++** does not have a primary key, this function is a no-op (but does not return
++** an error).
++**
++** Argument zFromDb must be the name of a database ("main", "temp" etc.)
++** attached to the same database handle as the session object that contains
++** a table compatible with the table attached to the session by this function.
++** A table is considered compatible if it:
++**
++** 
        
++**   
      •  Has the same name,
++**   
      •  Has the same set of columns declared in the same order, and
++**   
      •  Has the same PRIMARY KEY definition.
++** 
      
++**
++** If the tables are not compatible, SQLITE_SCHEMA is returned. If the tables
++** are compatible but do not have any PRIMARY KEY columns, it is not an error
++** but no changes are added to the session object. As with other session
++** APIs, tables without PRIMARY KEYs are simply ignored.
++**
++** This function adds a set of changes to the session object that could be
++** used to update the table in database zFrom (call this the "from-table")
++** so that its content is the same as the table attached to the session
++** object (call this the "to-table"). Specifically:
++**
++** 
        
++**   
      •  For each row (primary key) that exists in the to-table but not in
++**     the from-table, an INSERT record is added to the session object.
++**
++**   
      •  For each row (primary key) that exists in the to-table but not in
++**     the from-table, a DELETE record is added to the session object.
++**
++**   
      •  For each row (primary key) that exists in both tables, but features
++**     different non-PK values in each, an UPDATE record is added to the
++**     session.
++** 
      
++**
++** To clarify, if this function is called and then a changeset constructed
++** using [sqlite3session_changeset()], then after applying that changeset to
++** database zFrom the contents of the two compatible tables would be
++** identical.
++**
++** It an error if database zFrom does not exist or does not contain the
++** required compatible table.
++**
++** If the operation is successful, SQLITE_OK is returned. Otherwise, an SQLite
++** error code. In this case, if argument pzErrMsg is not NULL, *pzErrMsg
++** may be set to point to a buffer containing an English language error
++** message. It is the responsibility of the caller to free this buffer using
++** sqlite3_free().
++*/
++SQLITE_API int sqlite3session_diff(
++  sqlite3_session *pSession,
++  const char *zFromDb,
++  const char *zTbl,
++  char **pzErrMsg
++);
++
++
++/*
++** CAPI3REF: Generate A Patchset From A Session Object
++** METHOD: sqlite3_session
++**
++** The differences between a patchset and a changeset are that:
++**
++** 
        
++**   
      •  DELETE records consist of the primary key fields only. The
++**        original values of other fields are omitted.
++**   
      •  The original values of any modified fields are omitted from
++**        UPDATE records.
++** 
      
++**
++** A patchset blob may be used with up to date versions of all
++** sqlite3changeset_xxx API functions except for sqlite3changeset_invert(),
++** which returns SQLITE_CORRUPT if it is passed a patchset. Similarly,
++** attempting to use a patchset blob with old versions of the
++** sqlite3changeset_xxx APIs also provokes an SQLITE_CORRUPT error.
++**
++** Because the non-primary key "old.*" fields are omitted, no
++** SQLITE_CHANGESET_DATA conflicts can be detected or reported if a patchset
++** is passed to the sqlite3changeset_apply() API. Other conflict types work
++** in the same way as for changesets.
++**
++** Changes within a patchset are ordered in the same way as for changesets
++** generated by the sqlite3session_changeset() function (i.e. all changes for
++** a single table are grouped together, tables appear in the order in which
++** they were attached to the session object).
++*/
++SQLITE_API int sqlite3session_patchset(
++  sqlite3_session *pSession,      /* Session object */
++  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
++  void **ppPatchset               /* OUT: Buffer containing patchset */
++);
++
++/*
++** CAPI3REF: Test if a changeset has recorded any changes.
++**
++** Return non-zero if no changes to attached tables have been recorded by
++** the session object passed as the first argument. Otherwise, if one or
++** more changes have been recorded, return zero.
++**
++** Even if this function returns zero, it is possible that calling
++** [sqlite3session_changeset()] on the session handle may still return a
++** changeset that contains no changes. This can happen when a row in
++** an attached table is modified and then later on the original values
++** are restored. However, if this function returns non-zero, then it is
++** guaranteed that a call to sqlite3session_changeset() will return a
++** changeset containing zero changes.
++*/
++SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);
++
++/*
++** CAPI3REF: Query for the amount of heap memory used by a session object.
++**
++** This API returns the total amount of heap memory in bytes currently
++** used by the session object passed as the only argument.
++*/
++SQLITE_API sqlite3_int64 sqlite3session_memory_used(sqlite3_session *pSession);
++
++/*
++** CAPI3REF: Create An Iterator To Traverse A Changeset
++** CONSTRUCTOR: sqlite3_changeset_iter
++**
++** Create an iterator used to iterate through the contents of a changeset.
++** If successful, *pp is set to point to the iterator handle and SQLITE_OK
++** is returned. Otherwise, if an error occurs, *pp is set to zero and an
++** SQLite error code is returned.
++**
++** The following functions can be used to advance and query a changeset
++** iterator created by this function:
++**
++** 
        
++**   
      •  [sqlite3changeset_next()]
++**   
      •  [sqlite3changeset_op()]
++**   
      •  [sqlite3changeset_new()]
++**   
      •  [sqlite3changeset_old()]
++** 
      
++**
++** It is the responsibility of the caller to eventually destroy the iterator
++** by passing it to [sqlite3changeset_finalize()]. The buffer containing the
++** changeset (pChangeset) must remain valid until after the iterator is
++** destroyed.
++**
++** Assuming the changeset blob was created by one of the
++** [sqlite3session_changeset()], [sqlite3changeset_concat()] or
++** [sqlite3changeset_invert()] functions, all changes within the changeset
++** that apply to a single table are grouped together. This means that when
++** an application iterates through a changeset using an iterator created by
++** this function, all changes that relate to a single table are visited
++** consecutively. There is no chance that the iterator will visit a change
++** the applies to table X, then one for table Y, and then later on visit
++** another change for table X.
++**
++** The behavior of sqlite3changeset_start_v2() and its streaming equivalent
++** may be modified by passing a combination of
++** [SQLITE_CHANGESETSTART_INVERT | supported flags] as the 4th parameter.
++**
++** Note that the sqlite3changeset_start_v2() API is still experimental
++** and therefore subject to change.
++*/
++SQLITE_API int sqlite3changeset_start(
++  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
++  int nChangeset,                 /* Size of changeset blob in bytes */
++  void *pChangeset                /* Pointer to blob containing changeset */
++);
++SQLITE_API int sqlite3changeset_start_v2(
++  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
++  int nChangeset,                 /* Size of changeset blob in bytes */
++  void *pChangeset,               /* Pointer to blob containing changeset */
++  int flags                       /* SESSION_CHANGESETSTART_* flags */
++);
++
++/*
++** CAPI3REF: Flags for sqlite3changeset_start_v2
++**
++** The following flags may passed via the 4th parameter to
++** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
++**
++** 
      SQLITE_CHANGESETAPPLY_INVERT 
      
++**   Invert the changeset while iterating through it. This is equivalent to
++**   inverting a changeset using sqlite3changeset_invert() before applying it.
++**   It is an error to specify this flag with a patchset.
++*/
++#define SQLITE_CHANGESETSTART_INVERT        0x0002
++
++
++/*
++** CAPI3REF: Advance A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** This function may only be used with iterators created by the function
++** [sqlite3changeset_start()]. If it is called on an iterator passed to
++** a conflict-handler callback by [sqlite3changeset_apply()], SQLITE_MISUSE
++** is returned and the call has no effect.
++**
++** Immediately after an iterator is created by sqlite3changeset_start(), it
++** does not point to any change in the changeset. Assuming the changeset
++** is not empty, the first call to this function advances the iterator to
++** point to the first change in the changeset. Each subsequent call advances
++** the iterator to point to the next change in the changeset (if any). If
++** no error occurs and the iterator points to a valid change after a call
++** to sqlite3changeset_next() has advanced it, SQLITE_ROW is returned.
++** Otherwise, if all changes in the changeset have already been visited,
++** SQLITE_DONE is returned.
++**
++** If an error occurs, an SQLite error code is returned. Possible error
++** codes include SQLITE_CORRUPT (if the changeset buffer is corrupt) or
++** SQLITE_NOMEM.
++*/
++SQLITE_API int sqlite3changeset_next(sqlite3_changeset_iter *pIter);
++
++/*
++** CAPI3REF: Obtain The Current Operation From A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** The pIter argument passed to this function may either be an iterator
++** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
++** created by [sqlite3changeset_start()]. In the latter case, the most recent
++** call to [sqlite3changeset_next()] must have returned [SQLITE_ROW]. If this
++** is not the case, this function returns [SQLITE_MISUSE].
++**
++** Arguments pOp, pnCol and pzTab may not be NULL. Upon return, three
++** outputs are set through these pointers:
++**
++** *pOp is set to one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
++** depending on the type of change that the iterator currently points to;
++**
++** *pnCol is set to the number of columns in the table affected by the change; and
++**
++** *pzTab is set to point to a nul-terminated utf-8 encoded string containing
++** the name of the table affected by the current change. The buffer remains
++** valid until either sqlite3changeset_next() is called on the iterator
++** or until the conflict-handler function returns.
++**
++** If pbIndirect is not NULL, then *pbIndirect is set to true (1) if the change
++** is an indirect change, or false (0) otherwise. See the documentation for
++** [sqlite3session_indirect()] for a description of direct and indirect
++** changes.
++**
++** If no error occurs, SQLITE_OK is returned. If an error does occur, an
++** SQLite error code is returned. The values of the output variables may not
++** be trusted in this case.
++*/
++SQLITE_API int sqlite3changeset_op(
++  sqlite3_changeset_iter *pIter,  /* Iterator object */
++  const char **pzTab,             /* OUT: Pointer to table name */
++  int *pnCol,                     /* OUT: Number of columns in table */
++  int *pOp,                       /* OUT: SQLITE_INSERT, DELETE or UPDATE */
++  int *pbIndirect                 /* OUT: True for an 'indirect' change */
++);
++
++/*
++** CAPI3REF: Obtain The Primary Key Definition Of A Table
++** METHOD: sqlite3_changeset_iter
++**
++** For each modified table, a changeset includes the following:
++**
++** 
        
++**   
      •  The number of columns in the table, and
++**   
      •  Which of those columns make up the tables PRIMARY KEY.
++** 
      
++**
++** This function is used to find which columns comprise the PRIMARY KEY of
++** the table modified by the change that iterator pIter currently points to.
++** If successful, *pabPK is set to point to an array of nCol entries, where
++** nCol is the number of columns in the table. Elements of *pabPK are set to
++** 0x01 if the corresponding column is part of the tables primary key, or
++** 0x00 if it is not.
++**
++** If argument pnCol is not NULL, then *pnCol is set to the number of columns
++** in the table.
++**
++** If this function is called when the iterator does not point to a valid
++** entry, SQLITE_MISUSE is returned and the output variables zeroed. Otherwise,
++** SQLITE_OK is returned and the output variables populated as described
++** above.
++*/
++SQLITE_API int sqlite3changeset_pk(
++  sqlite3_changeset_iter *pIter,  /* Iterator object */
++  unsigned char **pabPK,          /* OUT: Array of boolean - true for PK cols */
++  int *pnCol                      /* OUT: Number of entries in output array */
++);
++
++/*
++** CAPI3REF: Obtain old.* Values From A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** The pIter argument passed to this function may either be an iterator
++** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
++** created by [sqlite3changeset_start()]. In the latter case, the most recent
++** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
++** Furthermore, it may only be called if the type of change that the iterator
++** currently points to is either [SQLITE_DELETE] or [SQLITE_UPDATE]. Otherwise,
++** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
++**
++** Argument iVal must be greater than or equal to 0, and less than the number
++** of columns in the table affected by the current change. Otherwise,
++** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
++**
++** If successful, this function sets *ppValue to point to a protected
++** sqlite3_value object containing the iVal'th value from the vector of
++** original row values stored as part of the UPDATE or DELETE change and
++** returns SQLITE_OK. The name of the function comes from the fact that this
++** is similar to the "old.*" columns available to update or delete triggers.
++**
++** If some other error occurs (e.g. an OOM condition), an SQLite error code
++** is returned and *ppValue is set to NULL.
++*/
++SQLITE_API int sqlite3changeset_old(
++  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
++  int iVal,                       /* Column number */
++  sqlite3_value **ppValue         /* OUT: Old value (or NULL pointer) */
++);
++
++/*
++** CAPI3REF: Obtain new.* Values From A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** The pIter argument passed to this function may either be an iterator
++** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
++** created by [sqlite3changeset_start()]. In the latter case, the most recent
++** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
++** Furthermore, it may only be called if the type of change that the iterator
++** currently points to is either [SQLITE_UPDATE] or [SQLITE_INSERT]. Otherwise,
++** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
++**
++** Argument iVal must be greater than or equal to 0, and less than the number
++** of columns in the table affected by the current change. Otherwise,
++** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
++**
++** If successful, this function sets *ppValue to point to a protected
++** sqlite3_value object containing the iVal'th value from the vector of
++** new row values stored as part of the UPDATE or INSERT change and
++** returns SQLITE_OK. If the change is an UPDATE and does not include
++** a new value for the requested column, *ppValue is set to NULL and
++** SQLITE_OK returned. The name of the function comes from the fact that
++** this is similar to the "new.*" columns available to update or delete
++** triggers.
++**
++** If some other error occurs (e.g. an OOM condition), an SQLite error code
++** is returned and *ppValue is set to NULL.
++*/
++SQLITE_API int sqlite3changeset_new(
++  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
++  int iVal,                       /* Column number */
++  sqlite3_value **ppValue         /* OUT: New value (or NULL pointer) */
++);
++
++/*
++** CAPI3REF: Obtain Conflicting Row Values From A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** This function should only be used with iterator objects passed to a
++** conflict-handler callback by [sqlite3changeset_apply()] with either
++** [SQLITE_CHANGESET_DATA] or [SQLITE_CHANGESET_CONFLICT]. If this function
++** is called on any other iterator, [SQLITE_MISUSE] is returned and *ppValue
++** is set to NULL.
++**
++** Argument iVal must be greater than or equal to 0, and less than the number
++** of columns in the table affected by the current change. Otherwise,
++** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
++**
++** If successful, this function sets *ppValue to point to a protected
++** sqlite3_value object containing the iVal'th value from the
++** "conflicting row" associated with the current conflict-handler callback
++** and returns SQLITE_OK.
++**
++** If some other error occurs (e.g. an OOM condition), an SQLite error code
++** is returned and *ppValue is set to NULL.
++*/
++SQLITE_API int sqlite3changeset_conflict(
++  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
++  int iVal,                       /* Column number */
++  sqlite3_value **ppValue         /* OUT: Value from conflicting row */
++);
++
++/*
++** CAPI3REF: Determine The Number Of Foreign Key Constraint Violations
++** METHOD: sqlite3_changeset_iter
++**
++** This function may only be called with an iterator passed to an
++** SQLITE_CHANGESET_FOREIGN_KEY conflict handler callback. In this case
++** it sets the output variable to the total number of known foreign key
++** violations in the destination database and returns SQLITE_OK.
++**
++** In all other cases this function returns SQLITE_MISUSE.
++*/
++SQLITE_API int sqlite3changeset_fk_conflicts(
++  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
++  int *pnOut                      /* OUT: Number of FK violations */
++);
++
++
++/*
++** CAPI3REF: Finalize A Changeset Iterator
++** METHOD: sqlite3_changeset_iter
++**
++** This function is used to finalize an iterator allocated with
++** [sqlite3changeset_start()].
++**
++** This function should only be called on iterators created using the
++** [sqlite3changeset_start()] function. If an application calls this
++** function with an iterator passed to a conflict-handler by
++** [sqlite3changeset_apply()], [SQLITE_MISUSE] is immediately returned and the
++** call has no effect.
++**
++** If an error was encountered within a call to an sqlite3changeset_xxx()
++** function (for example an [SQLITE_CORRUPT] in [sqlite3changeset_next()] or an
++** [SQLITE_NOMEM] in [sqlite3changeset_new()]) then an error code corresponding
++** to that error is returned by this function. Otherwise, SQLITE_OK is
++** returned. This is to allow the following pattern (pseudo-code):
++**
++** 
      ++**   sqlite3changeset_start();
++**   while( SQLITE_ROW==sqlite3changeset_next() ){
++**     // Do something with change.
++**   }
++**   rc = sqlite3changeset_finalize();
++**   if( rc!=SQLITE_OK ){
++**     // An error has occurred
++**   }
++** 
      
++*/
++SQLITE_API int sqlite3changeset_finalize(sqlite3_changeset_iter *pIter);
++
++/*
++** CAPI3REF: Invert A Changeset
++**
++** This function is used to "invert" a changeset object. Applying an inverted
++** changeset to a database reverses the effects of applying the uninverted
++** changeset. Specifically:
++**
++** 
        
++**   
      •  Each DELETE change is changed to an INSERT, and
++**   
      •  Each INSERT change is changed to a DELETE, and
++**   
      •  For each UPDATE change, the old.* and new.* values are exchanged.
++** 
      
++**
++** This function does not change the order in which changes appear within
++** the changeset. It merely reverses the sense of each individual change.
++**
++** If successful, a pointer to a buffer containing the inverted changeset
++** is stored in *ppOut, the size of the same buffer is stored in *pnOut, and
++** SQLITE_OK is returned. If an error occurs, both *pnOut and *ppOut are
++** zeroed and an SQLite error code returned.
++**
++** It is the responsibility of the caller to eventually call sqlite3_free()
++** on the *ppOut pointer to free the buffer allocation following a successful
++** call to this function.
++**
++** WARNING/TODO: This function currently assumes that the input is a valid
++** changeset. If it is not, the results are undefined.
++*/
++SQLITE_API int sqlite3changeset_invert(
++  int nIn, const void *pIn,       /* Input changeset */
++  int *pnOut, void **ppOut        /* OUT: Inverse of input */
++);
++
++/*
++** CAPI3REF: Concatenate Two Changeset Objects
++**
++** This function is used to concatenate two changesets, A and B, into a
++** single changeset. The result is a changeset equivalent to applying
++** changeset A followed by changeset B.
++**
++** This function combines the two input changesets using an
++** sqlite3_changegroup object. Calling it produces similar results as the
++** following code fragment:
++**
++** 
      ++**   sqlite3_changegroup *pGrp;
++**   rc = sqlite3_changegroup_new(&pGrp);
++**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nA, pA);
++**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nB, pB);
++**   if( rc==SQLITE_OK ){
++**     rc = sqlite3changegroup_output(pGrp, pnOut, ppOut);
++**   }else{
++**     *ppOut = 0;
++**     *pnOut = 0;
++**   }
++** 
      
++**
++** Refer to the sqlite3_changegroup documentation below for details.
++*/
++SQLITE_API int sqlite3changeset_concat(
++  int nA,                         /* Number of bytes in buffer pA */
++  void *pA,                       /* Pointer to buffer containing changeset A */
++  int nB,                         /* Number of bytes in buffer pB */
++  void *pB,                       /* Pointer to buffer containing changeset B */
++  int *pnOut,                     /* OUT: Number of bytes in output changeset */
++  void **ppOut                    /* OUT: Buffer containing output changeset */
++);
++
++
++/*
++** CAPI3REF: Upgrade the Schema of a Changeset/Patchset
++*/
++SQLITE_API int sqlite3changeset_upgrade(
++  sqlite3 *db,
++  const char *zDb,
++  int nIn, const void *pIn,       /* Input changeset */
++  int *pnOut, void **ppOut        /* OUT: Inverse of input */
++);
++
++
++
++/*
++** CAPI3REF: Changegroup Handle
++**
++** A changegroup is an object used to combine two or more
++** [changesets] or [patchsets]
++*/
++typedef struct sqlite3_changegroup sqlite3_changegroup;
++
++/*
++** CAPI3REF: Create A New Changegroup Object
++** CONSTRUCTOR: sqlite3_changegroup
++**
++** An sqlite3_changegroup object is used to combine two or more changesets
++** (or patchsets) into a single changeset (or patchset). A single changegroup
++** object may combine changesets or patchsets, but not both. The output is
++** always in the same format as the input.
++**
++** If successful, this function returns SQLITE_OK and populates (*pp) with
++** a pointer to a new sqlite3_changegroup object before returning. The caller
++** should eventually free the returned object using a call to
++** sqlite3changegroup_delete(). If an error occurs, an SQLite error code
++** (i.e. SQLITE_NOMEM) is returned and *pp is set to NULL.
++**
++** The usual usage pattern for an sqlite3_changegroup object is as follows:
++**
++** 
        
++**   
      •  It is created using a call to sqlite3changegroup_new().
++**
++**   
      •  Zero or more changesets (or patchsets) are added to the object
++**        by calling sqlite3changegroup_add().
++**
++**   
      •  The result of combining all input changesets together is obtained
++**        by the application via a call to sqlite3changegroup_output().
++**
++**   
      •  The object is deleted using a call to sqlite3changegroup_delete().
++** 
      
++**
++** Any number of calls to add() and output() may be made between the calls to
++** new() and delete(), and in any order.
++**
++** As well as the regular sqlite3changegroup_add() and
++** sqlite3changegroup_output() functions, also available are the streaming
++** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().
++*/
++SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
++
++/*
++** CAPI3REF: Add a Schema to a Changegroup
++** METHOD: sqlite3_changegroup_schema
++**
++** This method may be used to optionally enforce the rule that the changesets
++** added to the changegroup handle must match the schema of database zDb
++** ("main", "temp", or the name of an attached database). If
++** sqlite3changegroup_add() is called to add a changeset that is not compatible
++** with the configured schema, SQLITE_SCHEMA is returned and the changegroup
++** object is left in an undefined state.
++**
++** A changeset schema is considered compatible with the database schema in
++** the same way as for sqlite3changeset_apply(). Specifically, for each
++** table in the changeset, there exists a database table with:
++**
++** 
        
++**   
      •  The name identified by the changeset, and
++**   
      •  at least as many columns as recorded in the changeset, and
++**   
      •  the primary key columns in the same position as recorded in
++**        the changeset.
++** 
      
++**
++** The output of the changegroup object always has the same schema as the
++** database nominated using this function. In cases where changesets passed
++** to sqlite3changegroup_add() have fewer columns than the corresponding table
++** in the database schema, these are filled in using the default column
++** values from the database schema. This makes it possible to combined
++** changesets that have different numbers of columns for a single table
++** within a changegroup, provided that they are otherwise compatible.
++*/
++SQLITE_API int sqlite3changegroup_schema(sqlite3_changegroup*, sqlite3*, const char *zDb);
++
++/*
++** CAPI3REF: Add A Changeset To A Changegroup
++** METHOD: sqlite3_changegroup
++**
++** Add all changes within the changeset (or patchset) in buffer pData (size
++** nData bytes) to the changegroup.
++**
++** If the buffer contains a patchset, then all prior calls to this function
++** on the same changegroup object must also have specified patchsets. Or, if
++** the buffer contains a changeset, so must have the earlier calls to this
++** function. Otherwise, SQLITE_ERROR is returned and no changes are added
++** to the changegroup.
++**
++** Rows within the changeset and changegroup are identified by the values in
++** their PRIMARY KEY columns. A change in the changeset is considered to
++** apply to the same row as a change already present in the changegroup if
++** the two rows have the same primary key.
++**
++** Changes to rows that do not already appear in the changegroup are
++** simply copied into it. Or, if both the new changeset and the changegroup
++** contain changes that apply to a single row, the final contents of the
++** changegroup depends on the type of each change, as follows:
++**
++** 
++**   
++**       
++**       
      Existing Change  New Change       Output Change
++**   
      INSERT INSERT 
++**       The new change is ignored. This case does not occur if the new
++**       changeset was recorded immediately after the changesets already
++**       added to the changegroup.
++**   
      INSERT UPDATE 
++**       The INSERT change remains in the changegroup. The values in the
++**       INSERT change are modified as if the row was inserted by the
++**       existing change and then updated according to the new change.
++**   
      INSERT DELETE 
++**       The existing INSERT is removed from the changegroup. The DELETE is
++**       not added.
++**   
      UPDATE INSERT 
++**       The new change is ignored. This case does not occur if the new
++**       changeset was recorded immediately after the changesets already
++**       added to the changegroup.
++**   
      UPDATE UPDATE 
++**       The existing UPDATE remains within the changegroup. It is amended
++**       so that the accompanying values are as if the row was updated once
++**       by the existing change and then again by the new change.
++**   
      UPDATE DELETE 
++**       The existing UPDATE is replaced by the new DELETE within the
++**       changegroup.
++**   
      DELETE INSERT 
++**       If one or more of the column values in the row inserted by the
++**       new change differ from those in the row deleted by the existing
++**       change, the existing DELETE is replaced by an UPDATE within the
++**       changegroup. Otherwise, if the inserted row is exactly the same
++**       as the deleted row, the existing DELETE is simply discarded.
++**   
      DELETE UPDATE 
++**       The new change is ignored. This case does not occur if the new
++**       changeset was recorded immediately after the changesets already
++**       added to the changegroup.
++**   
      DELETE DELETE 
++**       The new change is ignored. This case does not occur if the new
++**       changeset was recorded immediately after the changesets already
++**       added to the changegroup.
++** 
      
++**
++** If the new changeset contains changes to a table that is already present
++** in the changegroup, then the number of columns and the position of the
++** primary key columns for the table must be consistent. If this is not the
++** case, this function fails with SQLITE_SCHEMA. Except, if the changegroup
++** object has been configured with a database schema using the
++** sqlite3changegroup_schema() API, then it is possible to combine changesets
++** with different numbers of columns for a single table, provided that
++** they are otherwise compatible.
++**
++** If the input changeset appears to be corrupt and the corruption is
++** detected, SQLITE_CORRUPT is returned. Or, if an out-of-memory condition
++** occurs during processing, this function returns SQLITE_NOMEM.
++**
++** In all cases, if an error occurs the state of the final contents of the
++** changegroup is undefined. If no error occurs, SQLITE_OK is returned.
++*/
++SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
++
++/*
++** CAPI3REF: Obtain A Composite Changeset From A Changegroup
++** METHOD: sqlite3_changegroup
++**
++** Obtain a buffer containing a changeset (or patchset) representing the
++** current contents of the changegroup. If the inputs to the changegroup
++** were themselves changesets, the output is a changeset. Or, if the
++** inputs were patchsets, the output is also a patchset.
++**
++** As with the output of the sqlite3session_changeset() and
++** sqlite3session_patchset() functions, all changes related to a single
++** table are grouped together in the output of this function. Tables appear
++** in the same order as for the very first changeset added to the changegroup.
++** If the second or subsequent changesets added to the changegroup contain
++** changes for tables that do not appear in the first changeset, they are
++** appended onto the end of the output changeset, again in the order in
++** which they are first encountered.
++**
++** If an error occurs, an SQLite error code is returned and the output
++** variables (*pnData) and (*ppData) are set to 0. Otherwise, SQLITE_OK
++** is returned and the output variables are set to the size of and a
++** pointer to the output buffer, respectively. In this case it is the
++** responsibility of the caller to eventually free the buffer using a
++** call to sqlite3_free().
++*/
++SQLITE_API int sqlite3changegroup_output(
++  sqlite3_changegroup*,
++  int *pnData,                    /* OUT: Size of output buffer in bytes */
++  void **ppData                   /* OUT: Pointer to output buffer */
++);
++
++/*
++** CAPI3REF: Delete A Changegroup Object
++** DESTRUCTOR: sqlite3_changegroup
++*/
++SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);
++
++/*
++** CAPI3REF: Apply A Changeset To A Database
++**
++** Apply a changeset or patchset to a database. These functions attempt to
++** update the "main" database attached to handle db with the changes found in
++** the changeset passed via the second and third arguments.
++**
++** The fourth argument (xFilter) passed to these functions is the "filter
++** callback". If it is not NULL, then for each table affected by at least one
++** change in the changeset, the filter callback is invoked with
++** the table name as the second argument, and a copy of the context pointer
++** passed as the sixth argument as the first. If the "filter callback"
++** returns zero, then no attempt is made to apply any changes to the table.
++** Otherwise, if the return value is non-zero or the xFilter argument to
++** is NULL, all changes related to the table are attempted.
++**
++** For each table that is not excluded by the filter callback, this function
++** tests that the target database contains a compatible table. A table is
++** considered compatible if all of the following are true:
++**
++** 
        
++**   
      •  The table has the same name as the name recorded in the
++**        changeset, and
++**   
      •  The table has at least as many columns as recorded in the
++**        changeset, and
++**   
      •  The table has primary key columns in the same position as
++**        recorded in the changeset.
++** 
      
++**
++** If there is no compatible table, it is not an error, but none of the
++** changes associated with the table are applied. A warning message is issued
++** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
++** one such warning is issued for each table in the changeset.
++**
++** For each change for which there is a compatible table, an attempt is made
++** to modify the table contents according to the UPDATE, INSERT or DELETE
++** change. If a change cannot be applied cleanly, the conflict handler
++** function passed as the fifth argument to sqlite3changeset_apply() may be
++** invoked. A description of exactly when the conflict handler is invoked for
++** each type of change is below.
++**
++** Unlike the xFilter argument, xConflict may not be passed NULL. The results
++** of passing anything other than a valid function pointer as the xConflict
++** argument are undefined.
++**
++** Each time the conflict handler function is invoked, it must return one
++** of [SQLITE_CHANGESET_OMIT], [SQLITE_CHANGESET_ABORT] or
++** [SQLITE_CHANGESET_REPLACE]. SQLITE_CHANGESET_REPLACE may only be returned
++** if the second argument passed to the conflict handler is either
++** SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If the conflict-handler
++** returns an illegal value, any changes already made are rolled back and
++** the call to sqlite3changeset_apply() returns SQLITE_MISUSE. Different
++** actions are taken by sqlite3changeset_apply() depending on the value
++** returned by each invocation of the conflict-handler function. Refer to
++** the documentation for the three
++** [SQLITE_CHANGESET_OMIT|available return values] for details.
++**
++** 
      
++** 
      DELETE Changes
      
++**   For each DELETE change, the function checks if the target database
++**   contains a row with the same primary key value (or values) as the
++**   original row values stored in the changeset. If it does, and the values
++**   stored in all non-primary key columns also match the values stored in
++**   the changeset the row is deleted from the target database.
++**
++**   If a row with matching primary key values is found, but one or more of
++**   the non-primary key fields contains a value different from the original
++**   row value stored in the changeset, the conflict-handler function is
++**   invoked with [SQLITE_CHANGESET_DATA] as the second argument. If the
++**   database table has more columns than are recorded in the changeset,
++**   only the values of those non-primary key fields are compared against
++**   the current database contents - any trailing database table columns
++**   are ignored.
++**
++**   If no row with matching primary key values is found in the database,
++**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
++**   passed as the second argument.
++**
++**   If the DELETE operation is attempted, but SQLite returns SQLITE_CONSTRAINT
++**   (which can only happen if a foreign key constraint is violated), the
++**   conflict-handler function is invoked with [SQLITE_CHANGESET_CONSTRAINT]
++**   passed as the second argument. This includes the case where the DELETE
++**   operation is attempted because an earlier call to the conflict handler
++**   function returned [SQLITE_CHANGESET_REPLACE].
++**
++** 
      INSERT Changes
      
++**   For each INSERT change, an attempt is made to insert the new row into
++**   the database. If the changeset row contains fewer fields than the
++**   database table, the trailing fields are populated with their default
++**   values.
++**
++**   If the attempt to insert the row fails because the database already
++**   contains a row with the same primary key values, the conflict handler
++**   function is invoked with the second argument set to
++**   [SQLITE_CHANGESET_CONFLICT].
++**
++**   If the attempt to insert the row fails because of some other constraint
++**   violation (e.g. NOT NULL or UNIQUE), the conflict handler function is
++**   invoked with the second argument set to [SQLITE_CHANGESET_CONSTRAINT].
++**   This includes the case where the INSERT operation is re-attempted because
++**   an earlier call to the conflict handler function returned
++**   [SQLITE_CHANGESET_REPLACE].
++**
++** 
      UPDATE Changes
      
++**   For each UPDATE change, the function checks if the target database
++**   contains a row with the same primary key value (or values) as the
++**   original row values stored in the changeset. If it does, and the values
++**   stored in all modified non-primary key columns also match the values
++**   stored in the changeset the row is updated within the target database.
++**
++**   If a row with matching primary key values is found, but one or more of
++**   the modified non-primary key fields contains a value different from an
++**   original row value stored in the changeset, the conflict-handler function
++**   is invoked with [SQLITE_CHANGESET_DATA] as the second argument. Since
++**   UPDATE changes only contain values for non-primary key fields that are
++**   to be modified, only those fields need to match the original values to
++**   avoid the SQLITE_CHANGESET_DATA conflict-handler callback.
++**
++**   If no row with matching primary key values is found in the database,
++**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
++**   passed as the second argument.
++**
++**   If the UPDATE operation is attempted, but SQLite returns
++**   SQLITE_CONSTRAINT, the conflict-handler function is invoked with
++**   [SQLITE_CHANGESET_CONSTRAINT] passed as the second argument.
++**   This includes the case where the UPDATE operation is attempted after
++**   an earlier call to the conflict handler function returned
++**   [SQLITE_CHANGESET_REPLACE].
++** 
      
++**
++** It is safe to execute SQL statements, including those that write to the
++** table that the callback related to, from within the xConflict callback.
++** This can be used to further customize the application's conflict
++** resolution strategy.
++**
++** All changes made by these functions are enclosed in a savepoint transaction.
++** If any other error (aside from a constraint failure when attempting to
++** write to the target database) occurs, then the savepoint transaction is
++** rolled back, restoring the target database to its original state, and an
++** SQLite error code returned.
++**
++** If the output parameters (ppRebase) and (pnRebase) are non-NULL and
++** the input is a changeset (not a patchset), then sqlite3changeset_apply_v2()
++** may set (*ppRebase) to point to a "rebase" that may be used with the
++** sqlite3_rebaser APIs buffer before returning. In this case (*pnRebase)
++** is set to the size of the buffer in bytes. It is the responsibility of the
++** caller to eventually free any such buffer using sqlite3_free(). The buffer
++** is only allocated and populated if one or more conflicts were encountered
++** while applying the patchset. See comments surrounding the sqlite3_rebaser
++** APIs for further details.
++**
++** The behavior of sqlite3changeset_apply_v2() and its streaming equivalent
++** may be modified by passing a combination of
++** [SQLITE_CHANGESETAPPLY_NOSAVEPOINT | supported flags] as the 9th parameter.
++**
++** Note that the sqlite3changeset_apply_v2() API is still experimental
++** and therefore subject to change.
++*/
++SQLITE_API int sqlite3changeset_apply(
++  sqlite3 *db,                    /* Apply change to "main" db of this handle */
++  int nChangeset,                 /* Size of changeset in bytes */
++  void *pChangeset,               /* Changeset blob */
++  int(*xFilter)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    const char *zTab              /* Table name */
++  ),
++  int(*xConflict)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
++    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
++  ),
++  void *pCtx                      /* First argument passed to xConflict */
++);
++SQLITE_API int sqlite3changeset_apply_v2(
++  sqlite3 *db,                    /* Apply change to "main" db of this handle */
++  int nChangeset,                 /* Size of changeset in bytes */
++  void *pChangeset,               /* Changeset blob */
++  int(*xFilter)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    const char *zTab              /* Table name */
++  ),
++  int(*xConflict)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
++    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
++  ),
++  void *pCtx,                     /* First argument passed to xConflict */
++  void **ppRebase, int *pnRebase, /* OUT: Rebase data */
++  int flags                       /* SESSION_CHANGESETAPPLY_* flags */
++);
++
++/*
++** CAPI3REF: Flags for sqlite3changeset_apply_v2
++**
++** The following flags may passed via the 9th parameter to
++** [sqlite3changeset_apply_v2] and [sqlite3changeset_apply_v2_strm]:
++**
++** 
      
++** 
      SQLITE_CHANGESETAPPLY_NOSAVEPOINT 
      
++**   Usually, the sessions module encloses all operations performed by
++**   a single call to apply_v2() or apply_v2_strm() in a [SAVEPOINT]. The
++**   SAVEPOINT is committed if the changeset or patchset is successfully
++**   applied, or rolled back if an error occurs. Specifying this flag
++**   causes the sessions module to omit this savepoint. In this case, if the
++**   caller has an open transaction or savepoint when apply_v2() is called,
++**   it may revert the partially applied changeset by rolling it back.
++**
++** 
      SQLITE_CHANGESETAPPLY_INVERT 
      
++**   Invert the changeset before applying it. This is equivalent to inverting
++**   a changeset using sqlite3changeset_invert() before applying it. It is
++**   an error to specify this flag with a patchset.
++**
++** 
      SQLITE_CHANGESETAPPLY_IGNORENOOP 
      
++**   Do not invoke the conflict handler callback for any changes that
++**   would not actually modify the database even if they were applied.
++**   Specifically, this means that the conflict handler is not invoked
++**   for:
++**    
        
++**    
      • a delete change if the row being deleted cannot be found,
++**    
      • an update change if the modified fields are already set to
++**        their new values in the conflicting row, or
++**    
      • an insert change if all fields of the conflicting row match
++**        the row being inserted.
++**    
      
++**
++** 
      SQLITE_CHANGESETAPPLY_FKNOACTION 
      
++**   If this flag it set, then all foreign key constraints in the target
++**   database behave as if they were declared with "ON UPDATE NO ACTION ON
++**   DELETE NO ACTION", even if they are actually CASCADE, RESTRICT, SET NULL
++**   or SET DEFAULT.
++*/
++#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT   0x0001
++#define SQLITE_CHANGESETAPPLY_INVERT        0x0002
++#define SQLITE_CHANGESETAPPLY_IGNORENOOP    0x0004
++#define SQLITE_CHANGESETAPPLY_FKNOACTION    0x0008
++
++/*
++** CAPI3REF: Constants Passed To The Conflict Handler
++**
++** Values that may be passed as the second argument to a conflict-handler.
++**
++** 
      
++** 
      SQLITE_CHANGESET_DATA
      
++**   The conflict handler is invoked with CHANGESET_DATA as the second argument
++**   when processing a DELETE or UPDATE change if a row with the required
++**   PRIMARY KEY fields is present in the database, but one or more other
++**   (non primary-key) fields modified by the update do not contain the
++**   expected "before" values.
++**
++**   The conflicting row, in this case, is the database row with the matching
++**   primary key.
++**
++** 
      SQLITE_CHANGESET_NOTFOUND
      
++**   The conflict handler is invoked with CHANGESET_NOTFOUND as the second
++**   argument when processing a DELETE or UPDATE change if a row with the
++**   required PRIMARY KEY fields is not present in the database.
++**
++**   There is no conflicting row in this case. The results of invoking the
++**   sqlite3changeset_conflict() API are undefined.
++**
++** 
      SQLITE_CHANGESET_CONFLICT
      
++**   CHANGESET_CONFLICT is passed as the second argument to the conflict
++**   handler while processing an INSERT change if the operation would result
++**   in duplicate primary key values.
++**
++**   The conflicting row in this case is the database row with the matching
++**   primary key.
++**
++** 
      SQLITE_CHANGESET_FOREIGN_KEY
      
++**   If foreign key handling is enabled, and applying a changeset leaves the
++**   database in a state containing foreign key violations, the conflict
++**   handler is invoked with CHANGESET_FOREIGN_KEY as the second argument
++**   exactly once before the changeset is committed. If the conflict handler
++**   returns CHANGESET_OMIT, the changes, including those that caused the
++**   foreign key constraint violation, are committed. Or, if it returns
++**   CHANGESET_ABORT, the changeset is rolled back.
++**
++**   No current or conflicting row information is provided. The only function
++**   it is possible to call on the supplied sqlite3_changeset_iter handle
++**   is sqlite3changeset_fk_conflicts().
++**
++** 
      SQLITE_CHANGESET_CONSTRAINT
      
++**   If any other constraint violation occurs while applying a change (i.e.
++**   a UNIQUE, CHECK or NOT NULL constraint), the conflict handler is
++**   invoked with CHANGESET_CONSTRAINT as the second argument.
++**
++**   There is no conflicting row in this case. The results of invoking the
++**   sqlite3changeset_conflict() API are undefined.
++**
++** 
      
++*/
++#define SQLITE_CHANGESET_DATA        1
++#define SQLITE_CHANGESET_NOTFOUND    2
++#define SQLITE_CHANGESET_CONFLICT    3
++#define SQLITE_CHANGESET_CONSTRAINT  4
++#define SQLITE_CHANGESET_FOREIGN_KEY 5
++
++/*
++** CAPI3REF: Constants Returned By The Conflict Handler
++**
++** A conflict handler callback must return one of the following three values.
++**
++** 
      
++** 
      SQLITE_CHANGESET_OMIT
      
++**   If a conflict handler returns this value no special action is taken. The
++**   change that caused the conflict is not applied. The session module
++**   continues to the next change in the changeset.
++**
++** 
      SQLITE_CHANGESET_REPLACE
      
++**   This value may only be returned if the second argument to the conflict
++**   handler was SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If this
++**   is not the case, any changes applied so far are rolled back and the
++**   call to sqlite3changeset_apply() returns SQLITE_MISUSE.
++**
++**   If CHANGESET_REPLACE is returned by an SQLITE_CHANGESET_DATA conflict
++**   handler, then the conflicting row is either updated or deleted, depending
++**   on the type of change.
++**
++**   If CHANGESET_REPLACE is returned by an SQLITE_CHANGESET_CONFLICT conflict
++**   handler, then the conflicting row is removed from the database and a
++**   second attempt to apply the change is made. If this second attempt fails,
++**   the original row is restored to the database before continuing.
++**
++** 
      SQLITE_CHANGESET_ABORT
      
++**   If this value is returned, any changes applied so far are rolled back
++**   and the call to sqlite3changeset_apply() returns SQLITE_ABORT.
++** 
      
++*/
++#define SQLITE_CHANGESET_OMIT       0
++#define SQLITE_CHANGESET_REPLACE    1
++#define SQLITE_CHANGESET_ABORT      2
++
++/*
++** CAPI3REF: Rebasing changesets
++** EXPERIMENTAL
++**
++** Suppose there is a site hosting a database in state S0. And that
++** modifications are made that move that database to state S1 and a
++** changeset recorded (the "local" changeset). Then, a changeset based
++** on S0 is received from another site (the "remote" changeset) and
++** applied to the database. The database is then in state
++** (S1+"remote"), where the exact state depends on any conflict
++** resolution decisions (OMIT or REPLACE) made while applying "remote".
++** Rebasing a changeset is to update it to take those conflict
++** resolution decisions into account, so that the same conflicts
++** do not have to be resolved elsewhere in the network.
++**
++** For example, if both the local and remote changesets contain an
++** INSERT of the same key on "CREATE TABLE t1(a PRIMARY KEY, b)":
++**
++**   local:  INSERT INTO t1 VALUES(1, 'v1');
++**   remote: INSERT INTO t1 VALUES(1, 'v2');
++**
++** and the conflict resolution is REPLACE, then the INSERT change is
++** removed from the local changeset (it was overridden). Or, if the
++** conflict resolution was "OMIT", then the local changeset is modified
++** to instead contain:
++**
++**           UPDATE t1 SET b = 'v2' WHERE a=1;
++**
++** Changes within the local changeset are rebased as follows:
++**
++** 
      
++** 
      Local INSERT
      
++**   This may only conflict with a remote INSERT. If the conflict
++**   resolution was OMIT, then add an UPDATE change to the rebased
++**   changeset. Or, if the conflict resolution was REPLACE, add
++**   nothing to the rebased changeset.
++**
++** 
      Local DELETE
      
++**   This may conflict with a remote UPDATE or DELETE. In both cases the
++**   only possible resolution is OMIT. If the remote operation was a
++**   DELETE, then add no change to the rebased changeset. If the remote
++**   operation was an UPDATE, then the old.* fields of change are updated
++**   to reflect the new.* values in the UPDATE.
++**
++** 
      Local UPDATE
      
++**   This may conflict with a remote UPDATE or DELETE. If it conflicts
++**   with a DELETE, and the conflict resolution was OMIT, then the update
++**   is changed into an INSERT. Any undefined values in the new.* record
++**   from the update change are filled in using the old.* values from
++**   the conflicting DELETE. Or, if the conflict resolution was REPLACE,
++**   the UPDATE change is simply omitted from the rebased changeset.
++**
++**   If conflict is with a remote UPDATE and the resolution is OMIT, then
++**   the old.* values are rebased using the new.* values in the remote
++**   change. Or, if the resolution is REPLACE, then the change is copied
++**   into the rebased changeset with updates to columns also updated by
++**   the conflicting remote UPDATE removed. If this means no columns would
++**   be updated, the change is omitted.
++** 
      
++**
++** A local change may be rebased against multiple remote changes
++** simultaneously. If a single key is modified by multiple remote
++** changesets, they are combined as follows before the local changeset
++** is rebased:
++**
++** 
        
++**    
      •  If there has been one or more REPLACE resolutions on a
++**         key, it is rebased according to a REPLACE.
++**
++**    
      •  If there have been no REPLACE resolutions on a key, then
++**         the local changeset is rebased according to the most recent
++**         of the OMIT resolutions.
++** 
      
++**
++** Note that conflict resolutions from multiple remote changesets are
++** combined on a per-field basis, not per-row. This means that in the
++** case of multiple remote UPDATE operations, some fields of a single
++** local change may be rebased for REPLACE while others are rebased for
++** OMIT.
++**
++** In order to rebase a local changeset, the remote changeset must first
++** be applied to the local database using sqlite3changeset_apply_v2() and
++** the buffer of rebase information captured. Then:
++**
++** 
        
++**   
      1.  An sqlite3_rebaser object is created by calling
++**        sqlite3rebaser_create().
++**   
      2.  The new object is configured with the rebase buffer obtained from
++**        sqlite3changeset_apply_v2() by calling sqlite3rebaser_configure().
++**        If the local changeset is to be rebased against multiple remote
++**        changesets, then sqlite3rebaser_configure() should be called
++**        multiple times, in the same order that the multiple
++**        sqlite3changeset_apply_v2() calls were made.
++**   
      3.  Each local changeset is rebased by calling sqlite3rebaser_rebase().
++**   
      4.  The sqlite3_rebaser object is deleted by calling
++**        sqlite3rebaser_delete().
++** 
      
++*/
++typedef struct sqlite3_rebaser sqlite3_rebaser;
++
++/*
++** CAPI3REF: Create a changeset rebaser object.
++** EXPERIMENTAL
++**
++** Allocate a new changeset rebaser object. If successful, set (*ppNew) to
++** point to the new object and return SQLITE_OK. Otherwise, if an error
++** occurs, return an SQLite error code (e.g. SQLITE_NOMEM) and set (*ppNew)
++** to NULL.
++*/
++SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser **ppNew);
++
++/*
++** CAPI3REF: Configure a changeset rebaser object.
++** EXPERIMENTAL
++**
++** Configure the changeset rebaser object to rebase changesets according
++** to the conflict resolutions described by buffer pRebase (size nRebase
++** bytes), which must have been obtained from a previous call to
++** sqlite3changeset_apply_v2().
++*/
++SQLITE_API int sqlite3rebaser_configure(
++  sqlite3_rebaser*,
++  int nRebase, const void *pRebase
++);
++
++/*
++** CAPI3REF: Rebase a changeset
++** EXPERIMENTAL
++**
++** Argument pIn must point to a buffer containing a changeset nIn bytes
++** in size. This function allocates and populates a buffer with a copy
++** of the changeset rebased according to the configuration of the
++** rebaser object passed as the first argument. If successful, (*ppOut)
++** is set to point to the new buffer containing the rebased changeset and
++** (*pnOut) to its size in bytes and SQLITE_OK returned. It is the
++** responsibility of the caller to eventually free the new buffer using
++** sqlite3_free(). Otherwise, if an error occurs, (*ppOut) and (*pnOut)
++** are set to zero and an SQLite error code returned.
++*/
++SQLITE_API int sqlite3rebaser_rebase(
++  sqlite3_rebaser*,
++  int nIn, const void *pIn,
++  int *pnOut, void **ppOut
++);
++
++/*
++** CAPI3REF: Delete a changeset rebaser object.
++** EXPERIMENTAL
++**
++** Delete the changeset rebaser object and all associated resources. There
++** should be one call to this function for each successful invocation
++** of sqlite3rebaser_create().
++*/
++SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);
++
++/*
++** CAPI3REF: Streaming Versions of API functions.
++**
++** The six streaming API xxx_strm() functions serve similar purposes to the
++** corresponding non-streaming API functions:
++**
++** 
++**   
++**   
      Streaming functionNon-streaming equivalent
      sqlite3changeset_apply_strm[sqlite3changeset_apply]
++**   
      sqlite3changeset_apply_strm_v2[sqlite3changeset_apply_v2]
++**   
      sqlite3changeset_concat_strm[sqlite3changeset_concat]
++**   
      sqlite3changeset_invert_strm[sqlite3changeset_invert]
++**   
      sqlite3changeset_start_strm[sqlite3changeset_start]
++**   
      sqlite3session_changeset_strm[sqlite3session_changeset]
++**   
      sqlite3session_patchset_strm[sqlite3session_patchset]
++** 
      
++**
++** Non-streaming functions that accept changesets (or patchsets) as input
++** require that the entire changeset be stored in a single buffer in memory.
++** Similarly, those that return a changeset or patchset do so by returning
++** a pointer to a single large buffer allocated using sqlite3_malloc().
++** Normally this is convenient. However, if an application running in a
++** low-memory environment is required to handle very large changesets, the
++** large contiguous memory allocations required can become onerous.
++**
++** In order to avoid this problem, instead of a single large buffer, input
++** is passed to a streaming API functions by way of a callback function that
++** the sessions module invokes to incrementally request input data as it is
++** required. In all cases, a pair of API function parameters such as
++**
++**  
      ++**        int nChangeset,
++**        void *pChangeset,
++**  
      
++**
++** Is replaced by:
++**
++**  
      ++**        int (*xInput)(void *pIn, void *pData, int *pnData),
++**        void *pIn,
++**  
      
++**
++** Each time the xInput callback is invoked by the sessions module, the first
++** argument passed is a copy of the supplied pIn context pointer. The second
++** argument, pData, points to a buffer (*pnData) bytes in size. Assuming no
++** error occurs the xInput method should copy up to (*pnData) bytes of data
++** into the buffer and set (*pnData) to the actual number of bytes copied
++** before returning SQLITE_OK. If the input is completely exhausted, (*pnData)
++** should be set to zero to indicate this. Or, if an error occurs, an SQLite
++** error code should be returned. In all cases, if an xInput callback returns
++** an error, all processing is abandoned and the streaming API function
++** returns a copy of the error code to the caller.
++**
++** In the case of sqlite3changeset_start_strm(), the xInput callback may be
++** invoked by the sessions module at any point during the lifetime of the
++** iterator. If such an xInput callback returns an error, the iterator enters
++** an error state, whereby all subsequent calls to iterator functions
++** immediately fail with the same error code as returned by xInput.
++**
++** Similarly, streaming API functions that return changesets (or patchsets)
++** return them in chunks by way of a callback function instead of via a
++** pointer to a single large buffer. In this case, a pair of parameters such
++** as:
++**
++**  
      ++**        int *pnChangeset,
++**        void **ppChangeset,
++**  
      
++**
++** Is replaced by:
++**
++**  
      ++**        int (*xOutput)(void *pOut, const void *pData, int nData),
++**        void *pOut
++**  
      
++**
++** The xOutput callback is invoked zero or more times to return data to
++** the application. The first parameter passed to each call is a copy of the
++** pOut pointer supplied by the application. The second parameter, pData,
++** points to a buffer nData bytes in size containing the chunk of output
++** data being returned. If the xOutput callback successfully processes the
++** supplied data, it should return SQLITE_OK to indicate success. Otherwise,
++** it should return some other SQLite error code. In this case processing
++** is immediately abandoned and the streaming API function returns a copy
++** of the xOutput error code to the application.
++**
++** The sessions module never invokes an xOutput callback with the third
++** parameter set to a value less than or equal to zero. Other than this,
++** no guarantees are made as to the size of the chunks of data returned.
++*/
++SQLITE_API int sqlite3changeset_apply_strm(
++  sqlite3 *db,                    /* Apply change to "main" db of this handle */
++  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
++  void *pIn,                                          /* First arg for xInput */
++  int(*xFilter)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    const char *zTab              /* Table name */
++  ),
++  int(*xConflict)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
++    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
++  ),
++  void *pCtx                      /* First argument passed to xConflict */
++);
++SQLITE_API int sqlite3changeset_apply_v2_strm(
++  sqlite3 *db,                    /* Apply change to "main" db of this handle */
++  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
++  void *pIn,                                          /* First arg for xInput */
++  int(*xFilter)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    const char *zTab              /* Table name */
++  ),
++  int(*xConflict)(
++    void *pCtx,                   /* Copy of sixth arg to _apply() */
++    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
++    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
++  ),
++  void *pCtx,                     /* First argument passed to xConflict */
++  void **ppRebase, int *pnRebase,
++  int flags
++);
++SQLITE_API int sqlite3changeset_concat_strm(
++  int (*xInputA)(void *pIn, void *pData, int *pnData),
++  void *pInA,
++  int (*xInputB)(void *pIn, void *pData, int *pnData),
++  void *pInB,
++  int (*xOutput)(void *pOut, const void *pData, int nData),
++  void *pOut
++);
++SQLITE_API int sqlite3changeset_invert_strm(
++  int (*xInput)(void *pIn, void *pData, int *pnData),
++  void *pIn,
++  int (*xOutput)(void *pOut, const void *pData, int nData),
++  void *pOut
++);
++SQLITE_API int sqlite3changeset_start_strm(
++  sqlite3_changeset_iter **pp,
++  int (*xInput)(void *pIn, void *pData, int *pnData),
++  void *pIn
++);
++SQLITE_API int sqlite3changeset_start_v2_strm(
++  sqlite3_changeset_iter **pp,
++  int (*xInput)(void *pIn, void *pData, int *pnData),
++  void *pIn,
++  int flags
++);
++SQLITE_API int sqlite3session_changeset_strm(
++  sqlite3_session *pSession,
++  int (*xOutput)(void *pOut, const void *pData, int nData),
++  void *pOut
++);
++SQLITE_API int sqlite3session_patchset_strm(
++  sqlite3_session *pSession,
++  int (*xOutput)(void *pOut, const void *pData, int nData),
++  void *pOut
++);
++SQLITE_API int sqlite3changegroup_add_strm(sqlite3_changegroup*,
++    int (*xInput)(void *pIn, void *pData, int *pnData),
++    void *pIn
++);
++SQLITE_API int sqlite3changegroup_output_strm(sqlite3_changegroup*,
++    int (*xOutput)(void *pOut, const void *pData, int nData),
++    void *pOut
++);
++SQLITE_API int sqlite3rebaser_rebase_strm(
++  sqlite3_rebaser *pRebaser,
++  int (*xInput)(void *pIn, void *pData, int *pnData),
++  void *pIn,
++  int (*xOutput)(void *pOut, const void *pData, int nData),
++  void *pOut
++);
++
++/*
++** CAPI3REF: Configure global parameters
++**
++** The sqlite3session_config() interface is used to make global configuration
++** changes to the sessions module in order to tune it to the specific needs
++** of the application.
++**
++** The sqlite3session_config() interface is not threadsafe. If it is invoked
++** while any other thread is inside any other sessions method then the
++** results are undefined. Furthermore, if it is invoked after any sessions
++** related objects have been created, the results are also undefined.
++**
++** The first argument to the sqlite3session_config() function must be one
++** of the SQLITE_SESSION_CONFIG_XXX constants defined below. The
++** interpretation of the (void*) value passed as the second parameter and
++** the effect of calling this function depends on the value of the first
++** parameter.
++**
++** 
      
++** 
      SQLITE_SESSION_CONFIG_STRMSIZE
      
++**    By default, the sessions module streaming interfaces attempt to input
++**    and output data in approximately 1 KiB chunks. This operand may be used
++**    to set and query the value of this configuration setting. The pointer
++**    passed as the second argument must point to a value of type (int).
++**    If this value is greater than 0, it is used as the new streaming data
++**    chunk size for both input and output. Before returning, the (int) value
++**    pointed to by pArg is set to the final value of the streaming interface
++**    chunk size.
++** 
      
++**
++** This function returns SQLITE_OK if successful, or an SQLite error code
++** otherwise.
++*/
++SQLITE_API int sqlite3session_config(int op, void *pArg);
++
++/*
++** CAPI3REF: Values for sqlite3session_config().
++*/
++#define SQLITE_SESSION_CONFIG_STRMSIZE 1
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++}
++#endif
++
++#endif  /* !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION) */
++
++/******** End of sqlite3session.h *********/
++/******** Begin file fts5.h *********/
++/*
++** 2014 May 31
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** Interfaces to extend FTS5. Using the interfaces defined in this file,
++** FTS5 may be extended with:
++**
++**     * custom tokenizers, and
++**     * custom auxiliary functions.
++*/
++
++
++#ifndef _FTS5_H
++#define _FTS5_H
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*************************************************************************
++** CUSTOM AUXILIARY FUNCTIONS
++**
++** Virtual table implementations may overload SQL functions by implementing
++** the sqlite3_module.xFindFunction() method.
++*/
++
++typedef struct Fts5ExtensionApi Fts5ExtensionApi;
++typedef struct Fts5Context Fts5Context;
++typedef struct Fts5PhraseIter Fts5PhraseIter;
++
++typedef void (*fts5_extension_function)(
++  const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
++  Fts5Context *pFts,              /* First arg to pass to pApi functions */
++  sqlite3_context *pCtx,          /* Context for returning result/error */
++  int nVal,                       /* Number of values in apVal[] array */
++  sqlite3_value **apVal           /* Array of trailing arguments */
++);
++
++struct Fts5PhraseIter {
++  const unsigned char *a;
++  const unsigned char *b;
++};
++
++/*
++** EXTENSION API FUNCTIONS
++**
++** xUserData(pFts):
++**   Return a copy of the context pointer the extension function was
++**   registered with.
++**
++** xColumnTotalSize(pFts, iCol, pnToken):
++**   If parameter iCol is less than zero, set output variable *pnToken
++**   to the total number of tokens in the FTS5 table. Or, if iCol is
++**   non-negative but less than the number of columns in the table, return
++**   the total number of tokens in column iCol, considering all rows in
++**   the FTS5 table.
++**
++**   If parameter iCol is greater than or equal to the number of columns
++**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
++**   an OOM condition or IO error), an appropriate SQLite error code is
++**   returned.
++**
++** xColumnCount(pFts):
++**   Return the number of columns in the table.
++**
++** xColumnSize(pFts, iCol, pnToken):
++**   If parameter iCol is less than zero, set output variable *pnToken
++**   to the total number of tokens in the current row. Or, if iCol is
++**   non-negative but less than the number of columns in the table, set
++**   *pnToken to the number of tokens in column iCol of the current row.
++**
++**   If parameter iCol is greater than or equal to the number of columns
++**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
++**   an OOM condition or IO error), an appropriate SQLite error code is
++**   returned.
++**
++**   This function may be quite inefficient if used with an FTS5 table
++**   created with the "columnsize=0" option.
++**
++** xColumnText:
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of columns in the table, SQLITE_RANGE is returned.
++**
++**   Otherwise, this function attempts to retrieve the text of column iCol of
++**   the current document. If successful, (*pz) is set to point to a buffer
++**   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
++**   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
++**   if an error occurs, an SQLite error code is returned and the final values
++**   of (*pz) and (*pn) are undefined.
++**
++** xPhraseCount:
++**   Returns the number of phrases in the current query expression.
++**
++** xPhraseSize:
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of phrases in the current query, as returned by xPhraseCount,
++**   0 is returned. Otherwise, this function returns the number of tokens in
++**   phrase iPhrase of the query. Phrases are numbered starting from zero.
++**
++** xInstCount:
++**   Set *pnInst to the total number of occurrences of all phrases within
++**   the query within the current row. Return SQLITE_OK if successful, or
++**   an error code (i.e. SQLITE_NOMEM) if an error occurs.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option. If the FTS5 table is created
++**   with either "detail=none" or "detail=column" and "content=" option
++**   (i.e. if it is a contentless table), then this API always returns 0.
++**
++** xInst:
++**   Query for the details of phrase match iIdx within the current row.
++**   Phrase matches are numbered starting from zero, so the iIdx argument
++**   should be greater than or equal to zero and smaller than the value
++**   output by xInstCount(). If iIdx is less than zero or greater than
++**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
++**
++**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
++**   to the column in which it occurs and *piOff the token offset of the
++**   first token of the phrase. SQLITE_OK is returned if successful, or an
++**   error code (i.e. SQLITE_NOMEM) if an error occurs.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option.
++**
++** xRowid:
++**   Returns the rowid of the current row.
++**
++** xTokenize:
++**   Tokenize text using the tokenizer belonging to the FTS5 table.
++**
++** xQueryPhrase(pFts5, iPhrase, pUserData, xCallback):
++**   This API function is used to query the FTS table for phrase iPhrase
++**   of the current query. Specifically, a query equivalent to:
++**
++**       ... FROM ftstable WHERE ftstable MATCH $p ORDER BY rowid
++**
++**   with $p set to a phrase equivalent to the phrase iPhrase of the
++**   current query is executed. Any column filter that applies to
++**   phrase iPhrase of the current query is included in $p. For each
++**   row visited, the callback function passed as the fourth argument
++**   is invoked. The context and API objects passed to the callback
++**   function may be used to access the properties of each matched row.
++**   Invoking Api.xUserData() returns a copy of the pointer passed as
++**   the third argument to pUserData.
++**
++**   If parameter iPhrase is less than zero, or greater than or equal to
++**   the number of phrases in the query, as returned by xPhraseCount(),
++**   this function returns SQLITE_RANGE.
++**
++**   If the callback function returns any value other than SQLITE_OK, the
++**   query is abandoned and the xQueryPhrase function returns immediately.
++**   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
++**   Otherwise, the error code is propagated upwards.
++**
++**   If the query runs to completion without incident, SQLITE_OK is returned.
++**   Or, if some error occurs before the query completes or is aborted by
++**   the callback, an SQLite error code is returned.
++**
++**
++** xSetAuxdata(pFts5, pAux, xDelete)
++**
++**   Save the pointer passed as the second argument as the extension function's
++**   "auxiliary data". The pointer may then be retrieved by the current or any
++**   future invocation of the same fts5 extension function made as part of
++**   the same MATCH query using the xGetAuxdata() API.
++**
++**   Each extension function is allocated a single auxiliary data slot for
++**   each FTS query (MATCH expression). If the extension function is invoked
++**   more than once for a single FTS query, then all invocations share a
++**   single auxiliary data context.
++**
++**   If there is already an auxiliary data pointer when this function is
++**   invoked, then it is replaced by the new pointer. If an xDelete callback
++**   was specified along with the original pointer, it is invoked at this
++**   point.
++**
++**   The xDelete callback, if one is specified, is also invoked on the
++**   auxiliary data pointer after the FTS5 query has finished.
++**
++**   If an error (e.g. an OOM condition) occurs within this function,
++**   the auxiliary data is set to NULL and an error code returned. If the
++**   xDelete parameter was not NULL, it is invoked on the auxiliary data
++**   pointer before returning.
++**
++**
++** xGetAuxdata(pFts5, bClear)
++**
++**   Returns the current auxiliary data pointer for the fts5 extension
++**   function. See the xSetAuxdata() method for details.
++**
++**   If the bClear argument is non-zero, then the auxiliary data is cleared
++**   (set to NULL) before this function returns. In this case the xDelete,
++**   if any, is not invoked.
++**
++**
++** xRowCount(pFts5, pnRow)
++**
++**   This function is used to retrieve the total number of rows in the table.
++**   In other words, the same value that would be returned by:
++**
++**        SELECT count(*) FROM ftstable;
++**
++** xPhraseFirst()
++**   This function is used, along with type Fts5PhraseIter and the xPhraseNext
++**   method, to iterate through all instances of a single query phrase within
++**   the current row. This is the same information as is accessible via the
++**   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
++**   to use, this API may be faster under some circumstances. To iterate
++**   through instances of phrase iPhrase, use the following code:
++**
++**       Fts5PhraseIter iter;
++**       int iCol, iOff;
++**       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
++**           iCol>=0;
++**           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
++**       ){
++**         // An instance of phrase iPhrase at offset iOff of column iCol
++**       }
++**
++**   The Fts5PhraseIter structure is defined above. Applications should not
++**   modify this structure directly - it should only be used as shown above
++**   with the xPhraseFirst() and xPhraseNext() API methods (and by
++**   xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below).
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option. If the FTS5 table is created
++**   with either "detail=none" or "detail=column" and "content=" option
++**   (i.e. if it is a contentless table), then this API always iterates
++**   through an empty set (all calls to xPhraseFirst() set iCol to -1).
++**
++** xPhraseNext()
++**   See xPhraseFirst above.
++**
++** xPhraseFirstColumn()
++**   This function and xPhraseNextColumn() are similar to the xPhraseFirst()
++**   and xPhraseNext() APIs described above. The difference is that instead
++**   of iterating through all instances of a phrase in the current row, these
++**   APIs are used to iterate through the set of columns in the current row
++**   that contain one or more instances of a specified phrase. For example:
++**
++**       Fts5PhraseIter iter;
++**       int iCol;
++**       for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol);
++**           iCol>=0;
++**           pApi->xPhraseNextColumn(pFts, &iter, &iCol)
++**       ){
++**         // Column iCol contains at least one instance of phrase iPhrase
++**       }
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" option. If the FTS5 table is created with either
++**   "detail=none" "content=" option (i.e. if it is a contentless table),
++**   then this API always iterates through an empty set (all calls to
++**   xPhraseFirstColumn() set iCol to -1).
++**
++**   The information accessed using this API and its companion
++**   xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext
++**   (or xInst/xInstCount). The chief advantage of this API is that it is
++**   significantly more efficient than those alternatives when used with
++**   "detail=column" tables.
++**
++** xPhraseNextColumn()
++**   See xPhraseFirstColumn above.
++**
++** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase iPhrase of the current
++**   query. Before returning, output parameter *ppToken is set to point
++**   to a buffer containing the requested token, and *pnToken to the
++**   size of this buffer in bytes.
++**
++**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
++**   or equal to the number of phrases in the query as reported by
++**   xPhraseCount(), or if iToken is equal to or greater than the number of
++**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
++     are both zeroed.
++**
++**   The output text is not a copy of the query text that specified the
++**   token. It is the output of the tokenizer module. For tokendata=1
++**   tables, this includes any embedded 0x00 and trailing data.
++**
++** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase hit iIdx within the
++**   current row. If iIdx is less than zero or greater than or equal to the
++**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
++**   output variable (*ppToken) is set to point to a buffer containing the
++**   matching document token, and (*pnToken) to the size of that buffer in
++**   bytes. This API is not available if the specified token matches a
++**   prefix query term. In that case both output variables are always set
++**   to 0.
++**
++**   The output text is not a copy of the document text that was tokenized.
++**   It is the output of the tokenizer module. For tokendata=1 tables, this
++**   includes any embedded 0x00 and trailing data.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option.
++*/
++struct Fts5ExtensionApi {
++  int iVersion;                   /* Currently always set to 3 */
++
++  void *(*xUserData)(Fts5Context*);
++
++  int (*xColumnCount)(Fts5Context*);
++  int (*xRowCount)(Fts5Context*, sqlite3_int64 *pnRow);
++  int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64 *pnToken);
++
++  int (*xTokenize)(Fts5Context*,
++    const char *pText, int nText, /* Text to tokenize */
++    void *pCtx,                   /* Context passed to xToken() */
++    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
++  );
++
++  int (*xPhraseCount)(Fts5Context*);
++  int (*xPhraseSize)(Fts5Context*, int iPhrase);
++
++  int (*xInstCount)(Fts5Context*, int *pnInst);
++  int (*xInst)(Fts5Context*, int iIdx, int *piPhrase, int *piCol, int *piOff);
++
++  sqlite3_int64 (*xRowid)(Fts5Context*);
++  int (*xColumnText)(Fts5Context*, int iCol, const char **pz, int *pn);
++  int (*xColumnSize)(Fts5Context*, int iCol, int *pnToken);
++
++  int (*xQueryPhrase)(Fts5Context*, int iPhrase, void *pUserData,
++    int(*)(const Fts5ExtensionApi*,Fts5Context*,void*)
++  );
++  int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*));
++  void *(*xGetAuxdata)(Fts5Context*, int bClear);
++
++  int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
++  void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff);
++
++  int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
++  void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
++
++  /* Below this point are iVersion>=3 only */
++  int (*xQueryToken)(Fts5Context*,
++      int iPhrase, int iToken,
++      const char **ppToken, int *pnToken
++  );
++  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
++};
++
++/*
++** CUSTOM AUXILIARY FUNCTIONS
++*************************************************************************/
++
++/*************************************************************************
++** CUSTOM TOKENIZERS
++**
++** Applications may also register custom tokenizer types. A tokenizer
++** is registered by providing fts5 with a populated instance of the
++** following structure. All structure methods must be defined, setting
++** any member of the fts5_tokenizer struct to NULL leads to undefined
++** behaviour. The structure methods are expected to function as follows:
++**
++** xCreate:
++**   This function is used to allocate and initialize a tokenizer instance.
++**   A tokenizer instance is required to actually tokenize text.
++**
++**   The first argument passed to this function is a copy of the (void*)
++**   pointer provided by the application when the fts5_tokenizer object
++**   was registered with FTS5 (the third argument to xCreateTokenizer()).
++**   The second and third arguments are an array of nul-terminated strings
++**   containing the tokenizer arguments, if any, specified following the
++**   tokenizer name as part of the CREATE VIRTUAL TABLE statement used
++**   to create the FTS5 table.
++**
++**   The final argument is an output variable. If successful, (*ppOut)
++**   should be set to point to the new tokenizer handle and SQLITE_OK
++**   returned. If an error occurs, some value other than SQLITE_OK should
++**   be returned. In this case, fts5 assumes that the final value of *ppOut
++**   is undefined.
++**
++** xDelete:
++**   This function is invoked to delete a tokenizer handle previously
++**   allocated using xCreate(). Fts5 guarantees that this function will
++**   be invoked exactly once for each successful call to xCreate().
++**
++** xTokenize:
++**   This function is expected to tokenize the nText byte string indicated
++**   by argument pText. pText may or may not be nul-terminated. The first
++**   argument passed to this function is a pointer to an Fts5Tokenizer object
++**   returned by an earlier call to xCreate().
++**
++**   The second argument indicates the reason that FTS5 is requesting
++**   tokenization of the supplied text. This is always one of the following
++**   four values:
++**
++**   
      •  FTS5_TOKENIZE_DOCUMENT - A document is being inserted into
++**            or removed from the FTS table. The tokenizer is being invoked to
++**            determine the set of tokens to add to (or delete from) the
++**            FTS index.
++**
++**       
      •  FTS5_TOKENIZE_QUERY - A MATCH query is being executed
++**            against the FTS index. The tokenizer is being called to tokenize
++**            a bareword or quoted string specified as part of the query.
++**
++**       
      •  (FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX) - Same as
++**            FTS5_TOKENIZE_QUERY, except that the bareword or quoted string is
++**            followed by a "*" character, indicating that the last token
++**            returned by the tokenizer will be treated as a token prefix.
++**
++**       
      •  FTS5_TOKENIZE_AUX - The tokenizer is being invoked to
++**            satisfy an fts5_api.xTokenize() request made by an auxiliary
++**            function. Or an fts5_api.xColumnSize() request made by the same
++**            on a columnsize=0 database.
++**   
      
++**
++**   For each token in the input string, the supplied callback xToken() must
++**   be invoked. The first argument to it should be a copy of the pointer
++**   passed as the second argument to xTokenize(). The third and fourth
++**   arguments are a pointer to a buffer containing the token text, and the
++**   size of the token in bytes. The 4th and 5th arguments are the byte offsets
++**   of the first byte of and first byte immediately following the text from
++**   which the token is derived within the input.
++**
++**   The second argument passed to the xToken() callback ("tflags") should
++**   normally be set to 0. The exception is if the tokenizer supports
++**   synonyms. In this case see the discussion below for details.
++**
++**   FTS5 assumes the xToken() callback is invoked for each token in the
++**   order that they occur within the input text.
++**
++**   If an xToken() callback returns any value other than SQLITE_OK, then
++**   the tokenization should be abandoned and the xTokenize() method should
++**   immediately return a copy of the xToken() return value. Or, if the
++**   input buffer is exhausted, xTokenize() should return SQLITE_OK. Finally,
++**   if an error occurs with the xTokenize() implementation itself, it
++**   may abandon the tokenization and return any error code other than
++**   SQLITE_OK or SQLITE_DONE.
++**
++** SYNONYM SUPPORT
++**
++**   Custom tokenizers may also support synonyms. Consider a case in which a
++**   user wishes to query for a phrase such as "first place". Using the
++**   built-in tokenizers, the FTS5 query 'first + place' will match instances
++**   of "first place" within the document set, but not alternative forms
++**   such as "1st place". In some applications, it would be better to match
++**   all instances of "first place" or "1st place" regardless of which form
++**   the user specified in the MATCH query text.
++**
++**   There are several ways to approach this in FTS5:
++**
++**   
      1.  By mapping all synonyms to a single token. In this case, using
++**            the above example, this means that the tokenizer returns the
++**            same token for inputs "first" and "1st". Say that token is in
++**            fact "first", so that when the user inserts the document "I won
++**            1st place" entries are added to the index for tokens "i", "won",
++**            "first" and "place". If the user then queries for '1st + place',
++**            the tokenizer substitutes "first" for "1st" and the query works
++**            as expected.
++**
++**       
      2.  By querying the index for all synonyms of each query term
++**            separately. In this case, when tokenizing query text, the
++**            tokenizer may provide multiple synonyms for a single term
++**            within the document. FTS5 then queries the index for each
++**            synonym individually. For example, faced with the query:
++**
++**   
++**     ... MATCH 'first place'
++**
++**            the tokenizer offers both "1st" and "first" as synonyms for the
++**            first token in the MATCH query and FTS5 effectively runs a query
++**            similar to:
++**
++**   
++**     ... MATCH '(first OR 1st) place'
++**
++**            except that, for the purposes of auxiliary functions, the query
++**            still appears to contain just two phrases - "(first OR 1st)"
++**            being treated as a single phrase.
++**
++**       
      3.  By adding multiple synonyms for a single term to the FTS index.
++**            Using this method, when tokenizing document text, the tokenizer
++**            provides multiple synonyms for each token. So that when a
++**            document such as "I won first place" is tokenized, entries are
++**            added to the FTS index for "i", "won", "first", "1st" and
++**            "place".
++**
++**            This way, even if the tokenizer does not provide synonyms
++**            when tokenizing query text (it should not - to do so would be
++**            inefficient), it doesn't matter if the user queries for
++**            'first + place' or '1st + place', as there are entries in the
++**            FTS index corresponding to both forms of the first token.
++**   
      
++**
++**   Whether it is parsing document or query text, any call to xToken that
++**   specifies a tflags argument with the FTS5_TOKEN_COLOCATED bit
++**   is considered to supply a synonym for the previous token. For example,
++**   when parsing the document "I won first place", a tokenizer that supports
++**   synonyms would call xToken() 5 times, as follows:
++**
++**   
++**       xToken(pCtx, 0, "i",                      1,  0,  1);
++**       xToken(pCtx, 0, "won",                    3,  2,  5);
++**       xToken(pCtx, 0, "first",                  5,  6, 11);
++**       xToken(pCtx, FTS5_TOKEN_COLOCATED, "1st", 3,  6, 11);
++**       xToken(pCtx, 0, "place",                  5, 12, 17);
++**
++**
++**   It is an error to specify the FTS5_TOKEN_COLOCATED flag the first time
++**   xToken() is called. Multiple synonyms may be specified for a single token
++**   by making multiple calls to xToken(FTS5_TOKEN_COLOCATED) in sequence.
++**   There is no limit to the number of synonyms that may be provided for a
++**   single token.
++**
++**   In many cases, method (1) above is the best approach. It does not add
++**   extra data to the FTS index or require FTS5 to query for multiple terms,
++**   so it is efficient in terms of disk space and query speed. However, it
++**   does not support prefix queries very well. If, as suggested above, the
++**   token "first" is substituted for "1st" by the tokenizer, then the query:
++**
++**   
++**     ... MATCH '1s*'
++**
++**   will not match documents that contain the token "1st" (as the tokenizer
++**   will probably not map "1s" to any prefix of "first").
++**
++**   For full prefix support, method (3) may be preferred. In this case,
++**   because the index contains entries for both "first" and "1st", prefix
++**   queries such as 'fi*' or '1s*' will match correctly. However, because
++**   extra entries are added to the FTS index, this method uses more space
++**   within the database.
++**
++**   Method (2) offers a midpoint between (1) and (3). Using this method,
++**   a query such as '1s*' will match documents that contain the literal
++**   token "1st", but not "first" (assuming the tokenizer is not able to
++**   provide synonyms for prefixes). However, a non-prefix query like '1st'
++**   will match against "1st" and "first". This method does not require
++**   extra disk space, as no extra entries are added to the FTS index.
++**   On the other hand, it may require more CPU cycles to run MATCH queries,
++**   as separate queries of the FTS index are required for each synonym.
++**
++**   When using methods (2) or (3), it is important that the tokenizer only
++**   provide synonyms when tokenizing document text (method (3)) or query
++**   text (method (2)), not both. Doing so will not cause any errors, but is
++**   inefficient.
++*/
++typedef struct Fts5Tokenizer Fts5Tokenizer;
++typedef struct fts5_tokenizer fts5_tokenizer;
++struct fts5_tokenizer {
++  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
++  void (*xDelete)(Fts5Tokenizer*);
++  int (*xTokenize)(Fts5Tokenizer*,
++      void *pCtx,
++      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
++      const char *pText, int nText,
++      int (*xToken)(
++        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
++        int tflags,         /* Mask of FTS5_TOKEN_* flags */
++        const char *pToken, /* Pointer to buffer containing token */
++        int nToken,         /* Size of token in bytes */
++        int iStart,         /* Byte offset of token within input text */
++        int iEnd            /* Byte offset of end of token within input text */
++      )
++  );
++};
++
++/* Flags that may be passed as the third argument to xTokenize() */
++#define FTS5_TOKENIZE_QUERY     0x0001
++#define FTS5_TOKENIZE_PREFIX    0x0002
++#define FTS5_TOKENIZE_DOCUMENT  0x0004
++#define FTS5_TOKENIZE_AUX       0x0008
++
++/* Flags that may be passed by the tokenizer implementation back to FTS5
++** as the third argument to the supplied xToken callback. */
++#define FTS5_TOKEN_COLOCATED    0x0001      /* Same position as prev. token */
++
++/*
++** END OF CUSTOM TOKENIZERS
++*************************************************************************/
++
++/*************************************************************************
++** FTS5 EXTENSION REGISTRATION API
++*/
++typedef struct fts5_api fts5_api;
++struct fts5_api {
++  int iVersion;                   /* Currently always set to 2 */
++
++  /* Create a new tokenizer */
++  int (*xCreateTokenizer)(
++    fts5_api *pApi,
++    const char *zName,
++    void *pUserData,
++    fts5_tokenizer *pTokenizer,
++    void (*xDestroy)(void*)
++  );
++
++  /* Find an existing tokenizer */
++  int (*xFindTokenizer)(
++    fts5_api *pApi,
++    const char *zName,
++    void **ppUserData,
++    fts5_tokenizer *pTokenizer
++  );
++
++  /* Create a new auxiliary function */
++  int (*xCreateFunction)(
++    fts5_api *pApi,
++    const char *zName,
++    void *pUserData,
++    fts5_extension_function xFunction,
++    void (*xDestroy)(void*)
++  );
++};
++
++/*
++** END OF REGISTRATION API
++*************************************************************************/
++
++#ifdef __cplusplus
++}  /* end of the 'extern "C"' block */
++#endif
++
++#endif /* _FTS5_H */
++
++/******** End of fts5.h *********/
++/*** End of #include "sqlite3.h" ***/
++
++
++#ifdef SQLITE_USER_AUTHENTICATION
++/* #include "sqlite3userauth.h" */
++/*** Begin of #include "sqlite3userauth.h" ***/
++/*
++** 2014-09-08
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++**
++** This file contains the application interface definitions for the
++** user-authentication extension feature.
++**
++** To compile with the user-authentication feature, append this file to
++** end of an SQLite amalgamation header file ("sqlite3.h"), then add
++** the SQLITE_USER_AUTHENTICATION compile-time option.  See the
++** user-auth.txt file in the same source directory as this file for
++** additional information.
++*/
++#ifdef SQLITE_USER_AUTHENTICATION
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** If a database contains the SQLITE_USER table, then the
++** sqlite3_user_authenticate() interface must be invoked with an
++** appropriate username and password prior to enable read and write
++** access to the database.
++**
++** Return SQLITE_OK on success or SQLITE_ERROR if the username/password
++** combination is incorrect or unknown.
++**
++** If the SQLITE_USER table is not present in the database file, then
++** this interface is a harmless no-op returnning SQLITE_OK.
++*/
++SQLITE_API int sqlite3_user_authenticate(
++  sqlite3 *db,           /* The database connection */
++  const char *zUsername, /* Username */
++  const char *aPW,       /* Password or credentials */
++  int nPW                /* Number of bytes in aPW[] */
++);
++
++/*
++** The sqlite3_user_add() interface can be used (by an admin user only)
++** to create a new user.  When called on a no-authentication-required
++** database, this routine converts the database into an authentication-
++** required database, automatically makes the added user an
++** administrator, and logs in the current connection as that user.
++** The sqlite3_user_add() interface only works for the "main" database, not
++** for any ATTACH-ed databases.  Any call to sqlite3_user_add() by a
++** non-admin user results in an error.
++*/
++SQLITE_API int sqlite3_user_add(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername, /* Username to be added */
++  const char *aPW,       /* Password or credentials */
++  int nPW,               /* Number of bytes in aPW[] */
++  int isAdmin            /* True to give new user admin privilege */
++);
++
++/*
++** The sqlite3_user_change() interface can be used to change a users
++** login credentials or admin privilege.  Any user can change their own
++** login credentials.  Only an admin user can change another users login
++** credentials or admin privilege setting.  No user may change their own 
++** admin privilege setting.
++*/
++SQLITE_API int sqlite3_user_change(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername, /* Username to change */
++  const char *aPW,       /* New password or credentials */
++  int nPW,               /* Number of bytes in aPW[] */
++  int isAdmin            /* Modified admin privilege for the user */
++);
++
++/*
++** The sqlite3_user_delete() interface can be used (by an admin user only)
++** to delete a user.  The currently logged-in user cannot be deleted,
++** which guarantees that there is always an admin user and hence that
++** the database cannot be converted into a no-authentication-required
++** database.
++*/
++SQLITE_API int sqlite3_user_delete(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername  /* Username to remove */
++);
++
++#ifdef __cplusplus
++}  /* end of the 'extern "C"' block */
++#endif
++
++#endif /* SQLITE_USER_AUTHENTICATION */
++/*** End of #include "sqlite3userauth.h" ***/
++
++#endif
++
++/*
++** Symbols for ciphers
++*/
++#define CODEC_TYPE_UNKNOWN     0
++#define CODEC_TYPE_AES128      1
++#define CODEC_TYPE_AES256      2
++#define CODEC_TYPE_CHACHA20    3
++#define CODEC_TYPE_SQLCIPHER   4
++#define CODEC_TYPE_RC4         5
++#define CODEC_TYPE_ASCON128    6
++#define CODEC_TYPE_MAX_BUILTIN 6
++
++/*
++** Definition of API functions
++*/
++
++/*
++** Define Windows specific SQLite API functions (not defined in sqlite3.h)
++*/
++#if SQLITE_OS_WIN == 1
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++SQLITE_API int sqlite3_win32_set_directory(unsigned long type, void* zValue);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** Specify the key for an encrypted database.
++** This routine should be called right after sqlite3_open().
++**
++** Arguments:
++**   db       - Database to be encrypted
++**   zDbName  - Name of the database (e.g. "main")
++**   pKey     - Passphrase
++**   nKey     - Length of passphrase
++*/
++SQLITE_API int sqlite3_key(sqlite3* db, const void* pKey, int nKey);
++SQLITE_API int sqlite3_key_v2(sqlite3* db, const char* zDbName, const void* pKey, int nKey);
++
++/*
++** Change the key on an open database.
++** If the current database is not encrypted, this routine will encrypt
++** it.  If pNew==0 or nNew==0, the database is decrypted.
++**
++** Arguments:
++**   db       - Database to be encrypted
++**   zDbName  - Name of the database (e.g. "main")
++**   pKey     - Passphrase
++**   nKey     - Length of passphrase
++*/
++SQLITE_API int sqlite3_rekey(sqlite3* db, const void* pKey, int nKey);
++SQLITE_API int sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* pKey, int nKey);
++
++/*
++** Specify the activation key for a SEE database.
++** Unless activated, none of the SEE routines will work.
++**
++** Arguments:
++**   zPassPhrase  - Activation phrase
++**
++** Note: Provided only for API compatibility with SEE.
++** Encryption support of SQLite3 Multi Cipher is always enabled.
++*/
++SQLITE_API void sqlite3_activate_see(const char* zPassPhrase);
++
++/*
++** Define functions for the configuration of the wxSQLite3 encryption extension
++*/
++SQLITE_API int sqlite3mc_cipher_count();
++SQLITE_API int sqlite3mc_cipher_index(const char* cipherName);
++SQLITE_API const char* sqlite3mc_cipher_name(int cipherIndex);
++SQLITE_API int sqlite3mc_config(sqlite3* db, const char* paramName, int newValue);
++SQLITE_API int sqlite3mc_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
++SQLITE_API unsigned char* sqlite3mc_codec_data(sqlite3* db, const char* zDbName, const char* paramName);
++SQLITE_API const char* sqlite3mc_version();
++
++#ifdef SQLITE3MC_WXSQLITE3_COMPATIBLE
++SQLITE_API int wxsqlite3_config(sqlite3* db, const char* paramName, int newValue);
++SQLITE_API int wxsqlite3_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
++SQLITE_API unsigned char* wxsqlite3_codec_data(sqlite3* db, const char* zDbName, const char* paramName);
++#endif
++
++/*
++** Structures and functions to dynamically register a cipher
++*/
++
++/*
++** Structure for a single cipher configuration parameter
++**
++** Components:
++**   m_name      - name of parameter (1st char = alpha, rest = alphanumeric or underscore, max 63 characters)
++**   m_value     - current/transient parameter value
++**   m_default   - default parameter value
++**   m_minValue  - minimum valid parameter value
++**   m_maxValue  - maximum valid parameter value
++*/
++typedef struct _CipherParams
++{
++  char* m_name;
++  int   m_value;
++  int   m_default;
++  int   m_minValue;
++  int   m_maxValue;
++} CipherParams;
++
++/*
++** Structure for a cipher API
++**
++** Components:
++**   m_name            - name of cipher (1st char = alpha, rest = alphanumeric or underscore, max 63 characters)
++**   m_allocateCipher  - Function pointer for function AllocateCipher
++**   m_freeCipher      - Function pointer for function FreeCipher
++**   m_cloneCipher     - Function pointer for function CloneCipher
++**   m_getLegacy       - Function pointer for function GetLegacy
++**   m_getPageSize     - Function pointer for function GetPageSize
++**   m_getReserved     - Function pointer for function GetReserved
++**   m_getSalt         - Function pointer for function GetSalt
++**   m_generateKey     - Function pointer for function GenerateKey
++**   m_encryptPage     - Function pointer for function EncryptPage
++**   m_decryptPage     - Function pointer for function DecryptPage
++*/
++
++typedef struct BtShared BtSharedMC;
++
++typedef void* (*AllocateCipher_t)(sqlite3* db);
++typedef void  (*FreeCipher_t)(void* cipher);
++typedef void  (*CloneCipher_t)(void* cipherTo, void* cipherFrom);
++typedef int   (*GetLegacy_t)(void* cipher);
++typedef int   (*GetPageSize_t)(void* cipher);
++typedef int   (*GetReserved_t)(void* cipher);
++typedef unsigned char* (*GetSalt_t)(void* cipher);
++typedef void  (*GenerateKey_t)(void* cipher, BtSharedMC* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt);
++typedef int   (*EncryptPage_t)(void* cipher, int page, unsigned char* data, int len, int reserved);
++typedef int   (*DecryptPage_t)(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck);
++
++typedef struct _CipherDescriptor
++{
++  char* m_name;
++  AllocateCipher_t m_allocateCipher;
++  FreeCipher_t     m_freeCipher;
++  CloneCipher_t    m_cloneCipher;
++  GetLegacy_t      m_getLegacy;
++  GetPageSize_t    m_getPageSize;
++  GetReserved_t    m_getReserved;
++  GetSalt_t        m_getSalt;
++  GenerateKey_t    m_generateKey;
++  EncryptPage_t    m_encryptPage;
++  DecryptPage_t    m_decryptPage;
++} CipherDescriptor;
++
++/*
++** Register a cipher
++**
++** Arguments:
++**   desc         - Cipher descriptor structure
++**   params       - Cipher configuration parameter table
++**   makeDefault  - flag whether to make the cipher the default cipher
++**
++** Returns:
++**   SQLITE_OK     - the cipher could be registered successfully
++**   SQLITE_ERROR  - the cipher could not be registered
++*/
++SQLITE_API int sqlite3mc_register_cipher(const CipherDescriptor* desc, const CipherParams* params, int makeDefault);
++
++#ifdef __cplusplus
++}
++#endif
++
++/*
++** Define public SQLite3 Multiple Ciphers VFS interface
++*/
++/* #include "sqlite3mc_vfs.h" */
++/*** Begin of #include "sqlite3mc_vfs.h" ***/
++/*
++** Name:        sqlite3mc_vfs.h
++** Purpose:     Header file for VFS of SQLite3 Multiple Ciphers support
++** Author:      Ulrich Telle
++** Created:     2020-03-01
++** Copyright:   (c) 2020-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef SQLITE3MC_VFS_H_
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifndef SQLITE_PRIVATE
++#define SQLITE_PRIVATE
++#endif
++SQLITE_PRIVATE int sqlite3mcCheckVfs(const char* zVfs);
++
++SQLITE_API int sqlite3mc_vfs_create(const char* zVfsReal, int makeDefault);
++SQLITE_API void sqlite3mc_vfs_destroy(const char* zName);
++SQLITE_API void sqlite3mc_vfs_shutdown();
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* SQLITE3MC_VFS_H_ */
++/*** End of #include "sqlite3mc_vfs.h" ***/
++
++
++#endif
++/*** End of #include "sqlite3mc.h" ***/
++
++
++SQLITE_API const char*
++sqlite3mc_version()
++{
++  static const char* version = SQLITE3MC_VERSION_STRING;
++  return version;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcVersion(sqlite3_context* context, int argc, sqlite3_value** argv)
++{
++  assert(argc == 0);
++  sqlite3_result_text(context, sqlite3mc_version(), -1, 0);
++}
++
++#ifndef SQLITE3MC_SECURE_MEMORY
++#define SQLITE3MC_SECURE_MEMORY 0
++#endif
++
++#if SQLITE3MC_SECURE_MEMORY
++
++#define SECURE_MEMORY_NONE 0
++#define SECURE_MEMORY_FILL 1
++#define SECURE_MEMORY_LOCK 2
++
++SQLITE_PRIVATE void sqlite3mcSetMemorySecurity(int value);
++SQLITE_PRIVATE int sqlite3mcGetMemorySecurity();
++
++#ifndef SQLITE3MC_USE_RANDOM_FILL_MEMORY
++#define SQLITE3MC_USE_RANDOM_FILL_MEMORY 0
++#endif
++
++/* Memory locking is currently not supported */
++#ifdef SQLITE3MC_ENABLE_MEMLOCK
++#undef SQLITE3MC_ENABLE_MEMLOCK
++#endif
++#define SQLITE3MC_ENABLE_MEMLOCK 0
++
++#endif
++
++/*
++** Crypto algorithms
++*/
++/* #include "md5.c" */
++/*** Begin of #include "md5.c" ***/
++/*
++ * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
++ * MD5 Message-Digest Algorithm (RFC 1321).
++ *
++ * Homepage:
++ * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
++ *
++ * Author:
++ * Alexander Peslyak, better known as Solar Designer 
++ *
++ * This software was written by Alexander Peslyak in 2001.  No copyright is
++ * claimed, and the software is hereby placed in the public domain.
++ * In case this attempt to disclaim copyright and place the software in the
++ * public domain is deemed null and void, then the software is
++ * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
++ * general public under the following terms:
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted.
++ *
++ * There's ABSOLUTELY NO WARRANTY, express or implied.
++ *
++ * (This is a heavily cut-down "BSD license".)
++ *
++ * This differs from Colin Plumb's older public domain implementation in that
++ * no exactly 32-bit integer data type is required (any 32-bit or wider
++ * unsigned integer data type will do), there's no compile-time endianness
++ * configuration, and the function prototypes match OpenSSL's.  No code from
++ * Colin Plumb's implementation has been reused; this comment merely compares
++ * the properties of the two independent implementations.
++ *
++ * The primary goals of this implementation are portability and ease of use.
++ * It is meant to be fast, but not as fast as possible.  Some known
++ * optimizations are not included to reduce source code size and avoid
++ * compile-time configuration.
++ */
++
++#define MD5_HASHBYTES 16
++
++#include 
++
++ /* Any 32-bit or wider unsigned integer data type will do */
++typedef unsigned int MD5_u32plus;
++
++typedef struct {
++  MD5_u32plus lo, hi;
++  MD5_u32plus a, b, c, d;
++  unsigned char buffer[64];
++  MD5_u32plus block[16];
++} MD5_CTX;
++
++static void MD5_Init(MD5_CTX *ctx);
++static void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
++static void MD5_Final(unsigned char *result, MD5_CTX *ctx);
++
++/*
++* The basic MD5 functions.
++*
++* F and G are optimized compared to their RFC 1321 definitions for
++* architectures that lack an AND-NOT instruction, just like in Colin Plumb's
++* implementation.
++*/
++#define F(x, y, z)			((z) ^ ((x) & ((y) ^ (z))))
++#define G(x, y, z)			((y) ^ ((z) & ((x) ^ (y))))
++#define H(x, y, z)			(((x) ^ (y)) ^ (z))
++#define H2(x, y, z)			((x) ^ ((y) ^ (z)))
++#define I(x, y, z)			((y) ^ ((x) | ~(z)))
++
++/*
++* The MD5 transformation for all four rounds.
++*/
++#define STEP(f, a, b, c, d, x, t, s) \
++	(a) += f((b), (c), (d)) + (x) + (t); \
++	(a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
++	(a) += (b);
++
++/*
++* SET reads 4 input bytes in little-endian byte order and stores them
++* in a properly aligned word in host byte order.
++*
++* The check for little-endian architectures that tolerate unaligned
++* memory accesses is just an optimization.  Nothing will break if it
++* doesn't work.
++*/
++#if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
++#define SET(n) \
++	(*(MD5_u32plus *)&ptr[(n) * 4])
++#define GET(n) \
++	SET(n)
++#else
++#define SET(n) \
++	(ctx->block[(n)] = \
++	(MD5_u32plus)ptr[(n) * 4] | \
++	((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
++	((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
++	((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
++#define GET(n) \
++	(ctx->block[(n)])
++#endif
++
++/*
++* This processes one or more 64-byte data blocks, but does NOT update
++* the bit counters.  There are no alignment requirements.
++*/
++static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
++{
++  const unsigned char *ptr;
++  MD5_u32plus a, b, c, d;
++  MD5_u32plus saved_a, saved_b, saved_c, saved_d;
++
++  ptr = (const unsigned char *)data;
++
++  a = ctx->a;
++  b = ctx->b;
++  c = ctx->c;
++  d = ctx->d;
++
++  do {
++    saved_a = a;
++    saved_b = b;
++    saved_c = c;
++    saved_d = d;
++
++    /* Round 1 */
++    STEP(F, a, b, c, d, SET(0),  0xd76aa478, 7)
++    STEP(F, d, a, b, c, SET(1),  0xe8c7b756, 12)
++    STEP(F, c, d, a, b, SET(2),  0x242070db, 17)
++    STEP(F, b, c, d, a, SET(3),  0xc1bdceee, 22)
++    STEP(F, a, b, c, d, SET(4),  0xf57c0faf, 7)
++    STEP(F, d, a, b, c, SET(5),  0x4787c62a, 12)
++    STEP(F, c, d, a, b, SET(6),  0xa8304613, 17)
++    STEP(F, b, c, d, a, SET(7),  0xfd469501, 22)
++    STEP(F, a, b, c, d, SET(8),  0x698098d8, 7)
++    STEP(F, d, a, b, c, SET(9),  0x8b44f7af, 12)
++    STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17)
++    STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22)
++    STEP(F, a, b, c, d, SET(12), 0x6b901122, 7)
++    STEP(F, d, a, b, c, SET(13), 0xfd987193, 12)
++    STEP(F, c, d, a, b, SET(14), 0xa679438e, 17)
++    STEP(F, b, c, d, a, SET(15), 0x49b40821, 22)
++
++    /* Round 2 */
++    STEP(G, a, b, c, d, GET(1),  0xf61e2562, 5)
++    STEP(G, d, a, b, c, GET(6),  0xc040b340, 9)
++    STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14)
++    STEP(G, b, c, d, a, GET(0),  0xe9b6c7aa, 20)
++    STEP(G, a, b, c, d, GET(5),  0xd62f105d, 5)
++    STEP(G, d, a, b, c, GET(10), 0x02441453, 9)
++    STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14)
++    STEP(G, b, c, d, a, GET(4),  0xe7d3fbc8, 20)
++    STEP(G, a, b, c, d, GET(9),  0x21e1cde6, 5)
++    STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9)
++    STEP(G, c, d, a, b, GET(3),  0xf4d50d87, 14)
++    STEP(G, b, c, d, a, GET(8),  0x455a14ed, 20)
++    STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5)
++    STEP(G, d, a, b, c, GET(2),  0xfcefa3f8, 9)
++    STEP(G, c, d, a, b, GET(7),  0x676f02d9, 14)
++    STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20)
++
++    /* Round 3 */
++    STEP(H,  a, b, c, d, GET(5),  0xfffa3942, 4)
++    STEP(H2, d, a, b, c, GET(8),  0x8771f681, 11)
++    STEP(H,  c, d, a, b, GET(11), 0x6d9d6122, 16)
++    STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23)
++    STEP(H,  a, b, c, d, GET(1),  0xa4beea44, 4)
++    STEP(H2, d, a, b, c, GET(4),  0x4bdecfa9, 11)
++    STEP(H,  c, d, a, b, GET(7),  0xf6bb4b60, 16)
++    STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23)
++    STEP(H,  a, b, c, d, GET(13), 0x289b7ec6, 4)
++    STEP(H2, d, a, b, c, GET(0),  0xeaa127fa, 11)
++    STEP(H,  c, d, a, b, GET(3),  0xd4ef3085, 16)
++    STEP(H2, b, c, d, a, GET(6),  0x04881d05, 23)
++    STEP(H,  a, b, c, d, GET(9),  0xd9d4d039, 4)
++    STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11)
++    STEP(H,  c, d, a, b, GET(15), 0x1fa27cf8, 16)
++    STEP(H2, b, c, d, a, GET(2),  0xc4ac5665, 23)
++
++    /* Round 4 */
++    STEP(I, a, b, c, d, GET(0),  0xf4292244, 6)
++    STEP(I, d, a, b, c, GET(7),  0x432aff97, 10)
++    STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15)
++    STEP(I, b, c, d, a, GET(5),  0xfc93a039, 21)
++    STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6)
++    STEP(I, d, a, b, c, GET(3),  0x8f0ccc92, 10)
++    STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15)
++    STEP(I, b, c, d, a, GET(1),  0x85845dd1, 21)
++    STEP(I, a, b, c, d, GET(8),  0x6fa87e4f, 6)
++    STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10)
++    STEP(I, c, d, a, b, GET(6),  0xa3014314, 15)
++    STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21)
++    STEP(I, a, b, c, d, GET(4),  0xf7537e82, 6)
++    STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10)
++    STEP(I, c, d, a, b, GET(2),  0x2ad7d2bb, 15)
++    STEP(I, b, c, d, a, GET(9),  0xeb86d391, 21)
++
++    a += saved_a;
++    b += saved_b;
++    c += saved_c;
++    d += saved_d;
++
++    ptr += 64;
++  } while (size -= 64);
++
++  ctx->a = a;
++  ctx->b = b;
++  ctx->c = c;
++  ctx->d = d;
++
++  return ptr;
++}
++
++void MD5_Init(MD5_CTX *ctx)
++{
++  ctx->a = 0x67452301;
++  ctx->b = 0xefcdab89;
++  ctx->c = 0x98badcfe;
++  ctx->d = 0x10325476;
++
++  ctx->lo = 0;
++  ctx->hi = 0;
++}
++
++void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
++{
++  MD5_u32plus saved_lo;
++  unsigned long used, available;
++
++  saved_lo = ctx->lo;
++  if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
++    ctx->hi++;
++  ctx->hi += size >> 29;
++
++  used = saved_lo & 0x3f;
++
++  if (used) {
++    available = 64 - used;
++
++    if (size < available) {
++      memcpy(&ctx->buffer[used], data, size);
++      return;
++    }
++
++    memcpy(&ctx->buffer[used], data, available);
++    data = (const unsigned char *)data + available;
++    size -= available;
++    body(ctx, ctx->buffer, 64);
++  }
++
++  if (size >= 64) {
++    data = body(ctx, data, size & ~(unsigned long)0x3f);
++    size &= 0x3f;
++  }
++
++  memcpy(ctx->buffer, data, size);
++}
++
++void MD5_Final(unsigned char *result, MD5_CTX *ctx)
++{
++  unsigned long used, available;
++
++  used = ctx->lo & 0x3f;
++
++  ctx->buffer[used++] = 0x80;
++
++  available = 64 - used;
++
++  if (available < 8) {
++    memset(&ctx->buffer[used], 0, available);
++    body(ctx, ctx->buffer, 64);
++    used = 0;
++    available = 64;
++  }
++
++  memset(&ctx->buffer[used], 0, available - 8);
++
++  ctx->lo <<= 3;
++  ctx->buffer[56] = ctx->lo;
++  ctx->buffer[57] = ctx->lo >> 8;
++  ctx->buffer[58] = ctx->lo >> 16;
++  ctx->buffer[59] = ctx->lo >> 24;
++  ctx->buffer[60] = ctx->hi;
++  ctx->buffer[61] = ctx->hi >> 8;
++  ctx->buffer[62] = ctx->hi >> 16;
++  ctx->buffer[63] = ctx->hi >> 24;
++
++  body(ctx, ctx->buffer, 64);
++
++  result[0]  = ctx->a;
++  result[1]  = ctx->a >> 8;
++  result[2]  = ctx->a >> 16;
++  result[3]  = ctx->a >> 24;
++  result[4]  = ctx->b;
++  result[5]  = ctx->b >> 8;
++  result[6]  = ctx->b >> 16;
++  result[7]  = ctx->b >> 24;
++  result[8]  = ctx->c;
++  result[9]  = ctx->c >> 8;
++  result[10] = ctx->c >> 16;
++  result[11] = ctx->c >> 24;
++  result[12] = ctx->d;
++  result[13] = ctx->d >> 8;
++  result[14] = ctx->d >> 16;
++  result[15] = ctx->d >> 24;
++
++  memset(ctx, 0, sizeof(*ctx));
++}
++/*** End of #include "md5.c" ***/
++
++/* #include "sha1.c" */
++/*** Begin of #include "sha1.c" ***/
++/**
++* @file sha1.c SHA-1 in C
++*/
++
++/*
++By Steve Reid 
++100% Public Domain
++
++-----------------
++Modified 7/98
++By James H. Brown 
++Still 100% Public Domain
++
++Corrected a problem which generated improper hash values on 16 bit machines
++Routine SHA1Update changed from
++	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
++len)
++to
++	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
++long len)
++
++The 'len' parameter was declared an int which works fine on 32 bit machines.
++However, on 16 bit machines an int is too small for the shifts being done
++against
++it.  This caused the hash function to generate incorrect values if len was
++greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
++
++Since the file IO in main() reads 16K at a time, any file 8K or larger would
++be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
++"a"s).
++
++I also changed the declaration of variables i & j in SHA1Update to
++unsigned long from unsigned int for the same reason.
++
++These changes should make no difference to any 32 bit implementations since
++an
++int and a long are the same size in those environments.
++
++--
++I also corrected a few compiler warnings generated by Borland C.
++1. Added #include  for exit() prototype
++2. Removed unused variable 'j' in SHA1Final
++3. Changed exit(0) to return(0) at end of main.
++
++ALL changes I made can be located by searching for comments containing 'JHB'
++-----------------
++Modified 8/98
++By Steve Reid 
++Still 100% public domain
++
++1- Removed #include  and used return() instead of exit()
++2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
++3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
++
++-----------------
++Modified 4/01
++By Saul Kravitz 
++Still 100% PD
++Modified to run on Compaq Alpha hardware.
++
++-----------------
++Modified 07/2002
++By Ralph Giles 
++Still 100% public domain
++modified for use with stdint types, autoconf
++code cleanup, removed attribution comments
++switched SHA1Final() argument order for consistency
++use SHA1_ prefix for public api
++move public api to sha1.h
++
++-----------------
++Modified 02/2018
++By Ulrich Telle 
++Still 100% public domain
++modified for use with fast-pbkdf2 (written by Joseph Birr-Pixton)
++detect endianess at run-time
++*/
++
++/*
++Test Vectors (from FIPS PUB 180-1)
++"abc"
++  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
++"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
++  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
++A million repetitions of "a"
++  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
++*/
++
++/* #include "mystdint.h" */
++/*** Begin of #include "mystdint.h" ***/
++#ifndef MY_STDINT_H_
++#define MY_STDINT_H_
++
++/*
++** MS Visual C++ 2008 and below do not provide the header file 
++** That is, we need to define the necessary types ourselves
++*/
++
++#if defined(_MSC_VER) && (_MSC_VER < 1600)
++typedef signed char int8_t;
++typedef short int16_t;
++typedef int int32_t;
++typedef long long int64_t;
++typedef unsigned char uint8_t;
++typedef unsigned short uint16_t;
++typedef unsigned int uint32_t;
++typedef unsigned long long uint64_t;
++
++#define UINT8_MAX 255
++#define UINT16_MAX 65535
++#define UINT32_MAX 0xffffffffU  /* 4294967295U */
++#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ 
++#else
++#include 
++#endif
++
++#endif /* MY_STDINT_H_ */
++/*** End of #include "mystdint.h" ***/
++
++
++#include 
++#include 
++/* #include "sha1.h" */
++/*** Begin of #include "sha1.h" ***/
++/* public api for steve reid's public domain SHA-1 implementation */
++/* this file is in the public domain */
++
++#ifndef SHA1_H_
++#define SHA1_H_ (1)
++
++/** SHA-1 Context */
++typedef struct {
++    uint32_t h[5];
++    /**< Context state */
++    uint32_t count[2];
++    /**< Counter       */
++    uint8_t buffer[64]; /**< SHA-1 buffer  */
++} sha1_ctx;
++
++#define SHA1_BLOCK_SIZE 64
++/** SHA-1 Digest size in bytes */
++#define SHA1_DIGEST_SIZE 20
++
++void sha1_init(sha1_ctx *context);
++
++void sha1_update(sha1_ctx *context, const void *p, size_t len);
++
++void sha1_final(sha1_ctx *context, uint8_t digest[SHA1_DIGEST_SIZE]);
++
++void sha1_transform(sha1_ctx *context, const uint8_t buffer[64]);
++
++#endif /* SHA1_H_ */
++/*** End of #include "sha1.h" ***/
++
++
++#if 0
++/* TODO: asm doesn't compile under Linux, use generic C equivalent for now */
++#if __GNUC__ && (defined(__i386__) || defined(__x86_64__))
++/*
++* GCC by itself only generates left rotates.  Use right rotates if
++* possible to be kinder to dinky implementations with iterative rotate
++* instructions.
++*/
++#define SHA_ROT(op, x, k) \
++        ({ unsigned int y; asm(op " %1,%0" : "=r" (y) : "I" (k), "0" (x)); y; })
++#define rol(x,k) SHA_ROT("roll", x, k)
++#define ror(x,k) SHA_ROT("rorl", x, k)
++#else
++/* Generic C equivalent */
++#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
++#define ror(value, bits) (((value) << (32 - (bits))) | ((value) >> (bits)))
++#endif
++#endif
++
++/* Generic C equivalent */
++#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
++#define ror(value, bits) (((value) << (32 - (bits))) | ((value) >> (bits)))
++
++#define blk0le(i) (block[i] = (ror(block[i],8)&0xFF00FF00) \
++                             |(rol(block[i],8)&0x00FF00FF))
++#define blk0be(i) block[i]
++#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
++                             ^block[(i+2)&15]^block[i&15],1))
++
++/*
++* (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
++*
++* Rl0() for little-endian and Rb0() for big-endian.  Endianness is
++* determined at run-time.
++*/
++#define Rl0(v,w,x,y,z,i) \
++  z+=((w&(x^y))^y)+blk0le(i)+0x5A827999+rol(v,5);w=ror(w,2);
++#define Rb0(v,w,x,y,z,i) \
++  z+=((w&(x^y))^y)+blk0be(i)+0x5A827999+rol(v,5);w=ror(w,2);
++#define R1(v,w,x,y,z,i) \
++  z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=ror(w,2);
++#define R2(v,w,x,y,z,i) \
++  z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=ror(w,2);
++#define R3(v,w,x,y,z,i) \
++  z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=ror(w,2);
++#define R4(v,w,x,y,z,i) \
++  z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=ror(w,2);
++
++/* Hash a single 512-bit block. This is the core of the algorithm. */
++void sha1_transform(sha1_ctx *context, const uint8_t buffer[64])
++{
++  uint32_t a, b, c, d, e;
++  static int one = 1;
++  uint32_t block[16];
++  memcpy(block, buffer, 64);
++
++  /* Copy context->h[] to working vars */
++  a = context->h[0];
++  b = context->h[1];
++  c = context->h[2];
++  d = context->h[3];
++  e = context->h[4];
++
++  /* 4 rounds of 20 operations each. Loop unrolled. */
++  if (1 == *(unsigned char*)&one) /* Check for endianess */
++  {
++    Rl0(a, b, c, d, e, 0);  Rl0(e, a, b, c, d, 1);  Rl0(d, e, a, b, c, 2);  Rl0(c, d, e, a, b, 3);
++    Rl0(b, c, d, e, a, 4);  Rl0(a, b, c, d, e, 5);  Rl0(e, a, b, c, d, 6);  Rl0(d, e, a, b, c, 7);
++    Rl0(c, d, e, a, b, 8);  Rl0(b, c, d, e, a, 9);  Rl0(a, b, c, d, e, 10); Rl0(e, a, b, c, d, 11);
++    Rl0(d, e, a, b, c, 12); Rl0(c, d, e, a, b, 13); Rl0(b, c, d, e, a, 14); Rl0(a, b, c, d, e, 15);
++  }
++  else
++  {
++    Rb0(a, b, c, d, e, 0);  Rb0(e, a, b, c, d, 1);  Rb0(d, e, a, b, c, 2);  Rb0(c, d, e, a, b, 3);
++    Rb0(b, c, d, e, a, 4);  Rb0(a, b, c, d, e, 5);  Rb0(e, a, b, c, d, 6);  Rb0(d, e, a, b, c, 7);
++    Rb0(c, d, e, a, b, 8);  Rb0(b, c, d, e, a, 9);  Rb0(a, b, c, d, e, 10); Rb0(e, a, b, c, d, 11);
++    Rb0(d, e, a, b, c, 12); Rb0(c, d, e, a, b, 13); Rb0(b, c, d, e, a, 14); Rb0(a, b, c, d, e, 15);
++  }
++  R1(e, a, b, c, d, 16); R1(d, e, a, b, c, 17); R1(c, d, e, a, b, 18); R1(b, c, d, e, a, 19);
++  R2(a, b, c, d, e, 20); R2(e, a, b, c, d, 21); R2(d, e, a, b, c, 22); R2(c, d, e, a, b, 23);
++  R2(b, c, d, e, a, 24); R2(a, b, c, d, e, 25); R2(e, a, b, c, d, 26); R2(d, e, a, b, c, 27);
++  R2(c, d, e, a, b, 28); R2(b, c, d, e, a, 29); R2(a, b, c, d, e, 30); R2(e, a, b, c, d, 31);
++  R2(d, e, a, b, c, 32); R2(c, d, e, a, b, 33); R2(b, c, d, e, a, 34); R2(a, b, c, d, e, 35);
++  R2(e, a, b, c, d, 36); R2(d, e, a, b, c, 37); R2(c, d, e, a, b, 38); R2(b, c, d, e, a, 39);
++  R3(a, b, c, d, e, 40); R3(e, a, b, c, d, 41); R3(d, e, a, b, c, 42); R3(c, d, e, a, b, 43);
++  R3(b, c, d, e, a, 44); R3(a, b, c, d, e, 45); R3(e, a, b, c, d, 46); R3(d, e, a, b, c, 47);
++  R3(c, d, e, a, b, 48); R3(b, c, d, e, a, 49); R3(a, b, c, d, e, 50); R3(e, a, b, c, d, 51);
++  R3(d, e, a, b, c, 52); R3(c, d, e, a, b, 53); R3(b, c, d, e, a, 54); R3(a, b, c, d, e, 55);
++  R3(e, a, b, c, d, 56); R3(d, e, a, b, c, 57); R3(c, d, e, a, b, 58); R3(b, c, d, e, a, 59);
++  R4(a, b, c, d, e, 60); R4(e, a, b, c, d, 61); R4(d, e, a, b, c, 62); R4(c, d, e, a, b, 63);
++  R4(b, c, d, e, a, 64); R4(a, b, c, d, e, 65); R4(e, a, b, c, d, 66); R4(d, e, a, b, c, 67);
++  R4(c, d, e, a, b, 68); R4(b, c, d, e, a, 69); R4(a, b, c, d, e, 70); R4(e, a, b, c, d, 71);
++  R4(d, e, a, b, c, 72); R4(c, d, e, a, b, 73); R4(b, c, d, e, a, 74); R4(a, b, c, d, e, 75);
++  R4(e, a, b, c, d, 76); R4(d, e, a, b, c, 77); R4(c, d, e, a, b, 78); R4(b, c, d, e, a, 79);
++
++  /* Add the working vars back into context.state[] */
++  context->h[0] += a;
++  context->h[1] += b;
++  context->h[2] += c;
++  context->h[3] += d;
++  context->h[4] += e;
++
++  /* Wipe variables */
++  a = b = c = d = e = 0;
++  memset(block, 0, 64);
++}
++
++
++/**
++* Initialize new context
++*
++* @param context SHA1-Context
++*/
++void sha1_init(sha1_ctx *context)
++{
++  /* SHA1 initialization constants */
++  context->h[0] = 0x67452301;
++  context->h[1] = 0xefcdab89;
++  context->h[2] = 0x98badcfe;
++  context->h[3] = 0x10325476;
++  context->h[4] = 0xc3d2e1f0;
++  context->count[0] = context->count[1] = 0;
++}
++
++
++/**
++* Run your data through this
++*
++* @param context SHA1-Context
++* @param p       Buffer to run SHA1 on
++* @param len     Number of bytes
++*/
++void sha1_update(sha1_ctx *context, const void *p, size_t len)
++{
++  const uint8_t *data = p;
++  size_t i, j;
++
++  j = (context->count[0] >> 3) & 63;
++  if ((context->count[0] += (uint32_t) (len << 3)) < (len << 3))
++  {
++    context->count[1]++;
++  }
++  context->count[1] += (uint32_t) (len >> 29);
++  if ((j + len) > 63)
++  {
++    memcpy(&context->buffer[j], data, (i = 64 - j));
++    sha1_transform(context, context->buffer);
++    for (; i + 63 < len; i += 64)
++    {
++      sha1_transform(context, data + i);
++    }
++    j = 0;
++  }
++  else
++  {
++    i = 0;
++  }
++  memcpy(&context->buffer[j], &data[i], len - i);
++}
++
++
++/**
++* Add padding and return the message digest
++*
++* @param digest  Generated message digest
++* @param context SHA1-Context
++*/
++void sha1_final(sha1_ctx *context, uint8_t digest[SHA1_DIGEST_SIZE])
++{
++  uint32_t i;
++  uint8_t finalcount[8];
++
++  for (i = 0; i < 8; i++)
++  {
++    finalcount[i] = (uint8_t) ((context->count[(i >= 4 ? 0 : 1)]
++                    >> ((3 - (i & 3)) * 8)) & 255);
++  }
++  sha1_update(context, (uint8_t *) "\200", 1);
++  while ((context->count[0] & 504) != 448)
++  {
++    sha1_update(context, (uint8_t *) "\0", 1);
++  }
++  sha1_update(context, finalcount, 8); /* Should cause SHA1_Transform */
++  for (i = 0; i < SHA1_DIGEST_SIZE; i++)
++  {
++    digest[i] = (uint8_t)
++                ((context->h[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
++  }
++
++  /* Wipe variables */
++  i = 0;
++  memset(context->buffer, 0, 64);
++  /* fast-pbkdf2 needs access to the state*/
++  /*memset(context->h, 0, 20);*/
++  memset(context->count, 0, 8);
++  memset(finalcount, 0, 8);    /* SWR */
++}
++/*** End of #include "sha1.c" ***/
++
++/* #include "sha2.c" */
++/*** Begin of #include "sha2.c" ***/
++/*
++ * FIPS 180-2 SHA-224/256/384/512 implementation
++ * Last update: 02/02/2007
++ * Issue date:  04/30/2005
++ *
++ * Copyright (C) 2005, 2007 Olivier Gay 
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the project nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#if 1
++#define UNROLL_LOOPS /* Enable loops unrolling */
++#endif
++
++#include 
++
++/* #include "sha2.h" */
++/*** Begin of #include "sha2.h" ***/
++/*
++ * FIPS 180-2 SHA-224/256/384/512 implementation
++ * Last update: 02/02/2007
++ * Issue date:  04/30/2005
++ *
++ * Copyright (C) 2005, 2007 Olivier Gay 
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the project nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#ifndef SHA2_H
++#define SHA2_H
++
++#define SHA224_DIGEST_SIZE ( 224 / 8)
++#define SHA256_DIGEST_SIZE ( 256 / 8)
++#define SHA384_DIGEST_SIZE ( 384 / 8)
++#define SHA512_DIGEST_SIZE ( 512 / 8)
++
++#define SHA256_BLOCK_SIZE  ( 512 / 8)
++#define SHA512_BLOCK_SIZE  (1024 / 8)
++#define SHA384_BLOCK_SIZE  SHA512_BLOCK_SIZE
++#define SHA224_BLOCK_SIZE  SHA256_BLOCK_SIZE
++
++#ifndef SHA2_TYPES
++#define SHA2_TYPES
++typedef unsigned char uint8;
++typedef unsigned int  uint32;
++
++typedef sqlite3_uint64 uint64;
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++  #define li_64(h) 0x##h##ui64
++#else
++  #define li_64(h) 0x##h##ull
++#endif 
++
++#if 0  /* Start of original int64 defines */
++
++#if defined(_MSC_VER)
++  #if _MSC_VER >= 1310
++    typedef unsigned long long uint64;
++    #define li_64(h) 0x##h##ull
++  #else
++    typedef unsigned __int64 uint64;
++    #define li_64(h) 0x##h##ui64
++  #endif
++#elif defined(__BORLANDC__) && !defined(__MSDOS__)
++  #define li_64(h) 0x##h##ull
++  typedef __int64 uint64;
++#elif defined(__sun)
++  #if defined(ULONG_MAX) && ULONG_MAX == 0xfffffffful
++    #define li_64(h) 0x##h##ull
++    typedef unsigned long long uint64;
++  #elif defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 0xfffffffffffffffful
++    #define li_64(h) 0x##h##ul
++    typedef unsigned long uint64;
++  #endif
++#elif defined(__MVS__)
++  #define li_64(h)    0x##h##ull
++  typedef unsigned int long long uint64;
++#elif defined(ULLONG_MAX) && ULLONG_MAX > 4294967295
++  #if ULLONG_MAX == 18446744073709551615ull
++    #define li_64(h) 0x##h##ull
++    typedef unsigned long long uint64;
++  #endif
++#elif defined(ULONG_LONG_MAX) && ULONG_LONG_MAX > 4294967295
++  #if ULONG_LONG_MAX == 18446744073709551615
++    #define li_64(h) 0x##h##ull
++    typedef unsigned long long uint64;
++  #endif
++#elif defined(ULONG_MAX) && ULONG_MAX > 4294967295
++  #if ULONG_MAX == 18446744073709551615
++    #define li_64(h) 0x##h##ul
++    typedef unsigned long uint64;
++  #endif
++#elif defined(UINT_MAX) && UINT_MAX > 4294967295
++  #if UINT_MAX == 18446744073709551615
++    #define li_64(h) 0x##h##u
++    typedef unsigned int uint64;
++  #endif
++#endif
++#endif
++
++#endif /* End of original int64 defines */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef struct {
++    unsigned int tot_len;
++    unsigned int len;
++    unsigned char block[2 * SHA256_BLOCK_SIZE];
++    uint32 h[8];
++} sha256_ctx;
++
++typedef struct {
++    unsigned int tot_len;
++    unsigned int len;
++    unsigned char block[2 * SHA512_BLOCK_SIZE];
++    uint64 h[8];
++} sha512_ctx;
++
++typedef sha512_ctx sha384_ctx;
++typedef sha256_ctx sha224_ctx;
++
++void sha224_init(sha224_ctx *ctx);
++void sha224_update(sha224_ctx *ctx, const unsigned char *message,
++                   unsigned int len);
++void sha224_final(sha224_ctx *ctx, unsigned char *digest);
++void sha224(const unsigned char *message, unsigned int len,
++            unsigned char *digest);
++
++void sha256_init(sha256_ctx * ctx);
++void sha256_update(sha256_ctx *ctx, const unsigned char *message,
++                   unsigned int len);
++void sha256_final(sha256_ctx *ctx, unsigned char *digest);
++void sha256_transform(sha256_ctx *ctx, const unsigned char *message);
++void sha256(const unsigned char *message, unsigned int len,
++            unsigned char *digest);
++
++void sha384_init(sha384_ctx *ctx);
++void sha384_update(sha384_ctx *ctx, const unsigned char *message,
++                   unsigned int len);
++void sha384_final(sha384_ctx *ctx, unsigned char *digest);
++void sha384(const unsigned char *message, unsigned int len,
++            unsigned char *digest);
++
++void sha512_init(sha512_ctx *ctx);
++void sha512_update(sha512_ctx *ctx, const unsigned char *message,
++                   unsigned int len);
++void sha512_final(sha512_ctx *ctx, unsigned char *digest);
++void sha512_transform(sha512_ctx *ctx, const unsigned char *message);
++void sha512(const unsigned char *message, unsigned int len,
++            unsigned char *digest);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* !SHA2_H */
++
++/*** End of #include "sha2.h" ***/
++
++
++#define SHFR(x, n)    (x >> n)
++#define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
++#if 0
++/* SQLite version 3.40.0 and later already defines this macro. */
++/* The macro isn't used here anyway, so simply inactivate it. */
++#define ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
++#endif
++#define CH(x, y, z)  ((x & y) ^ (~x & z))
++#define MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
++
++#define SHA256_F1(x) (ROTR(x,  2) ^ ROTR(x, 13) ^ ROTR(x, 22))
++#define SHA256_F2(x) (ROTR(x,  6) ^ ROTR(x, 11) ^ ROTR(x, 25))
++#define SHA256_F3(x) (ROTR(x,  7) ^ ROTR(x, 18) ^ SHFR(x,  3))
++#define SHA256_F4(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHFR(x, 10))
++
++#define SHA512_F1(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
++#define SHA512_F2(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
++#define SHA512_F3(x) (ROTR(x,  1) ^ ROTR(x,  8) ^ SHFR(x,  7))
++#define SHA512_F4(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHFR(x,  6))
++
++#define UNPACK32(x, str)                      \
++{                                             \
++    *((str) + 3) = (uint8) ((x)      );       \
++    *((str) + 2) = (uint8) ((x) >>  8);       \
++    *((str) + 1) = (uint8) ((x) >> 16);       \
++    *((str) + 0) = (uint8) ((x) >> 24);       \
++}
++
++#define PACK32(str, x)                        \
++{                                             \
++    *(x) =   ((uint32) *((str) + 3)      )    \
++           | ((uint32) *((str) + 2) <<  8)    \
++           | ((uint32) *((str) + 1) << 16)    \
++           | ((uint32) *((str) + 0) << 24);   \
++}
++
++#define UNPACK64(x, str)                      \
++{                                             \
++    *((str) + 7) = (uint8) ((x)      );       \
++    *((str) + 6) = (uint8) ((x) >>  8);       \
++    *((str) + 5) = (uint8) ((x) >> 16);       \
++    *((str) + 4) = (uint8) ((x) >> 24);       \
++    *((str) + 3) = (uint8) ((x) >> 32);       \
++    *((str) + 2) = (uint8) ((x) >> 40);       \
++    *((str) + 1) = (uint8) ((x) >> 48);       \
++    *((str) + 0) = (uint8) ((x) >> 56);       \
++}
++
++#define PACK64(str, x)                        \
++{                                             \
++    *(x) =   ((uint64) *((str) + 7)      )    \
++           | ((uint64) *((str) + 6) <<  8)    \
++           | ((uint64) *((str) + 5) << 16)    \
++           | ((uint64) *((str) + 4) << 24)    \
++           | ((uint64) *((str) + 3) << 32)    \
++           | ((uint64) *((str) + 2) << 40)    \
++           | ((uint64) *((str) + 1) << 48)    \
++           | ((uint64) *((str) + 0) << 56);   \
++}
++
++/* Macros used for loops unrolling */
++
++#define SHA256_SCR(i)                         \
++{                                             \
++    w[i] =  SHA256_F4(w[i -  2]) + w[i -  7]  \
++          + SHA256_F3(w[i - 15]) + w[i - 16]; \
++}
++
++#define SHA512_SCR(i)                         \
++{                                             \
++    w[i] =  SHA512_F4(w[i -  2]) + w[i -  7]  \
++          + SHA512_F3(w[i - 15]) + w[i - 16]; \
++}
++
++#define SHA256_EXP(a, b, c, d, e, f, g, h, j)               \
++{                                                           \
++    t1 = wv[h] + SHA256_F2(wv[e]) + CH(wv[e], wv[f], wv[g]) \
++         + sha256_k[j] + w[j];                              \
++    t2 = SHA256_F1(wv[a]) + MAJ(wv[a], wv[b], wv[c]);       \
++    wv[d] += t1;                                            \
++    wv[h] = t1 + t2;                                        \
++}
++
++#define SHA512_EXP(a, b, c, d, e, f, g ,h, j)               \
++{                                                           \
++    t1 = wv[h] + SHA512_F2(wv[e]) + CH(wv[e], wv[f], wv[g]) \
++         + sha512_k[j] + w[j];                              \
++    t2 = SHA512_F1(wv[a]) + MAJ(wv[a], wv[b], wv[c]);       \
++    wv[d] += t1;                                            \
++    wv[h] = t1 + t2;                                        \
++}
++
++uint32 sha224_h0[8] =
++            {0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
++             0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4};
++
++uint32 sha256_h0[8] =
++            {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
++             0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
++
++uint64 sha384_h0[8] =
++            {li_64(cbbb9d5dc1059ed8), li_64(629a292a367cd507),
++             li_64(9159015a3070dd17), li_64(152fecd8f70e5939),
++             li_64(67332667ffc00b31), li_64(8eb44a8768581511),
++             li_64(db0c2e0d64f98fa7), li_64(47b5481dbefa4fa4)};
++
++uint64 sha512_h0[8] =
++            {li_64(6a09e667f3bcc908), li_64(bb67ae8584caa73b),
++             li_64(3c6ef372fe94f82b), li_64(a54ff53a5f1d36f1),
++             li_64(510e527fade682d1), li_64(9b05688c2b3e6c1f),
++             li_64(1f83d9abfb41bd6b), li_64(5be0cd19137e2179)};
++
++uint32 sha256_k[64] =
++            {0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
++             0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
++             0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
++             0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
++             0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
++             0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
++             0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
++             0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
++             0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
++             0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
++             0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
++             0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
++             0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
++             0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
++             0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
++             0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2};
++
++uint64 sha512_k[80] =
++            {li_64(428a2f98d728ae22), li_64(7137449123ef65cd),
++             li_64(b5c0fbcfec4d3b2f), li_64(e9b5dba58189dbbc),
++             li_64(3956c25bf348b538), li_64(59f111f1b605d019),
++             li_64(923f82a4af194f9b), li_64(ab1c5ed5da6d8118),
++             li_64(d807aa98a3030242), li_64(12835b0145706fbe),
++             li_64(243185be4ee4b28c), li_64(550c7dc3d5ffb4e2),
++             li_64(72be5d74f27b896f), li_64(80deb1fe3b1696b1),
++             li_64(9bdc06a725c71235), li_64(c19bf174cf692694),
++             li_64(e49b69c19ef14ad2), li_64(efbe4786384f25e3),
++             li_64(0fc19dc68b8cd5b5), li_64(240ca1cc77ac9c65),
++             li_64(2de92c6f592b0275), li_64(4a7484aa6ea6e483),
++             li_64(5cb0a9dcbd41fbd4), li_64(76f988da831153b5),
++             li_64(983e5152ee66dfab), li_64(a831c66d2db43210),
++             li_64(b00327c898fb213f), li_64(bf597fc7beef0ee4),
++             li_64(c6e00bf33da88fc2), li_64(d5a79147930aa725),
++             li_64(06ca6351e003826f), li_64(142929670a0e6e70),
++             li_64(27b70a8546d22ffc), li_64(2e1b21385c26c926),
++             li_64(4d2c6dfc5ac42aed), li_64(53380d139d95b3df),
++             li_64(650a73548baf63de), li_64(766a0abb3c77b2a8),
++             li_64(81c2c92e47edaee6), li_64(92722c851482353b),
++             li_64(a2bfe8a14cf10364), li_64(a81a664bbc423001),
++             li_64(c24b8b70d0f89791), li_64(c76c51a30654be30),
++             li_64(d192e819d6ef5218), li_64(d69906245565a910),
++             li_64(f40e35855771202a), li_64(106aa07032bbd1b8),
++             li_64(19a4c116b8d2d0c8), li_64(1e376c085141ab53),
++             li_64(2748774cdf8eeb99), li_64(34b0bcb5e19b48a8),
++             li_64(391c0cb3c5c95a63), li_64(4ed8aa4ae3418acb),
++             li_64(5b9cca4f7763e373), li_64(682e6ff3d6b2b8a3),
++             li_64(748f82ee5defb2fc), li_64(78a5636f43172f60),
++             li_64(84c87814a1f0ab72), li_64(8cc702081a6439ec),
++             li_64(90befffa23631e28), li_64(a4506cebde82bde9),
++             li_64(bef9a3f7b2c67915), li_64(c67178f2e372532b),
++             li_64(ca273eceea26619c), li_64(d186b8c721c0c207),
++             li_64(eada7dd6cde0eb1e), li_64(f57d4f7fee6ed178),
++             li_64(06f067aa72176fba), li_64(0a637dc5a2c898a6),
++             li_64(113f9804bef90dae), li_64(1b710b35131c471b),
++             li_64(28db77f523047d84), li_64(32caab7b40c72493),
++             li_64(3c9ebe0a15c9bebc), li_64(431d67c49c100d4c),
++             li_64(4cc5d4becb3e42b6), li_64(597f299cfc657e2a),
++             li_64(5fcb6fab3ad6faec), li_64(6c44198c4a475817)};
++
++/* SHA-256 functions */
++
++static
++void sha256_transf(sha256_ctx *ctx, const unsigned char *message,
++                   unsigned int block_nb)
++{
++    uint32 w[64];
++    uint32 wv[8];
++    uint32 t1, t2;
++    const unsigned char *sub_block;
++    int i;
++
++#ifndef UNROLL_LOOPS
++    int j;
++#endif
++
++    for (i = 0; i < (int) block_nb; i++) {
++        sub_block = message + (i << 6);
++
++#ifndef UNROLL_LOOPS
++        for (j = 0; j < 16; j++) {
++            PACK32(&sub_block[j << 2], &w[j]);
++        }
++
++        for (j = 16; j < 64; j++) {
++            SHA256_SCR(j);
++        }
++
++        for (j = 0; j < 8; j++) {
++            wv[j] = ctx->h[j];
++        }
++
++        for (j = 0; j < 64; j++) {
++            t1 = wv[7] + SHA256_F2(wv[4]) + CH(wv[4], wv[5], wv[6])
++                + sha256_k[j] + w[j];
++            t2 = SHA256_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
++            wv[7] = wv[6];
++            wv[6] = wv[5];
++            wv[5] = wv[4];
++            wv[4] = wv[3] + t1;
++            wv[3] = wv[2];
++            wv[2] = wv[1];
++            wv[1] = wv[0];
++            wv[0] = t1 + t2;
++        }
++
++        for (j = 0; j < 8; j++) {
++            ctx->h[j] += wv[j];
++        }
++#else
++        PACK32(&sub_block[ 0], &w[ 0]); PACK32(&sub_block[ 4], &w[ 1]);
++        PACK32(&sub_block[ 8], &w[ 2]); PACK32(&sub_block[12], &w[ 3]);
++        PACK32(&sub_block[16], &w[ 4]); PACK32(&sub_block[20], &w[ 5]);
++        PACK32(&sub_block[24], &w[ 6]); PACK32(&sub_block[28], &w[ 7]);
++        PACK32(&sub_block[32], &w[ 8]); PACK32(&sub_block[36], &w[ 9]);
++        PACK32(&sub_block[40], &w[10]); PACK32(&sub_block[44], &w[11]);
++        PACK32(&sub_block[48], &w[12]); PACK32(&sub_block[52], &w[13]);
++        PACK32(&sub_block[56], &w[14]); PACK32(&sub_block[60], &w[15]);
++
++        SHA256_SCR(16); SHA256_SCR(17); SHA256_SCR(18); SHA256_SCR(19);
++        SHA256_SCR(20); SHA256_SCR(21); SHA256_SCR(22); SHA256_SCR(23);
++        SHA256_SCR(24); SHA256_SCR(25); SHA256_SCR(26); SHA256_SCR(27);
++        SHA256_SCR(28); SHA256_SCR(29); SHA256_SCR(30); SHA256_SCR(31);
++        SHA256_SCR(32); SHA256_SCR(33); SHA256_SCR(34); SHA256_SCR(35);
++        SHA256_SCR(36); SHA256_SCR(37); SHA256_SCR(38); SHA256_SCR(39);
++        SHA256_SCR(40); SHA256_SCR(41); SHA256_SCR(42); SHA256_SCR(43);
++        SHA256_SCR(44); SHA256_SCR(45); SHA256_SCR(46); SHA256_SCR(47);
++        SHA256_SCR(48); SHA256_SCR(49); SHA256_SCR(50); SHA256_SCR(51);
++        SHA256_SCR(52); SHA256_SCR(53); SHA256_SCR(54); SHA256_SCR(55);
++        SHA256_SCR(56); SHA256_SCR(57); SHA256_SCR(58); SHA256_SCR(59);
++        SHA256_SCR(60); SHA256_SCR(61); SHA256_SCR(62); SHA256_SCR(63);
++
++        wv[0] = ctx->h[0]; wv[1] = ctx->h[1];
++        wv[2] = ctx->h[2]; wv[3] = ctx->h[3];
++        wv[4] = ctx->h[4]; wv[5] = ctx->h[5];
++        wv[6] = ctx->h[6]; wv[7] = ctx->h[7];
++
++        SHA256_EXP(0,1,2,3,4,5,6,7, 0); SHA256_EXP(7,0,1,2,3,4,5,6, 1);
++        SHA256_EXP(6,7,0,1,2,3,4,5, 2); SHA256_EXP(5,6,7,0,1,2,3,4, 3);
++        SHA256_EXP(4,5,6,7,0,1,2,3, 4); SHA256_EXP(3,4,5,6,7,0,1,2, 5);
++        SHA256_EXP(2,3,4,5,6,7,0,1, 6); SHA256_EXP(1,2,3,4,5,6,7,0, 7);
++        SHA256_EXP(0,1,2,3,4,5,6,7, 8); SHA256_EXP(7,0,1,2,3,4,5,6, 9);
++        SHA256_EXP(6,7,0,1,2,3,4,5,10); SHA256_EXP(5,6,7,0,1,2,3,4,11);
++        SHA256_EXP(4,5,6,7,0,1,2,3,12); SHA256_EXP(3,4,5,6,7,0,1,2,13);
++        SHA256_EXP(2,3,4,5,6,7,0,1,14); SHA256_EXP(1,2,3,4,5,6,7,0,15);
++        SHA256_EXP(0,1,2,3,4,5,6,7,16); SHA256_EXP(7,0,1,2,3,4,5,6,17);
++        SHA256_EXP(6,7,0,1,2,3,4,5,18); SHA256_EXP(5,6,7,0,1,2,3,4,19);
++        SHA256_EXP(4,5,6,7,0,1,2,3,20); SHA256_EXP(3,4,5,6,7,0,1,2,21);
++        SHA256_EXP(2,3,4,5,6,7,0,1,22); SHA256_EXP(1,2,3,4,5,6,7,0,23);
++        SHA256_EXP(0,1,2,3,4,5,6,7,24); SHA256_EXP(7,0,1,2,3,4,5,6,25);
++        SHA256_EXP(6,7,0,1,2,3,4,5,26); SHA256_EXP(5,6,7,0,1,2,3,4,27);
++        SHA256_EXP(4,5,6,7,0,1,2,3,28); SHA256_EXP(3,4,5,6,7,0,1,2,29);
++        SHA256_EXP(2,3,4,5,6,7,0,1,30); SHA256_EXP(1,2,3,4,5,6,7,0,31);
++        SHA256_EXP(0,1,2,3,4,5,6,7,32); SHA256_EXP(7,0,1,2,3,4,5,6,33);
++        SHA256_EXP(6,7,0,1,2,3,4,5,34); SHA256_EXP(5,6,7,0,1,2,3,4,35);
++        SHA256_EXP(4,5,6,7,0,1,2,3,36); SHA256_EXP(3,4,5,6,7,0,1,2,37);
++        SHA256_EXP(2,3,4,5,6,7,0,1,38); SHA256_EXP(1,2,3,4,5,6,7,0,39);
++        SHA256_EXP(0,1,2,3,4,5,6,7,40); SHA256_EXP(7,0,1,2,3,4,5,6,41);
++        SHA256_EXP(6,7,0,1,2,3,4,5,42); SHA256_EXP(5,6,7,0,1,2,3,4,43);
++        SHA256_EXP(4,5,6,7,0,1,2,3,44); SHA256_EXP(3,4,5,6,7,0,1,2,45);
++        SHA256_EXP(2,3,4,5,6,7,0,1,46); SHA256_EXP(1,2,3,4,5,6,7,0,47);
++        SHA256_EXP(0,1,2,3,4,5,6,7,48); SHA256_EXP(7,0,1,2,3,4,5,6,49);
++        SHA256_EXP(6,7,0,1,2,3,4,5,50); SHA256_EXP(5,6,7,0,1,2,3,4,51);
++        SHA256_EXP(4,5,6,7,0,1,2,3,52); SHA256_EXP(3,4,5,6,7,0,1,2,53);
++        SHA256_EXP(2,3,4,5,6,7,0,1,54); SHA256_EXP(1,2,3,4,5,6,7,0,55);
++        SHA256_EXP(0,1,2,3,4,5,6,7,56); SHA256_EXP(7,0,1,2,3,4,5,6,57);
++        SHA256_EXP(6,7,0,1,2,3,4,5,58); SHA256_EXP(5,6,7,0,1,2,3,4,59);
++        SHA256_EXP(4,5,6,7,0,1,2,3,60); SHA256_EXP(3,4,5,6,7,0,1,2,61);
++        SHA256_EXP(2,3,4,5,6,7,0,1,62); SHA256_EXP(1,2,3,4,5,6,7,0,63);
++
++        ctx->h[0] += wv[0]; ctx->h[1] += wv[1];
++        ctx->h[2] += wv[2]; ctx->h[3] += wv[3];
++        ctx->h[4] += wv[4]; ctx->h[5] += wv[5];
++        ctx->h[6] += wv[6]; ctx->h[7] += wv[7];
++#endif /* !UNROLL_LOOPS */
++    }
++}
++
++void sha256_transform(sha256_ctx *ctx, const unsigned char *message)
++{
++  sha256_transf(ctx, message, 1);
++}
++
++void sha256(const unsigned char *message, unsigned int len, unsigned char *digest)
++{
++    sha256_ctx ctx;
++
++    sha256_init(&ctx);
++    sha256_update(&ctx, message, len);
++    sha256_final(&ctx, digest);
++}
++
++void sha256_init(sha256_ctx *ctx)
++{
++#ifndef UNROLL_LOOPS
++    int i;
++    for (i = 0; i < 8; i++) {
++        ctx->h[i] = sha256_h0[i];
++    }
++#else
++    ctx->h[0] = sha256_h0[0]; ctx->h[1] = sha256_h0[1];
++    ctx->h[2] = sha256_h0[2]; ctx->h[3] = sha256_h0[3];
++    ctx->h[4] = sha256_h0[4]; ctx->h[5] = sha256_h0[5];
++    ctx->h[6] = sha256_h0[6]; ctx->h[7] = sha256_h0[7];
++#endif /* !UNROLL_LOOPS */
++
++    ctx->len = 0;
++    ctx->tot_len = 0;
++}
++
++void sha256_update(sha256_ctx *ctx, const unsigned char *message,
++                   unsigned int len)
++{
++    unsigned int block_nb;
++    unsigned int new_len, rem_len, tmp_len;
++    const unsigned char *shifted_message;
++
++    tmp_len = SHA256_BLOCK_SIZE - ctx->len;
++    rem_len = len < tmp_len ? len : tmp_len;
++
++    memcpy(&ctx->block[ctx->len], message, rem_len);
++
++    if (ctx->len + len < SHA256_BLOCK_SIZE) {
++        ctx->len += len;
++        return;
++    }
++
++    new_len = len - rem_len;
++    block_nb = new_len / SHA256_BLOCK_SIZE;
++
++    shifted_message = message + rem_len;
++
++    sha256_transf(ctx, ctx->block, 1);
++    sha256_transf(ctx, shifted_message, block_nb);
++
++    rem_len = new_len % SHA256_BLOCK_SIZE;
++
++    memcpy(ctx->block, &shifted_message[block_nb << 6],
++           rem_len);
++
++    ctx->len = rem_len;
++    ctx->tot_len += (block_nb + 1) << 6;
++}
++
++void sha256_final(sha256_ctx *ctx, unsigned char *digest)
++{
++    unsigned int block_nb;
++    unsigned int pm_len;
++    unsigned int len_b;
++
++#ifndef UNROLL_LOOPS
++    int i;
++#endif
++
++    block_nb = (1 + ((SHA256_BLOCK_SIZE - 9)
++                     < (ctx->len % SHA256_BLOCK_SIZE)));
++
++    len_b = (ctx->tot_len + ctx->len) << 3;
++    pm_len = block_nb << 6;
++
++    memset(ctx->block + ctx->len, 0, pm_len - ctx->len);
++    ctx->block[ctx->len] = 0x80;
++    UNPACK32(len_b, ctx->block + pm_len - 4);
++
++    sha256_transf(ctx, ctx->block, block_nb);
++
++#ifndef UNROLL_LOOPS
++    for (i = 0 ; i < 8; i++) {
++        UNPACK32(ctx->h[i], &digest[i << 2]);
++    }
++#else
++   UNPACK32(ctx->h[0], &digest[ 0]);
++   UNPACK32(ctx->h[1], &digest[ 4]);
++   UNPACK32(ctx->h[2], &digest[ 8]);
++   UNPACK32(ctx->h[3], &digest[12]);
++   UNPACK32(ctx->h[4], &digest[16]);
++   UNPACK32(ctx->h[5], &digest[20]);
++   UNPACK32(ctx->h[6], &digest[24]);
++   UNPACK32(ctx->h[7], &digest[28]);
++#endif /* !UNROLL_LOOPS */
++}
++
++/* SHA-512 functions */
++
++static
++void sha512_transf(sha512_ctx *ctx, const unsigned char *message,
++                   unsigned int block_nb)
++{
++    uint64 w[80];
++    uint64 wv[8];
++    uint64 t1, t2;
++    const unsigned char *sub_block;
++    int i, j;
++
++    for (i = 0; i < (int) block_nb; i++) {
++        sub_block = message + (i << 7);
++
++#ifndef UNROLL_LOOPS
++        for (j = 0; j < 16; j++) {
++            PACK64(&sub_block[j << 3], &w[j]);
++        }
++
++        for (j = 16; j < 80; j++) {
++            SHA512_SCR(j);
++        }
++
++        for (j = 0; j < 8; j++) {
++            wv[j] = ctx->h[j];
++        }
++
++        for (j = 0; j < 80; j++) {
++            t1 = wv[7] + SHA512_F2(wv[4]) + CH(wv[4], wv[5], wv[6])
++                + sha512_k[j] + w[j];
++            t2 = SHA512_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
++            wv[7] = wv[6];
++            wv[6] = wv[5];
++            wv[5] = wv[4];
++            wv[4] = wv[3] + t1;
++            wv[3] = wv[2];
++            wv[2] = wv[1];
++            wv[1] = wv[0];
++            wv[0] = t1 + t2;
++        }
++
++        for (j = 0; j < 8; j++) {
++            ctx->h[j] += wv[j];
++        }
++#else
++        PACK64(&sub_block[  0], &w[ 0]); PACK64(&sub_block[  8], &w[ 1]);
++        PACK64(&sub_block[ 16], &w[ 2]); PACK64(&sub_block[ 24], &w[ 3]);
++        PACK64(&sub_block[ 32], &w[ 4]); PACK64(&sub_block[ 40], &w[ 5]);
++        PACK64(&sub_block[ 48], &w[ 6]); PACK64(&sub_block[ 56], &w[ 7]);
++        PACK64(&sub_block[ 64], &w[ 8]); PACK64(&sub_block[ 72], &w[ 9]);
++        PACK64(&sub_block[ 80], &w[10]); PACK64(&sub_block[ 88], &w[11]);
++        PACK64(&sub_block[ 96], &w[12]); PACK64(&sub_block[104], &w[13]);
++        PACK64(&sub_block[112], &w[14]); PACK64(&sub_block[120], &w[15]);
++
++        SHA512_SCR(16); SHA512_SCR(17); SHA512_SCR(18); SHA512_SCR(19);
++        SHA512_SCR(20); SHA512_SCR(21); SHA512_SCR(22); SHA512_SCR(23);
++        SHA512_SCR(24); SHA512_SCR(25); SHA512_SCR(26); SHA512_SCR(27);
++        SHA512_SCR(28); SHA512_SCR(29); SHA512_SCR(30); SHA512_SCR(31);
++        SHA512_SCR(32); SHA512_SCR(33); SHA512_SCR(34); SHA512_SCR(35);
++        SHA512_SCR(36); SHA512_SCR(37); SHA512_SCR(38); SHA512_SCR(39);
++        SHA512_SCR(40); SHA512_SCR(41); SHA512_SCR(42); SHA512_SCR(43);
++        SHA512_SCR(44); SHA512_SCR(45); SHA512_SCR(46); SHA512_SCR(47);
++        SHA512_SCR(48); SHA512_SCR(49); SHA512_SCR(50); SHA512_SCR(51);
++        SHA512_SCR(52); SHA512_SCR(53); SHA512_SCR(54); SHA512_SCR(55);
++        SHA512_SCR(56); SHA512_SCR(57); SHA512_SCR(58); SHA512_SCR(59);
++        SHA512_SCR(60); SHA512_SCR(61); SHA512_SCR(62); SHA512_SCR(63);
++        SHA512_SCR(64); SHA512_SCR(65); SHA512_SCR(66); SHA512_SCR(67);
++        SHA512_SCR(68); SHA512_SCR(69); SHA512_SCR(70); SHA512_SCR(71);
++        SHA512_SCR(72); SHA512_SCR(73); SHA512_SCR(74); SHA512_SCR(75);
++        SHA512_SCR(76); SHA512_SCR(77); SHA512_SCR(78); SHA512_SCR(79);
++
++        wv[0] = ctx->h[0]; wv[1] = ctx->h[1];
++        wv[2] = ctx->h[2]; wv[3] = ctx->h[3];
++        wv[4] = ctx->h[4]; wv[5] = ctx->h[5];
++        wv[6] = ctx->h[6]; wv[7] = ctx->h[7];
++
++        j = 0;
++
++        do {
++            SHA512_EXP(0,1,2,3,4,5,6,7,j); j++;
++            SHA512_EXP(7,0,1,2,3,4,5,6,j); j++;
++            SHA512_EXP(6,7,0,1,2,3,4,5,j); j++;
++            SHA512_EXP(5,6,7,0,1,2,3,4,j); j++;
++            SHA512_EXP(4,5,6,7,0,1,2,3,j); j++;
++            SHA512_EXP(3,4,5,6,7,0,1,2,j); j++;
++            SHA512_EXP(2,3,4,5,6,7,0,1,j); j++;
++            SHA512_EXP(1,2,3,4,5,6,7,0,j); j++;
++        } while (j < 80);
++
++        ctx->h[0] += wv[0]; ctx->h[1] += wv[1];
++        ctx->h[2] += wv[2]; ctx->h[3] += wv[3];
++        ctx->h[4] += wv[4]; ctx->h[5] += wv[5];
++        ctx->h[6] += wv[6]; ctx->h[7] += wv[7];
++#endif /* !UNROLL_LOOPS */
++    }
++}
++
++void sha512_transform(sha512_ctx *ctx, const unsigned char *message)
++{
++  sha512_transf(ctx, message, 1);
++}
++
++void sha512(const unsigned char *message, unsigned int len,
++            unsigned char *digest)
++{
++    sha512_ctx ctx;
++
++    sha512_init(&ctx);
++    sha512_update(&ctx, message, len);
++    sha512_final(&ctx, digest);
++}
++
++void sha512_init(sha512_ctx *ctx)
++{
++#ifndef UNROLL_LOOPS
++    int i;
++    for (i = 0; i < 8; i++) {
++        ctx->h[i] = sha512_h0[i];
++    }
++#else
++    ctx->h[0] = sha512_h0[0]; ctx->h[1] = sha512_h0[1];
++    ctx->h[2] = sha512_h0[2]; ctx->h[3] = sha512_h0[3];
++    ctx->h[4] = sha512_h0[4]; ctx->h[5] = sha512_h0[5];
++    ctx->h[6] = sha512_h0[6]; ctx->h[7] = sha512_h0[7];
++#endif /* !UNROLL_LOOPS */
++
++    ctx->len = 0;
++    ctx->tot_len = 0;
++}
++
++void sha512_update(sha512_ctx *ctx, const unsigned char *message,
++                   unsigned int len)
++{
++    unsigned int block_nb;
++    unsigned int new_len, rem_len, tmp_len;
++    const unsigned char *shifted_message;
++
++    tmp_len = SHA512_BLOCK_SIZE - ctx->len;
++    rem_len = len < tmp_len ? len : tmp_len;
++
++    memcpy(&ctx->block[ctx->len], message, rem_len);
++
++    if (ctx->len + len < SHA512_BLOCK_SIZE) {
++        ctx->len += len;
++        return;
++    }
++
++    new_len = len - rem_len;
++    block_nb = new_len / SHA512_BLOCK_SIZE;
++
++    shifted_message = message + rem_len;
++
++    sha512_transf(ctx, ctx->block, 1);
++    sha512_transf(ctx, shifted_message, block_nb);
++
++    rem_len = new_len % SHA512_BLOCK_SIZE;
++
++    memcpy(ctx->block, &shifted_message[block_nb << 7],
++           rem_len);
++
++    ctx->len = rem_len;
++    ctx->tot_len += (block_nb + 1) << 7;
++}
++
++void sha512_final(sha512_ctx *ctx, unsigned char *digest)
++{
++    unsigned int block_nb;
++    unsigned int pm_len;
++    unsigned int len_b;
++
++#ifndef UNROLL_LOOPS
++    int i;
++#endif
++
++    block_nb = 1 + ((SHA512_BLOCK_SIZE - 17)
++                     < (ctx->len % SHA512_BLOCK_SIZE));
++
++    len_b = (ctx->tot_len + ctx->len) << 3;
++    pm_len = block_nb << 7;
++
++    memset(ctx->block + ctx->len, 0, pm_len - ctx->len);
++    ctx->block[ctx->len] = 0x80;
++    UNPACK32(len_b, ctx->block + pm_len - 4);
++
++    sha512_transf(ctx, ctx->block, block_nb);
++
++#ifndef UNROLL_LOOPS
++    for (i = 0 ; i < 8; i++) {
++        UNPACK64(ctx->h[i], &digest[i << 3]);
++    }
++#else
++    UNPACK64(ctx->h[0], &digest[ 0]);
++    UNPACK64(ctx->h[1], &digest[ 8]);
++    UNPACK64(ctx->h[2], &digest[16]);
++    UNPACK64(ctx->h[3], &digest[24]);
++    UNPACK64(ctx->h[4], &digest[32]);
++    UNPACK64(ctx->h[5], &digest[40]);
++    UNPACK64(ctx->h[6], &digest[48]);
++    UNPACK64(ctx->h[7], &digest[56]);
++#endif /* !UNROLL_LOOPS */
++}
++
++/* SHA-384 functions */
++
++void sha384(const unsigned char *message, unsigned int len,
++            unsigned char *digest)
++{
++    sha384_ctx ctx;
++
++    sha384_init(&ctx);
++    sha384_update(&ctx, message, len);
++    sha384_final(&ctx, digest);
++}
++
++void sha384_init(sha384_ctx *ctx)
++{
++#ifndef UNROLL_LOOPS
++    int i;
++    for (i = 0; i < 8; i++) {
++        ctx->h[i] = sha384_h0[i];
++    }
++#else
++    ctx->h[0] = sha384_h0[0]; ctx->h[1] = sha384_h0[1];
++    ctx->h[2] = sha384_h0[2]; ctx->h[3] = sha384_h0[3];
++    ctx->h[4] = sha384_h0[4]; ctx->h[5] = sha384_h0[5];
++    ctx->h[6] = sha384_h0[6]; ctx->h[7] = sha384_h0[7];
++#endif /* !UNROLL_LOOPS */
++
++    ctx->len = 0;
++    ctx->tot_len = 0;
++}
++
++void sha384_update(sha384_ctx *ctx, const unsigned char *message,
++                   unsigned int len)
++{
++    unsigned int block_nb;
++    unsigned int new_len, rem_len, tmp_len;
++    const unsigned char *shifted_message;
++
++    tmp_len = SHA384_BLOCK_SIZE - ctx->len;
++    rem_len = len < tmp_len ? len : tmp_len;
++
++    memcpy(&ctx->block[ctx->len], message, rem_len);
++
++    if (ctx->len + len < SHA384_BLOCK_SIZE) {
++        ctx->len += len;
++        return;
++    }
++
++    new_len = len - rem_len;
++    block_nb = new_len / SHA384_BLOCK_SIZE;
++
++    shifted_message = message + rem_len;
++
++    sha512_transf(ctx, ctx->block, 1);
++    sha512_transf(ctx, shifted_message, block_nb);
++
++    rem_len = new_len % SHA384_BLOCK_SIZE;
++
++    memcpy(ctx->block, &shifted_message[block_nb << 7],
++           rem_len);
++
++    ctx->len = rem_len;
++    ctx->tot_len += (block_nb + 1) << 7;
++}
++
++void sha384_final(sha384_ctx *ctx, unsigned char *digest)
++{
++    unsigned int block_nb;
++    unsigned int pm_len;
++    unsigned int len_b;
++
++#ifndef UNROLL_LOOPS
++    int i;
++#endif
++
++    block_nb = (1 + ((SHA384_BLOCK_SIZE - 17)
++                     < (ctx->len % SHA384_BLOCK_SIZE)));
++
++    len_b = (ctx->tot_len + ctx->len) << 3;
++    pm_len = block_nb << 7;
++
++    memset(ctx->block + ctx->len, 0, pm_len - ctx->len);
++    ctx->block[ctx->len] = 0x80;
++    UNPACK32(len_b, ctx->block + pm_len - 4);
++
++    sha512_transf(ctx, ctx->block, block_nb);
++
++#ifndef UNROLL_LOOPS
++    for (i = 0 ; i < 6; i++) {
++        UNPACK64(ctx->h[i], &digest[i << 3]);
++    }
++#else
++    UNPACK64(ctx->h[0], &digest[ 0]);
++    UNPACK64(ctx->h[1], &digest[ 8]);
++    UNPACK64(ctx->h[2], &digest[16]);
++    UNPACK64(ctx->h[3], &digest[24]);
++    UNPACK64(ctx->h[4], &digest[32]);
++    UNPACK64(ctx->h[5], &digest[40]);
++#endif /* !UNROLL_LOOPS */
++}
++
++/* SHA-224 functions */
++
++void sha224(const unsigned char *message, unsigned int len,
++            unsigned char *digest)
++{
++    sha224_ctx ctx;
++
++    sha224_init(&ctx);
++    sha224_update(&ctx, message, len);
++    sha224_final(&ctx, digest);
++}
++
++void sha224_init(sha224_ctx *ctx)
++{
++#ifndef UNROLL_LOOPS
++    int i;
++    for (i = 0; i < 8; i++) {
++        ctx->h[i] = sha224_h0[i];
++    }
++#else
++    ctx->h[0] = sha224_h0[0]; ctx->h[1] = sha224_h0[1];
++    ctx->h[2] = sha224_h0[2]; ctx->h[3] = sha224_h0[3];
++    ctx->h[4] = sha224_h0[4]; ctx->h[5] = sha224_h0[5];
++    ctx->h[6] = sha224_h0[6]; ctx->h[7] = sha224_h0[7];
++#endif /* !UNROLL_LOOPS */
++
++    ctx->len = 0;
++    ctx->tot_len = 0;
++}
++
++void sha224_update(sha224_ctx *ctx, const unsigned char *message,
++                   unsigned int len)
++{
++    unsigned int block_nb;
++    unsigned int new_len, rem_len, tmp_len;
++    const unsigned char *shifted_message;
++
++    tmp_len = SHA224_BLOCK_SIZE - ctx->len;
++    rem_len = len < tmp_len ? len : tmp_len;
++
++    memcpy(&ctx->block[ctx->len], message, rem_len);
++
++    if (ctx->len + len < SHA224_BLOCK_SIZE) {
++        ctx->len += len;
++        return;
++    }
++
++    new_len = len - rem_len;
++    block_nb = new_len / SHA224_BLOCK_SIZE;
++
++    shifted_message = message + rem_len;
++
++    sha256_transf(ctx, ctx->block, 1);
++    sha256_transf(ctx, shifted_message, block_nb);
++
++    rem_len = new_len % SHA224_BLOCK_SIZE;
++
++    memcpy(ctx->block, &shifted_message[block_nb << 6],
++           rem_len);
++
++    ctx->len = rem_len;
++    ctx->tot_len += (block_nb + 1) << 6;
++}
++
++void sha224_final(sha224_ctx *ctx, unsigned char *digest)
++{
++    unsigned int block_nb;
++    unsigned int pm_len;
++    unsigned int len_b;
++
++#ifndef UNROLL_LOOPS
++    int i;
++#endif
++
++    block_nb = (1 + ((SHA224_BLOCK_SIZE - 9)
++                     < (ctx->len % SHA224_BLOCK_SIZE)));
++
++    len_b = (ctx->tot_len + ctx->len) << 3;
++    pm_len = block_nb << 6;
++
++    memset(ctx->block + ctx->len, 0, pm_len - ctx->len);
++    ctx->block[ctx->len] = 0x80;
++    UNPACK32(len_b, ctx->block + pm_len - 4);
++
++    sha256_transf(ctx, ctx->block, block_nb);
++
++#ifndef UNROLL_LOOPS
++    for (i = 0 ; i < 7; i++) {
++        UNPACK32(ctx->h[i], &digest[i << 2]);
++    }
++#else
++   UNPACK32(ctx->h[0], &digest[ 0]);
++   UNPACK32(ctx->h[1], &digest[ 4]);
++   UNPACK32(ctx->h[2], &digest[ 8]);
++   UNPACK32(ctx->h[3], &digest[12]);
++   UNPACK32(ctx->h[4], &digest[16]);
++   UNPACK32(ctx->h[5], &digest[20]);
++   UNPACK32(ctx->h[6], &digest[24]);
++#endif /* !UNROLL_LOOPS */
++}
++
++#ifdef TEST_VECTORS
++
++/* FIPS 180-2 Validation tests */
++
++#include 
++#include 
++
++void test(const unsigned char *vector, unsigned char *digest,
++          unsigned int digest_size)
++{
++    unsigned char output[2 * SHA512_DIGEST_SIZE + 1];
++    int i;
++
++    output[2 * digest_size] = '\0';
++
++    for (i = 0; i < (int) digest_size ; i++) {
++       sprintf((char *) output + 2 * i, "%02x", digest[i]);
++    }
++
++    printf("H: %s\n", output);
++    if (strcmp((char *) vector, (char *) output)) {
++        fprintf(stderr, "Test failed.\n");
++        exit(EXIT_FAILURE);
++    }
++}
++
++int main()
++{
++    static const unsigned char *vectors[4][3] =
++    {   /* SHA-224 */
++        {
++        "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7",
++        "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525",
++        "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67",
++        },
++        /* SHA-256 */
++        {
++        "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
++        "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
++        "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0",
++        },
++        /* SHA-384 */
++        {
++        "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed"
++        "8086072ba1e7cc2358baeca134c825a7",
++        "09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712"
++        "fcc7c71a557e2db966c3e9fa91746039",
++        "9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b"
++        "07b8b3dc38ecc4ebae97ddd87f3d8985",
++        },
++        /* SHA-512 */
++        {
++        "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a"
++        "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
++        "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018"
++        "501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909",
++        "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"
++        "de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b"
++        }
++    };
++
++    static const unsigned char message1[] = "abc";
++    static const unsigned char message2a[] = "abcdbcdecdefdefgefghfghighijhi"
++                                             "jkijkljklmklmnlmnomnopnopq";
++    static const unsigned char message2b[] =
++                                      "abcdefghbcdefghicdefghijdefghijkefghij"
++                                      "klfghijklmghijklmnhijklmnoijklmnopjklm"
++                                      "nopqklmnopqrlmnopqrsmnopqrstnopqrstu";
++    unsigned char *message3;
++    unsigned int message3_len  = 1000000;
++    unsigned char digest[SHA512_DIGEST_SIZE];
++
++    message3 = malloc(message3_len);
++    if (message3 == NULL) {
++        fprintf(stderr, "Can't allocate memory\n");
++        return -1;
++    }
++    memset(message3, 'a', message3_len);
++
++    printf("SHA-2 FIPS 180-2 Validation tests\n\n");
++    printf("SHA-224 Test vectors\n");
++
++    sha224(message1, strlen((char *) message1), digest);
++    test(vectors[0][0], digest, SHA224_DIGEST_SIZE);
++    sha224(message2a, strlen((char *) message2a), digest);
++    test(vectors[0][1], digest, SHA224_DIGEST_SIZE);
++    sha224(message3, message3_len, digest);
++    test(vectors[0][2], digest, SHA224_DIGEST_SIZE);
++    printf("\n");
++
++    printf("SHA-256 Test vectors\n");
++
++    sha256(message1, strlen((char *) message1), digest);
++    test(vectors[1][0], digest, SHA256_DIGEST_SIZE);
++    sha256(message2a, strlen((char *) message2a), digest);
++    test(vectors[1][1], digest, SHA256_DIGEST_SIZE);
++    sha256(message3, message3_len, digest);
++    test(vectors[1][2], digest, SHA256_DIGEST_SIZE);
++    printf("\n");
++
++    printf("SHA-384 Test vectors\n");
++
++    sha384(message1, strlen((char *) message1), digest);
++    test(vectors[2][0], digest, SHA384_DIGEST_SIZE);
++    sha384(message2b, strlen((char *) message2b), digest);
++    test(vectors[2][1], digest, SHA384_DIGEST_SIZE);
++    sha384(message3, message3_len, digest);
++    test(vectors[2][2], digest, SHA384_DIGEST_SIZE);
++    printf("\n");
++
++    printf("SHA-512 Test vectors\n");
++
++    sha512(message1, strlen((char *) message1), digest);
++    test(vectors[3][0], digest, SHA512_DIGEST_SIZE);
++    sha512(message2b, strlen((char *) message2b), digest);
++    test(vectors[3][1], digest, SHA512_DIGEST_SIZE);
++    sha512(message3, message3_len, digest);
++    test(vectors[3][2], digest, SHA512_DIGEST_SIZE);
++    printf("\n");
++
++    printf("All tests passed.\n");
++
++    return 0;
++}
++
++#endif /* TEST_VECTORS */
++
++/*** End of #include "sha2.c" ***/
++
++
++#if HAVE_CIPHER_CHACHA20 || HAVE_CIPHER_SQLCIPHER
++/* #include "fastpbkdf2.c" */
++/*** Begin of #include "fastpbkdf2.c" ***/
++/*
++ * fast-pbkdf2 - Optimal PBKDF2-HMAC calculation
++ * Written in 2015 by Joseph Birr-Pixton 
++ *
++ * To the extent possible under law, the author(s) have dedicated all
++ * copyright and related and neighboring rights to this software to the
++ * public domain worldwide. This software is distributed without any
++ * warranty.
++ *
++ * You should have received a copy of the CC0 Public Domain Dedication
++ * along with this software. If not, see
++ * .
++ */
++
++/* #include "fastpbkdf2.h" */
++/*** Begin of #include "fastpbkdf2.h" ***/
++/*
++ * fastpbkdf2 - Faster PBKDF2-HMAC calculation
++ * Written in 2015 by Joseph Birr-Pixton 
++ *
++ * To the extent possible under law, the author(s) have dedicated all
++ * copyright and related and neighboring rights to this software to the
++ * public domain worldwide. This software is distributed without any
++ * warranty.
++ *
++ * You should have received a copy of the CC0 Public Domain Dedication
++ * along with this software. If not, see
++ * .
++ */
++
++#ifndef FASTPBKDF2_H
++#define FASTPBKDF2_H
++
++#include 
++/* #include "mystdint.h" */
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/** Calculates PBKDF2-HMAC-SHA1.
++ *
++ *  @p npw bytes at @p pw are the password input.
++ *  @p nsalt bytes at @p salt are the salt input.
++ *  @p iterations is the PBKDF2 iteration count and must be non-zero.
++ *  @p nout bytes of output are written to @p out.  @p nout must be non-zero.
++ *
++ *  This function cannot fail; it does not report errors.
++ */
++void fastpbkdf2_hmac_sha1(const uint8_t *pw, size_t npw,
++                          const uint8_t *salt, size_t nsalt,
++                          uint32_t iterations,
++                          uint8_t *out, size_t nout);
++
++/** Calculates PBKDF2-HMAC-SHA256.
++ *
++ *  @p npw bytes at @p pw are the password input.
++ *  @p nsalt bytes at @p salt are the salt input.
++ *  @p iterations is the PBKDF2 iteration count and must be non-zero.
++ *  @p nout bytes of output are written to @p out.  @p nout must be non-zero.
++ *
++ *  This function cannot fail; it does not report errors.
++ */
++void fastpbkdf2_hmac_sha256(const uint8_t *pw, size_t npw,
++                            const uint8_t *salt, size_t nsalt,
++                            uint32_t iterations,
++                            uint8_t *out, size_t nout);
++
++/** Calculates PBKDF2-HMAC-SHA512.
++ *
++ *  @p npw bytes at @p pw are the password input.
++ *  @p nsalt bytes at @p salt are the salt input.
++ *  @p iterations is the PBKDF2 iteration count and must be non-zero.
++ *  @p nout bytes of output are written to @p out.  @p nout must be non-zero.
++ *
++ *  This function cannot fail; it does not report errors.
++ */
++void fastpbkdf2_hmac_sha512(const uint8_t *pw, size_t npw,
++                            const uint8_t *salt, size_t nsalt,
++                            uint32_t iterations,
++                            uint8_t *out, size_t nout);
++
++/** Calculates SQLCipher HMAC.
++ *
++ *  This function cannot fail; it does not report errors.
++ */
++void sqlcipher_hmac(int algorithm,
++                    unsigned char* key, int nkey,
++                    unsigned char* in, int in_sz,
++                    unsigned char* in2, int in2_sz,
++                    unsigned char* out);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++/*** End of #include "fastpbkdf2.h" ***/
++
++
++#include 
++#include 
++#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__clang__) && !defined(__QNX__)
++#include 
++#endif
++
++/* #include "sha1.h" */
++
++/* #include "sha2.h" */
++
++
++/* --- MSVC doesn't support C99 --- */
++#ifdef _MSC_VER
++#define restrict
++#define inline __inline
++#define _Pragma __pragma
++#endif
++
++/* --- Common useful things --- */
++#ifndef MIN
++#define MIN(a, b) ((a) > (b)) ? (b) : (a)
++#endif
++
++static inline void write32_be(uint32_t n, uint8_t out[4])
++{
++#if defined(__GNUC__) && __GNUC__ >= 4 && __BYTE_ORDER == __LITTLE_ENDIAN
++  *(uint32_t *)(out) = __builtin_bswap32(n);
++#else
++  out[0] = (n >> 24) & 0xff;
++  out[1] = (n >> 16) & 0xff;
++  out[2] = (n >> 8) & 0xff;
++  out[3] = n & 0xff;
++#endif
++}
++
++static inline void write64_be(uint64_t n, uint8_t out[8])
++{
++#if defined(__GNUC__) &&  __GNUC__ >= 4 && __BYTE_ORDER == __LITTLE_ENDIAN
++  *(uint64_t *)(out) = __builtin_bswap64(n);
++#else
++  write32_be((n >> 32) & 0xffffffff, out);
++  write32_be(n & 0xffffffff, out + 4);
++#endif
++}
++
++/* --- Optional OpenMP parallelisation of consecutive blocks --- */
++#ifdef WITH_OPENMP
++# define OPENMP_PARALLEL_FOR _Pragma("omp parallel for")
++#else
++# define OPENMP_PARALLEL_FOR
++#endif
++
++/* Prepare block (of blocksz bytes) to contain md padding denoting a msg-size
++ * message (in bytes).  block has a prefix of used bytes.
++ *
++ * Message length is expressed in 32 bits (so suitable for sha1, sha256, sha512). */
++static inline void md_pad(uint8_t *block, size_t blocksz, size_t used, size_t msg)
++{
++  memset(block + used, 0, blocksz - used - 4);
++  block[used] = 0x80;
++  block += blocksz - 4;
++  write32_be((uint32_t) (msg * 8), block);
++}
++
++/* Internal function/type names for hash-specific things. */
++#define HMAC_CTX(_name) HMAC_ ## _name ## _ctx
++#define HMAC_INIT(_name) HMAC_ ## _name ## _init
++#define HMAC_UPDATE(_name) HMAC_ ## _name ## _update
++#define HMAC_FINAL(_name) HMAC_ ## _name ## _final
++
++#define PBKDF2_F(_name) pbkdf2_f_ ## _name
++#define PBKDF2(_name) pbkdf2_ ## _name
++
++/* This macro expands to decls for the whole implementation for a given
++ * hash function.  Arguments are:
++ *
++ * _name like 'sha1', added to symbol names
++ * _blocksz block size, in bytes
++ * _hashsz digest output, in bytes
++ * _ctx hash context type
++ * _init hash context initialisation function
++ *    args: (_ctx *c)
++ * _update hash context update function
++ *    args: (_ctx *c, const void *data, size_t ndata)
++ * _final hash context finish function
++ *    args: (void *out, _ctx *c)
++ * _xform hash context raw block update function
++ *    args: (_ctx *c, const void *data)
++ * _xcpy hash context raw copy function (only need copy hash state)
++ *    args: (_ctx * restrict out, const _ctx *restrict in)
++ * _xtract hash context state extraction
++ *    args: args (_ctx *restrict c, uint8_t *restrict out)
++ * _xxor hash context xor function (only need xor hash state)
++ *    args: (_ctx *restrict out, const _ctx *restrict in)
++ *
++ * The resulting function is named PBKDF2(_name).
++ */
++#define DECL_PBKDF2(_name, _blocksz, _hashsz, _ctx,                           \
++                    _init, _update, _xform, _final, _xcpy, _xtract, _xxor)    \
++  typedef struct {                                                            \
++    _ctx inner;                                                               \
++    _ctx outer;                                                               \
++  } HMAC_CTX(_name);                                                          \
++                                                                              \
++  static inline void HMAC_INIT(_name)(HMAC_CTX(_name) *ctx,                   \
++                                      const uint8_t *key, size_t nkey)        \
++  {                                                                           \
++    /* Prepare key: */                                                        \
++    uint8_t k[_blocksz];                                                      \
++                                                                              \
++    /* Shorten long keys. */                                                  \
++    if (nkey > _blocksz)                                                      \
++    {                                                                         \
++      _init(&ctx->inner);                                                     \
++      _update(&ctx->inner, key, (unsigned int) nkey);                         \
++      _final(&ctx->inner, k);                                                 \
++                                                                              \
++      key = k;                                                                \
++      nkey = _hashsz;                                                         \
++    }                                                                         \
++                                                                              \
++    /* Standard doesn't cover case where blocksz < hashsz. */                 \
++    assert(nkey <= _blocksz);                                                 \
++                                                                              \
++    /* Right zero-pad short keys. */                                          \
++    if (k != key)                                                             \
++      memcpy(k, key, nkey);                                                   \
++    if (_blocksz > nkey)                                                      \
++      memset(k + nkey, 0, _blocksz - nkey);                                   \
++                                                                              \
++    {                                                                         \
++      /* Start inner hash computation */                                      \
++      uint8_t blk_inner[_blocksz];                                            \
++      uint8_t blk_outer[_blocksz];                                            \
++      size_t i;                                                               \
++                                                                              \
++      for (i = 0; i < _blocksz; i++)                                          \
++      {                                                                       \
++        blk_inner[i] = 0x36 ^ k[i];                                           \
++        blk_outer[i] = 0x5c ^ k[i];                                           \
++      }                                                                       \
++                                                                              \
++      _init(&ctx->inner);                                                     \
++      _update(&ctx->inner, blk_inner, sizeof blk_inner);                      \
++                                                                              \
++      /* And outer. */                                                        \
++      _init(&ctx->outer);                                                     \
++      _update(&ctx->outer, blk_outer, sizeof blk_outer);                      \
++    }                                                                         \
++  }                                                                           \
++                                                                              \
++  static inline void HMAC_UPDATE(_name)(HMAC_CTX(_name) *ctx,                 \
++                                        const void *data, size_t ndata)       \
++  {                                                                           \
++    _update(&ctx->inner, data, (unsigned int) ndata);                         \
++  }                                                                           \
++                                                                              \
++  static inline void HMAC_FINAL(_name)(HMAC_CTX(_name) *ctx,                  \
++                                       uint8_t out[_hashsz])                  \
++  {                                                                           \
++    _final(&ctx->inner, out);                                                 \
++    _update(&ctx->outer, out, _hashsz);                                       \
++    _final(&ctx->outer, out);                                                 \
++  }                                                                           \
++                                                                              \
++                                                                              \
++  /* --- PBKDF2 --- */                                                        \
++  static inline void PBKDF2_F(_name)(const HMAC_CTX(_name) *startctx,         \
++                                     uint32_t counter,                        \
++                                     const uint8_t *salt, size_t nsalt,       \
++                                     uint32_t iterations,                     \
++                                     uint8_t *out)                            \
++  {                                                                           \
++    uint8_t countbuf[4];                                                      \
++    uint8_t Ublock[_blocksz];                                                 \
++    HMAC_CTX(_name) ctx;                                                      \
++    uint32_t i;                                                               \
++    _ctx result;                                                              \
++                                                                              \
++    write32_be(counter, countbuf);                                            \
++                                                                              \
++    /* Prepare loop-invariant padding block. */                               \
++    md_pad(Ublock, _blocksz, _hashsz, _blocksz + _hashsz);                    \
++                                                                              \
++    /* First iteration:                                                       \
++     *   U_1 = PRF(P, S || INT_32_BE(i))                                      \
++     */                                                                       \
++    ctx = *startctx;                                                          \
++    HMAC_UPDATE(_name)(&ctx, salt, nsalt);                                    \
++    HMAC_UPDATE(_name)(&ctx, countbuf, sizeof countbuf);                      \
++    HMAC_FINAL(_name)(&ctx, Ublock);                                          \
++    result = ctx.outer;                                                       \
++                                                                              \
++    /* Subsequent iterations:                                                 \
++     *   U_c = PRF(P, U_{c-1})                                                \
++     */                                                                       \
++    for (i = 1; i < iterations; i++)                                 \
++    {                                                                         \
++      /* Complete inner hash with previous U */                               \
++      _xcpy(&ctx.inner, &startctx->inner);                                    \
++      _xform(&ctx.inner, Ublock);                                             \
++      _xtract(&ctx.inner, Ublock);                                            \
++      /* Complete outer hash with inner output */                             \
++      _xcpy(&ctx.outer, &startctx->outer);                                    \
++      _xform(&ctx.outer, Ublock);                                             \
++      _xtract(&ctx.outer, Ublock);                                            \
++      _xxor(&result, &ctx.outer);                                             \
++    }                                                                         \
++                                                                              \
++    /* Reform result into output buffer. */                                   \
++    _xtract(&result, out);                                                    \
++  }                                                                           \
++                                                                              \
++  static inline void PBKDF2(_name)(const uint8_t *pw, size_t npw,             \
++                     const uint8_t *salt, size_t nsalt,                       \
++                     uint32_t iterations,                                     \
++                     uint8_t *out, size_t nout)                               \
++  {                                                                           \
++    HMAC_CTX(_name) ctx;                                                      \
++    uint32_t blocks_needed;                                                   \
++    uint32_t counter;                                                         \
++    assert(iterations);                                                       \
++    assert(out && nout);                                                      \
++                                                                              \
++    /* Starting point for inner loop. */                                      \
++    HMAC_INIT(_name)(&ctx, pw, npw);                                          \
++                                                                              \
++    /* How many blocks do we need? */                                         \
++    blocks_needed = (uint32_t)(nout + _hashsz - 1) / _hashsz;                 \
++                                                                              \
++    OPENMP_PARALLEL_FOR                                                       \
++    for (counter = 1; counter <= blocks_needed; counter++)                    \
++    {                                                                         \
++      uint8_t block[_hashsz];                                                 \
++      size_t offset;                                                          \
++      size_t taken;                                                           \
++      PBKDF2_F(_name)(&ctx, counter, salt, nsalt, iterations, block);         \
++                                                                              \
++      offset = (counter - 1) * _hashsz;                                       \
++      taken = MIN(nout - offset, _hashsz);                                    \
++      memcpy(out + offset, block, taken);                                     \
++    }                                                                         \
++  }
++
++static inline void sha1_extract(sha1_ctx *restrict ctx, uint8_t *restrict out)
++{
++  write32_be(ctx->h[0], out);
++  write32_be(ctx->h[1], out + 4);
++  write32_be(ctx->h[2], out + 8);
++  write32_be(ctx->h[3], out + 12);
++  write32_be(ctx->h[4], out + 16);
++}
++
++static inline void sha1_cpy(sha1_ctx *restrict out, const sha1_ctx *restrict in)
++{
++  out->h[0] = in->h[0];
++  out->h[1] = in->h[1];
++  out->h[2] = in->h[2];
++  out->h[3] = in->h[3];
++  out->h[4] = in->h[4];
++}
++
++static inline void sha1_xor(sha1_ctx *restrict out, const sha1_ctx *restrict in)
++{
++  out->h[0] ^= in->h[0];
++  out->h[1] ^= in->h[1];
++  out->h[2] ^= in->h[2];
++  out->h[3] ^= in->h[3];
++  out->h[4] ^= in->h[4];
++}
++
++DECL_PBKDF2(sha1,
++            SHA1_BLOCK_SIZE,
++            SHA1_DIGEST_SIZE,
++            sha1_ctx,
++            sha1_init,
++            sha1_update,
++            sha1_transform,
++            sha1_final,
++            sha1_cpy,
++            sha1_extract,
++            sha1_xor)
++
++static inline void sha256_extract(sha256_ctx *restrict ctx, uint8_t *restrict out)
++{
++  write32_be(ctx->h[0], out);
++  write32_be(ctx->h[1], out + 4);
++  write32_be(ctx->h[2], out + 8);
++  write32_be(ctx->h[3], out + 12);
++  write32_be(ctx->h[4], out + 16);
++  write32_be(ctx->h[5], out + 20);
++  write32_be(ctx->h[6], out + 24);
++  write32_be(ctx->h[7], out + 28);
++}
++
++static inline void sha256_cpy(sha256_ctx *restrict out, const sha256_ctx *restrict in)
++{
++  out->h[0] = in->h[0];
++  out->h[1] = in->h[1];
++  out->h[2] = in->h[2];
++  out->h[3] = in->h[3];
++  out->h[4] = in->h[4];
++  out->h[5] = in->h[5];
++  out->h[6] = in->h[6];
++  out->h[7] = in->h[7];
++}
++
++static inline void sha256_xor(sha256_ctx *restrict out, const sha256_ctx *restrict in)
++{
++  out->h[0] ^= in->h[0];
++  out->h[1] ^= in->h[1];
++  out->h[2] ^= in->h[2];
++  out->h[3] ^= in->h[3];
++  out->h[4] ^= in->h[4];
++  out->h[5] ^= in->h[5];
++  out->h[6] ^= in->h[6];
++  out->h[7] ^= in->h[7];
++}
++
++DECL_PBKDF2(sha256,
++            SHA256_BLOCK_SIZE,
++            SHA256_DIGEST_SIZE,
++            sha256_ctx,
++            sha256_init,
++            sha256_update,
++            sha256_transform,
++            sha256_final,
++            sha256_cpy,
++            sha256_extract,
++            sha256_xor)
++
++static inline void sha512_extract(sha512_ctx *restrict ctx, uint8_t *restrict out)
++{
++  write64_be(ctx->h[0], out);
++  write64_be(ctx->h[1], out + 8);
++  write64_be(ctx->h[2], out + 16);
++  write64_be(ctx->h[3], out + 24);
++  write64_be(ctx->h[4], out + 32);
++  write64_be(ctx->h[5], out + 40);
++  write64_be(ctx->h[6], out + 48);
++  write64_be(ctx->h[7], out + 56);
++}
++
++static inline void sha512_cpy(sha512_ctx *restrict out, const sha512_ctx *restrict in)
++{
++  out->h[0] = in->h[0];
++  out->h[1] = in->h[1];
++  out->h[2] = in->h[2];
++  out->h[3] = in->h[3];
++  out->h[4] = in->h[4];
++  out->h[5] = in->h[5];
++  out->h[6] = in->h[6];
++  out->h[7] = in->h[7];
++}
++
++static inline void sha512_xor(sha512_ctx *restrict out, const sha512_ctx *restrict in)
++{
++  out->h[0] ^= in->h[0];
++  out->h[1] ^= in->h[1];
++  out->h[2] ^= in->h[2];
++  out->h[3] ^= in->h[3];
++  out->h[4] ^= in->h[4];
++  out->h[5] ^= in->h[5];
++  out->h[6] ^= in->h[6];
++  out->h[7] ^= in->h[7];
++}
++
++DECL_PBKDF2(sha512,
++            SHA512_BLOCK_SIZE,
++            SHA512_DIGEST_SIZE,
++            sha512_ctx,
++            sha512_init,
++            sha512_update,
++            sha512_transform,
++            sha512_final,
++            sha512_cpy,
++            sha512_extract,
++            sha512_xor)
++
++void fastpbkdf2_hmac_sha1(const uint8_t *pw, size_t npw,
++                          const uint8_t *salt, size_t nsalt,
++                          uint32_t iterations,
++                          uint8_t *out, size_t nout)
++{
++  PBKDF2(sha1)(pw, npw, salt, nsalt, iterations, out, nout);
++#if 0
++  pbkdf2_sha1(pw, npw, salt, nsalt, iterations, out, nout);
++#endif
++}
++
++void fastpbkdf2_hmac_sha256(const uint8_t *pw, size_t npw,
++                            const uint8_t *salt, size_t nsalt,
++                            uint32_t iterations,
++                            uint8_t *out, size_t nout)
++{
++  PBKDF2(sha256)(pw, npw, salt, nsalt, iterations, out, nout);
++}
++
++void fastpbkdf2_hmac_sha512(const uint8_t *pw, size_t npw,
++                            const uint8_t *salt, size_t nsalt,
++                            uint32_t iterations,
++                            uint8_t *out, size_t nout)
++{
++  PBKDF2(sha512)(pw, npw, salt, nsalt, iterations, out, nout);
++}
++
++void sqlcipher_hmac(int algorithm, unsigned char* key, int nkey, unsigned char* in, int in_sz, unsigned char* in2, int in2_sz, unsigned char* out)
++{
++  switch (algorithm)
++  {
++    case 0:
++    {
++      HMAC_sha1_ctx hctx;
++      HMAC_sha1_init(&hctx, key, nkey);
++      HMAC_sha1_update(&hctx, in, in_sz);
++      if (in2 != NULL)
++      {
++        HMAC_sha1_update(&hctx, in2, in2_sz);
++      }
++      HMAC_sha1_final(&hctx, out);
++    }
++    break;
++
++    case 1:
++    {
++      HMAC_sha256_ctx hctx;
++      HMAC_sha256_init(&hctx, key, nkey);
++      HMAC_sha256_update(&hctx, in, in_sz);
++      if (in2 != NULL)
++      {
++        HMAC_sha256_update(&hctx, in2, in2_sz);
++      }
++      HMAC_sha256_final(&hctx, out);
++    }
++    break;
++
++    case 2:
++    default:
++    {
++      HMAC_sha512_ctx hctx;
++      HMAC_sha512_init(&hctx, key, nkey);
++      HMAC_sha512_update(&hctx, in, in_sz);
++      if (in2 != NULL)
++      {
++        HMAC_sha512_update(&hctx, in2, in2_sz);
++      }
++      HMAC_sha512_final(&hctx, out);
++    }
++    break;
++  }
++}
++/*** End of #include "fastpbkdf2.c" ***/
++
++
++/* Prototypes for several crypto functions to make pedantic compilers happy */
++void chacha20_xor(void* data, size_t n, const uint8_t key[32], const uint8_t nonce[12], uint32_t counter);
++void poly1305(const uint8_t* msg, size_t n, const uint8_t key[32], uint8_t tag[16]);
++int poly1305_tagcmp(const uint8_t tag1[16], const uint8_t tag2[16]);
++void chacha20_rng(void* out, size_t n);
++
++/* #include "chacha20poly1305.c" */
++/*** Begin of #include "chacha20poly1305.c" ***/
++/*
++** This file contains the implementation for
++**   - the ChaCha20 cipher
++**   - the Poly1305 message digest
++**
++** The code was taken from the public domain implementation
++** of the sqleet project (https://github.com/resilar/sqleet)
++*/
++
++/* #include "mystdint.h" */
++
++#include 
++
++#define ROL32(x, c) (((x) << (c)) | ((x) >> (32-(c))))
++#define ROR32(x, c) (((x) >> (c)) | ((x) << (32-(c))))
++
++#define LOAD32_LE(p)            \
++  ( ((uint32_t)((p)[0]) <<  0)  \
++  | ((uint32_t)((p)[1]) <<  8)  \
++  | ((uint32_t)((p)[2]) << 16)  \
++  | ((uint32_t)((p)[3]) << 24)  \
++  )
++#define LOAD32_BE(p)            \
++  ( ((uint32_t)((p)[3]) <<  0)  \
++  | ((uint32_t)((p)[2]) <<  8)  \
++  | ((uint32_t)((p)[1]) << 16)  \
++  | ((uint32_t)((p)[0]) << 24)  \
++  )
++
++#define STORE32_LE(p, v)        \
++  (p)[0] = ((v) >>  0) & 0xFF;  \
++  (p)[1] = ((v) >>  8) & 0xFF;  \
++  (p)[2] = ((v) >> 16) & 0xFF;  \
++  (p)[3] = ((v) >> 24) & 0xFF;
++#define STORE32_BE(p, v)        \
++  (p)[3] = ((v) >>  0) & 0xFF;  \
++  (p)[2] = ((v) >>  8) & 0xFF;  \
++  (p)[1] = ((v) >> 16) & 0xFF;  \
++  (p)[0] = ((v) >> 24) & 0xFF;
++#define STORE64_BE(p, v)        \
++  (p)[7] = ((v) >>  0) & 0xFF;  \
++  (p)[6] = ((v) >>  8) & 0xFF;  \
++  (p)[5] = ((v) >> 16) & 0xFF;  \
++  (p)[4] = ((v) >> 24) & 0xFF;  \
++  (p)[3] = ((v) >> 32) & 0xFF;  \
++  (p)[2] = ((v) >> 40) & 0xFF;  \
++  (p)[1] = ((v) >> 48) & 0xFF;  \
++  (p)[0] = ((v) >> 56) & 0xFF;
++
++/*
++ * ChaCha20 stream cipher
++ */
++static void chacha20_block(uint32_t x[16])
++{
++  int i;
++  /* Macro renamed from QR to CC20QR to avoid name clashes. */
++  #define CC20QR(x, a, b, c, d)                           \
++  x[a] += x[b]; x[d] ^= x[a]; x[d] = ROL32(x[d], 16); \
++  x[c] += x[d]; x[b] ^= x[c]; x[b] = ROL32(x[b], 12); \
++  x[a] += x[b]; x[d] ^= x[a]; x[d] = ROL32(x[d],  8); \
++  x[c] += x[d]; x[b] ^= x[c]; x[b] = ROL32(x[b],  7);
++  for (i = 0; i < 10; i++)
++  {
++    /* Column round */
++    CC20QR(x, 0, 4, 8, 12)
++    CC20QR(x, 1, 5, 9, 13)
++    CC20QR(x, 2, 6, 10, 14)
++    CC20QR(x, 3, 7, 11, 15)
++    /* Diagonal round */
++    CC20QR(x, 0, 5, 10, 15)
++    CC20QR(x, 1, 6, 11, 12)
++    CC20QR(x, 2, 7, 8, 13)
++    CC20QR(x, 3, 4, 9, 14)
++  }
++  #undef CC20QR
++}
++
++void chacha20_xor(void* buffer, size_t n, const uint8_t key[32],
++                  const uint8_t nonce[12], uint32_t counter)
++{
++  size_t i;
++  union {
++    uint8_t bytes[64];
++    uint32_t words[16];
++  } block;
++  uint32_t state[16];
++  uint8_t* buf = buffer;
++
++  state[ 0] = 0x61707865; /* 'expa' */
++  state[ 1] = 0x3320646e; /* 'nd 3' */
++  state[ 2] = 0x79622d32; /* '2-by' */
++  state[ 3] = 0x6b206574; /* 'te k' */
++
++  state[ 4] = LOAD32_LE(key +  0);
++  state[ 5] = LOAD32_LE(key +  4);
++  state[ 6] = LOAD32_LE(key +  8);
++  state[ 7] = LOAD32_LE(key + 12);
++  state[ 8] = LOAD32_LE(key + 16);
++  state[ 9] = LOAD32_LE(key + 20);
++  state[10] = LOAD32_LE(key + 24);
++  state[11] = LOAD32_LE(key + 28);
++
++  state[12] = counter;
++  state[13] = LOAD32_LE(nonce + 0);
++  state[14] = LOAD32_LE(nonce + 4);
++  state[15] = LOAD32_LE(nonce + 8);
++
++  while (n > 64)
++  {
++    for (i = 0; i < 16; ++i)
++    {
++      block.words[i] = state[i];
++    }
++    chacha20_block(block.words);
++    for (i = 0; i < 16; ++i)
++    {
++      block.words[i] += state[i];
++      block.words[i] ^= LOAD32_LE(buf);
++      STORE32_LE(buf, block.words[i]);
++      buf += 4;
++    }
++    ++state[12];
++    n -= 64;
++  }
++
++  for (i = 0; i < 16; ++i)
++  {
++    block.words[i] = state[i];
++  }
++  chacha20_block(state);
++  for (i = 0; i < 16; ++i)
++  {
++    state[i] += block.words[i];
++    STORE32_LE(&block.bytes[4*i], state[i]);
++  }
++  for (i = 0; i < n; i++)
++  {
++    buf[i] ^= block.bytes[i];
++  }
++}
++
++/*
++ * Poly1305 authentication tags
++ */
++void poly1305(const uint8_t* msg, size_t n, const uint8_t key[32],
++              uint8_t tag[16])
++{
++  uint64_t d0, d1, d2, d3, d4;
++  uint32_t h0, h1, h2, h3, h4;
++  uint32_t r0, r1, r2, r3, r4;
++  uint32_t s1, s2, s3, s4;
++
++  h0 = h1 = h2 = h3 = h4 = 0;
++  r0 = (LOAD32_LE(key +  0) >> 0) & 0x03FFFFFF;
++  r1 = (LOAD32_LE(key +  3) >> 2) & 0x03FFFF03; s1 = r1 * 5;
++  r2 = (LOAD32_LE(key +  6) >> 4) & 0x03FFC0FF; s2 = r2 * 5;
++  r3 = (LOAD32_LE(key +  9) >> 6) & 0x03F03FFF; s3 = r3 * 5;
++  r4 = (LOAD32_LE(key + 12) >> 8) & 0x000FFFFF; s4 = r4 * 5;
++  while (n >= 16)
++  {
++    h4 += 0x01000000;
++process_block:
++    h0 += (LOAD32_LE(msg +  0) >> 0) & 0x03FFFFFF;
++    h1 += (LOAD32_LE(msg +  3) >> 2) & 0x03FFFFFF;
++    h2 += (LOAD32_LE(msg +  6) >> 4) & 0x03FFFFFF;
++    h3 += (LOAD32_LE(msg +  9) >> 6) & 0x03FFFFFF;
++    h4 += (LOAD32_LE(msg + 12) >> 8);
++
++    #define MUL(a,b) ((uint64_t)(a) * (b))
++    d0 = MUL(h0,r0) + MUL(h1,s4) + MUL(h2,s3) + MUL(h3,s2) + MUL(h4,s1);
++    d1 = MUL(h0,r1) + MUL(h1,r0) + MUL(h2,s4) + MUL(h3,s3) + MUL(h4,s2);
++    d2 = MUL(h0,r2) + MUL(h1,r1) + MUL(h2,r0) + MUL(h3,s4) + MUL(h4,s3);
++    d3 = MUL(h0,r3) + MUL(h1,r2) + MUL(h2,r1) + MUL(h3,r0) + MUL(h4,s4);
++    d4 = MUL(h0,r4) + MUL(h1,r3) + MUL(h2,r2) + MUL(h3,r1) + MUL(h4,r0);
++    #undef MUL
++
++    h0 = d0 & 0x03FFFFFF; d1 += (d0 >> 26);
++    h1 = d1 & 0x03FFFFFF; d2 += (d1 >> 26);
++    h2 = d2 & 0x03FFFFFF; d3 += (d2 >> 26);
++    h3 = d3 & 0x03FFFFFF; d4 += (d3 >> 26);
++    h4 = d4 & 0x03FFFFFF; h0 += (uint32_t)(d4 >> 26) * 5;
++
++    msg += 16;
++    n -= 16;
++  }
++  if (n)
++  {
++    size_t i;
++    for (i = 0; i < n; tag[i] = msg[i], i++);
++    for (tag[i++] = 1; i < 16; tag[i++] = 0);
++    msg = tag;
++    n = 16;
++    goto process_block;
++  }
++
++  r0 = (h0 + 5) >> 26;
++  r1 = (h1 + r0) >> 26;
++  r2 = (h2 + r1) >> 26;
++  r3 = (h3 + r2) >> 26;
++  r4 = (h4 + r3) >> 26;
++  h0 += r4 * 5;
++
++  d1 = (uint64_t)LOAD32_LE(key + 16) + (h0 >>  0) + (h1 << 26);
++  d2 = (uint64_t)LOAD32_LE(key + 20) + (h1 >>  6) + (h2 << 20) + (d1 >> 32);
++  d3 = (uint64_t)LOAD32_LE(key + 24) + (h2 >> 12) + (h3 << 14) + (d2 >> 32);
++  d4 = (uint64_t)LOAD32_LE(key + 28) + (h3 >> 18) + (h4 <<  8) + (d3 >> 32);
++
++  s1 = d1; STORE32_LE(tag +  0, s1);
++  s2 = d2; STORE32_LE(tag +  4, s2);
++  s3 = d3; STORE32_LE(tag +  8, s3);
++  s4 = d4; STORE32_LE(tag + 12, s4);
++}
++
++int poly1305_tagcmp(const uint8_t tag1[16], const uint8_t tag2[16])
++{
++  uint8_t d = 0;
++  d |= tag1[ 0] ^ tag2[ 0];
++  d |= tag1[ 1] ^ tag2[ 1];
++  d |= tag1[ 2] ^ tag2[ 2];
++  d |= tag1[ 3] ^ tag2[ 3];
++  d |= tag1[ 4] ^ tag2[ 4];
++  d |= tag1[ 5] ^ tag2[ 5];
++  d |= tag1[ 6] ^ tag2[ 6];
++  d |= tag1[ 7] ^ tag2[ 7];
++  d |= tag1[ 8] ^ tag2[ 8];
++  d |= tag1[ 9] ^ tag2[ 9];
++  d |= tag1[10] ^ tag2[10];
++  d |= tag1[11] ^ tag2[11];
++  d |= tag1[12] ^ tag2[12];
++  d |= tag1[13] ^ tag2[13];
++  d |= tag1[14] ^ tag2[14];
++  d |= tag1[15] ^ tag2[15];
++  return (int) d;
++}
++
++/*
++ * Platform-specific entropy functions for seeding RNG
++ */
++#if defined(__WASM__)
++
++extern int getentropy(void* buf, size_t n);
++
++static size_t entropy(void* buf, size_t n)
++{
++  return (getentropy(buf, n) == 0) ? n : 0;
++}
++
++#elif defined(_WIN32) || defined(__CYGWIN__)
++
++#if SQLITE3MC_USE_RAND_S
++
++/* Force header stdlib.h to define rand_s() */
++#if !defined(_CRT_RAND_S)
++#define _CRT_RAND_S
++#endif
++#include 
++
++/*
++  Provide declaration of rand_s() for MinGW-32 (not 64).
++  MinGW-32 didn't declare it prior to version 5.3.0.
++*/
++#if defined(__MINGW32__) && defined(__MINGW32_VERSION) && __MINGW32_VERSION < 5003000L && !defined(__MINGW64_VERSION_MAJOR)
++__declspec(dllimport) int rand_s(unsigned int *);
++#endif
++
++static size_t entropy(void* buf, size_t n)
++{
++  size_t totalBytes = 0;
++  while (totalBytes < n)
++  {
++    unsigned int random32 = 0;
++    size_t j = 0;
++
++    if (rand_s(&random32))
++    {
++      /* rand_s failed */
++      return 0;
++    }
++
++    for (; (j < sizeof(random32)) && (totalBytes < n); j++, totalBytes++)
++    {
++      const uint8_t random8 = (uint8_t)(random32 >> (j * 8));
++      ((uint8_t*) buf)[totalBytes] = random8;
++    }
++  }
++  return n;
++}
++
++#else
++  
++#include 
++#define RtlGenRandom SystemFunction036
++BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
++#pragma comment(lib, "advapi32.lib")
++static size_t entropy(void* buf, size_t n)
++{
++  return RtlGenRandom(buf, (ULONG) n) ? n : 0;
++}
++
++#endif
++
++#elif defined(__linux__) || defined(__unix__) || defined(__APPLE__) || defined(__QNX__)
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#ifdef __linux__
++#include 
++/* musl does not have  so let's define RNDGETENTCNT here */
++#ifndef RNDGETENTCNT
++#define RNDGETENTCNT _IOR('R', 0x00, int)
++#endif
++#endif
++
++/* Returns the number of urandom bytes read (either 0 or n) */
++static size_t read_urandom(void* buf, size_t n)
++{
++  size_t i;
++  ssize_t ret;
++  int fd, count;
++  struct stat st;
++  int errnold = errno;
++
++  do
++  {
++    fd = open("/dev/urandom", O_RDONLY, 0);
++  }
++  while (fd == -1 && errno == EINTR);
++  if (fd == -1)
++    goto fail;
++  fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
++
++  /* Check the sanity of the device node */
++  if (fstat(fd, &st) == -1 || !S_ISCHR(st.st_mode)
++                         #ifdef __linux__
++                           || ioctl(fd, RNDGETENTCNT, &count) == -1
++                         #endif
++     )
++  {
++    close(fd);
++    goto fail;
++  }
++
++  /* Read bytes */
++  for (i = 0; i < n; i += ret)
++  {
++    while ((ret = read(fd, (char *)buf + i, n - i)) == -1)
++    {
++      if (errno != EAGAIN && errno != EINTR)
++      {
++        close(fd);
++        goto fail;
++      }
++    }
++  }
++  close(fd);
++
++  /* Verify that the random device returned non-zero data */
++  for (i = 0; i < n; i++)
++  {
++    if (((uint8_t*) buf)[i] != 0)
++    {
++      errno = errnold;
++      return n;
++    }
++  }
++
++  /* Tiny n may unintentionally fall through! */
++fail:
++  fprintf(stderr, "bad /dev/urandom RNG\n");
++  abort(); /* PANIC! */
++  return 0;
++}
++
++#if defined(__APPLE__)
++#include 
++#endif
++
++static size_t entropy(void* buf, size_t n)
++{
++#if defined(__APPLE__)
++  if (SecRandomCopyBytes(kSecRandomDefault, n, (uint8_t*) buf) == 0)
++    return n;
++#elif defined(__linux__) && defined(SYS_getrandom)
++  if (syscall(SYS_getrandom, buf, n, 0) == n)
++    return n;
++#elif defined(SYS_getentropy)
++  if (syscall(SYS_getentropy, buf, n) == 0)
++    return n;
++#endif
++  return read_urandom(buf, n);
++}
++
++#else
++# error "Secure pseudorandom number generator not implemented for this OS"
++#endif
++
++/*
++ * ChaCha20 random number generator
++ */
++void chacha20_rng(void* out, size_t n)
++{
++  static uint8_t key[32], nonce[12], buffer[64] = { 0 };
++  static uint32_t counter = 0;
++  static size_t available = 0;
++
++#if SQLITE_THREADSAFE
++  sqlite3_mutex* mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_PRNG);
++  sqlite3_mutex_enter(mutex);
++#endif
++
++  while (n > 0)
++  {
++    size_t m;
++    if (available == 0)
++    {
++      if (counter == 0)
++      {
++        if (entropy(key, sizeof(key)) != sizeof(key))
++          abort();
++        if (entropy(nonce, sizeof(nonce)) != sizeof(nonce))
++          abort();
++      }
++      chacha20_xor(buffer, sizeof(buffer), key, nonce, counter++);
++      available = sizeof(buffer);
++    }
++    m = (available < n) ? available : n;
++    memcpy(out, buffer + (sizeof(buffer) - available), m);
++    out = (uint8_t*)out + m;
++    available -= m;
++    n -= m;
++  }
++
++#if SQLITE_THREADSAFE
++  sqlite3_mutex_leave(mutex);
++#endif
++}
++/*** End of #include "chacha20poly1305.c" ***/
++
++#endif
++
++#ifdef SQLITE_USER_AUTHENTICATION
++/* #include "userauth.c" */
++/*** Begin of #include "userauth.c" ***/
++/*
++** 2014-09-08
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++**
++** This file contains the bulk of the implementation of the
++** user-authentication extension feature.  Some parts of the user-
++** authentication code are contained within the SQLite core (in the
++** src/ subdirectory of the main source code tree) but those parts
++** that could reasonable be separated out are moved into this file.
++**
++** To compile with the user-authentication feature, append this file to
++** end of an SQLite amalgamation, then add the SQLITE_USER_AUTHENTICATION
++** compile-time option.  See the user-auth.txt file in the same source
++** directory as this file for additional information.
++*/
++#ifdef SQLITE_USER_AUTHENTICATION
++#ifndef SQLITEINT_H
++# include "sqliteInt.h"
++#endif
++
++/*
++** Prepare an SQL statement for use by the user authentication logic.
++** Return a pointer to the prepared statement on success.  Return a
++** NULL pointer if there is an error of any kind.
++*/
++static sqlite3_stmt *sqlite3UserAuthPrepare(
++  sqlite3 *db,
++  const char *zFormat,
++  ...
++){
++  sqlite3_stmt *pStmt;
++  char *zSql;
++  int rc;
++  va_list ap;
++  u64 savedFlags = db->flags;
++
++  va_start(ap, zFormat);
++  zSql = sqlite3_vmprintf(zFormat, ap);
++  va_end(ap);
++  if( zSql==0 ) return 0;
++  db->flags |= SQLITE_WriteSchema;
++  rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
++  db->flags = savedFlags;
++  sqlite3_free(zSql);
++  if( rc ){
++    sqlite3_finalize(pStmt);
++    pStmt = 0;
++  }
++  return pStmt;
++}
++
++/*
++** Check to see if the sqlite_user table exists in database zDb.
++*/
++static int userTableExists(sqlite3 *db, const char *zDb){
++  int rc;
++  sqlite3_mutex_enter(db->mutex);
++  sqlite3BtreeEnterAll(db);
++  if( db->init.busy==0 ){
++    char *zErr = 0;
++    sqlite3Init(db, &zErr);
++    sqlite3DbFree(db, zErr);
++  }
++  rc = sqlite3FindTable(db, "sqlite_user", zDb)!=0;
++  sqlite3BtreeLeaveAll(db);
++  sqlite3_mutex_leave(db->mutex);
++  return rc;
++}
++
++/*
++** Check to see if database zDb has a "sqlite_user" table and if it does
++** whether that table can authenticate zUser with nPw,zPw.  Write one of
++** the UAUTH_* user authorization level codes into *peAuth and return a
++** result code.
++*/
++static int userAuthCheckLogin(
++  sqlite3 *db,               /* The database connection to check */
++  const char *zDb,           /* Name of specific database to check */
++  u8 *peAuth                 /* OUT: One of UAUTH_* constants */
++){
++  sqlite3_stmt *pStmt;
++  int rc;
++
++  *peAuth = UAUTH_Unknown;
++  if( !userTableExists(db, zDb) ){
++    *peAuth = UAUTH_Admin;  /* No sqlite_user table.  Everybody is admin. */
++    return SQLITE_OK;
++  }
++  if( db->auth.zAuthUser==0 ){
++    *peAuth = UAUTH_Fail;
++    return SQLITE_OK;
++  }
++  pStmt = sqlite3UserAuthPrepare(db,
++            "SELECT pw=sqlite_crypt(?1,pw), isAdmin FROM \"%w\".sqlite_user"
++            " WHERE uname=?2", zDb);
++  if( pStmt==0 ) return SQLITE_NOMEM;
++  sqlite3_bind_blob(pStmt, 1, db->auth.zAuthPW, db->auth.nAuthPW,SQLITE_STATIC);
++  sqlite3_bind_text(pStmt, 2, db->auth.zAuthUser, -1, SQLITE_STATIC);
++  rc = sqlite3_step(pStmt);
++  if( rc==SQLITE_ROW && sqlite3_column_int(pStmt,0) ){
++    *peAuth = sqlite3_column_int(pStmt, 1) + UAUTH_User;
++  }else{
++    *peAuth = UAUTH_Fail;
++  }
++  return sqlite3_finalize(pStmt);
++}
++int sqlite3UserAuthCheckLogin(
++  sqlite3 *db,               /* The database connection to check */
++  const char *zDb,           /* Name of specific database to check */
++  u8 *peAuth                 /* OUT: One of UAUTH_* constants */
++){
++  int rc;
++  u8 savedAuthLevel;
++  assert( zDb!=0 );
++  assert( peAuth!=0 );
++  savedAuthLevel = db->auth.authLevel;
++  db->auth.authLevel = UAUTH_Admin;
++  rc = userAuthCheckLogin(db, zDb, peAuth);
++  db->auth.authLevel = savedAuthLevel;
++  return rc;
++}
++
++/*
++** If the current authLevel is UAUTH_Unknown, the take actions to figure
++** out what authLevel should be
++*/
++void sqlite3UserAuthInit(sqlite3 *db){
++  if( db->auth.authLevel==UAUTH_Unknown ){
++    u8 authLevel = UAUTH_Fail;
++    sqlite3UserAuthCheckLogin(db, "main", &authLevel);
++    db->auth.authLevel = authLevel;
++    if( authLevelflags &= ~SQLITE_WriteSchema;
++  }
++}
++
++/*
++** Implementation of the sqlite_crypt(X,Y) function.
++**
++** If Y is NULL then generate a new hash for password X and return that
++** hash.  If Y is not null, then generate a hash for password X using the
++** same salt as the previous hash Y and return the new hash.
++*/
++void sqlite3CryptFunc(
++  sqlite3_context *context,
++  int NotUsed,
++  sqlite3_value **argv
++){
++  const char *zIn;
++  int nIn;
++  u8 *zData;
++  u8 *zOut;
++  char zSalt[16];
++  int nHash = 32;
++  zIn = sqlite3_value_blob(argv[0]);
++  nIn = sqlite3_value_bytes(argv[0]);
++  if( sqlite3_value_type(argv[1])==SQLITE_BLOB
++   && sqlite3_value_bytes(argv[1])==nHash+sizeof(zSalt)
++  ){
++    memcpy(zSalt, sqlite3_value_blob(argv[1]), sizeof(zSalt));
++  }else{
++    sqlite3_randomness(sizeof(zSalt), zSalt);
++  }
++  zData = sqlite3_malloc( nIn+sizeof(zSalt) );
++  zOut = sqlite3_malloc( nHash+sizeof(zSalt) );
++  if( zOut==0 ){
++    sqlite3_result_error_nomem(context);
++  }else{
++    memcpy(zData, zSalt, sizeof(zSalt));
++    memcpy(zData+sizeof(zSalt), zIn, nIn);
++    memcpy(zOut, zSalt, sizeof(zSalt));
++    sha256(zData, (unsigned int) nIn+sizeof(zSalt), zOut+sizeof(zSalt));
++    sqlite3_result_blob(context, zOut, nHash+sizeof(zSalt), sqlite3_free);
++  }
++  if (zData != 0) sqlite3_free(zData);
++}
++
++/*
++** If a database contains the SQLITE_USER table, then the
++** sqlite3_user_authenticate() interface must be invoked with an
++** appropriate username and password prior to enable read and write
++** access to the database.
++**
++** Return SQLITE_OK on success or SQLITE_ERROR if the username/password
++** combination is incorrect or unknown.
++**
++** If the SQLITE_USER table is not present in the database file, then
++** this interface is a harmless no-op returnning SQLITE_OK.
++*/
++SQLITE_API int sqlite3_user_authenticate(
++  sqlite3 *db,           /* The database connection */
++  const char *zUsername, /* Username */
++  const char *zPW,       /* Password or credentials */
++  int nPW                /* Number of bytes in aPW[] */
++){
++  int rc;
++  u8 authLevel = UAUTH_Fail;
++  db->auth.authLevel = UAUTH_Unknown;
++  sqlite3_free(db->auth.zAuthUser);
++  sqlite3_free(db->auth.zAuthPW);
++  memset(&db->auth, 0, sizeof(db->auth));
++  db->auth.zAuthUser = sqlite3_mprintf("%s", zUsername);
++  if( db->auth.zAuthUser==0 ) return SQLITE_NOMEM;
++  db->auth.zAuthPW = sqlite3_malloc( nPW+1 );
++  if( db->auth.zAuthPW==0 ) return SQLITE_NOMEM;
++  memcpy(db->auth.zAuthPW,zPW,nPW);
++  db->auth.nAuthPW = nPW;
++  rc = sqlite3UserAuthCheckLogin(db, "main", &authLevel);
++  db->auth.authLevel = authLevel;
++  sqlite3ExpirePreparedStatements(db, 0);
++  if( rc ){
++    return rc;           /* OOM error, I/O error, etc. */
++  }
++  if( authLevelauth.authLevelauth.zAuthUser==0 ){
++    assert( isAdmin!=0 );
++    sqlite3_user_authenticate(db, zUsername, aPW, nPW);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** The sqlite3_user_change() interface can be used to change a users
++** login credentials or admin privilege.  Any user can change their own
++** login credentials.  Only an admin user can change another users login
++** credentials or admin privilege setting.  No user may change their own 
++** admin privilege setting.
++*/
++SQLITE_API int sqlite3_user_change(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername, /* Username to change */
++  const char *aPW,       /* Modified password or credentials */
++  int nPW,               /* Number of bytes in aPW[] */
++  int isAdmin            /* Modified admin privilege for the user */
++){
++  sqlite3_stmt *pStmt;
++  int rc = SQLITE_OK;
++  u8 authLevel;
++
++  authLevel = db->auth.authLevel;
++  if( authLevelauth.zAuthUser, zUsername)!=0 ){
++    if( db->auth.authLevelauth.authLevel = UAUTH_Admin;
++  if( !userTableExists(db, "main") ){
++    /* This routine is a no-op if the user to be modified does not exist */
++  }else{
++    pStmt = sqlite3UserAuthPrepare(db,
++              "UPDATE sqlite_user SET isAdmin=%d, pw=sqlite_crypt(?1,NULL)"
++              " WHERE uname=%Q", isAdmin, zUsername);
++    if( pStmt==0 ){
++      rc = SQLITE_NOMEM;
++    }else{
++      sqlite3_bind_blob(pStmt, 1, aPW, nPW, SQLITE_STATIC);
++      sqlite3_step(pStmt);
++      rc = sqlite3_finalize(pStmt);
++    }
++  }
++  db->auth.authLevel = authLevel;
++  return rc;
++}
++
++/*
++** The sqlite3_user_delete() interface can be used (by an admin user only)
++** to delete a user.  The currently logged-in user cannot be deleted,
++** which guarantees that there is always an admin user and hence that
++** the database cannot be converted into a no-authentication-required
++** database.
++*/
++SQLITE_API int sqlite3_user_delete(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername  /* Username to remove */
++){
++  sqlite3_stmt *pStmt;
++  if( db->auth.authLevelauth.zAuthUser, zUsername)==0 ){
++    /* Cannot delete self */
++    return SQLITE_AUTH;
++  }
++  if( !userTableExists(db, "main") ){
++    /* This routine is a no-op if the user to be deleted does not exist */
++    return SQLITE_OK;
++  }
++  pStmt = sqlite3UserAuthPrepare(db,
++              "DELETE FROM sqlite_user WHERE uname=%Q", zUsername);
++  if( pStmt==0 ) return SQLITE_NOMEM;
++  sqlite3_step(pStmt);
++  return sqlite3_finalize(pStmt);
++}
++
++#endif /* SQLITE_USER_AUTHENTICATION */
++/*** End of #include "userauth.c" ***/
++
++#endif
++
++/*
++** Declare function prototype for registering the codec extension functions
++*/
++static int
++mcRegisterCodecExtensions(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++
++/*
++** Codec implementation
++*/
++#if HAVE_CIPHER_AES_128_CBC || HAVE_CIPHER_AES_256_CBC || HAVE_CIPHER_SQLCIPHER
++/* #include "rijndael.c" */
++/*** Begin of #include "rijndael.c" ***/
++/*
++** Name:        rijndael.c
++** Purpose:     Implementation of the Rijndael cipher
++** Author:      Ulrich Telle
++** Created:     2006-12-06
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++**
++** Adjustments were made to make this code work with the wxSQLite3's
++** SQLite encryption extension.
++** The original code is public domain (see comments below).
++*/
++
++/*
++/// \file rijndael.cpp Implementation of the Rijndael cipher
++//
++// File : rijndael.cpp
++// Creation date : Sun Nov 5 2000 03:22:10 CEST
++// Author : Szymon Stefanek (stefanek@tin.it)
++//
++// Another implementation of the Rijndael cipher.
++// This is intended to be an easily usable library file.
++// This code is public domain.
++// Based on the Vincent Rijmen and K.U.Leuven implementation 2.4.
++//
++// Original Copyright notice:
++//
++//    rijndael-alg-fst.c   v2.4   April '2000
++//    rijndael-alg-fst.h
++//    rijndael-api-fst.c
++//    rijndael-api-fst.h
++//
++//    Optimised ANSI C code
++//
++//    authors: v1.0: Antoon Bosselaers
++//             v2.0: Vincent Rijmen, K.U.Leuven
++//             v2.3: Paulo Barreto
++//             v2.4: Vincent Rijmen, K.U.Leuven
++//
++//    This code is placed in the public domain.
++//
++// This implementation works on 128 , 192 , 256 bit keys
++// and on 128 bit blocks
++*/
++
++#define RIJNDAEL_CPP_
++
++/* #include "rijndael.h" */
++/*** Begin of #include "rijndael.h" ***/
++/*
++** Name:        rijndael.h
++** Purpose:     Header file for the Rijndael cipher
++** Author:      Ulrich Telle
++** Created:     2006-12-06
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++**
++** Adjustments were made to make this code work with the wxSQLite3's
++** SQLite encryption extension.
++** The original code is public domain (see comments below).
++*/
++
++/*
++/// \file rijndael.h Interface of the Rijndael cipher
++*/
++
++#ifndef _RIJNDAEL_H_
++#define _RIJNDAEL_H_
++
++/*
++// File : rijndael.h
++// Creation date : Sun Nov 5 2000 03:21:05 CEST
++// Author : Szymon Stefanek (stefanek@tin.it)
++//
++// Another implementation of the Rijndael cipher.
++// This is intended to be an easily usable library file.
++// This code is public domain.
++// Based on the Vincent Rijmen and K.U.Leuven implementation 2.4.
++//
++// Original Copyright notice:
++//
++//    rijndael-alg-fst.c   v2.4   April '2000
++//    rijndael-alg-fst.h
++//    rijndael-api-fst.c
++//    rijndael-api-fst.h
++//
++//    Optimised ANSI C code
++//
++//    authors: v1.0: Antoon Bosselaers
++//             v2.0: Vincent Rijmen, K.U.Leuven
++//             v2.3: Paulo Barreto
++//             v2.4: Vincent Rijmen, K.U.Leuven
++//
++//    This code is placed in the public domain.
++//
++
++//
++// This implementation works on 128 , 192 , 256 bit keys
++// and on 128 bit blocks
++//
++
++//
++// Example of usage:
++//
++//  // Input data
++//  unsigned char key[32];                       // The key
++//  initializeYour256BitKey();                   // Obviously initialized with sth
++//  const unsigned char * plainText = getYourPlainText(); // Your plain text
++//  int plainTextLen = strlen(plainText);        // Plain text length
++//
++//  // Encrypting
++//  Rijndael rin;
++//  unsigned char output[plainTextLen + 16];
++//
++//  rin.init(Rijndael::CBC,Rijndael::Encrypt,key,Rijndael::Key32Bytes);
++//  // It is a good idea to check the error code
++//  int len = rin.padEncrypt(plainText,len,output);
++//  if(len >= 0)useYourEncryptedText();
++//  else encryptError(len);
++//
++//  // Decrypting: we can reuse the same object
++//  unsigned char output2[len];
++//  rin.init(Rijndael::CBC,Rijndael::Decrypt,key,Rijndael::Key32Bytes));
++//  len = rin.padDecrypt(output,len,output2);
++//  if(len >= 0)useYourDecryptedText();
++//  else decryptError(len);
++//
++*/
++
++#define _MAX_KEY_COLUMNS (256/32)
++#define _MAX_ROUNDS      14
++#define MAX_IV_SIZE      16
++
++/* We assume that unsigned int is 32 bits long....  */
++typedef unsigned char  UINT8;
++typedef unsigned int   UINT32;
++typedef unsigned short UINT16;
++
++/* Error codes */
++#define RIJNDAEL_SUCCESS 0
++#define RIJNDAEL_UNSUPPORTED_MODE -1
++#define RIJNDAEL_UNSUPPORTED_DIRECTION -2
++#define RIJNDAEL_UNSUPPORTED_KEY_LENGTH -3
++#define RIJNDAEL_BAD_KEY -4
++#define RIJNDAEL_NOT_INITIALIZED -5
++#define RIJNDAEL_BAD_DIRECTION -6
++#define RIJNDAEL_CORRUPTED_DATA -7
++
++#define RIJNDAEL_Direction_Encrypt 0
++#define RIJNDAEL_Direction_Decrypt 1
++
++#define RIJNDAEL_Direction_Mode_ECB  0
++#define RIJNDAEL_Direction_Mode_CBC  1
++#define RIJNDAEL_Direction_Mode_CFB1 2
++
++#define RIJNDAEL_Direction_KeyLength_Key16Bytes  0
++#define RIJNDAEL_Direction_KeyLength_Key24Bytes  1
++#define RIJNDAEL_Direction_KeyLength_Key32Bytes  2
++
++#define RIJNDAEL_State_Valid   0
++#define RIJNDAEL_State_Invalid 1
++
++/*
++/// Class implementing the Rijndael cipher. (For internal use only)
++*/
++
++typedef struct _Rijndael
++{	
++	int     m_state;
++	int     m_mode;
++	int     m_direction;
++	UINT8   m_initVector[MAX_IV_SIZE];
++	UINT32  m_uRounds;
++	UINT8   m_expandedKey[_MAX_ROUNDS+1][4][4];
++} Rijndael;
++
++void RijndaelCreate(Rijndael* rijndael);
++
++/*
++//////////////////////////////////////////////////////////////////////////////////////////
++// API
++//////////////////////////////////////////////////////////////////////////////////////////
++
++// init(): Initializes the crypt session
++// Returns RIJNDAEL_SUCCESS or an error code
++// mode      : Rijndael::ECB, Rijndael::CBC or Rijndael::CFB1
++//             You have to use the same mode for encrypting and decrypting
++// dir       : Rijndael::Encrypt or Rijndael::Decrypt
++//             A cipher instance works only in one direction
++//             (Well , it could be easily modified to work in both
++//             directions with a single init() call, but it looks
++//             useless to me...anyway , it is a matter of generating
++//             two expanded keys)
++// key       : array of unsigned octets , it can be 16 , 24 or 32 bytes long
++//             this CAN be binary data (it is not expected to be null terminated)
++// keyLen    : Rijndael::Key16Bytes , Rijndael::Key24Bytes or Rijndael::Key32Bytes
++// initVector: initialization vector, you will usually use 0 here
++*/
++int RijndaelInit(Rijndael* rijndael, int mode, int dir, UINT8* key, int keyLen, UINT8* initVector);
++
++/*
++// Encrypts the input array (can be binary data)
++// The input array length must be a multiple of 16 bytes, the remaining part
++// is DISCARDED.
++// so it actually encrypts inputLen / 128 blocks of input and puts it in outBuffer
++// Input len is in BITS!
++// outBuffer must be at least inputLen / 8 bytes long.
++// Returns the encrypted buffer length in BITS or an error code < 0 in case of error
++*/
++int RijndaelBlockEncrypt(Rijndael* rijndael, UINT8 *input, int inputLen, UINT8 *outBuffer);
++
++/*
++// Encrypts the input array (can be binary data)
++// The input array can be any length , it is automatically padded on a 16 byte boundary.
++// Input len is in BYTES!
++// outBuffer must be at least (inputLen + 16) bytes long
++// Returns the encrypted buffer length in BYTES or an error code < 0 in case of error
++*/
++int RijndaelPadEncrypt(Rijndael* rijndael, UINT8 *input, int inputOctets, UINT8 *outBuffer);
++
++/*
++// Decrypts the input vector
++// Input len is in BITS!
++// outBuffer must be at least inputLen / 8 bytes long
++// Returns the decrypted buffer length in BITS and an error code < 0 in case of error
++*/
++int RijndaelBlockDecrypt(Rijndael* rijndael, UINT8 *input, int inputLen, UINT8 *outBuffer);
++
++/*
++// Decrypts the input vector
++// Input len is in BYTES!
++// outBuffer must be at least inputLen bytes long
++// Returns the decrypted buffer length in BYTES and an error code < 0 in case of error
++*/
++int RijndaelPadDecrypt(Rijndael* rijndael, UINT8 *input, int inputOctets, UINT8 *outBuffer);
++
++void RijndaelInvalidate(Rijndael* rijndael);
++void RijndaelKeySched(Rijndael* rijndael, UINT8 key[_MAX_KEY_COLUMNS][4]);
++void RijndaelKeyEncToDec(Rijndael* rijndael);
++void RijndaelEncrypt(Rijndael* rijndael, UINT8 a[16], UINT8 b[16]);
++void RijndaelDecrypt(Rijndael* rijndael, UINT8 a[16], UINT8 b[16]);
++	
++#endif /* _RIJNDAEL_H_ */
++/*** End of #include "rijndael.h" ***/
++
++
++#include 
++#include 
++#include 
++
++#ifdef TEST_AES_HW
++#define TEST_AES_HW_DEBUG
++#define TEST_AES_HW_DEBUG_DATA
++#endif
++
++#ifdef TEST_AES_HW_DEBUG
++#define TEST_AES_HW_DEBUG_LOG(...)  { fprintf(stdout, __VA_ARGS__); fflush(stdout); }
++#else
++#define TEST_AES_HW_DEBUG_LOG(...)
++#endif
++
++#ifdef TEST_AES_HW_DEBUG_DATA
++#define TEST_AES_HW_DEBUG_HEX(DESC,BUFFER,LEN)  \
++  { \
++    int count; \
++    printf(DESC); \
++    for (count = 0; count < LEN; ++count) \
++    { \
++      if (count % 16 == 0) printf("\n%05x: ", count); \
++      printf("%02x ", ((unsigned char*) BUFFER)[count]); \
++    } \
++    printf("\n"); \
++    fflush(stdout); \
++  }
++#else
++#define TEST_AES_HW_DEBUG_HEX(DESC,BUFFER,LEN)
++#endif
++
++/*
++** Use AES hardware support if available
++*/
++/* #include "aes_hardware.c" */
++/*** Begin of #include "aes_hardware.c" ***/
++/*
++** Name:        aes_hardware.c
++** Purpose:     AES algorithms based on AES NI
++** Author:      Ulrich Telle
++** Created:     2020-12-01
++** Copyright:   (c) 2020 Ulrich Telle
++** License:     MIT
++*/
++
++/*
++** Check whether the platform offers hardware support for AES
++*/
++
++#define AES_HARDWARE_NONE  0
++#define AES_HARDWARE_NI    1
++#define AES_HARDWARE_NEON  2
++
++#ifndef SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT
++
++#if defined __ARM_FEATURE_CRYPTO
++#define HAS_AES_HARDWARE AES_HARDWARE_NEON
++
++
++/* --- CLang --- */
++#elif defined(__clang__)
++
++#if __has_attribute(target) && __has_include() && (defined(__x86_64__) || defined(__i386))
++#define HAS_AES_HARDWARE AES_HARDWARE_NI
++
++#elif __has_attribute(target) && __has_include() && (defined(__aarch64__))
++#define HAS_AES_HARDWARE AES_HARDWARE_NEON
++
++/* Crypto extension in AArch64 can be enabled using __attribute__((target)) */
++#define USE_CLANG_ATTR_TARGET_AARCH64
++
++#endif
++
++
++/* --- GNU C/C++ */
++#elif defined(__GNUC__)
++
++#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && (defined(__x86_64__) || defined(__i386))
++#define HAS_AES_HARDWARE AES_HARDWARE_NI
++#endif
++
++
++/* --- Visual C/C++ --- */
++#elif defined (_MSC_VER)
++
++/* Architecture: x86 or x86_64 */
++#if (defined(_M_X64) || defined(_M_IX86)) && _MSC_FULL_VER >= 150030729
++#define HAS_AES_HARDWARE AES_HARDWARE_NI
++
++/* Architecture: ARM 64-bit */
++#elif defined(_M_ARM64)
++#define HAS_AES_HARDWARE AES_HARDWARE_NEON
++
++/* Use header  instead of  */
++#define USE_ARM64_NEON_H
++
++/* Architecture: ARM 32-bit */
++#elif defined _M_ARM
++#define HAS_AES_HARDWARE AES_HARDWARE_NEON
++
++/* The following #define is required to enable intrinsic definitions
++   that do not omit one of the parameters for vaes[ed]q_u8 */
++#define _ARM_USE_NEW_NEON_INTRINSICS
++
++#endif
++
++#else
++
++#define HAS_AES_HARDWARE AES_HARDWARE_NONE
++
++#endif
++
++#else /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT defined */
++
++/* Omit AES hardware support */
++#define HAS_AES_HARDWARE AES_HARDWARE_NONE
++
++#endif /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT */
++
++
++#if HAS_AES_HARDWARE != AES_HARDWARE_NONE
++/* --- Implementation of common data and functions for any AES hardware --- */
++
++/* The first few powers of X in GF(2^8), used during key setup */
++static const uint8_t gKeySetupRoundConstants[] =
++{
++  0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36,
++};
++
++static inline uint32_t
++toUint32FromLE(const void* buffer)
++{
++  const uint8_t* p = (const uint8_t*) buffer;
++  return (((uint32_t) p[0])       | ((uint32_t) p[1] << 8) |
++          ((uint32_t) p[2] << 16) | ((uint32_t) p[3] << 24));
++}
++
++#endif
++
++#if HAS_AES_HARDWARE == AES_HARDWARE_NI
++/* --- Implementation for AES-NI --- */
++
++/*
++** Define function for detecting hardware AES support at runtime
++*/
++
++#if defined(__clang__) || defined(__GNUC__)
++/* Compiler CLang or GCC */
++
++#include 
++
++static int
++aesHardwareCheck()
++{
++  unsigned int cpuInfo[4];
++  __cpuid(1, cpuInfo[0], cpuInfo[1], cpuInfo[2], cpuInfo[3]);
++  /* Check AES and SSE4.1 */
++  return (cpuInfo[2] & (1 << 25)) != 0 && (cpuInfo[2] & (1 << 19)) != 0;
++}
++
++#else /* !(defined(__clang__) || defined(__GNUC__)) */
++/* Compiler Visual C++ */
++
++#include 
++
++static int
++aesHardwareCheck()
++{
++  unsigned int CPUInfo[4];
++  __cpuid((int*) CPUInfo, 1);
++  return (CPUInfo[2] & (1 << 25)) != 0 && (CPUInfo[2] & (1 << 19)) != 0; /* Check AES and SSE4.1 */
++}
++
++#endif /* defined(__clang__) || defined(__GNUC__) */
++
++#include 
++#include 
++
++static int
++aesGenKeyEncryptInternal(const unsigned char* userKey, const int bits, __m128i* keyData)
++{
++  int rc = 0;
++  int i;
++  int j;
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int keyWords = bits / 32;
++  int schedWords = (numberOfRounds + 1) * 4;
++
++  /*
++  ** Key schedule stored as 32-bit integers during expansion.
++  ** Final __m128i form produced in the last step.
++  */
++  uint32_t sched[(_MAX_ROUNDS + 1) * 4];
++
++  unsigned roundConstantPos = 0;
++
++  for (i = 0; i < schedWords; i++)
++  {
++    if (i < keyWords)
++    {
++      sched[i] = toUint32FromLE(userKey + 4 * i);
++    }
++    else
++    {
++      uint32_t temp = sched[i - 1];
++
++      int rotateAndRoundConstant = (i % keyWords == 0);
++      int subOnly = (keyWords == 8 && i % 8 == 4);
++
++      if (rotateAndRoundConstant)
++      {
++        temp = _mm_extract_epi32(_mm_aeskeygenassist_si128(_mm_setr_epi32(0, temp, 0, 0), 0), 1);
++        temp ^= gKeySetupRoundConstants[roundConstantPos++];
++      }
++      else if (subOnly)
++      {
++        temp = _mm_extract_epi32(_mm_aeskeygenassist_si128(_mm_setr_epi32(0, temp, 0, 0), 0), 0);
++      }
++
++      sched[i] = sched[i - keyWords] ^ temp;
++    }
++  }
++
++  /* Convert key schedule words into __m128i vectors */
++  for (j = 0; j <= numberOfRounds; j++)
++  {
++    keyData[j] = _mm_setr_epi32(sched[4 * j], sched[4 * j + 1], sched[4 * j + 2], sched[4 * j + 3]);
++  }
++  return rc;
++}
++
++static int
++aesGenKeyEncrypt(const unsigned char* userKey, const int bits, unsigned char* keyData)
++{
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int rc = (!userKey || !keyData) ? -1 : (numberOfRounds > 0) ? 0 : -2;
++  
++  if (rc == 0)
++  {
++    __m128i tempKey[_MAX_ROUNDS + 1];
++    rc = aesGenKeyEncryptInternal(userKey, bits, tempKey);
++    if (rc == 0)
++    {
++      int j;
++      for (j = 0; j <= numberOfRounds; ++j)
++      {
++        _mm_storeu_si128(&((__m128i*) keyData)[j], tempKey[j]);
++      }
++    }
++  }
++  return rc;
++}
++
++static int
++aesGenKeyDecrypt(const unsigned char* userKey, const int bits, unsigned char* keyData)
++{
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int rc = (!userKey || !keyData) ? -1 : (numberOfRounds > 0) ? 0 : -2;
++
++  if (rc == 0)
++  {
++    __m128i tempKeySchedule[_MAX_ROUNDS + 1];
++    __m128i keySchedule[_MAX_ROUNDS + 1];
++    rc = aesGenKeyEncryptInternal(userKey, bits, tempKeySchedule);
++    if (rc == 0)
++    {
++      int j;
++      keySchedule[0] = tempKeySchedule[0];
++      for (j = 1; j < numberOfRounds; ++j)
++      {
++        keySchedule[j] = _mm_aesimc_si128(tempKeySchedule[j]);
++      }
++      keySchedule[numberOfRounds] = tempKeySchedule[numberOfRounds];
++
++      for (j = 0; j <= numberOfRounds; ++j)
++      {
++        _mm_storeu_si128(&((__m128i*) keyData)[j], keySchedule[j]);
++      }
++    }
++  }
++  return rc;
++}
++
++/*
++** AES CBC CTS Encryption
++*/
++
++static void
++aesEncryptCBC(const unsigned char* in,
++              unsigned char* out,
++              unsigned char ivec[16],
++              unsigned long length,
++              const unsigned char* keyData,
++              int numberOfRounds)
++{
++  __m128i key[_MAX_ROUNDS + 1];
++  __m128i feedback;
++  __m128i data;
++  unsigned long i;
++  int j;
++  unsigned long numBlocks = length / 16;
++  unsigned long lenFrag = (length % 16);
++
++  /* Load key data into properly aligned local storage */
++  for (j = 0; j <= numberOfRounds; ++j)
++  {
++    key[j] = _mm_loadu_si128(&((__m128i*) keyData)[j]);
++  }
++
++  /* Encrypt all complete blocks */
++  feedback = _mm_loadu_si128((__m128i*) ivec);
++  for (i = 0; i < numBlocks; ++i)
++  {
++    data = _mm_loadu_si128(&((__m128i*) in)[i]);
++    feedback = _mm_xor_si128(data, feedback);
++
++    feedback = _mm_xor_si128(feedback, key[0]);
++    for (j = 1; j < numberOfRounds; j++)
++    {
++      feedback = _mm_aesenc_si128(feedback, key[j]);
++    }
++    feedback = _mm_aesenclast_si128(feedback, key[j]);
++    _mm_storeu_si128(&((__m128i*) out)[i], feedback);
++  }
++
++  /* Use Cipher Text Stealing (CTS) for incomplete last block */
++  if (lenFrag > 0)
++  {
++    UINT8 lastblock[16];
++    UINT8 partialblock[16];
++    /* Adjust the second last plain block. */
++    memcpy(lastblock, &out[16*(numBlocks-1)], lenFrag);
++    /* Encrypt the last plain block. */
++    memset(partialblock, 0, 16);
++    memcpy(partialblock, &in[16*numBlocks], lenFrag);
++
++    data = _mm_loadu_si128(&((__m128i*) partialblock)[0]);
++    feedback = _mm_xor_si128(data, feedback);
++
++    feedback = _mm_xor_si128(feedback, key[0]);
++    for (j = 1; j < numberOfRounds; j++)
++    {
++      feedback = _mm_aesenc_si128(feedback, key[j]);
++    }
++    feedback = _mm_aesenclast_si128(feedback, key[j]);
++    _mm_storeu_si128(&((__m128i*) out)[numBlocks-1], feedback);
++
++    memcpy(&out[16*numBlocks], lastblock, lenFrag);
++  }
++}
++
++/*
++** AES CBC CTS decryption
++*/
++static void
++aesDecryptCBC(const unsigned char* in,
++              unsigned char* out,
++              unsigned char ivec[16],
++              unsigned long length,
++              const unsigned char* keyData,
++              int numberOfRounds)
++{
++  __m128i key[_MAX_ROUNDS + 1];
++  __m128i data;
++  __m128i feedback;
++  __m128i last_in;
++  unsigned long i;
++  int j;
++  unsigned long numBlocks = length / 16;
++  unsigned long lenFrag = (length % 16);
++
++  /* Load key data into properly aligned local storage */
++  for (j = 0; j <= numberOfRounds; ++j)
++  {
++    key[j] = _mm_loadu_si128(&((__m128i*) keyData)[j]);
++  }
++
++  /* Use Cipher Text Stealing (CTS) for incomplete last block */
++  if (lenFrag > 0)
++  {
++    UINT8 lastblock[16];
++    UINT8 partialblock[16];
++    int offset;
++    --numBlocks;
++    offset = numBlocks * 16;
++ 
++    /* Decrypt the last plain block. */
++    last_in = _mm_loadu_si128(&((__m128i*) in)[numBlocks]);
++    data = _mm_xor_si128(last_in, key[numberOfRounds - 0]);
++    for (j = 1; j < numberOfRounds; j++)
++    {
++      data = _mm_aesdec_si128(data, key[numberOfRounds - j]);
++    }
++    data = _mm_aesdeclast_si128(data, key[numberOfRounds - j]);
++    _mm_storeu_si128(&((__m128i*) partialblock)[0], data);
++
++    memcpy(partialblock, &in[16 * numBlocks + 16], lenFrag);
++    last_in = _mm_loadu_si128(&((__m128i*) partialblock)[0]);
++
++    data = _mm_xor_si128(data, last_in);
++    _mm_storeu_si128(&((__m128i*) lastblock)[0], data);
++
++    /* Decrypt the second last block. */
++    data = _mm_xor_si128(last_in, key[numberOfRounds - 0]);
++    for (j = 1; j < numberOfRounds; j++)
++    {
++      data = _mm_aesdec_si128(data, key[numberOfRounds - j]);
++    }
++    data = _mm_aesdeclast_si128(data, key[numberOfRounds - j]);
++
++    if (numBlocks > 0)
++    {
++      feedback = _mm_loadu_si128(&((__m128i*) in)[numBlocks - 1]);
++    }
++    else
++    {
++      feedback = _mm_loadu_si128((__m128i*) ivec);
++    }
++    data = _mm_xor_si128(data, feedback);
++    _mm_storeu_si128(&((__m128i*) out)[numBlocks], data);
++
++    memcpy(out + offset + 16, lastblock, lenFrag);
++  }
++
++  /* Encrypt all complete blocks */
++  feedback = _mm_loadu_si128((__m128i*) ivec);
++  for (i = 0; i < numBlocks; i++)
++  {
++    last_in =_mm_loadu_si128(&((__m128i*) in)[i]);
++    data = _mm_xor_si128(last_in, key[numberOfRounds - 0]);
++    for (j = 1; j < numberOfRounds; j++)
++    {
++      data = _mm_aesdec_si128(data, key[numberOfRounds - j]);
++    }
++    data = _mm_aesdeclast_si128(data, key[numberOfRounds - j]);
++    data = _mm_xor_si128(data, feedback);
++    _mm_storeu_si128(&((__m128i*) out)[i], data);
++    feedback = last_in;
++  }
++}
++
++#elif HAS_AES_HARDWARE == AES_HARDWARE_NEON
++/* --- Implementation for AES-NEON --- */
++
++/* Set target architecture manually, if necessary */
++#ifdef USE_CLANG_ATTR_TARGET_AARCH64
++#define __ARM_NEON 1
++#define __ARM_FEATURE_CRYPTO 1
++#define __ARM_FEATURE_AES 1
++#define FUNC_ISA __attribute__ ((target("neon,crypto")))
++#endif /* USE_CLANG_ATTR_TARGET_AARCH64 */
++
++/* FUNCtion attributes for ISA (Instruction Set Architecture) */
++#ifndef FUNC_ISA
++#define FUNC_ISA
++#endif
++
++#ifdef USE_ARM64_NEON_H
++#include 
++#else
++#include 
++#endif
++
++#if defined(__linux__) && (defined(__arm__) || defined(__aarch64__))
++
++#include 
++#include 
++
++static int
++aesHardwareAvailableOnPlatform()
++{
++#if defined HWCAP_AES
++  return getauxval(AT_HWCAP) & HWCAP_AES;
++#elif defined HWCAP2_AES
++  return getauxval(AT_HWCAP2) & HWCAP2_AES;
++#else
++  return 0;
++#endif
++}
++
++#elif defined _M_ARM || defined _M_ARM64
++
++static int
++aesHardwareAvailableOnPlatform()
++{
++  return (int) IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
++}
++
++#else
++
++static int
++aesHardwareAvailableOnPlatform()
++{
++  return 0;
++}
++
++#endif
++
++static int
++aesHardwareCheck()
++{
++  return aesHardwareAvailableOnPlatform();
++}
++
++/*
++** Set up expanded key
++*/
++
++static FUNC_ISA int
++aesGenKeyEncryptInternal(const unsigned char* userKey, const int bits, uint8x16_t* keyData)
++{
++  int rc = 0;
++  int i;
++  int j;
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int keyWords = bits / 32;  
++  int schedWords = (numberOfRounds + 1) * 4;
++
++  /*
++  ** Key schedule stored as 32-bit integers during expansion.
++  ** Final uint8x16_t form produced in the last step.
++  */
++  uint32_t sched[(_MAX_ROUNDS + 1) * 4];
++
++  unsigned roundConstantPos = 0;
++
++  for (i = 0; i < schedWords; i++)
++  {
++    if (i < keyWords)
++    {
++      sched[i] = toUint32FromLE(userKey + 4 * i);
++    }
++    else
++    {
++      uint32_t temp = sched[i - 1];
++
++      int rotateAndRoundConstant = (i % keyWords == 0);
++      int sub = rotateAndRoundConstant || (keyWords == 8 && i % 8 == 4);
++
++      if (rotateAndRoundConstant)
++      {
++        temp = (temp << 24) | (temp >> 8);
++      }
++
++      if (sub)
++      {
++        uint32x4_t v32 = vdupq_n_u32(temp);
++        uint8x16_t v8 = vreinterpretq_u8_u32(v32);
++        v8 = vaeseq_u8(v8, vdupq_n_u8(0));
++        v32 = vreinterpretq_u32_u8(v8);
++        temp = vget_lane_u32(vget_low_u32(v32), 0);
++      }
++
++      if (rotateAndRoundConstant)
++      {
++        temp ^= gKeySetupRoundConstants[roundConstantPos++];
++      }
++
++      sched[i] = sched[i - keyWords] ^ temp;
++    }
++  }
++
++  /* Convert key schedule words into uint8x16_t vectors */
++  for (j = 0; j <= numberOfRounds; j++)
++  {
++    keyData[j] = vreinterpretq_u8_u32(vld1q_u32(sched + 4*j));
++  }
++
++  return rc;
++}
++
++static FUNC_ISA int
++aesGenKeyEncrypt(const unsigned char* userKey, const int bits, unsigned char* keyData)
++{
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int rc = (!userKey || !keyData) ? -1 : (numberOfRounds > 0) ? 0 : -2;
++  
++  if (rc == 0)
++  {
++    uint8x16_t tempKey[_MAX_ROUNDS + 1];
++    rc = aesGenKeyEncryptInternal(userKey, bits, tempKey);
++    if (rc == 0)
++    {
++      int j;
++      for (j = 0; j <= numberOfRounds; ++j)
++      {
++        vst1q_u8(&keyData[j*16], tempKey[j]);
++      }
++    }
++  }
++  return rc;
++}
++
++static FUNC_ISA int
++aesGenKeyDecrypt(const unsigned char* userKey, const int bits, unsigned char* keyData)
++{
++  int numberOfRounds = (bits == 128) ? 10 : (bits == 192) ? 12 : (bits == 256) ? 14 : 0;
++  int rc = (!userKey || !keyData) ? -1 : (numberOfRounds > 0) ? 0 : -2;
++
++  if (rc == 0)
++  {
++    uint8x16_t tempKeySchedule[_MAX_ROUNDS + 1];
++    uint8x16_t keySchedule[_MAX_ROUNDS + 1];
++    rc = aesGenKeyEncryptInternal(userKey, bits, tempKeySchedule);
++    if (rc == 0)
++    {
++      int j;
++      keySchedule[0] = tempKeySchedule[0];
++
++      for (j = 1; j < numberOfRounds; ++j)
++      {
++        keySchedule[j] = vaesimcq_u8(tempKeySchedule[j]);
++      }
++      keySchedule[numberOfRounds] = tempKeySchedule[numberOfRounds];
++
++      for (j = 0; j <= numberOfRounds; ++j)
++      {
++        vst1q_u8(&keyData[j*16], keySchedule[j]);
++      }
++    }
++  }
++  return rc;
++}
++
++/*
++** AES CBC CTS Encryption
++*/
++static FUNC_ISA void
++aesEncryptCBC(const unsigned char* in,
++              unsigned char* out,
++              unsigned char ivec[16],
++              unsigned long length,
++              const unsigned char* keyData,
++              int numberOfRounds)
++{
++  uint8x16_t key[_MAX_ROUNDS + 1];
++  uint8x16_t feedback;
++  uint8x16_t data;
++  unsigned long i;
++  int j;
++  unsigned long numBlocks = length / 16;
++  unsigned long lenFrag = (length % 16);
++
++  /* Load key data into properly aligned local storage */
++  for (j = 0; j <= numberOfRounds; ++j)
++  {
++    key[j] = vld1q_u8(&keyData[j*16]);
++  }
++
++  /* Encrypt all complete blocks */
++  feedback = vld1q_u8(ivec);
++  for (i = 0; i < numBlocks; ++i)
++  {
++    data = vld1q_u8(&in[i*16]);
++    feedback = veorq_u8(data, feedback);
++
++    for (j = 0; j < numberOfRounds-1; j++)
++    {
++      feedback = vaesmcq_u8(vaeseq_u8(feedback, key[j]));
++    }
++    feedback = vaeseq_u8(feedback, key[numberOfRounds-1]);
++    feedback = veorq_u8(feedback, key[numberOfRounds]);                          \
++
++    vst1q_u8(&out[i*16], feedback);
++  }
++
++  /* Use Cipher Text Stealing (CTS) for incomplete last block */
++  if (lenFrag > 0)
++  {
++    UINT8 lastblock[16];
++    UINT8 partialblock[16];
++    /* Adjust the second last plain block. */
++    memcpy(lastblock, &out[(numBlocks-1)*16], lenFrag);
++    /* Encrypt the last plain block. */
++    memset(partialblock, 0, 16);
++    memcpy(partialblock, &in[numBlocks*16], lenFrag);
++
++    data = vld1q_u8(partialblock);
++    feedback = veorq_u8(data, feedback);
++
++    for (j = 0; j < numberOfRounds-1; j++)
++    {
++      feedback = vaesmcq_u8(vaeseq_u8(feedback, key[j]));
++    }
++    feedback = vaeseq_u8(feedback, key[numberOfRounds-1]);
++    feedback = veorq_u8(feedback, key[numberOfRounds]);                          \
++    
++    vst1q_u8(&out[(numBlocks-1)*16], feedback);
++
++    memcpy(&out[numBlocks*16], lastblock, lenFrag);
++  }
++}
++
++/*
++** AES CBC CTS decryption
++*/
++static FUNC_ISA void
++aesDecryptCBC(const unsigned char* in,
++              unsigned char* out,
++              unsigned char ivec[16],
++              unsigned long length,
++              const unsigned char* keyData,
++              int numberOfRounds)
++{
++  uint8x16_t key[_MAX_ROUNDS + 1];
++  uint8x16_t data;
++  uint8x16_t feedback;
++  uint8x16_t last_in;
++  unsigned long i;
++  int j;
++  unsigned long numBlocks = length / 16;
++  unsigned long lenFrag = (length % 16);
++
++  /* Load key data into properly aligned local storage */
++  for (j = 0; j <= numberOfRounds; ++j)
++  {
++    key[j] = vld1q_u8(&keyData[j*16]);
++  }
++
++  /* Use Cipher Text Stealing (CTS) for incomplete last block */
++  if (lenFrag > 0)
++  {
++    UINT8 lastblock[16];
++    UINT8 partialblock[16];
++    int offset;
++    --numBlocks;
++    offset = numBlocks * 16;
++ 
++    /* Decrypt the last plain block. */
++    last_in = vld1q_u8(&in[numBlocks*16]);
++
++    data = last_in;
++    for (j = 0; j < numberOfRounds-1; j++)
++    {
++      data = vaesimcq_u8(vaesdq_u8(data, key[numberOfRounds-j]));
++    }
++    data = vaesdq_u8(data, key[1]);
++    data = veorq_u8(data, key[0]);
++
++    vst1q_u8(partialblock, data);
++
++    memcpy(partialblock, &in[(numBlocks + 1)*16], lenFrag);
++    last_in = vld1q_u8(partialblock);
++
++    data = veorq_u8(data, last_in);
++    vst1q_u8(lastblock, data);
++
++    /* Decrypt the second last block. */
++    data = last_in;
++    for (j = 0; j < numberOfRounds-1; j++)
++    {
++      data = vaesimcq_u8(vaesdq_u8(data, key[numberOfRounds-j]));
++    }
++    data = vaesdq_u8(data, key[1]);
++    data = veorq_u8(data, key[0]);
++
++    if (numBlocks > 0)
++    {
++      feedback = vld1q_u8(&in[(numBlocks - 1)*16]);
++    }
++    else
++    {
++      feedback = vld1q_u8(ivec);
++    }
++    data = veorq_u8(data, feedback);
++    vst1q_u8(&out[numBlocks*16], data);
++
++    memcpy(out + offset + 16, lastblock, lenFrag);
++  }
++
++  /* Decrypt all complete blocks */
++  feedback = vld1q_u8(ivec);
++  for (i = 0; i < numBlocks; i++)
++  {
++    last_in = vld1q_u8(&in[i*16]);
++
++    data = last_in;
++    for (j = 0; j < numberOfRounds-1; j++)
++    {
++      data = vaesimcq_u8(vaesdq_u8(data, key[numberOfRounds-j]));
++    }
++    data = vaesdq_u8(data, key[1]);
++    data = veorq_u8(data, key[0]);
++
++    data = veorq_u8(data, feedback);
++    vst1q_u8(&out[i*16], data);
++
++    feedback = last_in;
++  }
++}
++
++#else
++/* --- No AES hardware available --- */
++
++static int
++aesHardwareCheck()
++{
++  return 0;
++}
++
++#endif
++
++/*
++** The top-level selection function, caching the results of
++** aesHardwareCheck() so it only has to run once.
++*/
++static int
++aesHardwareAvailable()
++{
++  static int initialized = 0;
++  static int hwAvailable = 0;
++  if (!initialized)
++  {
++    hwAvailable = aesHardwareCheck();
++    initialized = 1;
++  }
++  return hwAvailable;
++}
++/*** End of #include "aes_hardware.c" ***/
++
++
++static UINT8 S[256]=
++{
++   99, 124, 119, 123, 242, 107, 111, 197,  48,   1, 103,  43, 254, 215, 171, 118, 
++  202, 130, 201, 125, 250,  89,  71, 240, 173, 212, 162, 175, 156, 164, 114, 192, 
++  183, 253, 147,  38,  54,  63, 247, 204,  52, 165, 229, 241, 113, 216,  49,  21, 
++    4, 199,  35, 195,  24, 150,   5, 154,   7,  18, 128, 226, 235,  39, 178, 117, 
++    9, 131,  44,  26,  27, 110,  90, 160,  82,  59, 214, 179,  41, 227,  47, 132, 
++   83, 209,   0, 237,  32, 252, 177,  91, 106, 203, 190,  57,  74,  76,  88, 207, 
++  208, 239, 170, 251,  67,  77,  51, 133,  69, 249,   2, 127,  80,  60, 159, 168, 
++   81, 163,  64, 143, 146, 157,  56, 245, 188, 182, 218,  33,  16, 255, 243, 210, 
++  205,  12,  19, 236,  95, 151,  68,  23, 196, 167, 126,  61, 100,  93,  25, 115, 
++   96, 129,  79, 220,  34,  42, 144, 136,  70, 238, 184,  20, 222,  94,  11, 219, 
++  224,  50,  58,  10,  73,   6,  36,  92, 194, 211, 172,  98, 145, 149, 228, 121, 
++  231, 200,  55, 109, 141, 213,  78, 169, 108,  86, 244, 234, 101, 122, 174,   8, 
++  186, 120,  37,  46,  28, 166, 180, 198, 232, 221, 116,  31,  75, 189, 139, 138, 
++  112,  62, 181, 102,  72,   3, 246,  14,  97,  53,  87, 185, 134, 193,  29, 158, 
++  225, 248, 152,  17, 105, 217, 142, 148, 155,  30, 135, 233, 206,  85,  40, 223, 
++  140, 161, 137,  13, 191, 230,  66, 104,  65, 153,  45,  15, 176,  84, 187,  22
++};
++
++static UINT8 T1[256][4]=
++{
++  {0xc6,0x63,0x63,0xa5}, {0xf8,0x7c,0x7c,0x84}, {0xee,0x77,0x77,0x99}, {0xf6,0x7b,0x7b,0x8d},
++  {0xff,0xf2,0xf2,0x0d}, {0xd6,0x6b,0x6b,0xbd}, {0xde,0x6f,0x6f,0xb1}, {0x91,0xc5,0xc5,0x54},
++  {0x60,0x30,0x30,0x50}, {0x02,0x01,0x01,0x03}, {0xce,0x67,0x67,0xa9}, {0x56,0x2b,0x2b,0x7d},
++  {0xe7,0xfe,0xfe,0x19}, {0xb5,0xd7,0xd7,0x62}, {0x4d,0xab,0xab,0xe6}, {0xec,0x76,0x76,0x9a},
++  {0x8f,0xca,0xca,0x45}, {0x1f,0x82,0x82,0x9d}, {0x89,0xc9,0xc9,0x40}, {0xfa,0x7d,0x7d,0x87},
++  {0xef,0xfa,0xfa,0x15}, {0xb2,0x59,0x59,0xeb}, {0x8e,0x47,0x47,0xc9}, {0xfb,0xf0,0xf0,0x0b},
++  {0x41,0xad,0xad,0xec}, {0xb3,0xd4,0xd4,0x67}, {0x5f,0xa2,0xa2,0xfd}, {0x45,0xaf,0xaf,0xea},
++  {0x23,0x9c,0x9c,0xbf}, {0x53,0xa4,0xa4,0xf7}, {0xe4,0x72,0x72,0x96}, {0x9b,0xc0,0xc0,0x5b},
++  {0x75,0xb7,0xb7,0xc2}, {0xe1,0xfd,0xfd,0x1c}, {0x3d,0x93,0x93,0xae}, {0x4c,0x26,0x26,0x6a},
++  {0x6c,0x36,0x36,0x5a}, {0x7e,0x3f,0x3f,0x41}, {0xf5,0xf7,0xf7,0x02}, {0x83,0xcc,0xcc,0x4f},
++  {0x68,0x34,0x34,0x5c}, {0x51,0xa5,0xa5,0xf4}, {0xd1,0xe5,0xe5,0x34}, {0xf9,0xf1,0xf1,0x08},
++  {0xe2,0x71,0x71,0x93}, {0xab,0xd8,0xd8,0x73}, {0x62,0x31,0x31,0x53}, {0x2a,0x15,0x15,0x3f},
++  {0x08,0x04,0x04,0x0c}, {0x95,0xc7,0xc7,0x52}, {0x46,0x23,0x23,0x65}, {0x9d,0xc3,0xc3,0x5e},
++  {0x30,0x18,0x18,0x28}, {0x37,0x96,0x96,0xa1}, {0x0a,0x05,0x05,0x0f}, {0x2f,0x9a,0x9a,0xb5},
++  {0x0e,0x07,0x07,0x09}, {0x24,0x12,0x12,0x36}, {0x1b,0x80,0x80,0x9b}, {0xdf,0xe2,0xe2,0x3d},
++  {0xcd,0xeb,0xeb,0x26}, {0x4e,0x27,0x27,0x69}, {0x7f,0xb2,0xb2,0xcd}, {0xea,0x75,0x75,0x9f},
++  {0x12,0x09,0x09,0x1b}, {0x1d,0x83,0x83,0x9e}, {0x58,0x2c,0x2c,0x74}, {0x34,0x1a,0x1a,0x2e},
++  {0x36,0x1b,0x1b,0x2d}, {0xdc,0x6e,0x6e,0xb2}, {0xb4,0x5a,0x5a,0xee}, {0x5b,0xa0,0xa0,0xfb},
++  {0xa4,0x52,0x52,0xf6}, {0x76,0x3b,0x3b,0x4d}, {0xb7,0xd6,0xd6,0x61}, {0x7d,0xb3,0xb3,0xce},
++  {0x52,0x29,0x29,0x7b}, {0xdd,0xe3,0xe3,0x3e}, {0x5e,0x2f,0x2f,0x71}, {0x13,0x84,0x84,0x97},
++  {0xa6,0x53,0x53,0xf5}, {0xb9,0xd1,0xd1,0x68}, {0x00,0x00,0x00,0x00}, {0xc1,0xed,0xed,0x2c},
++  {0x40,0x20,0x20,0x60}, {0xe3,0xfc,0xfc,0x1f}, {0x79,0xb1,0xb1,0xc8}, {0xb6,0x5b,0x5b,0xed},
++  {0xd4,0x6a,0x6a,0xbe}, {0x8d,0xcb,0xcb,0x46}, {0x67,0xbe,0xbe,0xd9}, {0x72,0x39,0x39,0x4b},
++  {0x94,0x4a,0x4a,0xde}, {0x98,0x4c,0x4c,0xd4}, {0xb0,0x58,0x58,0xe8}, {0x85,0xcf,0xcf,0x4a},
++  {0xbb,0xd0,0xd0,0x6b}, {0xc5,0xef,0xef,0x2a}, {0x4f,0xaa,0xaa,0xe5}, {0xed,0xfb,0xfb,0x16},
++  {0x86,0x43,0x43,0xc5}, {0x9a,0x4d,0x4d,0xd7}, {0x66,0x33,0x33,0x55}, {0x11,0x85,0x85,0x94},
++  {0x8a,0x45,0x45,0xcf}, {0xe9,0xf9,0xf9,0x10}, {0x04,0x02,0x02,0x06}, {0xfe,0x7f,0x7f,0x81},
++  {0xa0,0x50,0x50,0xf0}, {0x78,0x3c,0x3c,0x44}, {0x25,0x9f,0x9f,0xba}, {0x4b,0xa8,0xa8,0xe3},
++  {0xa2,0x51,0x51,0xf3}, {0x5d,0xa3,0xa3,0xfe}, {0x80,0x40,0x40,0xc0}, {0x05,0x8f,0x8f,0x8a},
++  {0x3f,0x92,0x92,0xad}, {0x21,0x9d,0x9d,0xbc}, {0x70,0x38,0x38,0x48}, {0xf1,0xf5,0xf5,0x04},
++  {0x63,0xbc,0xbc,0xdf}, {0x77,0xb6,0xb6,0xc1}, {0xaf,0xda,0xda,0x75}, {0x42,0x21,0x21,0x63},
++  {0x20,0x10,0x10,0x30}, {0xe5,0xff,0xff,0x1a}, {0xfd,0xf3,0xf3,0x0e}, {0xbf,0xd2,0xd2,0x6d},
++  {0x81,0xcd,0xcd,0x4c}, {0x18,0x0c,0x0c,0x14}, {0x26,0x13,0x13,0x35}, {0xc3,0xec,0xec,0x2f},
++  {0xbe,0x5f,0x5f,0xe1}, {0x35,0x97,0x97,0xa2}, {0x88,0x44,0x44,0xcc}, {0x2e,0x17,0x17,0x39},
++  {0x93,0xc4,0xc4,0x57}, {0x55,0xa7,0xa7,0xf2}, {0xfc,0x7e,0x7e,0x82}, {0x7a,0x3d,0x3d,0x47},
++  {0xc8,0x64,0x64,0xac}, {0xba,0x5d,0x5d,0xe7}, {0x32,0x19,0x19,0x2b}, {0xe6,0x73,0x73,0x95},
++  {0xc0,0x60,0x60,0xa0}, {0x19,0x81,0x81,0x98}, {0x9e,0x4f,0x4f,0xd1}, {0xa3,0xdc,0xdc,0x7f},
++  {0x44,0x22,0x22,0x66}, {0x54,0x2a,0x2a,0x7e}, {0x3b,0x90,0x90,0xab}, {0x0b,0x88,0x88,0x83},
++  {0x8c,0x46,0x46,0xca}, {0xc7,0xee,0xee,0x29}, {0x6b,0xb8,0xb8,0xd3}, {0x28,0x14,0x14,0x3c},
++  {0xa7,0xde,0xde,0x79}, {0xbc,0x5e,0x5e,0xe2}, {0x16,0x0b,0x0b,0x1d}, {0xad,0xdb,0xdb,0x76},
++  {0xdb,0xe0,0xe0,0x3b}, {0x64,0x32,0x32,0x56}, {0x74,0x3a,0x3a,0x4e}, {0x14,0x0a,0x0a,0x1e},
++  {0x92,0x49,0x49,0xdb}, {0x0c,0x06,0x06,0x0a}, {0x48,0x24,0x24,0x6c}, {0xb8,0x5c,0x5c,0xe4},
++  {0x9f,0xc2,0xc2,0x5d}, {0xbd,0xd3,0xd3,0x6e}, {0x43,0xac,0xac,0xef}, {0xc4,0x62,0x62,0xa6},
++  {0x39,0x91,0x91,0xa8}, {0x31,0x95,0x95,0xa4}, {0xd3,0xe4,0xe4,0x37}, {0xf2,0x79,0x79,0x8b},
++  {0xd5,0xe7,0xe7,0x32}, {0x8b,0xc8,0xc8,0x43}, {0x6e,0x37,0x37,0x59}, {0xda,0x6d,0x6d,0xb7},
++  {0x01,0x8d,0x8d,0x8c}, {0xb1,0xd5,0xd5,0x64}, {0x9c,0x4e,0x4e,0xd2}, {0x49,0xa9,0xa9,0xe0},
++  {0xd8,0x6c,0x6c,0xb4}, {0xac,0x56,0x56,0xfa}, {0xf3,0xf4,0xf4,0x07}, {0xcf,0xea,0xea,0x25},
++  {0xca,0x65,0x65,0xaf}, {0xf4,0x7a,0x7a,0x8e}, {0x47,0xae,0xae,0xe9}, {0x10,0x08,0x08,0x18},
++  {0x6f,0xba,0xba,0xd5}, {0xf0,0x78,0x78,0x88}, {0x4a,0x25,0x25,0x6f}, {0x5c,0x2e,0x2e,0x72},
++  {0x38,0x1c,0x1c,0x24}, {0x57,0xa6,0xa6,0xf1}, {0x73,0xb4,0xb4,0xc7}, {0x97,0xc6,0xc6,0x51},
++  {0xcb,0xe8,0xe8,0x23}, {0xa1,0xdd,0xdd,0x7c}, {0xe8,0x74,0x74,0x9c}, {0x3e,0x1f,0x1f,0x21},
++  {0x96,0x4b,0x4b,0xdd}, {0x61,0xbd,0xbd,0xdc}, {0x0d,0x8b,0x8b,0x86}, {0x0f,0x8a,0x8a,0x85},
++  {0xe0,0x70,0x70,0x90}, {0x7c,0x3e,0x3e,0x42}, {0x71,0xb5,0xb5,0xc4}, {0xcc,0x66,0x66,0xaa},
++  {0x90,0x48,0x48,0xd8}, {0x06,0x03,0x03,0x05}, {0xf7,0xf6,0xf6,0x01}, {0x1c,0x0e,0x0e,0x12},
++  {0xc2,0x61,0x61,0xa3}, {0x6a,0x35,0x35,0x5f}, {0xae,0x57,0x57,0xf9}, {0x69,0xb9,0xb9,0xd0},
++  {0x17,0x86,0x86,0x91}, {0x99,0xc1,0xc1,0x58}, {0x3a,0x1d,0x1d,0x27}, {0x27,0x9e,0x9e,0xb9},
++  {0xd9,0xe1,0xe1,0x38}, {0xeb,0xf8,0xf8,0x13}, {0x2b,0x98,0x98,0xb3}, {0x22,0x11,0x11,0x33},
++  {0xd2,0x69,0x69,0xbb}, {0xa9,0xd9,0xd9,0x70}, {0x07,0x8e,0x8e,0x89}, {0x33,0x94,0x94,0xa7},
++  {0x2d,0x9b,0x9b,0xb6}, {0x3c,0x1e,0x1e,0x22}, {0x15,0x87,0x87,0x92}, {0xc9,0xe9,0xe9,0x20},
++  {0x87,0xce,0xce,0x49}, {0xaa,0x55,0x55,0xff}, {0x50,0x28,0x28,0x78}, {0xa5,0xdf,0xdf,0x7a},
++  {0x03,0x8c,0x8c,0x8f}, {0x59,0xa1,0xa1,0xf8}, {0x09,0x89,0x89,0x80}, {0x1a,0x0d,0x0d,0x17},
++  {0x65,0xbf,0xbf,0xda}, {0xd7,0xe6,0xe6,0x31}, {0x84,0x42,0x42,0xc6}, {0xd0,0x68,0x68,0xb8},
++  {0x82,0x41,0x41,0xc3}, {0x29,0x99,0x99,0xb0}, {0x5a,0x2d,0x2d,0x77}, {0x1e,0x0f,0x0f,0x11},
++  {0x7b,0xb0,0xb0,0xcb}, {0xa8,0x54,0x54,0xfc}, {0x6d,0xbb,0xbb,0xd6}, {0x2c,0x16,0x16,0x3a}
++};
++  
++static UINT8 T2[256][4]=
++{
++  {0xa5,0xc6,0x63,0x63}, {0x84,0xf8,0x7c,0x7c}, {0x99,0xee,0x77,0x77}, {0x8d,0xf6,0x7b,0x7b},
++  {0x0d,0xff,0xf2,0xf2}, {0xbd,0xd6,0x6b,0x6b}, {0xb1,0xde,0x6f,0x6f}, {0x54,0x91,0xc5,0xc5},
++  {0x50,0x60,0x30,0x30}, {0x03,0x02,0x01,0x01}, {0xa9,0xce,0x67,0x67}, {0x7d,0x56,0x2b,0x2b},
++  {0x19,0xe7,0xfe,0xfe}, {0x62,0xb5,0xd7,0xd7}, {0xe6,0x4d,0xab,0xab}, {0x9a,0xec,0x76,0x76},
++  {0x45,0x8f,0xca,0xca}, {0x9d,0x1f,0x82,0x82}, {0x40,0x89,0xc9,0xc9}, {0x87,0xfa,0x7d,0x7d},
++  {0x15,0xef,0xfa,0xfa}, {0xeb,0xb2,0x59,0x59}, {0xc9,0x8e,0x47,0x47}, {0x0b,0xfb,0xf0,0xf0},
++  {0xec,0x41,0xad,0xad}, {0x67,0xb3,0xd4,0xd4}, {0xfd,0x5f,0xa2,0xa2}, {0xea,0x45,0xaf,0xaf},
++  {0xbf,0x23,0x9c,0x9c}, {0xf7,0x53,0xa4,0xa4}, {0x96,0xe4,0x72,0x72}, {0x5b,0x9b,0xc0,0xc0},
++  {0xc2,0x75,0xb7,0xb7}, {0x1c,0xe1,0xfd,0xfd}, {0xae,0x3d,0x93,0x93}, {0x6a,0x4c,0x26,0x26},
++  {0x5a,0x6c,0x36,0x36}, {0x41,0x7e,0x3f,0x3f}, {0x02,0xf5,0xf7,0xf7}, {0x4f,0x83,0xcc,0xcc},
++  {0x5c,0x68,0x34,0x34}, {0xf4,0x51,0xa5,0xa5}, {0x34,0xd1,0xe5,0xe5}, {0x08,0xf9,0xf1,0xf1},
++  {0x93,0xe2,0x71,0x71}, {0x73,0xab,0xd8,0xd8}, {0x53,0x62,0x31,0x31}, {0x3f,0x2a,0x15,0x15},
++  {0x0c,0x08,0x04,0x04}, {0x52,0x95,0xc7,0xc7}, {0x65,0x46,0x23,0x23}, {0x5e,0x9d,0xc3,0xc3},
++  {0x28,0x30,0x18,0x18}, {0xa1,0x37,0x96,0x96}, {0x0f,0x0a,0x05,0x05}, {0xb5,0x2f,0x9a,0x9a},
++  {0x09,0x0e,0x07,0x07}, {0x36,0x24,0x12,0x12}, {0x9b,0x1b,0x80,0x80}, {0x3d,0xdf,0xe2,0xe2},
++  {0x26,0xcd,0xeb,0xeb}, {0x69,0x4e,0x27,0x27}, {0xcd,0x7f,0xb2,0xb2}, {0x9f,0xea,0x75,0x75},
++  {0x1b,0x12,0x09,0x09}, {0x9e,0x1d,0x83,0x83}, {0x74,0x58,0x2c,0x2c}, {0x2e,0x34,0x1a,0x1a},
++  {0x2d,0x36,0x1b,0x1b}, {0xb2,0xdc,0x6e,0x6e}, {0xee,0xb4,0x5a,0x5a}, {0xfb,0x5b,0xa0,0xa0},
++  {0xf6,0xa4,0x52,0x52}, {0x4d,0x76,0x3b,0x3b}, {0x61,0xb7,0xd6,0xd6}, {0xce,0x7d,0xb3,0xb3},
++  {0x7b,0x52,0x29,0x29}, {0x3e,0xdd,0xe3,0xe3}, {0x71,0x5e,0x2f,0x2f}, {0x97,0x13,0x84,0x84},
++  {0xf5,0xa6,0x53,0x53}, {0x68,0xb9,0xd1,0xd1}, {0x00,0x00,0x00,0x00}, {0x2c,0xc1,0xed,0xed},
++  {0x60,0x40,0x20,0x20}, {0x1f,0xe3,0xfc,0xfc}, {0xc8,0x79,0xb1,0xb1}, {0xed,0xb6,0x5b,0x5b},
++  {0xbe,0xd4,0x6a,0x6a}, {0x46,0x8d,0xcb,0xcb}, {0xd9,0x67,0xbe,0xbe}, {0x4b,0x72,0x39,0x39},
++  {0xde,0x94,0x4a,0x4a}, {0xd4,0x98,0x4c,0x4c}, {0xe8,0xb0,0x58,0x58}, {0x4a,0x85,0xcf,0xcf},
++  {0x6b,0xbb,0xd0,0xd0}, {0x2a,0xc5,0xef,0xef}, {0xe5,0x4f,0xaa,0xaa}, {0x16,0xed,0xfb,0xfb},
++  {0xc5,0x86,0x43,0x43}, {0xd7,0x9a,0x4d,0x4d}, {0x55,0x66,0x33,0x33}, {0x94,0x11,0x85,0x85},
++  {0xcf,0x8a,0x45,0x45}, {0x10,0xe9,0xf9,0xf9}, {0x06,0x04,0x02,0x02}, {0x81,0xfe,0x7f,0x7f},
++  {0xf0,0xa0,0x50,0x50}, {0x44,0x78,0x3c,0x3c}, {0xba,0x25,0x9f,0x9f}, {0xe3,0x4b,0xa8,0xa8},
++  {0xf3,0xa2,0x51,0x51}, {0xfe,0x5d,0xa3,0xa3}, {0xc0,0x80,0x40,0x40}, {0x8a,0x05,0x8f,0x8f},
++  {0xad,0x3f,0x92,0x92}, {0xbc,0x21,0x9d,0x9d}, {0x48,0x70,0x38,0x38}, {0x04,0xf1,0xf5,0xf5},
++  {0xdf,0x63,0xbc,0xbc}, {0xc1,0x77,0xb6,0xb6}, {0x75,0xaf,0xda,0xda}, {0x63,0x42,0x21,0x21},
++  {0x30,0x20,0x10,0x10}, {0x1a,0xe5,0xff,0xff}, {0x0e,0xfd,0xf3,0xf3}, {0x6d,0xbf,0xd2,0xd2},
++  {0x4c,0x81,0xcd,0xcd}, {0x14,0x18,0x0c,0x0c}, {0x35,0x26,0x13,0x13}, {0x2f,0xc3,0xec,0xec},
++  {0xe1,0xbe,0x5f,0x5f}, {0xa2,0x35,0x97,0x97}, {0xcc,0x88,0x44,0x44}, {0x39,0x2e,0x17,0x17},
++  {0x57,0x93,0xc4,0xc4}, {0xf2,0x55,0xa7,0xa7}, {0x82,0xfc,0x7e,0x7e}, {0x47,0x7a,0x3d,0x3d},
++  {0xac,0xc8,0x64,0x64}, {0xe7,0xba,0x5d,0x5d}, {0x2b,0x32,0x19,0x19}, {0x95,0xe6,0x73,0x73},
++  {0xa0,0xc0,0x60,0x60}, {0x98,0x19,0x81,0x81}, {0xd1,0x9e,0x4f,0x4f}, {0x7f,0xa3,0xdc,0xdc},
++  {0x66,0x44,0x22,0x22}, {0x7e,0x54,0x2a,0x2a}, {0xab,0x3b,0x90,0x90}, {0x83,0x0b,0x88,0x88},
++  {0xca,0x8c,0x46,0x46}, {0x29,0xc7,0xee,0xee}, {0xd3,0x6b,0xb8,0xb8}, {0x3c,0x28,0x14,0x14},
++  {0x79,0xa7,0xde,0xde}, {0xe2,0xbc,0x5e,0x5e}, {0x1d,0x16,0x0b,0x0b}, {0x76,0xad,0xdb,0xdb},
++  {0x3b,0xdb,0xe0,0xe0}, {0x56,0x64,0x32,0x32}, {0x4e,0x74,0x3a,0x3a}, {0x1e,0x14,0x0a,0x0a},
++  {0xdb,0x92,0x49,0x49}, {0x0a,0x0c,0x06,0x06}, {0x6c,0x48,0x24,0x24}, {0xe4,0xb8,0x5c,0x5c},
++  {0x5d,0x9f,0xc2,0xc2}, {0x6e,0xbd,0xd3,0xd3}, {0xef,0x43,0xac,0xac}, {0xa6,0xc4,0x62,0x62},
++  {0xa8,0x39,0x91,0x91}, {0xa4,0x31,0x95,0x95}, {0x37,0xd3,0xe4,0xe4}, {0x8b,0xf2,0x79,0x79},
++  {0x32,0xd5,0xe7,0xe7}, {0x43,0x8b,0xc8,0xc8}, {0x59,0x6e,0x37,0x37}, {0xb7,0xda,0x6d,0x6d},
++  {0x8c,0x01,0x8d,0x8d}, {0x64,0xb1,0xd5,0xd5}, {0xd2,0x9c,0x4e,0x4e}, {0xe0,0x49,0xa9,0xa9},
++  {0xb4,0xd8,0x6c,0x6c}, {0xfa,0xac,0x56,0x56}, {0x07,0xf3,0xf4,0xf4}, {0x25,0xcf,0xea,0xea},
++  {0xaf,0xca,0x65,0x65}, {0x8e,0xf4,0x7a,0x7a}, {0xe9,0x47,0xae,0xae}, {0x18,0x10,0x08,0x08},
++  {0xd5,0x6f,0xba,0xba}, {0x88,0xf0,0x78,0x78}, {0x6f,0x4a,0x25,0x25}, {0x72,0x5c,0x2e,0x2e},
++  {0x24,0x38,0x1c,0x1c}, {0xf1,0x57,0xa6,0xa6}, {0xc7,0x73,0xb4,0xb4}, {0x51,0x97,0xc6,0xc6},
++  {0x23,0xcb,0xe8,0xe8}, {0x7c,0xa1,0xdd,0xdd}, {0x9c,0xe8,0x74,0x74}, {0x21,0x3e,0x1f,0x1f},
++  {0xdd,0x96,0x4b,0x4b}, {0xdc,0x61,0xbd,0xbd}, {0x86,0x0d,0x8b,0x8b}, {0x85,0x0f,0x8a,0x8a},
++  {0x90,0xe0,0x70,0x70}, {0x42,0x7c,0x3e,0x3e}, {0xc4,0x71,0xb5,0xb5}, {0xaa,0xcc,0x66,0x66},
++  {0xd8,0x90,0x48,0x48}, {0x05,0x06,0x03,0x03}, {0x01,0xf7,0xf6,0xf6}, {0x12,0x1c,0x0e,0x0e},
++  {0xa3,0xc2,0x61,0x61}, {0x5f,0x6a,0x35,0x35}, {0xf9,0xae,0x57,0x57}, {0xd0,0x69,0xb9,0xb9},
++  {0x91,0x17,0x86,0x86}, {0x58,0x99,0xc1,0xc1}, {0x27,0x3a,0x1d,0x1d}, {0xb9,0x27,0x9e,0x9e},
++  {0x38,0xd9,0xe1,0xe1}, {0x13,0xeb,0xf8,0xf8}, {0xb3,0x2b,0x98,0x98}, {0x33,0x22,0x11,0x11},
++  {0xbb,0xd2,0x69,0x69}, {0x70,0xa9,0xd9,0xd9}, {0x89,0x07,0x8e,0x8e}, {0xa7,0x33,0x94,0x94},
++  {0xb6,0x2d,0x9b,0x9b}, {0x22,0x3c,0x1e,0x1e}, {0x92,0x15,0x87,0x87}, {0x20,0xc9,0xe9,0xe9},
++  {0x49,0x87,0xce,0xce}, {0xff,0xaa,0x55,0x55}, {0x78,0x50,0x28,0x28}, {0x7a,0xa5,0xdf,0xdf},
++  {0x8f,0x03,0x8c,0x8c}, {0xf8,0x59,0xa1,0xa1}, {0x80,0x09,0x89,0x89}, {0x17,0x1a,0x0d,0x0d},
++  {0xda,0x65,0xbf,0xbf}, {0x31,0xd7,0xe6,0xe6}, {0xc6,0x84,0x42,0x42}, {0xb8,0xd0,0x68,0x68},
++  {0xc3,0x82,0x41,0x41}, {0xb0,0x29,0x99,0x99}, {0x77,0x5a,0x2d,0x2d}, {0x11,0x1e,0x0f,0x0f},
++  {0xcb,0x7b,0xb0,0xb0}, {0xfc,0xa8,0x54,0x54}, {0xd6,0x6d,0xbb,0xbb}, {0x3a,0x2c,0x16,0x16}
++};
++
++static UINT8 T3[256][4]=
++{
++  {0x63,0xa5,0xc6,0x63}, {0x7c,0x84,0xf8,0x7c}, {0x77,0x99,0xee,0x77}, {0x7b,0x8d,0xf6,0x7b},
++  {0xf2,0x0d,0xff,0xf2}, {0x6b,0xbd,0xd6,0x6b}, {0x6f,0xb1,0xde,0x6f}, {0xc5,0x54,0x91,0xc5},
++  {0x30,0x50,0x60,0x30}, {0x01,0x03,0x02,0x01}, {0x67,0xa9,0xce,0x67}, {0x2b,0x7d,0x56,0x2b},
++  {0xfe,0x19,0xe7,0xfe}, {0xd7,0x62,0xb5,0xd7}, {0xab,0xe6,0x4d,0xab}, {0x76,0x9a,0xec,0x76},
++  {0xca,0x45,0x8f,0xca}, {0x82,0x9d,0x1f,0x82}, {0xc9,0x40,0x89,0xc9}, {0x7d,0x87,0xfa,0x7d},
++  {0xfa,0x15,0xef,0xfa}, {0x59,0xeb,0xb2,0x59}, {0x47,0xc9,0x8e,0x47}, {0xf0,0x0b,0xfb,0xf0},
++  {0xad,0xec,0x41,0xad}, {0xd4,0x67,0xb3,0xd4}, {0xa2,0xfd,0x5f,0xa2}, {0xaf,0xea,0x45,0xaf},
++  {0x9c,0xbf,0x23,0x9c}, {0xa4,0xf7,0x53,0xa4}, {0x72,0x96,0xe4,0x72}, {0xc0,0x5b,0x9b,0xc0},
++  {0xb7,0xc2,0x75,0xb7}, {0xfd,0x1c,0xe1,0xfd}, {0x93,0xae,0x3d,0x93}, {0x26,0x6a,0x4c,0x26},
++  {0x36,0x5a,0x6c,0x36}, {0x3f,0x41,0x7e,0x3f}, {0xf7,0x02,0xf5,0xf7}, {0xcc,0x4f,0x83,0xcc},
++  {0x34,0x5c,0x68,0x34}, {0xa5,0xf4,0x51,0xa5}, {0xe5,0x34,0xd1,0xe5}, {0xf1,0x08,0xf9,0xf1},
++  {0x71,0x93,0xe2,0x71}, {0xd8,0x73,0xab,0xd8}, {0x31,0x53,0x62,0x31}, {0x15,0x3f,0x2a,0x15},
++  {0x04,0x0c,0x08,0x04}, {0xc7,0x52,0x95,0xc7}, {0x23,0x65,0x46,0x23}, {0xc3,0x5e,0x9d,0xc3},
++  {0x18,0x28,0x30,0x18}, {0x96,0xa1,0x37,0x96}, {0x05,0x0f,0x0a,0x05}, {0x9a,0xb5,0x2f,0x9a},
++  {0x07,0x09,0x0e,0x07}, {0x12,0x36,0x24,0x12}, {0x80,0x9b,0x1b,0x80}, {0xe2,0x3d,0xdf,0xe2},
++  {0xeb,0x26,0xcd,0xeb}, {0x27,0x69,0x4e,0x27}, {0xb2,0xcd,0x7f,0xb2}, {0x75,0x9f,0xea,0x75},
++  {0x09,0x1b,0x12,0x09}, {0x83,0x9e,0x1d,0x83}, {0x2c,0x74,0x58,0x2c}, {0x1a,0x2e,0x34,0x1a},
++  {0x1b,0x2d,0x36,0x1b}, {0x6e,0xb2,0xdc,0x6e}, {0x5a,0xee,0xb4,0x5a}, {0xa0,0xfb,0x5b,0xa0},
++  {0x52,0xf6,0xa4,0x52}, {0x3b,0x4d,0x76,0x3b}, {0xd6,0x61,0xb7,0xd6}, {0xb3,0xce,0x7d,0xb3},
++  {0x29,0x7b,0x52,0x29}, {0xe3,0x3e,0xdd,0xe3}, {0x2f,0x71,0x5e,0x2f}, {0x84,0x97,0x13,0x84},
++  {0x53,0xf5,0xa6,0x53}, {0xd1,0x68,0xb9,0xd1}, {0x00,0x00,0x00,0x00}, {0xed,0x2c,0xc1,0xed},
++  {0x20,0x60,0x40,0x20}, {0xfc,0x1f,0xe3,0xfc}, {0xb1,0xc8,0x79,0xb1}, {0x5b,0xed,0xb6,0x5b},
++  {0x6a,0xbe,0xd4,0x6a}, {0xcb,0x46,0x8d,0xcb}, {0xbe,0xd9,0x67,0xbe}, {0x39,0x4b,0x72,0x39},
++  {0x4a,0xde,0x94,0x4a}, {0x4c,0xd4,0x98,0x4c}, {0x58,0xe8,0xb0,0x58}, {0xcf,0x4a,0x85,0xcf},
++  {0xd0,0x6b,0xbb,0xd0}, {0xef,0x2a,0xc5,0xef}, {0xaa,0xe5,0x4f,0xaa}, {0xfb,0x16,0xed,0xfb},
++  {0x43,0xc5,0x86,0x43}, {0x4d,0xd7,0x9a,0x4d}, {0x33,0x55,0x66,0x33}, {0x85,0x94,0x11,0x85},
++  {0x45,0xcf,0x8a,0x45}, {0xf9,0x10,0xe9,0xf9}, {0x02,0x06,0x04,0x02}, {0x7f,0x81,0xfe,0x7f},
++  {0x50,0xf0,0xa0,0x50}, {0x3c,0x44,0x78,0x3c}, {0x9f,0xba,0x25,0x9f}, {0xa8,0xe3,0x4b,0xa8},
++  {0x51,0xf3,0xa2,0x51}, {0xa3,0xfe,0x5d,0xa3}, {0x40,0xc0,0x80,0x40}, {0x8f,0x8a,0x05,0x8f},
++  {0x92,0xad,0x3f,0x92}, {0x9d,0xbc,0x21,0x9d}, {0x38,0x48,0x70,0x38}, {0xf5,0x04,0xf1,0xf5},
++  {0xbc,0xdf,0x63,0xbc}, {0xb6,0xc1,0x77,0xb6}, {0xda,0x75,0xaf,0xda}, {0x21,0x63,0x42,0x21},
++  {0x10,0x30,0x20,0x10}, {0xff,0x1a,0xe5,0xff}, {0xf3,0x0e,0xfd,0xf3}, {0xd2,0x6d,0xbf,0xd2},
++  {0xcd,0x4c,0x81,0xcd}, {0x0c,0x14,0x18,0x0c}, {0x13,0x35,0x26,0x13}, {0xec,0x2f,0xc3,0xec},
++  {0x5f,0xe1,0xbe,0x5f}, {0x97,0xa2,0x35,0x97}, {0x44,0xcc,0x88,0x44}, {0x17,0x39,0x2e,0x17},
++  {0xc4,0x57,0x93,0xc4}, {0xa7,0xf2,0x55,0xa7}, {0x7e,0x82,0xfc,0x7e}, {0x3d,0x47,0x7a,0x3d},
++  {0x64,0xac,0xc8,0x64}, {0x5d,0xe7,0xba,0x5d}, {0x19,0x2b,0x32,0x19}, {0x73,0x95,0xe6,0x73},
++  {0x60,0xa0,0xc0,0x60}, {0x81,0x98,0x19,0x81}, {0x4f,0xd1,0x9e,0x4f}, {0xdc,0x7f,0xa3,0xdc},
++  {0x22,0x66,0x44,0x22}, {0x2a,0x7e,0x54,0x2a}, {0x90,0xab,0x3b,0x90}, {0x88,0x83,0x0b,0x88},
++  {0x46,0xca,0x8c,0x46}, {0xee,0x29,0xc7,0xee}, {0xb8,0xd3,0x6b,0xb8}, {0x14,0x3c,0x28,0x14},
++  {0xde,0x79,0xa7,0xde}, {0x5e,0xe2,0xbc,0x5e}, {0x0b,0x1d,0x16,0x0b}, {0xdb,0x76,0xad,0xdb},
++  {0xe0,0x3b,0xdb,0xe0}, {0x32,0x56,0x64,0x32}, {0x3a,0x4e,0x74,0x3a}, {0x0a,0x1e,0x14,0x0a},
++  {0x49,0xdb,0x92,0x49}, {0x06,0x0a,0x0c,0x06}, {0x24,0x6c,0x48,0x24}, {0x5c,0xe4,0xb8,0x5c},
++  {0xc2,0x5d,0x9f,0xc2}, {0xd3,0x6e,0xbd,0xd3}, {0xac,0xef,0x43,0xac}, {0x62,0xa6,0xc4,0x62},
++  {0x91,0xa8,0x39,0x91}, {0x95,0xa4,0x31,0x95}, {0xe4,0x37,0xd3,0xe4}, {0x79,0x8b,0xf2,0x79},
++  {0xe7,0x32,0xd5,0xe7}, {0xc8,0x43,0x8b,0xc8}, {0x37,0x59,0x6e,0x37}, {0x6d,0xb7,0xda,0x6d},
++  {0x8d,0x8c,0x01,0x8d}, {0xd5,0x64,0xb1,0xd5}, {0x4e,0xd2,0x9c,0x4e}, {0xa9,0xe0,0x49,0xa9},
++  {0x6c,0xb4,0xd8,0x6c}, {0x56,0xfa,0xac,0x56}, {0xf4,0x07,0xf3,0xf4}, {0xea,0x25,0xcf,0xea},
++  {0x65,0xaf,0xca,0x65}, {0x7a,0x8e,0xf4,0x7a}, {0xae,0xe9,0x47,0xae}, {0x08,0x18,0x10,0x08},
++  {0xba,0xd5,0x6f,0xba}, {0x78,0x88,0xf0,0x78}, {0x25,0x6f,0x4a,0x25}, {0x2e,0x72,0x5c,0x2e},
++  {0x1c,0x24,0x38,0x1c}, {0xa6,0xf1,0x57,0xa6}, {0xb4,0xc7,0x73,0xb4}, {0xc6,0x51,0x97,0xc6},
++  {0xe8,0x23,0xcb,0xe8}, {0xdd,0x7c,0xa1,0xdd}, {0x74,0x9c,0xe8,0x74}, {0x1f,0x21,0x3e,0x1f},
++  {0x4b,0xdd,0x96,0x4b}, {0xbd,0xdc,0x61,0xbd}, {0x8b,0x86,0x0d,0x8b}, {0x8a,0x85,0x0f,0x8a},
++  {0x70,0x90,0xe0,0x70}, {0x3e,0x42,0x7c,0x3e}, {0xb5,0xc4,0x71,0xb5}, {0x66,0xaa,0xcc,0x66},
++  {0x48,0xd8,0x90,0x48}, {0x03,0x05,0x06,0x03}, {0xf6,0x01,0xf7,0xf6}, {0x0e,0x12,0x1c,0x0e},
++  {0x61,0xa3,0xc2,0x61}, {0x35,0x5f,0x6a,0x35}, {0x57,0xf9,0xae,0x57}, {0xb9,0xd0,0x69,0xb9},
++  {0x86,0x91,0x17,0x86}, {0xc1,0x58,0x99,0xc1}, {0x1d,0x27,0x3a,0x1d}, {0x9e,0xb9,0x27,0x9e},
++  {0xe1,0x38,0xd9,0xe1}, {0xf8,0x13,0xeb,0xf8}, {0x98,0xb3,0x2b,0x98}, {0x11,0x33,0x22,0x11},
++  {0x69,0xbb,0xd2,0x69}, {0xd9,0x70,0xa9,0xd9}, {0x8e,0x89,0x07,0x8e}, {0x94,0xa7,0x33,0x94},
++  {0x9b,0xb6,0x2d,0x9b}, {0x1e,0x22,0x3c,0x1e}, {0x87,0x92,0x15,0x87}, {0xe9,0x20,0xc9,0xe9},
++  {0xce,0x49,0x87,0xce}, {0x55,0xff,0xaa,0x55}, {0x28,0x78,0x50,0x28}, {0xdf,0x7a,0xa5,0xdf},
++  {0x8c,0x8f,0x03,0x8c}, {0xa1,0xf8,0x59,0xa1}, {0x89,0x80,0x09,0x89}, {0x0d,0x17,0x1a,0x0d},
++  {0xbf,0xda,0x65,0xbf}, {0xe6,0x31,0xd7,0xe6}, {0x42,0xc6,0x84,0x42}, {0x68,0xb8,0xd0,0x68},
++  {0x41,0xc3,0x82,0x41}, {0x99,0xb0,0x29,0x99}, {0x2d,0x77,0x5a,0x2d}, {0x0f,0x11,0x1e,0x0f},
++  {0xb0,0xcb,0x7b,0xb0}, {0x54,0xfc,0xa8,0x54}, {0xbb,0xd6,0x6d,0xbb}, {0x16,0x3a,0x2c,0x16}
++};
++
++static UINT8 T4[256][4]=
++{
++  {0x63,0x63,0xa5,0xc6}, {0x7c,0x7c,0x84,0xf8}, {0x77,0x77,0x99,0xee}, {0x7b,0x7b,0x8d,0xf6},
++  {0xf2,0xf2,0x0d,0xff}, {0x6b,0x6b,0xbd,0xd6}, {0x6f,0x6f,0xb1,0xde}, {0xc5,0xc5,0x54,0x91},
++  {0x30,0x30,0x50,0x60}, {0x01,0x01,0x03,0x02}, {0x67,0x67,0xa9,0xce}, {0x2b,0x2b,0x7d,0x56},
++  {0xfe,0xfe,0x19,0xe7}, {0xd7,0xd7,0x62,0xb5}, {0xab,0xab,0xe6,0x4d}, {0x76,0x76,0x9a,0xec},
++  {0xca,0xca,0x45,0x8f}, {0x82,0x82,0x9d,0x1f}, {0xc9,0xc9,0x40,0x89}, {0x7d,0x7d,0x87,0xfa},
++  {0xfa,0xfa,0x15,0xef}, {0x59,0x59,0xeb,0xb2}, {0x47,0x47,0xc9,0x8e}, {0xf0,0xf0,0x0b,0xfb},
++  {0xad,0xad,0xec,0x41}, {0xd4,0xd4,0x67,0xb3}, {0xa2,0xa2,0xfd,0x5f}, {0xaf,0xaf,0xea,0x45},
++  {0x9c,0x9c,0xbf,0x23}, {0xa4,0xa4,0xf7,0x53}, {0x72,0x72,0x96,0xe4}, {0xc0,0xc0,0x5b,0x9b},
++  {0xb7,0xb7,0xc2,0x75}, {0xfd,0xfd,0x1c,0xe1}, {0x93,0x93,0xae,0x3d}, {0x26,0x26,0x6a,0x4c},
++  {0x36,0x36,0x5a,0x6c}, {0x3f,0x3f,0x41,0x7e}, {0xf7,0xf7,0x02,0xf5}, {0xcc,0xcc,0x4f,0x83},
++  {0x34,0x34,0x5c,0x68}, {0xa5,0xa5,0xf4,0x51}, {0xe5,0xe5,0x34,0xd1}, {0xf1,0xf1,0x08,0xf9},
++  {0x71,0x71,0x93,0xe2}, {0xd8,0xd8,0x73,0xab}, {0x31,0x31,0x53,0x62}, {0x15,0x15,0x3f,0x2a},
++  {0x04,0x04,0x0c,0x08}, {0xc7,0xc7,0x52,0x95}, {0x23,0x23,0x65,0x46}, {0xc3,0xc3,0x5e,0x9d},
++  {0x18,0x18,0x28,0x30}, {0x96,0x96,0xa1,0x37}, {0x05,0x05,0x0f,0x0a}, {0x9a,0x9a,0xb5,0x2f},
++  {0x07,0x07,0x09,0x0e}, {0x12,0x12,0x36,0x24}, {0x80,0x80,0x9b,0x1b}, {0xe2,0xe2,0x3d,0xdf},
++  {0xeb,0xeb,0x26,0xcd}, {0x27,0x27,0x69,0x4e}, {0xb2,0xb2,0xcd,0x7f}, {0x75,0x75,0x9f,0xea},
++  {0x09,0x09,0x1b,0x12}, {0x83,0x83,0x9e,0x1d}, {0x2c,0x2c,0x74,0x58}, {0x1a,0x1a,0x2e,0x34},
++  {0x1b,0x1b,0x2d,0x36}, {0x6e,0x6e,0xb2,0xdc}, {0x5a,0x5a,0xee,0xb4}, {0xa0,0xa0,0xfb,0x5b},
++  {0x52,0x52,0xf6,0xa4}, {0x3b,0x3b,0x4d,0x76}, {0xd6,0xd6,0x61,0xb7}, {0xb3,0xb3,0xce,0x7d},
++  {0x29,0x29,0x7b,0x52}, {0xe3,0xe3,0x3e,0xdd}, {0x2f,0x2f,0x71,0x5e}, {0x84,0x84,0x97,0x13},
++  {0x53,0x53,0xf5,0xa6}, {0xd1,0xd1,0x68,0xb9}, {0x00,0x00,0x00,0x00}, {0xed,0xed,0x2c,0xc1},
++  {0x20,0x20,0x60,0x40}, {0xfc,0xfc,0x1f,0xe3}, {0xb1,0xb1,0xc8,0x79}, {0x5b,0x5b,0xed,0xb6},
++  {0x6a,0x6a,0xbe,0xd4}, {0xcb,0xcb,0x46,0x8d}, {0xbe,0xbe,0xd9,0x67}, {0x39,0x39,0x4b,0x72},
++  {0x4a,0x4a,0xde,0x94}, {0x4c,0x4c,0xd4,0x98}, {0x58,0x58,0xe8,0xb0}, {0xcf,0xcf,0x4a,0x85},
++  {0xd0,0xd0,0x6b,0xbb}, {0xef,0xef,0x2a,0xc5}, {0xaa,0xaa,0xe5,0x4f}, {0xfb,0xfb,0x16,0xed},
++  {0x43,0x43,0xc5,0x86}, {0x4d,0x4d,0xd7,0x9a}, {0x33,0x33,0x55,0x66}, {0x85,0x85,0x94,0x11},
++  {0x45,0x45,0xcf,0x8a}, {0xf9,0xf9,0x10,0xe9}, {0x02,0x02,0x06,0x04}, {0x7f,0x7f,0x81,0xfe},
++  {0x50,0x50,0xf0,0xa0}, {0x3c,0x3c,0x44,0x78}, {0x9f,0x9f,0xba,0x25}, {0xa8,0xa8,0xe3,0x4b},
++  {0x51,0x51,0xf3,0xa2}, {0xa3,0xa3,0xfe,0x5d}, {0x40,0x40,0xc0,0x80}, {0x8f,0x8f,0x8a,0x05},
++  {0x92,0x92,0xad,0x3f}, {0x9d,0x9d,0xbc,0x21}, {0x38,0x38,0x48,0x70}, {0xf5,0xf5,0x04,0xf1},
++  {0xbc,0xbc,0xdf,0x63}, {0xb6,0xb6,0xc1,0x77}, {0xda,0xda,0x75,0xaf}, {0x21,0x21,0x63,0x42},
++  {0x10,0x10,0x30,0x20}, {0xff,0xff,0x1a,0xe5}, {0xf3,0xf3,0x0e,0xfd}, {0xd2,0xd2,0x6d,0xbf},
++  {0xcd,0xcd,0x4c,0x81}, {0x0c,0x0c,0x14,0x18}, {0x13,0x13,0x35,0x26}, {0xec,0xec,0x2f,0xc3},
++  {0x5f,0x5f,0xe1,0xbe}, {0x97,0x97,0xa2,0x35}, {0x44,0x44,0xcc,0x88}, {0x17,0x17,0x39,0x2e},
++  {0xc4,0xc4,0x57,0x93}, {0xa7,0xa7,0xf2,0x55}, {0x7e,0x7e,0x82,0xfc}, {0x3d,0x3d,0x47,0x7a},
++  {0x64,0x64,0xac,0xc8}, {0x5d,0x5d,0xe7,0xba}, {0x19,0x19,0x2b,0x32}, {0x73,0x73,0x95,0xe6},
++  {0x60,0x60,0xa0,0xc0}, {0x81,0x81,0x98,0x19}, {0x4f,0x4f,0xd1,0x9e}, {0xdc,0xdc,0x7f,0xa3},
++  {0x22,0x22,0x66,0x44}, {0x2a,0x2a,0x7e,0x54}, {0x90,0x90,0xab,0x3b}, {0x88,0x88,0x83,0x0b},
++  {0x46,0x46,0xca,0x8c}, {0xee,0xee,0x29,0xc7}, {0xb8,0xb8,0xd3,0x6b}, {0x14,0x14,0x3c,0x28},
++  {0xde,0xde,0x79,0xa7}, {0x5e,0x5e,0xe2,0xbc}, {0x0b,0x0b,0x1d,0x16}, {0xdb,0xdb,0x76,0xad},
++  {0xe0,0xe0,0x3b,0xdb}, {0x32,0x32,0x56,0x64}, {0x3a,0x3a,0x4e,0x74}, {0x0a,0x0a,0x1e,0x14},
++  {0x49,0x49,0xdb,0x92}, {0x06,0x06,0x0a,0x0c}, {0x24,0x24,0x6c,0x48}, {0x5c,0x5c,0xe4,0xb8},
++  {0xc2,0xc2,0x5d,0x9f}, {0xd3,0xd3,0x6e,0xbd}, {0xac,0xac,0xef,0x43}, {0x62,0x62,0xa6,0xc4},
++  {0x91,0x91,0xa8,0x39}, {0x95,0x95,0xa4,0x31}, {0xe4,0xe4,0x37,0xd3}, {0x79,0x79,0x8b,0xf2},
++  {0xe7,0xe7,0x32,0xd5}, {0xc8,0xc8,0x43,0x8b}, {0x37,0x37,0x59,0x6e}, {0x6d,0x6d,0xb7,0xda},
++  {0x8d,0x8d,0x8c,0x01}, {0xd5,0xd5,0x64,0xb1}, {0x4e,0x4e,0xd2,0x9c}, {0xa9,0xa9,0xe0,0x49},
++  {0x6c,0x6c,0xb4,0xd8}, {0x56,0x56,0xfa,0xac}, {0xf4,0xf4,0x07,0xf3}, {0xea,0xea,0x25,0xcf},
++  {0x65,0x65,0xaf,0xca}, {0x7a,0x7a,0x8e,0xf4}, {0xae,0xae,0xe9,0x47}, {0x08,0x08,0x18,0x10},
++  {0xba,0xba,0xd5,0x6f}, {0x78,0x78,0x88,0xf0}, {0x25,0x25,0x6f,0x4a}, {0x2e,0x2e,0x72,0x5c},
++  {0x1c,0x1c,0x24,0x38}, {0xa6,0xa6,0xf1,0x57}, {0xb4,0xb4,0xc7,0x73}, {0xc6,0xc6,0x51,0x97},
++  {0xe8,0xe8,0x23,0xcb}, {0xdd,0xdd,0x7c,0xa1}, {0x74,0x74,0x9c,0xe8}, {0x1f,0x1f,0x21,0x3e},
++  {0x4b,0x4b,0xdd,0x96}, {0xbd,0xbd,0xdc,0x61}, {0x8b,0x8b,0x86,0x0d}, {0x8a,0x8a,0x85,0x0f},
++  {0x70,0x70,0x90,0xe0}, {0x3e,0x3e,0x42,0x7c}, {0xb5,0xb5,0xc4,0x71}, {0x66,0x66,0xaa,0xcc},
++  {0x48,0x48,0xd8,0x90}, {0x03,0x03,0x05,0x06}, {0xf6,0xf6,0x01,0xf7}, {0x0e,0x0e,0x12,0x1c},
++  {0x61,0x61,0xa3,0xc2}, {0x35,0x35,0x5f,0x6a}, {0x57,0x57,0xf9,0xae}, {0xb9,0xb9,0xd0,0x69},
++  {0x86,0x86,0x91,0x17}, {0xc1,0xc1,0x58,0x99}, {0x1d,0x1d,0x27,0x3a}, {0x9e,0x9e,0xb9,0x27},
++  {0xe1,0xe1,0x38,0xd9}, {0xf8,0xf8,0x13,0xeb}, {0x98,0x98,0xb3,0x2b}, {0x11,0x11,0x33,0x22},
++  {0x69,0x69,0xbb,0xd2}, {0xd9,0xd9,0x70,0xa9}, {0x8e,0x8e,0x89,0x07}, {0x94,0x94,0xa7,0x33},
++  {0x9b,0x9b,0xb6,0x2d}, {0x1e,0x1e,0x22,0x3c}, {0x87,0x87,0x92,0x15}, {0xe9,0xe9,0x20,0xc9},
++  {0xce,0xce,0x49,0x87}, {0x55,0x55,0xff,0xaa}, {0x28,0x28,0x78,0x50}, {0xdf,0xdf,0x7a,0xa5},
++  {0x8c,0x8c,0x8f,0x03}, {0xa1,0xa1,0xf8,0x59}, {0x89,0x89,0x80,0x09}, {0x0d,0x0d,0x17,0x1a},
++  {0xbf,0xbf,0xda,0x65}, {0xe6,0xe6,0x31,0xd7}, {0x42,0x42,0xc6,0x84}, {0x68,0x68,0xb8,0xd0},
++  {0x41,0x41,0xc3,0x82}, {0x99,0x99,0xb0,0x29}, {0x2d,0x2d,0x77,0x5a}, {0x0f,0x0f,0x11,0x1e},
++  {0xb0,0xb0,0xcb,0x7b}, {0x54,0x54,0xfc,0xa8}, {0xbb,0xbb,0xd6,0x6d}, {0x16,0x16,0x3a,0x2c}
++};
++
++static UINT8 T5[256][4]=
++{
++  {0x51,0xf4,0xa7,0x50}, {0x7e,0x41,0x65,0x53}, {0x1a,0x17,0xa4,0xc3}, {0x3a,0x27,0x5e,0x96},
++  {0x3b,0xab,0x6b,0xcb}, {0x1f,0x9d,0x45,0xf1}, {0xac,0xfa,0x58,0xab}, {0x4b,0xe3,0x03,0x93},
++  {0x20,0x30,0xfa,0x55}, {0xad,0x76,0x6d,0xf6}, {0x88,0xcc,0x76,0x91}, {0xf5,0x02,0x4c,0x25},
++  {0x4f,0xe5,0xd7,0xfc}, {0xc5,0x2a,0xcb,0xd7}, {0x26,0x35,0x44,0x80}, {0xb5,0x62,0xa3,0x8f},
++  {0xde,0xb1,0x5a,0x49}, {0x25,0xba,0x1b,0x67}, {0x45,0xea,0x0e,0x98}, {0x5d,0xfe,0xc0,0xe1},
++  {0xc3,0x2f,0x75,0x02}, {0x81,0x4c,0xf0,0x12}, {0x8d,0x46,0x97,0xa3}, {0x6b,0xd3,0xf9,0xc6},
++  {0x03,0x8f,0x5f,0xe7}, {0x15,0x92,0x9c,0x95}, {0xbf,0x6d,0x7a,0xeb}, {0x95,0x52,0x59,0xda},
++  {0xd4,0xbe,0x83,0x2d}, {0x58,0x74,0x21,0xd3}, {0x49,0xe0,0x69,0x29}, {0x8e,0xc9,0xc8,0x44},
++  {0x75,0xc2,0x89,0x6a}, {0xf4,0x8e,0x79,0x78}, {0x99,0x58,0x3e,0x6b}, {0x27,0xb9,0x71,0xdd},
++  {0xbe,0xe1,0x4f,0xb6}, {0xf0,0x88,0xad,0x17}, {0xc9,0x20,0xac,0x66}, {0x7d,0xce,0x3a,0xb4},
++  {0x63,0xdf,0x4a,0x18}, {0xe5,0x1a,0x31,0x82}, {0x97,0x51,0x33,0x60}, {0x62,0x53,0x7f,0x45},
++  {0xb1,0x64,0x77,0xe0}, {0xbb,0x6b,0xae,0x84}, {0xfe,0x81,0xa0,0x1c}, {0xf9,0x08,0x2b,0x94},
++  {0x70,0x48,0x68,0x58}, {0x8f,0x45,0xfd,0x19}, {0x94,0xde,0x6c,0x87}, {0x52,0x7b,0xf8,0xb7},
++  {0xab,0x73,0xd3,0x23}, {0x72,0x4b,0x02,0xe2}, {0xe3,0x1f,0x8f,0x57}, {0x66,0x55,0xab,0x2a},
++  {0xb2,0xeb,0x28,0x07}, {0x2f,0xb5,0xc2,0x03}, {0x86,0xc5,0x7b,0x9a}, {0xd3,0x37,0x08,0xa5},
++  {0x30,0x28,0x87,0xf2}, {0x23,0xbf,0xa5,0xb2}, {0x02,0x03,0x6a,0xba}, {0xed,0x16,0x82,0x5c},
++  {0x8a,0xcf,0x1c,0x2b}, {0xa7,0x79,0xb4,0x92}, {0xf3,0x07,0xf2,0xf0}, {0x4e,0x69,0xe2,0xa1},
++  {0x65,0xda,0xf4,0xcd}, {0x06,0x05,0xbe,0xd5}, {0xd1,0x34,0x62,0x1f}, {0xc4,0xa6,0xfe,0x8a},
++  {0x34,0x2e,0x53,0x9d}, {0xa2,0xf3,0x55,0xa0}, {0x05,0x8a,0xe1,0x32}, {0xa4,0xf6,0xeb,0x75},
++  {0x0b,0x83,0xec,0x39}, {0x40,0x60,0xef,0xaa}, {0x5e,0x71,0x9f,0x06}, {0xbd,0x6e,0x10,0x51},
++  {0x3e,0x21,0x8a,0xf9}, {0x96,0xdd,0x06,0x3d}, {0xdd,0x3e,0x05,0xae}, {0x4d,0xe6,0xbd,0x46},
++  {0x91,0x54,0x8d,0xb5}, {0x71,0xc4,0x5d,0x05}, {0x04,0x06,0xd4,0x6f}, {0x60,0x50,0x15,0xff},
++  {0x19,0x98,0xfb,0x24}, {0xd6,0xbd,0xe9,0x97}, {0x89,0x40,0x43,0xcc}, {0x67,0xd9,0x9e,0x77},
++  {0xb0,0xe8,0x42,0xbd}, {0x07,0x89,0x8b,0x88}, {0xe7,0x19,0x5b,0x38}, {0x79,0xc8,0xee,0xdb},
++  {0xa1,0x7c,0x0a,0x47}, {0x7c,0x42,0x0f,0xe9}, {0xf8,0x84,0x1e,0xc9}, {0x00,0x00,0x00,0x00},
++  {0x09,0x80,0x86,0x83}, {0x32,0x2b,0xed,0x48}, {0x1e,0x11,0x70,0xac}, {0x6c,0x5a,0x72,0x4e},
++  {0xfd,0x0e,0xff,0xfb}, {0x0f,0x85,0x38,0x56}, {0x3d,0xae,0xd5,0x1e}, {0x36,0x2d,0x39,0x27},
++  {0x0a,0x0f,0xd9,0x64}, {0x68,0x5c,0xa6,0x21}, {0x9b,0x5b,0x54,0xd1}, {0x24,0x36,0x2e,0x3a},
++  {0x0c,0x0a,0x67,0xb1}, {0x93,0x57,0xe7,0x0f}, {0xb4,0xee,0x96,0xd2}, {0x1b,0x9b,0x91,0x9e},
++  {0x80,0xc0,0xc5,0x4f}, {0x61,0xdc,0x20,0xa2}, {0x5a,0x77,0x4b,0x69}, {0x1c,0x12,0x1a,0x16},
++  {0xe2,0x93,0xba,0x0a}, {0xc0,0xa0,0x2a,0xe5}, {0x3c,0x22,0xe0,0x43}, {0x12,0x1b,0x17,0x1d},
++  {0x0e,0x09,0x0d,0x0b}, {0xf2,0x8b,0xc7,0xad}, {0x2d,0xb6,0xa8,0xb9}, {0x14,0x1e,0xa9,0xc8},
++  {0x57,0xf1,0x19,0x85}, {0xaf,0x75,0x07,0x4c}, {0xee,0x99,0xdd,0xbb}, {0xa3,0x7f,0x60,0xfd},
++  {0xf7,0x01,0x26,0x9f}, {0x5c,0x72,0xf5,0xbc}, {0x44,0x66,0x3b,0xc5}, {0x5b,0xfb,0x7e,0x34},
++  {0x8b,0x43,0x29,0x76}, {0xcb,0x23,0xc6,0xdc}, {0xb6,0xed,0xfc,0x68}, {0xb8,0xe4,0xf1,0x63},
++  {0xd7,0x31,0xdc,0xca}, {0x42,0x63,0x85,0x10}, {0x13,0x97,0x22,0x40}, {0x84,0xc6,0x11,0x20},
++  {0x85,0x4a,0x24,0x7d}, {0xd2,0xbb,0x3d,0xf8}, {0xae,0xf9,0x32,0x11}, {0xc7,0x29,0xa1,0x6d},
++  {0x1d,0x9e,0x2f,0x4b}, {0xdc,0xb2,0x30,0xf3}, {0x0d,0x86,0x52,0xec}, {0x77,0xc1,0xe3,0xd0},
++  {0x2b,0xb3,0x16,0x6c}, {0xa9,0x70,0xb9,0x99}, {0x11,0x94,0x48,0xfa}, {0x47,0xe9,0x64,0x22},
++  {0xa8,0xfc,0x8c,0xc4}, {0xa0,0xf0,0x3f,0x1a}, {0x56,0x7d,0x2c,0xd8}, {0x22,0x33,0x90,0xef},
++  {0x87,0x49,0x4e,0xc7}, {0xd9,0x38,0xd1,0xc1}, {0x8c,0xca,0xa2,0xfe}, {0x98,0xd4,0x0b,0x36},
++  {0xa6,0xf5,0x81,0xcf}, {0xa5,0x7a,0xde,0x28}, {0xda,0xb7,0x8e,0x26}, {0x3f,0xad,0xbf,0xa4},
++  {0x2c,0x3a,0x9d,0xe4}, {0x50,0x78,0x92,0x0d}, {0x6a,0x5f,0xcc,0x9b}, {0x54,0x7e,0x46,0x62},
++  {0xf6,0x8d,0x13,0xc2}, {0x90,0xd8,0xb8,0xe8}, {0x2e,0x39,0xf7,0x5e}, {0x82,0xc3,0xaf,0xf5},
++  {0x9f,0x5d,0x80,0xbe}, {0x69,0xd0,0x93,0x7c}, {0x6f,0xd5,0x2d,0xa9}, {0xcf,0x25,0x12,0xb3},
++  {0xc8,0xac,0x99,0x3b}, {0x10,0x18,0x7d,0xa7}, {0xe8,0x9c,0x63,0x6e}, {0xdb,0x3b,0xbb,0x7b},
++  {0xcd,0x26,0x78,0x09}, {0x6e,0x59,0x18,0xf4}, {0xec,0x9a,0xb7,0x01}, {0x83,0x4f,0x9a,0xa8},
++  {0xe6,0x95,0x6e,0x65}, {0xaa,0xff,0xe6,0x7e}, {0x21,0xbc,0xcf,0x08}, {0xef,0x15,0xe8,0xe6},
++  {0xba,0xe7,0x9b,0xd9}, {0x4a,0x6f,0x36,0xce}, {0xea,0x9f,0x09,0xd4}, {0x29,0xb0,0x7c,0xd6},
++  {0x31,0xa4,0xb2,0xaf}, {0x2a,0x3f,0x23,0x31}, {0xc6,0xa5,0x94,0x30}, {0x35,0xa2,0x66,0xc0},
++  {0x74,0x4e,0xbc,0x37}, {0xfc,0x82,0xca,0xa6}, {0xe0,0x90,0xd0,0xb0}, {0x33,0xa7,0xd8,0x15},
++  {0xf1,0x04,0x98,0x4a}, {0x41,0xec,0xda,0xf7}, {0x7f,0xcd,0x50,0x0e}, {0x17,0x91,0xf6,0x2f},
++  {0x76,0x4d,0xd6,0x8d}, {0x43,0xef,0xb0,0x4d}, {0xcc,0xaa,0x4d,0x54}, {0xe4,0x96,0x04,0xdf},
++  {0x9e,0xd1,0xb5,0xe3}, {0x4c,0x6a,0x88,0x1b}, {0xc1,0x2c,0x1f,0xb8}, {0x46,0x65,0x51,0x7f},
++  {0x9d,0x5e,0xea,0x04}, {0x01,0x8c,0x35,0x5d}, {0xfa,0x87,0x74,0x73}, {0xfb,0x0b,0x41,0x2e},
++  {0xb3,0x67,0x1d,0x5a}, {0x92,0xdb,0xd2,0x52}, {0xe9,0x10,0x56,0x33}, {0x6d,0xd6,0x47,0x13},
++  {0x9a,0xd7,0x61,0x8c}, {0x37,0xa1,0x0c,0x7a}, {0x59,0xf8,0x14,0x8e}, {0xeb,0x13,0x3c,0x89},
++  {0xce,0xa9,0x27,0xee}, {0xb7,0x61,0xc9,0x35}, {0xe1,0x1c,0xe5,0xed}, {0x7a,0x47,0xb1,0x3c},
++  {0x9c,0xd2,0xdf,0x59}, {0x55,0xf2,0x73,0x3f}, {0x18,0x14,0xce,0x79}, {0x73,0xc7,0x37,0xbf},
++  {0x53,0xf7,0xcd,0xea}, {0x5f,0xfd,0xaa,0x5b}, {0xdf,0x3d,0x6f,0x14}, {0x78,0x44,0xdb,0x86},
++  {0xca,0xaf,0xf3,0x81}, {0xb9,0x68,0xc4,0x3e}, {0x38,0x24,0x34,0x2c}, {0xc2,0xa3,0x40,0x5f},
++  {0x16,0x1d,0xc3,0x72}, {0xbc,0xe2,0x25,0x0c}, {0x28,0x3c,0x49,0x8b}, {0xff,0x0d,0x95,0x41},
++  {0x39,0xa8,0x01,0x71}, {0x08,0x0c,0xb3,0xde}, {0xd8,0xb4,0xe4,0x9c}, {0x64,0x56,0xc1,0x90},
++  {0x7b,0xcb,0x84,0x61}, {0xd5,0x32,0xb6,0x70}, {0x48,0x6c,0x5c,0x74}, {0xd0,0xb8,0x57,0x42}
++};
++
++static UINT8 T6[256][4]=
++{
++  {0x50,0x51,0xf4,0xa7}, {0x53,0x7e,0x41,0x65}, {0xc3,0x1a,0x17,0xa4}, {0x96,0x3a,0x27,0x5e},
++  {0xcb,0x3b,0xab,0x6b}, {0xf1,0x1f,0x9d,0x45}, {0xab,0xac,0xfa,0x58}, {0x93,0x4b,0xe3,0x03},
++  {0x55,0x20,0x30,0xfa}, {0xf6,0xad,0x76,0x6d}, {0x91,0x88,0xcc,0x76}, {0x25,0xf5,0x02,0x4c},
++  {0xfc,0x4f,0xe5,0xd7}, {0xd7,0xc5,0x2a,0xcb}, {0x80,0x26,0x35,0x44}, {0x8f,0xb5,0x62,0xa3},
++  {0x49,0xde,0xb1,0x5a}, {0x67,0x25,0xba,0x1b}, {0x98,0x45,0xea,0x0e}, {0xe1,0x5d,0xfe,0xc0},
++  {0x02,0xc3,0x2f,0x75}, {0x12,0x81,0x4c,0xf0}, {0xa3,0x8d,0x46,0x97}, {0xc6,0x6b,0xd3,0xf9},
++  {0xe7,0x03,0x8f,0x5f}, {0x95,0x15,0x92,0x9c}, {0xeb,0xbf,0x6d,0x7a}, {0xda,0x95,0x52,0x59},
++  {0x2d,0xd4,0xbe,0x83}, {0xd3,0x58,0x74,0x21}, {0x29,0x49,0xe0,0x69}, {0x44,0x8e,0xc9,0xc8},
++  {0x6a,0x75,0xc2,0x89}, {0x78,0xf4,0x8e,0x79}, {0x6b,0x99,0x58,0x3e}, {0xdd,0x27,0xb9,0x71},
++  {0xb6,0xbe,0xe1,0x4f}, {0x17,0xf0,0x88,0xad}, {0x66,0xc9,0x20,0xac}, {0xb4,0x7d,0xce,0x3a},
++  {0x18,0x63,0xdf,0x4a}, {0x82,0xe5,0x1a,0x31}, {0x60,0x97,0x51,0x33}, {0x45,0x62,0x53,0x7f},
++  {0xe0,0xb1,0x64,0x77}, {0x84,0xbb,0x6b,0xae}, {0x1c,0xfe,0x81,0xa0}, {0x94,0xf9,0x08,0x2b},
++  {0x58,0x70,0x48,0x68}, {0x19,0x8f,0x45,0xfd}, {0x87,0x94,0xde,0x6c}, {0xb7,0x52,0x7b,0xf8},
++  {0x23,0xab,0x73,0xd3}, {0xe2,0x72,0x4b,0x02}, {0x57,0xe3,0x1f,0x8f}, {0x2a,0x66,0x55,0xab},
++  {0x07,0xb2,0xeb,0x28}, {0x03,0x2f,0xb5,0xc2}, {0x9a,0x86,0xc5,0x7b}, {0xa5,0xd3,0x37,0x08},
++  {0xf2,0x30,0x28,0x87}, {0xb2,0x23,0xbf,0xa5}, {0xba,0x02,0x03,0x6a}, {0x5c,0xed,0x16,0x82},
++  {0x2b,0x8a,0xcf,0x1c}, {0x92,0xa7,0x79,0xb4}, {0xf0,0xf3,0x07,0xf2}, {0xa1,0x4e,0x69,0xe2},
++  {0xcd,0x65,0xda,0xf4}, {0xd5,0x06,0x05,0xbe}, {0x1f,0xd1,0x34,0x62}, {0x8a,0xc4,0xa6,0xfe},
++  {0x9d,0x34,0x2e,0x53}, {0xa0,0xa2,0xf3,0x55}, {0x32,0x05,0x8a,0xe1}, {0x75,0xa4,0xf6,0xeb},
++  {0x39,0x0b,0x83,0xec}, {0xaa,0x40,0x60,0xef}, {0x06,0x5e,0x71,0x9f}, {0x51,0xbd,0x6e,0x10},
++  {0xf9,0x3e,0x21,0x8a}, {0x3d,0x96,0xdd,0x06}, {0xae,0xdd,0x3e,0x05}, {0x46,0x4d,0xe6,0xbd},
++  {0xb5,0x91,0x54,0x8d}, {0x05,0x71,0xc4,0x5d}, {0x6f,0x04,0x06,0xd4}, {0xff,0x60,0x50,0x15},
++  {0x24,0x19,0x98,0xfb}, {0x97,0xd6,0xbd,0xe9}, {0xcc,0x89,0x40,0x43}, {0x77,0x67,0xd9,0x9e},
++  {0xbd,0xb0,0xe8,0x42}, {0x88,0x07,0x89,0x8b}, {0x38,0xe7,0x19,0x5b}, {0xdb,0x79,0xc8,0xee},
++  {0x47,0xa1,0x7c,0x0a}, {0xe9,0x7c,0x42,0x0f}, {0xc9,0xf8,0x84,0x1e}, {0x00,0x00,0x00,0x00},
++  {0x83,0x09,0x80,0x86}, {0x48,0x32,0x2b,0xed}, {0xac,0x1e,0x11,0x70}, {0x4e,0x6c,0x5a,0x72},
++  {0xfb,0xfd,0x0e,0xff}, {0x56,0x0f,0x85,0x38}, {0x1e,0x3d,0xae,0xd5}, {0x27,0x36,0x2d,0x39},
++  {0x64,0x0a,0x0f,0xd9}, {0x21,0x68,0x5c,0xa6}, {0xd1,0x9b,0x5b,0x54}, {0x3a,0x24,0x36,0x2e},
++  {0xb1,0x0c,0x0a,0x67}, {0x0f,0x93,0x57,0xe7}, {0xd2,0xb4,0xee,0x96}, {0x9e,0x1b,0x9b,0x91},
++  {0x4f,0x80,0xc0,0xc5}, {0xa2,0x61,0xdc,0x20}, {0x69,0x5a,0x77,0x4b}, {0x16,0x1c,0x12,0x1a},
++  {0x0a,0xe2,0x93,0xba}, {0xe5,0xc0,0xa0,0x2a}, {0x43,0x3c,0x22,0xe0}, {0x1d,0x12,0x1b,0x17},
++  {0x0b,0x0e,0x09,0x0d}, {0xad,0xf2,0x8b,0xc7}, {0xb9,0x2d,0xb6,0xa8}, {0xc8,0x14,0x1e,0xa9},
++  {0x85,0x57,0xf1,0x19}, {0x4c,0xaf,0x75,0x07}, {0xbb,0xee,0x99,0xdd}, {0xfd,0xa3,0x7f,0x60},
++  {0x9f,0xf7,0x01,0x26}, {0xbc,0x5c,0x72,0xf5}, {0xc5,0x44,0x66,0x3b}, {0x34,0x5b,0xfb,0x7e},
++  {0x76,0x8b,0x43,0x29}, {0xdc,0xcb,0x23,0xc6}, {0x68,0xb6,0xed,0xfc}, {0x63,0xb8,0xe4,0xf1},
++  {0xca,0xd7,0x31,0xdc}, {0x10,0x42,0x63,0x85}, {0x40,0x13,0x97,0x22}, {0x20,0x84,0xc6,0x11},
++  {0x7d,0x85,0x4a,0x24}, {0xf8,0xd2,0xbb,0x3d}, {0x11,0xae,0xf9,0x32}, {0x6d,0xc7,0x29,0xa1},
++  {0x4b,0x1d,0x9e,0x2f}, {0xf3,0xdc,0xb2,0x30}, {0xec,0x0d,0x86,0x52}, {0xd0,0x77,0xc1,0xe3},
++  {0x6c,0x2b,0xb3,0x16}, {0x99,0xa9,0x70,0xb9}, {0xfa,0x11,0x94,0x48}, {0x22,0x47,0xe9,0x64},
++  {0xc4,0xa8,0xfc,0x8c}, {0x1a,0xa0,0xf0,0x3f}, {0xd8,0x56,0x7d,0x2c}, {0xef,0x22,0x33,0x90},
++  {0xc7,0x87,0x49,0x4e}, {0xc1,0xd9,0x38,0xd1}, {0xfe,0x8c,0xca,0xa2}, {0x36,0x98,0xd4,0x0b},
++  {0xcf,0xa6,0xf5,0x81}, {0x28,0xa5,0x7a,0xde}, {0x26,0xda,0xb7,0x8e}, {0xa4,0x3f,0xad,0xbf},
++  {0xe4,0x2c,0x3a,0x9d}, {0x0d,0x50,0x78,0x92}, {0x9b,0x6a,0x5f,0xcc}, {0x62,0x54,0x7e,0x46},
++  {0xc2,0xf6,0x8d,0x13}, {0xe8,0x90,0xd8,0xb8}, {0x5e,0x2e,0x39,0xf7}, {0xf5,0x82,0xc3,0xaf},
++  {0xbe,0x9f,0x5d,0x80}, {0x7c,0x69,0xd0,0x93}, {0xa9,0x6f,0xd5,0x2d}, {0xb3,0xcf,0x25,0x12},
++  {0x3b,0xc8,0xac,0x99}, {0xa7,0x10,0x18,0x7d}, {0x6e,0xe8,0x9c,0x63}, {0x7b,0xdb,0x3b,0xbb},
++  {0x09,0xcd,0x26,0x78}, {0xf4,0x6e,0x59,0x18}, {0x01,0xec,0x9a,0xb7}, {0xa8,0x83,0x4f,0x9a},
++  {0x65,0xe6,0x95,0x6e}, {0x7e,0xaa,0xff,0xe6}, {0x08,0x21,0xbc,0xcf}, {0xe6,0xef,0x15,0xe8},
++  {0xd9,0xba,0xe7,0x9b}, {0xce,0x4a,0x6f,0x36}, {0xd4,0xea,0x9f,0x09}, {0xd6,0x29,0xb0,0x7c},
++  {0xaf,0x31,0xa4,0xb2}, {0x31,0x2a,0x3f,0x23}, {0x30,0xc6,0xa5,0x94}, {0xc0,0x35,0xa2,0x66},
++  {0x37,0x74,0x4e,0xbc}, {0xa6,0xfc,0x82,0xca}, {0xb0,0xe0,0x90,0xd0}, {0x15,0x33,0xa7,0xd8},
++  {0x4a,0xf1,0x04,0x98}, {0xf7,0x41,0xec,0xda}, {0x0e,0x7f,0xcd,0x50}, {0x2f,0x17,0x91,0xf6},
++  {0x8d,0x76,0x4d,0xd6}, {0x4d,0x43,0xef,0xb0}, {0x54,0xcc,0xaa,0x4d}, {0xdf,0xe4,0x96,0x04},
++  {0xe3,0x9e,0xd1,0xb5}, {0x1b,0x4c,0x6a,0x88}, {0xb8,0xc1,0x2c,0x1f}, {0x7f,0x46,0x65,0x51},
++  {0x04,0x9d,0x5e,0xea}, {0x5d,0x01,0x8c,0x35}, {0x73,0xfa,0x87,0x74}, {0x2e,0xfb,0x0b,0x41},
++  {0x5a,0xb3,0x67,0x1d}, {0x52,0x92,0xdb,0xd2}, {0x33,0xe9,0x10,0x56}, {0x13,0x6d,0xd6,0x47},
++  {0x8c,0x9a,0xd7,0x61}, {0x7a,0x37,0xa1,0x0c}, {0x8e,0x59,0xf8,0x14}, {0x89,0xeb,0x13,0x3c},
++  {0xee,0xce,0xa9,0x27}, {0x35,0xb7,0x61,0xc9}, {0xed,0xe1,0x1c,0xe5}, {0x3c,0x7a,0x47,0xb1},
++  {0x59,0x9c,0xd2,0xdf}, {0x3f,0x55,0xf2,0x73}, {0x79,0x18,0x14,0xce}, {0xbf,0x73,0xc7,0x37},
++  {0xea,0x53,0xf7,0xcd}, {0x5b,0x5f,0xfd,0xaa}, {0x14,0xdf,0x3d,0x6f}, {0x86,0x78,0x44,0xdb},
++  {0x81,0xca,0xaf,0xf3}, {0x3e,0xb9,0x68,0xc4}, {0x2c,0x38,0x24,0x34}, {0x5f,0xc2,0xa3,0x40},
++  {0x72,0x16,0x1d,0xc3}, {0x0c,0xbc,0xe2,0x25}, {0x8b,0x28,0x3c,0x49}, {0x41,0xff,0x0d,0x95},
++  {0x71,0x39,0xa8,0x01}, {0xde,0x08,0x0c,0xb3}, {0x9c,0xd8,0xb4,0xe4}, {0x90,0x64,0x56,0xc1},
++  {0x61,0x7b,0xcb,0x84}, {0x70,0xd5,0x32,0xb6}, {0x74,0x48,0x6c,0x5c}, {0x42,0xd0,0xb8,0x57}
++};
++
++static UINT8 T7[256][4]=
++{
++  {0xa7,0x50,0x51,0xf4}, {0x65,0x53,0x7e,0x41}, {0xa4,0xc3,0x1a,0x17}, {0x5e,0x96,0x3a,0x27},
++  {0x6b,0xcb,0x3b,0xab}, {0x45,0xf1,0x1f,0x9d}, {0x58,0xab,0xac,0xfa}, {0x03,0x93,0x4b,0xe3},
++  {0xfa,0x55,0x20,0x30}, {0x6d,0xf6,0xad,0x76}, {0x76,0x91,0x88,0xcc}, {0x4c,0x25,0xf5,0x02},
++  {0xd7,0xfc,0x4f,0xe5}, {0xcb,0xd7,0xc5,0x2a}, {0x44,0x80,0x26,0x35}, {0xa3,0x8f,0xb5,0x62},
++  {0x5a,0x49,0xde,0xb1}, {0x1b,0x67,0x25,0xba}, {0x0e,0x98,0x45,0xea}, {0xc0,0xe1,0x5d,0xfe},
++  {0x75,0x02,0xc3,0x2f}, {0xf0,0x12,0x81,0x4c}, {0x97,0xa3,0x8d,0x46}, {0xf9,0xc6,0x6b,0xd3},
++  {0x5f,0xe7,0x03,0x8f}, {0x9c,0x95,0x15,0x92}, {0x7a,0xeb,0xbf,0x6d}, {0x59,0xda,0x95,0x52},
++  {0x83,0x2d,0xd4,0xbe}, {0x21,0xd3,0x58,0x74}, {0x69,0x29,0x49,0xe0}, {0xc8,0x44,0x8e,0xc9},
++  {0x89,0x6a,0x75,0xc2}, {0x79,0x78,0xf4,0x8e}, {0x3e,0x6b,0x99,0x58}, {0x71,0xdd,0x27,0xb9},
++  {0x4f,0xb6,0xbe,0xe1}, {0xad,0x17,0xf0,0x88}, {0xac,0x66,0xc9,0x20}, {0x3a,0xb4,0x7d,0xce},
++  {0x4a,0x18,0x63,0xdf}, {0x31,0x82,0xe5,0x1a}, {0x33,0x60,0x97,0x51}, {0x7f,0x45,0x62,0x53},
++  {0x77,0xe0,0xb1,0x64}, {0xae,0x84,0xbb,0x6b}, {0xa0,0x1c,0xfe,0x81}, {0x2b,0x94,0xf9,0x08},
++  {0x68,0x58,0x70,0x48}, {0xfd,0x19,0x8f,0x45}, {0x6c,0x87,0x94,0xde}, {0xf8,0xb7,0x52,0x7b},
++  {0xd3,0x23,0xab,0x73}, {0x02,0xe2,0x72,0x4b}, {0x8f,0x57,0xe3,0x1f}, {0xab,0x2a,0x66,0x55},
++  {0x28,0x07,0xb2,0xeb}, {0xc2,0x03,0x2f,0xb5}, {0x7b,0x9a,0x86,0xc5}, {0x08,0xa5,0xd3,0x37},
++  {0x87,0xf2,0x30,0x28}, {0xa5,0xb2,0x23,0xbf}, {0x6a,0xba,0x02,0x03}, {0x82,0x5c,0xed,0x16},
++  {0x1c,0x2b,0x8a,0xcf}, {0xb4,0x92,0xa7,0x79}, {0xf2,0xf0,0xf3,0x07}, {0xe2,0xa1,0x4e,0x69},
++  {0xf4,0xcd,0x65,0xda}, {0xbe,0xd5,0x06,0x05}, {0x62,0x1f,0xd1,0x34}, {0xfe,0x8a,0xc4,0xa6},
++  {0x53,0x9d,0x34,0x2e}, {0x55,0xa0,0xa2,0xf3}, {0xe1,0x32,0x05,0x8a}, {0xeb,0x75,0xa4,0xf6},
++  {0xec,0x39,0x0b,0x83}, {0xef,0xaa,0x40,0x60}, {0x9f,0x06,0x5e,0x71}, {0x10,0x51,0xbd,0x6e},
++  {0x8a,0xf9,0x3e,0x21}, {0x06,0x3d,0x96,0xdd}, {0x05,0xae,0xdd,0x3e}, {0xbd,0x46,0x4d,0xe6},
++  {0x8d,0xb5,0x91,0x54}, {0x5d,0x05,0x71,0xc4}, {0xd4,0x6f,0x04,0x06}, {0x15,0xff,0x60,0x50},
++  {0xfb,0x24,0x19,0x98}, {0xe9,0x97,0xd6,0xbd}, {0x43,0xcc,0x89,0x40}, {0x9e,0x77,0x67,0xd9},
++  {0x42,0xbd,0xb0,0xe8}, {0x8b,0x88,0x07,0x89}, {0x5b,0x38,0xe7,0x19}, {0xee,0xdb,0x79,0xc8},
++  {0x0a,0x47,0xa1,0x7c}, {0x0f,0xe9,0x7c,0x42}, {0x1e,0xc9,0xf8,0x84}, {0x00,0x00,0x00,0x00},
++  {0x86,0x83,0x09,0x80}, {0xed,0x48,0x32,0x2b}, {0x70,0xac,0x1e,0x11}, {0x72,0x4e,0x6c,0x5a},
++  {0xff,0xfb,0xfd,0x0e}, {0x38,0x56,0x0f,0x85}, {0xd5,0x1e,0x3d,0xae}, {0x39,0x27,0x36,0x2d},
++  {0xd9,0x64,0x0a,0x0f}, {0xa6,0x21,0x68,0x5c}, {0x54,0xd1,0x9b,0x5b}, {0x2e,0x3a,0x24,0x36},
++  {0x67,0xb1,0x0c,0x0a}, {0xe7,0x0f,0x93,0x57}, {0x96,0xd2,0xb4,0xee}, {0x91,0x9e,0x1b,0x9b},
++  {0xc5,0x4f,0x80,0xc0}, {0x20,0xa2,0x61,0xdc}, {0x4b,0x69,0x5a,0x77}, {0x1a,0x16,0x1c,0x12},
++  {0xba,0x0a,0xe2,0x93}, {0x2a,0xe5,0xc0,0xa0}, {0xe0,0x43,0x3c,0x22}, {0x17,0x1d,0x12,0x1b},
++  {0x0d,0x0b,0x0e,0x09}, {0xc7,0xad,0xf2,0x8b}, {0xa8,0xb9,0x2d,0xb6}, {0xa9,0xc8,0x14,0x1e},
++  {0x19,0x85,0x57,0xf1}, {0x07,0x4c,0xaf,0x75}, {0xdd,0xbb,0xee,0x99}, {0x60,0xfd,0xa3,0x7f},
++  {0x26,0x9f,0xf7,0x01}, {0xf5,0xbc,0x5c,0x72}, {0x3b,0xc5,0x44,0x66}, {0x7e,0x34,0x5b,0xfb},
++  {0x29,0x76,0x8b,0x43}, {0xc6,0xdc,0xcb,0x23}, {0xfc,0x68,0xb6,0xed}, {0xf1,0x63,0xb8,0xe4},
++  {0xdc,0xca,0xd7,0x31}, {0x85,0x10,0x42,0x63}, {0x22,0x40,0x13,0x97}, {0x11,0x20,0x84,0xc6},
++  {0x24,0x7d,0x85,0x4a}, {0x3d,0xf8,0xd2,0xbb}, {0x32,0x11,0xae,0xf9}, {0xa1,0x6d,0xc7,0x29},
++  {0x2f,0x4b,0x1d,0x9e}, {0x30,0xf3,0xdc,0xb2}, {0x52,0xec,0x0d,0x86}, {0xe3,0xd0,0x77,0xc1},
++  {0x16,0x6c,0x2b,0xb3}, {0xb9,0x99,0xa9,0x70}, {0x48,0xfa,0x11,0x94}, {0x64,0x22,0x47,0xe9},
++  {0x8c,0xc4,0xa8,0xfc}, {0x3f,0x1a,0xa0,0xf0}, {0x2c,0xd8,0x56,0x7d}, {0x90,0xef,0x22,0x33},
++  {0x4e,0xc7,0x87,0x49}, {0xd1,0xc1,0xd9,0x38}, {0xa2,0xfe,0x8c,0xca}, {0x0b,0x36,0x98,0xd4},
++  {0x81,0xcf,0xa6,0xf5}, {0xde,0x28,0xa5,0x7a}, {0x8e,0x26,0xda,0xb7}, {0xbf,0xa4,0x3f,0xad},
++  {0x9d,0xe4,0x2c,0x3a}, {0x92,0x0d,0x50,0x78}, {0xcc,0x9b,0x6a,0x5f}, {0x46,0x62,0x54,0x7e},
++  {0x13,0xc2,0xf6,0x8d}, {0xb8,0xe8,0x90,0xd8}, {0xf7,0x5e,0x2e,0x39}, {0xaf,0xf5,0x82,0xc3},
++  {0x80,0xbe,0x9f,0x5d}, {0x93,0x7c,0x69,0xd0}, {0x2d,0xa9,0x6f,0xd5}, {0x12,0xb3,0xcf,0x25},
++  {0x99,0x3b,0xc8,0xac}, {0x7d,0xa7,0x10,0x18}, {0x63,0x6e,0xe8,0x9c}, {0xbb,0x7b,0xdb,0x3b},
++  {0x78,0x09,0xcd,0x26}, {0x18,0xf4,0x6e,0x59}, {0xb7,0x01,0xec,0x9a}, {0x9a,0xa8,0x83,0x4f},
++  {0x6e,0x65,0xe6,0x95}, {0xe6,0x7e,0xaa,0xff}, {0xcf,0x08,0x21,0xbc}, {0xe8,0xe6,0xef,0x15},
++  {0x9b,0xd9,0xba,0xe7}, {0x36,0xce,0x4a,0x6f}, {0x09,0xd4,0xea,0x9f}, {0x7c,0xd6,0x29,0xb0},
++  {0xb2,0xaf,0x31,0xa4}, {0x23,0x31,0x2a,0x3f}, {0x94,0x30,0xc6,0xa5}, {0x66,0xc0,0x35,0xa2},
++  {0xbc,0x37,0x74,0x4e}, {0xca,0xa6,0xfc,0x82}, {0xd0,0xb0,0xe0,0x90}, {0xd8,0x15,0x33,0xa7},
++  {0x98,0x4a,0xf1,0x04}, {0xda,0xf7,0x41,0xec}, {0x50,0x0e,0x7f,0xcd}, {0xf6,0x2f,0x17,0x91},
++  {0xd6,0x8d,0x76,0x4d}, {0xb0,0x4d,0x43,0xef}, {0x4d,0x54,0xcc,0xaa}, {0x04,0xdf,0xe4,0x96},
++  {0xb5,0xe3,0x9e,0xd1}, {0x88,0x1b,0x4c,0x6a}, {0x1f,0xb8,0xc1,0x2c}, {0x51,0x7f,0x46,0x65},
++  {0xea,0x04,0x9d,0x5e}, {0x35,0x5d,0x01,0x8c}, {0x74,0x73,0xfa,0x87}, {0x41,0x2e,0xfb,0x0b},
++  {0x1d,0x5a,0xb3,0x67}, {0xd2,0x52,0x92,0xdb}, {0x56,0x33,0xe9,0x10}, {0x47,0x13,0x6d,0xd6},
++  {0x61,0x8c,0x9a,0xd7}, {0x0c,0x7a,0x37,0xa1}, {0x14,0x8e,0x59,0xf8}, {0x3c,0x89,0xeb,0x13},
++  {0x27,0xee,0xce,0xa9}, {0xc9,0x35,0xb7,0x61}, {0xe5,0xed,0xe1,0x1c}, {0xb1,0x3c,0x7a,0x47},
++  {0xdf,0x59,0x9c,0xd2}, {0x73,0x3f,0x55,0xf2}, {0xce,0x79,0x18,0x14}, {0x37,0xbf,0x73,0xc7},
++  {0xcd,0xea,0x53,0xf7}, {0xaa,0x5b,0x5f,0xfd}, {0x6f,0x14,0xdf,0x3d}, {0xdb,0x86,0x78,0x44},
++  {0xf3,0x81,0xca,0xaf}, {0xc4,0x3e,0xb9,0x68}, {0x34,0x2c,0x38,0x24}, {0x40,0x5f,0xc2,0xa3},
++  {0xc3,0x72,0x16,0x1d}, {0x25,0x0c,0xbc,0xe2}, {0x49,0x8b,0x28,0x3c}, {0x95,0x41,0xff,0x0d},
++  {0x01,0x71,0x39,0xa8}, {0xb3,0xde,0x08,0x0c}, {0xe4,0x9c,0xd8,0xb4}, {0xc1,0x90,0x64,0x56},
++  {0x84,0x61,0x7b,0xcb}, {0xb6,0x70,0xd5,0x32}, {0x5c,0x74,0x48,0x6c}, {0x57,0x42,0xd0,0xb8}
++};
++
++static UINT8 T8[256][4]=
++{
++  {0xf4,0xa7,0x50,0x51}, {0x41,0x65,0x53,0x7e}, {0x17,0xa4,0xc3,0x1a}, {0x27,0x5e,0x96,0x3a},
++  {0xab,0x6b,0xcb,0x3b}, {0x9d,0x45,0xf1,0x1f}, {0xfa,0x58,0xab,0xac}, {0xe3,0x03,0x93,0x4b},
++  {0x30,0xfa,0x55,0x20}, {0x76,0x6d,0xf6,0xad}, {0xcc,0x76,0x91,0x88}, {0x02,0x4c,0x25,0xf5},
++  {0xe5,0xd7,0xfc,0x4f}, {0x2a,0xcb,0xd7,0xc5}, {0x35,0x44,0x80,0x26}, {0x62,0xa3,0x8f,0xb5},
++  {0xb1,0x5a,0x49,0xde}, {0xba,0x1b,0x67,0x25}, {0xea,0x0e,0x98,0x45}, {0xfe,0xc0,0xe1,0x5d},
++  {0x2f,0x75,0x02,0xc3}, {0x4c,0xf0,0x12,0x81}, {0x46,0x97,0xa3,0x8d}, {0xd3,0xf9,0xc6,0x6b},
++  {0x8f,0x5f,0xe7,0x03}, {0x92,0x9c,0x95,0x15}, {0x6d,0x7a,0xeb,0xbf}, {0x52,0x59,0xda,0x95},
++  {0xbe,0x83,0x2d,0xd4}, {0x74,0x21,0xd3,0x58}, {0xe0,0x69,0x29,0x49}, {0xc9,0xc8,0x44,0x8e},
++  {0xc2,0x89,0x6a,0x75}, {0x8e,0x79,0x78,0xf4}, {0x58,0x3e,0x6b,0x99}, {0xb9,0x71,0xdd,0x27},
++  {0xe1,0x4f,0xb6,0xbe}, {0x88,0xad,0x17,0xf0}, {0x20,0xac,0x66,0xc9}, {0xce,0x3a,0xb4,0x7d},
++  {0xdf,0x4a,0x18,0x63}, {0x1a,0x31,0x82,0xe5}, {0x51,0x33,0x60,0x97}, {0x53,0x7f,0x45,0x62},
++  {0x64,0x77,0xe0,0xb1}, {0x6b,0xae,0x84,0xbb}, {0x81,0xa0,0x1c,0xfe}, {0x08,0x2b,0x94,0xf9},
++  {0x48,0x68,0x58,0x70}, {0x45,0xfd,0x19,0x8f}, {0xde,0x6c,0x87,0x94}, {0x7b,0xf8,0xb7,0x52},
++  {0x73,0xd3,0x23,0xab}, {0x4b,0x02,0xe2,0x72}, {0x1f,0x8f,0x57,0xe3}, {0x55,0xab,0x2a,0x66},
++  {0xeb,0x28,0x07,0xb2}, {0xb5,0xc2,0x03,0x2f}, {0xc5,0x7b,0x9a,0x86}, {0x37,0x08,0xa5,0xd3},
++  {0x28,0x87,0xf2,0x30}, {0xbf,0xa5,0xb2,0x23}, {0x03,0x6a,0xba,0x02}, {0x16,0x82,0x5c,0xed},
++  {0xcf,0x1c,0x2b,0x8a}, {0x79,0xb4,0x92,0xa7}, {0x07,0xf2,0xf0,0xf3}, {0x69,0xe2,0xa1,0x4e},
++  {0xda,0xf4,0xcd,0x65}, {0x05,0xbe,0xd5,0x06}, {0x34,0x62,0x1f,0xd1}, {0xa6,0xfe,0x8a,0xc4},
++  {0x2e,0x53,0x9d,0x34}, {0xf3,0x55,0xa0,0xa2}, {0x8a,0xe1,0x32,0x05}, {0xf6,0xeb,0x75,0xa4},
++  {0x83,0xec,0x39,0x0b}, {0x60,0xef,0xaa,0x40}, {0x71,0x9f,0x06,0x5e}, {0x6e,0x10,0x51,0xbd},
++  {0x21,0x8a,0xf9,0x3e}, {0xdd,0x06,0x3d,0x96}, {0x3e,0x05,0xae,0xdd}, {0xe6,0xbd,0x46,0x4d},
++  {0x54,0x8d,0xb5,0x91}, {0xc4,0x5d,0x05,0x71}, {0x06,0xd4,0x6f,0x04}, {0x50,0x15,0xff,0x60},
++  {0x98,0xfb,0x24,0x19}, {0xbd,0xe9,0x97,0xd6}, {0x40,0x43,0xcc,0x89}, {0xd9,0x9e,0x77,0x67},
++  {0xe8,0x42,0xbd,0xb0}, {0x89,0x8b,0x88,0x07}, {0x19,0x5b,0x38,0xe7}, {0xc8,0xee,0xdb,0x79},
++  {0x7c,0x0a,0x47,0xa1}, {0x42,0x0f,0xe9,0x7c}, {0x84,0x1e,0xc9,0xf8}, {0x00,0x00,0x00,0x00},
++  {0x80,0x86,0x83,0x09}, {0x2b,0xed,0x48,0x32}, {0x11,0x70,0xac,0x1e}, {0x5a,0x72,0x4e,0x6c},
++  {0x0e,0xff,0xfb,0xfd}, {0x85,0x38,0x56,0x0f}, {0xae,0xd5,0x1e,0x3d}, {0x2d,0x39,0x27,0x36},
++  {0x0f,0xd9,0x64,0x0a}, {0x5c,0xa6,0x21,0x68}, {0x5b,0x54,0xd1,0x9b}, {0x36,0x2e,0x3a,0x24},
++  {0x0a,0x67,0xb1,0x0c}, {0x57,0xe7,0x0f,0x93}, {0xee,0x96,0xd2,0xb4}, {0x9b,0x91,0x9e,0x1b},
++  {0xc0,0xc5,0x4f,0x80}, {0xdc,0x20,0xa2,0x61}, {0x77,0x4b,0x69,0x5a}, {0x12,0x1a,0x16,0x1c},
++  {0x93,0xba,0x0a,0xe2}, {0xa0,0x2a,0xe5,0xc0}, {0x22,0xe0,0x43,0x3c}, {0x1b,0x17,0x1d,0x12},
++  {0x09,0x0d,0x0b,0x0e}, {0x8b,0xc7,0xad,0xf2}, {0xb6,0xa8,0xb9,0x2d}, {0x1e,0xa9,0xc8,0x14},
++  {0xf1,0x19,0x85,0x57}, {0x75,0x07,0x4c,0xaf}, {0x99,0xdd,0xbb,0xee}, {0x7f,0x60,0xfd,0xa3},
++  {0x01,0x26,0x9f,0xf7}, {0x72,0xf5,0xbc,0x5c}, {0x66,0x3b,0xc5,0x44}, {0xfb,0x7e,0x34,0x5b},
++  {0x43,0x29,0x76,0x8b}, {0x23,0xc6,0xdc,0xcb}, {0xed,0xfc,0x68,0xb6}, {0xe4,0xf1,0x63,0xb8},
++  {0x31,0xdc,0xca,0xd7}, {0x63,0x85,0x10,0x42}, {0x97,0x22,0x40,0x13}, {0xc6,0x11,0x20,0x84},
++  {0x4a,0x24,0x7d,0x85}, {0xbb,0x3d,0xf8,0xd2}, {0xf9,0x32,0x11,0xae}, {0x29,0xa1,0x6d,0xc7},
++  {0x9e,0x2f,0x4b,0x1d}, {0xb2,0x30,0xf3,0xdc}, {0x86,0x52,0xec,0x0d}, {0xc1,0xe3,0xd0,0x77},
++  {0xb3,0x16,0x6c,0x2b}, {0x70,0xb9,0x99,0xa9}, {0x94,0x48,0xfa,0x11}, {0xe9,0x64,0x22,0x47},
++  {0xfc,0x8c,0xc4,0xa8}, {0xf0,0x3f,0x1a,0xa0}, {0x7d,0x2c,0xd8,0x56}, {0x33,0x90,0xef,0x22},
++  {0x49,0x4e,0xc7,0x87}, {0x38,0xd1,0xc1,0xd9}, {0xca,0xa2,0xfe,0x8c}, {0xd4,0x0b,0x36,0x98},
++  {0xf5,0x81,0xcf,0xa6}, {0x7a,0xde,0x28,0xa5}, {0xb7,0x8e,0x26,0xda}, {0xad,0xbf,0xa4,0x3f},
++  {0x3a,0x9d,0xe4,0x2c}, {0x78,0x92,0x0d,0x50}, {0x5f,0xcc,0x9b,0x6a}, {0x7e,0x46,0x62,0x54},
++  {0x8d,0x13,0xc2,0xf6}, {0xd8,0xb8,0xe8,0x90}, {0x39,0xf7,0x5e,0x2e}, {0xc3,0xaf,0xf5,0x82},
++  {0x5d,0x80,0xbe,0x9f}, {0xd0,0x93,0x7c,0x69}, {0xd5,0x2d,0xa9,0x6f}, {0x25,0x12,0xb3,0xcf},
++  {0xac,0x99,0x3b,0xc8}, {0x18,0x7d,0xa7,0x10}, {0x9c,0x63,0x6e,0xe8}, {0x3b,0xbb,0x7b,0xdb},
++  {0x26,0x78,0x09,0xcd}, {0x59,0x18,0xf4,0x6e}, {0x9a,0xb7,0x01,0xec}, {0x4f,0x9a,0xa8,0x83},
++  {0x95,0x6e,0x65,0xe6}, {0xff,0xe6,0x7e,0xaa}, {0xbc,0xcf,0x08,0x21}, {0x15,0xe8,0xe6,0xef},
++  {0xe7,0x9b,0xd9,0xba}, {0x6f,0x36,0xce,0x4a}, {0x9f,0x09,0xd4,0xea}, {0xb0,0x7c,0xd6,0x29},
++  {0xa4,0xb2,0xaf,0x31}, {0x3f,0x23,0x31,0x2a}, {0xa5,0x94,0x30,0xc6}, {0xa2,0x66,0xc0,0x35},
++  {0x4e,0xbc,0x37,0x74}, {0x82,0xca,0xa6,0xfc}, {0x90,0xd0,0xb0,0xe0}, {0xa7,0xd8,0x15,0x33},
++  {0x04,0x98,0x4a,0xf1}, {0xec,0xda,0xf7,0x41}, {0xcd,0x50,0x0e,0x7f}, {0x91,0xf6,0x2f,0x17},
++  {0x4d,0xd6,0x8d,0x76}, {0xef,0xb0,0x4d,0x43}, {0xaa,0x4d,0x54,0xcc}, {0x96,0x04,0xdf,0xe4},
++  {0xd1,0xb5,0xe3,0x9e}, {0x6a,0x88,0x1b,0x4c}, {0x2c,0x1f,0xb8,0xc1}, {0x65,0x51,0x7f,0x46},
++  {0x5e,0xea,0x04,0x9d}, {0x8c,0x35,0x5d,0x01}, {0x87,0x74,0x73,0xfa}, {0x0b,0x41,0x2e,0xfb},
++  {0x67,0x1d,0x5a,0xb3}, {0xdb,0xd2,0x52,0x92}, {0x10,0x56,0x33,0xe9}, {0xd6,0x47,0x13,0x6d},
++  {0xd7,0x61,0x8c,0x9a}, {0xa1,0x0c,0x7a,0x37}, {0xf8,0x14,0x8e,0x59}, {0x13,0x3c,0x89,0xeb},
++  {0xa9,0x27,0xee,0xce}, {0x61,0xc9,0x35,0xb7}, {0x1c,0xe5,0xed,0xe1}, {0x47,0xb1,0x3c,0x7a},
++  {0xd2,0xdf,0x59,0x9c}, {0xf2,0x73,0x3f,0x55}, {0x14,0xce,0x79,0x18}, {0xc7,0x37,0xbf,0x73},
++  {0xf7,0xcd,0xea,0x53}, {0xfd,0xaa,0x5b,0x5f}, {0x3d,0x6f,0x14,0xdf}, {0x44,0xdb,0x86,0x78},
++  {0xaf,0xf3,0x81,0xca}, {0x68,0xc4,0x3e,0xb9}, {0x24,0x34,0x2c,0x38}, {0xa3,0x40,0x5f,0xc2},
++  {0x1d,0xc3,0x72,0x16}, {0xe2,0x25,0x0c,0xbc}, {0x3c,0x49,0x8b,0x28}, {0x0d,0x95,0x41,0xff},
++  {0xa8,0x01,0x71,0x39}, {0x0c,0xb3,0xde,0x08}, {0xb4,0xe4,0x9c,0xd8}, {0x56,0xc1,0x90,0x64},
++  {0xcb,0x84,0x61,0x7b}, {0x32,0xb6,0x70,0xd5}, {0x6c,0x5c,0x74,0x48}, {0xb8,0x57,0x42,0xd0}
++};
++
++static UINT8 S5[256]=
++{
++  0x52,0x09,0x6a,0xd5,
++  0x30,0x36,0xa5,0x38,
++  0xbf,0x40,0xa3,0x9e,
++  0x81,0xf3,0xd7,0xfb,
++  0x7c,0xe3,0x39,0x82,
++  0x9b,0x2f,0xff,0x87,
++  0x34,0x8e,0x43,0x44,
++  0xc4,0xde,0xe9,0xcb,
++  0x54,0x7b,0x94,0x32,
++  0xa6,0xc2,0x23,0x3d,
++  0xee,0x4c,0x95,0x0b,
++  0x42,0xfa,0xc3,0x4e,
++  0x08,0x2e,0xa1,0x66,
++  0x28,0xd9,0x24,0xb2,
++  0x76,0x5b,0xa2,0x49,
++  0x6d,0x8b,0xd1,0x25,
++  0x72,0xf8,0xf6,0x64,
++  0x86,0x68,0x98,0x16,
++  0xd4,0xa4,0x5c,0xcc,
++  0x5d,0x65,0xb6,0x92,
++  0x6c,0x70,0x48,0x50,
++  0xfd,0xed,0xb9,0xda,
++  0x5e,0x15,0x46,0x57,
++  0xa7,0x8d,0x9d,0x84,
++  0x90,0xd8,0xab,0x00,
++  0x8c,0xbc,0xd3,0x0a,
++  0xf7,0xe4,0x58,0x05,
++  0xb8,0xb3,0x45,0x06,
++  0xd0,0x2c,0x1e,0x8f,
++  0xca,0x3f,0x0f,0x02,
++  0xc1,0xaf,0xbd,0x03,
++  0x01,0x13,0x8a,0x6b,
++  0x3a,0x91,0x11,0x41,
++  0x4f,0x67,0xdc,0xea,
++  0x97,0xf2,0xcf,0xce,
++  0xf0,0xb4,0xe6,0x73,
++  0x96,0xac,0x74,0x22,
++  0xe7,0xad,0x35,0x85,
++  0xe2,0xf9,0x37,0xe8,
++  0x1c,0x75,0xdf,0x6e,
++  0x47,0xf1,0x1a,0x71,
++  0x1d,0x29,0xc5,0x89,
++  0x6f,0xb7,0x62,0x0e,
++  0xaa,0x18,0xbe,0x1b,
++  0xfc,0x56,0x3e,0x4b,
++  0xc6,0xd2,0x79,0x20,
++  0x9a,0xdb,0xc0,0xfe,
++  0x78,0xcd,0x5a,0xf4,
++  0x1f,0xdd,0xa8,0x33,
++  0x88,0x07,0xc7,0x31,
++  0xb1,0x12,0x10,0x59,
++  0x27,0x80,0xec,0x5f,
++  0x60,0x51,0x7f,0xa9,
++  0x19,0xb5,0x4a,0x0d,
++  0x2d,0xe5,0x7a,0x9f,
++  0x93,0xc9,0x9c,0xef,
++  0xa0,0xe0,0x3b,0x4d,
++  0xae,0x2a,0xf5,0xb0,
++  0xc8,0xeb,0xbb,0x3c,
++  0x83,0x53,0x99,0x61,
++  0x17,0x2b,0x04,0x7e,
++  0xba,0x77,0xd6,0x26,
++  0xe1,0x69,0x14,0x63,
++  0x55,0x21,0x0c,0x7d
++};
++
++static UINT8 U1[256][4]=
++{
++  {0x00,0x00,0x00,0x00}, {0x0e,0x09,0x0d,0x0b}, {0x1c,0x12,0x1a,0x16}, {0x12,0x1b,0x17,0x1d},
++  {0x38,0x24,0x34,0x2c}, {0x36,0x2d,0x39,0x27}, {0x24,0x36,0x2e,0x3a}, {0x2a,0x3f,0x23,0x31},
++  {0x70,0x48,0x68,0x58}, {0x7e,0x41,0x65,0x53}, {0x6c,0x5a,0x72,0x4e}, {0x62,0x53,0x7f,0x45},
++  {0x48,0x6c,0x5c,0x74}, {0x46,0x65,0x51,0x7f}, {0x54,0x7e,0x46,0x62}, {0x5a,0x77,0x4b,0x69},
++  {0xe0,0x90,0xd0,0xb0}, {0xee,0x99,0xdd,0xbb}, {0xfc,0x82,0xca,0xa6}, {0xf2,0x8b,0xc7,0xad},
++  {0xd8,0xb4,0xe4,0x9c}, {0xd6,0xbd,0xe9,0x97}, {0xc4,0xa6,0xfe,0x8a}, {0xca,0xaf,0xf3,0x81},
++  {0x90,0xd8,0xb8,0xe8}, {0x9e,0xd1,0xb5,0xe3}, {0x8c,0xca,0xa2,0xfe}, {0x82,0xc3,0xaf,0xf5},
++  {0xa8,0xfc,0x8c,0xc4}, {0xa6,0xf5,0x81,0xcf}, {0xb4,0xee,0x96,0xd2}, {0xba,0xe7,0x9b,0xd9},
++  {0xdb,0x3b,0xbb,0x7b}, {0xd5,0x32,0xb6,0x70}, {0xc7,0x29,0xa1,0x6d}, {0xc9,0x20,0xac,0x66},
++  {0xe3,0x1f,0x8f,0x57}, {0xed,0x16,0x82,0x5c}, {0xff,0x0d,0x95,0x41}, {0xf1,0x04,0x98,0x4a},
++  {0xab,0x73,0xd3,0x23}, {0xa5,0x7a,0xde,0x28}, {0xb7,0x61,0xc9,0x35}, {0xb9,0x68,0xc4,0x3e},
++  {0x93,0x57,0xe7,0x0f}, {0x9d,0x5e,0xea,0x04}, {0x8f,0x45,0xfd,0x19}, {0x81,0x4c,0xf0,0x12},
++  {0x3b,0xab,0x6b,0xcb}, {0x35,0xa2,0x66,0xc0}, {0x27,0xb9,0x71,0xdd}, {0x29,0xb0,0x7c,0xd6},
++  {0x03,0x8f,0x5f,0xe7}, {0x0d,0x86,0x52,0xec}, {0x1f,0x9d,0x45,0xf1}, {0x11,0x94,0x48,0xfa},
++  {0x4b,0xe3,0x03,0x93}, {0x45,0xea,0x0e,0x98}, {0x57,0xf1,0x19,0x85}, {0x59,0xf8,0x14,0x8e},
++  {0x73,0xc7,0x37,0xbf}, {0x7d,0xce,0x3a,0xb4}, {0x6f,0xd5,0x2d,0xa9}, {0x61,0xdc,0x20,0xa2},
++  {0xad,0x76,0x6d,0xf6}, {0xa3,0x7f,0x60,0xfd}, {0xb1,0x64,0x77,0xe0}, {0xbf,0x6d,0x7a,0xeb},
++  {0x95,0x52,0x59,0xda}, {0x9b,0x5b,0x54,0xd1}, {0x89,0x40,0x43,0xcc}, {0x87,0x49,0x4e,0xc7},
++  {0xdd,0x3e,0x05,0xae}, {0xd3,0x37,0x08,0xa5}, {0xc1,0x2c,0x1f,0xb8}, {0xcf,0x25,0x12,0xb3},
++  {0xe5,0x1a,0x31,0x82}, {0xeb,0x13,0x3c,0x89}, {0xf9,0x08,0x2b,0x94}, {0xf7,0x01,0x26,0x9f},
++  {0x4d,0xe6,0xbd,0x46}, {0x43,0xef,0xb0,0x4d}, {0x51,0xf4,0xa7,0x50}, {0x5f,0xfd,0xaa,0x5b},
++  {0x75,0xc2,0x89,0x6a}, {0x7b,0xcb,0x84,0x61}, {0x69,0xd0,0x93,0x7c}, {0x67,0xd9,0x9e,0x77},
++  {0x3d,0xae,0xd5,0x1e}, {0x33,0xa7,0xd8,0x15}, {0x21,0xbc,0xcf,0x08}, {0x2f,0xb5,0xc2,0x03},
++  {0x05,0x8a,0xe1,0x32}, {0x0b,0x83,0xec,0x39}, {0x19,0x98,0xfb,0x24}, {0x17,0x91,0xf6,0x2f},
++  {0x76,0x4d,0xd6,0x8d}, {0x78,0x44,0xdb,0x86}, {0x6a,0x5f,0xcc,0x9b}, {0x64,0x56,0xc1,0x90},
++  {0x4e,0x69,0xe2,0xa1}, {0x40,0x60,0xef,0xaa}, {0x52,0x7b,0xf8,0xb7}, {0x5c,0x72,0xf5,0xbc},
++  {0x06,0x05,0xbe,0xd5}, {0x08,0x0c,0xb3,0xde}, {0x1a,0x17,0xa4,0xc3}, {0x14,0x1e,0xa9,0xc8},
++  {0x3e,0x21,0x8a,0xf9}, {0x30,0x28,0x87,0xf2}, {0x22,0x33,0x90,0xef}, {0x2c,0x3a,0x9d,0xe4},
++  {0x96,0xdd,0x06,0x3d}, {0x98,0xd4,0x0b,0x36}, {0x8a,0xcf,0x1c,0x2b}, {0x84,0xc6,0x11,0x20},
++  {0xae,0xf9,0x32,0x11}, {0xa0,0xf0,0x3f,0x1a}, {0xb2,0xeb,0x28,0x07}, {0xbc,0xe2,0x25,0x0c},
++  {0xe6,0x95,0x6e,0x65}, {0xe8,0x9c,0x63,0x6e}, {0xfa,0x87,0x74,0x73}, {0xf4,0x8e,0x79,0x78},
++  {0xde,0xb1,0x5a,0x49}, {0xd0,0xb8,0x57,0x42}, {0xc2,0xa3,0x40,0x5f}, {0xcc,0xaa,0x4d,0x54},
++  {0x41,0xec,0xda,0xf7}, {0x4f,0xe5,0xd7,0xfc}, {0x5d,0xfe,0xc0,0xe1}, {0x53,0xf7,0xcd,0xea},
++  {0x79,0xc8,0xee,0xdb}, {0x77,0xc1,0xe3,0xd0}, {0x65,0xda,0xf4,0xcd}, {0x6b,0xd3,0xf9,0xc6},
++  {0x31,0xa4,0xb2,0xaf}, {0x3f,0xad,0xbf,0xa4}, {0x2d,0xb6,0xa8,0xb9}, {0x23,0xbf,0xa5,0xb2},
++  {0x09,0x80,0x86,0x83}, {0x07,0x89,0x8b,0x88}, {0x15,0x92,0x9c,0x95}, {0x1b,0x9b,0x91,0x9e},
++  {0xa1,0x7c,0x0a,0x47}, {0xaf,0x75,0x07,0x4c}, {0xbd,0x6e,0x10,0x51}, {0xb3,0x67,0x1d,0x5a},
++  {0x99,0x58,0x3e,0x6b}, {0x97,0x51,0x33,0x60}, {0x85,0x4a,0x24,0x7d}, {0x8b,0x43,0x29,0x76},
++  {0xd1,0x34,0x62,0x1f}, {0xdf,0x3d,0x6f,0x14}, {0xcd,0x26,0x78,0x09}, {0xc3,0x2f,0x75,0x02},
++  {0xe9,0x10,0x56,0x33}, {0xe7,0x19,0x5b,0x38}, {0xf5,0x02,0x4c,0x25}, {0xfb,0x0b,0x41,0x2e},
++  {0x9a,0xd7,0x61,0x8c}, {0x94,0xde,0x6c,0x87}, {0x86,0xc5,0x7b,0x9a}, {0x88,0xcc,0x76,0x91},
++  {0xa2,0xf3,0x55,0xa0}, {0xac,0xfa,0x58,0xab}, {0xbe,0xe1,0x4f,0xb6}, {0xb0,0xe8,0x42,0xbd},
++  {0xea,0x9f,0x09,0xd4}, {0xe4,0x96,0x04,0xdf}, {0xf6,0x8d,0x13,0xc2}, {0xf8,0x84,0x1e,0xc9},
++  {0xd2,0xbb,0x3d,0xf8}, {0xdc,0xb2,0x30,0xf3}, {0xce,0xa9,0x27,0xee}, {0xc0,0xa0,0x2a,0xe5},
++  {0x7a,0x47,0xb1,0x3c}, {0x74,0x4e,0xbc,0x37}, {0x66,0x55,0xab,0x2a}, {0x68,0x5c,0xa6,0x21},
++  {0x42,0x63,0x85,0x10}, {0x4c,0x6a,0x88,0x1b}, {0x5e,0x71,0x9f,0x06}, {0x50,0x78,0x92,0x0d},
++  {0x0a,0x0f,0xd9,0x64}, {0x04,0x06,0xd4,0x6f}, {0x16,0x1d,0xc3,0x72}, {0x18,0x14,0xce,0x79},
++  {0x32,0x2b,0xed,0x48}, {0x3c,0x22,0xe0,0x43}, {0x2e,0x39,0xf7,0x5e}, {0x20,0x30,0xfa,0x55},
++  {0xec,0x9a,0xb7,0x01}, {0xe2,0x93,0xba,0x0a}, {0xf0,0x88,0xad,0x17}, {0xfe,0x81,0xa0,0x1c},
++  {0xd4,0xbe,0x83,0x2d}, {0xda,0xb7,0x8e,0x26}, {0xc8,0xac,0x99,0x3b}, {0xc6,0xa5,0x94,0x30},
++  {0x9c,0xd2,0xdf,0x59}, {0x92,0xdb,0xd2,0x52}, {0x80,0xc0,0xc5,0x4f}, {0x8e,0xc9,0xc8,0x44},
++  {0xa4,0xf6,0xeb,0x75}, {0xaa,0xff,0xe6,0x7e}, {0xb8,0xe4,0xf1,0x63}, {0xb6,0xed,0xfc,0x68},
++  {0x0c,0x0a,0x67,0xb1}, {0x02,0x03,0x6a,0xba}, {0x10,0x18,0x7d,0xa7}, {0x1e,0x11,0x70,0xac},
++  {0x34,0x2e,0x53,0x9d}, {0x3a,0x27,0x5e,0x96}, {0x28,0x3c,0x49,0x8b}, {0x26,0x35,0x44,0x80},
++  {0x7c,0x42,0x0f,0xe9}, {0x72,0x4b,0x02,0xe2}, {0x60,0x50,0x15,0xff}, {0x6e,0x59,0x18,0xf4},
++  {0x44,0x66,0x3b,0xc5}, {0x4a,0x6f,0x36,0xce}, {0x58,0x74,0x21,0xd3}, {0x56,0x7d,0x2c,0xd8},
++  {0x37,0xa1,0x0c,0x7a}, {0x39,0xa8,0x01,0x71}, {0x2b,0xb3,0x16,0x6c}, {0x25,0xba,0x1b,0x67},
++  {0x0f,0x85,0x38,0x56}, {0x01,0x8c,0x35,0x5d}, {0x13,0x97,0x22,0x40}, {0x1d,0x9e,0x2f,0x4b},
++  {0x47,0xe9,0x64,0x22}, {0x49,0xe0,0x69,0x29}, {0x5b,0xfb,0x7e,0x34}, {0x55,0xf2,0x73,0x3f},
++  {0x7f,0xcd,0x50,0x0e}, {0x71,0xc4,0x5d,0x05}, {0x63,0xdf,0x4a,0x18}, {0x6d,0xd6,0x47,0x13},
++  {0xd7,0x31,0xdc,0xca}, {0xd9,0x38,0xd1,0xc1}, {0xcb,0x23,0xc6,0xdc}, {0xc5,0x2a,0xcb,0xd7},
++  {0xef,0x15,0xe8,0xe6}, {0xe1,0x1c,0xe5,0xed}, {0xf3,0x07,0xf2,0xf0}, {0xfd,0x0e,0xff,0xfb},
++  {0xa7,0x79,0xb4,0x92}, {0xa9,0x70,0xb9,0x99}, {0xbb,0x6b,0xae,0x84}, {0xb5,0x62,0xa3,0x8f},
++  {0x9f,0x5d,0x80,0xbe}, {0x91,0x54,0x8d,0xb5}, {0x83,0x4f,0x9a,0xa8}, {0x8d,0x46,0x97,0xa3}
++};
++  
++static UINT8 U2[256][4]=
++{
++  {0x00,0x00,0x00,0x00}, {0x0b,0x0e,0x09,0x0d}, {0x16,0x1c,0x12,0x1a}, {0x1d,0x12,0x1b,0x17},
++  {0x2c,0x38,0x24,0x34}, {0x27,0x36,0x2d,0x39}, {0x3a,0x24,0x36,0x2e}, {0x31,0x2a,0x3f,0x23},
++  {0x58,0x70,0x48,0x68}, {0x53,0x7e,0x41,0x65}, {0x4e,0x6c,0x5a,0x72}, {0x45,0x62,0x53,0x7f},
++  {0x74,0x48,0x6c,0x5c}, {0x7f,0x46,0x65,0x51}, {0x62,0x54,0x7e,0x46}, {0x69,0x5a,0x77,0x4b},
++  {0xb0,0xe0,0x90,0xd0}, {0xbb,0xee,0x99,0xdd}, {0xa6,0xfc,0x82,0xca}, {0xad,0xf2,0x8b,0xc7},
++  {0x9c,0xd8,0xb4,0xe4}, {0x97,0xd6,0xbd,0xe9}, {0x8a,0xc4,0xa6,0xfe}, {0x81,0xca,0xaf,0xf3},
++  {0xe8,0x90,0xd8,0xb8}, {0xe3,0x9e,0xd1,0xb5}, {0xfe,0x8c,0xca,0xa2}, {0xf5,0x82,0xc3,0xaf},
++  {0xc4,0xa8,0xfc,0x8c}, {0xcf,0xa6,0xf5,0x81}, {0xd2,0xb4,0xee,0x96}, {0xd9,0xba,0xe7,0x9b},
++  {0x7b,0xdb,0x3b,0xbb}, {0x70,0xd5,0x32,0xb6}, {0x6d,0xc7,0x29,0xa1}, {0x66,0xc9,0x20,0xac},
++  {0x57,0xe3,0x1f,0x8f}, {0x5c,0xed,0x16,0x82}, {0x41,0xff,0x0d,0x95}, {0x4a,0xf1,0x04,0x98},
++  {0x23,0xab,0x73,0xd3}, {0x28,0xa5,0x7a,0xde}, {0x35,0xb7,0x61,0xc9}, {0x3e,0xb9,0x68,0xc4},
++  {0x0f,0x93,0x57,0xe7}, {0x04,0x9d,0x5e,0xea}, {0x19,0x8f,0x45,0xfd}, {0x12,0x81,0x4c,0xf0},
++  {0xcb,0x3b,0xab,0x6b}, {0xc0,0x35,0xa2,0x66}, {0xdd,0x27,0xb9,0x71}, {0xd6,0x29,0xb0,0x7c},
++  {0xe7,0x03,0x8f,0x5f}, {0xec,0x0d,0x86,0x52}, {0xf1,0x1f,0x9d,0x45}, {0xfa,0x11,0x94,0x48},
++  {0x93,0x4b,0xe3,0x03}, {0x98,0x45,0xea,0x0e}, {0x85,0x57,0xf1,0x19}, {0x8e,0x59,0xf8,0x14},
++  {0xbf,0x73,0xc7,0x37}, {0xb4,0x7d,0xce,0x3a}, {0xa9,0x6f,0xd5,0x2d}, {0xa2,0x61,0xdc,0x20},
++  {0xf6,0xad,0x76,0x6d}, {0xfd,0xa3,0x7f,0x60}, {0xe0,0xb1,0x64,0x77}, {0xeb,0xbf,0x6d,0x7a},
++  {0xda,0x95,0x52,0x59}, {0xd1,0x9b,0x5b,0x54}, {0xcc,0x89,0x40,0x43}, {0xc7,0x87,0x49,0x4e},
++  {0xae,0xdd,0x3e,0x05}, {0xa5,0xd3,0x37,0x08}, {0xb8,0xc1,0x2c,0x1f}, {0xb3,0xcf,0x25,0x12},
++  {0x82,0xe5,0x1a,0x31}, {0x89,0xeb,0x13,0x3c}, {0x94,0xf9,0x08,0x2b}, {0x9f,0xf7,0x01,0x26},
++  {0x46,0x4d,0xe6,0xbd}, {0x4d,0x43,0xef,0xb0}, {0x50,0x51,0xf4,0xa7}, {0x5b,0x5f,0xfd,0xaa},
++  {0x6a,0x75,0xc2,0x89}, {0x61,0x7b,0xcb,0x84}, {0x7c,0x69,0xd0,0x93}, {0x77,0x67,0xd9,0x9e},
++  {0x1e,0x3d,0xae,0xd5}, {0x15,0x33,0xa7,0xd8}, {0x08,0x21,0xbc,0xcf}, {0x03,0x2f,0xb5,0xc2},
++  {0x32,0x05,0x8a,0xe1}, {0x39,0x0b,0x83,0xec}, {0x24,0x19,0x98,0xfb}, {0x2f,0x17,0x91,0xf6},
++  {0x8d,0x76,0x4d,0xd6}, {0x86,0x78,0x44,0xdb}, {0x9b,0x6a,0x5f,0xcc}, {0x90,0x64,0x56,0xc1},
++  {0xa1,0x4e,0x69,0xe2}, {0xaa,0x40,0x60,0xef}, {0xb7,0x52,0x7b,0xf8}, {0xbc,0x5c,0x72,0xf5},
++  {0xd5,0x06,0x05,0xbe}, {0xde,0x08,0x0c,0xb3}, {0xc3,0x1a,0x17,0xa4}, {0xc8,0x14,0x1e,0xa9},
++  {0xf9,0x3e,0x21,0x8a}, {0xf2,0x30,0x28,0x87}, {0xef,0x22,0x33,0x90}, {0xe4,0x2c,0x3a,0x9d},
++  {0x3d,0x96,0xdd,0x06}, {0x36,0x98,0xd4,0x0b}, {0x2b,0x8a,0xcf,0x1c}, {0x20,0x84,0xc6,0x11},
++  {0x11,0xae,0xf9,0x32}, {0x1a,0xa0,0xf0,0x3f}, {0x07,0xb2,0xeb,0x28}, {0x0c,0xbc,0xe2,0x25},
++  {0x65,0xe6,0x95,0x6e}, {0x6e,0xe8,0x9c,0x63}, {0x73,0xfa,0x87,0x74}, {0x78,0xf4,0x8e,0x79},
++  {0x49,0xde,0xb1,0x5a}, {0x42,0xd0,0xb8,0x57}, {0x5f,0xc2,0xa3,0x40}, {0x54,0xcc,0xaa,0x4d},
++  {0xf7,0x41,0xec,0xda}, {0xfc,0x4f,0xe5,0xd7}, {0xe1,0x5d,0xfe,0xc0}, {0xea,0x53,0xf7,0xcd},
++  {0xdb,0x79,0xc8,0xee}, {0xd0,0x77,0xc1,0xe3}, {0xcd,0x65,0xda,0xf4}, {0xc6,0x6b,0xd3,0xf9},
++  {0xaf,0x31,0xa4,0xb2}, {0xa4,0x3f,0xad,0xbf}, {0xb9,0x2d,0xb6,0xa8}, {0xb2,0x23,0xbf,0xa5},
++  {0x83,0x09,0x80,0x86}, {0x88,0x07,0x89,0x8b}, {0x95,0x15,0x92,0x9c}, {0x9e,0x1b,0x9b,0x91},
++  {0x47,0xa1,0x7c,0x0a}, {0x4c,0xaf,0x75,0x07}, {0x51,0xbd,0x6e,0x10}, {0x5a,0xb3,0x67,0x1d},
++  {0x6b,0x99,0x58,0x3e}, {0x60,0x97,0x51,0x33}, {0x7d,0x85,0x4a,0x24}, {0x76,0x8b,0x43,0x29},
++  {0x1f,0xd1,0x34,0x62}, {0x14,0xdf,0x3d,0x6f}, {0x09,0xcd,0x26,0x78}, {0x02,0xc3,0x2f,0x75},
++  {0x33,0xe9,0x10,0x56}, {0x38,0xe7,0x19,0x5b}, {0x25,0xf5,0x02,0x4c}, {0x2e,0xfb,0x0b,0x41},
++  {0x8c,0x9a,0xd7,0x61}, {0x87,0x94,0xde,0x6c}, {0x9a,0x86,0xc5,0x7b}, {0x91,0x88,0xcc,0x76},
++  {0xa0,0xa2,0xf3,0x55}, {0xab,0xac,0xfa,0x58}, {0xb6,0xbe,0xe1,0x4f}, {0xbd,0xb0,0xe8,0x42},
++  {0xd4,0xea,0x9f,0x09}, {0xdf,0xe4,0x96,0x04}, {0xc2,0xf6,0x8d,0x13}, {0xc9,0xf8,0x84,0x1e},
++  {0xf8,0xd2,0xbb,0x3d}, {0xf3,0xdc,0xb2,0x30}, {0xee,0xce,0xa9,0x27}, {0xe5,0xc0,0xa0,0x2a},
++  {0x3c,0x7a,0x47,0xb1}, {0x37,0x74,0x4e,0xbc}, {0x2a,0x66,0x55,0xab}, {0x21,0x68,0x5c,0xa6},
++  {0x10,0x42,0x63,0x85}, {0x1b,0x4c,0x6a,0x88}, {0x06,0x5e,0x71,0x9f}, {0x0d,0x50,0x78,0x92},
++  {0x64,0x0a,0x0f,0xd9}, {0x6f,0x04,0x06,0xd4}, {0x72,0x16,0x1d,0xc3}, {0x79,0x18,0x14,0xce},
++  {0x48,0x32,0x2b,0xed}, {0x43,0x3c,0x22,0xe0}, {0x5e,0x2e,0x39,0xf7}, {0x55,0x20,0x30,0xfa},
++  {0x01,0xec,0x9a,0xb7}, {0x0a,0xe2,0x93,0xba}, {0x17,0xf0,0x88,0xad}, {0x1c,0xfe,0x81,0xa0},
++  {0x2d,0xd4,0xbe,0x83}, {0x26,0xda,0xb7,0x8e}, {0x3b,0xc8,0xac,0x99}, {0x30,0xc6,0xa5,0x94},
++  {0x59,0x9c,0xd2,0xdf}, {0x52,0x92,0xdb,0xd2}, {0x4f,0x80,0xc0,0xc5}, {0x44,0x8e,0xc9,0xc8},
++  {0x75,0xa4,0xf6,0xeb}, {0x7e,0xaa,0xff,0xe6}, {0x63,0xb8,0xe4,0xf1}, {0x68,0xb6,0xed,0xfc},
++  {0xb1,0x0c,0x0a,0x67}, {0xba,0x02,0x03,0x6a}, {0xa7,0x10,0x18,0x7d}, {0xac,0x1e,0x11,0x70},
++  {0x9d,0x34,0x2e,0x53}, {0x96,0x3a,0x27,0x5e}, {0x8b,0x28,0x3c,0x49}, {0x80,0x26,0x35,0x44},
++  {0xe9,0x7c,0x42,0x0f}, {0xe2,0x72,0x4b,0x02}, {0xff,0x60,0x50,0x15}, {0xf4,0x6e,0x59,0x18},
++  {0xc5,0x44,0x66,0x3b}, {0xce,0x4a,0x6f,0x36}, {0xd3,0x58,0x74,0x21}, {0xd8,0x56,0x7d,0x2c},
++  {0x7a,0x37,0xa1,0x0c}, {0x71,0x39,0xa8,0x01}, {0x6c,0x2b,0xb3,0x16}, {0x67,0x25,0xba,0x1b},
++  {0x56,0x0f,0x85,0x38}, {0x5d,0x01,0x8c,0x35}, {0x40,0x13,0x97,0x22}, {0x4b,0x1d,0x9e,0x2f},
++  {0x22,0x47,0xe9,0x64}, {0x29,0x49,0xe0,0x69}, {0x34,0x5b,0xfb,0x7e}, {0x3f,0x55,0xf2,0x73},
++  {0x0e,0x7f,0xcd,0x50}, {0x05,0x71,0xc4,0x5d}, {0x18,0x63,0xdf,0x4a}, {0x13,0x6d,0xd6,0x47},
++  {0xca,0xd7,0x31,0xdc}, {0xc1,0xd9,0x38,0xd1}, {0xdc,0xcb,0x23,0xc6}, {0xd7,0xc5,0x2a,0xcb},
++  {0xe6,0xef,0x15,0xe8}, {0xed,0xe1,0x1c,0xe5}, {0xf0,0xf3,0x07,0xf2}, {0xfb,0xfd,0x0e,0xff},
++  {0x92,0xa7,0x79,0xb4}, {0x99,0xa9,0x70,0xb9}, {0x84,0xbb,0x6b,0xae}, {0x8f,0xb5,0x62,0xa3},
++  {0xbe,0x9f,0x5d,0x80}, {0xb5,0x91,0x54,0x8d}, {0xa8,0x83,0x4f,0x9a}, {0xa3,0x8d,0x46,0x97}
++};
++
++static UINT8 U3[256][4]=
++{
++  {0x00,0x00,0x00,0x00}, {0x0d,0x0b,0x0e,0x09}, {0x1a,0x16,0x1c,0x12}, {0x17,0x1d,0x12,0x1b},
++  {0x34,0x2c,0x38,0x24}, {0x39,0x27,0x36,0x2d}, {0x2e,0x3a,0x24,0x36}, {0x23,0x31,0x2a,0x3f},
++  {0x68,0x58,0x70,0x48}, {0x65,0x53,0x7e,0x41}, {0x72,0x4e,0x6c,0x5a}, {0x7f,0x45,0x62,0x53},
++  {0x5c,0x74,0x48,0x6c}, {0x51,0x7f,0x46,0x65}, {0x46,0x62,0x54,0x7e}, {0x4b,0x69,0x5a,0x77},
++  {0xd0,0xb0,0xe0,0x90}, {0xdd,0xbb,0xee,0x99}, {0xca,0xa6,0xfc,0x82}, {0xc7,0xad,0xf2,0x8b},
++  {0xe4,0x9c,0xd8,0xb4}, {0xe9,0x97,0xd6,0xbd}, {0xfe,0x8a,0xc4,0xa6}, {0xf3,0x81,0xca,0xaf},
++  {0xb8,0xe8,0x90,0xd8}, {0xb5,0xe3,0x9e,0xd1}, {0xa2,0xfe,0x8c,0xca}, {0xaf,0xf5,0x82,0xc3},
++  {0x8c,0xc4,0xa8,0xfc}, {0x81,0xcf,0xa6,0xf5}, {0x96,0xd2,0xb4,0xee}, {0x9b,0xd9,0xba,0xe7},
++  {0xbb,0x7b,0xdb,0x3b}, {0xb6,0x70,0xd5,0x32}, {0xa1,0x6d,0xc7,0x29}, {0xac,0x66,0xc9,0x20},
++  {0x8f,0x57,0xe3,0x1f}, {0x82,0x5c,0xed,0x16}, {0x95,0x41,0xff,0x0d}, {0x98,0x4a,0xf1,0x04},
++  {0xd3,0x23,0xab,0x73}, {0xde,0x28,0xa5,0x7a}, {0xc9,0x35,0xb7,0x61}, {0xc4,0x3e,0xb9,0x68},
++  {0xe7,0x0f,0x93,0x57}, {0xea,0x04,0x9d,0x5e}, {0xfd,0x19,0x8f,0x45}, {0xf0,0x12,0x81,0x4c},
++  {0x6b,0xcb,0x3b,0xab}, {0x66,0xc0,0x35,0xa2}, {0x71,0xdd,0x27,0xb9}, {0x7c,0xd6,0x29,0xb0},
++  {0x5f,0xe7,0x03,0x8f}, {0x52,0xec,0x0d,0x86}, {0x45,0xf1,0x1f,0x9d}, {0x48,0xfa,0x11,0x94},
++  {0x03,0x93,0x4b,0xe3}, {0x0e,0x98,0x45,0xea}, {0x19,0x85,0x57,0xf1}, {0x14,0x8e,0x59,0xf8},
++  {0x37,0xbf,0x73,0xc7}, {0x3a,0xb4,0x7d,0xce}, {0x2d,0xa9,0x6f,0xd5}, {0x20,0xa2,0x61,0xdc},
++  {0x6d,0xf6,0xad,0x76}, {0x60,0xfd,0xa3,0x7f}, {0x77,0xe0,0xb1,0x64}, {0x7a,0xeb,0xbf,0x6d},
++  {0x59,0xda,0x95,0x52}, {0x54,0xd1,0x9b,0x5b}, {0x43,0xcc,0x89,0x40}, {0x4e,0xc7,0x87,0x49},
++  {0x05,0xae,0xdd,0x3e}, {0x08,0xa5,0xd3,0x37}, {0x1f,0xb8,0xc1,0x2c}, {0x12,0xb3,0xcf,0x25},
++  {0x31,0x82,0xe5,0x1a}, {0x3c,0x89,0xeb,0x13}, {0x2b,0x94,0xf9,0x08}, {0x26,0x9f,0xf7,0x01},
++  {0xbd,0x46,0x4d,0xe6}, {0xb0,0x4d,0x43,0xef}, {0xa7,0x50,0x51,0xf4}, {0xaa,0x5b,0x5f,0xfd},
++  {0x89,0x6a,0x75,0xc2}, {0x84,0x61,0x7b,0xcb}, {0x93,0x7c,0x69,0xd0}, {0x9e,0x77,0x67,0xd9},
++  {0xd5,0x1e,0x3d,0xae}, {0xd8,0x15,0x33,0xa7}, {0xcf,0x08,0x21,0xbc}, {0xc2,0x03,0x2f,0xb5},
++  {0xe1,0x32,0x05,0x8a}, {0xec,0x39,0x0b,0x83}, {0xfb,0x24,0x19,0x98}, {0xf6,0x2f,0x17,0x91},
++  {0xd6,0x8d,0x76,0x4d}, {0xdb,0x86,0x78,0x44}, {0xcc,0x9b,0x6a,0x5f}, {0xc1,0x90,0x64,0x56},
++  {0xe2,0xa1,0x4e,0x69}, {0xef,0xaa,0x40,0x60}, {0xf8,0xb7,0x52,0x7b}, {0xf5,0xbc,0x5c,0x72},
++  {0xbe,0xd5,0x06,0x05}, {0xb3,0xde,0x08,0x0c}, {0xa4,0xc3,0x1a,0x17}, {0xa9,0xc8,0x14,0x1e},
++  {0x8a,0xf9,0x3e,0x21}, {0x87,0xf2,0x30,0x28}, {0x90,0xef,0x22,0x33}, {0x9d,0xe4,0x2c,0x3a},
++  {0x06,0x3d,0x96,0xdd}, {0x0b,0x36,0x98,0xd4}, {0x1c,0x2b,0x8a,0xcf}, {0x11,0x20,0x84,0xc6},
++  {0x32,0x11,0xae,0xf9}, {0x3f,0x1a,0xa0,0xf0}, {0x28,0x07,0xb2,0xeb}, {0x25,0x0c,0xbc,0xe2},
++  {0x6e,0x65,0xe6,0x95}, {0x63,0x6e,0xe8,0x9c}, {0x74,0x73,0xfa,0x87}, {0x79,0x78,0xf4,0x8e},
++  {0x5a,0x49,0xde,0xb1}, {0x57,0x42,0xd0,0xb8}, {0x40,0x5f,0xc2,0xa3}, {0x4d,0x54,0xcc,0xaa},
++  {0xda,0xf7,0x41,0xec}, {0xd7,0xfc,0x4f,0xe5}, {0xc0,0xe1,0x5d,0xfe}, {0xcd,0xea,0x53,0xf7},
++  {0xee,0xdb,0x79,0xc8}, {0xe3,0xd0,0x77,0xc1}, {0xf4,0xcd,0x65,0xda}, {0xf9,0xc6,0x6b,0xd3},
++  {0xb2,0xaf,0x31,0xa4}, {0xbf,0xa4,0x3f,0xad}, {0xa8,0xb9,0x2d,0xb6}, {0xa5,0xb2,0x23,0xbf},
++  {0x86,0x83,0x09,0x80}, {0x8b,0x88,0x07,0x89}, {0x9c,0x95,0x15,0x92}, {0x91,0x9e,0x1b,0x9b},
++  {0x0a,0x47,0xa1,0x7c}, {0x07,0x4c,0xaf,0x75}, {0x10,0x51,0xbd,0x6e}, {0x1d,0x5a,0xb3,0x67},
++  {0x3e,0x6b,0x99,0x58}, {0x33,0x60,0x97,0x51}, {0x24,0x7d,0x85,0x4a}, {0x29,0x76,0x8b,0x43},
++  {0x62,0x1f,0xd1,0x34}, {0x6f,0x14,0xdf,0x3d}, {0x78,0x09,0xcd,0x26}, {0x75,0x02,0xc3,0x2f},
++  {0x56,0x33,0xe9,0x10}, {0x5b,0x38,0xe7,0x19}, {0x4c,0x25,0xf5,0x02}, {0x41,0x2e,0xfb,0x0b},
++  {0x61,0x8c,0x9a,0xd7}, {0x6c,0x87,0x94,0xde}, {0x7b,0x9a,0x86,0xc5}, {0x76,0x91,0x88,0xcc},
++  {0x55,0xa0,0xa2,0xf3}, {0x58,0xab,0xac,0xfa}, {0x4f,0xb6,0xbe,0xe1}, {0x42,0xbd,0xb0,0xe8},
++  {0x09,0xd4,0xea,0x9f}, {0x04,0xdf,0xe4,0x96}, {0x13,0xc2,0xf6,0x8d}, {0x1e,0xc9,0xf8,0x84},
++  {0x3d,0xf8,0xd2,0xbb}, {0x30,0xf3,0xdc,0xb2}, {0x27,0xee,0xce,0xa9}, {0x2a,0xe5,0xc0,0xa0},
++  {0xb1,0x3c,0x7a,0x47}, {0xbc,0x37,0x74,0x4e}, {0xab,0x2a,0x66,0x55}, {0xa6,0x21,0x68,0x5c},
++  {0x85,0x10,0x42,0x63}, {0x88,0x1b,0x4c,0x6a}, {0x9f,0x06,0x5e,0x71}, {0x92,0x0d,0x50,0x78},
++  {0xd9,0x64,0x0a,0x0f}, {0xd4,0x6f,0x04,0x06}, {0xc3,0x72,0x16,0x1d}, {0xce,0x79,0x18,0x14},
++  {0xed,0x48,0x32,0x2b}, {0xe0,0x43,0x3c,0x22}, {0xf7,0x5e,0x2e,0x39}, {0xfa,0x55,0x20,0x30},
++  {0xb7,0x01,0xec,0x9a}, {0xba,0x0a,0xe2,0x93}, {0xad,0x17,0xf0,0x88}, {0xa0,0x1c,0xfe,0x81},
++  {0x83,0x2d,0xd4,0xbe}, {0x8e,0x26,0xda,0xb7}, {0x99,0x3b,0xc8,0xac}, {0x94,0x30,0xc6,0xa5},
++  {0xdf,0x59,0x9c,0xd2}, {0xd2,0x52,0x92,0xdb}, {0xc5,0x4f,0x80,0xc0}, {0xc8,0x44,0x8e,0xc9},
++  {0xeb,0x75,0xa4,0xf6}, {0xe6,0x7e,0xaa,0xff}, {0xf1,0x63,0xb8,0xe4}, {0xfc,0x68,0xb6,0xed},
++  {0x67,0xb1,0x0c,0x0a}, {0x6a,0xba,0x02,0x03}, {0x7d,0xa7,0x10,0x18}, {0x70,0xac,0x1e,0x11},
++  {0x53,0x9d,0x34,0x2e}, {0x5e,0x96,0x3a,0x27}, {0x49,0x8b,0x28,0x3c}, {0x44,0x80,0x26,0x35},
++  {0x0f,0xe9,0x7c,0x42}, {0x02,0xe2,0x72,0x4b}, {0x15,0xff,0x60,0x50}, {0x18,0xf4,0x6e,0x59},
++  {0x3b,0xc5,0x44,0x66}, {0x36,0xce,0x4a,0x6f}, {0x21,0xd3,0x58,0x74}, {0x2c,0xd8,0x56,0x7d},
++  {0x0c,0x7a,0x37,0xa1}, {0x01,0x71,0x39,0xa8}, {0x16,0x6c,0x2b,0xb3}, {0x1b,0x67,0x25,0xba},
++  {0x38,0x56,0x0f,0x85}, {0x35,0x5d,0x01,0x8c}, {0x22,0x40,0x13,0x97}, {0x2f,0x4b,0x1d,0x9e},
++  {0x64,0x22,0x47,0xe9}, {0x69,0x29,0x49,0xe0}, {0x7e,0x34,0x5b,0xfb}, {0x73,0x3f,0x55,0xf2},
++  {0x50,0x0e,0x7f,0xcd}, {0x5d,0x05,0x71,0xc4}, {0x4a,0x18,0x63,0xdf}, {0x47,0x13,0x6d,0xd6},
++  {0xdc,0xca,0xd7,0x31}, {0xd1,0xc1,0xd9,0x38}, {0xc6,0xdc,0xcb,0x23}, {0xcb,0xd7,0xc5,0x2a},
++  {0xe8,0xe6,0xef,0x15}, {0xe5,0xed,0xe1,0x1c}, {0xf2,0xf0,0xf3,0x07}, {0xff,0xfb,0xfd,0x0e},
++  {0xb4,0x92,0xa7,0x79}, {0xb9,0x99,0xa9,0x70}, {0xae,0x84,0xbb,0x6b}, {0xa3,0x8f,0xb5,0x62},
++  {0x80,0xbe,0x9f,0x5d}, {0x8d,0xb5,0x91,0x54}, {0x9a,0xa8,0x83,0x4f}, {0x97,0xa3,0x8d,0x46}
++};
++
++static UINT8 U4[256][4]=
++{
++  {0x00,0x00,0x00,0x00}, {0x09,0x0d,0x0b,0x0e}, {0x12,0x1a,0x16,0x1c}, {0x1b,0x17,0x1d,0x12},
++  {0x24,0x34,0x2c,0x38}, {0x2d,0x39,0x27,0x36}, {0x36,0x2e,0x3a,0x24}, {0x3f,0x23,0x31,0x2a},
++  {0x48,0x68,0x58,0x70}, {0x41,0x65,0x53,0x7e}, {0x5a,0x72,0x4e,0x6c}, {0x53,0x7f,0x45,0x62},
++  {0x6c,0x5c,0x74,0x48}, {0x65,0x51,0x7f,0x46}, {0x7e,0x46,0x62,0x54}, {0x77,0x4b,0x69,0x5a},
++  {0x90,0xd0,0xb0,0xe0}, {0x99,0xdd,0xbb,0xee}, {0x82,0xca,0xa6,0xfc}, {0x8b,0xc7,0xad,0xf2},
++  {0xb4,0xe4,0x9c,0xd8}, {0xbd,0xe9,0x97,0xd6}, {0xa6,0xfe,0x8a,0xc4}, {0xaf,0xf3,0x81,0xca},
++  {0xd8,0xb8,0xe8,0x90}, {0xd1,0xb5,0xe3,0x9e}, {0xca,0xa2,0xfe,0x8c}, {0xc3,0xaf,0xf5,0x82},
++  {0xfc,0x8c,0xc4,0xa8}, {0xf5,0x81,0xcf,0xa6}, {0xee,0x96,0xd2,0xb4}, {0xe7,0x9b,0xd9,0xba},
++  {0x3b,0xbb,0x7b,0xdb}, {0x32,0xb6,0x70,0xd5}, {0x29,0xa1,0x6d,0xc7}, {0x20,0xac,0x66,0xc9},
++  {0x1f,0x8f,0x57,0xe3}, {0x16,0x82,0x5c,0xed}, {0x0d,0x95,0x41,0xff}, {0x04,0x98,0x4a,0xf1},
++  {0x73,0xd3,0x23,0xab}, {0x7a,0xde,0x28,0xa5}, {0x61,0xc9,0x35,0xb7}, {0x68,0xc4,0x3e,0xb9},
++  {0x57,0xe7,0x0f,0x93}, {0x5e,0xea,0x04,0x9d}, {0x45,0xfd,0x19,0x8f}, {0x4c,0xf0,0x12,0x81},
++  {0xab,0x6b,0xcb,0x3b}, {0xa2,0x66,0xc0,0x35}, {0xb9,0x71,0xdd,0x27}, {0xb0,0x7c,0xd6,0x29},
++  {0x8f,0x5f,0xe7,0x03}, {0x86,0x52,0xec,0x0d}, {0x9d,0x45,0xf1,0x1f}, {0x94,0x48,0xfa,0x11},
++  {0xe3,0x03,0x93,0x4b}, {0xea,0x0e,0x98,0x45}, {0xf1,0x19,0x85,0x57}, {0xf8,0x14,0x8e,0x59},
++  {0xc7,0x37,0xbf,0x73}, {0xce,0x3a,0xb4,0x7d}, {0xd5,0x2d,0xa9,0x6f}, {0xdc,0x20,0xa2,0x61},
++  {0x76,0x6d,0xf6,0xad}, {0x7f,0x60,0xfd,0xa3}, {0x64,0x77,0xe0,0xb1}, {0x6d,0x7a,0xeb,0xbf},
++  {0x52,0x59,0xda,0x95}, {0x5b,0x54,0xd1,0x9b}, {0x40,0x43,0xcc,0x89}, {0x49,0x4e,0xc7,0x87},
++  {0x3e,0x05,0xae,0xdd}, {0x37,0x08,0xa5,0xd3}, {0x2c,0x1f,0xb8,0xc1}, {0x25,0x12,0xb3,0xcf},
++  {0x1a,0x31,0x82,0xe5}, {0x13,0x3c,0x89,0xeb}, {0x08,0x2b,0x94,0xf9}, {0x01,0x26,0x9f,0xf7},
++  {0xe6,0xbd,0x46,0x4d}, {0xef,0xb0,0x4d,0x43}, {0xf4,0xa7,0x50,0x51}, {0xfd,0xaa,0x5b,0x5f},
++  {0xc2,0x89,0x6a,0x75}, {0xcb,0x84,0x61,0x7b}, {0xd0,0x93,0x7c,0x69}, {0xd9,0x9e,0x77,0x67},
++  {0xae,0xd5,0x1e,0x3d}, {0xa7,0xd8,0x15,0x33}, {0xbc,0xcf,0x08,0x21}, {0xb5,0xc2,0x03,0x2f},
++  {0x8a,0xe1,0x32,0x05}, {0x83,0xec,0x39,0x0b}, {0x98,0xfb,0x24,0x19}, {0x91,0xf6,0x2f,0x17},
++  {0x4d,0xd6,0x8d,0x76}, {0x44,0xdb,0x86,0x78}, {0x5f,0xcc,0x9b,0x6a}, {0x56,0xc1,0x90,0x64},
++  {0x69,0xe2,0xa1,0x4e}, {0x60,0xef,0xaa,0x40}, {0x7b,0xf8,0xb7,0x52}, {0x72,0xf5,0xbc,0x5c},
++  {0x05,0xbe,0xd5,0x06}, {0x0c,0xb3,0xde,0x08}, {0x17,0xa4,0xc3,0x1a}, {0x1e,0xa9,0xc8,0x14},
++  {0x21,0x8a,0xf9,0x3e}, {0x28,0x87,0xf2,0x30}, {0x33,0x90,0xef,0x22}, {0x3a,0x9d,0xe4,0x2c},
++  {0xdd,0x06,0x3d,0x96}, {0xd4,0x0b,0x36,0x98}, {0xcf,0x1c,0x2b,0x8a}, {0xc6,0x11,0x20,0x84},
++  {0xf9,0x32,0x11,0xae}, {0xf0,0x3f,0x1a,0xa0}, {0xeb,0x28,0x07,0xb2}, {0xe2,0x25,0x0c,0xbc},
++  {0x95,0x6e,0x65,0xe6}, {0x9c,0x63,0x6e,0xe8}, {0x87,0x74,0x73,0xfa}, {0x8e,0x79,0x78,0xf4},
++  {0xb1,0x5a,0x49,0xde}, {0xb8,0x57,0x42,0xd0}, {0xa3,0x40,0x5f,0xc2}, {0xaa,0x4d,0x54,0xcc},
++  {0xec,0xda,0xf7,0x41}, {0xe5,0xd7,0xfc,0x4f}, {0xfe,0xc0,0xe1,0x5d}, {0xf7,0xcd,0xea,0x53},
++  {0xc8,0xee,0xdb,0x79}, {0xc1,0xe3,0xd0,0x77}, {0xda,0xf4,0xcd,0x65}, {0xd3,0xf9,0xc6,0x6b},
++  {0xa4,0xb2,0xaf,0x31}, {0xad,0xbf,0xa4,0x3f}, {0xb6,0xa8,0xb9,0x2d}, {0xbf,0xa5,0xb2,0x23},
++  {0x80,0x86,0x83,0x09}, {0x89,0x8b,0x88,0x07}, {0x92,0x9c,0x95,0x15}, {0x9b,0x91,0x9e,0x1b},
++  {0x7c,0x0a,0x47,0xa1}, {0x75,0x07,0x4c,0xaf}, {0x6e,0x10,0x51,0xbd}, {0x67,0x1d,0x5a,0xb3},
++  {0x58,0x3e,0x6b,0x99}, {0x51,0x33,0x60,0x97}, {0x4a,0x24,0x7d,0x85}, {0x43,0x29,0x76,0x8b},
++  {0x34,0x62,0x1f,0xd1}, {0x3d,0x6f,0x14,0xdf}, {0x26,0x78,0x09,0xcd}, {0x2f,0x75,0x02,0xc3},
++  {0x10,0x56,0x33,0xe9}, {0x19,0x5b,0x38,0xe7}, {0x02,0x4c,0x25,0xf5}, {0x0b,0x41,0x2e,0xfb},
++  {0xd7,0x61,0x8c,0x9a}, {0xde,0x6c,0x87,0x94}, {0xc5,0x7b,0x9a,0x86}, {0xcc,0x76,0x91,0x88},
++  {0xf3,0x55,0xa0,0xa2}, {0xfa,0x58,0xab,0xac}, {0xe1,0x4f,0xb6,0xbe}, {0xe8,0x42,0xbd,0xb0},
++  {0x9f,0x09,0xd4,0xea}, {0x96,0x04,0xdf,0xe4}, {0x8d,0x13,0xc2,0xf6}, {0x84,0x1e,0xc9,0xf8},
++  {0xbb,0x3d,0xf8,0xd2}, {0xb2,0x30,0xf3,0xdc}, {0xa9,0x27,0xee,0xce}, {0xa0,0x2a,0xe5,0xc0},
++  {0x47,0xb1,0x3c,0x7a}, {0x4e,0xbc,0x37,0x74}, {0x55,0xab,0x2a,0x66}, {0x5c,0xa6,0x21,0x68},
++  {0x63,0x85,0x10,0x42}, {0x6a,0x88,0x1b,0x4c}, {0x71,0x9f,0x06,0x5e}, {0x78,0x92,0x0d,0x50},
++  {0x0f,0xd9,0x64,0x0a}, {0x06,0xd4,0x6f,0x04}, {0x1d,0xc3,0x72,0x16}, {0x14,0xce,0x79,0x18},
++  {0x2b,0xed,0x48,0x32}, {0x22,0xe0,0x43,0x3c}, {0x39,0xf7,0x5e,0x2e}, {0x30,0xfa,0x55,0x20},
++  {0x9a,0xb7,0x01,0xec}, {0x93,0xba,0x0a,0xe2}, {0x88,0xad,0x17,0xf0}, {0x81,0xa0,0x1c,0xfe},
++  {0xbe,0x83,0x2d,0xd4}, {0xb7,0x8e,0x26,0xda}, {0xac,0x99,0x3b,0xc8}, {0xa5,0x94,0x30,0xc6},
++  {0xd2,0xdf,0x59,0x9c}, {0xdb,0xd2,0x52,0x92}, {0xc0,0xc5,0x4f,0x80}, {0xc9,0xc8,0x44,0x8e},
++  {0xf6,0xeb,0x75,0xa4}, {0xff,0xe6,0x7e,0xaa}, {0xe4,0xf1,0x63,0xb8}, {0xed,0xfc,0x68,0xb6},
++  {0x0a,0x67,0xb1,0x0c}, {0x03,0x6a,0xba,0x02}, {0x18,0x7d,0xa7,0x10}, {0x11,0x70,0xac,0x1e},
++  {0x2e,0x53,0x9d,0x34}, {0x27,0x5e,0x96,0x3a}, {0x3c,0x49,0x8b,0x28}, {0x35,0x44,0x80,0x26},
++  {0x42,0x0f,0xe9,0x7c}, {0x4b,0x02,0xe2,0x72}, {0x50,0x15,0xff,0x60}, {0x59,0x18,0xf4,0x6e},
++  {0x66,0x3b,0xc5,0x44}, {0x6f,0x36,0xce,0x4a}, {0x74,0x21,0xd3,0x58}, {0x7d,0x2c,0xd8,0x56},
++  {0xa1,0x0c,0x7a,0x37}, {0xa8,0x01,0x71,0x39}, {0xb3,0x16,0x6c,0x2b}, {0xba,0x1b,0x67,0x25},
++  {0x85,0x38,0x56,0x0f}, {0x8c,0x35,0x5d,0x01}, {0x97,0x22,0x40,0x13}, {0x9e,0x2f,0x4b,0x1d},
++  {0xe9,0x64,0x22,0x47}, {0xe0,0x69,0x29,0x49}, {0xfb,0x7e,0x34,0x5b}, {0xf2,0x73,0x3f,0x55},
++  {0xcd,0x50,0x0e,0x7f}, {0xc4,0x5d,0x05,0x71}, {0xdf,0x4a,0x18,0x63}, {0xd6,0x47,0x13,0x6d},
++  {0x31,0xdc,0xca,0xd7}, {0x38,0xd1,0xc1,0xd9}, {0x23,0xc6,0xdc,0xcb}, {0x2a,0xcb,0xd7,0xc5},
++  {0x15,0xe8,0xe6,0xef}, {0x1c,0xe5,0xed,0xe1}, {0x07,0xf2,0xf0,0xf3}, {0x0e,0xff,0xfb,0xfd},
++  {0x79,0xb4,0x92,0xa7}, {0x70,0xb9,0x99,0xa9}, {0x6b,0xae,0x84,0xbb}, {0x62,0xa3,0x8f,0xb5},
++  {0x5d,0x80,0xbe,0x9f}, {0x54,0x8d,0xb5,0x91}, {0x4f,0x9a,0xa8,0x83}, {0x46,0x97,0xa3,0x8d}
++};
++
++static UINT32 rcon[30]=
++{ 
++  0x01, 0x02, 0x04, 0x08, 0x10, 0x20,
++  0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8,
++  0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc,
++  0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4,
++  0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
++};
++
++/*
++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
++// API
++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
++*/
++
++void RijndaelCreate(Rijndael* rijndael)
++{
++   rijndael->m_state = RIJNDAEL_State_Invalid;
++}
++
++int RijndaelInit(Rijndael* rijndael, int mode, int dir, UINT8* key, int keyLen, UINT8* initVector)
++{
++  UINT32 uKeyLenInBytes;
++  UINT8 keyMatrix[_MAX_KEY_COLUMNS][4];
++  UINT32 i;
++#ifdef TEST_AES_HW
++  UINT8 aesKeySched[15*16];
++#endif
++
++  /* Not initialized yet */
++  rijndael->m_state = RIJNDAEL_State_Invalid;
++
++  /* Check the mode */
++  if ((mode != RIJNDAEL_Direction_Mode_CBC) && (mode != RIJNDAEL_Direction_Mode_ECB) && (mode != RIJNDAEL_Direction_Mode_CFB1)) return RIJNDAEL_UNSUPPORTED_MODE;
++  rijndael->m_mode = mode;
++
++  /* And the direction */
++  if ((dir != RIJNDAEL_Direction_Encrypt) && (dir != RIJNDAEL_Direction_Decrypt)) return RIJNDAEL_UNSUPPORTED_DIRECTION;
++  rijndael->m_direction = dir;
++
++  /* Allow to set an init vector */
++  if (initVector)
++  {
++    /* specified init vector */
++    for(i = 0;i < MAX_IV_SIZE;i++)
++    {
++      rijndael->m_initVector[i] = initVector[i];
++    }
++  } else {
++    /* zero init vector */
++    for(i = 0;i < MAX_IV_SIZE;i++)
++    {
++      rijndael->m_initVector[i] = 0;
++    }
++  }
++
++  /* And check the key length */
++  switch (keyLen)
++  {
++    case RIJNDAEL_Direction_KeyLength_Key16Bytes:
++      uKeyLenInBytes = 16;
++      rijndael->m_uRounds = 10;
++    break;
++    case RIJNDAEL_Direction_KeyLength_Key24Bytes:
++      uKeyLenInBytes = 24;
++      rijndael->m_uRounds = 12;
++    break;
++    case RIJNDAEL_Direction_KeyLength_Key32Bytes:
++      uKeyLenInBytes = 32;
++      rijndael->m_uRounds = 14;
++    break;
++    default:
++      return RIJNDAEL_UNSUPPORTED_KEY_LENGTH;
++    break;
++  }
++  /* The number of rounds is calculated as */
++  /* m_uRounds = (m_uKeyLenInBits / 32) + 6; */
++
++  if (!key) return RIJNDAEL_BAD_KEY;
++
++#if HAS_AES_HARDWARE
++  if (aesHardwareAvailable())
++  {
++    if (rijndael->m_direction == RIJNDAEL_Direction_Encrypt)
++    {
++#ifndef TEST_AES_HW
++      aesGenKeyEncrypt(key, uKeyLenInBytes*8, (unsigned char*) rijndael->m_expandedKey);
++#else
++      TEST_AES_HW_DEBUG_LOG("aes gen key enc: hw enabled\n");
++      aesGenKeyEncrypt(key, uKeyLenInBytes*8, (unsigned char*) aesKeySched);
++      TEST_AES_HW_DEBUG_LOG("aes gen key enc: ready\n");
++#endif
++    }
++    else
++    {
++#ifndef TEST_AES_HW
++      aesGenKeyDecrypt(key, uKeyLenInBytes*8, (unsigned char*) rijndael->m_expandedKey);
++#else
++      TEST_AES_HW_DEBUG_LOG("aes gen key dec: hw enabled\n");
++      aesGenKeyDecrypt(key, uKeyLenInBytes*8, (unsigned char*) aesKeySched);
++      TEST_AES_HW_DEBUG_LOG("aes gen key dec: ready\n");
++#endif
++    }
++  }
++#ifndef TEST_AES_HW  
++  else
++#endif
++#endif
++  {
++    for (i = 0; i < uKeyLenInBytes; i++) keyMatrix[i >> 2][i & 3] = key[i];
++
++    RijndaelKeySched(rijndael, keyMatrix);
++
++    if (rijndael->m_direction == RIJNDAEL_Direction_Decrypt) RijndaelKeyEncToDec(rijndael);
++  }
++
++#ifdef TEST_AES_HW  
++  {
++    int cmpkeyexp = memcmp((unsigned char*) rijndael->m_expandedKey, aesKeySched, (rijndael->m_uRounds+1)*16);
++    int datalen = (rijndael->m_uRounds + 1) * 16;
++    TEST_AES_HW_DEBUG_LOG("aes gen key: cmp=%d\n", cmpkeyexp);
++    TEST_AES_HW_DEBUG_HEX("aes gen key SW:", (unsigned char*) rijndael->m_expandedKey, datalen);
++    TEST_AES_HW_DEBUG_HEX("aes gen key HW:", aesKeySched, datalen);
++  }
++#endif
++
++  rijndael->m_state = RIJNDAEL_State_Valid;
++  return RIJNDAEL_SUCCESS;
++}
++
++int RijndaelBlockEncrypt(Rijndael* rijndael, UINT8* input, int inputLen, UINT8* outBuffer)
++{
++  int i, k, numBlocks, lenFrag;
++  UINT8 block[16], iv[4][4];
++  UINT8* outOrig = outBuffer;
++#ifdef TEST_AES_HW
++  UINT8 outBuffer2[70000];
++#endif
++
++  if (rijndael->m_state != RIJNDAEL_State_Valid) return RIJNDAEL_NOT_INITIALIZED;
++  if (rijndael->m_direction != RIJNDAEL_Direction_Encrypt) return RIJNDAEL_BAD_DIRECTION;
++
++  if (input == 0 || inputLen <= 0) return 0;
++
++  numBlocks = inputLen/128;
++  lenFrag = (inputLen % 128) / 8;
++  
++  switch (rijndael->m_mode)
++  {
++    case RIJNDAEL_Direction_Mode_ECB: 
++      for(i = numBlocks;i > 0;i--)
++      {
++        RijndaelEncrypt(rijndael, input, outBuffer);
++        input += 16;
++        outBuffer += 16;
++      }
++    break;
++    case RIJNDAEL_Direction_Mode_CBC:
++#if HAS_AES_HARDWARE
++      if (aesHardwareAvailable())
++      {
++#ifndef TEST_AES_HW        
++        aesEncryptCBC(input, outBuffer, rijndael->m_initVector, inputLen/8, (unsigned char*) (rijndael->m_expandedKey), rijndael->m_uRounds);
++#else
++        TEST_AES_HW_DEBUG_LOG("aes enc: hw enabled\n");
++        aesEncryptCBC(input, outBuffer2, rijndael->m_initVector, inputLen/8, (unsigned char*) (rijndael->m_expandedKey), rijndael->m_uRounds);
++#endif
++      }
++#ifndef TEST_AES_HW
++      else
++#endif
++#endif
++      {
++        ((UINT32*)block)[0] = ((UINT32*)rijndael->m_initVector)[0] ^ ((UINT32*)input)[0];
++        ((UINT32*)block)[1] = ((UINT32*)rijndael->m_initVector)[1] ^ ((UINT32*)input)[1];
++        ((UINT32*)block)[2] = ((UINT32*)rijndael->m_initVector)[2] ^ ((UINT32*)input)[2];
++        ((UINT32*)block)[3] = ((UINT32*)rijndael->m_initVector)[3] ^ ((UINT32*)input)[3];
++        RijndaelEncrypt(rijndael, block,outBuffer);
++        input += 16;
++        for(i = numBlocks - 1;i > 0;i--)
++        {
++          ((UINT32*)block)[0] = ((UINT32*)outBuffer)[0] ^ ((UINT32*)input)[0];
++          ((UINT32*)block)[1] = ((UINT32*)outBuffer)[1] ^ ((UINT32*)input)[1];
++          ((UINT32*)block)[2] = ((UINT32*)outBuffer)[2] ^ ((UINT32*)input)[2];
++          ((UINT32*)block)[3] = ((UINT32*)outBuffer)[3] ^ ((UINT32*)input)[3];
++          outBuffer += 16;
++          RijndaelEncrypt(rijndael, block,outBuffer);
++          input += 16;
++        }
++        /**/
++        if (lenFrag > 0)
++        {
++          UINT8 lastblock[16];
++          /* Adjust the second last plain block. */
++          memcpy(lastblock, outBuffer, lenFrag);
++          /* Encrypt the last plain block. */
++          memcpy(block, outBuffer, 16);
++          for (i = 0; i < lenFrag; i++)
++          {
++            block[i] ^= input[i];
++          }
++          RijndaelEncrypt(rijndael, block, outBuffer);
++          memcpy(outBuffer + 16, lastblock, lenFrag);
++        }
++      }
++    break;
++    case RIJNDAEL_Direction_Mode_CFB1:
++#if STRICT_ALIGN 
++      memcpy(iv,rijndael->m_initVector,16); 
++#else  /* !STRICT_ALIGN */
++      *((UINT32*)iv[0]) = *((UINT32*)(rijndael->m_initVector   ));
++      *((UINT32*)iv[1]) = *((UINT32*)(rijndael->m_initVector + 4));
++      *((UINT32*)iv[2]) = *((UINT32*)(rijndael->m_initVector + 8));
++      *((UINT32*)iv[3]) = *((UINT32*)(rijndael->m_initVector +12));
++#endif /* ?STRICT_ALIGN */
++      for(i = numBlocks; i > 0; i--)
++      {
++        memcpy(outBuffer, input, 16);
++        for(k = 0; k < 128; k++)
++        {
++          *((UINT32*) block    ) = *((UINT32*)iv[0]);
++          *((UINT32*)(block+ 4)) = *((UINT32*)iv[1]);
++          *((UINT32*)(block+ 8)) = *((UINT32*)iv[2]);
++          *((UINT32*)(block+12)) = *((UINT32*)iv[3]);
++          RijndaelEncrypt(rijndael, block, block);
++          outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7);
++          iv[0][0] = (UINT8) ((iv[0][0] << 1) | (iv[0][1] >> 7));
++          iv[0][1] = (UINT8) ((iv[0][1] << 1) | (iv[0][2] >> 7));
++          iv[0][2] = (UINT8) ((iv[0][2] << 1) | (iv[0][3] >> 7));
++          iv[0][3] = (UINT8) ((iv[0][3] << 1) | (iv[1][0] >> 7));
++          iv[1][0] = (UINT8) ((iv[1][0] << 1) | (iv[1][1] >> 7));
++          iv[1][1] = (UINT8) ((iv[1][1] << 1) | (iv[1][2] >> 7));
++          iv[1][2] = (UINT8) ((iv[1][2] << 1) | (iv[1][3] >> 7));
++          iv[1][3] = (UINT8) ((iv[1][3] << 1) | (iv[2][0] >> 7));
++          iv[2][0] = (UINT8) ((iv[2][0] << 1) | (iv[2][1] >> 7));
++          iv[2][1] = (UINT8) ((iv[2][1] << 1) | (iv[2][2] >> 7));
++          iv[2][2] = (UINT8) ((iv[2][2] << 1) | (iv[2][3] >> 7));
++          iv[2][3] = (UINT8) ((iv[2][3] << 1) | (iv[3][0] >> 7));
++          iv[3][0] = (UINT8) ((iv[3][0] << 1) | (iv[3][1] >> 7));
++          iv[3][1] = (UINT8) ((iv[3][1] << 1) | (iv[3][2] >> 7));
++          iv[3][2] = (UINT8) ((iv[3][2] << 1) | (iv[3][3] >> 7));
++          iv[3][3] = (UINT8) ((iv[3][3] << 1) | ((outBuffer[k/8] >> (7-(k&7))) & 1));
++        }
++        outBuffer += 16;
++        input += 16;
++      }
++    break;
++    default:
++      return -1;
++    break;
++  }
++
++#ifdef TEST_AES_HW  
++  {
++    int cmpdata = memcmp((unsigned char*) outOrig, outBuffer2, inputLen/8);
++    TEST_AES_HW_DEBUG_LOG("aes enc: cmp=%d\n", cmpdata);
++    TEST_AES_HW_DEBUG_HEX("aes enc SW:", outOrig, 16);
++    TEST_AES_HW_DEBUG_HEX("aes enc HW:", outBuffer2, 16);
++  }
++#endif
++  
++  return 128 * numBlocks;
++}
++
++int RijndaelPadEncrypt(Rijndael* rijndael, UINT8 *input, int inputOctets, UINT8 *outBuffer)
++{
++  int i, numBlocks, padLen;
++  UINT8 block[16], *iv;
++
++  if (rijndael->m_state != RIJNDAEL_State_Valid) return RIJNDAEL_NOT_INITIALIZED;
++  if (rijndael->m_direction != RIJNDAEL_Direction_Encrypt) return RIJNDAEL_NOT_INITIALIZED;
++
++  if (input == 0 || inputOctets <= 0) return 0;
++
++  numBlocks = inputOctets/16;
++
++  switch (rijndael->m_mode)
++  {
++    case RIJNDAEL_Direction_Mode_ECB: 
++      for(i = numBlocks; i > 0; i--)
++      {
++        RijndaelEncrypt(rijndael, input, outBuffer);
++        input += 16;
++        outBuffer += 16;
++      }
++      padLen = 16 - (inputOctets - 16*numBlocks);
++/*      assert(padLen > 0 && padLen <= 16); */
++      memcpy(block, input, 16 - padLen);
++      memset(block + 16 - padLen, padLen, padLen);
++      RijndaelEncrypt(rijndael, block,outBuffer);
++    break;
++    case RIJNDAEL_Direction_Mode_CBC:
++      iv = rijndael->m_initVector;
++      for(i = numBlocks; i > 0; i--)
++      {
++        ((UINT32*)block)[0] = ((UINT32*)input)[0] ^ ((UINT32*)iv)[0];
++        ((UINT32*)block)[1] = ((UINT32*)input)[1] ^ ((UINT32*)iv)[1];
++        ((UINT32*)block)[2] = ((UINT32*)input)[2] ^ ((UINT32*)iv)[2];
++        ((UINT32*)block)[3] = ((UINT32*)input)[3] ^ ((UINT32*)iv)[3];
++        RijndaelEncrypt(rijndael, block, outBuffer);
++        iv = outBuffer;
++        input += 16;
++        outBuffer += 16;
++      }
++      padLen = 16 - (inputOctets - 16*numBlocks);
++/*      assert(padLen > 0 && padLen <= 16); // DO SOMETHING HERE ? */
++      for (i = 0; i < 16 - padLen; i++) {
++        block[i] = (UINT8) (input[i] ^ iv[i]);
++      }
++      for (i = 16 - padLen; i < 16; i++) {
++        block[i] = (UINT8) ((UINT8) padLen ^ iv[i]);
++      }
++      RijndaelEncrypt(rijndael, block,outBuffer);
++    break;
++    default:
++      return -1;
++    break;
++  }
++  
++  return 16*(numBlocks + 1);
++}
++  
++int RijndaelBlockDecrypt(Rijndael* rijndael, UINT8* input, int inputLen, UINT8* outBuffer)
++{
++  int i, k, numBlocks, lenFrag;
++  UINT8 block[16], iv[4][4];
++  UINT8* outOrig = outBuffer;
++#ifdef TEST_AES_HW
++  UINT8 outBuffer2[70000];
++#endif
++
++  if (rijndael->m_state != RIJNDAEL_State_Valid) return RIJNDAEL_NOT_INITIALIZED;
++  if ((rijndael->m_mode != RIJNDAEL_Direction_Mode_CFB1) && (rijndael->m_direction == RIJNDAEL_Direction_Encrypt)) return RIJNDAEL_BAD_DIRECTION;
++
++  if (input == 0 || inputLen <= 0)return 0;
++
++  numBlocks = inputLen/128;
++  lenFrag = (inputLen % 128) / 8;
++
++  switch (rijndael->m_mode)
++  {
++    case RIJNDAEL_Direction_Mode_ECB: 
++      for (i = numBlocks; i > 0; i--)
++      {
++        RijndaelDecrypt(rijndael, input, outBuffer);
++        input += 16;
++        outBuffer += 16;
++      }
++    break;
++    case RIJNDAEL_Direction_Mode_CBC:
++#if HAS_AES_HARDWARE
++      if (aesHardwareAvailable())
++      {
++#ifndef TEST_AES_HW
++        aesDecryptCBC(input, outBuffer, rijndael->m_initVector, inputLen/8, (unsigned char*) (rijndael->m_expandedKey), rijndael->m_uRounds);
++#else
++        TEST_AES_HW_DEBUG_LOG("aes dec: hw enabled\n");
++        aesDecryptCBC(input, outBuffer2, rijndael->m_initVector, inputLen/8, (unsigned char*) (rijndael->m_expandedKey), rijndael->m_uRounds);
++#endif
++      }
++#ifndef TEST_AES_HW
++      else
++#endif
++#endif
++      {
++        if (lenFrag > 0)
++        {
++          UINT8 lastblock[16];
++          int offset;
++          --numBlocks;
++          offset = numBlocks * 16;
++          /* Decrypt the last plain block. */
++          RijndaelDecrypt(rijndael, input + offset, block);
++          for (i = 0; i < lenFrag; i++)
++          {
++            lastblock[i] = block[i] ^ (input + offset + 16)[i];
++          }
++          /* Decrypt the second last block. */
++          memcpy(block, input + offset + 16, lenFrag);
++          RijndaelDecrypt(rijndael, block, outBuffer + offset);
++          memcpy(outBuffer + offset + 16, lastblock, lenFrag);
++          if (offset == 0)
++          {
++            for (i = 0; i < 16; i++)
++            {
++              (outBuffer + offset)[i] ^= rijndael->m_initVector[i];
++            }
++          }
++          else
++          {
++            for (i = 0; i < 16; i++)
++            {
++              (outBuffer + offset)[i] ^= (input + offset - 16)[i];
++            }
++          }
++        }
++#if STRICT_ALIGN 
++        memcpy(iv,rijndael->m_initVector,16); 
++#else
++        *((UINT32*)iv[0]) = *((UINT32*)(rijndael->m_initVector  ));
++        *((UINT32*)iv[1]) = *((UINT32*)(rijndael->m_initVector+ 4));
++        *((UINT32*)iv[2]) = *((UINT32*)(rijndael->m_initVector+ 8));
++        *((UINT32*)iv[3]) = *((UINT32*)(rijndael->m_initVector+12));
++#endif
++        for (i = numBlocks; i > 0; i--)
++        {
++          RijndaelDecrypt(rijndael, input, block);
++          ((UINT32*)block)[0] ^= *((UINT32*)iv[0]);
++          ((UINT32*)block)[1] ^= *((UINT32*)iv[1]);
++          ((UINT32*)block)[2] ^= *((UINT32*)iv[2]);
++          ((UINT32*)block)[3] ^= *((UINT32*)iv[3]);
++#if STRICT_ALIGN
++          memcpy(iv, input, 16);
++          memcpy(outBuf, block, 16);
++#else
++          *((UINT32*)iv[0]) = ((UINT32*)input)[0]; ((UINT32*)outBuffer)[0] = ((UINT32*)block)[0];
++          *((UINT32*)iv[1]) = ((UINT32*)input)[1]; ((UINT32*)outBuffer)[1] = ((UINT32*)block)[1];
++          *((UINT32*)iv[2]) = ((UINT32*)input)[2]; ((UINT32*)outBuffer)[2] = ((UINT32*)block)[2];
++          *((UINT32*)iv[3]) = ((UINT32*)input)[3]; ((UINT32*)outBuffer)[3] = ((UINT32*)block)[3];
++#endif
++          input += 16;
++          outBuffer += 16;
++        }
++      }
++      break;
++    case RIJNDAEL_Direction_Mode_CFB1:
++#if STRICT_ALIGN 
++      memcpy(iv, rijndael->m_initVector, 16); 
++#else
++      *((UINT32*)iv[0]) = *((UINT32*)(rijndael->m_initVector));
++      *((UINT32*)iv[1]) = *((UINT32*)(rijndael->m_initVector+ 4));
++      *((UINT32*)iv[2]) = *((UINT32*)(rijndael->m_initVector+ 8));
++      *((UINT32*)iv[3]) = *((UINT32*)(rijndael->m_initVector+12));
++#endif
++      for(i = numBlocks; i > 0; i--)
++      {
++        memcpy(outBuffer, input, 16);
++        for(k = 0; k < 128; k++)
++        {
++          *((UINT32*) block    ) = *((UINT32*)iv[0]);
++          *((UINT32*)(block+ 4)) = *((UINT32*)iv[1]);
++          *((UINT32*)(block+ 8)) = *((UINT32*)iv[2]);
++          *((UINT32*)(block+12)) = *((UINT32*)iv[3]);
++          RijndaelEncrypt(rijndael, block, block);
++          iv[0][0] = (UINT8) ((iv[0][0] << 1) | (iv[0][1] >> 7));
++          iv[0][1] = (UINT8) ((iv[0][1] << 1) | (iv[0][2] >> 7));
++          iv[0][2] = (UINT8) ((iv[0][2] << 1) | (iv[0][3] >> 7));
++          iv[0][3] = (UINT8) ((iv[0][3] << 1) | (iv[1][0] >> 7));
++          iv[1][0] = (UINT8) ((iv[1][0] << 1) | (iv[1][1] >> 7));
++          iv[1][1] = (UINT8) ((iv[1][1] << 1) | (iv[1][2] >> 7));
++          iv[1][2] = (UINT8) ((iv[1][2] << 1) | (iv[1][3] >> 7));
++          iv[1][3] = (UINT8) ((iv[1][3] << 1) | (iv[2][0] >> 7));
++          iv[2][0] = (UINT8) ((iv[2][0] << 1) | (iv[2][1] >> 7));
++          iv[2][1] = (UINT8) ((iv[2][1] << 1) | (iv[2][2] >> 7));
++          iv[2][2] = (UINT8) ((iv[2][2] << 1) | (iv[2][3] >> 7));
++          iv[2][3] = (UINT8) ((iv[2][3] << 1) | (iv[3][0] >> 7));
++          iv[3][0] = (UINT8) ((iv[3][0] << 1) | (iv[3][1] >> 7));
++          iv[3][1] = (UINT8) ((iv[3][1] << 1) | (iv[3][2] >> 7));
++          iv[3][2] = (UINT8) ((iv[3][2] << 1) | (iv[3][3] >> 7));
++          iv[3][3] = (UINT8) ((iv[3][3] << 1) | ((input[k/8] >> (7-(k&7))) & 1));
++          outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7);
++        }
++        outBuffer += 16;
++        input += 16;
++      }
++    break;
++    default:
++      return -1;
++    break;
++  }
++
++#ifdef TEST_AES_HW  
++  {
++    int cmpdata = memcmp((unsigned char*) outOrig, outBuffer2, inputLen/8);
++    TEST_AES_HW_DEBUG_LOG("aes dec: cmp=%d\n", cmpdata);
++    TEST_AES_HW_DEBUG_HEX("aes dec SW:", outOrig, 16);
++    TEST_AES_HW_DEBUG_HEX("aes dec HW:", outBuffer2, 16);
++  }
++#endif
++  
++  return 128*numBlocks;
++}
++
++int RijndaelPadDecrypt(Rijndael* rijndael, UINT8 *input, int inputOctets, UINT8 *outBuffer)
++{
++  int i, numBlocks, padLen;
++  UINT8 block[16];
++  UINT32 iv[4];
++
++  if (rijndael->m_state != RIJNDAEL_State_Valid) return RIJNDAEL_NOT_INITIALIZED;
++  if (rijndael->m_direction != RIJNDAEL_Direction_Decrypt) return RIJNDAEL_BAD_DIRECTION;
++
++  if (input == 0 || inputOctets <= 0) return 0;
++
++  if ((inputOctets % 16) != 0) return RIJNDAEL_CORRUPTED_DATA;
++
++  numBlocks = inputOctets/16;
++
++  switch (rijndael->m_mode)
++  {
++    case RIJNDAEL_Direction_Mode_ECB:
++      for (i = numBlocks - 1; i > 0; i--)
++      {
++        RijndaelDecrypt(rijndael, input, outBuffer);
++        input += 16;
++        outBuffer += 16;
++      }
++
++      RijndaelDecrypt(rijndael, input, block);
++      padLen = block[15];
++      if (padLen >= 16) return RIJNDAEL_CORRUPTED_DATA;
++      for(i = 16 - padLen; i < 16; i++)
++      {
++        if (block[i] != padLen) return RIJNDAEL_CORRUPTED_DATA;
++      }
++      memcpy(outBuffer, block, 16 - padLen);
++    break;  
++    case RIJNDAEL_Direction_Mode_CBC:
++      memcpy(iv, rijndael->m_initVector, 16);
++      /* all blocks but last */
++      for (i = numBlocks - 1; i > 0; i--)
++      {
++        RijndaelDecrypt(rijndael, input, block);
++        ((UINT32*)block)[0] ^= iv[0];
++        ((UINT32*)block)[1] ^= iv[1];
++        ((UINT32*)block)[2] ^= iv[2];
++        ((UINT32*)block)[3] ^= iv[3];
++        memcpy(iv, input, 16);
++        memcpy(outBuffer, block, 16);
++        input += 16;
++        outBuffer += 16;
++      }
++      /* last block */
++      RijndaelDecrypt(rijndael, input, block);
++      ((UINT32*)block)[0] ^= iv[0];
++      ((UINT32*)block)[1] ^= iv[1];
++      ((UINT32*)block)[2] ^= iv[2];
++      ((UINT32*)block)[3] ^= iv[3];
++      padLen = block[15];
++      if(padLen <= 0 || padLen > 16)return RIJNDAEL_CORRUPTED_DATA;
++      for(i = 16 - padLen; i < 16; i++)
++      {
++        if(block[i] != padLen)return RIJNDAEL_CORRUPTED_DATA;
++      }
++      memcpy(outBuffer, block, 16 - padLen);
++      break;
++    
++    default:
++      return -1;
++    break;
++  }
++  
++  return 16*numBlocks - padLen;
++}
++
++/*
++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
++// ALGORITHM
++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
++*/
++
++void RijndaelKeySched(Rijndael* rijndael, UINT8 key[_MAX_KEY_COLUMNS][4])
++{
++  int j,rconpointer = 0;
++
++  /* Calculate the necessary round keys */
++  /* The number of calculations depends on keyBits and blockBits */
++  int uKeyColumns = rijndael->m_uRounds - 6;
++
++  UINT8 tempKey[_MAX_KEY_COLUMNS][4];
++
++  UINT32 r = 0;
++  int t = 0;
++
++  /* Copy the input key to the temporary key matrix */
++
++  for(j = 0;j < uKeyColumns;j++)
++  {
++    *((UINT32*)(tempKey[j])) = *((UINT32*)(key[j]));
++  }
++
++
++  /* copy values into round key array */
++  for(j = 0;(j < uKeyColumns) && (r <= rijndael->m_uRounds); )
++  {
++    for(;(j < uKeyColumns) && (t < 4); j++, t++)
++    {
++      *((UINT32*)rijndael->m_expandedKey[r][t]) = *((UINT32*)tempKey[j]);
++    }
++
++
++    if(t == 4)
++    {
++      r++;
++      t = 0;
++    }
++  }
++    
++  while(r <= rijndael->m_uRounds)
++  {
++    tempKey[0][0] ^= S[tempKey[uKeyColumns-1][1]];
++    tempKey[0][1] ^= S[tempKey[uKeyColumns-1][2]];
++    tempKey[0][2] ^= S[tempKey[uKeyColumns-1][3]];
++    tempKey[0][3] ^= S[tempKey[uKeyColumns-1][0]];
++    tempKey[0][0] ^= rcon[rconpointer++];
++
++    if (uKeyColumns != 8)
++    {
++      for(j = 1; j < uKeyColumns; j++)
++      {
++        *((UINT32*)tempKey[j]) ^= *((UINT32*)tempKey[j-1]);
++      }
++    } else {
++      for(j = 1; j < uKeyColumns/2; j++)
++      {
++        *((UINT32*)tempKey[j]) ^= *((UINT32*)tempKey[j-1]);
++      }
++      tempKey[uKeyColumns/2][0] ^= S[tempKey[uKeyColumns/2 - 1][0]];
++      tempKey[uKeyColumns/2][1] ^= S[tempKey[uKeyColumns/2 - 1][1]];
++      tempKey[uKeyColumns/2][2] ^= S[tempKey[uKeyColumns/2 - 1][2]];
++      tempKey[uKeyColumns/2][3] ^= S[tempKey[uKeyColumns/2 - 1][3]];
++      for(j = uKeyColumns/2 + 1; j < uKeyColumns; j++)
++      {
++        *((UINT32*)tempKey[j]) ^= *((UINT32*)tempKey[j-1]);
++      }
++    }
++    for(j = 0; (j < uKeyColumns) && (r <= rijndael->m_uRounds); )
++    {
++      for(; (j < uKeyColumns) && (t < 4); j++, t++)
++      {
++        *((UINT32*)rijndael->m_expandedKey[r][t]) = *((UINT32*)tempKey[j]);
++      }
++      if(t == 4)
++      {
++        r++;
++        t = 0;
++      }
++    }
++  }    
++}
++
++void RijndaelKeyEncToDec(Rijndael* rijndael)
++{
++  UINT32 r;
++  UINT8 *w;
++
++  for(r = 1; r < rijndael->m_uRounds; r++)
++  {
++    w = rijndael->m_expandedKey[r][0];
++    *((UINT32*)w) = *((UINT32*)U1[w[0]]) ^ *((UINT32*)U2[w[1]]) ^ *((UINT32*)U3[w[2]]) ^ *((UINT32*)U4[w[3]]);
++    w = rijndael->m_expandedKey[r][1];
++    *((UINT32*)w) = *((UINT32*)U1[w[0]]) ^ *((UINT32*)U2[w[1]]) ^ *((UINT32*)U3[w[2]]) ^ *((UINT32*)U4[w[3]]);
++    w = rijndael->m_expandedKey[r][2];
++    *((UINT32*)w) = *((UINT32*)U1[w[0]]) ^ *((UINT32*)U2[w[1]]) ^ *((UINT32*)U3[w[2]]) ^ *((UINT32*)U4[w[3]]);
++    w = rijndael->m_expandedKey[r][3];
++    *((UINT32*)w) = *((UINT32*)U1[w[0]]) ^ *((UINT32*)U2[w[1]]) ^ *((UINT32*)U3[w[2]]) ^ *((UINT32*)U4[w[3]]);
++  }
++}  
++
++void RijndaelEncrypt(Rijndael* rijndael, UINT8 a[16], UINT8 b[16])
++{
++  UINT32 r;
++  UINT8 temp[4][4];
++
++    *((UINT32*)temp[0]) = *((UINT32*)(a   )) ^ *((UINT32*)rijndael->m_expandedKey[0][0]);
++    *((UINT32*)temp[1]) = *((UINT32*)(a+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[0][1]);
++    *((UINT32*)temp[2]) = *((UINT32*)(a+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[0][2]);
++    *((UINT32*)temp[3]) = *((UINT32*)(a+12)) ^ *((UINT32*)rijndael->m_expandedKey[0][3]);
++    *((UINT32*)(b    )) = *((UINT32*)T1[temp[0][0]])
++            ^ *((UINT32*)T2[temp[1][1]])
++            ^ *((UINT32*)T3[temp[2][2]]) 
++            ^ *((UINT32*)T4[temp[3][3]]);
++    *((UINT32*)(b + 4)) = *((UINT32*)T1[temp[1][0]])
++            ^ *((UINT32*)T2[temp[2][1]])
++            ^ *((UINT32*)T3[temp[3][2]]) 
++            ^ *((UINT32*)T4[temp[0][3]]);
++    *((UINT32*)(b + 8)) = *((UINT32*)T1[temp[2][0]])
++            ^ *((UINT32*)T2[temp[3][1]])
++            ^ *((UINT32*)T3[temp[0][2]]) 
++            ^ *((UINT32*)T4[temp[1][3]]);
++    *((UINT32*)(b +12)) = *((UINT32*)T1[temp[3][0]])
++            ^ *((UINT32*)T2[temp[0][1]])
++            ^ *((UINT32*)T3[temp[1][2]]) 
++            ^ *((UINT32*)T4[temp[2][3]]);
++  for(r = 1; r < rijndael->m_uRounds-1; r++)
++  {
++    *((UINT32*)temp[0]) = *((UINT32*)(b   )) ^ *((UINT32*)rijndael->m_expandedKey[r][0]);
++    *((UINT32*)temp[1]) = *((UINT32*)(b+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[r][1]);
++    *((UINT32*)temp[2]) = *((UINT32*)(b+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[r][2]);
++    *((UINT32*)temp[3]) = *((UINT32*)(b+12)) ^ *((UINT32*)rijndael->m_expandedKey[r][3]);
++
++    *((UINT32*)(b    )) = *((UINT32*)T1[temp[0][0]])
++              ^ *((UINT32*)T2[temp[1][1]])
++              ^ *((UINT32*)T3[temp[2][2]]) 
++              ^ *((UINT32*)T4[temp[3][3]]);
++    *((UINT32*)(b + 4)) = *((UINT32*)T1[temp[1][0]])
++              ^ *((UINT32*)T2[temp[2][1]])
++              ^ *((UINT32*)T3[temp[3][2]]) 
++              ^ *((UINT32*)T4[temp[0][3]]);
++    *((UINT32*)(b + 8)) = *((UINT32*)T1[temp[2][0]])
++              ^ *((UINT32*)T2[temp[3][1]])
++              ^ *((UINT32*)T3[temp[0][2]]) 
++              ^ *((UINT32*)T4[temp[1][3]]);
++    *((UINT32*)(b +12)) = *((UINT32*)T1[temp[3][0]])
++              ^ *((UINT32*)T2[temp[0][1]])
++              ^ *((UINT32*)T3[temp[1][2]]) 
++              ^ *((UINT32*)T4[temp[2][3]]);
++  }
++  *((UINT32*)temp[0]) = *((UINT32*)(b   )) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds-1][0]);
++  *((UINT32*)temp[1]) = *((UINT32*)(b+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds-1][1]);
++  *((UINT32*)temp[2]) = *((UINT32*)(b+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds-1][2]);
++  *((UINT32*)temp[3]) = *((UINT32*)(b+12)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds-1][3]);
++  b[ 0] = T1[temp[0][0]][1];
++  b[ 1] = T1[temp[1][1]][1];
++  b[ 2] = T1[temp[2][2]][1];
++  b[ 3] = T1[temp[3][3]][1];
++  b[ 4] = T1[temp[1][0]][1];
++  b[ 5] = T1[temp[2][1]][1];
++  b[ 6] = T1[temp[3][2]][1];
++  b[ 7] = T1[temp[0][3]][1];
++  b[ 8] = T1[temp[2][0]][1];
++  b[ 9] = T1[temp[3][1]][1];
++  b[10] = T1[temp[0][2]][1];
++  b[11] = T1[temp[1][3]][1];
++  b[12] = T1[temp[3][0]][1];
++  b[13] = T1[temp[0][1]][1];
++  b[14] = T1[temp[1][2]][1];
++  b[15] = T1[temp[2][3]][1];
++  *((UINT32*)(b   )) ^= *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][0]);
++  *((UINT32*)(b+ 4)) ^= *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][1]);
++  *((UINT32*)(b+ 8)) ^= *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][2]);
++  *((UINT32*)(b+12)) ^= *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][3]);
++}
++
++void RijndaelDecrypt(Rijndael* rijndael, UINT8 a[16], UINT8 b[16])
++{
++  int r;
++  UINT8 temp[4][4];
++  
++    *((UINT32*)temp[0]) = *((UINT32*)(a   )) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][0]);
++    *((UINT32*)temp[1]) = *((UINT32*)(a+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][1]);
++    *((UINT32*)temp[2]) = *((UINT32*)(a+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][2]);
++    *((UINT32*)temp[3]) = *((UINT32*)(a+12)) ^ *((UINT32*)rijndael->m_expandedKey[rijndael->m_uRounds][3]);
++
++    *((UINT32*)(b   )) = *((UINT32*)T5[temp[0][0]])
++           ^ *((UINT32*)T6[temp[3][1]])
++           ^ *((UINT32*)T7[temp[2][2]]) 
++           ^ *((UINT32*)T8[temp[1][3]]);
++  *((UINT32*)(b+ 4)) = *((UINT32*)T5[temp[1][0]])
++           ^ *((UINT32*)T6[temp[0][1]])
++           ^ *((UINT32*)T7[temp[3][2]]) 
++           ^ *((UINT32*)T8[temp[2][3]]);
++  *((UINT32*)(b+ 8)) = *((UINT32*)T5[temp[2][0]])
++           ^ *((UINT32*)T6[temp[1][1]])
++           ^ *((UINT32*)T7[temp[0][2]]) 
++           ^ *((UINT32*)T8[temp[3][3]]);
++  *((UINT32*)(b+12)) = *((UINT32*)T5[temp[3][0]])
++           ^ *((UINT32*)T6[temp[2][1]])
++           ^ *((UINT32*)T7[temp[1][2]]) 
++           ^ *((UINT32*)T8[temp[0][3]]);
++  for(r = rijndael->m_uRounds-1; r > 1; r--)
++  {
++    *((UINT32*)temp[0]) = *((UINT32*)(b   )) ^ *((UINT32*)rijndael->m_expandedKey[r][0]);
++    *((UINT32*)temp[1]) = *((UINT32*)(b+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[r][1]);
++    *((UINT32*)temp[2]) = *((UINT32*)(b+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[r][2]);
++    *((UINT32*)temp[3]) = *((UINT32*)(b+12)) ^ *((UINT32*)rijndael->m_expandedKey[r][3]);
++    *((UINT32*)(b   )) = *((UINT32*)T5[temp[0][0]])
++           ^ *((UINT32*)T6[temp[3][1]])
++           ^ *((UINT32*)T7[temp[2][2]]) 
++           ^ *((UINT32*)T8[temp[1][3]]);
++    *((UINT32*)(b+ 4)) = *((UINT32*)T5[temp[1][0]])
++           ^ *((UINT32*)T6[temp[0][1]])
++           ^ *((UINT32*)T7[temp[3][2]]) 
++           ^ *((UINT32*)T8[temp[2][3]]);
++    *((UINT32*)(b+ 8)) = *((UINT32*)T5[temp[2][0]])
++           ^ *((UINT32*)T6[temp[1][1]])
++           ^ *((UINT32*)T7[temp[0][2]]) 
++           ^ *((UINT32*)T8[temp[3][3]]);
++    *((UINT32*)(b+12)) = *((UINT32*)T5[temp[3][0]])
++           ^ *((UINT32*)T6[temp[2][1]])
++           ^ *((UINT32*)T7[temp[1][2]]) 
++           ^ *((UINT32*)T8[temp[0][3]]);
++  }
++ 
++  *((UINT32*)temp[0]) = *((UINT32*)(b   )) ^ *((UINT32*)rijndael->m_expandedKey[1][0]);
++  *((UINT32*)temp[1]) = *((UINT32*)(b+ 4)) ^ *((UINT32*)rijndael->m_expandedKey[1][1]);
++  *((UINT32*)temp[2]) = *((UINT32*)(b+ 8)) ^ *((UINT32*)rijndael->m_expandedKey[1][2]);
++  *((UINT32*)temp[3]) = *((UINT32*)(b+12)) ^ *((UINT32*)rijndael->m_expandedKey[1][3]);
++  b[ 0] = S5[temp[0][0]];
++  b[ 1] = S5[temp[3][1]];
++  b[ 2] = S5[temp[2][2]];
++  b[ 3] = S5[temp[1][3]];
++  b[ 4] = S5[temp[1][0]];
++  b[ 5] = S5[temp[0][1]];
++  b[ 6] = S5[temp[3][2]];
++  b[ 7] = S5[temp[2][3]];
++  b[ 8] = S5[temp[2][0]];
++  b[ 9] = S5[temp[1][1]];
++  b[10] = S5[temp[0][2]];
++  b[11] = S5[temp[3][3]];
++  b[12] = S5[temp[3][0]];
++  b[13] = S5[temp[2][1]];
++  b[14] = S5[temp[1][2]];
++  b[15] = S5[temp[0][3]];
++  *((UINT32*)(b   )) ^= *((UINT32*)rijndael->m_expandedKey[0][0]);
++  *((UINT32*)(b+ 4)) ^= *((UINT32*)rijndael->m_expandedKey[0][1]);
++  *((UINT32*)(b+ 8)) ^= *((UINT32*)rijndael->m_expandedKey[0][2]);
++  *((UINT32*)(b+12)) ^= *((UINT32*)rijndael->m_expandedKey[0][3]);
++}
++
++void RijndaelInvalidate(Rijndael* rijndael)
++{
++  rijndael->m_state = RIJNDAEL_State_Invalid;
++}
++/*** End of #include "rijndael.c" ***/
++
++#endif
++/* #include "codec_algos.c" */
++/*** Begin of #include "codec_algos.c" ***/
++/*
++** Name:        codec_algos.c
++** Purpose:     Implementation of SQLite codec algorithms
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++/*** Begin of #include "cipher_common.h" ***/
++/*
++** Name:        cipher_common.h
++** Purpose:     Header for the ciphers of SQLite3 Multiple Ciphers
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2022 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef CIPHER_COMMON_H_
++#define CIPHER_COMMON_H_
++
++/* #include "sqlite3mc.h" */
++
++
++/*
++// ATTENTION: Macro similar to that in pager.c
++// TODO: Check in case of new version of SQLite
++*/
++#define WX_PAGER_MJ_PGNO(x) ((PENDING_BYTE/(x))+1)
++
++#define CODEC_TYPE_DEFAULT CODEC_TYPE_CHACHA20
++
++#ifndef CODEC_TYPE
++#define CODEC_TYPE CODEC_TYPE_DEFAULT
++#endif
++
++#if CODEC_TYPE < 1 || CODEC_TYPE > CODEC_TYPE_MAX_BUILTIN
++#error "Invalid codec type selected"
++#endif
++
++/*
++** Define the maximum number of ciphers that can be registered
++*/
++
++/* Use a reasonable upper limit for the maximum number of ciphers */
++#define CODEC_COUNT_LIMIT 16
++
++#ifdef SQLITE3MC_MAX_CODEC_COUNT
++/* Allow at least to register all built-in ciphers, but use a reasonable upper limit */
++#if SQLITE3MC_MAX_CODEC_COUNT >= CODEC_TYPE_MAX_BUILTIN && SQLITE3MC_MAX_CODEC_COUNT <= CODEC_COUNT_LIMIT
++#define CODEC_COUNT_MAX SQLITE3MC_MAX_CODEC_COUNT
++#else
++#error "Maximum cipher count not in range [CODEC_TYPE_MAX_BUILTIN .. CODEC_COUNT_LIMIT]"
++#endif
++#else
++#define CODEC_COUNT_MAX CODEC_COUNT_LIMIT
++#endif
++
++#define CIPHER_NAME_MAXLEN 32
++#define CIPHER_PARAMS_COUNT_MAX 64
++
++#define MAXKEYLENGTH     32
++#define KEYLENGTH_AES128 16
++#define KEYLENGTH_AES256 32
++#define KEYSALT_LENGTH   16
++
++#define CODEC_SHA_ITER 4001
++
++typedef struct _CodecParameter
++{
++  char* m_name;
++  int           m_id;
++  CipherParams* m_params;
++} CodecParameter;
++
++typedef struct _Codec
++{
++  int           m_isEncrypted;
++  int           m_hmacCheck;
++  int           m_walLegacy;
++  /* Read cipher */
++  int           m_hasReadCipher;
++  int           m_readCipherType;
++  void*         m_readCipher;
++  int           m_readReserved;
++  /* Write cipher */
++  int           m_hasWriteCipher;
++  int           m_writeCipherType;
++  void*         m_writeCipher;
++  int           m_writeReserved;
++
++  sqlite3*      m_db; /* Pointer to DB */
++#if 0
++  Btree*        m_bt; /* Pointer to B-tree used by DB */
++#endif
++  BtShared*     m_btShared; /* Pointer to shared B-tree used by DB */
++  unsigned char m_page[SQLITE_MAX_PAGE_SIZE + 24];
++  int           m_pageSize;
++  int           m_reserved;
++  int           m_hasKeySalt;
++  unsigned char m_keySalt[KEYSALT_LENGTH];
++} Codec;
++
++#define CIPHER_PARAMS_SENTINEL  { "", 0, 0, 0, 0 }
++#define CIPHER_PAGE1_OFFSET 24
++
++SQLITE_PRIVATE int sqlite3mcGetCipherParameter(CipherParams* cipherParams, const char* paramName);
++
++SQLITE_PRIVATE int sqlite3mcGetCipherType(sqlite3* db);
++
++SQLITE_PRIVATE CipherParams* sqlite3mcGetCipherParams(sqlite3* db, const char* cipherName);
++
++SQLITE_PRIVATE int sqlite3mcCodecInit(Codec* codec);
++
++SQLITE_PRIVATE void sqlite3mcCodecTerm(Codec* codec);
++
++SQLITE_PRIVATE void sqlite3mcClearKeySalt(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcCodecSetup(Codec* codec, int cipherType, char* userPassword, int passwordLength);
++
++SQLITE_PRIVATE int sqlite3mcSetupWriteCipher(Codec* codec, int cipherType, char* userPassword, int passwordLength);
++
++SQLITE_PRIVATE void sqlite3mcSetIsEncrypted(Codec* codec, int isEncrypted);
++
++SQLITE_PRIVATE void sqlite3mcSetReadCipherType(Codec* codec, int cipherType);
++
++SQLITE_PRIVATE void sqlite3mcSetWriteCipherType(Codec* codec, int cipherType);
++
++SQLITE_PRIVATE void sqlite3mcSetHasReadCipher(Codec* codec, int hasReadCipher);
++
++SQLITE_PRIVATE void sqlite3mcSetHasWriteCipher(Codec* codec, int hasWriteCipher);
++
++SQLITE_PRIVATE void sqlite3mcSetDb(Codec* codec, sqlite3* db);
++
++SQLITE_PRIVATE void sqlite3mcSetBtree(Codec* codec, Btree* bt);
++
++SQLITE_PRIVATE void sqlite3mcSetReadReserved(Codec* codec, int reserved);
++
++SQLITE_PRIVATE void sqlite3mcSetWriteReserved(Codec* codec, int reserved);
++
++SQLITE_PRIVATE int sqlite3mcIsEncrypted(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcHasReadCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcHasWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE BtShared* sqlite3mcGetBtShared(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetPageSize(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetReadReserved(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetWriteReserved(Codec* codec);
++
++SQLITE_PRIVATE unsigned char* sqlite3mcGetPageBuffer(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetLegacyReadCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetLegacyWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetPageSizeReadCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetPageSizeWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetReservedReadCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcGetReservedWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcReservedEqual(Codec* codec);
++
++SQLITE_PRIVATE unsigned char* sqlite3mcGetSaltWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE int sqlite3mcCodecCopy(Codec* codec, Codec* other);
++
++SQLITE_PRIVATE void sqlite3mcGenerateReadKey(Codec* codec, char* userPassword, int passwordLength, unsigned char* cipherSalt);
++
++SQLITE_PRIVATE void sqlite3mcGenerateWriteKey(Codec* codec, char* userPassword, int passwordLength, unsigned char* cipherSalt);
++
++SQLITE_PRIVATE int sqlite3mcEncrypt(Codec* codec, int page, unsigned char* data, int len, int useWriteKey);
++
++SQLITE_PRIVATE int sqlite3mcDecrypt(Codec* codec, int page, unsigned char* data, int len);
++
++SQLITE_PRIVATE int sqlite3mcCopyCipher(Codec* codec, int read2write);
++
++SQLITE_PRIVATE void sqlite3mcPadPassword(char* password, int pswdlen, unsigned char pswd[32]);
++
++SQLITE_PRIVATE void sqlite3mcRC4(unsigned char* key, int keylen, unsigned char* textin, int textlen, unsigned char* textout);
++
++SQLITE_PRIVATE void sqlite3mcGetMD5Binary(unsigned char* data, int length, unsigned char* digest);
++
++SQLITE_PRIVATE void sqlite3mcGetSHABinary(unsigned char* data, int length, unsigned char* digest);
++
++SQLITE_PRIVATE void sqlite3mcGenerateInitialVector(int seed, unsigned char iv[16]);
++
++SQLITE_PRIVATE int sqlite3mcIsHexKey(const unsigned char* hex, int len);
++
++SQLITE_PRIVATE int sqlite3mcConvertHex2Int(char c);
++
++SQLITE_PRIVATE void sqlite3mcConvertHex2Bin(const unsigned char* hex, int len, unsigned char* bin);
++
++SQLITE_PRIVATE int sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault);
++
++SQLITE_PRIVATE void sqlite3mcConfigureSQLCipherVersion(sqlite3* db, int configDefault, int legacyVersion);
++
++SQLITE_PRIVATE int sqlite3mcCodecAttach(sqlite3* db, int nDb, const char* zPath, const void* zKey, int nKey);
++
++SQLITE_PRIVATE void sqlite3mcCodecGetKey(sqlite3* db, int nDb, void** zKey, int* nKey);
++
++SQLITE_PRIVATE void sqlite3mcSecureZeroMemory(void* v, size_t n);
++
++/* Debugging */
++
++#if 0
++#define SQLITE3MC_DEBUG
++#define SQLITE3MC_DEBUG_DATA
++#endif
++
++#ifdef SQLITE3MC_DEBUG
++#define SQLITE3MC_DEBUG_LOG(...)  { fprintf(stdout, __VA_ARGS__); fflush(stdout); }
++#else
++#define SQLITE3MC_DEBUG_LOG(...)
++#endif
++
++#ifdef SQLITE3MC_DEBUG_DATA
++#define SQLITE3MC_DEBUG_HEX(DESC,BUFFER,LEN)  \
++  { \
++    int count; \
++    printf(DESC); \
++    for (count = 0; count < LEN; ++count) \
++    { \
++      if (count % 16 == 0) printf("\n%05x: ", count); \
++      printf("%02x ", ((unsigned char*) BUFFER)[count]); \
++    } \
++    printf("\n"); \
++    fflush(stdout); \
++  }
++#else
++#define SQLITE3MC_DEBUG_HEX(DESC,BUFFER,LEN)
++#endif
++
++/*
++** If encryption was enabled and WAL journal mode was used,
++** SQLite3 Multiple Ciphers encrypted the WAL journal frames up to version 1.2.5
++** within the VFS implementation. As a consequence the WAL journal file was not
++** compatible with legacy encryption implementations (for example, System.Data.SQLite
++** or SQLCipher). Additionally, the implementation of the WAL journal encryption
++** was broken, because reading and writing of complete WAL frames was not handled
++** correctly. Usually, operating in WAL journal mode worked nevertheless, but after
++** crashes the WAL journal file could be corrupted leading to data loss.
++**
++** Version 1.3.0 introduced a new way to handle WAL journal encryption. The advantage
++** is that the WAL journal file is now compatible with legacy encryption implementations.
++** Unfortunately the new implementation is not compatible with that used up to version
++** 1.2.5. To be able to access WAL journals created by prior versions, the configuration
++** parameter 'mc_legacy_wal' was introduced. If the parameter is set to 1, then the
++** prior WAL journal encryption mode is used. The default of this parameter can be set
++** at compile time by setting the symbol SQLITE3MC_LEGACY_WAL accordingly, but the actual
++** value can also be set at runtime using the pragma or the URI parameter 'mc_legacy_wal'.
++**
++** In principle, operating generally in WAL legacy mode is possible, but it is strongly
++** recommended to use the WAL legacy mode only to recover WAL journals left behind by
++** prior versions without data loss.
++*/
++#ifndef SQLITE3MC_LEGACY_WAL
++#define SQLITE3MC_LEGACY_WAL 0
++#endif
++
++#endif
++/*** End of #include "cipher_common.h" ***/
++
++#if HAVE_CIPHER_AES_128_CBC || HAVE_CIPHER_AES_256_CBC || HAVE_CIPHER_SQLCIPHER
++/* #include "rijndael.h" */
++
++#endif
++
++/*
++** RC4 implementation
++*/
++
++SQLITE_PRIVATE void
++sqlite3mcRC4(unsigned char* key, int keylen,
++             unsigned char* textin, int textlen,
++             unsigned char* textout)
++{
++  int i;
++  int j;
++  int t;
++  unsigned char rc4[256];
++
++  int a = 0;
++  int b = 0;
++  unsigned char k;
++
++  for (i = 0; i < 256; i++)
++  {
++    rc4[i] = i;
++  }
++  j = 0;
++  for (i = 0; i < 256; i++)
++  {
++    t = rc4[i];
++    j = (j + t + key[i % keylen]) % 256;
++    rc4[i] = rc4[j];
++    rc4[j] = t;
++  }
++
++  for (i = 0; i < textlen; i++)
++  {
++    a = (a + 1) % 256;
++    t = rc4[a];
++    b = (b + t) % 256;
++    rc4[a] = rc4[b];
++    rc4[b] = t;
++    k = rc4[(rc4[a] + rc4[b]) % 256];
++    textout[i] = textin[i] ^ k;
++  }
++}
++
++SQLITE_PRIVATE void
++sqlite3mcGetMD5Binary(unsigned char* data, int length, unsigned char* digest)
++{
++  MD5_CTX ctx;
++  MD5_Init(&ctx);
++  MD5_Update(&ctx, data, length);
++  MD5_Final(digest,&ctx);
++}
++
++SQLITE_PRIVATE void
++sqlite3mcGetSHABinary(unsigned char* data, int length, unsigned char* digest)
++{
++  sha256(data, (unsigned int) length, digest);
++}
++
++#define MODMULT(a, b, c, m, s) q = s / a; s = b * (s - a * q) - c * q; if (s < 0) s += m
++
++SQLITE_PRIVATE void
++sqlite3mcGenerateInitialVector(int seed, unsigned char iv[16])
++{
++  unsigned char initkey[16];
++  int j, q;
++  int z = seed + 1;
++  for (j = 0; j < 4; j++)
++  {
++    MODMULT(52774, 40692,  3791, 2147483399L, z);
++    initkey[4*j+0] = 0xff &  z;
++    initkey[4*j+1] = 0xff & (z >>  8);
++    initkey[4*j+2] = 0xff & (z >> 16);
++    initkey[4*j+3] = 0xff & (z >> 24);
++  }
++  sqlite3mcGetMD5Binary((unsigned char*) initkey, 16, iv);
++}
++
++#if HAVE_CIPHER_AES_128_CBC
++
++SQLITE_PRIVATE int
++sqlite3mcAES128(Rijndael* aesCtx, int page, int encrypt, unsigned char encryptionKey[KEYLENGTH_AES128],
++                unsigned char* datain, int datalen, unsigned char* dataout)
++{
++  int rc = SQLITE_OK;
++  unsigned char initial[16];
++  unsigned char pagekey[KEYLENGTH_AES128];
++  unsigned char nkey[KEYLENGTH_AES128+4+4];
++  int keyLength = KEYLENGTH_AES128;
++  int nkeylen = keyLength + 4 + 4;
++  int j;
++  int direction = (encrypt) ? RIJNDAEL_Direction_Encrypt : RIJNDAEL_Direction_Decrypt;
++  int len = 0;
++
++  for (j = 0; j < keyLength; j++)
++  {
++    nkey[j] = encryptionKey[j];
++  }
++  nkey[keyLength+0] = 0xff &  page;
++  nkey[keyLength+1] = 0xff & (page >>  8);
++  nkey[keyLength+2] = 0xff & (page >> 16);
++  nkey[keyLength+3] = 0xff & (page >> 24);
++
++  /* AES encryption needs some 'salt' */
++  nkey[keyLength+4] = 0x73;
++  nkey[keyLength+5] = 0x41;
++  nkey[keyLength+6] = 0x6c;
++  nkey[keyLength+7] = 0x54;
++
++  sqlite3mcGetMD5Binary(nkey, nkeylen, pagekey);
++  sqlite3mcGenerateInitialVector(page, initial);
++  RijndaelInit(aesCtx, RIJNDAEL_Direction_Mode_CBC, direction, pagekey, RIJNDAEL_Direction_KeyLength_Key16Bytes, initial);
++  if (encrypt)
++  {
++    len = RijndaelBlockEncrypt(aesCtx, datain, datalen*8, dataout);
++  }
++  else
++  {
++    len = RijndaelBlockDecrypt(aesCtx, datain, datalen*8, dataout);
++  }
++  
++  /* It is a good idea to check the error code */
++  if (len < 0)
++  {
++    /* AES: Error on encrypting. */
++    rc = SQLITE_ERROR;
++  }
++  return rc;
++}
++
++#endif
++
++#if HAVE_CIPHER_AES_256_CBC
++
++SQLITE_PRIVATE int
++sqlite3mcAES256(Rijndael* aesCtx, int page, int encrypt, unsigned char encryptionKey[KEYLENGTH_AES256],
++                unsigned char* datain, int datalen, unsigned char* dataout)
++{
++  int rc = SQLITE_OK;
++  unsigned char initial[16];
++  unsigned char pagekey[KEYLENGTH_AES256];
++  unsigned char nkey[KEYLENGTH_AES256+4+4];
++  int keyLength = KEYLENGTH_AES256;
++  int nkeylen = keyLength + 4 + 4;
++  int j;
++  int direction = (encrypt) ? RIJNDAEL_Direction_Encrypt : RIJNDAEL_Direction_Decrypt;
++  int len = 0;
++
++  for (j = 0; j < keyLength; j++)
++  {
++    nkey[j] = encryptionKey[j];
++  }
++  nkey[keyLength+0] = 0xff &  page;
++  nkey[keyLength+1] = 0xff & (page >>  8);
++  nkey[keyLength+2] = 0xff & (page >> 16);
++  nkey[keyLength+3] = 0xff & (page >> 24);
++
++  /* AES encryption needs some 'salt' */
++  nkey[keyLength+4] = 0x73;
++  nkey[keyLength+5] = 0x41;
++  nkey[keyLength+6] = 0x6c;
++  nkey[keyLength+7] = 0x54;
++
++  sqlite3mcGetSHABinary(nkey, nkeylen, pagekey);
++  sqlite3mcGenerateInitialVector(page, initial);
++  RijndaelInit(aesCtx, RIJNDAEL_Direction_Mode_CBC, direction, pagekey, RIJNDAEL_Direction_KeyLength_Key32Bytes, initial);
++  if (encrypt)
++  {
++    len = RijndaelBlockEncrypt(aesCtx, datain, datalen*8, dataout);
++  }
++  else
++  {
++    len = RijndaelBlockDecrypt(aesCtx, datain, datalen*8, dataout);
++  }
++  
++  /* It is a good idea to check the error code */
++  if (len < 0)
++  {
++    /* AES: Error on encrypting. */
++    rc = SQLITE_ERROR;
++  }
++  return rc;
++}
++
++#endif
++
++/* Check hex encoding */
++SQLITE_PRIVATE int
++sqlite3mcIsHexKey(const unsigned char* hex, int len)
++{
++  int j;
++  for (j = 0; j < len; ++j)
++  {
++    unsigned char c = hex[j];
++    if ((c < '0' || c > '9') && (c < 'A' || c > 'F') && (c < 'a' || c > 'f'))
++    {
++      return 0;
++    }
++  }
++  return 1;
++}
++
++/* Convert single hex digit */
++SQLITE_PRIVATE int
++sqlite3mcConvertHex2Int(char c)
++{
++  return (c >= '0' && c <= '9') ? (c)-'0' :
++    (c >= 'A' && c <= 'F') ? (c)-'A' + 10 :
++    (c >= 'a' && c <= 'f') ? (c)-'a' + 10 : 0;
++}
++
++/* Convert hex encoded string to binary */
++SQLITE_PRIVATE void
++sqlite3mcConvertHex2Bin(const unsigned char* hex, int len, unsigned char* bin)
++{
++  int j;
++  for (j = 0; j < len; j += 2)
++  {
++    bin[j / 2] = (sqlite3mcConvertHex2Int(hex[j]) << 4) | sqlite3mcConvertHex2Int(hex[j + 1]);
++  }
++}
++/*** End of #include "codec_algos.c" ***/
++
++
++/* #include "cipher_wxaes128.c" */
++/*** Begin of #include "cipher_wxaes128.c" ***/
++/*
++** Name:        cipher_wxaes128.c
++** Purpose:     Implementation of cipher wxSQLite3 AES 128-bit
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- AES 128-bit cipher (wxSQLite3) --- */
++#if HAVE_CIPHER_AES_128_CBC
++
++#define CIPHER_NAME_AES128 "aes128cbc"
++
++/*
++** Configuration parameters for "aes128cbc"
++**
++** - legacy mode : compatibility with first version (page 1 encrypted)
++**                 possible values:  1 = yes, 0 = no (default)
++*/
++
++#ifdef WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
++#define AES128_LEGACY_DEFAULT 1
++#else
++#define AES128_LEGACY_DEFAULT 0
++#endif
++
++SQLITE_PRIVATE CipherParams mcAES128Params[] =
++{
++  { "legacy",            AES128_LEGACY_DEFAULT, AES128_LEGACY_DEFAULT, 0, 1 },
++  { "legacy_page_size",  0,                     0,                     0, SQLITE_MAX_PAGE_SIZE },
++  CIPHER_PARAMS_SENTINEL
++};
++
++typedef struct _AES128Cipher
++{
++  int       m_legacy;
++  int       m_legacyPageSize;
++  int       m_keyLength;
++  uint8_t   m_key[KEYLENGTH_AES128];
++  Rijndael* m_aes;
++} AES128Cipher;
++
++static void*
++AllocateAES128Cipher(sqlite3* db)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*) sqlite3_malloc(sizeof(AES128Cipher));
++  if (aesCipher != NULL)
++  {
++    aesCipher->m_aes = (Rijndael*) sqlite3_malloc(sizeof(Rijndael));
++    if (aesCipher->m_aes != NULL)
++    {
++      aesCipher->m_keyLength = KEYLENGTH_AES128;
++      memset(aesCipher->m_key, 0, KEYLENGTH_AES128);
++      RijndaelCreate(aesCipher->m_aes);
++    }
++    else
++    {
++      sqlite3_free(aesCipher);
++      aesCipher = NULL;
++    }
++  }
++  if (aesCipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_AES128);
++    aesCipher->m_legacy = sqlite3mcGetCipherParameter(cipherParams, "legacy");
++    aesCipher->m_legacyPageSize = sqlite3mcGetCipherParameter(cipherParams, "legacy_page_size");
++  }
++  return aesCipher;
++}
++
++static void
++FreeAES128Cipher(void* cipher)
++{
++  AES128Cipher* localCipher = (AES128Cipher*) cipher;
++  memset(localCipher->m_aes, 0, sizeof(Rijndael));
++  sqlite3_free(localCipher->m_aes);
++  memset(localCipher, 0, sizeof(AES128Cipher));
++  sqlite3_free(localCipher);
++}
++
++static void
++CloneAES128Cipher(void* cipherTo, void* cipherFrom)
++{
++  AES128Cipher* aesCipherTo = (AES128Cipher*) cipherTo;
++  AES128Cipher* aesCipherFrom = (AES128Cipher*) cipherFrom;
++  aesCipherTo->m_legacy = aesCipherFrom->m_legacy;
++  aesCipherTo->m_legacyPageSize = aesCipherFrom->m_legacyPageSize;
++  aesCipherTo->m_keyLength = aesCipherFrom->m_keyLength;
++  memcpy(aesCipherTo->m_key, aesCipherFrom->m_key, KEYLENGTH_AES128);
++  RijndaelInvalidate(aesCipherTo->m_aes);
++  RijndaelInvalidate(aesCipherFrom->m_aes);
++}
++
++static int
++GetLegacyAES128Cipher(void* cipher)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*)cipher;
++  return aesCipher->m_legacy;
++}
++
++static int
++GetPageSizeAES128Cipher(void* cipher)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*) cipher;
++  int pageSize = 0;
++  if (aesCipher->m_legacy != 0)
++  {
++    pageSize = aesCipher->m_legacyPageSize;
++    if ((pageSize < 512) || (pageSize > SQLITE_MAX_PAGE_SIZE) || (((pageSize - 1) & pageSize) != 0))
++    {
++      pageSize = 0;
++    }
++  }
++  return pageSize;
++}
++
++static int
++GetReservedAES128Cipher(void* cipher)
++{
++  return 0;
++}
++
++static unsigned char*
++GetSaltAES128Cipher(void* cipher)
++{
++  return NULL;
++}
++
++static void
++GenerateKeyAES128Cipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*) cipher;
++  unsigned char userPad[32];
++  unsigned char ownerPad[32];
++  unsigned char ownerKey[32];
++
++  unsigned char mkey[MD5_HASHBYTES];
++  unsigned char digest[MD5_HASHBYTES];
++  int keyLength = MD5_HASHBYTES;
++  int i, j, k;
++  MD5_CTX ctx;
++
++  /* Pad passwords */
++  sqlite3mcPadPassword(userPassword, passwordLength, userPad);
++  sqlite3mcPadPassword("", 0, ownerPad);
++
++  /* Compute owner key */
++
++  MD5_Init(&ctx);
++  MD5_Update(&ctx, ownerPad, 32);
++  MD5_Final(digest, &ctx);
++
++  /* only use for the input as many bit as the key consists of */
++  for (k = 0; k < 50; ++k)
++  {
++    MD5_Init(&ctx);
++    MD5_Update(&ctx, digest, keyLength);
++    MD5_Final(digest, &ctx);
++  }
++  memcpy(ownerKey, userPad, 32);
++  for (i = 0; i < 20; ++i)
++  {
++    for (j = 0; j < keyLength; ++j)
++    {
++      mkey[j] = (digest[j] ^ i);
++    }
++    sqlite3mcRC4(mkey, keyLength, ownerKey, 32, ownerKey);
++  }
++
++  /* Compute encryption key */
++
++  MD5_Init(&ctx);
++  MD5_Update(&ctx, userPad, 32);
++  MD5_Update(&ctx, ownerKey, 32);
++  MD5_Final(digest, &ctx);
++
++  /* only use the really needed bits as input for the hash */
++  for (k = 0; k < 50; ++k)
++  {
++    MD5_Init(&ctx);
++    MD5_Update(&ctx, digest, keyLength);
++    MD5_Final(digest, &ctx);
++  }
++  memcpy(aesCipher->m_key, digest, aesCipher->m_keyLength);
++}
++
++static int
++EncryptPageAES128Cipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*) cipher;
++  int rc = SQLITE_OK;
++  if (aesCipher->m_legacy != 0)
++  {
++    /* Use the legacy encryption scheme */
++    unsigned char* key = aesCipher->m_key;
++    rc = sqlite3mcAES128(aesCipher->m_aes, page, 1, key, data, len, data);
++  }
++  else
++  {
++    unsigned char dbHeader[8];
++    int offset = 0;
++    unsigned char* key = aesCipher->m_key;
++    if (page == 1)
++    {
++      /* Save the header bytes remaining unencrypted */
++      memcpy(dbHeader, data + 16, 8);
++      offset = 16;
++      sqlite3mcAES128(aesCipher->m_aes, page, 1, key, data, 16, data);
++    }
++    rc = sqlite3mcAES128(aesCipher->m_aes, page, 1, key, data + offset, len - offset, data + offset);
++    if (page == 1)
++    {
++      /* Move the encrypted header bytes 16..23 to a safe position */
++      memcpy(data + 8, data + 16, 8);
++      /* Restore the unencrypted header bytes 16..23 */
++      memcpy(data + 16, dbHeader, 8);
++    }
++  }
++  return rc;
++}
++
++static int
++DecryptPageAES128Cipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  AES128Cipher* aesCipher = (AES128Cipher*) cipher;
++  int rc = SQLITE_OK;
++  if (aesCipher->m_legacy != 0)
++  {
++    /* Use the legacy encryption scheme */
++    rc = sqlite3mcAES128(aesCipher->m_aes, page, 0, aesCipher->m_key, data, len, data);
++  }
++  else
++  {
++    unsigned char dbHeader[8];
++    int dbPageSize;
++    int offset = 0;
++    if (page == 1)
++    {
++      /* Save (unencrypted) header bytes 16..23 */
++      memcpy(dbHeader, data + 16, 8);
++      /* Determine page size */
++      dbPageSize = (dbHeader[0] << 8) | (dbHeader[1] << 16);
++      /* Check whether the database header is valid */
++      /* If yes, the database follows the new encryption scheme, otherwise use the previous encryption scheme */
++      if ((dbPageSize >= 512) && (dbPageSize <= SQLITE_MAX_PAGE_SIZE) && (((dbPageSize - 1) & dbPageSize) == 0) &&
++          (dbHeader[5] == 0x40) && (dbHeader[6] == 0x20) && (dbHeader[7] == 0x20))
++      {
++        /* Restore encrypted bytes 16..23 for new encryption scheme */
++        memcpy(data + 16, data + 8, 8);
++        offset = 16;
++      }
++    }
++    rc = sqlite3mcAES128(aesCipher->m_aes, page, 0, aesCipher->m_key, data + offset, len - offset, data + offset);
++    if (page == 1 && offset != 0)
++    {
++      /* Verify the database header */
++      if (memcmp(dbHeader, data + 16, 8) == 0)
++      {
++        memcpy(data, SQLITE_FILE_HEADER, 16);
++      }
++    }
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE const CipherDescriptor mcAES128Descriptor =
++{
++  CIPHER_NAME_AES128,
++  AllocateAES128Cipher,
++  FreeAES128Cipher,
++  CloneAES128Cipher,
++  GetLegacyAES128Cipher,
++  GetPageSizeAES128Cipher,
++  GetReservedAES128Cipher,
++  GetSaltAES128Cipher,
++  GenerateKeyAES128Cipher,
++  EncryptPageAES128Cipher,
++  DecryptPageAES128Cipher
++};
++#endif
++/*** End of #include "cipher_wxaes128.c" ***/
++
++/* #include "cipher_wxaes256.c" */
++/*** Begin of #include "cipher_wxaes256.c" ***/
++/*
++** Name:        cipher_wxaes256.c
++** Purpose:     Implementation of cipher wxSQLite3 AES 256-bit
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- AES 256-bit cipher (wxSQLite3) --- */
++#if HAVE_CIPHER_AES_256_CBC
++
++#define CIPHER_NAME_AES256 "aes256cbc"
++
++/*
++** Configuration parameters for "aes256cbc"
++**
++** - legacy mode : compatibility with first version (page 1 encrypted)
++**                 possible values:  1 = yes, 0 = no (default)
++** - kdf_iter : number of iterations for key derivation
++*/
++
++#ifdef WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
++#define AES256_LEGACY_DEFAULT 1
++#else
++#define AES256_LEGACY_DEFAULT 0
++#endif
++
++SQLITE_PRIVATE CipherParams mcAES256Params[] =
++{
++  { "legacy",            AES256_LEGACY_DEFAULT, AES256_LEGACY_DEFAULT, 0, 1 },
++  { "legacy_page_size",  0,                     0,                     0, SQLITE_MAX_PAGE_SIZE },
++  { "kdf_iter",          CODEC_SHA_ITER,        CODEC_SHA_ITER,        1, 0x7fffffff },
++  CIPHER_PARAMS_SENTINEL
++};
++
++
++typedef struct _AES256Cipher
++{
++  int       m_legacy;
++  int       m_legacyPageSize;
++  int       m_kdfIter;
++  int       m_keyLength;
++  uint8_t   m_key[KEYLENGTH_AES256];
++  Rijndael* m_aes;
++} AES256Cipher;
++
++static void*
++AllocateAES256Cipher(sqlite3* db)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) sqlite3_malloc(sizeof(AES256Cipher));
++  if (aesCipher != NULL)
++  {
++    aesCipher->m_aes = (Rijndael*) sqlite3_malloc(sizeof(Rijndael));
++    if (aesCipher->m_aes != NULL)
++    {
++      aesCipher->m_keyLength = KEYLENGTH_AES256;
++      memset(aesCipher->m_key, 0, KEYLENGTH_AES256);
++      RijndaelCreate(aesCipher->m_aes);
++    }
++    else
++    {
++      sqlite3_free(aesCipher);
++      aesCipher = NULL;
++    }
++  }
++  if (aesCipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_AES256);
++    aesCipher->m_legacy = sqlite3mcGetCipherParameter(cipherParams, "legacy");
++    aesCipher->m_legacyPageSize = sqlite3mcGetCipherParameter(cipherParams, "legacy_page_size");
++    aesCipher->m_kdfIter = sqlite3mcGetCipherParameter(cipherParams, "kdf_iter");
++  }
++  return aesCipher;
++}
++
++static void
++FreeAES256Cipher(void* cipher)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) cipher;
++  memset(aesCipher->m_aes, 0, sizeof(Rijndael));
++  sqlite3_free(aesCipher->m_aes);
++  memset(aesCipher, 0, sizeof(AES256Cipher));
++  sqlite3_free(aesCipher);
++}
++
++static void
++CloneAES256Cipher(void* cipherTo, void* cipherFrom)
++{
++  AES256Cipher* aesCipherTo = (AES256Cipher*) cipherTo;
++  AES256Cipher* aesCipherFrom = (AES256Cipher*) cipherFrom;
++  aesCipherTo->m_legacy = aesCipherFrom->m_legacy;
++  aesCipherTo->m_legacyPageSize = aesCipherFrom->m_legacyPageSize;
++  aesCipherTo->m_kdfIter = aesCipherFrom->m_kdfIter;
++  aesCipherTo->m_keyLength = aesCipherFrom->m_keyLength;
++  memcpy(aesCipherTo->m_key, aesCipherFrom->m_key, KEYLENGTH_AES256);
++  RijndaelInvalidate(aesCipherTo->m_aes);
++  RijndaelInvalidate(aesCipherFrom->m_aes);
++}
++
++static int
++GetLegacyAES256Cipher(void* cipher)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*)cipher;
++  return aesCipher->m_legacy;
++}
++
++static int
++GetPageSizeAES256Cipher(void* cipher)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) cipher;
++  int pageSize = 0;
++  if (aesCipher->m_legacy != 0)
++  {
++    pageSize = aesCipher->m_legacyPageSize;
++    if ((pageSize < 512) || (pageSize > SQLITE_MAX_PAGE_SIZE) || (((pageSize - 1) & pageSize) != 0))
++    {
++      pageSize = 0;
++    }
++  }
++  return pageSize;
++}
++
++static int
++GetReservedAES256Cipher(void* cipher)
++{
++  return 0;
++}
++
++static unsigned char*
++GetSaltAES256Cipher(void* cipher)
++{
++  return NULL;
++}
++
++static void
++GenerateKeyAES256Cipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) cipher;
++  unsigned char userPad[32];
++  unsigned char digest[KEYLENGTH_AES256];
++  int keyLength = KEYLENGTH_AES256;
++  int k;
++
++  /* Pad password */
++  sqlite3mcPadPassword(userPassword, passwordLength, userPad);
++
++  sha256(userPad, 32, digest);
++  for (k = 0; k < CODEC_SHA_ITER; ++k)
++  {
++    sha256(digest, KEYLENGTH_AES256, digest);
++  }
++  memcpy(aesCipher->m_key, digest, aesCipher->m_keyLength);
++}
++
++static int
++EncryptPageAES256Cipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) cipher;
++  int rc = SQLITE_OK;
++  if (aesCipher->m_legacy != 0)
++  {
++    /* Use the legacy encryption scheme */
++    unsigned char* key = aesCipher->m_key;
++    rc = sqlite3mcAES256(aesCipher->m_aes, page, 1, key, data, len, data);
++  }
++  else
++  {
++    unsigned char dbHeader[8];
++    int offset = 0;
++    unsigned char* key = aesCipher->m_key;
++    if (page == 1)
++    {
++      /* Save the header bytes remaining unencrypted */
++      memcpy(dbHeader, data + 16, 8);
++      offset = 16;
++      sqlite3mcAES256(aesCipher->m_aes, page, 1, key, data, 16, data);
++    }
++    rc = sqlite3mcAES256(aesCipher->m_aes, page, 1, key, data + offset, len - offset, data + offset);
++    if (page == 1)
++    {
++      /* Move the encrypted header bytes 16..23 to a safe position */
++      memcpy(data + 8, data + 16, 8);
++      /* Restore the unencrypted header bytes 16..23 */
++      memcpy(data + 16, dbHeader, 8);
++    }
++  }
++  return rc;
++}
++
++static int
++DecryptPageAES256Cipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  AES256Cipher* aesCipher = (AES256Cipher*) cipher;
++  int rc = SQLITE_OK;
++  if (aesCipher->m_legacy != 0)
++  {
++    /* Use the legacy encryption scheme */
++    rc = sqlite3mcAES256(aesCipher->m_aes, page, 0, aesCipher->m_key, data, len, data);
++  }
++  else
++  {
++    unsigned char dbHeader[8];
++    int dbPageSize;
++    int offset = 0;
++    if (page == 1)
++    {
++      /* Save (unencrypted) header bytes 16..23 */
++      memcpy(dbHeader, data + 16, 8);
++      /* Determine page size */
++      dbPageSize = (dbHeader[0] << 8) | (dbHeader[1] << 16);
++      /* Check whether the database header is valid */
++      /* If yes, the database follows the new encryption scheme, otherwise use the previous encryption scheme */
++      if ((dbPageSize >= 512) && (dbPageSize <= SQLITE_MAX_PAGE_SIZE) && (((dbPageSize - 1) & dbPageSize) == 0) &&
++        (dbHeader[5] == 0x40) && (dbHeader[6] == 0x20) && (dbHeader[7] == 0x20))
++      {
++        /* Restore encrypted bytes 16..23 for new encryption scheme */
++        memcpy(data + 16, data + 8, 8);
++        offset = 16;
++      }
++    }
++    rc = sqlite3mcAES256(aesCipher->m_aes, page, 0, aesCipher->m_key, data + offset, len - offset, data + offset);
++    if (page == 1 && offset != 0)
++    {
++      /* Verify the database header */
++      if (memcmp(dbHeader, data + 16, 8) == 0)
++      {
++        memcpy(data, SQLITE_FILE_HEADER, 16);
++      }
++    }
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE const CipherDescriptor mcAES256Descriptor =
++{
++  CIPHER_NAME_AES256,
++  AllocateAES256Cipher,
++  FreeAES256Cipher,
++  CloneAES256Cipher,
++  GetLegacyAES256Cipher,
++  GetPageSizeAES256Cipher,
++  GetReservedAES256Cipher,
++  GetSaltAES256Cipher,
++  GenerateKeyAES256Cipher,
++  EncryptPageAES256Cipher,
++  DecryptPageAES256Cipher
++};
++#endif
++/*** End of #include "cipher_wxaes256.c" ***/
++
++/* #include "cipher_chacha20.c" */
++/*** Begin of #include "cipher_chacha20.c" ***/
++/*
++** Name:        cipher_chacha20.c
++** Purpose:     Implementation of cipher ChaCha20 - Poly1305
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- ChaCha20-Poly1305 cipher (plus sqleet variant) --- */
++#if HAVE_CIPHER_CHACHA20
++
++#define CIPHER_NAME_CHACHA20 "chacha20"
++
++/*
++** Configuration parameters for "chacha20"
++**
++** - legacy mode : compatibility with original sqleet
++**                 (page 1 encrypted, kdf_iter = 12345)
++**                 possible values:  1 = yes, 0 = no
++** - kdf_iter : number of iterations for key derivation
++*/
++
++#ifdef SQLITE3MC_USE_SQLEET_LEGACY
++#define CHACHA20_LEGACY_DEFAULT   1
++#else
++#define CHACHA20_LEGACY_DEFAULT   0
++#endif
++
++#define CHACHA20_KDF_ITER_DEFAULT 64007
++#define SQLEET_KDF_ITER           12345
++#define CHACHA20_LEGACY_PAGE_SIZE 4096
++
++SQLITE_PRIVATE CipherParams mcChaCha20Params[] =
++{
++  { "legacy",            CHACHA20_LEGACY_DEFAULT,   CHACHA20_LEGACY_DEFAULT,   0, 1 },
++  { "legacy_page_size",  CHACHA20_LEGACY_PAGE_SIZE, CHACHA20_LEGACY_PAGE_SIZE, 0, SQLITE_MAX_PAGE_SIZE },
++  { "kdf_iter",          CHACHA20_KDF_ITER_DEFAULT, CHACHA20_KDF_ITER_DEFAULT, 1, 0x7fffffff },
++  CIPHER_PARAMS_SENTINEL
++};
++
++#define KEYLENGTH_CHACHA20       32
++#define SALTLENGTH_CHACHA20      16
++#define PAGE_NONCE_LEN_CHACHA20  16
++#define PAGE_TAG_LEN_CHACHA20    16
++#define PAGE_RESERVED_CHACHA20   (PAGE_NONCE_LEN_CHACHA20 + PAGE_TAG_LEN_CHACHA20)
++
++typedef struct _chacha20Cipher
++{
++  int     m_legacy;
++  int     m_legacyPageSize;
++  int     m_kdfIter;
++  int     m_keyLength;
++  uint8_t m_key[KEYLENGTH_CHACHA20];
++  uint8_t m_salt[SALTLENGTH_CHACHA20];
++} ChaCha20Cipher;
++
++static void*
++AllocateChaCha20Cipher(sqlite3* db)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) sqlite3_malloc(sizeof(ChaCha20Cipher));
++  if (chacha20Cipher != NULL)
++  {
++    memset(chacha20Cipher, 0, sizeof(ChaCha20Cipher));
++    chacha20Cipher->m_keyLength = KEYLENGTH_CHACHA20;
++    memset(chacha20Cipher->m_key, 0, KEYLENGTH_CHACHA20);
++    memset(chacha20Cipher->m_salt, 0, SALTLENGTH_CHACHA20);
++  }
++  if (chacha20Cipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_CHACHA20);
++    chacha20Cipher->m_legacy = sqlite3mcGetCipherParameter(cipherParams, "legacy");
++    chacha20Cipher->m_legacyPageSize = sqlite3mcGetCipherParameter(cipherParams, "legacy_page_size");
++    chacha20Cipher->m_kdfIter = sqlite3mcGetCipherParameter(cipherParams, "kdf_iter");
++    if (chacha20Cipher->m_legacy != 0)
++    {
++      chacha20Cipher->m_kdfIter = SQLEET_KDF_ITER;
++    }
++  }
++  return chacha20Cipher;
++}
++
++static void
++FreeChaCha20Cipher(void* cipher)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  memset(chacha20Cipher, 0, sizeof(ChaCha20Cipher));
++  sqlite3_free(chacha20Cipher);
++}
++
++static void
++CloneChaCha20Cipher(void* cipherTo, void* cipherFrom)
++{
++  ChaCha20Cipher* chacha20CipherTo = (ChaCha20Cipher*) cipherTo;
++  ChaCha20Cipher* chacha20CipherFrom = (ChaCha20Cipher*) cipherFrom;
++  chacha20CipherTo->m_legacy = chacha20CipherFrom->m_legacy;
++  chacha20CipherTo->m_legacyPageSize = chacha20CipherFrom->m_legacyPageSize;
++  chacha20CipherTo->m_kdfIter = chacha20CipherFrom->m_kdfIter;
++  chacha20CipherTo->m_keyLength = chacha20CipherFrom->m_keyLength;
++  memcpy(chacha20CipherTo->m_key, chacha20CipherFrom->m_key, KEYLENGTH_CHACHA20);
++  memcpy(chacha20CipherTo->m_salt, chacha20CipherFrom->m_salt, SALTLENGTH_CHACHA20);
++}
++
++static int
++GetLegacyChaCha20Cipher(void* cipher)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*)cipher;
++  return chacha20Cipher->m_legacy;
++}
++
++static int
++GetPageSizeChaCha20Cipher(void* cipher)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  int pageSize = 0;
++  if (chacha20Cipher->m_legacy != 0)
++  {
++    pageSize = chacha20Cipher->m_legacyPageSize;
++    if ((pageSize < 512) || (pageSize > SQLITE_MAX_PAGE_SIZE) || (((pageSize - 1) & pageSize) != 0))
++    {
++      pageSize = 0;
++    }
++  }
++  return pageSize;
++}
++
++static int
++GetReservedChaCha20Cipher(void* cipher)
++{
++  return PAGE_RESERVED_CHACHA20;
++}
++
++static unsigned char*
++GetSaltChaCha20Cipher(void* cipher)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  return chacha20Cipher->m_salt;
++}
++
++static void
++GenerateKeyChaCha20Cipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  int bypass = 0;
++
++  Pager *pPager = pBt->pPager;
++  sqlite3_file* fd = (isOpen(pPager->fd)) ? pPager->fd : NULL;
++
++  int keyOnly = 1;
++  if (rekey || fd == NULL || sqlite3OsRead(fd, chacha20Cipher->m_salt, SALTLENGTH_CHACHA20, 0) != SQLITE_OK)
++  {
++    chacha20_rng(chacha20Cipher->m_salt, SALTLENGTH_CHACHA20);
++    keyOnly = 0;
++  }
++  else if (cipherSalt != NULL)
++  {
++    memcpy(chacha20Cipher->m_salt, cipherSalt, SALTLENGTH_CHACHA20);
++  }
++
++  /* Bypass key derivation if the key string starts with "raw:" */
++  if (passwordLength > 4 && !memcmp(userPassword, "raw:", 4))
++  {
++    const int nRaw = passwordLength - 4;
++    const unsigned char* zRaw = (const unsigned char*) userPassword + 4;
++    switch (nRaw)
++    {
++      /* Binary key (and salt) */
++      case KEYLENGTH_CHACHA20 + SALTLENGTH_CHACHA20:
++        if (!keyOnly)
++        {
++          memcpy(chacha20Cipher->m_salt, zRaw + KEYLENGTH_CHACHA20, SALTLENGTH_CHACHA20);
++        }
++        /* fall-through */
++      case KEYLENGTH_CHACHA20:
++        memcpy(chacha20Cipher->m_key, zRaw, KEYLENGTH_CHACHA20);
++        bypass = 1;
++        break;
++
++      /* Hex-encoded key */
++      case 2 * KEYLENGTH_CHACHA20:
++        if (sqlite3mcIsHexKey(zRaw, nRaw) != 0)
++        {
++          sqlite3mcConvertHex2Bin(zRaw, nRaw, chacha20Cipher->m_key);
++          bypass = 1;
++        }
++        break;
++
++      /* Hex-encoded key and salt */
++      case 2 * (KEYLENGTH_CHACHA20 + SALTLENGTH_CHACHA20):
++        if (sqlite3mcIsHexKey(zRaw, nRaw) != 0)
++        {
++          sqlite3mcConvertHex2Bin(zRaw, 2 * KEYLENGTH_CHACHA20, chacha20Cipher->m_key);
++          if (!keyOnly)
++          {
++            sqlite3mcConvertHex2Bin(zRaw + 2 * KEYLENGTH_CHACHA20, 2 * SALTLENGTH_CHACHA20, chacha20Cipher->m_salt);
++          }
++          bypass = 1;
++        }
++        break;
++
++      default:
++        break;
++    }
++  }
++
++  if (!bypass)
++  {
++    fastpbkdf2_hmac_sha256((unsigned char*)userPassword, passwordLength,
++                           chacha20Cipher->m_salt, SALTLENGTH_CHACHA20,
++                           chacha20Cipher->m_kdfIter,
++                           chacha20Cipher->m_key, KEYLENGTH_CHACHA20);
++  }
++  SQLITE3MC_DEBUG_LOG("generate: codec=%p pFile=%p\n", chacha20Cipher, fd);
++  SQLITE3MC_DEBUG_HEX("generate  key:", chacha20Cipher->m_key, KEYLENGTH_CHACHA20);
++  SQLITE3MC_DEBUG_HEX("generate salt:", chacha20Cipher->m_salt, SALTLENGTH_CHACHA20);
++}
++
++static int
++EncryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  int rc = SQLITE_OK;
++  int legacy = chacha20Cipher->m_legacy;
++  int nReserved = (reserved == 0 && legacy == 0) ? 0 : GetReservedChaCha20Cipher(cipher);
++  int n = len - nReserved;
++
++  /* Generate one-time keys */
++  uint8_t otk[64];
++  uint32_t counter;
++  int offset;
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
++  {
++    return SQLITE_CORRUPT;
++  }
++
++  if (nReserved > 0)
++  {
++    /* Encrypt and authenticate */
++    memset(otk, 0, 64);
++    chacha20_rng(data + n, PAGE_NONCE_LEN_CHACHA20);
++    counter = LOAD32_LE(data + n + PAGE_NONCE_LEN_CHACHA20 - 4) ^ page;
++    chacha20_xor(otk, 64, chacha20Cipher->m_key, data + n, counter);
++
++    offset = (page == 1) ? (chacha20Cipher->m_legacy != 0) ? 0 : CIPHER_PAGE1_OFFSET : 0;
++    chacha20_xor(data + offset, n - offset, otk + 32, data + n, counter + 1);
++    if (page == 1)
++    {
++      memcpy(data, chacha20Cipher->m_salt, SALTLENGTH_CHACHA20);
++    }
++    poly1305(data, n + PAGE_NONCE_LEN_CHACHA20, otk, data + n + PAGE_NONCE_LEN_CHACHA20);
++  }
++  else
++  {
++    /* Encrypt only */
++    uint8_t nonce[PAGE_NONCE_LEN_CHACHA20];
++    memset(otk, 0, 64);
++    sqlite3mcGenerateInitialVector(page, nonce);
++    counter = LOAD32_LE(&nonce[PAGE_NONCE_LEN_CHACHA20 - 4]) ^ page;
++    chacha20_xor(otk, 64, chacha20Cipher->m_key, nonce, counter);
++
++    /* Encrypt */
++    offset = (page == 1) ? (chacha20Cipher->m_legacy != 0) ? 0 : CIPHER_PAGE1_OFFSET : 0;
++    chacha20_xor(data + offset, n - offset, otk + 32, nonce, counter + 1);
++    if (page == 1)
++    {
++      memcpy(data, chacha20Cipher->m_salt, SALTLENGTH_CHACHA20);
++    }
++  }
++
++  return rc;
++}
++
++int chacha20_ismemset(const void* v, unsigned char value, int len)
++{
++  const unsigned char* a = v;
++  int i = 0, result = 0;
++
++  for (i = 0; i < len; i++) {
++    result |= a[i] ^ value;
++  }
++
++  return (result != 0);
++}
++
++static int
++DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
++  int rc = SQLITE_OK;
++  int legacy = chacha20Cipher->m_legacy;
++  int nReserved = (reserved == 0 && legacy == 0) ? 0 : GetReservedChaCha20Cipher(cipher);
++  int n = len - nReserved;
++
++  /* Generate one-time keys */
++  uint8_t otk[64];
++  uint32_t counter;
++  uint8_t tag[16];
++  int offset;
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
++  {
++    return (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++  }
++
++  if (nReserved > 0)
++  {
++    int allzero = 0;
++    /* Decrypt and verify MAC */
++    memset(otk, 0, 64);
++    counter = LOAD32_LE(data + n + PAGE_NONCE_LEN_CHACHA20 - 4) ^ page;
++    chacha20_xor(otk, 64, chacha20Cipher->m_key, data + n, counter);
++
++    /* Determine MAC and decrypt */
++    allzero = chacha20_ismemset(data, 0, n);
++    poly1305(data, n + PAGE_NONCE_LEN_CHACHA20, otk, tag);
++    offset = (page == 1) ? (chacha20Cipher->m_legacy != 0) ? 0 : CIPHER_PAGE1_OFFSET : 0;
++    chacha20_xor(data + offset, n - offset, otk + 32, data + n, counter + 1);
++
++    if (hmacCheck != 0)
++    {
++      /* Verify the MAC */
++      if (poly1305_tagcmp(data + n + PAGE_NONCE_LEN_CHACHA20, tag))
++      {
++        SQLITE3MC_DEBUG_LOG("decrypt: codec=%p page=%d\n", chacha20Cipher, page);
++        SQLITE3MC_DEBUG_HEX("decrypt key:", chacha20Cipher->m_key, 32);
++        SQLITE3MC_DEBUG_HEX("decrypt otk:", otk, 64);
++        SQLITE3MC_DEBUG_HEX("decrypt data+00:", data, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt data+24:", data + 24, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt data+n:", data + n, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt tag r:", data + n + PAGE_NONCE_LEN_CHACHA20, PAGE_TAG_LEN_CHACHA20);
++        SQLITE3MC_DEBUG_HEX("decrypt tag c:", tag, PAGE_TAG_LEN_CHACHA20);
++        /* Bad MAC */
++        rc = (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++      }
++    }
++    if (page == 1 && rc == SQLITE_OK)
++    {
++      memcpy(data, SQLITE_FILE_HEADER, 16);
++    }
++  }
++  else
++  {
++    /* Decrypt only */
++    uint8_t nonce[PAGE_NONCE_LEN_CHACHA20];
++    memset(otk, 0, 64);
++    sqlite3mcGenerateInitialVector(page, nonce);
++    counter = LOAD32_LE(&nonce[PAGE_NONCE_LEN_CHACHA20 - 4]) ^ page;
++    chacha20_xor(otk, 64, chacha20Cipher->m_key, nonce, counter);
++
++    /* Decrypt */
++    offset = (page == 1) ? (chacha20Cipher->m_legacy != 0) ? 0 : CIPHER_PAGE1_OFFSET : 0;
++    chacha20_xor(data + offset, n - offset, otk + 32, nonce, counter + 1);
++    if (page == 1)
++    {
++      memcpy(data, SQLITE_FILE_HEADER, 16);
++    }
++  }
++
++  return rc;
++}
++
++SQLITE_PRIVATE const CipherDescriptor mcChaCha20Descriptor =
++{
++  CIPHER_NAME_CHACHA20,
++  AllocateChaCha20Cipher,
++  FreeChaCha20Cipher,
++  CloneChaCha20Cipher,
++  GetLegacyChaCha20Cipher,
++  GetPageSizeChaCha20Cipher,
++  GetReservedChaCha20Cipher,
++  GetSaltChaCha20Cipher,
++  GenerateKeyChaCha20Cipher,
++  EncryptPageChaCha20Cipher,
++  DecryptPageChaCha20Cipher
++};
++#endif
++/*** End of #include "cipher_chacha20.c" ***/
++
++/* #include "cipher_sqlcipher.c" */
++/*** Begin of #include "cipher_sqlcipher.c" ***/
++/*
++** Name:        cipher_sqlcipher.c
++** Purpose:     Implementation of cipher SQLCipher (version 1 to 4)
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- SQLCipher AES256CBC-HMAC cipher --- */
++#if HAVE_CIPHER_SQLCIPHER
++
++#define CIPHER_NAME_SQLCIPHER "sqlcipher"
++
++/*
++** Configuration parameters for "sqlcipher"
++**
++** - kdf_iter        : number of iterations for key derivation
++** - fast_kdf_iter   : number of iterations for hmac key
++** - hmac_use        : flag whether to use hmac
++** - hmac_pgno       : storage type for page number in hmac (native, le, be)
++** - hmac_salt_mask  : mask byte for hmac salt
++*/
++
++#define SQLCIPHER_FAST_KDF_ITER     2
++#define SQLCIPHER_HMAC_USE          1
++#define SQLCIPHER_HMAC_PGNO_LE      1
++#define SQLCIPHER_HMAC_PGNO_BE      2
++#define SQLCIPHER_HMAC_PGNO_NATIVE  0
++#define SQLCIPHER_HMAC_SALT_MASK    0x3a
++
++#define SQLCIPHER_KDF_ALGORITHM_SHA1   0
++#define SQLCIPHER_KDF_ALGORITHM_SHA256 1
++#define SQLCIPHER_KDF_ALGORITHM_SHA512 2
++
++#define SQLCIPHER_HMAC_ALGORITHM_SHA1   0
++#define SQLCIPHER_HMAC_ALGORITHM_SHA256 1
++#define SQLCIPHER_HMAC_ALGORITHM_SHA512 2
++
++#define SQLCIPHER_VERSION_1   1
++#define SQLCIPHER_VERSION_2   2
++#define SQLCIPHER_VERSION_3   3
++#define SQLCIPHER_VERSION_4   4
++#define SQLCIPHER_VERSION_MAX SQLCIPHER_VERSION_4
++
++#ifndef SQLCIPHER_VERSION_DEFAULT
++#define SQLCIPHER_VERSION_DEFAULT SQLCIPHER_VERSION_4
++#endif
++
++#ifdef SQLITE3MC_USE_SQLCIPHER_LEGACY
++#define SQLCIPHER_LEGACY_DEFAULT   SQLCIPHER_VERSION_DEFAULT
++#else
++#define SQLCIPHER_LEGACY_DEFAULT   0
++#endif
++
++#if SQLCIPHER_VERSION_DEFAULT < SQLCIPHER_VERSION_4
++#define SQLCIPHER_KDF_ITER          64000
++#define SQLCIPHER_LEGACY_PAGE_SIZE  1024
++#define SQLCIPHER_KDF_ALGORITHM     SQLCIPHER_KDF_ALGORITHM_SHA1
++#define SQLCIPHER_HMAC_ALGORITHM    SQLCIPHER_HMAC_ALGORITHM_SHA1
++#else
++#define SQLCIPHER_KDF_ITER          256000
++#define SQLCIPHER_LEGACY_PAGE_SIZE  4096
++#define SQLCIPHER_KDF_ALGORITHM  SQLCIPHER_KDF_ALGORITHM_SHA512
++#define SQLCIPHER_HMAC_ALGORITHM SQLCIPHER_HMAC_ALGORITHM_SHA512
++#endif
++
++SQLITE_PRIVATE CipherParams mcSQLCipherParams[] =
++{
++  { "legacy",                SQLCIPHER_LEGACY_DEFAULT,   SQLCIPHER_LEGACY_DEFAULT,   0, SQLCIPHER_VERSION_MAX },
++  { "legacy_page_size",      SQLCIPHER_LEGACY_PAGE_SIZE, SQLCIPHER_LEGACY_PAGE_SIZE, 0, SQLITE_MAX_PAGE_SIZE },
++  { "kdf_iter",              SQLCIPHER_KDF_ITER,         SQLCIPHER_KDF_ITER,         1, 0x7fffffff },
++  { "fast_kdf_iter",         SQLCIPHER_FAST_KDF_ITER,    SQLCIPHER_FAST_KDF_ITER,    1, 0x7fffffff },
++  { "hmac_use",              SQLCIPHER_HMAC_USE,         SQLCIPHER_HMAC_USE,         0, 1 },
++  { "hmac_pgno",             SQLCIPHER_HMAC_PGNO_LE,     SQLCIPHER_HMAC_PGNO_LE,     0, 2 },
++  { "hmac_salt_mask",        SQLCIPHER_HMAC_SALT_MASK,   SQLCIPHER_HMAC_SALT_MASK,   0x00, 0xff },
++  { "kdf_algorithm",         SQLCIPHER_KDF_ALGORITHM,    SQLCIPHER_KDF_ALGORITHM,    0, 2 },
++  { "hmac_algorithm",        SQLCIPHER_HMAC_ALGORITHM,   SQLCIPHER_HMAC_ALGORITHM,   0, 2 },
++  { "plaintext_header_size", 0,                          0,                          0, 100 /* restrict to db header size */ },
++  CIPHER_PARAMS_SENTINEL
++};
++
++#define KEYLENGTH_SQLCIPHER       32
++#define SALTLENGTH_SQLCIPHER      16
++#define MAX_HMAC_LENGTH_SQLCIPHER SHA512_DIGEST_SIZE
++#define PAGE_NONCE_LEN_SQLCIPHER  16
++
++typedef struct _sqlCipherCipher
++{
++  int       m_legacy;
++  int       m_legacyPageSize;
++  int       m_kdfIter;
++  int       m_fastKdfIter;
++  int       m_hmacUse;
++  int       m_hmacPgno;
++  int       m_hmacSaltMask;
++  int       m_kdfAlgorithm;
++  int       m_hmacAlgorithm;
++  int       m_plaintextHeaderSize;
++  int       m_keyLength;
++  uint8_t   m_key[KEYLENGTH_SQLCIPHER];
++  uint8_t   m_salt[SALTLENGTH_SQLCIPHER];
++  uint8_t   m_hmacKey[KEYLENGTH_SQLCIPHER];
++  Rijndael* m_aes;
++} SQLCipherCipher;
++
++static void*
++AllocateSQLCipherCipher(sqlite3* db)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) sqlite3_malloc(sizeof(SQLCipherCipher));
++  if (sqlCipherCipher != NULL)
++  {
++    sqlCipherCipher->m_aes = (Rijndael*)sqlite3_malloc(sizeof(Rijndael));
++    if (sqlCipherCipher->m_aes != NULL)
++    {
++      sqlCipherCipher->m_keyLength = KEYLENGTH_SQLCIPHER;
++      memset(sqlCipherCipher->m_key, 0, KEYLENGTH_SQLCIPHER);
++      memset(sqlCipherCipher->m_salt, 0, SALTLENGTH_SQLCIPHER);
++      memset(sqlCipherCipher->m_hmacKey, 0, KEYLENGTH_SQLCIPHER);
++      RijndaelCreate(sqlCipherCipher->m_aes);
++    }
++    else
++    {
++      sqlite3_free(sqlCipherCipher);
++      sqlCipherCipher = NULL;
++    }
++  }
++  if (sqlCipherCipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_SQLCIPHER);
++    sqlCipherCipher->m_legacy = sqlite3mcGetCipherParameter(cipherParams, "legacy");
++    sqlCipherCipher->m_legacyPageSize = sqlite3mcGetCipherParameter(cipherParams, "legacy_page_size");
++    sqlCipherCipher->m_kdfIter = sqlite3mcGetCipherParameter(cipherParams, "kdf_iter");
++    sqlCipherCipher->m_fastKdfIter = sqlite3mcGetCipherParameter(cipherParams, "fast_kdf_iter");
++    sqlCipherCipher->m_hmacUse = sqlite3mcGetCipherParameter(cipherParams, "hmac_use");
++    sqlCipherCipher->m_hmacPgno = sqlite3mcGetCipherParameter(cipherParams, "hmac_pgno");
++    sqlCipherCipher->m_hmacSaltMask = sqlite3mcGetCipherParameter(cipherParams, "hmac_salt_mask");
++    sqlCipherCipher->m_kdfAlgorithm = sqlite3mcGetCipherParameter(cipherParams, "kdf_algorithm");
++    sqlCipherCipher->m_hmacAlgorithm = sqlite3mcGetCipherParameter(cipherParams, "hmac_algorithm");
++    if (sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
++    {
++      int plaintextHeaderSize = sqlite3mcGetCipherParameter(cipherParams, "plaintext_header_size");
++      sqlCipherCipher->m_plaintextHeaderSize = (plaintextHeaderSize >=0 && plaintextHeaderSize <= 100 && plaintextHeaderSize % 16 == 0) ? plaintextHeaderSize : 0;
++    }
++    else
++    {
++      sqlCipherCipher->m_plaintextHeaderSize = 0;
++    }
++  }
++  return sqlCipherCipher;
++}
++
++static void
++FreeSQLCipherCipher(void* cipher)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  memset(sqlCipherCipher->m_aes, 0, sizeof(Rijndael));
++  sqlite3_free(sqlCipherCipher->m_aes);
++  memset(sqlCipherCipher, 0, sizeof(SQLCipherCipher));
++  sqlite3_free(sqlCipherCipher);
++}
++
++static void
++CloneSQLCipherCipher(void* cipherTo, void* cipherFrom)
++{
++  SQLCipherCipher* sqlCipherCipherTo = (SQLCipherCipher*) cipherTo;
++  SQLCipherCipher* sqlCipherCipherFrom = (SQLCipherCipher*) cipherFrom;
++  sqlCipherCipherTo->m_legacy = sqlCipherCipherFrom->m_legacy;
++  sqlCipherCipherTo->m_legacyPageSize = sqlCipherCipherFrom->m_legacyPageSize;
++  sqlCipherCipherTo->m_kdfIter = sqlCipherCipherFrom->m_kdfIter;
++  sqlCipherCipherTo->m_fastKdfIter = sqlCipherCipherFrom->m_fastKdfIter;
++  sqlCipherCipherTo->m_hmacUse = sqlCipherCipherFrom->m_hmacUse;
++  sqlCipherCipherTo->m_hmacPgno = sqlCipherCipherFrom->m_hmacPgno;
++  sqlCipherCipherTo->m_hmacSaltMask = sqlCipherCipherFrom->m_hmacSaltMask;
++  sqlCipherCipherTo->m_kdfAlgorithm = sqlCipherCipherFrom->m_kdfAlgorithm;
++  sqlCipherCipherTo->m_hmacAlgorithm = sqlCipherCipherFrom->m_hmacAlgorithm;
++  sqlCipherCipherTo->m_plaintextHeaderSize = sqlCipherCipherFrom->m_plaintextHeaderSize;
++  sqlCipherCipherTo->m_keyLength = sqlCipherCipherFrom->m_keyLength;
++  memcpy(sqlCipherCipherTo->m_key, sqlCipherCipherFrom->m_key, KEYLENGTH_SQLCIPHER);
++  memcpy(sqlCipherCipherTo->m_salt, sqlCipherCipherFrom->m_salt, SALTLENGTH_SQLCIPHER);
++  memcpy(sqlCipherCipherTo->m_hmacKey, sqlCipherCipherFrom->m_hmacKey, KEYLENGTH_SQLCIPHER);
++  RijndaelInvalidate(sqlCipherCipherTo->m_aes);
++  RijndaelInvalidate(sqlCipherCipherFrom->m_aes);
++}
++
++static int
++GetLegacySQLCipherCipher(void* cipher)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*)cipher;
++  return sqlCipherCipher->m_legacy;
++}
++
++static int
++GetPageSizeSQLCipherCipher(void* cipher)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  int pageSize = 0;
++  if (sqlCipherCipher->m_legacy != 0)
++  {
++    pageSize = sqlCipherCipher->m_legacyPageSize;
++    if ((pageSize < 512) || (pageSize > SQLITE_MAX_PAGE_SIZE) || (((pageSize - 1) & pageSize) != 0))
++    {
++      pageSize = 0;
++    }
++  }
++  return pageSize;
++}
++
++static int
++GetReservedSQLCipherCipher(void* cipher)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  int reserved = SALTLENGTH_SQLCIPHER;
++  if (sqlCipherCipher->m_hmacUse != 0)
++  {
++    switch (sqlCipherCipher->m_hmacAlgorithm)
++    {
++      case SQLCIPHER_HMAC_ALGORITHM_SHA1:
++      case SQLCIPHER_HMAC_ALGORITHM_SHA256:
++        reserved += SHA256_DIGEST_SIZE;
++        break;
++      case SQLCIPHER_HMAC_ALGORITHM_SHA512:
++      default:
++        reserved += SHA512_DIGEST_SIZE;
++        break;
++    }
++  }
++  return reserved;
++}
++
++static unsigned char*
++GetSaltSQLCipherCipher(void* cipher)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  return sqlCipherCipher->m_salt;
++}
++
++static void
++GenerateKeySQLCipherCipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++
++  Pager *pPager = pBt->pPager;
++  sqlite3_file* fd = (isOpen(pPager->fd)) ? pPager->fd : NULL;
++
++  if (rekey || fd == NULL || sqlite3OsRead(fd, sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER, 0) != SQLITE_OK)
++  {
++    chacha20_rng(sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER);
++  }
++  else if (cipherSalt != NULL)
++  {
++    memcpy(sqlCipherCipher->m_salt, cipherSalt, SALTLENGTH_SQLCIPHER);
++  }
++
++  if (passwordLength == ((KEYLENGTH_SQLCIPHER * 2) + 3) &&
++      sqlite3_strnicmp(userPassword, "x'", 2) == 0 &&
++    sqlite3mcIsHexKey((unsigned char*) (userPassword + 2), KEYLENGTH_SQLCIPHER * 2) != 0)
++  {
++    sqlite3mcConvertHex2Bin((unsigned char*) (userPassword + 2), passwordLength - 3, sqlCipherCipher->m_key);
++  }
++  else if (passwordLength == (((KEYLENGTH_SQLCIPHER + SALTLENGTH_SQLCIPHER) * 2) + 3) &&
++           sqlite3_strnicmp(userPassword, "x'", 2) == 0 &&
++           sqlite3mcIsHexKey((unsigned char*) (userPassword + 2), (KEYLENGTH_SQLCIPHER + SALTLENGTH_SQLCIPHER) * 2) != 0)
++  {
++    sqlite3mcConvertHex2Bin((unsigned char*) (userPassword + 2), KEYLENGTH_SQLCIPHER * 2, sqlCipherCipher->m_key);
++    sqlite3mcConvertHex2Bin((unsigned char*) (userPassword + 2 + KEYLENGTH_SQLCIPHER * 2), SALTLENGTH_SQLCIPHER * 2, sqlCipherCipher->m_salt);
++  }
++  else
++  {
++    switch (sqlCipherCipher->m_kdfAlgorithm)
++    {
++      case SQLCIPHER_KDF_ALGORITHM_SHA1:
++        fastpbkdf2_hmac_sha1((unsigned char*) userPassword, passwordLength,
++                             sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER,
++                             sqlCipherCipher->m_kdfIter,
++                             sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER);
++        break;
++      case SQLCIPHER_KDF_ALGORITHM_SHA256:
++        fastpbkdf2_hmac_sha256((unsigned char*) userPassword, passwordLength,
++                               sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER,
++                               sqlCipherCipher->m_kdfIter,
++                               sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER);
++        break;
++      case SQLCIPHER_KDF_ALGORITHM_SHA512:
++      default:
++        fastpbkdf2_hmac_sha512((unsigned char*) userPassword, passwordLength,
++                               sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER,
++                               sqlCipherCipher->m_kdfIter,
++                               sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER);
++        break;
++    }
++  }
++
++  if (sqlCipherCipher->m_hmacUse != 0)
++  {
++    int j;
++    unsigned char hmacSaltMask = sqlCipherCipher->m_hmacSaltMask;
++    unsigned char hmacSalt[SALTLENGTH_SQLCIPHER];
++    memcpy(hmacSalt, sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER);
++    for (j = 0; j < SALTLENGTH_SQLCIPHER; ++j)
++    {
++      hmacSalt[j] ^= hmacSaltMask;
++    }
++    switch (sqlCipherCipher->m_hmacAlgorithm)
++    {
++      case SQLCIPHER_HMAC_ALGORITHM_SHA1:
++        fastpbkdf2_hmac_sha1(sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER,
++                             hmacSalt, SALTLENGTH_SQLCIPHER,
++                             sqlCipherCipher->m_fastKdfIter,
++                             sqlCipherCipher->m_hmacKey, KEYLENGTH_SQLCIPHER);
++      break;
++      case SQLCIPHER_HMAC_ALGORITHM_SHA256:
++        fastpbkdf2_hmac_sha256(sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER,
++                               hmacSalt, SALTLENGTH_SQLCIPHER,
++                               sqlCipherCipher->m_fastKdfIter,
++                               sqlCipherCipher->m_hmacKey, KEYLENGTH_SQLCIPHER);
++        break;
++      case SQLCIPHER_HMAC_ALGORITHM_SHA512:
++      default:
++        fastpbkdf2_hmac_sha512(sqlCipherCipher->m_key, KEYLENGTH_SQLCIPHER,
++                               hmacSalt, SALTLENGTH_SQLCIPHER,
++                               sqlCipherCipher->m_fastKdfIter,
++                               sqlCipherCipher->m_hmacKey, KEYLENGTH_SQLCIPHER);
++        break;
++    }
++  }
++}
++
++static int
++GetHmacSizeSQLCipherCipher(int algorithm)
++{
++  int hmacSize = SHA512_DIGEST_SIZE;
++  switch (algorithm)
++  {
++    case SQLCIPHER_HMAC_ALGORITHM_SHA1:
++      hmacSize = SHA1_DIGEST_SIZE;
++      break;
++    case SQLCIPHER_HMAC_ALGORITHM_SHA256:
++    case SQLCIPHER_HMAC_ALGORITHM_SHA512:
++    default:
++      hmacSize = SHA512_DIGEST_SIZE;
++      break;
++  }
++  return hmacSize;
++}
++
++static int
++EncryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  int rc = SQLITE_OK;
++  int legacy = sqlCipherCipher->m_legacy;
++  int nReserved = (reserved == 0 && legacy == 0) ? 0 : GetReservedSQLCipherCipher(cipher);
++  int n = len - nReserved;
++  int offset = (page == 1) ? (sqlCipherCipher->m_legacy != 0) ? 16 : 24 : 0;
++  int blen;
++  unsigned char iv[64];
++  int usePlaintextHeader = 0;
++
++  /* Check whether a plaintext header should be used */
++  if (page == 1 && sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4 && sqlCipherCipher->m_plaintextHeaderSize > 0)
++  {
++    usePlaintextHeader = 1;
++    offset = sqlCipherCipher->m_plaintextHeaderSize;
++  }
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
++  {
++    return SQLITE_CORRUPT;
++  }
++
++  /* Generate nonce (64 bytes) */
++  memset(iv, 0, 64);
++  if (nReserved > 0)
++  {
++    chacha20_rng(iv, 64);
++  }
++  else
++  {
++    sqlite3mcGenerateInitialVector(page, iv);
++  }
++
++  RijndaelInit(sqlCipherCipher->m_aes, RIJNDAEL_Direction_Mode_CBC, RIJNDAEL_Direction_Encrypt, sqlCipherCipher->m_key, RIJNDAEL_Direction_KeyLength_Key32Bytes, iv);
++  blen = RijndaelBlockEncrypt(sqlCipherCipher->m_aes, data + offset, (n - offset) * 8, data + offset);
++  if (nReserved > 0)
++  {
++    memcpy(data + n, iv, nReserved);
++  }
++  if (page == 1 && usePlaintextHeader == 0)
++  {
++    memcpy(data, sqlCipherCipher->m_salt, SALTLENGTH_SQLCIPHER);
++  }
++
++  /* hmac calculation */
++  if (sqlCipherCipher->m_hmacUse == 1 && nReserved > 0)
++  {
++    unsigned char pgno_raw[4];
++    unsigned char hmac_out[64];
++    int hmac_size = GetHmacSizeSQLCipherCipher(sqlCipherCipher->m_hmacAlgorithm);
++
++    if (sqlCipherCipher->m_hmacPgno == SQLCIPHER_HMAC_PGNO_LE)
++    {
++      STORE32_LE(pgno_raw, page);
++    }
++    else if (sqlCipherCipher->m_hmacPgno == SQLCIPHER_HMAC_PGNO_BE)
++    {
++      STORE32_BE(pgno_raw, page);
++    }
++    else
++    {
++      memcpy(pgno_raw, &page, 4);
++    }
++    sqlcipher_hmac(sqlCipherCipher->m_hmacAlgorithm, sqlCipherCipher->m_hmacKey, KEYLENGTH_SQLCIPHER, data + offset, n + PAGE_NONCE_LEN_SQLCIPHER - offset, pgno_raw, 4, hmac_out);
++    memcpy(data + n + PAGE_NONCE_LEN_SQLCIPHER, hmac_out, hmac_size);
++  }
++
++  return rc;
++}
++
++static int
++DecryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
++  int rc = SQLITE_OK;
++  int legacy = sqlCipherCipher->m_legacy;
++  int nReserved = (reserved == 0 && legacy == 0) ? 0 : GetReservedSQLCipherCipher(cipher);
++  int n = len - nReserved;
++  int offset = (page == 1) ? (sqlCipherCipher->m_legacy != 0) ? 16 : 24 : 0;
++  int hmacOk = 1;
++  int blen;
++  unsigned char iv[128];
++  int usePlaintextHeader = 0;
++
++  /* Check whether a plaintext header should be used */
++  if (page == 1 && sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4 && sqlCipherCipher->m_plaintextHeaderSize > 0)
++  {
++    usePlaintextHeader = 1;
++    offset = sqlCipherCipher->m_plaintextHeaderSize;
++  }
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
++  {
++    return (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++  }
++
++  /* Get nonce from buffer */
++  if (nReserved > 0)
++  {
++    memcpy(iv, data + n, nReserved);
++  }
++  else
++  {
++    sqlite3mcGenerateInitialVector(page, iv);
++  }
++
++  /* hmac check */
++  if (sqlCipherCipher->m_hmacUse == 1 && nReserved > 0 && hmacCheck != 0)
++  {
++    unsigned char pgno_raw[4];
++    unsigned char hmac_out[64];
++    int hmac_size = GetHmacSizeSQLCipherCipher(sqlCipherCipher->m_hmacAlgorithm);
++    if (sqlCipherCipher->m_hmacPgno == SQLCIPHER_HMAC_PGNO_LE)
++    {
++      STORE32_LE(pgno_raw, page);
++    }
++    else if (sqlCipherCipher->m_hmacPgno == SQLCIPHER_HMAC_PGNO_BE)
++    {
++      STORE32_BE(pgno_raw, page);
++    }
++    else
++    {
++      memcpy(pgno_raw, &page, 4);
++    }
++    sqlcipher_hmac(sqlCipherCipher->m_hmacAlgorithm, sqlCipherCipher->m_hmacKey, KEYLENGTH_SQLCIPHER, data + offset, n + PAGE_NONCE_LEN_SQLCIPHER - offset, pgno_raw, 4, hmac_out);
++    hmacOk = (memcmp(data + n + PAGE_NONCE_LEN_SQLCIPHER, hmac_out, hmac_size) == 0);
++  }
++
++  if (hmacOk != 0)
++  {
++    RijndaelInit(sqlCipherCipher->m_aes, RIJNDAEL_Direction_Mode_CBC, RIJNDAEL_Direction_Decrypt, sqlCipherCipher->m_key, RIJNDAEL_Direction_KeyLength_Key32Bytes, iv);
++    blen = RijndaelBlockDecrypt(sqlCipherCipher->m_aes, data + offset, (n - offset) * 8, data + offset);
++    if (nReserved > 0)
++    {
++      memcpy(data + n, iv, nReserved);
++    }
++    if (page == 1 && usePlaintextHeader == 0)
++    {
++      memcpy(data, SQLITE_FILE_HEADER, 16);
++    }
++  }
++  else
++  {
++    /* Bad MAC */
++    rc = (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++  }
++
++  return rc;
++}
++SQLITE_PRIVATE const CipherDescriptor mcSQLCipherDescriptor =
++{
++  CIPHER_NAME_SQLCIPHER,
++  AllocateSQLCipherCipher,
++  FreeSQLCipherCipher,
++  CloneSQLCipherCipher,
++  GetLegacySQLCipherCipher,
++  GetPageSizeSQLCipherCipher,
++  GetReservedSQLCipherCipher,
++  GetSaltSQLCipherCipher,
++  GenerateKeySQLCipherCipher,
++  EncryptPageSQLCipherCipher,
++  DecryptPageSQLCipherCipher
++};
++#endif
++/*** End of #include "cipher_sqlcipher.c" ***/
++
++/* #include "cipher_sds_rc4.c" */
++/*** Begin of #include "cipher_sds_rc4.c" ***/
++/*
++** Name:        cipher_sds_rc4.c
++** Purpose:     Implementation of cipher System.Data.SQLite3 RC4
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- RC4 cipher (System.Data.SQLite) --- */
++#if HAVE_CIPHER_RC4
++
++#define CIPHER_NAME_RC4 "rc4"
++
++/*
++** Configuration parameters for "rc4"
++**
++** - legacy mode : compatibility with System.Data.SQLite encryption
++**                 (page 1 fully encrypted)
++**                 only legacy mode is supported
++**                 possible value:  1 = yes
++*/
++
++#define RC4_LEGACY_DEFAULT 1
++
++SQLITE_PRIVATE CipherParams mcRC4Params[] =
++{
++  { "legacy",           RC4_LEGACY_DEFAULT, RC4_LEGACY_DEFAULT, RC4_LEGACY_DEFAULT, RC4_LEGACY_DEFAULT },
++  { "legacy_page_size", 0,                  0,                  0,                  SQLITE_MAX_PAGE_SIZE },
++  CIPHER_PARAMS_SENTINEL
++};
++
++
++#define KEYLENGTH_RC4 16
++
++typedef struct _RC4Cipher
++{
++  int       m_legacy;
++  int       m_legacyPageSize;
++  int       m_keyLength;
++  uint8_t   m_key[KEYLENGTH_RC4];
++} RC4Cipher;
++
++static void*
++AllocateRC4Cipher(sqlite3* db)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*) sqlite3_malloc(sizeof(RC4Cipher));
++  if (rc4Cipher != NULL)
++  {
++    rc4Cipher->m_keyLength = KEYLENGTH_RC4;
++    memset(rc4Cipher->m_key, 0, KEYLENGTH_RC4);
++  }
++  if (rc4Cipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_RC4);
++    rc4Cipher->m_legacy = sqlite3mcGetCipherParameter(cipherParams, "legacy");
++    rc4Cipher->m_legacyPageSize = sqlite3mcGetCipherParameter(cipherParams, "legacy_page_size");
++  }
++  return rc4Cipher;
++}
++
++static void
++FreeRC4Cipher(void* cipher)
++{
++  RC4Cipher* localCipher = (RC4Cipher*) cipher;
++  memset(localCipher, 0, sizeof(RC4Cipher));
++  sqlite3_free(localCipher);
++}
++
++static void
++CloneRC4Cipher(void* cipherTo, void* cipherFrom)
++{
++  RC4Cipher* rc4CipherTo = (RC4Cipher*) cipherTo;
++  RC4Cipher* rc4CipherFrom = (RC4Cipher*) cipherFrom;
++  rc4CipherTo->m_legacy = rc4CipherFrom->m_legacy;
++  rc4CipherTo->m_legacyPageSize = rc4CipherFrom->m_legacyPageSize;
++  rc4CipherTo->m_keyLength = rc4CipherFrom->m_keyLength;
++  memcpy(rc4CipherTo->m_key, rc4CipherFrom->m_key, KEYLENGTH_RC4);
++}
++
++static int
++GetLegacyRC4Cipher(void* cipher)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*)cipher;
++  return rc4Cipher->m_legacy;
++}
++
++static int
++GetPageSizeRC4Cipher(void* cipher)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*) cipher;
++  int pageSize = 0;
++  if (rc4Cipher->m_legacy != 0)
++  {
++    pageSize = rc4Cipher->m_legacyPageSize;
++    if ((pageSize < 512) || (pageSize > SQLITE_MAX_PAGE_SIZE) || (((pageSize - 1) & pageSize) != 0))
++    {
++      pageSize = 0;
++    }
++  }
++  return pageSize;
++}
++
++static int
++GetReservedRC4Cipher(void* cipher)
++{
++  return 0;
++}
++
++static unsigned char*
++GetSaltRC4Cipher(void* cipher)
++{
++  return NULL;
++}
++
++static void
++GenerateKeyRC4Cipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*) cipher;
++  unsigned char digest[SHA1_DIGEST_SIZE];
++  sha1_ctx ctx;
++
++  sha1_init(&ctx);
++  sha1_update(&ctx, userPassword, passwordLength);
++  sha1_final(&ctx, digest);
++
++  memcpy(rc4Cipher->m_key, digest, 16);
++/*  memset(rc4Cipher->m_key+5, 0, rc4Cipher->m_keyLength-5);*/
++}
++
++static int
++EncryptPageRC4Cipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*) cipher;
++  int rc = SQLITE_OK;
++
++  /* Use the legacy encryption scheme */
++  unsigned char* key = rc4Cipher->m_key;
++  sqlite3mcRC4(key, rc4Cipher->m_keyLength, data, len, data);
++
++  return rc;
++}
++
++static int
++DecryptPageRC4Cipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  RC4Cipher* rc4Cipher = (RC4Cipher*) cipher;
++  int rc = SQLITE_OK;
++
++  /* Use the legacy encryption scheme */
++  sqlite3mcRC4(rc4Cipher->m_key, rc4Cipher->m_keyLength, data, len, data);
++
++  return rc;
++}
++
++SQLITE_PRIVATE const CipherDescriptor mcRC4Descriptor =
++{
++  CIPHER_NAME_RC4,
++  AllocateRC4Cipher,
++  FreeRC4Cipher,
++  CloneRC4Cipher,
++  GetLegacyRC4Cipher,
++  GetPageSizeRC4Cipher,
++  GetReservedRC4Cipher,
++  GetSaltRC4Cipher,
++  GenerateKeyRC4Cipher,
++  EncryptPageRC4Cipher,
++  DecryptPageRC4Cipher
++};
++#endif
++/*** End of #include "cipher_sds_rc4.c" ***/
++
++/* #include "cipher_ascon.c" */
++/*** Begin of #include "cipher_ascon.c" ***/
++/*
++** Name:        cipher_ascon.c
++** Purpose:     Implementation of cipher Ascon
++** Author:      Ulrich Telle
++** Created:     2023-11-13
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++/* --- Ascon --- */
++#if HAVE_CIPHER_ASCON128
++
++#define CIPHER_NAME_ASCON128 "ascon128"
++
++/*
++** Configuration parameters for "ascon128a"
++**
++** - kdf_iter : number of iterations for key derivation
++*/
++
++#define ASCON128_KDF_ITER_DEFAULT 64007
++
++/* #include "ascon/prolog.h" */
++/*** Begin of #include "ascon/prolog.h" ***/
++/*
++** Name:        prolog.h
++** Purpose:     Include important header files, before 
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef PROLOG_H
++#define PROLOG_H
++
++/* #include "word.h" */
++/*** Begin of #include "word.h" ***/
++#ifndef WORD_H_
++#define WORD_H_
++
++#include 
++#include 
++
++/* #include "bendian.h" */
++/*** Begin of #include "bendian.h" ***/
++#ifndef ENDIAN_H_
++#define ENDIAN_H_
++
++#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++
++/* macros for big endian machines */
++#ifdef PRAGMA_ENDIAN
++#pragma message("Using macros for big endian machines")
++#endif
++#define ASCON_U64BIG(x) (x)
++#define ASCON_U32BIG(x) (x)
++#define ASCON_U16BIG(x) (x)
++
++#elif defined(_MSC_VER) || \
++    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
++
++/* macros for little endian machines */
++#ifdef PRAGMA_ENDIAN
++#pragma message("Using macros for little endian machines")
++#endif
++#define ASCON_U64BIG(x)                          \
++  (((0x00000000000000FFULL & (x)) << 56) | \
++   ((0x000000000000FF00ULL & (x)) << 40) | \
++   ((0x0000000000FF0000ULL & (x)) << 24) | \
++   ((0x00000000FF000000ULL & (x)) << 8) |  \
++   ((0x000000FF00000000ULL & (x)) >> 8) |  \
++   ((0x0000FF0000000000ULL & (x)) >> 24) | \
++   ((0x00FF000000000000ULL & (x)) >> 40) | \
++   ((0xFF00000000000000ULL & (x)) >> 56))
++#define ASCON_U32BIG(x)                                           \
++  (((0x000000FF & (x)) << 24) | ((0x0000FF00 & (x)) << 8) | \
++   ((0x00FF0000 & (x)) >> 8) | ((0xFF000000 & (x)) >> 24))
++#define ASCON_U16BIG(x) (((0x00FF & (x)) << 8) | ((0xFF00 & (x)) >> 8))
++
++#else
++#error "Ascon byte order macros not defined in bendian.h"
++#endif
++
++#endif /* ENDIAN_H_ */
++/*** End of #include "bendian.h" ***/
++
++/* #include "forceinline.h" */
++/*** Begin of #include "forceinline.h" ***/
++#ifndef FORCEINLINE_H_
++#define FORCEINLINE_H_
++
++/* define forceinline macro */
++#ifdef _MSC_VER
++#define forceinline __forceinline
++#elif defined(__GNUC__)
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++#define forceinline inline __attribute__((__always_inline__))
++#else
++#define forceinline static inline
++#endif
++#elif defined(__CLANG__)
++#if __has_attribute(__always_inline__)
++#define forceinline inline __attribute__((__always_inline__))
++#else
++#define forceinline inline
++#endif
++#else
++#define forceinline inline
++#endif
++
++#endif /* FORCEINLINE_H_ */
++/*** End of #include "forceinline.h" ***/
++
++
++typedef union {
++  uint64_t x;
++  uint32_t w[2];
++  uint8_t b[8];
++} word_t;
++
++#define ASCON_U64TOWORD(x) ASCON_U64BIG(x)
++#define ASCON_WORDTOU64(x) ASCON_U64BIG(x)
++
++forceinline uint64_t ASCON_ROR(uint64_t x, int n) { return x >> n | x << (-n & 63); }
++
++forceinline uint64_t ASCON_KEYROT(uint64_t lo2hi, uint64_t hi2lo) {
++  return lo2hi << 32 | hi2lo >> 32;
++}
++
++forceinline int ASCON_NOTZERO(uint64_t a, uint64_t b) {
++  uint64_t result = a | b;
++  result |= result >> 32;
++  result |= result >> 16;
++  result |= result >> 8;
++  return ((((int)(result & 0xff) - 1) >> 8) & 1) - 1;
++}
++
++forceinline uint64_t ASCON_PAD(int i) { return 0x80ull << (56 - 8 * i); }
++
++forceinline uint64_t ASCON_PRFS_MLEN(uint64_t len) { return len << 51; }
++
++forceinline uint64_t ASCON_CLEAR(uint64_t w, int n) {
++  /* undefined for n == 0 */
++  uint64_t mask = ~0ull >> (8 * n);
++  return w & mask;
++}
++
++forceinline uint64_t ASCON_MASK(int n) {
++  /* undefined for n == 0 */
++  return ~0ull >> (64 - 8 * n);
++}
++
++forceinline uint64_t ASCON_LOAD(const uint8_t* bytes, int n) {
++  uint64_t x = *(uint64_t*)bytes & ASCON_MASK(n);
++  return ASCON_U64TOWORD(x);
++}
++
++forceinline void ASCON_STORE(uint8_t* bytes, uint64_t w, int n) {
++  *(uint64_t*)bytes &= ~ASCON_MASK(n);
++  *(uint64_t*)bytes |= ASCON_WORDTOU64(w);
++}
++
++forceinline uint64_t ASCON_LOADBYTES(const uint8_t* bytes, int n) {
++  uint64_t x = 0;
++  memcpy(&x, bytes, n);
++  return ASCON_U64TOWORD(x);
++}
++
++forceinline void ASCON_STOREBYTES(uint8_t* bytes, uint64_t w, int n) {
++  uint64_t x = ASCON_WORDTOU64(w);
++  memcpy(bytes, &x, n);
++}
++
++#endif /* WORD_H_ */
++/*** End of #include "word.h" ***/
++
++
++#endif
++/*** End of #include "ascon/prolog.h" ***/
++
++/* #include "ascon/aead.c" */
++/*** Begin of #include "ascon/aead.c" ***/
++/*
++** Name:        aead.c
++** Purpose:     Stream encryption/decryption with Ascon
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "api.h" */
++/*** Begin of #include "api.h" ***/
++/*
++** Name:        api.h
++** Purpose:     Definition of preprocessor symbols
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++**              Combined symbols from AEAD and HASH
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#define CRYPTO_VERSION "1.2.7"
++#define CRYPTO_KEYBYTES 16
++#define CRYPTO_NSECBYTES 0
++#define CRYPTO_NPUBBYTES 16
++#define CRYPTO_ABYTES 16
++#define CRYPTO_NOOVERLAP 1
++#define ASCON_AEAD_RATE 8
++
++#define CRYPTO_BYTES 32
++#define ASCON_HASH_BYTES 32 /* HASH */
++#define ASCON_HASH_ROUNDS 12
++
++#define ASCON_AEAD_KEY_LEN CRYPTO_KEYBYTES
++#define ASCON_AEAD_NONCE_LEN CRYPTO_NPUBBYTES
++#define ASCON_AEAD_TAG_LEN CRYPTO_ABYTES
++#define ASCON_SALT_LEN CRYPTO_NPUBBYTES
++/*** End of #include "api.h" ***/
++
++/* #include "ascon.h" */
++/*** Begin of #include "ascon.h" ***/
++#ifndef ASCON_H_
++#define ASCON_H_
++
++#include 
++
++/* #include "api.h" */
++
++/* #include "config.h" */
++/*** Begin of #include "config.h" ***/
++#ifndef CONFIG_H_
++#define CONFIG_H_
++
++/* inline the ascon mode */
++#ifndef ASCON_INLINE_MODE
++#define ASCON_INLINE_MODE 1
++#endif
++
++/* inline all permutations */
++#ifndef ASCON_INLINE_PERM
++#define ASCON_INLINE_PERM 1
++#endif
++
++/* unroll permutation loops */
++#ifndef ASCON_UNROLL_LOOPS
++#define ASCON_UNROLL_LOOPS 1
++#endif
++
++#endif /* CONFIG_H_ */
++/*** End of #include "config.h" ***/
++
++
++typedef union {
++  uint64_t x[5];
++  uint32_t w[5][2];
++  uint8_t b[5][8];
++} ascon_state_t;
++
++#ifdef ASCON_AEAD_RATE
++
++#define ASCON_KEYWORDS (CRYPTO_KEYBYTES + 7) / 8
++
++typedef union {
++  uint64_t x[ASCON_KEYWORDS];
++  uint32_t w[ASCON_KEYWORDS][2];
++  uint8_t b[ASCON_KEYWORDS][8];
++} ascon_key_t;
++
++#if !ASCON_INLINE_MODE
++
++void ascon_loadkey(ascon_key_t* key, const uint8_t* k);
++void ascon_initaead(ascon_state_t* s, const ascon_key_t* key,
++                    const uint8_t* npub);
++void ascon_adata(ascon_state_t* s, const uint8_t* ad, uint64_t adlen);
++void ascon_encrypt(ascon_state_t* s, uint8_t* c, const uint8_t* m,
++                   uint64_t mlen);
++void ascon_decrypt(ascon_state_t* s, uint8_t* m, const uint8_t* c,
++                   uint64_t clen);
++void ascon_final(ascon_state_t* s, const ascon_key_t* k);
++
++#endif
++
++#endif
++
++#ifdef ASCON_HASH_BYTES
++
++#if !ASCON_INLINE_MODE
++
++void ascon_inithash(ascon_state_t* s);
++void ascon_absorb(ascon_state_t* s, const uint8_t* in, uint64_t inlen);
++void ascon_squeeze(ascon_state_t* s, uint8_t* out, uint64_t outlen);
++
++#endif
++
++#endif
++
++#endif /* ASCON_H_ */
++/*** End of #include "ascon.h" ***/
++
++/* #include "crypto_aead.h" */
++/*** Begin of #include "crypto_aead.h" ***/
++/*
++** Name:        hash.c
++** Purpose:     API definition for Hash algorithm with Ascon
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef CRYPTO_AEAD_H
++#define CRYPTO_AEAD_H
++
++#include 
++
++/*
++** Encryption using ASCON-AEAD.
++**
++** \param ctext Output buffer for encrypted text (same length as plain text)
++** \param tag Output buffer for tag with fixed length of ASCON_AEAD_TAG_LEN
++** \param mtext Input buffer with plain message text
++** \param mlen Length of message text
++** \param ad Input buffer with associated data
++** \param adlen Length of associated data
++** \param nonce Buffer with nonce data
++** \param k Buffer with key data
++*/
++int ascon_aead_encrypt(uint8_t* ctext, uint8_t tag[ASCON_AEAD_TAG_LEN],
++                       const uint8_t* mtext, uint64_t mlen,
++                       const uint8_t* ad, uint64_t adlen,
++                       const uint8_t nonce[ASCON_AEAD_NONCE_LEN],
++                       const uint8_t k[ASCON_AEAD_KEY_LEN]);
++
++/*
++** Encryption using ASCON-AEAD.
++**
++** \param mtext Output buffer with decrypted plain message text  (same length as encrypted text)
++** \param ctext Input buffer for encrypted text
++** \param clen Length of encrypted text
++** \param ad Input buffer with associated data
++** \param adlen Length of associated data
++** \param tag Input buffer for expected tag with fixed length of ASCON_AEAD_TAG_LEN
++** \param nonce Buffer with nonce data
++** \param k Buffer with key data
++*/
++int ascon_aead_decrypt(uint8_t* mtext, const uint8_t* ctext, uint64_t clen,
++                       const uint8_t* ad, uint64_t adlen,
++                       const uint8_t tag[ASCON_AEAD_TAG_LEN],
++                       const uint8_t nonce[ASCON_AEAD_NONCE_LEN],
++                       const uint8_t k[ASCON_AEAD_KEY_LEN]);
++
++#endif
++/*** End of #include "crypto_aead.h" ***/
++
++/* #include "permutations.h" */
++/*** Begin of #include "permutations.h" ***/
++#ifndef PERMUTATIONS_H_
++#define PERMUTATIONS_H_
++
++#include 
++
++/* #include "api.h" */
++
++/* #include "ascon.h" */
++
++/* #include "config.h" */
++
++/* #include "constants.h" */
++/*** Begin of #include "constants.h" ***/
++#ifndef CONSTANTS_H_
++#define CONSTANTS_H_
++
++#include 
++
++#define ASCON_128_KEYBYTES 16
++#define ASCON_128A_KEYBYTES 16
++#define ASCON_80PQ_KEYBYTES 20
++
++#define ASCON_128_RATE 8
++#define ASCON_128A_RATE 16
++#define ASCON_HASH_RATE 8
++#define ASCON_PRF_IN_RATE 32
++#define ASCON_PRFA_IN_RATE 40
++#define ASCON_PRF_OUT_RATE 16
++
++#define ASCON_128_PA_ROUNDS 12
++#define ASCON_128_PB_ROUNDS 6
++#define ASCON_128A_PA_ROUNDS 12
++#define ASCON_128A_PB_ROUNDS 8
++
++#define ASCON_HASH_PA_ROUNDS 12
++#define ASCON_HASH_PB_ROUNDS 12
++#define ASCON_HASHA_PA_ROUNDS 12
++#define ASCON_HASHA_PB_ROUNDS 8
++
++#define ASCON_PRF_PA_ROUNDS 12
++#define ASCON_PRF_PB_ROUNDS 12
++#define ASCON_PRFA_PA_ROUNDS 12
++#define ASCON_PRFA_PB_ROUNDS 8
++
++#define ASCON_128_IV 0x80400c0600000000ull
++#define ASCON_128A_IV 0x80800c0800000000ull
++#define ASCON_80PQ_IV 0xa0400c0600000000ull
++
++#define ASCON_HASH_IV 0x00400c0000000100ull
++#define ASCON_HASHA_IV 0x00400c0400000100ull
++#define ASCON_XOF_IV 0x00400c0000000000ull
++#define ASCON_XOFA_IV 0x00400c0400000000ull
++
++#define ASCON_HASH_IV0 0xee9398aadb67f03dull
++#define ASCON_HASH_IV1 0x8bb21831c60f1002ull
++#define ASCON_HASH_IV2 0xb48a92db98d5da62ull
++#define ASCON_HASH_IV3 0x43189921b8f8e3e8ull
++#define ASCON_HASH_IV4 0x348fa5c9d525e140ull
++
++#define ASCON_HASHA_IV0 0x01470194fc6528a6ull
++#define ASCON_HASHA_IV1 0x738ec38ac0adffa7ull
++#define ASCON_HASHA_IV2 0x2ec8e3296c76384cull
++#define ASCON_HASHA_IV3 0xd6f6a54d7f52377dull
++#define ASCON_HASHA_IV4 0xa13c42a223be8d87ull
++
++#define ASCON_XOF_IV0 0xb57e273b814cd416ull
++#define ASCON_XOF_IV1 0x2b51042562ae2420ull
++#define ASCON_XOF_IV2 0x66a3a7768ddf2218ull
++#define ASCON_XOF_IV3 0x5aad0a7a8153650cull
++#define ASCON_XOF_IV4 0x4f3e0e32539493b6ull
++
++#define ASCON_XOFA_IV0 0x44906568b77b9832ull
++#define ASCON_XOFA_IV1 0xcd8d6cae53455532ull
++#define ASCON_XOFA_IV2 0xf7b5212756422129ull
++#define ASCON_XOFA_IV3 0x246885e1de0d225bull
++#define ASCON_XOFA_IV4 0xa8cb5ce33449973full
++
++#define ASCON_MAC_IV 0x80808c0000000080ull
++#define ASCON_MACA_IV 0x80808c0400000080ull
++#define ASCON_PRF_IV 0x80808c0000000000ull
++#define ASCON_PRFA_IV 0x80808c0400000000ull
++#define ASCON_PRFS_IV 0x80004c8000000000ull
++
++#define ASCON_RC0 0xf0
++#define ASCON_RC1 0xe1
++#define ASCON_RC2 0xd2
++#define ASCON_RC3 0xc3
++#define ASCON_RC4 0xb4
++#define ASCON_RC5 0xa5
++#define ASCON_RC6 0x96
++#define ASCON_RC7 0x87
++#define ASCON_RC8 0x78
++#define ASCON_RC9 0x69
++#define ASCON_RCa 0x5a
++#define ASCON_RCb 0x4b
++
++#define ASCON_RC(i) (i)
++
++#define ASCON_START(n) ((3 + (n)) << 4 | (12 - (n)))
++#define ASCON_INC -0x0f
++#define ASCON_END 0x3c
++
++#endif /* CONSTANTS_H_ */
++/*** End of #include "constants.h" ***/
++
++/* #include "printstate.h" */
++/*** Begin of #include "printstate.h" ***/
++#ifndef PRINTSTATE_H_
++#define PRINTSTATE_H_
++
++#ifdef ASCON_PRINT_STATE
++
++/* #include "ascon.h" */
++
++/* #include "word.h" */
++
++
++void ascon_printword(const char* text, const uint64_t x);
++void ascon_printstate(const char* text, const ascon_state_t* s);
++
++#else
++
++#define ascon_printword(text, w) \
++  do {                     \
++  } while (0)
++
++#define ascon_printstate(text, s) \
++  do {                      \
++  } while (0)
++
++#endif
++
++#endif /* PRINTSTATE_H_ */
++/*** End of #include "printstate.h" ***/
++
++/* #include "round.h" */
++/*** Begin of #include "round.h" ***/
++/*
++** Name:        round.h
++** Purpose:     Selector for Ascon implementation variant for 32- resp 64-bit
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef ROUND_H
++#define ROUND_H
++
++/* #include "forceinline.h" */
++
++
++#if defined(__LP64__) || defined(_WIN64)
++/* 64-bit machine, Windows or Linux or OS X */
++/* #include "round64.h" */
++/*** Begin of #include "round64.h" ***/
++#ifndef ROUND64_H_
++#define ROUND64_H_
++
++/* #include "ascon.h" */
++
++/* #include "constants.h" */
++
++/* #include "forceinline.h" */
++
++/* #include "printstate.h" */
++
++/* #include "word.h" */
++
++
++forceinline void ASCON_ROUND(ascon_state_t* s, uint8_t C) {
++  ascon_state_t t;
++  /* round constant */
++  s->x[2] ^= C;
++  /* s-box layer */
++  s->x[0] ^= s->x[4];
++  s->x[4] ^= s->x[3];
++  s->x[2] ^= s->x[1];
++  t.x[0] = s->x[0] ^ (~s->x[1] & s->x[2]);
++  t.x[2] = s->x[2] ^ (~s->x[3] & s->x[4]);
++  t.x[4] = s->x[4] ^ (~s->x[0] & s->x[1]);
++  t.x[1] = s->x[1] ^ (~s->x[2] & s->x[3]);
++  t.x[3] = s->x[3] ^ (~s->x[4] & s->x[0]);
++  t.x[1] ^= t.x[0];
++  t.x[3] ^= t.x[2];
++  t.x[0] ^= t.x[4];
++  /* linear layer */
++  s->x[2] = t.x[2] ^ ASCON_ROR(t.x[2], 6 - 1);
++  s->x[3] = t.x[3] ^ ASCON_ROR(t.x[3], 17 - 10);
++  s->x[4] = t.x[4] ^ ASCON_ROR(t.x[4], 41 - 7);
++  s->x[0] = t.x[0] ^ ASCON_ROR(t.x[0], 28 - 19);
++  s->x[1] = t.x[1] ^ ASCON_ROR(t.x[1], 61 - 39);
++  s->x[2] = t.x[2] ^ ASCON_ROR(s->x[2], 1);
++  s->x[3] = t.x[3] ^ ASCON_ROR(s->x[3], 10);
++  s->x[4] = t.x[4] ^ ASCON_ROR(s->x[4], 7);
++  s->x[0] = t.x[0] ^ ASCON_ROR(s->x[0], 19);
++  s->x[1] = t.x[1] ^ ASCON_ROR(s->x[1], 39);
++  s->x[2] = ~s->x[2];
++  ascon_printstate(" round output", s);
++}
++
++forceinline void ASCON_PROUNDS(ascon_state_t* s, int nr) {
++  int i = ASCON_START(nr);
++  do {
++    ASCON_ROUND(s, ASCON_RC(i));
++    i += ASCON_INC;
++  } while (i != ASCON_END);
++}
++
++#endif /* ROUND64_H_ */
++/*** End of #include "round64.h" ***/
++
++#else
++/* 32-bit machine, Windows or Linux or OS X */
++/* #include "round32.h" */
++/*** Begin of #include "round32.h" ***/
++#ifndef ROUND32_H_
++#define ROUND32_H_
++
++/* #include "ascon.h" */
++
++/* #include "constants.h" */
++
++/* #include "forceinline.h" */
++
++/* #include "printstate.h" */
++
++/* #include "word.h" */
++
++
++forceinline void ASCON_ROUND(ascon_state_t* s, uint8_t C) {
++  uint64_t xtemp;
++  /* round constant */
++  s->x[2] ^= C;
++  /* s-box layer */
++  s->x[0] ^= s->x[4];
++  s->x[4] ^= s->x[3];
++  s->x[2] ^= s->x[1];
++  xtemp = s->x[0] & ~s->x[4];
++  s->x[0] ^= s->x[2] & ~s->x[1];
++  s->x[2] ^= s->x[4] & ~s->x[3];
++  s->x[4] ^= s->x[1] & ~s->x[0];
++  s->x[1] ^= s->x[3] & ~s->x[2];
++  s->x[3] ^= xtemp;
++  s->x[1] ^= s->x[0];
++  s->x[3] ^= s->x[2];
++  s->x[0] ^= s->x[4];
++  s->x[2] = ~s->x[2];
++  /* linear layer */
++  s->x[0] ^=
++      (s->x[0] >> 19) ^ (s->x[0] << 45) ^ (s->x[0] >> 28) ^ (s->x[0] << 36);
++  s->x[1] ^=
++      (s->x[1] >> 61) ^ (s->x[1] << 3) ^ (s->x[1] >> 39) ^ (s->x[1] << 25);
++  s->x[2] ^=
++      (s->x[2] >> 1) ^ (s->x[2] << 63) ^ (s->x[2] >> 6) ^ (s->x[2] << 58);
++  s->x[3] ^=
++      (s->x[3] >> 10) ^ (s->x[3] << 54) ^ (s->x[3] >> 17) ^ (s->x[3] << 47);
++  s->x[4] ^=
++      (s->x[4] >> 7) ^ (s->x[4] << 57) ^ (s->x[4] >> 41) ^ (s->x[4] << 23);
++  ascon_printstate(" round output", s);
++}
++
++forceinline void ASCON_PROUNDS(ascon_state_t* s, int nr) {
++  int i = ASCON_START(nr);
++  do {
++    ASCON_ROUND(s, ASCON_RC(i));
++    i += ASCON_INC;
++  } while (i != ASCON_END);
++}
++
++#endif /* ROUND32_H_ */
++/*** End of #include "round32.h" ***/
++
++#endif
++
++#endif
++/*** End of #include "round.h" ***/
++
++
++forceinline void ASCON_P12ROUNDS(ascon_state_t* s) {
++  ASCON_ROUND(s, ASCON_RC0);
++  ASCON_ROUND(s, ASCON_RC1);
++  ASCON_ROUND(s, ASCON_RC2);
++  ASCON_ROUND(s, ASCON_RC3);
++  ASCON_ROUND(s, ASCON_RC4);
++  ASCON_ROUND(s, ASCON_RC5);
++  ASCON_ROUND(s, ASCON_RC6);
++  ASCON_ROUND(s, ASCON_RC7);
++  ASCON_ROUND(s, ASCON_RC8);
++  ASCON_ROUND(s, ASCON_RC9);
++  ASCON_ROUND(s, ASCON_RCa);
++  ASCON_ROUND(s, ASCON_RCb);
++}
++
++forceinline void ASCON_P8ROUNDS(ascon_state_t* s) {
++  ASCON_ROUND(s, ASCON_RC4);
++  ASCON_ROUND(s, ASCON_RC5);
++  ASCON_ROUND(s, ASCON_RC6);
++  ASCON_ROUND(s, ASCON_RC7);
++  ASCON_ROUND(s, ASCON_RC8);
++  ASCON_ROUND(s, ASCON_RC9);
++  ASCON_ROUND(s, ASCON_RCa);
++  ASCON_ROUND(s, ASCON_RCb);
++}
++
++forceinline void ASCON_P6ROUNDS(ascon_state_t* s) {
++  ASCON_ROUND(s, ASCON_RC6);
++  ASCON_ROUND(s, ASCON_RC7);
++  ASCON_ROUND(s, ASCON_RC8);
++  ASCON_ROUND(s, ASCON_RC9);
++  ASCON_ROUND(s, ASCON_RCa);
++  ASCON_ROUND(s, ASCON_RCb);
++}
++
++#if ASCON_INLINE_PERM && ASCON_UNROLL_LOOPS
++
++forceinline void ASCON_P(ascon_state_t* s, int nr) {
++  if (nr == 12) ASCON_P12ROUNDS(s);
++  if (nr == 8) ASCON_P8ROUNDS(s);
++  if (nr == 6) ASCON_P6ROUNDS(s);
++}
++
++#elif !ASCON_INLINE_PERM && ASCON_UNROLL_LOOPS
++
++void ASCON_P12(ascon_state_t* s);
++void ASCON_P8(ascon_state_t* s);
++void ASCON_P6(ascon_state_t* s);
++
++forceinline void ASCON_P(ascon_state_t* s, int nr) {
++  if (nr == 12) ASCON_P12(s);
++  if (nr == 8) ASCON_P8(s);
++  if (nr == 6) ASCON_P6(s);
++}
++
++#elif ASCON_INLINE_PERM && !ASCON_UNROLL_LOOPS
++
++forceinline void ASCON_P(ascon_state_t* s, int nr) { ASCON_PROUNDS(s, nr); }
++
++#else /* !ASCON_INLINE_PERM && !ASCON_UNROLL_LOOPS */
++
++void ASCON_P(ascon_state_t* s, int nr);
++
++#endif
++
++#endif /* PERMUTATIONS_H_ */
++/*** End of #include "permutations.h" ***/
++
++/* #include "printstate.h" */
++
++
++#if !ASCON_INLINE_MODE
++#undef forceinline
++#define forceinline
++#endif
++
++#ifdef ASCON_AEAD_RATE
++
++forceinline void ascon_loadkey(ascon_key_t* key, const uint8_t* k) {
++#if CRYPTO_KEYBYTES == 16
++  key->x[0] = ASCON_LOAD(k, 8);
++  key->x[1] = ASCON_LOAD(k + 8, 8);
++#else /* CRYPTO_KEYBYTES == 20 */
++  key->x[0] = ASCON_KEYROT(0, ASCON_LOADBYTES(k, 4));
++  key->x[1] = ASCON_LOADBYTES(k + 4, 8);
++  key->x[2] = ASCON_LOADBYTES(k + 12, 8);
++#endif
++}
++
++forceinline void ascon_initaead(ascon_state_t* s, const ascon_key_t* key,
++                                const uint8_t* npub) {
++#if CRYPTO_KEYBYTES == 16
++  if (ASCON_AEAD_RATE == 8) s->x[0] = ASCON_128_IV;
++  if (ASCON_AEAD_RATE == 16) s->x[0] = ASCON_128A_IV;
++  s->x[1] = key->x[0];
++  s->x[2] = key->x[1];
++#else /* CRYPTO_KEYBYTES == 20 */
++  s->x[0] = key->x[0] ^ ASCON_80PQ_IV;
++  s->x[1] = key->x[1];
++  s->x[2] = key->x[2];
++#endif
++  s->x[3] = ASCON_LOAD(npub, 8);
++  s->x[4] = ASCON_LOAD(npub + 8, 8);
++  ascon_printstate("init 1st key xor", s);
++  ASCON_P(s, 12);
++#if CRYPTO_KEYBYTES == 16
++  s->x[3] ^= key->x[0];
++  s->x[4] ^= key->x[1];
++#else /* CRYPTO_KEYBYTES == 20 */
++  s->x[2] ^= key->x[0];
++  s->x[3] ^= key->x[1];
++  s->x[4] ^= key->x[2];
++#endif
++  ascon_printstate("init 2nd key xor", s);
++}
++
++forceinline void ascon_adata(ascon_state_t* s, const uint8_t* ad,
++                             uint64_t adlen) {
++  const int nr = (ASCON_AEAD_RATE == 8) ? 6 : 8;
++  if (adlen) {
++    /* full associated data blocks */
++    while (adlen >= ASCON_AEAD_RATE) {
++      s->x[0] ^= ASCON_LOAD(ad, 8);
++      if (ASCON_AEAD_RATE == 16) s->x[1] ^= ASCON_LOAD(ad + 8, 8);
++      ascon_printstate("absorb adata", s);
++      ASCON_P(s, nr);
++      ad += ASCON_AEAD_RATE;
++      adlen -= ASCON_AEAD_RATE;
++    }
++    /* final associated data block */
++    uint64_t* px = &s->x[0];
++    if (ASCON_AEAD_RATE == 16 && adlen >= 8) {
++      s->x[0] ^= ASCON_LOAD(ad, 8);
++      px = &s->x[1];
++      ad += 8;
++      adlen -= 8;
++    }
++    *px ^= ASCON_PAD(adlen);
++    if (adlen) *px ^= ASCON_LOADBYTES(ad, adlen);
++    ascon_printstate("pad adata", s);
++    ASCON_P(s, nr);
++  }
++  /* domain separation */
++  s->x[4] ^= 1;
++  ascon_printstate("domain separation", s);
++}
++
++forceinline void ascon_encrypt(ascon_state_t* s, uint8_t* c, const uint8_t* m,
++                               uint64_t mlen) {
++  const int nr = (ASCON_AEAD_RATE == 8) ? 6 : 8;
++  /* full plaintext blocks */
++  while (mlen >= ASCON_AEAD_RATE) {
++    s->x[0] ^= ASCON_LOAD(m, 8);
++    ASCON_STORE(c, s->x[0], 8);
++    if (ASCON_AEAD_RATE == 16) {
++      s->x[1] ^= ASCON_LOAD(m + 8, 8);
++      ASCON_STORE(c + 8, s->x[1], 8);
++    }
++    ascon_printstate("absorb plaintext", s);
++    ASCON_P(s, nr);
++    m += ASCON_AEAD_RATE;
++    c += ASCON_AEAD_RATE;
++    mlen -= ASCON_AEAD_RATE;
++  }
++  /* final plaintext block */
++  uint64_t* px = &s->x[0];
++  if (ASCON_AEAD_RATE == 16 && mlen >= 8) {
++    s->x[0] ^= ASCON_LOAD(m, 8);
++    ASCON_STORE(c, s->x[0], 8);
++    px = &s->x[1];
++    m += 8;
++    c += 8;
++    mlen -= 8;
++  }
++  *px ^= ASCON_PAD(mlen);
++  if (mlen) {
++    *px ^= ASCON_LOADBYTES(m, mlen);
++    ASCON_STOREBYTES(c, *px, mlen);
++  }
++  ascon_printstate("pad plaintext", s);
++}
++
++forceinline void ascon_decrypt(ascon_state_t* s, uint8_t* m, const uint8_t* c,
++                               uint64_t clen) {
++  const int nr = (ASCON_AEAD_RATE == 8) ? 6 : 8;
++  /* full ciphertext blocks */
++  while (clen >= ASCON_AEAD_RATE) {
++    uint64_t cx = ASCON_LOAD(c, 8);
++    s->x[0] ^= cx;
++    ASCON_STORE(m, s->x[0], 8);
++    s->x[0] = cx;
++    if (ASCON_AEAD_RATE == 16) {
++      cx = ASCON_LOAD(c + 8, 8);
++      s->x[1] ^= cx;
++      ASCON_STORE(m + 8, s->x[1], 8);
++      s->x[1] = cx;
++    }
++    ascon_printstate("insert ciphertext", s);
++    ASCON_P(s, nr);
++    m += ASCON_AEAD_RATE;
++    c += ASCON_AEAD_RATE;
++    clen -= ASCON_AEAD_RATE;
++  }
++  /* final ciphertext block */
++  uint64_t* px = &s->x[0];
++  if (ASCON_AEAD_RATE == 16 && clen >= 8) {
++    uint64_t cx = ASCON_LOAD(c, 8);
++    s->x[0] ^= cx;
++    ASCON_STORE(m, s->x[0], 8);
++    s->x[0] = cx;
++    px = &s->x[1];
++    m += 8;
++    c += 8;
++    clen -= 8;
++  }
++  *px ^= ASCON_PAD(clen);
++  if (clen) {
++    uint64_t cx = ASCON_LOADBYTES(c, clen);
++    *px ^= cx;
++    ASCON_STOREBYTES(m, *px, clen);
++    *px = ASCON_CLEAR(*px, clen);
++    *px ^= cx;
++  }
++  ascon_printstate("pad ciphertext", s);
++}
++
++forceinline void ascon_final(ascon_state_t* s, const ascon_key_t* key) {
++#if CRYPTO_KEYBYTES == 16
++  if (ASCON_AEAD_RATE == 8) {
++    s->x[1] ^= key->x[0];
++    s->x[2] ^= key->x[1];
++  } else {
++    s->x[2] ^= key->x[0];
++    s->x[3] ^= key->x[1];
++  }
++#else /* CRYPTO_KEYBYTES == 20 */
++  s->x[1] ^= KEYROT(key->x[0], key->x[1]);
++  s->x[2] ^= KEYROT(key->x[1], key->x[2]);
++  s->x[3] ^= KEYROT(key->x[2], 0);
++#endif
++  ascon_printstate("final 1st key xor", s);
++  ASCON_P(s, 12);
++#if CRYPTO_KEYBYTES == 16
++  s->x[3] ^= key->x[0];
++  s->x[4] ^= key->x[1];
++#else /* CRYPTO_KEYBYTES == 20 */
++  s->x[3] ^= key->x[1];
++  s->x[4] ^= key->x[2];
++#endif
++  ascon_printstate("final 2nd key xor", s);
++}
++
++int ascon_aead_encrypt(uint8_t* ctext,
++                       uint8_t tag[ASCON_AEAD_TAG_LEN],
++                       const uint8_t* mtext, uint64_t mlen,
++                       const uint8_t* ad, uint64_t adlen,
++                       const uint8_t nonce[ASCON_AEAD_NONCE_LEN],
++                       const uint8_t k[ASCON_AEAD_KEY_LEN])
++{
++  ascon_state_t s;
++  /* perform ascon computation */
++  ascon_key_t key;
++  ascon_loadkey(&key, k);
++  ascon_initaead(&s, &key, nonce);
++  ascon_adata(&s, ad, adlen);
++  ascon_encrypt(&s, ctext, mtext, mlen);
++  ascon_final(&s, &key);
++  /* set tag */
++  ASCON_STOREBYTES(tag, s.x[3], 8);
++  ASCON_STOREBYTES(tag + 8, s.x[4], 8);
++  sqlite3mcSecureZeroMemory(&s, sizeof(ascon_state_t));
++  sqlite3mcSecureZeroMemory(&key, sizeof(ascon_key_t));
++  return 0;
++}
++
++int ascon_aead_decrypt(uint8_t* mtext,
++                       const uint8_t* ctext, uint64_t clen,
++                       const uint8_t* ad, uint64_t adlen,
++                       const uint8_t tag[ASCON_AEAD_TAG_LEN],
++                       const uint8_t nonce[ASCON_AEAD_NONCE_LEN],
++                       const uint8_t k[ASCON_AEAD_KEY_LEN])
++{
++  int rc = 0;
++  ascon_state_t s;
++  if (clen < CRYPTO_ABYTES) return -1;
++  /* perform ascon computation */
++  ascon_key_t key;
++  ascon_loadkey(&key, k);
++  ascon_initaead(&s, &key, nonce);
++  ascon_adata(&s, ad, adlen);
++  ascon_decrypt(&s, mtext, ctext, clen);
++  ascon_final(&s, &key);
++  /* verify tag (should be constant time, check compiler output) */
++  s.x[3] ^= ASCON_LOADBYTES(tag, 8);
++  s.x[4] ^= ASCON_LOADBYTES(tag + 8, 8);
++  rc = ASCON_NOTZERO(s.x[3], s.x[4]);
++  sqlite3mcSecureZeroMemory(&s, sizeof(ascon_state_t));
++  sqlite3mcSecureZeroMemory(&key, sizeof(ascon_key_t));
++  return rc;
++}
++
++#endif
++/*** End of #include "ascon/aead.c" ***/
++
++/* #include "ascon/hash.c" */
++/*** Begin of #include "ascon/hash.c" ***/
++/*
++** Name:        hash.c
++** Purpose:     Hash algorithm with Ascon
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "api.h" */
++
++/* #include "ascon.h" */
++
++/* #include "crypto_hash.h" */
++/*** Begin of #include "crypto_hash.h" ***/
++/*
++** Name:        hash.c
++** Purpose:     API definition for Hash algorithm with Ascon
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Modified by: Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef CRYPTO_HASH_H
++#define CRYPTO_HASH_H
++
++#include 
++
++/*
++** Derives hash value using ASCON-HASH.
++**
++** \param out Output buffer for hash with fixed length of ASCON_HASH_BYTES
++** \param in Buffer with input data
++** \param passwordlen Length of input data in bytes
++*/
++int ascon_hash(uint8_t* out, const uint8_t* in, uint64_t inlen);
++
++#endif
++/*** End of #include "crypto_hash.h" ***/
++
++/* #include "permutations.h" */
++
++/* #include "printstate.h" */
++
++
++#if !ASCON_INLINE_MODE
++#undef forceinline
++#define forceinline
++#endif
++
++#ifdef ASCON_HASH_BYTES
++
++forceinline void ascon_inithash(ascon_state_t* s) {
++  int i;
++  /* initialize */
++#ifdef ASCON_PRINT_STATE
++#if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12
++  s->x[0] = ASCON_HASH_IV;
++#elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8
++  s->x[0] = ASCON_HASHA_IV;
++#elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12
++  s->x[0] = ASCON_XOF_IV;
++#elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8
++  s->x[0] = ASCON_XOFA_IV;
++#endif
++  for (i = 1; i < 5; ++i) s->x[i] = 0;
++  ascon_printstate("initial value", s);
++  ASCON_P(s, 12);
++#endif
++#if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12
++  const uint64_t iv[5] = {ASCON_HASH_IV0, ASCON_HASH_IV1, ASCON_HASH_IV2,
++                          ASCON_HASH_IV3, ASCON_HASH_IV4};
++#elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8
++  const uint64_t iv[5] = {ASCON_HASHA_IV0, ASCON_HASHA_IV1, ASCON_HASHA_IV2,
++                          ASCON_HASHA_IV3, ASCON_HASHA_IV4};
++#elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12
++  const uint64_t iv[5] = {ASCON_XOF_IV0, ASCON_XOF_IV1, ASCON_XOF_IV2,
++                          ASCON_XOF_IV3, ASCON_XOF_IV4};
++#elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8
++  const uint64_t iv[5] = {ASCON_XOFA_IV0, ASCON_XOFA_IV1, ASCON_XOFA_IV2,
++                          ASCON_XOFA_IV3, ASCON_XOFA_IV4};
++#endif
++  for (i = 0; i < 5; ++i) s->x[i] = (iv[i]);
++  ascon_printstate("initialization", s);
++}
++
++forceinline void ascon_absorb(ascon_state_t* s, const uint8_t* in,
++                              uint64_t inlen) {
++  /* absorb full plaintext blocks */
++  while (inlen >= ASCON_HASH_RATE) {
++    s->x[0] ^= ASCON_LOAD(in, 8);
++    ascon_printstate("absorb plaintext", s);
++    ASCON_P(s, ASCON_HASH_ROUNDS);
++    in += ASCON_HASH_RATE;
++    inlen -= ASCON_HASH_RATE;
++  }
++  /* absorb final plaintext block */
++  s->x[0] ^= ASCON_LOADBYTES(in, inlen);
++  s->x[0] ^= ASCON_PAD(inlen);
++  ascon_printstate("pad plaintext", s);
++}
++
++forceinline void ascon_squeeze(ascon_state_t* s, uint8_t* out,
++                               uint64_t outlen) {
++  /* squeeze full output blocks */
++  ASCON_P(s, 12);
++  while (outlen > ASCON_HASH_RATE) {
++    ASCON_STORE(out, s->x[0], 8);
++    ascon_printstate("squeeze output", s);
++    ASCON_P(s, ASCON_HASH_ROUNDS);
++    out += ASCON_HASH_RATE;
++    outlen -= ASCON_HASH_RATE;
++  }
++  /* squeeze final output block */
++  ASCON_STOREBYTES(out, s->x[0], outlen);
++  ascon_printstate("squeeze output", s);
++}
++
++int ascon_hash(uint8_t* out, const uint8_t* in, uint64_t inlen)
++{
++  ascon_state_t s;
++  ascon_inithash(&s);
++  ascon_absorb(&s, in, inlen);
++  ascon_squeeze(&s, out, ASCON_HASH_BYTES);
++  sqlite3mcSecureZeroMemory(&s, sizeof(ascon_state_t));
++  return 0;
++}
++
++#endif
++/*** End of #include "ascon/hash.c" ***/
++
++/* #include "ascon/pbkdf2.c" */
++/*** Begin of #include "ascon/pbkdf2.c" ***/
++/*
++** Name:        pbkdf2.c
++** Purpose:     Implementation of PBKDF2 algoritm with Ascon
++** Based on:    Public domain Ascon reference implementation
++**              and optimized variants for 32- and 64-bit
++**              (see https://github.com/ascon/ascon-c)
++**              and the paper "Additional Modes for ASCON Version 1.1"
++**              by Rhys Weatherley, Southern Storm Software, Pty Ltd.
++** Remarks:     API functions adapted for use in SQLite3 Multiple Ciphers
++** Created by:  Ulrich Telle
++** Copyright:   (c) 2023-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#define ASCON_HASH_SIZE 32
++#define ASCON_PBKDF2_SIZE 32
++
++void ascon_pbkdf2_init(ascon_state_t* state, const char* functionName,
++                       const unsigned char* custom, uint32_t customlen, uint32_t outlen)
++{
++  /* Format the initial block with the function name and output length */
++  uint8_t initial[ASCON_HASH_SIZE];
++  size_t fnLength = functionName ? strlen(functionName) : 0;
++
++  if (fnLength == 0)
++  {
++    /* No function name specified */
++    memset(initial, 0, ASCON_HASH_SIZE);
++  }
++  else if (fnLength <= ASCON_HASH_SIZE)
++  {
++    /* Pad the function name with zeroes */
++    memcpy(initial, functionName, fnLength);
++    memset(initial + fnLength, 0, ASCON_HASH_SIZE - fnLength);
++  }
++  else
++  {
++    ascon_hash(initial, (const uint8_t*) functionName, fnLength);
++  }
++
++  state->x[0] = ASCON_HASH_IV;
++  state->x[1] = ASCON_LOAD(initial, 8);
++  state->x[2] = ASCON_LOAD(initial + 8, 8);
++  state->x[3] = ASCON_LOAD(initial + 16, 8);
++  state->x[4] = ASCON_LOAD(initial + 24, 8);
++  ASCON_P(state, 12);
++
++  if (customlen > 0)
++  {
++    ascon_absorb(state, custom, customlen);
++    ASCON_P(state, 12);
++    /* domain separation */
++    state->x[4] ^= 1;
++  }
++}
++
++/*
++ * Implementation of the "F" function from RFC 8018, section 5.2
++ *
++ * Note: Instead of HMAC like in RFC 8018, use the following PRF:
++ * PRF(P, X) = ASCON-cXOF(X, 256, "PBKDF2", P)
++ */
++static void ascon_pbkdf2_f(ascon_state_t* state,
++                           uint8_t* T, /*uint8_t* U,*/
++                           const uint8_t* salt, uint32_t saltlen,
++                           uint32_t count, uint32_t blocknum)
++{
++  uint32_t asconSaltLen = (saltlen < ASCON_SALT_LEN) ? saltlen : ASCON_SALT_LEN;
++  uint8_t temp[ASCON_SALT_LEN+4];
++  ascon_state_t state2;
++  int j;
++
++  memset(temp, 0, ASCON_SALT_LEN);
++  memcpy(temp, salt, asconSaltLen);
++  STORE32_BE(temp+ASCON_SALT_LEN, blocknum);
++  
++  /* Copy initial state */
++  for (j = 0; j < 5; ++j) state2.x[j] = state->x[j];
++
++  ascon_absorb(&state2, temp, ASCON_SALT_LEN+4);
++  ascon_squeeze(&state2, T, ASCON_PBKDF2_SIZE);
++  sqlite3mcSecureZeroMemory(temp, sizeof(temp));
++
++  if (count > 1)
++  {
++    uint8_t U[ASCON_PBKDF2_SIZE];
++    memcpy(U, T, ASCON_PBKDF2_SIZE);
++    while (count > 1)
++    {
++      uint8_t* dst = T;
++      uint8_t* src = U;
++      uint32_t len = ASCON_PBKDF2_SIZE;
++      /* Copy initial state */
++      for (j = 0; j < 5; ++j) state2.x[j] = state->x[j];
++      /* Absorb U */
++      ascon_absorb(&state2, U, ASCON_PBKDF2_SIZE);
++      /* Squeeze next U */
++      ascon_squeeze(&state2, U, ASCON_PBKDF2_SIZE);
++      /* XOR T with U */
++      while (len > 0)
++      {
++        *dst++ ^= *src++;
++        --len;
++      }
++      --count;
++    }
++    sqlite3mcSecureZeroMemory(U, sizeof(U));
++  }
++  sqlite3mcSecureZeroMemory(&state2, sizeof(ascon_state_t));
++}
++
++void ascon_pbkdf2(uint8_t* out, uint32_t outlen,
++                  const uint8_t* password, uint32_t passwordlen,
++                  const uint8_t* salt, uint32_t saltlen, uint32_t count)
++{
++  ascon_state_t state;
++  uint32_t blocknum = 1;
++  ascon_pbkdf2_init(&state, "PBKDF2", password, passwordlen, ASCON_PBKDF2_SIZE);
++  while (outlen > 0)
++  {
++    if (outlen >= ASCON_PBKDF2_SIZE)
++    {
++      ascon_pbkdf2_f(&state, out, /*U,*/ salt, saltlen, count, blocknum);
++      out += ASCON_PBKDF2_SIZE;
++      outlen -= ASCON_PBKDF2_SIZE;
++    }
++    else
++    {
++      uint8_t T[ASCON_PBKDF2_SIZE];
++      ascon_pbkdf2_f(&state, T, /*U,*/ salt, saltlen, count, blocknum);
++      memcpy(out, T, outlen);
++      sqlite3mcSecureZeroMemory(T, sizeof(T));
++      break;
++    }
++    ++blocknum;
++  }
++}
++/*** End of #include "ascon/pbkdf2.c" ***/
++
++
++SQLITE_PRIVATE CipherParams mcAscon128Params[] =
++{
++  { "kdf_iter",          ASCON128_KDF_ITER_DEFAULT, ASCON128_KDF_ITER_DEFAULT, 1, 0x7fffffff },
++  CIPHER_PARAMS_SENTINEL
++};
++
++#define KEYLENGTH_ASCON128       32
++#define SALTLENGTH_ASCON128      16
++#define PAGE_NONCE_LEN_ASCON128  16
++#define PAGE_TAG_LEN_ASCON128    16
++#define PAGE_RESERVED_ASCON128   (PAGE_NONCE_LEN_ASCON128 + PAGE_TAG_LEN_ASCON128)
++
++typedef struct _ascon128Cipher
++{
++  int     m_kdfIter;
++  int     m_keyLength;
++  uint8_t m_key[KEYLENGTH_ASCON128];
++  uint8_t m_salt[SALTLENGTH_ASCON128];
++} Ascon128Cipher;
++
++static void*
++AllocateAscon128Cipher(sqlite3* db)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) sqlite3_malloc(sizeof(Ascon128Cipher));
++  if (ascon128Cipher != NULL)
++  {
++    memset(ascon128Cipher, 0, sizeof(Ascon128Cipher));
++    ascon128Cipher->m_keyLength = KEYLENGTH_ASCON128;
++    memset(ascon128Cipher->m_key, 0, KEYLENGTH_ASCON128);
++    memset(ascon128Cipher->m_salt, 0, SALTLENGTH_ASCON128);
++  }
++  if (ascon128Cipher != NULL)
++  {
++    CipherParams* cipherParams = sqlite3mcGetCipherParams(db, CIPHER_NAME_ASCON128);
++    ascon128Cipher->m_kdfIter = sqlite3mcGetCipherParameter(cipherParams, "kdf_iter");
++  }
++  return ascon128Cipher;
++}
++
++static void
++FreeAscon128Cipher(void* cipher)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  memset(ascon128Cipher, 0, sizeof(Ascon128Cipher));
++  sqlite3_free(ascon128Cipher);
++}
++
++static void
++CloneAscon128Cipher(void* cipherTo, void* cipherFrom)
++{
++  Ascon128Cipher* ascon128CipherTo = (Ascon128Cipher*) cipherTo;
++  Ascon128Cipher* ascon128CipherFrom = (Ascon128Cipher*) cipherFrom;
++  ascon128CipherTo->m_kdfIter = ascon128CipherFrom->m_kdfIter;
++  ascon128CipherTo->m_keyLength = ascon128CipherFrom->m_keyLength;
++  memcpy(ascon128CipherTo->m_key, ascon128CipherFrom->m_key, KEYLENGTH_ASCON128);
++  memcpy(ascon128CipherTo->m_salt, ascon128CipherFrom->m_salt, SALTLENGTH_ASCON128);
++}
++
++static int
++GetLegacyAscon128Cipher(void* cipher)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*)cipher;
++  return 0;
++}
++
++static int
++GetPageSizeAscon128Cipher(void* cipher)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  int pageSize = 0;
++  return pageSize;
++}
++
++static int
++GetReservedAscon128Cipher(void* cipher)
++{
++  return PAGE_RESERVED_ASCON128;
++}
++
++static unsigned char*
++GetSaltAscon128Cipher(void* cipher)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  return ascon128Cipher->m_salt;
++}
++
++static void
++GenerateKeyAscon128Cipher(void* cipher, BtShared* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  int bypass = 0;
++
++  Pager *pPager = pBt->pPager;
++  sqlite3_file* fd = (isOpen(pPager->fd)) ? pPager->fd : NULL;
++
++  int keyOnly = 1;
++  if (rekey || fd == NULL || sqlite3OsRead(fd, ascon128Cipher->m_salt, SALTLENGTH_ASCON128, 0) != SQLITE_OK)
++  {
++    chacha20_rng(ascon128Cipher->m_salt, SALTLENGTH_ASCON128);
++    keyOnly = 0;
++  }
++  else if (cipherSalt != NULL)
++  {
++    memcpy(ascon128Cipher->m_salt, cipherSalt, SALTLENGTH_ASCON128);
++  }
++
++  /* Bypass key derivation if the key string starts with "raw:" */
++  if (passwordLength > 4 && !memcmp(userPassword, "raw:", 4))
++  {
++    const int nRaw = passwordLength - 4;
++    const unsigned char* zRaw = (const unsigned char*) userPassword + 4;
++    switch (nRaw)
++    {
++      /* Binary key (and salt) */
++      case KEYLENGTH_ASCON128 + SALTLENGTH_ASCON128:
++        if (!keyOnly)
++        {
++          memcpy(ascon128Cipher->m_salt, zRaw + KEYLENGTH_ASCON128, SALTLENGTH_ASCON128);
++        }
++        /* fall-through */
++      case KEYLENGTH_ASCON128:
++        memcpy(ascon128Cipher->m_key, zRaw, KEYLENGTH_ASCON128);
++        bypass = 1;
++        break;
++
++      /* Hex-encoded key */
++      case 2 * KEYLENGTH_ASCON128:
++        if (sqlite3mcIsHexKey(zRaw, nRaw) != 0)
++        {
++          sqlite3mcConvertHex2Bin(zRaw, nRaw, ascon128Cipher->m_key);
++          bypass = 1;
++        }
++        break;
++
++      /* Hex-encoded key and salt */
++      case 2 * (KEYLENGTH_ASCON128 + SALTLENGTH_ASCON128):
++        if (sqlite3mcIsHexKey(zRaw, nRaw) != 0)
++        {
++          sqlite3mcConvertHex2Bin(zRaw, 2 * KEYLENGTH_ASCON128, ascon128Cipher->m_key);
++          if (!keyOnly)
++          {
++            sqlite3mcConvertHex2Bin(zRaw + 2 * KEYLENGTH_ASCON128, 2 * SALTLENGTH_ASCON128, ascon128Cipher->m_salt);
++          }
++          bypass = 1;
++        }
++        break;
++
++      default:
++        break;
++    }
++  }
++
++  if (!bypass)
++  {
++    ascon_pbkdf2(ascon128Cipher->m_key, KEYLENGTH_ASCON128,
++                 (const uint8_t*) userPassword, passwordLength,
++                 ascon128Cipher->m_salt, SALTLENGTH_ASCON128, ascon128Cipher->m_kdfIter);
++  }
++  SQLITE3MC_DEBUG_LOG("generate: codec=%p pFile=%p\n", ascon128Cipher, fd);
++  SQLITE3MC_DEBUG_HEX("generate  key:", ascon128Cipher->m_key, KEYLENGTH_ASCON128);
++  SQLITE3MC_DEBUG_HEX("generate salt:", ascon128Cipher->m_salt, SALTLENGTH_ASCON128);
++}
++
++static int
++AsconGenOtk(uint8_t* out, const uint8_t* key, const uint8_t* nonce, int page)
++{
++  ascon_state_t s;
++  uint8_t temp[KEYLENGTH_ASCON128+PAGE_NONCE_LEN_ASCON128+4];
++  memcpy(temp, key, KEYLENGTH_ASCON128);
++  memcpy(temp+KEYLENGTH_ASCON128, nonce, PAGE_NONCE_LEN_ASCON128);
++  STORE32_BE(temp+KEYLENGTH_ASCON128+PAGE_NONCE_LEN_ASCON128, page);
++  ascon_inithash(&s);
++  ascon_absorb(&s, temp, KEYLENGTH_ASCON128+PAGE_NONCE_LEN_ASCON128+4);
++  ascon_squeeze(&s, out, ASCON_HASH_BYTES);
++  sqlite3mcSecureZeroMemory(temp, sizeof(temp));
++  return 0;
++}
++
++static int
++EncryptPageAscon128Cipher(void* cipher, int page, unsigned char* data, int len, int reserved)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  int rc = SQLITE_OK;
++  int nReserved = (reserved == 0) ? 0 : GetReservedAscon128Cipher(cipher);
++  int n = len - nReserved;
++  uint64_t mlen = n;
++
++  /* Generate one-time keys */
++  uint8_t otk[ASCON_HASH_BYTES];
++  int offset;
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if (nReserved > reserved)
++  {
++    return SQLITE_CORRUPT;
++  }
++
++  if (nReserved > 0)
++  {
++    /* Encrypt and authenticate */
++    memset(otk, 0, ASCON_HASH_BYTES);
++    /* Generate nonce */
++    chacha20_rng(data + n + PAGE_TAG_LEN_ASCON128, PAGE_NONCE_LEN_ASCON128);
++    AsconGenOtk(otk, ascon128Cipher->m_key, data + n + PAGE_TAG_LEN_ASCON128, page);
++
++    offset = (page == 1) ? CIPHER_PAGE1_OFFSET : 0;
++    ascon_aead_encrypt(data + offset, data + n, data + offset, mlen - offset,
++                       NULL /* ad */, 0 /* adlen*/,
++                       data + n + PAGE_TAG_LEN_ASCON128, otk);
++    if (page == 1)
++    {
++      memcpy(data, ascon128Cipher->m_salt, SALTLENGTH_ASCON128);
++    }
++  }
++  else
++  {
++    /* Encrypt only */
++    uint8_t nonce[PAGE_NONCE_LEN_ASCON128];
++    uint8_t dummyTag[PAGE_TAG_LEN_ASCON128];
++    memset(dummyTag, 0, PAGE_TAG_LEN_ASCON128);
++    memset(otk, 0, ASCON_HASH_BYTES);
++    sqlite3mcGenerateInitialVector(page, nonce);
++    AsconGenOtk(otk, ascon128Cipher->m_key, nonce, page);
++
++    /* Encrypt */
++    offset = (page == 1) ? CIPHER_PAGE1_OFFSET : 0;
++    ascon_aead_encrypt(data + offset, dummyTag, data + offset, mlen - offset,
++                       NULL /* ad */, 0 /* adlen*/,
++                       nonce, otk);
++      if (page == 1)
++    {
++      memcpy(data, ascon128Cipher->m_salt, SALTLENGTH_ASCON128);
++    }
++  }
++
++  return rc;
++}
++
++static int
++DecryptPageAscon128Cipher(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck)
++{
++  Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
++  int rc = SQLITE_OK;
++  int nReserved = (reserved == 0) ? 0 : GetReservedAscon128Cipher(cipher);
++  int n = len - nReserved;
++  uint64_t clen = n;
++  int tagOk;
++
++  /* Generate one-time keys */
++  uint8_t otk[ASCON_HASH_BYTES];
++  int offset;
++
++  /* Check whether number of required reserved bytes and actually reserved bytes match */
++  if (nReserved > reserved)
++  {
++    return (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++  }
++
++  if (nReserved > 0)
++  {
++    /* Decrypt and verify MAC */
++    memset(otk, 0, ASCON_HASH_BYTES);
++    AsconGenOtk(otk, ascon128Cipher->m_key, data + n + PAGE_TAG_LEN_ASCON128, page);
++
++    /* Determine MAC and decrypt */
++    offset = (page == 1) ? CIPHER_PAGE1_OFFSET : 0;
++    tagOk = ascon_aead_decrypt(data + offset, data + offset, clen - offset,
++                               NULL /* ad */, 0 /* adlen */,
++                               data + n, data + n + PAGE_TAG_LEN_ASCON128, otk);
++    if (hmacCheck != 0)
++    {
++      /* Verify the MAC */
++      if (tagOk != 0)
++      {
++        SQLITE3MC_DEBUG_LOG("decrypt: codec=%p page=%d\n", ascon128Cipher, page);
++        SQLITE3MC_DEBUG_HEX("decrypt key:", ascon128Cipher->m_key, 32);
++        SQLITE3MC_DEBUG_HEX("decrypt otk:", otk, 64);
++        SQLITE3MC_DEBUG_HEX("decrypt data+00:", data, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt data+24:", data + 24, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt data+n:", data + n, 16);
++        SQLITE3MC_DEBUG_HEX("decrypt tag r:", data + n + PAGE_NONCE_LEN_ASCON128, PAGE_TAG_LEN_ASCON128);
++        SQLITE3MC_DEBUG_HEX("decrypt tag c:", tag, PAGE_TAG_LEN_ASCON128);
++        /* Bad MAC */
++        rc = (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
++      }
++    }
++    if (page == 1 && rc == SQLITE_OK)
++    {
++      memcpy(data, SQLITE_FILE_HEADER, 16);
++    }
++  }
++  else
++  {
++    /* Decrypt only */
++    uint8_t nonce[PAGE_NONCE_LEN_ASCON128];
++    uint8_t dummyTag[PAGE_TAG_LEN_ASCON128];
++    memset(dummyTag, 0, PAGE_TAG_LEN_ASCON128);
++    memset(otk, 0, ASCON_HASH_BYTES);
++    sqlite3mcGenerateInitialVector(page, nonce);
++    AsconGenOtk(otk, ascon128Cipher->m_key, nonce, page);
++
++    /* Decrypt */
++    offset = (page == 1) ? CIPHER_PAGE1_OFFSET : 0;
++    tagOk = ascon_aead_decrypt(data + offset, data + offset, clen - offset,
++                               NULL /* ad */, 0 /* adlen */,
++                               dummyTag, nonce, otk);
++    if (page == 1)
++    {
++      memcpy(data, SQLITE_FILE_HEADER, 16);
++    }
++  }
++
++  return rc;
++}
++
++SQLITE_PRIVATE const CipherDescriptor mcAscon128Descriptor =
++{
++  CIPHER_NAME_ASCON128,
++  AllocateAscon128Cipher,
++  FreeAscon128Cipher,
++  CloneAscon128Cipher,
++  GetLegacyAscon128Cipher,
++  GetPageSizeAscon128Cipher,
++  GetReservedAscon128Cipher,
++  GetSaltAscon128Cipher,
++  GenerateKeyAscon128Cipher,
++  EncryptPageAscon128Cipher,
++  DecryptPageAscon128Cipher
++};
++#endif
++/*** End of #include "cipher_ascon.c" ***/
++
++/* #include "cipher_common.c" */
++/*** Begin of #include "cipher_common.c" ***/
++/*
++** Name:        cipher_common.c
++** Purpose:     Implementation of SQLite codecs
++** Author:      Ulrich Telle
++** Created:     2020-02-02
++** Copyright:   (c) 2006-2022 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++
++static unsigned char padding[] =
++"\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
++
++/* --- Codec Descriptor Table --- */
++
++/*
++** Common configuration parameters
++**
++** - cipher     : default cipher type
++** - hmac_check : flag whether page hmac should be verified on read
++*/
++
++static CipherParams commonParams[] =
++{
++  { "cipher",          CODEC_TYPE_UNKNOWN,   CODEC_TYPE_UNKNOWN, 1, CODEC_COUNT_MAX },
++  { "hmac_check",                       1,                    1, 0,               1 },
++  { "mc_legacy_wal", SQLITE3MC_LEGACY_WAL, SQLITE3MC_LEGACY_WAL, 0,               1 },
++  CIPHER_PARAMS_SENTINEL
++};
++
++#define CIPHER_NAME_GLOBAL "global"
++
++static CodecParameter globalCommonParams   = { CIPHER_NAME_GLOBAL, CODEC_TYPE_UNKNOWN, commonParams };
++static CodecParameter globalSentinelParams = { "",                 CODEC_TYPE_UNKNOWN, NULL };
++
++SQLITE_PRIVATE int
++sqlite3mcGetCipherParameter(CipherParams* cipherParams, const char* paramName)
++{
++  int value = -1;
++  for (; cipherParams->m_name[0] != 0; ++cipherParams)
++  {
++    if (sqlite3_stricmp(paramName, cipherParams->m_name) == 0) break;
++  }
++  if (cipherParams->m_name[0] != 0)
++  {
++    value = cipherParams->m_value;
++    cipherParams->m_value = cipherParams->m_default;
++  }
++  return value;
++}
++
++typedef struct _CipherName
++{
++  char m_name[CIPHER_NAME_MAXLEN];
++} CipherName;
++
++static int globalCipherCount = 0;
++static char* globalSentinelName = "";
++static CipherName globalCipherNameTable[CODEC_COUNT_LIMIT + 2] = { 0 };
++static CodecParameter globalCodecParameterTable[CODEC_COUNT_LIMIT + 2];
++
++SQLITE_PRIVATE CodecParameter*
++sqlite3mcCloneCodecParameterTable()
++{
++  /* Count number of codecs and cipher parameters */
++  int nTables = 0;
++  int nParams = 0;
++  int j, k, n;
++  CipherParams* cloneCipherParams;
++  CodecParameter* cloneCodecParams;
++
++  for (j = 0; globalCodecParameterTable[j].m_name[0] != 0; ++j)
++  {
++    CipherParams* params = globalCodecParameterTable[j].m_params;
++    for (k = 0; params[k].m_name[0] != 0; ++k);
++    nParams += k;
++  }
++  nTables = j;
++
++  /* Allocate memory for cloned codec parameter tables (including sentinel for each table) */
++  cloneCipherParams = (CipherParams*) sqlite3_malloc((nParams + nTables) * sizeof(CipherParams));
++  cloneCodecParams = (CodecParameter*) sqlite3_malloc((nTables + 1) * sizeof(CodecParameter));
++
++  /* Create copy of tables */
++  if (cloneCodecParams != NULL)
++  {
++    int offset = 0;
++    for (j = 0; j < nTables; ++j)
++    {
++      CipherParams* params = globalCodecParameterTable[j].m_params;
++      cloneCodecParams[j].m_name = globalCodecParameterTable[j].m_name;
++      cloneCodecParams[j].m_id = globalCodecParameterTable[j].m_id;
++      cloneCodecParams[j].m_params = &cloneCipherParams[offset];
++      for (n = 0; params[n].m_name[0] != 0; ++n);
++      /* Copy all parameters of the current table (including sentinel) */
++      for (k = 0; k <= n; ++k)
++      {
++        cloneCipherParams[offset + k].m_name     = params[k].m_name;
++        cloneCipherParams[offset + k].m_value    = params[k].m_value;
++        cloneCipherParams[offset + k].m_default  = params[k].m_default;
++        cloneCipherParams[offset + k].m_minValue = params[k].m_minValue;
++        cloneCipherParams[offset + k].m_maxValue = params[k].m_maxValue;
++      }
++      offset += (n + 1);
++    }
++    cloneCodecParams[nTables].m_name = globalCodecParameterTable[nTables].m_name;
++    cloneCodecParams[nTables].m_id = globalCodecParameterTable[nTables].m_id;
++    cloneCodecParams[nTables].m_params = NULL;
++  }
++  else
++  {
++    sqlite3_free(cloneCipherParams);
++  }
++  return cloneCodecParams;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcFreeCodecParameterTable(CodecParameter* codecParams)
++{
++  sqlite3_free(codecParams[0].m_params);
++  sqlite3_free(codecParams);
++}
++
++static const CipherDescriptor mcSentinelDescriptor =
++{
++  "", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
++};
++
++static const CipherDescriptor mcDummyDescriptor =
++{
++  "@dummy@", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
++};
++
++static CipherDescriptor globalCodecDescriptorTable[CODEC_COUNT_MAX + 1];
++
++/* --- Codec --- */
++
++SQLITE_PRIVATE CodecParameter*
++sqlite3mcGetCodecParams(sqlite3* db);
++
++SQLITE_PRIVATE int
++sqlite3mcGetCipherType(sqlite3* db)
++{
++  CodecParameter* codecParams = (db != NULL) ? sqlite3mcGetCodecParams(db) : globalCodecParameterTable;
++  CipherParams* cipherParamTable = (codecParams != NULL) ? codecParams[0].m_params : commonParams;
++  int cipherType = CODEC_TYPE;
++  CipherParams* cipher = cipherParamTable;
++  for (; cipher->m_name[0] != 0; ++cipher)
++  {
++    if (sqlite3_stricmp("cipher", cipher->m_name) == 0) break;
++  }
++  if (cipher->m_name[0] != 0)
++  {
++    cipherType = cipher->m_value;
++    cipher->m_value = cipher->m_default;
++  }
++  return cipherType;
++}
++
++SQLITE_PRIVATE CipherParams*
++sqlite3mcGetCipherParams(sqlite3* db, const char* cipherName)
++{
++  int j = 0;
++  int cipherType = sqlite3mc_cipher_index(cipherName);
++  CodecParameter* codecParams = (db != NULL) ? sqlite3mcGetCodecParams(db) : globalCodecParameterTable;
++  if (codecParams == NULL)
++  {
++    codecParams = globalCodecParameterTable;
++  }
++  if (cipherType > 0)
++  {
++    for (j = 1; codecParams[j].m_id > 0; ++j)
++    {
++      if (cipherType == codecParams[j].m_id) break;
++    }
++  }
++  CipherParams* cipherParamTable = codecParams[j].m_params;
++  return cipherParamTable;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcCodecInit(Codec* codec)
++{
++  int rc = SQLITE_OK;
++  if (codec != NULL)
++  {
++    codec->m_isEncrypted = 0;
++    codec->m_hmacCheck = 1;
++    codec->m_walLegacy = 0;
++
++    codec->m_hasReadCipher = 0;
++    codec->m_readCipherType = CODEC_TYPE_UNKNOWN;
++    codec->m_readCipher = NULL;
++    codec->m_readReserved = -1;
++
++    codec->m_hasWriteCipher = 0;
++    codec->m_writeCipherType = CODEC_TYPE_UNKNOWN;
++    codec->m_writeCipher = NULL;
++    codec->m_writeReserved = -1;
++
++    codec->m_db = NULL;
++#if 0
++    codec->m_bt = NULL;
++#endif
++    codec->m_btShared = NULL;
++    memset(codec->m_page, 0, sizeof(codec->m_page));
++    codec->m_pageSize = 0;
++    codec->m_reserved = 0;
++    codec->m_hasKeySalt = 0;
++    memset(codec->m_keySalt, 0, sizeof(codec->m_keySalt));
++  }
++  else
++  {
++    rc = SQLITE_NOMEM;
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcCodecTerm(Codec* codec)
++{
++  if (codec->m_readCipher != NULL)
++  {
++    globalCodecDescriptorTable[codec->m_readCipherType - 1].m_freeCipher(codec->m_readCipher);
++    codec->m_readCipher = NULL;
++  }
++  if (codec->m_writeCipher != NULL)
++  {
++    globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_freeCipher(codec->m_writeCipher);
++    codec->m_writeCipher = NULL;
++  }
++  memset(codec, 0, sizeof(Codec));
++}
++
++SQLITE_PRIVATE void
++sqlite3mcClearKeySalt(Codec* codec)
++{
++  codec->m_hasKeySalt = 0;
++  memset(codec->m_keySalt, 0, sizeof(codec->m_keySalt));
++}
++
++SQLITE_PRIVATE int
++sqlite3mcCodecSetup(Codec* codec, int cipherType, char* userPassword, int passwordLength)
++{
++  int rc = SQLITE_OK;
++  CipherParams* globalParams = sqlite3mcGetCipherParams(codec->m_db, CIPHER_NAME_GLOBAL);
++  codec->m_isEncrypted = 1;
++  codec->m_hmacCheck = sqlite3mcGetCipherParameter(globalParams, "hmac_check");
++  codec->m_walLegacy = sqlite3mcGetCipherParameter(globalParams, "mc_legacy_wal");
++  codec->m_hasReadCipher = 1;
++  codec->m_hasWriteCipher = 1;
++  codec->m_readCipherType = cipherType;
++  codec->m_readCipher = globalCodecDescriptorTable[codec->m_readCipherType-1].m_allocateCipher(codec->m_db);
++  if (codec->m_readCipher != NULL)
++  {
++    unsigned char* keySalt = (codec->m_hasKeySalt != 0) ? codec->m_keySalt : NULL;
++    sqlite3mcGenerateReadKey(codec, userPassword, passwordLength, keySalt);
++    rc = sqlite3mcCopyCipher(codec, 1);
++  }
++  else
++  {
++    rc = SQLITE_NOMEM;
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcSetupWriteCipher(Codec* codec, int cipherType, char* userPassword, int passwordLength)
++{
++  int rc = SQLITE_OK;
++  CipherParams* globalParams = sqlite3mcGetCipherParams(codec->m_db, CIPHER_NAME_GLOBAL);
++  if (codec->m_writeCipher != NULL)
++  {
++    globalCodecDescriptorTable[codec->m_writeCipherType-1].m_freeCipher(codec->m_writeCipher);
++  }
++  codec->m_isEncrypted = 1;
++  codec->m_hmacCheck = sqlite3mcGetCipherParameter(globalParams, "hmac_check");
++  codec->m_walLegacy = sqlite3mcGetCipherParameter(globalParams, "mc_legacy_wal");
++  codec->m_hasWriteCipher = 1;
++  codec->m_writeCipherType = cipherType;
++  codec->m_writeCipher = globalCodecDescriptorTable[codec->m_writeCipherType-1].m_allocateCipher(codec->m_db);
++  if (codec->m_writeCipher != NULL)
++  {
++    unsigned char* keySalt = (codec->m_hasKeySalt != 0) ? codec->m_keySalt : NULL;
++    sqlite3mcGenerateWriteKey(codec, userPassword, passwordLength, keySalt);
++  }
++  else
++  {
++    rc = SQLITE_NOMEM;
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetIsEncrypted(Codec* codec, int isEncrypted)
++{
++  codec->m_isEncrypted = isEncrypted;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetReadCipherType(Codec* codec, int cipherType)
++{
++  codec->m_readCipherType = cipherType;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetWriteCipherType(Codec* codec, int cipherType)
++{
++  codec->m_writeCipherType = cipherType;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetHasReadCipher(Codec* codec, int hasReadCipher)
++{
++  codec->m_hasReadCipher = hasReadCipher;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetHasWriteCipher(Codec* codec, int hasWriteCipher)
++{
++  codec->m_hasWriteCipher = hasWriteCipher;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetDb(Codec* codec, sqlite3* db)
++{
++  codec->m_db = db;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetBtree(Codec* codec, Btree* bt)
++{
++#if 0
++  codec->m_bt = bt;
++#endif
++  codec->m_btShared = bt->pBt;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetReadReserved(Codec* codec, int reserved)
++{
++  codec->m_readReserved = reserved;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcSetWriteReserved(Codec* codec, int reserved)
++{
++  codec->m_writeReserved = reserved;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcIsEncrypted(Codec* codec)
++{
++  return codec->m_isEncrypted;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcHasReadCipher(Codec* codec)
++{
++  return codec->m_hasReadCipher;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcHasWriteCipher(Codec* codec)
++{
++  return codec->m_hasWriteCipher;
++}
++
++SQLITE_PRIVATE BtShared*
++sqlite3mcGetBtShared(Codec* codec)
++{
++  return codec->m_btShared;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetPageSize(Codec* codec)
++{
++  return codec->m_btShared->pageSize;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetReadReserved(Codec* codec)
++{
++  return codec->m_readReserved;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetWriteReserved(Codec* codec)
++{
++  return codec->m_writeReserved;
++}
++
++SQLITE_PRIVATE unsigned char*
++sqlite3mcGetPageBuffer(Codec* codec)
++{
++  return &codec->m_page[4];
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetLegacyReadCipher(Codec* codec)
++{
++  int legacy = (codec->m_hasReadCipher  && codec->m_readCipher != NULL) ? globalCodecDescriptorTable[codec->m_readCipherType - 1].m_getLegacy(codec->m_readCipher) : 0;
++  return legacy;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetLegacyWriteCipher(Codec* codec)
++{
++  int legacy = (codec->m_hasWriteCipher && codec->m_writeCipher != NULL) ? globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_getLegacy(codec->m_writeCipher) : -1;
++  return legacy;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetPageSizeReadCipher(Codec* codec)
++{
++  int pageSize = (codec->m_hasReadCipher  && codec->m_readCipher != NULL) ? globalCodecDescriptorTable[codec->m_readCipherType - 1].m_getPageSize(codec->m_readCipher) : 0;
++  return pageSize;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetPageSizeWriteCipher(Codec* codec)
++{
++  int pageSize = (codec->m_hasWriteCipher && codec->m_writeCipher != NULL) ? globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_getPageSize(codec->m_writeCipher) : -1;
++  return pageSize;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetReservedReadCipher(Codec* codec)
++{
++  int reserved = (codec->m_hasReadCipher  && codec->m_readCipher != NULL) ? globalCodecDescriptorTable[codec->m_readCipherType-1].m_getReserved(codec->m_readCipher) : -1;
++  return reserved;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetReservedWriteCipher(Codec* codec)
++{
++  int reserved = (codec->m_hasWriteCipher && codec->m_writeCipher != NULL) ? globalCodecDescriptorTable[codec->m_writeCipherType-1].m_getReserved(codec->m_writeCipher) : -1;
++  return reserved;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcReservedEqual(Codec* codec)
++{
++  int readReserved  = (codec->m_hasReadCipher  && codec->m_readCipher  != NULL) ? globalCodecDescriptorTable[codec->m_readCipherType-1].m_getReserved(codec->m_readCipher)   : -1;
++  int writeReserved = (codec->m_hasWriteCipher && codec->m_writeCipher != NULL) ? globalCodecDescriptorTable[codec->m_writeCipherType-1].m_getReserved(codec->m_writeCipher) : -1;
++  return (readReserved == writeReserved);
++}
++
++SQLITE_PRIVATE unsigned char*
++sqlite3mcGetSaltWriteCipher(Codec* codec)
++{
++  unsigned char* salt = (codec->m_hasWriteCipher && codec->m_writeCipher != NULL) ? globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_getSalt(codec->m_writeCipher) : NULL;
++  return salt;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcCodecCopy(Codec* codec, Codec* other)
++{
++  int rc = SQLITE_OK;
++  codec->m_isEncrypted = other->m_isEncrypted;
++  codec->m_hmacCheck = other->m_hmacCheck;
++  codec->m_walLegacy = other->m_walLegacy;
++  codec->m_hasReadCipher = other->m_hasReadCipher;
++  codec->m_hasWriteCipher = other->m_hasWriteCipher;
++  codec->m_readCipherType = other->m_readCipherType;
++  codec->m_writeCipherType = other->m_writeCipherType;
++  codec->m_readCipher = NULL;
++  codec->m_writeCipher = NULL;
++  codec->m_readReserved = other->m_readReserved;
++  codec->m_writeReserved = other->m_writeReserved;
++
++  if (codec->m_hasReadCipher)
++  {
++    codec->m_readCipher = globalCodecDescriptorTable[codec->m_readCipherType - 1].m_allocateCipher(codec->m_db);
++    if (codec->m_readCipher != NULL)
++    {
++      globalCodecDescriptorTable[codec->m_readCipherType - 1].m_cloneCipher(codec->m_readCipher, other->m_readCipher);
++    }
++    else
++    {
++      rc = SQLITE_NOMEM;
++    }
++  }
++
++  if (codec->m_hasWriteCipher)
++  {
++    codec->m_writeCipher = globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_allocateCipher(codec->m_db);
++    if (codec->m_writeCipher != NULL)
++    {
++      globalCodecDescriptorTable[codec->m_writeCipherType - 1].m_cloneCipher(codec->m_writeCipher, other->m_writeCipher);
++    }
++    else
++    {
++      rc = SQLITE_NOMEM;
++    }
++  }
++  codec->m_db = other->m_db;
++#if 0
++  codec->m_bt = other->m_bt;
++#endif
++  codec->m_btShared = other->m_btShared;
++  return rc;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcCopyCipher(Codec* codec, int read2write)
++{
++  int rc = SQLITE_OK;
++  if (read2write)
++  {
++    if (codec->m_writeCipher != NULL && codec->m_writeCipherType != codec->m_readCipherType)
++    {
++      globalCodecDescriptorTable[codec->m_writeCipherType-1].m_freeCipher(codec->m_writeCipher);
++      codec->m_writeCipher = NULL;
++    }
++    if (codec->m_writeCipher == NULL)
++    {
++      codec->m_writeCipherType = codec->m_readCipherType;
++      codec->m_writeCipher = globalCodecDescriptorTable[codec->m_writeCipherType-1].m_allocateCipher(codec->m_db);
++    }
++    if (codec->m_writeCipher != NULL)
++    {
++      globalCodecDescriptorTable[codec->m_writeCipherType-1].m_cloneCipher(codec->m_writeCipher, codec->m_readCipher);
++    }
++    else
++    {
++      rc = SQLITE_NOMEM;
++    }
++  }
++  else
++  {
++    if (codec->m_readCipher != NULL && codec->m_readCipherType != codec->m_writeCipherType)
++    {
++      globalCodecDescriptorTable[codec->m_readCipherType-1].m_freeCipher(codec->m_readCipher);
++      codec->m_readCipher = NULL;
++    }
++    if (codec->m_readCipher == NULL)
++    {
++      codec->m_readCipherType = codec->m_writeCipherType;
++      codec->m_readCipher = globalCodecDescriptorTable[codec->m_readCipherType-1].m_allocateCipher(codec->m_db);
++    }
++    if (codec->m_readCipher != NULL)
++    {
++      globalCodecDescriptorTable[codec->m_readCipherType-1].m_cloneCipher(codec->m_readCipher, codec->m_writeCipher);
++    }
++    else
++    {
++      rc = SQLITE_NOMEM;
++    }
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcPadPassword(char* password, int pswdlen, unsigned char pswd[32])
++{
++  int j;
++  int p = 0;
++  int m = pswdlen;
++  if (m > 32) m = 32;
++
++  for (j = 0; j < m; j++)
++  {
++    pswd[p++] = (unsigned char) password[j];
++  }
++  for (j = 0; p < 32 && j < 32; j++)
++  {
++    pswd[p++] = padding[j];
++  }
++}
++
++SQLITE_PRIVATE void
++sqlite3mcGenerateReadKey(Codec* codec, char* userPassword, int passwordLength, unsigned char* cipherSalt)
++{
++  globalCodecDescriptorTable[codec->m_readCipherType-1].m_generateKey(codec->m_readCipher, codec->m_btShared, userPassword, passwordLength, 0, cipherSalt);
++}
++
++SQLITE_PRIVATE void
++sqlite3mcGenerateWriteKey(Codec* codec, char* userPassword, int passwordLength, unsigned char* cipherSalt)
++{
++  globalCodecDescriptorTable[codec->m_writeCipherType-1].m_generateKey(codec->m_writeCipher, codec->m_btShared, userPassword, passwordLength, 1, cipherSalt);
++}
++
++SQLITE_PRIVATE int
++sqlite3mcEncrypt(Codec* codec, int page, unsigned char* data, int len, int useWriteKey)
++{
++  int cipherType = (useWriteKey) ? codec->m_writeCipherType : codec->m_readCipherType;
++  void* cipher = (useWriteKey) ? codec->m_writeCipher : codec->m_readCipher;
++  int reserved = (useWriteKey) ? (codec->m_writeReserved >= 0) ? codec->m_writeReserved : codec->m_reserved
++                               : (codec->m_readReserved >= 0) ? codec->m_readReserved : codec->m_reserved;
++  return globalCodecDescriptorTable[cipherType-1].m_encryptPage(cipher, page, data, len, reserved);
++}
++
++SQLITE_PRIVATE int
++sqlite3mcDecrypt(Codec* codec, int page, unsigned char* data, int len)
++{
++  int cipherType = codec->m_readCipherType;
++  void* cipher = codec->m_readCipher;
++  int reserved = (codec->m_readReserved >= 0) ? codec->m_readReserved : codec->m_reserved;
++  return globalCodecDescriptorTable[cipherType-1].m_decryptPage(cipher, page, data, len, reserved, codec->m_hmacCheck);
++}
++
++#if HAVE_CIPHER_SQLCIPHER
++
++SQLITE_PRIVATE void
++sqlite3mcConfigureSQLCipherVersion(sqlite3* db, int configDefault, int legacyVersion)
++{
++  static char* stdNames[] = { "legacy_page_size",         "kdf_iter",         "hmac_use",         "kdf_algorithm",         "hmac_algorithm",         NULL };
++  static char* defNames[] = { "default:legacy_page_size", "default:kdf_iter", "default:hmac_use", "default:kdf_algorithm", "default:hmac_algorithm", NULL };
++  static int versionParams[SQLCIPHER_VERSION_MAX][5] =
++  {
++    { 1024,   4000, 0, SQLCIPHER_KDF_ALGORITHM_SHA1,   SQLCIPHER_HMAC_ALGORITHM_SHA1   }, 
++    { 1024,   4000, 1, SQLCIPHER_KDF_ALGORITHM_SHA1,   SQLCIPHER_HMAC_ALGORITHM_SHA1   },
++    { 1024,  64000, 1, SQLCIPHER_KDF_ALGORITHM_SHA1,   SQLCIPHER_HMAC_ALGORITHM_SHA1   },
++    { 4096, 256000, 1, SQLCIPHER_KDF_ALGORITHM_SHA512, SQLCIPHER_HMAC_ALGORITHM_SHA512 }
++  };
++  if (legacyVersion > 0 && legacyVersion <= SQLCIPHER_VERSION_MAX)
++  {
++    char** names = (configDefault != 0) ? defNames : stdNames;
++    int* values = &versionParams[legacyVersion - 1][0];
++    int j;
++    for (j = 0; names[j] != NULL; ++j)
++    {
++      sqlite3mc_config_cipher(db, "sqlcipher", names[j], values[j]);
++    }
++  }
++}
++
++#endif
++/*** End of #include "cipher_common.c" ***/
++
++/* #include "cipher_config.c" */
++/*** Begin of #include "cipher_config.c" ***/
++/*
++** Name:        cipher_config.c
++** Purpose:     Configuration of SQLite codecs
++** Author:      Ulrich Telle
++** Created:     2020-03-02
++** Copyright:   (c) 2006-2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "cipher_common.h" */
++
++/* #include "cipher_config.h" */
++/*** Begin of #include "cipher_config.h" ***/
++/*
++** Name:        cipher_config.h
++** Purpose:     Header for the cipher configuration of SQLite3 Multiple Ciphers
++** Author:      Ulrich Telle
++** Created:     2020-03-10
++** Copyright:   (c) 2006-2020 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef CIPHER_CONFIG_H_
++#define CIPHER_CONFIG_H_
++
++/* #include "sqlite3mc.h" */
++
++
++SQLITE_PRIVATE void sqlite3mcConfigTable(sqlite3_context* context, int argc, sqlite3_value** argv);
++SQLITE_PRIVATE CodecParameter* sqlite3mcGetCodecParams(sqlite3* db);
++
++/* Forward declaration */
++static unsigned char* sqlite3mcGetSaltWriteCipher(Codec* codec);
++
++SQLITE_PRIVATE void sqlite3mcCodecDataSql(sqlite3_context* context, int argc, sqlite3_value** argv);
++SQLITE_PRIVATE void sqlite3mcConfigParams(sqlite3_context* context, int argc, sqlite3_value** argv);
++SQLITE_PRIVATE int sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault);
++
++SQLITE_PRIVATE int sqlite3mcFileControlPragma(sqlite3* db, const char* zDbName, int op, void* pArg);
++SQLITE_PRIVATE int sqlite3mcCodecQueryParameters(sqlite3* db, const char* zDb, const char* zUri);
++SQLITE_PRIVATE int sqlite3mcHandleAttachKey(sqlite3* db, const char* zName, const char* zPath, sqlite3_value* pKey, char** zErrDyn);
++SQLITE_PRIVATE int sqlite3mcHandleMainKey(sqlite3* db, const char* zPath);
++
++#endif
++/*** End of #include "cipher_config.h" ***/
++
++
++/* --- Codec --- */
++
++SQLITE_PRIVATE int
++sqlite3mcGetGlobalCipherCount();
++
++SQLITE_PRIVATE Codec*
++sqlite3mcGetCodec(sqlite3* db, const char* zDbName);
++
++SQLITE_PRIVATE void
++sqlite3mcConfigTable(sqlite3_context* context, int argc, sqlite3_value** argv)
++{
++  CodecParameter* codecParams = (CodecParameter*) sqlite3_user_data(context);
++  assert(argc == 0);
++  sqlite3_result_pointer(context, codecParams, "sqlite3mc_codec_params", 0);
++}
++
++SQLITE_PRIVATE CodecParameter*
++sqlite3mcGetCodecParams(sqlite3* db)
++{
++  CodecParameter* codecParams = NULL;
++  sqlite3_stmt* pStmt = 0;
++  int rc = sqlite3_prepare_v2(db, "SELECT sqlite3mc_config_table();", -1, &pStmt, 0);
++  if (rc == SQLITE_OK)
++  {
++    if (SQLITE_ROW == sqlite3_step(pStmt))
++    {
++      sqlite3_value* ptrValue = sqlite3_column_value(pStmt, 0);
++      codecParams = (CodecParameter*) sqlite3_value_pointer(ptrValue, "sqlite3mc_codec_params");
++    }
++    sqlite3_finalize(pStmt);
++  }
++  return codecParams;
++}
++
++SQLITE_API int
++sqlite3mc_config(sqlite3* db, const char* paramName, int newValue)
++{
++  int value = -1;
++  CodecParameter* codecParams;
++  int hasDefaultPrefix = 0;
++  int hasMinPrefix = 0;
++  int hasMaxPrefix = 0;
++  CipherParams* param;
++
++#ifndef SQLITE_OMIT_AUTOINIT
++  if (sqlite3_initialize()) return value;
++#endif
++
++  if (paramName == NULL || (db == NULL && newValue >= 0))
++  {
++    return value;
++  }
++
++  codecParams = (db != NULL) ? sqlite3mcGetCodecParams(db) : globalCodecParameterTable;
++  if (codecParams == NULL)
++  {
++    return value;
++  }
++
++  if (sqlite3_strnicmp(paramName, "default:", 8) == 0)
++  {
++    hasDefaultPrefix = 1;
++    paramName += 8;
++  }
++  if (sqlite3_strnicmp(paramName, "min:", 4) == 0)
++  {
++    hasMinPrefix = 1;
++    paramName += 4;
++  }
++  if (sqlite3_strnicmp(paramName, "max:", 4) == 0)
++  {
++    hasMaxPrefix = 1;
++    paramName += 4;
++  }
++
++  param = codecParams[0].m_params;
++  for (; param->m_name[0] != 0; ++param)
++  {
++    if (sqlite3_stricmp(paramName, param->m_name) == 0) break;
++  }
++  if (param->m_name[0] != 0)
++  {
++    int cipherCount = sqlite3mcGetGlobalCipherCount();
++    if (db != NULL)
++    {
++      sqlite3_mutex_enter(db->mutex);
++    }
++    else
++    {
++      sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++    }
++    value = (hasDefaultPrefix) ? param->m_default : (hasMinPrefix) ? param->m_minValue : (hasMaxPrefix) ? param->m_maxValue : param->m_value;
++    if (!hasMinPrefix && !hasMaxPrefix && newValue >= 0 && newValue >= param->m_minValue && newValue <= param->m_maxValue)
++    {
++      int allowChange = 1;
++
++      /* Allow cipher change only if new cipher is actually available */
++      if (sqlite3_stricmp(paramName, "cipher") == 0)
++      {
++        allowChange = newValue > 0 && newValue <= cipherCount;
++      }
++
++      if (allowChange)
++      {
++        /* Do not allow to change the default value for parameter "hmac_check" */
++        if (hasDefaultPrefix && (sqlite3_stricmp(paramName, "hmac_check") != 0))
++        {
++          param->m_default = newValue;
++        }
++        param->m_value = newValue;
++        value = newValue;
++      }
++    }
++    if (db != NULL)
++    {
++      sqlite3_mutex_leave(db->mutex);
++    }
++    else
++    {
++      sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++    }
++  }
++  return value;
++}
++
++SQLITE_API int
++sqlite3mc_cipher_count()
++{
++#ifndef SQLITE_OMIT_AUTOINIT
++  if (sqlite3_initialize()) return 0;
++#endif
++  return sqlite3mcGetGlobalCipherCount();
++}
++
++SQLITE_API int
++sqlite3mc_cipher_index(const char* cipherName)
++{
++  int count;
++  int j;
++#ifndef SQLITE_OMIT_AUTOINIT
++  if (sqlite3_initialize()) return -1;
++#endif
++  count = sqlite3mcGetGlobalCipherCount();
++  j = 0;
++  for (j = 0; j < count && globalCodecDescriptorTable[j].m_name[0] != 0; ++j)
++  {
++    if (sqlite3_stricmp(cipherName, globalCodecDescriptorTable[j].m_name) == 0) break;
++  }
++  return (j < count && globalCodecDescriptorTable[j].m_name[0] != 0) ? j + 1 : -1;
++}
++
++SQLITE_API const char*
++sqlite3mc_cipher_name(int cipherIndex)
++{
++  static char cipherName[CIPHER_NAME_MAXLEN] = "";
++  int count;
++  int j;
++#ifndef SQLITE_OMIT_AUTOINIT
++  if( sqlite3_initialize() ) return cipherName;
++#endif
++  count = sqlite3mcGetGlobalCipherCount();
++  j = 0;
++  cipherName[0] = '\0';
++  if (cipherIndex > 0 && cipherIndex <= count)
++  {
++    for (j = 0; j < count && globalCodecDescriptorTable[j].m_name[0] != 0; ++j)
++    {
++      if (cipherIndex == j + 1) break;
++    }
++    if (j < count && globalCodecDescriptorTable[j].m_name[0] != 0)
++    {
++      strncpy(cipherName, globalCodecDescriptorTable[j].m_name, CIPHER_NAME_MAXLEN - 1);
++      cipherName[CIPHER_NAME_MAXLEN - 1] = '\0';
++    }
++  }
++  return cipherName;
++}
++
++SQLITE_API int
++sqlite3mc_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue)
++{
++  int value = -1;
++  CodecParameter* codecParams;
++  CipherParams* cipherParamTable = NULL;
++  int j = 0;
++
++#ifndef SQLITE_OMIT_AUTOINIT
++  if (sqlite3_initialize()) return value;
++#endif
++
++  if (cipherName == NULL || paramName == NULL)
++  {
++    sqlite3_log(SQLITE_WARNING,
++                "sqlite3mc_config_cipher: cipher name ('%s*) or parameter ('%s*) missing",
++                (cipherName == NULL) ? "" : cipherName, (paramName == NULL) ? "" : paramName);
++    return value;
++  }
++  else if (db == NULL && newValue >= 0)
++  {
++    sqlite3_log(SQLITE_WARNING,
++                "sqlite3mc_config_cipher: global change of parameter '%s' for cipher '%s' not supported",
++                paramName, cipherName);
++    return value;
++  }
++
++  codecParams = (db != NULL) ? sqlite3mcGetCodecParams(db) : globalCodecParameterTable;
++  if (codecParams == NULL)
++  {
++    sqlite3_log(SQLITE_WARNING,
++                "sqlite3mc_config_cipher: codec parameter table not found");
++    return value;
++  }
++
++  for (j = 0; codecParams[j].m_name[0] != 0; ++j)
++  {
++    if (sqlite3_stricmp(cipherName, codecParams[j].m_name) == 0) break;
++  }
++  if (codecParams[j].m_name[0] != 0)
++  {
++    cipherParamTable = codecParams[j].m_params;
++  }
++
++  if (cipherParamTable != NULL)
++  {
++    int hasDefaultPrefix = 0;
++    int hasMinPrefix = 0;
++    int hasMaxPrefix = 0;
++    CipherParams* param = cipherParamTable;
++
++    if (sqlite3_strnicmp(paramName, "default:", 8) == 0)
++    {
++      hasDefaultPrefix = 1;
++      paramName += 8;
++    }
++    if (sqlite3_strnicmp(paramName, "min:", 4) == 0)
++    {
++      hasMinPrefix = 1;
++      paramName += 4;
++    }
++    if (sqlite3_strnicmp(paramName, "max:", 4) == 0)
++    {
++      hasMaxPrefix = 1;
++      paramName += 4;
++    }
++
++#if HAVE_CIPHER_SQLCIPHER
++    /* Special handling for SQLCipher legacy mode */
++    if (db != NULL &&
++        sqlite3_stricmp(cipherName, "sqlcipher") == 0 &&
++        sqlite3_stricmp(paramName, "legacy") == 0)
++    {
++      if (!hasMinPrefix && !hasMaxPrefix)
++      {
++        if (newValue > 0 && newValue <= SQLCIPHER_VERSION_MAX)
++        {
++          sqlite3mcConfigureSQLCipherVersion(db, hasDefaultPrefix, newValue);
++        }
++        else if (newValue != -1)
++        {
++          sqlite3_log(SQLITE_WARNING,
++                      "sqlite3mc_config_cipher: SQLCipher legacy version %d out of range [%d..%d]",
++                      newValue, 1, SQLCIPHER_VERSION_MAX);
++        }
++      }
++    }
++#endif
++
++    for (; param->m_name[0] != 0; ++param)
++    {
++      if (sqlite3_stricmp(paramName, param->m_name) == 0) break;
++    }
++    if (param->m_name[0] != 0)
++    {
++      if (db != NULL)
++      {
++        sqlite3_mutex_enter(db->mutex);
++      }
++      else
++      {
++        sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
++      }
++      value = (hasDefaultPrefix) ? param->m_default : (hasMinPrefix) ? param->m_minValue : (hasMaxPrefix) ? param->m_maxValue : param->m_value;
++      if (!hasMinPrefix && !hasMaxPrefix)
++      {
++        if (newValue >= 0 && newValue >= param->m_minValue && newValue <= param->m_maxValue)
++        {
++          if (hasDefaultPrefix)
++          {
++            param->m_default = newValue;
++          }
++          param->m_value = newValue;
++          value = newValue;
++        }
++        else if (newValue != -1)
++        {
++          sqlite3_log(SQLITE_WARNING,
++                      "sqlite3mc_config_cipher: Value %d for parameter '%s' of cipher '%s' out of range [%d..%d]",
++                      newValue, paramName, cipherName, param->m_minValue, param->m_maxValue);
++        }
++      }
++      if (db != NULL)
++      {
++        sqlite3_mutex_leave(db->mutex);
++      }
++      else
++      {
++        sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
++      }
++    }
++  }
++  return value;
++}
++
++SQLITE_API unsigned char*
++sqlite3mc_codec_data(sqlite3* db, const char* zDbName, const char* paramName)
++{
++  unsigned char* result = NULL;
++#ifndef SQLITE_OMIT_AUTOINIT
++  if (sqlite3_initialize()) return NULL;
++#endif
++  if (db != NULL && paramName != NULL)
++  {
++    int iDb = (zDbName != NULL) ? sqlite3FindDbName(db, zDbName) : 0;
++    int toRaw = 0;
++    if (sqlite3_strnicmp(paramName, "raw:", 4) == 0)
++    {
++      toRaw = 1;
++      paramName += 4;
++    }
++    if ((sqlite3_stricmp(paramName, "cipher_salt") == 0) && (iDb >= 0))
++    {
++      /* Check whether database is encrypted */
++      Codec* codec = sqlite3mcGetCodec(db, zDbName);
++      if (codec != NULL && sqlite3mcIsEncrypted(codec) && sqlite3mcHasWriteCipher(codec))
++      {
++        unsigned char* salt = sqlite3mcGetSaltWriteCipher(codec);
++        if (salt != NULL)
++        {
++          if (!toRaw)
++          {
++            int j;
++            result = sqlite3_malloc(32 + 1);
++            for (j = 0; j < 16; ++j)
++            {
++              result[j * 2] = hexdigits[(salt[j] >> 4) & 0x0F];
++              result[j * 2 + 1] = hexdigits[(salt[j]) & 0x0F];
++            }
++            result[32] = '\0';
++          }
++          else
++          {
++            result = sqlite3_malloc(16 + 1);
++            memcpy(result, salt, 16);
++            result[16] = '\0';
++          }
++        }
++      }
++    }
++  }
++  return result;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcCodecDataSql(sqlite3_context* context, int argc, sqlite3_value** argv)
++{
++  const char* nameParam1 = NULL;
++  const char* nameParam2 = NULL;
++
++  assert(argc == 1 || argc == 2);
++  /* NULL values are not allowed for the first 2 arguments */
++  if (SQLITE_NULL == sqlite3_value_type(argv[0]) || (argc > 1 && SQLITE_NULL == sqlite3_value_type(argv[1])))
++  {
++    sqlite3_result_null(context);
++    return;
++  }
++
++  /* Determine parameter name */
++  nameParam1 = (const char*) sqlite3_value_text(argv[0]);
++
++  /* Determine schema name if given */
++  if (argc == 2)
++  {
++    nameParam2 = (const char*) sqlite3_value_text(argv[1]);
++  }
++
++  /* Check for known parameter name(s) */
++  if (sqlite3_stricmp(nameParam1, "cipher_salt") == 0)
++  {
++    /* Determine key salt */
++    sqlite3* db = sqlite3_context_db_handle(context);
++    const char* salt = (const char*) sqlite3mc_codec_data(db, nameParam2, "cipher_salt");
++    if (salt != NULL)
++    {
++      sqlite3_result_text(context, salt, -1, sqlite3_free);
++    }
++    else
++    {
++      sqlite3_result_null(context);
++    }
++  }
++  else
++  {
++    sqlite3_result_null(context);
++  }
++}
++
++SQLITE_PRIVATE void
++sqlite3mcConfigParams(sqlite3_context* context, int argc, sqlite3_value** argv)
++{
++  CodecParameter* codecParams;
++  const char* nameParam1;
++  int hasDefaultPrefix = 0;
++  int hasMinPrefix = 0;
++  int hasMaxPrefix = 0;
++  CipherParams* param1;
++  CipherParams* cipherParamTable = NULL;
++  int isCommonParam1;
++  int isCipherParam1 = 0;
++
++  assert(argc == 1 || argc == 2 || argc == 3);
++  /* NULL values are not allowed for the first 2 arguments */
++  if (SQLITE_NULL == sqlite3_value_type(argv[0]) || (argc > 1 && SQLITE_NULL == sqlite3_value_type(argv[1])))
++  {
++    sqlite3_result_null(context);
++    return;
++  }
++
++  codecParams = (CodecParameter*)sqlite3_user_data(context);
++
++  /* Check first argument whether it is a common parameter */
++  /* If the first argument is a common parameter, param1 will point to its parameter table entry */
++  nameParam1 = (const char*)sqlite3_value_text(argv[0]);
++  if (sqlite3_strnicmp(nameParam1, "default:", 8) == 0)
++  {
++    hasDefaultPrefix = 1;
++    nameParam1 += 8;
++  }
++  if (sqlite3_strnicmp(nameParam1, "min:", 4) == 0)
++  {
++    hasMinPrefix = 1;
++    nameParam1 += 4;
++  }
++  if (sqlite3_strnicmp(nameParam1, "max:", 4) == 0)
++  {
++    hasMaxPrefix = 1;
++    nameParam1 += 4;
++  }
++
++  param1 = codecParams[0].m_params;
++  cipherParamTable = NULL;
++  for (; param1->m_name[0] != 0; ++param1)
++  {
++    if (sqlite3_stricmp(nameParam1, param1->m_name) == 0) break;
++  }
++  isCommonParam1 = param1->m_name[0] != 0;
++
++  /* Check first argument whether it is a cipher name, if it wasn't a common parameter */
++  /* If the first argument is a cipher name, cipherParamTable will point to the corresponding cipher parameter table */
++  if (!isCommonParam1)
++  {
++    if (!hasDefaultPrefix && !hasMinPrefix && !hasMaxPrefix)
++    {
++      int j = 0;
++      for (j = 0; codecParams[j].m_name[0] != 0; ++j)
++      {
++        if (sqlite3_stricmp(nameParam1, codecParams[j].m_name) == 0) break;
++      }
++      isCipherParam1 = codecParams[j].m_name[0] != 0;
++      if (isCipherParam1)
++      {
++        cipherParamTable = codecParams[j].m_params;
++      }
++    }
++    if (!isCipherParam1)
++    {
++      /* Prefix not allowed for cipher names or cipher name not found */
++      sqlite3_result_null(context);
++      return;
++    }
++  }
++
++  if (argc == 1)
++  {
++    /* Return value of param1 */
++    if (isCommonParam1)
++    {
++      int value = (hasDefaultPrefix) ? param1->m_default : (hasMinPrefix) ? param1->m_minValue : (hasMaxPrefix) ? param1->m_maxValue : param1->m_value;
++      if (sqlite3_stricmp(nameParam1, "cipher") == 0)
++      {
++        sqlite3_result_text(context, globalCodecDescriptorTable[value - 1].m_name, -1, SQLITE_STATIC);
++      }
++      else
++      {
++        sqlite3_result_int(context, value);
++      }
++    }
++    else if (isCipherParam1)
++    {
++      /* Return a list of available parameters for the requested cipher */
++      int nParams = 0;
++      int lenTotal = 0;
++      int j;
++      for (j = 0; cipherParamTable[j].m_name[0] != 0; ++j)
++      {
++        ++nParams;
++        lenTotal += (int) strlen(cipherParamTable[j].m_name);
++      }
++      if (nParams > 0)
++      {
++        char* paramList = (char*)sqlite3_malloc(lenTotal + nParams);
++        if (paramList != NULL)
++        {
++          char* p = paramList;
++          strcpy(paramList, cipherParamTable[0].m_name);
++          for (j = 1; j < nParams; ++j)
++          {
++            strcat(paramList, ",");
++            strcat(paramList, cipherParamTable[j].m_name);
++          }
++          sqlite3_result_text(context, paramList, -1, sqlite3_free);
++        }
++        else
++        {
++          /* Not enough memory to allocate the result */
++          sqlite3_result_error_nomem(context);
++        }
++      }
++      else
++      {
++        /* Cipher has no parameters */
++        sqlite3_result_null(context);
++      }
++    }
++  }
++  else
++  {
++    /* 2 or more arguments */
++    int arg2Type = sqlite3_value_type(argv[1]);
++    if (argc == 2 && isCommonParam1)
++    {
++      /* Set value of common parameter */
++      if (sqlite3_stricmp(nameParam1, "cipher") == 0)
++      {
++        /* 2nd argument is a cipher name */
++        if (arg2Type == SQLITE_TEXT)
++        {
++          const char* nameCipher = (const char*)sqlite3_value_text(argv[1]);
++          int j = 0;
++          for (j = 0; globalCodecDescriptorTable[j].m_name[0] != 0; ++j)
++          {
++            if (sqlite3_stricmp(nameCipher, globalCodecDescriptorTable[j].m_name) == 0) break;
++          }
++          if (globalCodecDescriptorTable[j].m_name[0] != 0)
++          {
++            if (hasDefaultPrefix)
++            {
++              param1->m_default = j + 1;
++            }
++            param1->m_value = j + 1;
++            sqlite3_result_text(context, globalCodecDescriptorTable[j].m_name, -1, SQLITE_STATIC);
++          }
++          else
++          {
++            /* No match for cipher name found */
++            sqlite3_result_null(context);
++          }
++        }
++        else
++        {
++          /* Invalid parameter type */
++          sqlite3_result_null(context);
++        }
++      }
++      else if (arg2Type == SQLITE_INTEGER)
++      {
++        /* Check that parameter value is within allowed range */
++        int value = sqlite3_value_int(argv[1]);
++        if (value >= param1->m_minValue && value <= param1->m_maxValue)
++        {
++          /* Do not allow to change the default value for parameter "hmac_check" */
++          if (hasDefaultPrefix && (sqlite3_stricmp(nameParam1, "hmac_check") != 0))
++          {
++            param1->m_default = value;
++          }
++          param1->m_value = value;
++          sqlite3_result_int(context, value);
++        }
++        else
++        {
++          /* Parameter value not within allowed range */
++          sqlite3_result_null(context);
++        }
++      }
++      else
++      {
++        sqlite3_result_null(context);
++      }
++    }
++    else if (isCipherParam1 && arg2Type == SQLITE_TEXT)
++    {
++      /* get or set cipher parameter */
++      const char* nameParam2 = (const char*)sqlite3_value_text(argv[1]);
++      CipherParams* param2 = cipherParamTable;
++      hasDefaultPrefix = 0;
++      if (sqlite3_strnicmp(nameParam2, "default:", 8) == 0)
++      {
++        hasDefaultPrefix = 1;
++        nameParam2 += 8;
++      }
++      hasMinPrefix = 0;
++      if (sqlite3_strnicmp(nameParam2, "min:", 4) == 0)
++      {
++        hasMinPrefix = 1;
++        nameParam2 += 4;
++      }
++      hasMaxPrefix = 0;
++      if (sqlite3_strnicmp(nameParam2, "max:", 4) == 0)
++      {
++        hasMaxPrefix = 1;
++        nameParam2 += 4;
++      }
++      for (; param2->m_name[0] != 0; ++param2)
++      {
++        if (sqlite3_stricmp(nameParam2, param2->m_name) == 0) break;
++      }
++
++#if HAVE_CIPHER_SQLCIPHER
++      /* Special handling for SQLCipher legacy mode */
++      if (argc == 3 &&
++        sqlite3_stricmp(nameParam1, "sqlcipher") == 0 &&
++        sqlite3_stricmp(nameParam2, "legacy") == 0)
++      {
++        if (!hasMinPrefix && !hasMaxPrefix && sqlite3_value_type(argv[2]) == SQLITE_INTEGER)
++        {
++          int legacy = sqlite3_value_int(argv[2]);
++          if (legacy > 0 && legacy <= SQLCIPHER_VERSION_MAX)
++          {
++            sqlite3* db = sqlite3_context_db_handle(context);
++            sqlite3mcConfigureSQLCipherVersion(db, hasDefaultPrefix, legacy);
++          }
++        }
++      }
++#endif
++
++      if (param2->m_name[0] != 0)
++      {
++        if (argc == 2)
++        {
++          /* Return parameter value */
++          int value = (hasDefaultPrefix) ? param2->m_default : (hasMinPrefix) ? param2->m_minValue : (hasMaxPrefix) ? param2->m_maxValue : param2->m_value;
++          sqlite3_result_int(context, value);
++        }
++        else if (!hasMinPrefix && !hasMaxPrefix && sqlite3_value_type(argv[2]) == SQLITE_INTEGER)
++        {
++          /* Change cipher parameter value */
++          int value = sqlite3_value_int(argv[2]);
++          if (value >= param2->m_minValue && value <= param2->m_maxValue)
++          {
++            if (hasDefaultPrefix)
++            {
++              param2->m_default = value;
++            }
++            param2->m_value = value;
++            sqlite3_result_int(context, value);
++          }
++          else
++          {
++            /* Cipher parameter value not within allowed range */
++            sqlite3_result_null(context);
++          }
++        }
++        else
++        {
++          /* Only current value and default value of a parameter can be changed */
++          sqlite3_result_null(context);
++        }
++      }
++      else
++      {
++        /* Cipher parameter not found */
++        sqlite3_result_null(context);
++      }
++    }
++    else
++    {
++      /* Cipher has no parameters */
++      sqlite3_result_null(context);
++    }
++  }
++}
++
++SQLITE_PRIVATE int
++sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault)
++{
++  int rc = SQLITE_OK;
++
++  /* Check URI parameters if database filename is available */
++  const char* dbFileName = zDbName;
++  if (dbFileName != NULL)
++  {
++    /* Check whether cipher is specified */
++    const char* cipherName = sqlite3_uri_parameter(dbFileName, "cipher");
++    if (cipherName != NULL)
++    {
++      int j = 0;
++      CipherParams* cipherParams = NULL;
++
++      /* Try to locate the cipher name */
++      for (j = 1; globalCodecParameterTable[j].m_name[0] != 0; ++j)
++      {
++        if (sqlite3_stricmp(cipherName, globalCodecParameterTable[j].m_name) == 0) break;
++      }
++
++      /* j is the index of the cipher name, if found */
++      cipherParams = (globalCodecParameterTable[j].m_name[0] != 0) ? globalCodecParameterTable[j].m_params : NULL;
++      if (cipherParams != NULL)
++      {
++        /*
++        ** Flag whether to skip the legacy parameter
++        ** Currently enabled only in case of the SQLCipher scheme
++        */
++        int skipLegacy = 0;
++        /* Set global parameters (cipher and hmac_check) */
++        int hmacCheck = sqlite3_uri_boolean(dbFileName, "hmac_check", 1);
++        int walLegacy = sqlite3_uri_boolean(dbFileName, "mc_legacy_wal", 0);
++        if (configDefault)
++        {
++          sqlite3mc_config(db, "default:cipher", globalCodecParameterTable[j].m_id);
++        }
++        else
++        {
++          sqlite3mc_config(db, "cipher", globalCodecParameterTable[j].m_id);
++        }
++        if (!hmacCheck)
++        {
++          sqlite3mc_config(db, "hmac_check", hmacCheck);
++        }
++        sqlite3mc_config(db, "mc_legacy_wal", walLegacy);
++
++#if HAVE_CIPHER_SQLCIPHER
++        /* Special handling for SQLCipher */
++        if (sqlite3_stricmp(cipherName, "sqlcipher") == 0)
++        {
++          int legacy = (int) sqlite3_uri_int64(dbFileName, "legacy", 0);
++          if (legacy > 0 && legacy <= SQLCIPHER_VERSION_MAX)
++          {
++            char* param = (configDefault) ? "default:legacy" : "legacy";
++            sqlite3mc_config_cipher(db, cipherName, param, legacy);
++            skipLegacy = 1;
++          }
++        }
++#endif
++
++        /* Check all cipher specific parameters */
++        for (j = 0; cipherParams[j].m_name[0] != 0; ++j)
++        {
++          if (skipLegacy && sqlite3_stricmp(cipherParams[j].m_name, "legacy") == 0) continue;
++
++          int value = (int) sqlite3_uri_int64(dbFileName, cipherParams[j].m_name, -1);
++          if (value >= 0)
++          {
++            /* Configure cipher parameter if it was given in the URI */
++            char* param = (configDefault) ? sqlite3_mprintf("default:%s", cipherParams[j].m_name) : cipherParams[j].m_name;
++            sqlite3mc_config_cipher(db, cipherName, param, value);
++            if (configDefault)
++            {
++              sqlite3_free(param);
++            }
++          }
++        }
++      }
++      else
++      {
++        rc = SQLITE_ERROR;
++        sqlite3ErrorWithMsg(db, rc, "unknown cipher '%s'", cipherName);
++      }
++    }
++  }
++  return rc;
++}
++
++#ifdef SQLITE3MC_WXSQLITE3_COMPATIBLE
++SQLITE_API int
++wxsqlite3_config(sqlite3* db, const char* paramName, int newValue)
++{
++  return sqlite3mc_config(db, paramName, newValue);
++}
++
++SQLITE_API int
++wxsqlite3_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue)
++{
++  return sqlite3mc_config_cipher(db, cipherName, paramName, newValue);
++}
++
++SQLITE_API unsigned char*
++wxsqlite3_codec_data(sqlite3* db, const char* zDbName, const char* paramName)
++{
++  return sqlite3mc_codec_data(db, zDbName, paramName);
++}
++#endif
++
++/*
++** Functions called from patched SQLite version
++*/
++
++SQLITE_PRIVATE int
++sqlite3mcFileControlPragma(sqlite3* db, const char* zDbName, int op, void* pArg)
++{
++  int rc = sqlite3_file_control(db, zDbName, op, pArg);
++  if (rc == SQLITE_NOTFOUND)
++  {
++    int configDefault;
++    char* pragmaName;
++    char* pragmaValue;
++    int dbIndex = (zDbName) ? sqlite3FindDbName(db, zDbName) : 0;
++    if (dbIndex < 0 && zDbName != NULL)
++    {
++      /* Unknown schema name */
++      return rc;
++    }
++
++    configDefault = (dbIndex <= 0);
++    pragmaName = ((char**) pArg)[1];
++    pragmaValue = ((char**) pArg)[2];
++    if (sqlite3StrICmp(pragmaName, "cipher") == 0)
++    {
++      int cipherId = -1;
++      if (pragmaValue != NULL)
++      {
++        int j = 1;
++        /* Try to locate the cipher name */
++        for (j = 1; globalCodecParameterTable[j].m_name[0] != 0; ++j)
++        {
++          if (sqlite3_stricmp(pragmaValue, globalCodecParameterTable[j].m_name) == 0) break;
++        }
++        cipherId = (globalCodecParameterTable[j].m_name[0] != 0) ? globalCodecParameterTable[j].m_id : CODEC_TYPE_UNKNOWN;
++      }
++
++      /* cipherId is the numeric id of the cipher name, if found */
++      if ((cipherId == -1) || (cipherId > 0 && cipherId <= CODEC_COUNT_MAX))
++      {
++        int value;
++        if (configDefault)
++        {
++          value = sqlite3mc_config(db, "default:cipher", cipherId);
++        }
++        else
++        {
++          value = sqlite3mc_config(db, "cipher", cipherId);
++        }
++        rc = SQLITE_OK;
++        ((char**)pArg)[0] = sqlite3_mprintf("%s", globalCodecDescriptorTable[value - 1].m_name);
++      }
++      else
++      {
++        ((char**) pArg)[0] = sqlite3_mprintf("Cipher '%s' unknown.", pragmaValue);
++        rc = SQLITE_ERROR;
++      }
++    }
++    else if (sqlite3StrICmp(pragmaName, "hmac_check") == 0)
++    {
++      int hmacCheck = (pragmaValue != NULL) ? sqlite3GetBoolean(pragmaValue, 1) : -1;
++      int value = sqlite3mc_config(db, "hmac_check", hmacCheck);
++      ((char**)pArg)[0] = sqlite3_mprintf("%d", value);
++      rc = SQLITE_OK;
++    }
++    else if (sqlite3StrICmp(pragmaName, "mc_legacy_wal") == 0)
++    {
++      int walLegacy = (pragmaValue != NULL) ? sqlite3GetBoolean(pragmaValue, 0) : -1;
++      int value = sqlite3mc_config(db, "mc_legacy_wal", walLegacy);
++      ((char**)pArg)[0] = sqlite3_mprintf("%d", value);
++      rc = SQLITE_OK;
++    }
++    else if (sqlite3StrICmp(pragmaName, "key") == 0)
++    {
++      rc = sqlite3_key_v2(db, zDbName, pragmaValue, -1);
++      if (rc == SQLITE_OK)
++      {
++        ((char**)pArg)[0] = sqlite3_mprintf("ok");
++      }
++      else
++      {
++        if (db->pErr)
++        {
++          const char* z = (const char*)sqlite3_value_text(db->pErr);
++          if (z && sqlite3Strlen30(z) > 0)
++          {
++            ((char**)pArg)[0] = sqlite3_mprintf(z);
++          }
++        }
++      }
++    }
++    else if (sqlite3StrICmp(pragmaName, "hexkey") == 0)
++    {
++      int nValue = sqlite3Strlen30(pragmaValue);
++      if (((nValue & 1) == 0) && (sqlite3mcIsHexKey((const unsigned char*) pragmaValue, nValue) != 0))
++      {
++        unsigned char* zHexKey = sqlite3_malloc(nValue/2);
++        sqlite3mcConvertHex2Bin((const unsigned char*) pragmaValue, nValue, zHexKey);
++        rc = sqlite3_key_v2(db, zDbName, zHexKey, nValue/2);
++        sqlite3_free(zHexKey);
++        if (rc == SQLITE_OK)
++        {
++          ((char**)pArg)[0] = sqlite3_mprintf("ok");
++        }
++        else
++        {
++          if (db->pErr)
++          {
++            const char* z = (const char*)sqlite3_value_text(db->pErr);
++            if (z && sqlite3Strlen30(z) > 0)
++            {
++              ((char**)pArg)[0] = sqlite3_mprintf(z);
++            }
++          }
++        }
++      }
++      else
++      {
++        rc = SQLITE_ERROR;
++        ((char**)pArg)[0] = sqlite3_mprintf("Malformed hex string");
++      }
++    }
++    else if (sqlite3StrICmp(pragmaName, "rekey") == 0)
++    {
++      rc = sqlite3_rekey_v2(db, zDbName, pragmaValue, -1);
++      if (rc == SQLITE_OK)
++      {
++        ((char**)pArg)[0] = sqlite3_mprintf("ok");
++      }
++      else
++      {
++        if (db->pErr)
++        {
++          const char* z = (const char*) sqlite3_value_text(db->pErr);
++          if (z && sqlite3Strlen30(z) > 0)
++          {
++            ((char**)pArg)[0] = sqlite3_mprintf(z);
++          }
++        }
++      }
++    }
++    else if (sqlite3StrICmp(pragmaName, "hexrekey") == 0)
++    {
++      int nValue = sqlite3Strlen30(pragmaValue);
++      if (((nValue & 1) == 0) && (sqlite3mcIsHexKey((const unsigned char*) pragmaValue, nValue) != 0))
++      {
++        unsigned char* zHexKey = sqlite3_malloc(nValue/2);
++        sqlite3mcConvertHex2Bin((const unsigned char*) pragmaValue, nValue, zHexKey);
++        rc = sqlite3_rekey_v2(db, zDbName, zHexKey, nValue/2);
++        sqlite3_free(zHexKey);
++        if (rc == SQLITE_OK)
++        {
++          ((char**)pArg)[0] = sqlite3_mprintf("ok");
++        }
++        else
++        {
++          if (db->pErr)
++          {
++            const char* z = (const char*)sqlite3_value_text(db->pErr);
++            if (z && sqlite3Strlen30(z) > 0)
++            {
++              ((char**)pArg)[0] = sqlite3_mprintf(z);
++            }
++          }
++        }
++      }
++      else
++      {
++        rc = SQLITE_ERROR;
++        ((char**)pArg)[0] = sqlite3_mprintf("Malformed hex string");
++      }
++    }
++#if SQLITE3MC_SECURE_MEMORY
++    else if (sqlite3StrICmp(pragmaName, "memory_security") == 0)
++    {
++      if (pragmaValue)
++      {
++        int intValue = -1;
++        if (0 == sqlite3StrICmp(pragmaValue, "none"))
++        {
++          intValue = SECURE_MEMORY_NONE;
++        }
++        else if (0 == sqlite3StrICmp(pragmaValue, "fill") )
++        {
++          intValue = SECURE_MEMORY_FILL;
++        }
++#if SQLITE3MC_ENABLE_MEMLOCK
++        else if (0 == sqlite3StrICmp(pragmaValue, "lock") )
++        {
++          intValue = SECURE_MEMORY_LOCK;
++        }
++#endif
++        else
++        {
++          intValue = sqlite3Atoi(pragmaValue);
++#if SQLITE3MC_ENABLE_MEMLOCK
++          intValue = (intValue >=0 && intValue <= 2) ? intValue : -1;
++#else
++          intValue = (intValue >=0 && intValue <= 1) ? intValue : -1;
++#endif
++        }
++        if (intValue >= 0)
++        {
++          sqlite3mcSetMemorySecurity(intValue);
++          rc = SQLITE_OK;
++          ((char**)pArg)[0] = sqlite3_mprintf("%d", intValue);
++        }
++        else
++        {
++          rc = SQLITE_ERROR;
++          ((char**) pArg)[0] = sqlite3_mprintf("Secure memory option '%s' invalid.", pragmaValue);
++        }
++      }
++      else
++      {
++        rc = SQLITE_OK;
++        ((char**)pArg)[0] = sqlite3_mprintf("%d", sqlite3mcGetMemorySecurity());
++      }
++    }
++#endif /* SQLITE3MC_SECURE_MEMORY */
++    else
++    {
++      int j;
++      int intValue = (pragmaValue != NULL) ? 0 : -1;
++      int isIntValue = (pragmaValue != NULL) ? (sqlite3GetInt32(pragmaValue, &intValue) != 0) : 1;
++
++      /* Determine cipher */
++      int cipher = sqlite3mc_config(db, "cipher", -1);
++      CipherParams* cipherParams = NULL;
++
++      /* Try to locate the cipher name */
++      for (j = 1; globalCodecParameterTable[j].m_name[0] != 0; ++j)
++      {
++        if (cipher == globalCodecParameterTable[j].m_id) break;
++      }
++
++      /* j is the index of the cipher name, if found */
++      cipherParams = (globalCodecParameterTable[j].m_name[0] != 0) ? globalCodecParameterTable[j].m_params : NULL;
++      if (cipherParams != NULL)
++      {
++        const char* cipherName = globalCodecParameterTable[j].m_name;
++        for (j = 0; cipherParams[j].m_name[0] != 0; ++j)
++        {
++          if (sqlite3_stricmp(pragmaName, cipherParams[j].m_name) == 0) break;
++        }
++        if (cipherParams[j].m_name[0] != 0)
++        {
++          char* param = (configDefault) ? sqlite3_mprintf("default:%s", pragmaName) : pragmaName;
++          if (isIntValue)
++          {
++            int value = sqlite3mc_config_cipher(db, cipherName, param, intValue);
++            ((char**)pArg)[0] = sqlite3_mprintf("%d", value);
++            rc = SQLITE_OK;
++          }
++          else
++          {
++            ((char**) pArg)[0] = sqlite3_mprintf("Malformed integer value '%s'.", pragmaValue);
++            rc = SQLITE_ERROR;
++          }
++          if (configDefault)
++          {
++            sqlite3_free(param);
++          }
++        }
++      }
++    }
++  }
++  return rc;
++}
++
++/*
++** Process URI filename query parameters relevant to the SQLite Encryption
++** Extension.  Return true if any of the relevant query parameters are
++** seen and return false if not.
++*/
++SQLITE_PRIVATE int
++sqlite3mcCodecQueryParameters(sqlite3* db, const char* zDb, const char* zUri)
++{
++  int rc = 1;
++  const char* zKey;
++  if ((zKey = sqlite3_uri_parameter(zUri, "hexkey")) != 0 && zKey[0])
++  {
++    u8 iByte;
++    int i;
++    int nKey = sqlite3Strlen30(zKey);
++    char* zDecoded = sqlite3_malloc(nKey);
++    for (i = 0, iByte = 0; i < nKey && sqlite3Isxdigit(zKey[i]); i++)
++    {
++      iByte = (iByte << 4) + sqlite3HexToInt(zKey[i]);
++      if ((i & 1) != 0) zDecoded[i/2] = iByte;
++    }
++    sqlite3_key_v2(db, zDb, zDecoded, i/2);
++    sqlite3_free(zDecoded);
++  }
++  else if ((zKey = sqlite3_uri_parameter(zUri, "key")) != 0)
++  {
++    sqlite3_key_v2(db, zDb, zKey, sqlite3Strlen30(zKey));
++  }
++  else if ((zKey = sqlite3_uri_parameter(zUri, "textkey")) != 0)
++  {
++    sqlite3_key_v2(db, zDb, zKey, -1);
++  }
++  else
++  {
++    rc = 0;
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcHandleAttachKey(sqlite3* db, const char* zName, const char* zPath, sqlite3_value* pKey, char** zErrDyn)
++{
++  int rc = SQLITE_OK;
++  int nKey;
++  char* zKey;
++  int keyType = sqlite3_value_type(pKey);
++  switch (keyType)
++  {
++    case SQLITE_INTEGER:
++    case SQLITE_FLOAT:
++      /* Invalid data type for key */
++      *zErrDyn = sqlite3DbStrDup(db, "Invalid key value");
++      rc = SQLITE_ERROR;
++      break;
++
++    case SQLITE_TEXT:
++    case SQLITE_BLOB:
++      /* Key parameter specified in ATTACH statement */
++      nKey = sqlite3_value_bytes(pKey);
++      zKey = (char*) sqlite3_value_blob(pKey);
++      rc = sqlite3mcCodecAttach(db, db->nDb - 1, zPath, zKey, nKey);
++      break;
++
++    case SQLITE_NULL:
++      /* No key specified.  Use the key from URI filename, or if none,
++      ** use the key from the main database. */
++      if (sqlite3mcCodecQueryParameters(db, zName, zPath) == 0)
++      {
++        sqlite3mcCodecGetKey(db, 0, (void**) &zKey, &nKey);
++        if (nKey)
++        {
++          rc = sqlite3mcCodecAttach(db, db->nDb - 1, zPath, zKey, nKey);
++        }
++      }
++      break;
++  }
++
++  return rc;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcHandleMainKey(sqlite3* db, const char* zPath)
++{
++  int rc = sqlite3mcConfigureFromUri(db, zPath, 1);
++  if (rc == SQLITE_OK)
++  {
++    sqlite3mcCodecQueryParameters(db, "main", zPath);
++  }
++  return rc;
++}
++/*** End of #include "cipher_config.c" ***/
++
++
++/* #include "codecext.c" */
++/*** Begin of #include "codecext.c" ***/
++/*
++** Name:        codecext.c
++** Purpose:     Implementation of SQLite codec API
++** Author:      Ulrich Telle
++** Created:     2006-12-06
++** Copyright:   (c) 2006-2022 Ulrich Telle
++** License:     MIT
++*/
++
++/*
++** "Special" version of function sqlite3BtreeSetPageSize
++** This version allows to reduce the number of reserved bytes per page,
++** while the original version allows only to increase it.
++** Needed to reclaim reserved space on decrypting a database.
++*/
++SQLITE_PRIVATE int
++sqlite3mcBtreeSetPageSize(Btree* p, int pageSize, int nReserve, int iFix)
++{
++  int rc = SQLITE_OK;
++  int x;
++  BtShared* pBt = p->pBt;
++  assert(nReserve >= 0 && nReserve <= 255);
++  sqlite3BtreeEnter(p);
++  pBt->nReserveWanted = nReserve;
++  x = pBt->pageSize - pBt->usableSize;
++  if (nReserve < 0) nReserve = x;
++  if (pBt->btsFlags & BTS_PAGESIZE_FIXED)
++  {
++    sqlite3BtreeLeave(p);
++    return SQLITE_READONLY;
++  }
++  assert(nReserve >= 0 && nReserve <= 255);
++  if (pageSize >= 512 && pageSize <= SQLITE_MAX_PAGE_SIZE &&
++    ((pageSize - 1) & pageSize) == 0)
++  {
++    assert((pageSize & 7) == 0);
++    assert(!pBt->pCursor);
++    pBt->pageSize = (u32)pageSize;
++    freeTempSpace(pBt);
++  }
++  rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
++  pBt->usableSize = pBt->pageSize - (u16)nReserve;
++  if (iFix) pBt->btsFlags |= BTS_PAGESIZE_FIXED;
++  sqlite3BtreeLeave(p);
++  return rc;
++}
++
++/*
++** Include a "special" version of the VACUUM command
++*/
++/* #include "rekeyvacuum.c" */
++/*** Begin of #include "rekeyvacuum.c" ***/
++/*
++** 2020-11-14
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++************************************************************************
++**
++** This file contains an adjusted version of function sqlite3RunVacuum
++** to allow reducing or removing reserved page space.
++** For this purpose the number of reserved bytes per page for the target
++** database is passed as an extra parameter to the adjusted function.
++**
++** NOTE: When upgrading to a new version of SQLite3 it is strongly
++** recommended to check the original function sqlite3RunVacuum of the
++** new version for relevant changes, and to incorporate them in the
++** adjusted function below.
++**
++** Change 0: Rename function to sqlite3mcRunVacuumForRekey()
++** Change 1: Add parameter 'int nRes'
++** Change 2: Remove local variable 'int nRes'
++** Change 3: Remove initialization 'nRes = sqlite3BtreeGetOptimalReserve(pMain)'
++** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
++**           (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
++**
++** This code is generated by the script rekeyvacuum.sh from SQLite version 3.45.1 amalgamation.
++*/
++SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
++  char **pzErrMsg,        /* Write error message here */
++  sqlite3 *db,            /* Database connection */
++  int iDb,                /* Which attached DB to vacuum */
++  sqlite3_value *pOut     /* Write results here, if not NULL. VACUUM INTO */
++, int nRes){
++  int rc = SQLITE_OK;     /* Return code from service routines */
++  Btree *pMain;           /* The database being vacuumed */
++  Btree *pTemp;           /* The temporary database we vacuum into */
++  u32 saved_mDbFlags;     /* Saved value of db->mDbFlags */
++  u64 saved_flags;        /* Saved value of db->flags */
++  i64 saved_nChange;      /* Saved value of db->nChange */
++  i64 saved_nTotalChange; /* Saved value of db->nTotalChange */
++  u32 saved_openFlags;    /* Saved value of db->openFlags */
++  u8 saved_mTrace;        /* Saved trace settings */
++  Db *pDb = 0;            /* Database to detach at end of vacuum */
++  int isMemDb;            /* True if vacuuming a :memory: database */
++  int nDb;                /* Number of attached databases */
++  const char *zDbMain;    /* Schema name of database to vacuum */
++  const char *zOut;       /* Name of output file */
++  u32 pgflags = PAGER_SYNCHRONOUS_OFF; /* sync flags for output db */
++
++  if( !db->autoCommit ){
++    sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
++    return SQLITE_ERROR; /* IMP: R-12218-18073 */
++  }
++  if( db->nVdbeActive>1 ){
++    sqlite3SetString(pzErrMsg, db,"cannot VACUUM - SQL statements in progress");
++    return SQLITE_ERROR; /* IMP: R-15610-35227 */
++  }
++  saved_openFlags = db->openFlags;
++  if( pOut ){
++    if( sqlite3_value_type(pOut)!=SQLITE_TEXT ){
++      sqlite3SetString(pzErrMsg, db, "non-text filename");
++      return SQLITE_ERROR;
++    }
++    zOut = (const char*)sqlite3_value_text(pOut);
++    db->openFlags &= ~SQLITE_OPEN_READONLY;
++    db->openFlags |= SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE;
++  }else{
++    zOut = "";
++  }
++
++  /* Save the current value of the database flags so that it can be
++  ** restored before returning. Then set the writable-schema flag, and
++  ** disable CHECK and foreign key constraints.  */
++  saved_flags = db->flags;
++  saved_mDbFlags = db->mDbFlags;
++  saved_nChange = db->nChange;
++  saved_nTotalChange = db->nTotalChange;
++  saved_mTrace = db->mTrace;
++  db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks;
++  db->mDbFlags |= DBFLAG_PreferBuiltin | DBFLAG_Vacuum;
++  db->flags &= ~(u64)(SQLITE_ForeignKeys | SQLITE_ReverseOrder
++                   | SQLITE_Defensive | SQLITE_CountRows);
++  db->mTrace = 0;
++
++  zDbMain = db->aDb[iDb].zDbSName;
++  pMain = db->aDb[iDb].pBt;
++  isMemDb = sqlite3PagerIsMemdb(sqlite3BtreePager(pMain));
++
++  /* Attach the temporary database as 'vacuum_db'. The synchronous pragma
++  ** can be set to 'off' for this file, as it is not recovered if a crash
++  ** occurs anyway. The integrity of the database is maintained by a
++  ** (possibly synchronous) transaction opened on the main database before
++  ** sqlite3BtreeCopyFile() is called.
++  **
++  ** An optimization would be to use a non-journaled pager.
++  ** (Later:) I tried setting "PRAGMA vacuum_db.journal_mode=OFF" but
++  ** that actually made the VACUUM run slower.  Very little journalling
++  ** actually occurs when doing a vacuum since the vacuum_db is initially
++  ** empty.  Only the journal header is written.  Apparently it takes more
++  ** time to parse and run the PRAGMA to turn journalling off than it does
++  ** to write the journal header file.
++  */
++  nDb = db->nDb;
++  rc = execSqlF(db, pzErrMsg, "ATTACH %Q AS vacuum_db", zOut);
++  db->openFlags = saved_openFlags;
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++  assert( (db->nDb-1)==nDb );
++  pDb = &db->aDb[nDb];
++  assert( strcmp(pDb->zDbSName,"vacuum_db")==0 );
++  pTemp = pDb->pBt;
++  if( pOut ){
++    sqlite3_file *id = sqlite3PagerFile(sqlite3BtreePager(pTemp));
++    i64 sz = 0;
++    if( id->pMethods!=0 && (sqlite3OsFileSize(id, &sz)!=SQLITE_OK || sz>0) ){
++      rc = SQLITE_ERROR;
++      sqlite3SetString(pzErrMsg, db, "output file already exists");
++      goto end_of_vacuum;
++    }
++    db->mDbFlags |= DBFLAG_VacuumInto;
++
++    /* For a VACUUM INTO, the pager-flags are set to the same values as
++    ** they are for the database being vacuumed, except that PAGER_CACHESPILL
++    ** is always set. */
++    pgflags = db->aDb[iDb].safety_level | (db->flags & PAGER_FLAGS_MASK);
++  }
++
++  /* A VACUUM cannot change the pagesize of an encrypted database. */
++  if( db->nextPagesize ){
++    extern void sqlite3mcCodecGetKey(sqlite3*, int, void**, int*);
++    int nKey;
++    char *zKey;
++    sqlite3mcCodecGetKey(db, iDb, (void**)&zKey, &nKey);
++    if( nKey ) db->nextPagesize = 0;
++  }
++
++  sqlite3BtreeSetCacheSize(pTemp, db->aDb[iDb].pSchema->cache_size);
++  sqlite3BtreeSetSpillSize(pTemp, sqlite3BtreeSetSpillSize(pMain,0));
++  sqlite3BtreeSetPagerFlags(pTemp, pgflags|PAGER_CACHESPILL);
++
++  /* Begin a transaction and take an exclusive lock on the main database
++  ** file. This is done before the sqlite3BtreeGetPageSize(pMain) call below,
++  ** to ensure that we do not try to change the page-size on a WAL database.
++  */
++  rc = execSql(db, pzErrMsg, "BEGIN");
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++  rc = sqlite3BtreeBeginTrans(pMain, pOut==0 ? 2 : 0, 0);
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++
++  /* Do not attempt to change the page size for a WAL database */
++  if( sqlite3PagerGetJournalMode(sqlite3BtreePager(pMain))
++                                               ==PAGER_JOURNALMODE_WAL
++   && pOut==0
++  ){
++    db->nextPagesize = 0;
++  }
++
++  if( sqlite3BtreeSetPageSize(pTemp, sqlite3BtreeGetPageSize(pMain), nRes, 0)
++   || (!isMemDb && sqlite3BtreeSetPageSize(pTemp, db->nextPagesize, nRes, 0))
++   || NEVER(db->mallocFailed)
++  ){
++    rc = SQLITE_NOMEM_BKPT;
++    goto end_of_vacuum;
++  }
++
++#ifndef SQLITE_OMIT_AUTOVACUUM
++  sqlite3BtreeSetAutoVacuum(pTemp, db->nextAutovac>=0 ? db->nextAutovac :
++                                           sqlite3BtreeGetAutoVacuum(pMain));
++#endif
++
++  /* Query the schema of the main database. Create a mirror schema
++  ** in the temporary database.
++  */
++  db->init.iDb = nDb; /* force new CREATE statements into vacuum_db */
++  rc = execSqlF(db, pzErrMsg,
++      "SELECT sql FROM \"%w\".sqlite_schema"
++      " WHERE type='table'AND name<>'sqlite_sequence'"
++      " AND coalesce(rootpage,1)>0",
++      zDbMain
++  );
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++  rc = execSqlF(db, pzErrMsg,
++      "SELECT sql FROM \"%w\".sqlite_schema"
++      " WHERE type='index'",
++      zDbMain
++  );
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++  db->init.iDb = 0;
++
++  /* Loop through the tables in the main database. For each, do
++  ** an "INSERT INTO vacuum_db.xxx SELECT * FROM main.xxx;" to copy
++  ** the contents to the temporary database.
++  */
++  rc = execSqlF(db, pzErrMsg,
++      "SELECT'INSERT INTO vacuum_db.'||quote(name)"
++      "||' SELECT*FROM\"%w\".'||quote(name)"
++      "FROM vacuum_db.sqlite_schema "
++      "WHERE type='table'AND coalesce(rootpage,1)>0",
++      zDbMain
++  );
++  assert( (db->mDbFlags & DBFLAG_Vacuum)!=0 );
++  db->mDbFlags &= ~DBFLAG_Vacuum;
++  if( rc!=SQLITE_OK ) goto end_of_vacuum;
++
++  /* Copy the triggers, views, and virtual tables from the main database
++  ** over to the temporary database.  None of these objects has any
++  ** associated storage, so all we have to do is copy their entries
++  ** from the schema table.
++  */
++  rc = execSqlF(db, pzErrMsg,
++      "INSERT INTO vacuum_db.sqlite_schema"
++      " SELECT*FROM \"%w\".sqlite_schema"
++      " WHERE type IN('view','trigger')"
++      " OR(type='table'AND rootpage=0)",
++      zDbMain
++  );
++  if( rc ) goto end_of_vacuum;
++
++  /* At this point, there is a write transaction open on both the
++  ** vacuum database and the main database. Assuming no error occurs,
++  ** both transactions are closed by this block - the main database
++  ** transaction by sqlite3BtreeCopyFile() and the other by an explicit
++  ** call to sqlite3BtreeCommit().
++  */
++  {
++    u32 meta;
++    int i;
++
++    /* This array determines which meta meta values are preserved in the
++    ** vacuum.  Even entries are the meta value number and odd entries
++    ** are an increment to apply to the meta value after the vacuum.
++    ** The increment is used to increase the schema cookie so that other
++    ** connections to the same database will know to reread the schema.
++    */
++    static const unsigned char aCopy[] = {
++       BTREE_SCHEMA_VERSION,     1,  /* Add one to the old schema cookie */
++       BTREE_DEFAULT_CACHE_SIZE, 0,  /* Preserve the default page cache size */
++       BTREE_TEXT_ENCODING,      0,  /* Preserve the text encoding */
++       BTREE_USER_VERSION,       0,  /* Preserve the user version */
++       BTREE_APPLICATION_ID,     0,  /* Preserve the application id */
++    };
++
++    assert( SQLITE_TXN_WRITE==sqlite3BtreeTxnState(pTemp) );
++    assert( pOut!=0 || SQLITE_TXN_WRITE==sqlite3BtreeTxnState(pMain) );
++
++    /* Copy Btree meta values */
++    for(i=0; iflags */
++  db->init.iDb = 0;
++  db->mDbFlags = saved_mDbFlags;
++  db->flags = saved_flags;
++  db->nChange = saved_nChange;
++  db->nTotalChange = saved_nTotalChange;
++  db->mTrace = saved_mTrace;
++  sqlite3BtreeSetPageSize(pMain, -1, 0, 1);
++
++  /* Currently there is an SQL level transaction open on the vacuum
++  ** database. No locks are held on any other files (since the main file
++  ** was committed at the btree level). So it safe to end the transaction
++  ** by manually setting the autoCommit flag to true and detaching the
++  ** vacuum database. The vacuum_db journal file is deleted when the pager
++  ** is closed by the DETACH.
++  */
++  db->autoCommit = 1;
++
++  if( pDb ){
++    sqlite3BtreeClose(pDb->pBt);
++    pDb->pBt = 0;
++    pDb->pSchema = 0;
++  }
++
++  /* This both clears the schemas and reduces the size of the db->aDb[]
++  ** array. */
++  sqlite3ResetAllSchemasOfConnection(db);
++
++  return rc;
++}
++/*** End of #include "rekeyvacuum.c" ***/
++
++
++/* #include "cipher_common.h" */
++
++
++SQLITE_API void
++sqlite3_activate_see(const char *info)
++{
++}
++
++/*
++** Free the encryption data structure associated with a pager instance.
++** (called from the modified code in pager.c) 
++*/
++SQLITE_PRIVATE void
++sqlite3mcCodecFree(void *pCodecArg)
++{
++  if (pCodecArg)
++  {
++    sqlite3mcCodecTerm(pCodecArg);
++    sqlite3_free(pCodecArg);
++    pCodecArg = NULL;
++  }
++}
++
++SQLITE_PRIVATE void
++sqlite3mcCodecSizeChange(void *pArg, int pageSize, int reservedSize)
++{
++  Codec* pCodec = (Codec*) pArg;
++  pCodec->m_pageSize = pageSize;
++  pCodec->m_reserved = reservedSize;
++}
++
++static void
++mcReportCodecError(BtShared* pBt, int error)
++{
++  pBt->db->errCode = error;
++  pBt->pPager->errCode = error;
++  if (error != SQLITE_OK)
++  {
++    pBt->pPager->eState = PAGER_ERROR;
++  }
++  setGetterMethod(pBt->pPager);
++  if (error == SQLITE_OK)
++  {
++    /* Clear cache to force reread of database after a new passphrase has been set */
++    sqlite3PagerClearCache(pBt->pPager);
++  }
++}
++
++/*
++// Encrypt/Decrypt functionality, called by pager.c
++*/
++SQLITE_PRIVATE void*
++sqlite3mcCodec(void* pCodecArg, void* data, Pgno nPageNum, int nMode)
++{
++  int rc = SQLITE_OK;
++  Codec* codec = NULL;
++  int pageSize;
++  if (pCodecArg == NULL)
++  {
++    return data;
++  }
++  codec = (Codec*) pCodecArg;
++  if (!sqlite3mcIsEncrypted(codec))
++  {
++    return data;
++  }
++
++  pageSize = sqlite3mcGetPageSize(codec);
++
++  switch(nMode)
++  {
++    case 0: /* Undo a "case 7" journal file encryption */
++    case 2: /* Reload a page */
++    case 3: /* Load a page */
++      if (sqlite3mcHasReadCipher(codec))
++      {
++        rc = sqlite3mcDecrypt(codec, nPageNum, (unsigned char*) data, pageSize);
++        if (rc != SQLITE_OK) mcReportCodecError(sqlite3mcGetBtShared(codec), rc);
++      }
++      break;
++
++    case 6: /* Encrypt a page for the main database file */
++      if (sqlite3mcHasWriteCipher(codec))
++      {
++        unsigned char* pageBuffer = sqlite3mcGetPageBuffer(codec);
++        memcpy(pageBuffer, data, pageSize);
++        data = pageBuffer;
++        rc = sqlite3mcEncrypt(codec, nPageNum, (unsigned char*) data, pageSize, 1);
++        if (rc != SQLITE_OK) mcReportCodecError(sqlite3mcGetBtShared(codec), rc);
++      }
++      break;
++
++    case 7: /* Encrypt a page for the journal file */
++      /* Under normal circumstances, the readkey is the same as the writekey.  However,
++         when the database is being rekeyed, the readkey is not the same as the writekey.
++         The rollback journal must be written using the original key for the
++         database file because it is, by nature, a rollback journal.
++         Therefore, for case 7, when the rollback is being written, always encrypt using
++         the database's readkey, which is guaranteed to be the same key that was used to
++         read the original data.
++      */
++      if (sqlite3mcHasReadCipher(codec))
++      {
++        unsigned char* pageBuffer = sqlite3mcGetPageBuffer(codec);
++        memcpy(pageBuffer, data, pageSize);
++        data = pageBuffer;
++        rc = sqlite3mcEncrypt(codec, nPageNum, (unsigned char*) data, pageSize, 0);
++        if (rc != SQLITE_OK) mcReportCodecError(sqlite3mcGetBtShared(codec), rc);
++      }
++      break;
++  }
++  return data;
++}
++
++SQLITE_PRIVATE Codec*
++sqlite3mcGetMainCodec(sqlite3* db);
++
++SQLITE_PRIVATE void
++sqlite3mcSetCodec(sqlite3* db, const char* zDbName, const char* zFileName, Codec* codec);
++
++static int
++mcAdjustBtree(Btree* pBt, int nPageSize, int nReserved, int isLegacy)
++{
++  int rc = SQLITE_OK;
++  Pager* pager = sqlite3BtreePager(pBt);
++  int pagesize = sqlite3BtreeGetPageSize(pBt);
++  sqlite3BtreeSecureDelete(pBt, 1);
++  if (nPageSize > 0)
++  {
++    pagesize = nPageSize;
++  }
++
++  /* Adjust the page size and the reserved area */
++  if (pager->pageSize != pagesize || pager->nReserve != nReserved)
++  {
++    if (isLegacy != 0)
++    {
++      pBt->pBt->btsFlags &= ~BTS_PAGESIZE_FIXED;
++    }
++    rc = sqlite3BtreeSetPageSize(pBt, pagesize, nReserved, 0);
++  }
++  return rc;
++}
++
++static int
++sqlite3mcCodecAttach(sqlite3* db, int nDb, const char* zPath, const void* zKey, int nKey)
++{
++  /* Attach a key to a database. */
++  const char* zDbName = db->aDb[nDb].zDbSName;
++  const char* dbFileName = sqlite3_db_filename(db, zDbName);
++  Codec* codec = (Codec*) sqlite3_malloc(sizeof(Codec));
++  int rc = (codec != NULL) ? sqlite3mcCodecInit(codec) : SQLITE_NOMEM;
++  if (rc != SQLITE_OK)
++  {
++    /* Unable to allocate memory for the codec base structure */
++    return rc;
++  }
++
++  sqlite3_mutex_enter(db->mutex);
++  sqlite3mcSetDb(codec, db);
++
++  /* No key specified, could mean either use the main db's encryption or no encryption */
++  if (zKey == NULL || nKey <= 0)
++  {
++    /* No key specified */
++    if (nDb != 0 && nKey > 0)
++    {
++      /* Main database possibly encrypted, no key explicitly given for attached database */
++      Codec* mainCodec = sqlite3mcGetMainCodec(db);
++      /* Attached database, therefore use the key of main database, if main database is encrypted */
++      if (mainCodec != NULL && sqlite3mcIsEncrypted(mainCodec))
++      {
++        rc = sqlite3mcCodecCopy(codec, mainCodec);
++        if (rc == SQLITE_OK)
++        {
++          int pageSize = sqlite3mcGetPageSizeWriteCipher(codec);
++          int reserved = sqlite3mcGetReservedWriteCipher(codec);
++          sqlite3mcSetBtree(codec, db->aDb[nDb].pBt);
++          mcAdjustBtree(db->aDb[nDb].pBt, pageSize, reserved, sqlite3mcGetLegacyWriteCipher(codec));
++          sqlite3mcCodecSizeChange(codec, pageSize, reserved);
++          sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
++        }
++        else
++        {
++          /* Replicating main codec failed, do not attach incomplete codec */
++          sqlite3mcCodecFree(codec);
++        }
++      }
++      else
++      {
++        /* Main database not encrypted */
++        sqlite3mcCodecFree(codec);
++      }
++    }
++    else
++    {
++      /* Main database not encrypted, no key given for attached database */
++      sqlite3mcCodecFree(codec);
++      /* Remove codec for main database */
++      if (nDb == 0 && nKey == 0)
++      {
++        sqlite3mcSetCodec(db, zDbName, dbFileName, NULL);
++      }
++    }
++  }
++  else
++  {
++    if (dbFileName != NULL)
++    {
++      /* Check whether key salt is provided in URI */
++      const unsigned char* cipherSalt = (const unsigned char*)sqlite3_uri_parameter(dbFileName, "cipher_salt");
++      if ((cipherSalt != NULL) && (strlen((const char*)cipherSalt) >= 2 * KEYSALT_LENGTH) && sqlite3mcIsHexKey(cipherSalt, 2 * KEYSALT_LENGTH))
++      {
++        codec->m_hasKeySalt = 1;
++        sqlite3mcConvertHex2Bin(cipherSalt, 2 * KEYSALT_LENGTH, codec->m_keySalt);
++      }
++    }
++
++    /* Configure cipher from URI in case of attached database */
++    if (nDb > 0)
++    {
++      rc = sqlite3mcConfigureFromUri(db, dbFileName, 0);
++    }
++    if (rc == SQLITE_OK)
++    {
++      /* Key specified, setup encryption key for database */
++      sqlite3mcSetBtree(codec, db->aDb[nDb].pBt);
++      rc = sqlite3mcCodecSetup(codec, sqlite3mcGetCipherType(db), (char*) zKey, nKey);
++      sqlite3mcClearKeySalt(codec);
++    }
++    if (rc == SQLITE_OK)
++    {
++      int pageSize = sqlite3mcGetPageSizeWriteCipher(codec);
++      int reserved = sqlite3mcGetReservedWriteCipher(codec);
++      mcAdjustBtree(db->aDb[nDb].pBt, pageSize, reserved, sqlite3mcGetLegacyWriteCipher(codec));
++      sqlite3mcCodecSizeChange(codec, pageSize, reserved);
++      sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
++    }
++    else
++    {
++      /* Setting up codec failed, do not attach incomplete codec */
++      sqlite3mcCodecFree(codec);
++    }
++  }
++
++  sqlite3_mutex_leave(db->mutex);
++
++  return rc;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcCodecGetKey(sqlite3* db, int nDb, void** zKey, int* nKey)
++{
++  /*
++  ** The unencrypted password is not stored for security reasons
++  ** therefore always return NULL
++  ** If the main database is encrypted a key length of 1 is returned.
++  ** In that case an attached database will get the same encryption key
++  ** as the main database if no key was explicitly given for the attached database.
++  */
++  Codec* codec = sqlite3mcGetCodec(db, db->aDb[nDb].zDbSName);
++  int keylen = (codec != NULL && sqlite3mcIsEncrypted(codec)) ? 1 : 0;
++  *zKey = NULL;
++  *nKey = keylen;
++}
++
++SQLITE_API int
++sqlite3_key(sqlite3 *db, const void *zKey, int nKey)
++{
++  /* The key is only set for the main database, not the temp database  */
++  return sqlite3_key_v2(db, "main", zKey, nKey);
++}
++
++SQLITE_API int
++sqlite3_key_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
++{
++  int rc = SQLITE_ERROR;
++  if (zKey != NULL && nKey < 0)
++  {
++    /* Key is zero-terminated string */
++    nKey = sqlite3Strlen30((const char*) zKey);
++  }
++  /* Database handle db and key must be given, but key length 0 is allowed */
++  if ((db != NULL) && (zKey != NULL) && (nKey >= 0))
++  {
++    int dbIndex;
++    const char* dbFileName = sqlite3_db_filename(db, zDbName);
++    if (dbFileName == NULL || dbFileName[0] == 0)
++    {
++      sqlite3ErrorWithMsg(db, rc, "Setting key not supported for in-memory or temporary databases.");
++      return rc;
++    }
++    /* Configure cipher from URI parameters if requested */
++    if (sqlite3FindFunction(db, "sqlite3mc_config_table", 0, SQLITE_UTF8, 0) == NULL)
++    {
++      /*
++      ** Encryption extension of database connection not yet initialized;
++      ** that is, sqlite3_key_v2 was called from the internal open function.
++      ** Therefore the URI should be checked for encryption configuration parameters.
++      */
++      rc = sqlite3mcConfigureFromUri(db, dbFileName, 0);
++    }
++
++    /* The key is only set for the main database, not the temp database  */
++    dbIndex = (zDbName) ? sqlite3FindDbName(db, zDbName) : 0;
++    if (dbIndex >= 0)
++    {
++      rc = sqlite3mcCodecAttach(db, dbIndex, dbFileName, zKey, nKey);
++    }
++    else
++    {
++      rc = SQLITE_ERROR;
++      sqlite3ErrorWithMsg(db, rc, "Setting key failed. Database '%s' not found.", zDbName);
++    }
++  }
++  return rc;
++}
++
++SQLITE_API int
++sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
++{
++  /* Changes the encryption key for an existing database. */
++  const char* dbFileName;
++  int dbIndex;
++  Btree* pBt;
++  int nPagesize;
++  int nReserved;
++  Pager* pPager;
++  Codec* codec;
++  int rc = SQLITE_ERROR;
++  if (zKey != NULL && nKey < 0)
++  {
++    /* Key is zero-terminated string */
++    nKey = sqlite3Strlen30((const char*) zKey);
++  }
++  dbFileName = sqlite3_db_filename(db, zDbName);
++  dbIndex = (zDbName) ? sqlite3FindDbName(db, zDbName) : 0;
++  if (dbIndex < 0)
++  {
++    sqlite3ErrorWithMsg(db, rc, "Rekeying failed. Database '%s' not found.", zDbName);
++    return rc;
++  }
++  if (dbFileName == NULL || dbFileName[0] == 0)
++  {
++    sqlite3ErrorWithMsg(db, rc, "Rekeying not supported for in-memory or temporary databases.");
++    return rc;
++  }
++  pBt = db->aDb[dbIndex].pBt;
++  nPagesize = sqlite3BtreeGetPageSize(pBt);
++
++  sqlite3BtreeEnter(pBt);
++  nReserved = sqlite3BtreeGetReserveNoMutex(pBt);
++  sqlite3BtreeLeave(pBt);
++
++  pPager = sqlite3BtreePager(pBt);
++  codec = sqlite3mcGetCodec(db, zDbName);
++
++  if (pagerUseWal(pPager))
++  {
++    sqlite3ErrorWithMsg(db, rc, "Rekeying is not supported in WAL journal mode.");
++    return rc;
++  }
++  
++  if ((zKey == NULL || nKey == 0) && (codec == NULL || !sqlite3mcIsEncrypted(codec)))
++  {
++    /* Database not encrypted and key not specified, therefore do nothing	*/
++    return SQLITE_OK;
++  }
++
++  sqlite3_mutex_enter(db->mutex);
++
++  if (codec == NULL || !sqlite3mcIsEncrypted(codec))
++  {
++    /* Database not encrypted, but key specified, therefore encrypt database	*/
++    if (codec == NULL)
++    {
++      codec = (Codec*) sqlite3_malloc(sizeof(Codec));
++      rc = (codec != NULL) ? sqlite3mcCodecInit(codec) : SQLITE_NOMEM;
++    }
++    if (rc == SQLITE_OK)
++    {
++      sqlite3mcSetDb(codec, db);
++      sqlite3mcSetBtree(codec, pBt);
++      rc = sqlite3mcSetupWriteCipher(codec, sqlite3mcGetCipherType(db), (char*) zKey, nKey);
++    }
++    if (rc == SQLITE_OK)
++    {
++      int nPagesizeWriteCipher = sqlite3mcGetPageSizeWriteCipher(codec);
++      if (nPagesizeWriteCipher <= 0 || nPagesize == nPagesizeWriteCipher)
++      {
++        int nReservedWriteCipher;
++        sqlite3mcSetHasReadCipher(codec, 0); /* Original database is not encrypted */
++        mcAdjustBtree(pBt, sqlite3mcGetPageSizeWriteCipher(codec), sqlite3mcGetReservedWriteCipher(codec), sqlite3mcGetLegacyWriteCipher(codec));
++        sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
++        nReservedWriteCipher = sqlite3mcGetReservedWriteCipher(codec);
++        sqlite3mcCodecSizeChange(codec, nPagesize, nReservedWriteCipher);
++        if (nReserved != nReservedWriteCipher)
++        {
++          /* Use VACUUM to change the number of reserved bytes */
++          char* err = NULL;
++          sqlite3mcSetReadReserved(codec, nReserved);
++          sqlite3mcSetWriteReserved(codec, nReservedWriteCipher);
++          rc = sqlite3mcRunVacuumForRekey(&err, db, dbIndex, NULL, nReservedWriteCipher);
++          if (rc != SQLITE_OK && err != NULL)
++          {
++            sqlite3ErrorWithMsg(db, rc, err);
++          }
++          goto leave_rekey;
++        }
++      }
++      else
++      {
++        /* Pagesize cannot be changed for an encrypted database */
++        rc = SQLITE_ERROR;
++        sqlite3ErrorWithMsg(db, rc, "Rekeying failed. Pagesize cannot be changed for an encrypted database.");
++        goto leave_rekey;
++      }
++    }
++    else
++    {
++      return rc;
++    }
++  }
++  else if (zKey == NULL || nKey == 0)
++  {
++    /* Database encrypted, but key not specified, therefore decrypt database */
++    /* Keep read key, drop write key */
++    sqlite3mcSetHasWriteCipher(codec, 0);
++    if (nReserved > 0)
++    {
++      /* Use VACUUM to change the number of reserved bytes */
++      char* err = NULL;
++      sqlite3mcSetReadReserved(codec, nReserved);
++      sqlite3mcSetWriteReserved(codec, 0);
++      rc = sqlite3mcRunVacuumForRekey(&err, db, dbIndex, NULL, 0);
++      if (rc != SQLITE_OK && err != NULL)
++      {
++        sqlite3ErrorWithMsg(db, rc, err);
++      }
++      goto leave_rekey;
++    }
++  }
++  else
++  {
++    /* Database encrypted and key specified, therefore re-encrypt database with new key */
++    /* Keep read key, change write key to new key */
++    rc = sqlite3mcSetupWriteCipher(codec, sqlite3mcGetCipherType(db), (char*) zKey, nKey);
++    if (rc == SQLITE_OK)
++    {
++      int nPagesizeWriteCipher = sqlite3mcGetPageSizeWriteCipher(codec);
++      if (nPagesizeWriteCipher <= 0 || nPagesize == nPagesizeWriteCipher)
++      {
++        int nReservedWriteCipher = sqlite3mcGetReservedWriteCipher(codec);
++        if (nReserved != nReservedWriteCipher)
++        {
++          /* Use VACUUM to change the number of reserved bytes */
++          char* err = NULL;
++          sqlite3mcSetReadReserved(codec, nReserved);
++          sqlite3mcSetWriteReserved(codec, nReservedWriteCipher);
++          rc = sqlite3mcRunVacuumForRekey(&err, db, dbIndex, NULL, nReservedWriteCipher);
++          if (rc != SQLITE_OK && err != NULL)
++          {
++            sqlite3ErrorWithMsg(db, rc, err);
++          }
++          goto leave_rekey;
++        }
++      }
++      else
++      {
++        /* Pagesize cannot be changed for an encrypted database */
++        rc = SQLITE_ERROR;
++        sqlite3ErrorWithMsg(db, rc, "Rekeying failed. Pagesize cannot be changed for an encrypted database.");
++        goto leave_rekey;
++      }
++    }
++    else
++    {
++      /* Setup of write cipher failed */
++      sqlite3ErrorWithMsg(db, rc, "Rekeying failed. Setup of write cipher failed.");
++      goto leave_rekey;
++    }
++  }
++
++  /* Start transaction */
++  rc = sqlite3BtreeBeginTrans(pBt, 1, 0);
++  if (!rc)
++  {
++    int pageSize = sqlite3BtreeGetPageSize(pBt);
++    Pgno nSkip = WX_PAGER_MJ_PGNO(pageSize);
++    DbPage *pPage;
++    Pgno n;
++    /* Rewrite all pages using the new encryption key (if specified) */
++    Pgno nPage;
++    int nPageCount = -1;
++    sqlite3PagerPagecount(pPager, &nPageCount);
++    nPage = nPageCount;
++
++    for (n = 1; rc == SQLITE_OK && n <= nPage; n++)
++    {
++      if (n == nSkip) continue;
++      rc = sqlite3PagerGet(pPager, n, &pPage, 0);
++      if (!rc)
++      {
++        rc = sqlite3PagerWrite(pPage);
++        sqlite3PagerUnref(pPage);
++      }
++    }
++  }
++
++  if (rc == SQLITE_OK)
++  {
++    /* Commit transaction if all pages could be rewritten */
++    rc = sqlite3BtreeCommit(pBt);
++  }
++  if (rc != SQLITE_OK)
++  {
++    /* Rollback in case of error */
++    sqlite3BtreeRollback(pBt, SQLITE_OK, 0);
++  }
++
++leave_rekey:
++  sqlite3_mutex_leave(db->mutex);
++
++/*leave_final:*/
++  if (rc == SQLITE_OK)
++  {
++    /* Set read key equal to write key if necessary */
++    if (sqlite3mcHasWriteCipher(codec))
++    {
++      sqlite3mcCopyCipher(codec, 0);
++      sqlite3mcSetHasReadCipher(codec, 1);
++    }
++    else
++    {
++      sqlite3mcSetIsEncrypted(codec, 0);
++    }
++  }
++  else
++  {
++    /* Restore write key if necessary */
++    if (sqlite3mcHasReadCipher(codec))
++    {
++      sqlite3mcCopyCipher(codec, 1);
++    }
++    else
++    {
++      sqlite3mcSetIsEncrypted(codec, 0);
++    }
++  }
++  /* Reset reserved for read and write key */
++  sqlite3mcSetReadReserved(codec, -1);
++  sqlite3mcSetWriteReserved(codec, -1);
++
++  if (!sqlite3mcIsEncrypted(codec))
++  {
++    /* Remove codec for unencrypted database */
++    sqlite3mcSetCodec(db, zDbName, dbFileName, NULL);
++  }
++  return rc;
++}
++
++SQLITE_API int
++sqlite3_rekey(sqlite3 *db, const void *zKey, int nKey)
++{
++  return sqlite3_rekey_v2(db, "main", zKey, nKey);
++}
++/*** End of #include "codecext.c" ***/
++
++
++/*
++** Functions for securing allocated memory
++*/
++/* #include "memory_secure.c" */
++/*** Begin of #include "memory_secure.c" ***/
++/*
++** Name:        mem_secure.c
++** Purpose:     Memory manager for SQLite3 Multiple Ciphers
++** Author:      Ulrich Telle
++** Created:     2023-09-17
++** Copyright:   (c) 2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* For memset, memset_s */
++#include 
++
++#ifdef _WIN32
++/* For SecureZeroMemory */
++#include 
++#include 
++#endif
++
++SQLITE_PRIVATE void sqlite3mcSecureZeroMemory(void* v, size_t n)
++{
++#ifdef _WIN32
++  SecureZeroMemory(v, n);
++#elif defined(__DARWIN__) || defined(__STDC_LIB_EXT1__)
++  /* memset_s() is available since OS X 10.9, */
++  /* and may be available on other platforms. */
++  memset_s(v, n, 0, n);
++#elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ >= 11)
++  /* Non-standard function */
++  explicit_bzero(v, n);
++#else
++  /* Generic implementation based on volatile pointers */
++  static void* (* const volatile memset_sec)(void*, int, size_t) = &memset;
++  memset_sec(v, 0, n);
++#endif
++}
++
++#if SQLITE3MC_SECURE_MEMORY
++
++/* Flag indicating whether securing memory allocations is initialized */
++static volatile int mcSecureMemoryInitialized = 0;
++/* Flag indicating whether memory allocations will be secured */
++static volatile int mcSecureMemoryFlag = 0;
++
++/* Map of default memory allocation methods */
++static volatile sqlite3_mem_methods mcDefaultMemoryMethods;
++
++#if SQLITE3MC_ENABLE_RANDOM_FILL_MEMORY
++
++/*
++** Fill a buffer with pseudo-random bytes.  This is used to preset
++** the content of a new memory allocation to unpredictable values and
++** to clear the content of a freed allocation to unpredictable values.
++*/
++static void mcRandomFill(char* pBuf, int nByte)
++{
++  unsigned int x, y, r;
++  x = SQLITE_PTR_TO_INT(pBuf);
++  y = nByte | 1;
++  while( nByte >= 4 )
++  {
++    x = (x>>1) ^ (-(int)(x&1) & 0xd0000001);
++    y = y*1103515245 + 12345;
++    r = x ^ y;
++    *(int*)pBuf = r;
++    pBuf += 4;
++    nByte -= 4;
++  }
++  while( nByte-- > 0 )
++  {
++    x = (x>>1) ^ (-(int)(x&1) & 0xd0000001);
++    y = y*1103515245 + 12345;
++    r = x ^ y;
++    *(pBuf++) = r & 0xff;
++  }
++}
++
++#endif
++
++/*
++** Return the size of an allocation
++*/
++static int mcMemorySize(void* pBuf)
++{
++  return mcDefaultMemoryMethods.xSize(pBuf);
++}
++
++/*
++** Memory allocation function
++*/
++static void* mcMemoryAlloc(int nByte)
++{
++  return mcDefaultMemoryMethods.xMalloc(nByte);
++}
++
++/*
++** Free a prior allocation
++*/
++static void mcMemoryFree(void* pPrior)
++{
++  if (mcSecureMemoryFlag)
++  {
++#if SQLITE3MC_USE_RANDOM_FILL_MEMORY
++    int nSize = mcMemorySize(pPrior);
++    mcRandomFill((char*) pPrior, nSize)
++#else
++    int nSize = mcMemorySize(pPrior);
++    sqlite3mcSecureZeroMemory(pPrior, 0, nSize);
++#endif
++  }
++  mcDefaultMemoryMethods.xFree(pPrior);
++}
++
++/*
++** Resize an allocation
++*/
++static void* mcMemoryRealloc(void* pPrior, int nByte)
++{
++  void* pNew = NULL;
++  if (mcSecureMemoryFlag)
++  {
++    int nPriorSize = mcMemorySize(pPrior);
++    if (nByte == 0)
++    {
++      /* New size = 0, just free prior memory */
++      mcMemoryFree(pPrior);
++      return NULL;
++    }
++    else if (!pPrior)
++    {
++      /* Prior size = 0, just allocate new memory */
++      return mcMemoryAlloc(nByte);
++    }
++    else if(nByte <= nPriorSize)
++    {
++      /* New size less or equal prior size, do nothing - we do not shrink allocations */
++      return pPrior;
++    }
++    else
++    {
++      /* New size greater than prior size, reallocate memory */
++      pNew = mcMemoryAlloc(nByte);
++      if (pNew)
++      {
++        memcpy(pNew, pPrior, nPriorSize);
++        mcMemoryFree(pPrior);
++      }
++      return pNew;
++    }
++  }
++  else
++  {
++    return mcDefaultMemoryMethods.xRealloc(pPrior, nByte);
++  }
++}
++
++/*
++** Round up request size to allocation size
++*/
++static int mcMemoryRoundup(int nByte)
++{
++  return mcDefaultMemoryMethods.xRoundup(nByte);
++}
++
++/*
++** Initialize the memory allocator
++*/
++static int mcMemoryInit(void* pAppData)
++{
++  return mcDefaultMemoryMethods.xInit(pAppData);
++}
++
++/*
++** Deinitialize the memory allocator
++*/
++static void mcMemoryShutdown(void* pAppData)
++{
++  mcDefaultMemoryMethods.xShutdown(pAppData);
++}
++
++static sqlite3_mem_methods mcSecureMemoryMethods =
++{
++  mcMemoryAlloc,
++  mcMemoryFree,
++  mcMemoryRealloc,
++  mcMemorySize,
++  mcMemoryRoundup,
++  mcMemoryInit,
++  mcMemoryShutdown,
++  0
++};
++
++SQLITE_PRIVATE void sqlite3mcSetMemorySecurity(int value)
++{
++  /* memory security can be changed only, if locking is not enabled */
++  if (mcSecureMemoryFlag < 2)
++  {
++    mcSecureMemoryFlag = (value >= 0 && value <= 2) ? value : 0;
++  }
++}
++
++SQLITE_PRIVATE int sqlite3mcGetMemorySecurity()
++{
++  return mcSecureMemoryFlag;
++}
++
++#endif /* SQLITE3MC_SECURE_MEMORY */
++
++SQLITE_PRIVATE void sqlite3mcInitMemoryMethods()
++{
++#if SQLITE3MC_SECURE_MEMORY
++  if (!mcSecureMemoryInitialized)
++  {
++    if (sqlite3_config(SQLITE_CONFIG_GETMALLOC, &mcDefaultMemoryMethods) != SQLITE_OK ||
++      sqlite3_config(SQLITE_CONFIG_MALLOC, &mcSecureMemoryMethods) != SQLITE_OK)
++    {
++      mcSecureMemoryFlag = mcSecureMemoryInitialized = 0;
++    }
++    else
++    {
++      mcSecureMemoryInitialized = 1;
++    }
++  }
++#endif /* SQLITE3MC_SECURE_MEMORY */
++}
++
++/*** End of #include "memory_secure.c" ***/
++
++
++/*
++** Extension functions
++*/
++#ifdef SQLITE_ENABLE_EXTFUNC
++/* Prototype for initialization function of EXTENSIONFUNCTIONS extension */
++int RegisterExtensionFunctions(sqlite3* db);
++/* #include "extensionfunctions.c" */
++/*** Begin of #include "extensionfunctions.c" ***/
++/*
++This library will provide common mathematical and string functions in
++SQL queries using the operating system libraries or provided
++definitions.  It includes the following functions:
++
++Math: acos, asin, atan, atn2, atan2, acosh, asinh, atanh, difference,
++degrees, radians, cos, sin, tan, cot, cosh, sinh, tanh, coth, exp,
++log, log10, power, sign, sqrt, square, ceil, floor, pi.
++
++String: replicate, charindex, leftstr, rightstr, ltrim, rtrim, trim,
++replace, reverse, proper, padl, padr, padc, strfilter.
++
++Aggregate: stdev, variance, mode, median, lower_quartile,
++upper_quartile.
++
++The string functions ltrim, rtrim, trim, replace are included in
++recent versions of SQLite and so by default do not build.
++
++Compilation instructions:
++ Compile this C source file into a dynamic library as follows:
++ * Linux:
++   gcc -fPIC -lm -shared extension-functions.c -o libsqlitefunctions.so
++ * Mac OS X:
++   gcc -fno-common -dynamiclib extension-functions.c -o libsqlitefunctions.dylib
++ (You may need to add flags
++  -I /opt/local/include/ -L/opt/local/lib -lsqlite3
++  if your sqlite3 is installed from Mac ports, or
++  -I /sw/include/ -L/sw/lib -lsqlite3
++  if installed with Fink.)
++ * Windows:
++  1. Install MinGW (http://www.mingw.org/) and you will get the gcc
++  (gnu compiler collection)
++  2. add the path to your path variable (isn't done during the
++   installation!)
++  3. compile:
++   gcc -shared -I "path" -o libsqlitefunctions.so extension-functions.c
++   (path = path of sqlite3ext.h; i.e. C:\programs\sqlite)
++
++Usage instructions for applications calling the sqlite3 API functions:
++  In your application, call sqlite3_enable_load_extension(db,1) to
++  allow loading external libraries.  Then load the library libsqlitefunctions
++  using sqlite3_load_extension; the third argument should be 0.
++  See http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
++  Select statements may now use these functions, as in
++  SELECT cos(radians(inclination)) FROM satsum WHERE satnum = 25544;
++
++Usage instructions for the sqlite3 program:
++  If the program is built so that loading extensions is permitted,
++  the following will work:
++   sqlite> SELECT load_extension('./libsqlitefunctions.so');
++   sqlite> select cos(radians(45));
++   0.707106781186548
++  Note: Loading extensions is by default prohibited as a
++  security measure; see "Security Considerations" in
++  http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
++  If the sqlite3 program and library are built this
++  way, you cannot use these functions from the program, you 
++  must write your own program using the sqlite3 API, and call
++  sqlite3_enable_load_extension as described above, or else
++  rebuilt the sqlite3 program to allow loadable extensions.
++
++Alterations:
++The instructions are for Linux, Mac OS X, and Windows; users of other
++OSes may need to modify this procedure.  In particular, if your math
++library lacks one or more of the needed trig or log functions, comment
++out the appropriate HAVE_ #define at the top of file.  If you do not
++wish to make a loadable module, comment out the define for
++COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE.  If you are using a
++version of SQLite without the trim functions and replace, comment out
++the HAVE_TRIM #define.
++
++Liam Healy
++
++History:
++2021-01-05 Disable math functions that are provided by the SQLite Math Extension since version 3.35.0
++2010-01-06 Correct check for argc in squareFunc, and add Windows
++compilation instructions.
++2009-06-24 Correct check for argc in properFunc.
++2008-09-14 Add check that memory was actually allocated after
++sqlite3_malloc or sqlite3StrDup, call sqlite3_result_error_nomem if
++not.  Thanks to Robert Simpson.
++2008-06-13 Change to instructions to indicate use of the math library
++and that program might work.
++2007-10-01 Minor clarification to instructions.
++2007-09-29 Compilation as loadable module is optional with
++COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE.
++2007-09-28 Use sqlite3_extension_init and macros
++SQLITE_EXTENSION_INIT1, SQLITE_EXTENSION_INIT2, so that it works with
++sqlite3_load_extension.  Thanks to Eric Higashino and Joe Wilson.
++New instructions for Mac compilation.
++2007-09-17 With help from Joe Wilson and Nuno Luca, made use of
++external interfaces so that compilation is no longer dependent on
++SQLite source code.  Merged source, header, and README into a single
++file.  Added casts so that Mac will compile without warnings (unsigned
++and signed char).
++2007-09-05 Included some definitions from sqlite 3.3.13 so that this
++will continue to work in newer versions of sqlite.  Completed
++description of functions available.
++2007-03-27 Revised description.
++2007-03-23 Small cleanup and a bug fix on the code.  This was mainly
++letting errno flag errors encountered in the math library and checking
++the result, rather than pre-checking.  This fixes a bug in power that
++would cause an error if any non-positive number was raised to any
++power.
++2007-02-07 posted by Mikey C to sqlite mailing list.
++Original code 2006 June 05 by relicoder.
++
++*/
++
++/* #include "config.h" */
++
++/* #define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE 1 */
++#if defined(_MSC_VER) && _MSC_VER <= 1700
++#else
++#define HAVE_ACOSH 1
++#define HAVE_ASINH 1
++#define HAVE_ATANH 1
++#endif
++#define HAVE_SINH 1
++#define HAVE_COSH 1
++#define HAVE_TANH 1
++#define HAVE_LOG10 1
++#if defined(_MSC_VER) && _MSC_VER <= 1700
++#else
++#define HAVE_ISBLANK 1
++#endif
++#define SQLITE_SOUNDEX 1
++#define HAVE_TRIM 1		/* LMH 2007-03-25 if sqlite has trim functions */
++
++#ifdef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE
++/* #include "sqlite3ext.h" */
++/*** Begin of #include "sqlite3ext.h" ***/
++/*
++** 2006 June 7
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the SQLite interface for use by
++** shared libraries that want to be imported as extensions into
++** an SQLite instance.  Shared libraries that intend to be loaded
++** as extensions by SQLite should #include this file instead of 
++** sqlite3.h.
++*/
++#ifndef SQLITE3EXT_H
++#define SQLITE3EXT_H
++/* #include "sqlite3.h" */
++
++
++/*
++** The following structure holds pointers to all of the SQLite API
++** routines.
++**
++** WARNING:  In order to maintain backwards compatibility, add new
++** interfaces to the end of this structure only.  If you insert new
++** interfaces in the middle of this structure, then older different
++** versions of SQLite will not be able to load each other's shared
++** libraries!
++*/
++struct sqlite3_api_routines {
++  void * (*aggregate_context)(sqlite3_context*,int nBytes);
++  int  (*aggregate_count)(sqlite3_context*);
++  int  (*bind_blob)(sqlite3_stmt*,int,const void*,int n,void(*)(void*));
++  int  (*bind_double)(sqlite3_stmt*,int,double);
++  int  (*bind_int)(sqlite3_stmt*,int,int);
++  int  (*bind_int64)(sqlite3_stmt*,int,sqlite_int64);
++  int  (*bind_null)(sqlite3_stmt*,int);
++  int  (*bind_parameter_count)(sqlite3_stmt*);
++  int  (*bind_parameter_index)(sqlite3_stmt*,const char*zName);
++  const char * (*bind_parameter_name)(sqlite3_stmt*,int);
++  int  (*bind_text)(sqlite3_stmt*,int,const char*,int n,void(*)(void*));
++  int  (*bind_text16)(sqlite3_stmt*,int,const void*,int,void(*)(void*));
++  int  (*bind_value)(sqlite3_stmt*,int,const sqlite3_value*);
++  int  (*busy_handler)(sqlite3*,int(*)(void*,int),void*);
++  int  (*busy_timeout)(sqlite3*,int ms);
++  int  (*changes)(sqlite3*);
++  int  (*close)(sqlite3*);
++  int  (*collation_needed)(sqlite3*,void*,void(*)(void*,sqlite3*,
++                           int eTextRep,const char*));
++  int  (*collation_needed16)(sqlite3*,void*,void(*)(void*,sqlite3*,
++                             int eTextRep,const void*));
++  const void * (*column_blob)(sqlite3_stmt*,int iCol);
++  int  (*column_bytes)(sqlite3_stmt*,int iCol);
++  int  (*column_bytes16)(sqlite3_stmt*,int iCol);
++  int  (*column_count)(sqlite3_stmt*pStmt);
++  const char * (*column_database_name)(sqlite3_stmt*,int);
++  const void * (*column_database_name16)(sqlite3_stmt*,int);
++  const char * (*column_decltype)(sqlite3_stmt*,int i);
++  const void * (*column_decltype16)(sqlite3_stmt*,int);
++  double  (*column_double)(sqlite3_stmt*,int iCol);
++  int  (*column_int)(sqlite3_stmt*,int iCol);
++  sqlite_int64  (*column_int64)(sqlite3_stmt*,int iCol);
++  const char * (*column_name)(sqlite3_stmt*,int);
++  const void * (*column_name16)(sqlite3_stmt*,int);
++  const char * (*column_origin_name)(sqlite3_stmt*,int);
++  const void * (*column_origin_name16)(sqlite3_stmt*,int);
++  const char * (*column_table_name)(sqlite3_stmt*,int);
++  const void * (*column_table_name16)(sqlite3_stmt*,int);
++  const unsigned char * (*column_text)(sqlite3_stmt*,int iCol);
++  const void * (*column_text16)(sqlite3_stmt*,int iCol);
++  int  (*column_type)(sqlite3_stmt*,int iCol);
++  sqlite3_value* (*column_value)(sqlite3_stmt*,int iCol);
++  void * (*commit_hook)(sqlite3*,int(*)(void*),void*);
++  int  (*complete)(const char*sql);
++  int  (*complete16)(const void*sql);
++  int  (*create_collation)(sqlite3*,const char*,int,void*,
++                           int(*)(void*,int,const void*,int,const void*));
++  int  (*create_collation16)(sqlite3*,const void*,int,void*,
++                             int(*)(void*,int,const void*,int,const void*));
++  int  (*create_function)(sqlite3*,const char*,int,int,void*,
++                          void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++                          void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++                          void (*xFinal)(sqlite3_context*));
++  int  (*create_function16)(sqlite3*,const void*,int,int,void*,
++                            void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++                            void (*xFinal)(sqlite3_context*));
++  int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*);
++  int  (*data_count)(sqlite3_stmt*pStmt);
++  sqlite3 * (*db_handle)(sqlite3_stmt*);
++  int (*declare_vtab)(sqlite3*,const char*);
++  int  (*enable_shared_cache)(int);
++  int  (*errcode)(sqlite3*db);
++  const char * (*errmsg)(sqlite3*);
++  const void * (*errmsg16)(sqlite3*);
++  int  (*exec)(sqlite3*,const char*,sqlite3_callback,void*,char**);
++  int  (*expired)(sqlite3_stmt*);
++  int  (*finalize)(sqlite3_stmt*pStmt);
++  void  (*free)(void*);
++  void  (*free_table)(char**result);
++  int  (*get_autocommit)(sqlite3*);
++  void * (*get_auxdata)(sqlite3_context*,int);
++  int  (*get_table)(sqlite3*,const char*,char***,int*,int*,char**);
++  int  (*global_recover)(void);
++  void  (*interruptx)(sqlite3*);
++  sqlite_int64  (*last_insert_rowid)(sqlite3*);
++  const char * (*libversion)(void);
++  int  (*libversion_number)(void);
++  void *(*malloc)(int);
++  char * (*mprintf)(const char*,...);
++  int  (*open)(const char*,sqlite3**);
++  int  (*open16)(const void*,sqlite3**);
++  int  (*prepare)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
++  int  (*prepare16)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
++  void * (*profile)(sqlite3*,void(*)(void*,const char*,sqlite_uint64),void*);
++  void  (*progress_handler)(sqlite3*,int,int(*)(void*),void*);
++  void *(*realloc)(void*,int);
++  int  (*reset)(sqlite3_stmt*pStmt);
++  void  (*result_blob)(sqlite3_context*,const void*,int,void(*)(void*));
++  void  (*result_double)(sqlite3_context*,double);
++  void  (*result_error)(sqlite3_context*,const char*,int);
++  void  (*result_error16)(sqlite3_context*,const void*,int);
++  void  (*result_int)(sqlite3_context*,int);
++  void  (*result_int64)(sqlite3_context*,sqlite_int64);
++  void  (*result_null)(sqlite3_context*);
++  void  (*result_text)(sqlite3_context*,const char*,int,void(*)(void*));
++  void  (*result_text16)(sqlite3_context*,const void*,int,void(*)(void*));
++  void  (*result_text16be)(sqlite3_context*,const void*,int,void(*)(void*));
++  void  (*result_text16le)(sqlite3_context*,const void*,int,void(*)(void*));
++  void  (*result_value)(sqlite3_context*,sqlite3_value*);
++  void * (*rollback_hook)(sqlite3*,void(*)(void*),void*);
++  int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
++                         const char*,const char*),void*);
++  void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
++  char * (*xsnprintf)(int,char*,const char*,...);
++  int  (*step)(sqlite3_stmt*);
++  int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
++                                char const**,char const**,int*,int*,int*);
++  void  (*thread_cleanup)(void);
++  int  (*total_changes)(sqlite3*);
++  void * (*trace)(sqlite3*,void(*xTrace)(void*,const char*),void*);
++  int  (*transfer_bindings)(sqlite3_stmt*,sqlite3_stmt*);
++  void * (*update_hook)(sqlite3*,void(*)(void*,int ,char const*,char const*,
++                                         sqlite_int64),void*);
++  void * (*user_data)(sqlite3_context*);
++  const void * (*value_blob)(sqlite3_value*);
++  int  (*value_bytes)(sqlite3_value*);
++  int  (*value_bytes16)(sqlite3_value*);
++  double  (*value_double)(sqlite3_value*);
++  int  (*value_int)(sqlite3_value*);
++  sqlite_int64  (*value_int64)(sqlite3_value*);
++  int  (*value_numeric_type)(sqlite3_value*);
++  const unsigned char * (*value_text)(sqlite3_value*);
++  const void * (*value_text16)(sqlite3_value*);
++  const void * (*value_text16be)(sqlite3_value*);
++  const void * (*value_text16le)(sqlite3_value*);
++  int  (*value_type)(sqlite3_value*);
++  char *(*vmprintf)(const char*,va_list);
++  /* Added ??? */
++  int (*overload_function)(sqlite3*, const char *zFuncName, int nArg);
++  /* Added by 3.3.13 */
++  int (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
++  int (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
++  int (*clear_bindings)(sqlite3_stmt*);
++  /* Added by 3.4.1 */
++  int (*create_module_v2)(sqlite3*,const char*,const sqlite3_module*,void*,
++                          void (*xDestroy)(void *));
++  /* Added by 3.5.0 */
++  int (*bind_zeroblob)(sqlite3_stmt*,int,int);
++  int (*blob_bytes)(sqlite3_blob*);
++  int (*blob_close)(sqlite3_blob*);
++  int (*blob_open)(sqlite3*,const char*,const char*,const char*,sqlite3_int64,
++                   int,sqlite3_blob**);
++  int (*blob_read)(sqlite3_blob*,void*,int,int);
++  int (*blob_write)(sqlite3_blob*,const void*,int,int);
++  int (*create_collation_v2)(sqlite3*,const char*,int,void*,
++                             int(*)(void*,int,const void*,int,const void*),
++                             void(*)(void*));
++  int (*file_control)(sqlite3*,const char*,int,void*);
++  sqlite3_int64 (*memory_highwater)(int);
++  sqlite3_int64 (*memory_used)(void);
++  sqlite3_mutex *(*mutex_alloc)(int);
++  void (*mutex_enter)(sqlite3_mutex*);
++  void (*mutex_free)(sqlite3_mutex*);
++  void (*mutex_leave)(sqlite3_mutex*);
++  int (*mutex_try)(sqlite3_mutex*);
++  int (*open_v2)(const char*,sqlite3**,int,const char*);
++  int (*release_memory)(int);
++  void (*result_error_nomem)(sqlite3_context*);
++  void (*result_error_toobig)(sqlite3_context*);
++  int (*sleep)(int);
++  void (*soft_heap_limit)(int);
++  sqlite3_vfs *(*vfs_find)(const char*);
++  int (*vfs_register)(sqlite3_vfs*,int);
++  int (*vfs_unregister)(sqlite3_vfs*);
++  int (*xthreadsafe)(void);
++  void (*result_zeroblob)(sqlite3_context*,int);
++  void (*result_error_code)(sqlite3_context*,int);
++  int (*test_control)(int, ...);
++  void (*randomness)(int,void*);
++  sqlite3 *(*context_db_handle)(sqlite3_context*);
++  int (*extended_result_codes)(sqlite3*,int);
++  int (*limit)(sqlite3*,int,int);
++  sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
++  const char *(*sql)(sqlite3_stmt*);
++  int (*status)(int,int*,int*,int);
++  int (*backup_finish)(sqlite3_backup*);
++  sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*);
++  int (*backup_pagecount)(sqlite3_backup*);
++  int (*backup_remaining)(sqlite3_backup*);
++  int (*backup_step)(sqlite3_backup*,int);
++  const char *(*compileoption_get)(int);
++  int (*compileoption_used)(const char*);
++  int (*create_function_v2)(sqlite3*,const char*,int,int,void*,
++                            void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
++                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++                            void (*xFinal)(sqlite3_context*),
++                            void(*xDestroy)(void*));
++  int (*db_config)(sqlite3*,int,...);
++  sqlite3_mutex *(*db_mutex)(sqlite3*);
++  int (*db_status)(sqlite3*,int,int*,int*,int);
++  int (*extended_errcode)(sqlite3*);
++  void (*log)(int,const char*,...);
++  sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64);
++  const char *(*sourceid)(void);
++  int (*stmt_status)(sqlite3_stmt*,int,int);
++  int (*strnicmp)(const char*,const char*,int);
++  int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*);
++  int (*wal_autocheckpoint)(sqlite3*,int);
++  int (*wal_checkpoint)(sqlite3*,const char*);
++  void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
++  int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
++  int (*vtab_config)(sqlite3*,int op,...);
++  int (*vtab_on_conflict)(sqlite3*);
++  /* Version 3.7.16 and later */
++  int (*close_v2)(sqlite3*);
++  const char *(*db_filename)(sqlite3*,const char*);
++  int (*db_readonly)(sqlite3*,const char*);
++  int (*db_release_memory)(sqlite3*);
++  const char *(*errstr)(int);
++  int (*stmt_busy)(sqlite3_stmt*);
++  int (*stmt_readonly)(sqlite3_stmt*);
++  int (*stricmp)(const char*,const char*);
++  int (*uri_boolean)(const char*,const char*,int);
++  sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
++  const char *(*uri_parameter)(const char*,const char*);
++  char *(*xvsnprintf)(int,char*,const char*,va_list);
++  int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
++  /* Version 3.8.7 and later */
++  int (*auto_extension)(void(*)(void));
++  int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
++                     void(*)(void*));
++  int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
++                      void(*)(void*),unsigned char);
++  int (*cancel_auto_extension)(void(*)(void));
++  int (*load_extension)(sqlite3*,const char*,const char*,char**);
++  void *(*malloc64)(sqlite3_uint64);
++  sqlite3_uint64 (*msize)(void*);
++  void *(*realloc64)(void*,sqlite3_uint64);
++  void (*reset_auto_extension)(void);
++  void (*result_blob64)(sqlite3_context*,const void*,sqlite3_uint64,
++                        void(*)(void*));
++  void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
++                         void(*)(void*), unsigned char);
++  int (*strglob)(const char*,const char*);
++  /* Version 3.8.11 and later */
++  sqlite3_value *(*value_dup)(const sqlite3_value*);
++  void (*value_free)(sqlite3_value*);
++  int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
++  int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
++  /* Version 3.9.0 and later */
++  unsigned int (*value_subtype)(sqlite3_value*);
++  void (*result_subtype)(sqlite3_context*,unsigned int);
++  /* Version 3.10.0 and later */
++  int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
++  int (*strlike)(const char*,const char*,unsigned int);
++  int (*db_cacheflush)(sqlite3*);
++  /* Version 3.12.0 and later */
++  int (*system_errno)(sqlite3*);
++  /* Version 3.14.0 and later */
++  int (*trace_v2)(sqlite3*,unsigned,int(*)(unsigned,void*,void*,void*),void*);
++  char *(*expanded_sql)(sqlite3_stmt*);
++  /* Version 3.18.0 and later */
++  void (*set_last_insert_rowid)(sqlite3*,sqlite3_int64);
++  /* Version 3.20.0 and later */
++  int (*prepare_v3)(sqlite3*,const char*,int,unsigned int,
++                    sqlite3_stmt**,const char**);
++  int (*prepare16_v3)(sqlite3*,const void*,int,unsigned int,
++                      sqlite3_stmt**,const void**);
++  int (*bind_pointer)(sqlite3_stmt*,int,void*,const char*,void(*)(void*));
++  void (*result_pointer)(sqlite3_context*,void*,const char*,void(*)(void*));
++  void *(*value_pointer)(sqlite3_value*,const char*);
++  int (*vtab_nochange)(sqlite3_context*);
++  int (*value_nochange)(sqlite3_value*);
++  const char *(*vtab_collation)(sqlite3_index_info*,int);
++  /* Version 3.24.0 and later */
++  int (*keyword_count)(void);
++  int (*keyword_name)(int,const char**,int*);
++  int (*keyword_check)(const char*,int);
++  sqlite3_str *(*str_new)(sqlite3*);
++  char *(*str_finish)(sqlite3_str*);
++  void (*str_appendf)(sqlite3_str*, const char *zFormat, ...);
++  void (*str_vappendf)(sqlite3_str*, const char *zFormat, va_list);
++  void (*str_append)(sqlite3_str*, const char *zIn, int N);
++  void (*str_appendall)(sqlite3_str*, const char *zIn);
++  void (*str_appendchar)(sqlite3_str*, int N, char C);
++  void (*str_reset)(sqlite3_str*);
++  int (*str_errcode)(sqlite3_str*);
++  int (*str_length)(sqlite3_str*);
++  char *(*str_value)(sqlite3_str*);
++  /* Version 3.25.0 and later */
++  int (*create_window_function)(sqlite3*,const char*,int,int,void*,
++                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
++                            void (*xFinal)(sqlite3_context*),
++                            void (*xValue)(sqlite3_context*),
++                            void (*xInv)(sqlite3_context*,int,sqlite3_value**),
++                            void(*xDestroy)(void*));
++  /* Version 3.26.0 and later */
++  const char *(*normalized_sql)(sqlite3_stmt*);
++  /* Version 3.28.0 and later */
++  int (*stmt_isexplain)(sqlite3_stmt*);
++  int (*value_frombind)(sqlite3_value*);
++  /* Version 3.30.0 and later */
++  int (*drop_modules)(sqlite3*,const char**);
++  /* Version 3.31.0 and later */
++  sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64);
++  const char *(*uri_key)(const char*,int);
++  const char *(*filename_database)(const char*);
++  const char *(*filename_journal)(const char*);
++  const char *(*filename_wal)(const char*);
++  /* Version 3.32.0 and later */
++  const char *(*create_filename)(const char*,const char*,const char*,
++                           int,const char**);
++  void (*free_filename)(const char*);
++  sqlite3_file *(*database_file_object)(const char*);
++  /* Version 3.34.0 and later */
++  int (*txn_state)(sqlite3*,const char*);
++  /* Version 3.36.1 and later */
++  sqlite3_int64 (*changes64)(sqlite3*);
++  sqlite3_int64 (*total_changes64)(sqlite3*);
++  /* Version 3.37.0 and later */
++  int (*autovacuum_pages)(sqlite3*,
++     unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
++     void*, void(*)(void*));
++  /* Version 3.38.0 and later */
++  int (*error_offset)(sqlite3*);
++  int (*vtab_rhs_value)(sqlite3_index_info*,int,sqlite3_value**);
++  int (*vtab_distinct)(sqlite3_index_info*);
++  int (*vtab_in)(sqlite3_index_info*,int,int);
++  int (*vtab_in_first)(sqlite3_value*,sqlite3_value**);
++  int (*vtab_in_next)(sqlite3_value*,sqlite3_value**);
++  /* Version 3.39.0 and later */
++  int (*deserialize)(sqlite3*,const char*,unsigned char*,
++                     sqlite3_int64,sqlite3_int64,unsigned);
++  unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
++                              unsigned int);
++  const char *(*db_name)(sqlite3*,int);
++  /* Version 3.40.0 and later */
++  int (*value_encoding)(sqlite3_value*);
++  /* Version 3.41.0 and later */
++  int (*is_interrupted)(sqlite3*);
++  /* Version 3.43.0 and later */
++  int (*stmt_explain)(sqlite3_stmt*,int);
++  /* Version 3.44.0 and later */
++  void *(*get_clientdata)(sqlite3*,const char*);
++  int (*set_clientdata)(sqlite3*, const char*, void*, void(*)(void*));
++};
++
++/*
++** This is the function signature used for all extension entry points.  It
++** is also defined in the file "loadext.c".
++*/
++typedef int (*sqlite3_loadext_entry)(
++  sqlite3 *db,                       /* Handle to the database. */
++  char **pzErrMsg,                   /* Used to set error string on failure. */
++  const sqlite3_api_routines *pThunk /* Extension API function pointers. */
++);
++
++/*
++** The following macros redefine the API routines so that they are
++** redirected through the global sqlite3_api structure.
++**
++** This header file is also used by the loadext.c source file
++** (part of the main SQLite library - not an extension) so that
++** it can get access to the sqlite3_api_routines structure
++** definition.  But the main library does not want to redefine
++** the API.  So the redefinition macros are only valid if the
++** SQLITE_CORE macros is undefined.
++*/
++#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
++#define sqlite3_aggregate_context      sqlite3_api->aggregate_context
++#ifndef SQLITE_OMIT_DEPRECATED
++#define sqlite3_aggregate_count        sqlite3_api->aggregate_count
++#endif
++#define sqlite3_bind_blob              sqlite3_api->bind_blob
++#define sqlite3_bind_double            sqlite3_api->bind_double
++#define sqlite3_bind_int               sqlite3_api->bind_int
++#define sqlite3_bind_int64             sqlite3_api->bind_int64
++#define sqlite3_bind_null              sqlite3_api->bind_null
++#define sqlite3_bind_parameter_count   sqlite3_api->bind_parameter_count
++#define sqlite3_bind_parameter_index   sqlite3_api->bind_parameter_index
++#define sqlite3_bind_parameter_name    sqlite3_api->bind_parameter_name
++#define sqlite3_bind_text              sqlite3_api->bind_text
++#define sqlite3_bind_text16            sqlite3_api->bind_text16
++#define sqlite3_bind_value             sqlite3_api->bind_value
++#define sqlite3_busy_handler           sqlite3_api->busy_handler
++#define sqlite3_busy_timeout           sqlite3_api->busy_timeout
++#define sqlite3_changes                sqlite3_api->changes
++#define sqlite3_close                  sqlite3_api->close
++#define sqlite3_collation_needed       sqlite3_api->collation_needed
++#define sqlite3_collation_needed16     sqlite3_api->collation_needed16
++#define sqlite3_column_blob            sqlite3_api->column_blob
++#define sqlite3_column_bytes           sqlite3_api->column_bytes
++#define sqlite3_column_bytes16         sqlite3_api->column_bytes16
++#define sqlite3_column_count           sqlite3_api->column_count
++#define sqlite3_column_database_name   sqlite3_api->column_database_name
++#define sqlite3_column_database_name16 sqlite3_api->column_database_name16
++#define sqlite3_column_decltype        sqlite3_api->column_decltype
++#define sqlite3_column_decltype16      sqlite3_api->column_decltype16
++#define sqlite3_column_double          sqlite3_api->column_double
++#define sqlite3_column_int             sqlite3_api->column_int
++#define sqlite3_column_int64           sqlite3_api->column_int64
++#define sqlite3_column_name            sqlite3_api->column_name
++#define sqlite3_column_name16          sqlite3_api->column_name16
++#define sqlite3_column_origin_name     sqlite3_api->column_origin_name
++#define sqlite3_column_origin_name16   sqlite3_api->column_origin_name16
++#define sqlite3_column_table_name      sqlite3_api->column_table_name
++#define sqlite3_column_table_name16    sqlite3_api->column_table_name16
++#define sqlite3_column_text            sqlite3_api->column_text
++#define sqlite3_column_text16          sqlite3_api->column_text16
++#define sqlite3_column_type            sqlite3_api->column_type
++#define sqlite3_column_value           sqlite3_api->column_value
++#define sqlite3_commit_hook            sqlite3_api->commit_hook
++#define sqlite3_complete               sqlite3_api->complete
++#define sqlite3_complete16             sqlite3_api->complete16
++#define sqlite3_create_collation       sqlite3_api->create_collation
++#define sqlite3_create_collation16     sqlite3_api->create_collation16
++#define sqlite3_create_function        sqlite3_api->create_function
++#define sqlite3_create_function16      sqlite3_api->create_function16
++#define sqlite3_create_module          sqlite3_api->create_module
++#define sqlite3_create_module_v2       sqlite3_api->create_module_v2
++#define sqlite3_data_count             sqlite3_api->data_count
++#define sqlite3_db_handle              sqlite3_api->db_handle
++#define sqlite3_declare_vtab           sqlite3_api->declare_vtab
++#define sqlite3_enable_shared_cache    sqlite3_api->enable_shared_cache
++#define sqlite3_errcode                sqlite3_api->errcode
++#define sqlite3_errmsg                 sqlite3_api->errmsg
++#define sqlite3_errmsg16               sqlite3_api->errmsg16
++#define sqlite3_exec                   sqlite3_api->exec
++#ifndef SQLITE_OMIT_DEPRECATED
++#define sqlite3_expired                sqlite3_api->expired
++#endif
++#define sqlite3_finalize               sqlite3_api->finalize
++#define sqlite3_free                   sqlite3_api->free
++#define sqlite3_free_table             sqlite3_api->free_table
++#define sqlite3_get_autocommit         sqlite3_api->get_autocommit
++#define sqlite3_get_auxdata            sqlite3_api->get_auxdata
++#define sqlite3_get_table              sqlite3_api->get_table
++#ifndef SQLITE_OMIT_DEPRECATED
++#define sqlite3_global_recover         sqlite3_api->global_recover
++#endif
++#define sqlite3_interrupt              sqlite3_api->interruptx
++#define sqlite3_last_insert_rowid      sqlite3_api->last_insert_rowid
++#define sqlite3_libversion             sqlite3_api->libversion
++#define sqlite3_libversion_number      sqlite3_api->libversion_number
++#define sqlite3_malloc                 sqlite3_api->malloc
++#define sqlite3_mprintf                sqlite3_api->mprintf
++#define sqlite3_open                   sqlite3_api->open
++#define sqlite3_open16                 sqlite3_api->open16
++#define sqlite3_prepare                sqlite3_api->prepare
++#define sqlite3_prepare16              sqlite3_api->prepare16
++#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
++#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
++#define sqlite3_profile                sqlite3_api->profile
++#define sqlite3_progress_handler       sqlite3_api->progress_handler
++#define sqlite3_realloc                sqlite3_api->realloc
++#define sqlite3_reset                  sqlite3_api->reset
++#define sqlite3_result_blob            sqlite3_api->result_blob
++#define sqlite3_result_double          sqlite3_api->result_double
++#define sqlite3_result_error           sqlite3_api->result_error
++#define sqlite3_result_error16         sqlite3_api->result_error16
++#define sqlite3_result_int             sqlite3_api->result_int
++#define sqlite3_result_int64           sqlite3_api->result_int64
++#define sqlite3_result_null            sqlite3_api->result_null
++#define sqlite3_result_text            sqlite3_api->result_text
++#define sqlite3_result_text16          sqlite3_api->result_text16
++#define sqlite3_result_text16be        sqlite3_api->result_text16be
++#define sqlite3_result_text16le        sqlite3_api->result_text16le
++#define sqlite3_result_value           sqlite3_api->result_value
++#define sqlite3_rollback_hook          sqlite3_api->rollback_hook
++#define sqlite3_set_authorizer         sqlite3_api->set_authorizer
++#define sqlite3_set_auxdata            sqlite3_api->set_auxdata
++#define sqlite3_snprintf               sqlite3_api->xsnprintf
++#define sqlite3_step                   sqlite3_api->step
++#define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
++#define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
++#define sqlite3_total_changes          sqlite3_api->total_changes
++#define sqlite3_trace                  sqlite3_api->trace
++#ifndef SQLITE_OMIT_DEPRECATED
++#define sqlite3_transfer_bindings      sqlite3_api->transfer_bindings
++#endif
++#define sqlite3_update_hook            sqlite3_api->update_hook
++#define sqlite3_user_data              sqlite3_api->user_data
++#define sqlite3_value_blob             sqlite3_api->value_blob
++#define sqlite3_value_bytes            sqlite3_api->value_bytes
++#define sqlite3_value_bytes16          sqlite3_api->value_bytes16
++#define sqlite3_value_double           sqlite3_api->value_double
++#define sqlite3_value_int              sqlite3_api->value_int
++#define sqlite3_value_int64            sqlite3_api->value_int64
++#define sqlite3_value_numeric_type     sqlite3_api->value_numeric_type
++#define sqlite3_value_text             sqlite3_api->value_text
++#define sqlite3_value_text16           sqlite3_api->value_text16
++#define sqlite3_value_text16be         sqlite3_api->value_text16be
++#define sqlite3_value_text16le         sqlite3_api->value_text16le
++#define sqlite3_value_type             sqlite3_api->value_type
++#define sqlite3_vmprintf               sqlite3_api->vmprintf
++#define sqlite3_vsnprintf              sqlite3_api->xvsnprintf
++#define sqlite3_overload_function      sqlite3_api->overload_function
++#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
++#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
++#define sqlite3_clear_bindings         sqlite3_api->clear_bindings
++#define sqlite3_bind_zeroblob          sqlite3_api->bind_zeroblob
++#define sqlite3_blob_bytes             sqlite3_api->blob_bytes
++#define sqlite3_blob_close             sqlite3_api->blob_close
++#define sqlite3_blob_open              sqlite3_api->blob_open
++#define sqlite3_blob_read              sqlite3_api->blob_read
++#define sqlite3_blob_write             sqlite3_api->blob_write
++#define sqlite3_create_collation_v2    sqlite3_api->create_collation_v2
++#define sqlite3_file_control           sqlite3_api->file_control
++#define sqlite3_memory_highwater       sqlite3_api->memory_highwater
++#define sqlite3_memory_used            sqlite3_api->memory_used
++#define sqlite3_mutex_alloc            sqlite3_api->mutex_alloc
++#define sqlite3_mutex_enter            sqlite3_api->mutex_enter
++#define sqlite3_mutex_free             sqlite3_api->mutex_free
++#define sqlite3_mutex_leave            sqlite3_api->mutex_leave
++#define sqlite3_mutex_try              sqlite3_api->mutex_try
++#define sqlite3_open_v2                sqlite3_api->open_v2
++#define sqlite3_release_memory         sqlite3_api->release_memory
++#define sqlite3_result_error_nomem     sqlite3_api->result_error_nomem
++#define sqlite3_result_error_toobig    sqlite3_api->result_error_toobig
++#define sqlite3_sleep                  sqlite3_api->sleep
++#define sqlite3_soft_heap_limit        sqlite3_api->soft_heap_limit
++#define sqlite3_vfs_find               sqlite3_api->vfs_find
++#define sqlite3_vfs_register           sqlite3_api->vfs_register
++#define sqlite3_vfs_unregister         sqlite3_api->vfs_unregister
++#define sqlite3_threadsafe             sqlite3_api->xthreadsafe
++#define sqlite3_result_zeroblob        sqlite3_api->result_zeroblob
++#define sqlite3_result_error_code      sqlite3_api->result_error_code
++#define sqlite3_test_control           sqlite3_api->test_control
++#define sqlite3_randomness             sqlite3_api->randomness
++#define sqlite3_context_db_handle      sqlite3_api->context_db_handle
++#define sqlite3_extended_result_codes  sqlite3_api->extended_result_codes
++#define sqlite3_limit                  sqlite3_api->limit
++#define sqlite3_next_stmt              sqlite3_api->next_stmt
++#define sqlite3_sql                    sqlite3_api->sql
++#define sqlite3_status                 sqlite3_api->status
++#define sqlite3_backup_finish          sqlite3_api->backup_finish
++#define sqlite3_backup_init            sqlite3_api->backup_init
++#define sqlite3_backup_pagecount       sqlite3_api->backup_pagecount
++#define sqlite3_backup_remaining       sqlite3_api->backup_remaining
++#define sqlite3_backup_step            sqlite3_api->backup_step
++#define sqlite3_compileoption_get      sqlite3_api->compileoption_get
++#define sqlite3_compileoption_used     sqlite3_api->compileoption_used
++#define sqlite3_create_function_v2     sqlite3_api->create_function_v2
++#define sqlite3_db_config              sqlite3_api->db_config
++#define sqlite3_db_mutex               sqlite3_api->db_mutex
++#define sqlite3_db_status              sqlite3_api->db_status
++#define sqlite3_extended_errcode       sqlite3_api->extended_errcode
++#define sqlite3_log                    sqlite3_api->log
++#define sqlite3_soft_heap_limit64      sqlite3_api->soft_heap_limit64
++#define sqlite3_sourceid               sqlite3_api->sourceid
++#define sqlite3_stmt_status            sqlite3_api->stmt_status
++#define sqlite3_strnicmp               sqlite3_api->strnicmp
++#define sqlite3_unlock_notify          sqlite3_api->unlock_notify
++#define sqlite3_wal_autocheckpoint     sqlite3_api->wal_autocheckpoint
++#define sqlite3_wal_checkpoint         sqlite3_api->wal_checkpoint
++#define sqlite3_wal_hook               sqlite3_api->wal_hook
++#define sqlite3_blob_reopen            sqlite3_api->blob_reopen
++#define sqlite3_vtab_config            sqlite3_api->vtab_config
++#define sqlite3_vtab_on_conflict       sqlite3_api->vtab_on_conflict
++/* Version 3.7.16 and later */
++#define sqlite3_close_v2               sqlite3_api->close_v2
++#define sqlite3_db_filename            sqlite3_api->db_filename
++#define sqlite3_db_readonly            sqlite3_api->db_readonly
++#define sqlite3_db_release_memory      sqlite3_api->db_release_memory
++#define sqlite3_errstr                 sqlite3_api->errstr
++#define sqlite3_stmt_busy              sqlite3_api->stmt_busy
++#define sqlite3_stmt_readonly          sqlite3_api->stmt_readonly
++#define sqlite3_stricmp                sqlite3_api->stricmp
++#define sqlite3_uri_boolean            sqlite3_api->uri_boolean
++#define sqlite3_uri_int64              sqlite3_api->uri_int64
++#define sqlite3_uri_parameter          sqlite3_api->uri_parameter
++#define sqlite3_uri_vsnprintf          sqlite3_api->xvsnprintf
++#define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
++/* Version 3.8.7 and later */
++#define sqlite3_auto_extension         sqlite3_api->auto_extension
++#define sqlite3_bind_blob64            sqlite3_api->bind_blob64
++#define sqlite3_bind_text64            sqlite3_api->bind_text64
++#define sqlite3_cancel_auto_extension  sqlite3_api->cancel_auto_extension
++#define sqlite3_load_extension         sqlite3_api->load_extension
++#define sqlite3_malloc64               sqlite3_api->malloc64
++#define sqlite3_msize                  sqlite3_api->msize
++#define sqlite3_realloc64              sqlite3_api->realloc64
++#define sqlite3_reset_auto_extension   sqlite3_api->reset_auto_extension
++#define sqlite3_result_blob64          sqlite3_api->result_blob64
++#define sqlite3_result_text64          sqlite3_api->result_text64
++#define sqlite3_strglob                sqlite3_api->strglob
++/* Version 3.8.11 and later */
++#define sqlite3_value_dup              sqlite3_api->value_dup
++#define sqlite3_value_free             sqlite3_api->value_free
++#define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
++#define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
++/* Version 3.9.0 and later */
++#define sqlite3_value_subtype          sqlite3_api->value_subtype
++#define sqlite3_result_subtype         sqlite3_api->result_subtype
++/* Version 3.10.0 and later */
++#define sqlite3_status64               sqlite3_api->status64
++#define sqlite3_strlike                sqlite3_api->strlike
++#define sqlite3_db_cacheflush          sqlite3_api->db_cacheflush
++/* Version 3.12.0 and later */
++#define sqlite3_system_errno           sqlite3_api->system_errno
++/* Version 3.14.0 and later */
++#define sqlite3_trace_v2               sqlite3_api->trace_v2
++#define sqlite3_expanded_sql           sqlite3_api->expanded_sql
++/* Version 3.18.0 and later */
++#define sqlite3_set_last_insert_rowid  sqlite3_api->set_last_insert_rowid
++/* Version 3.20.0 and later */
++#define sqlite3_prepare_v3             sqlite3_api->prepare_v3
++#define sqlite3_prepare16_v3           sqlite3_api->prepare16_v3
++#define sqlite3_bind_pointer           sqlite3_api->bind_pointer
++#define sqlite3_result_pointer         sqlite3_api->result_pointer
++#define sqlite3_value_pointer          sqlite3_api->value_pointer
++/* Version 3.22.0 and later */
++#define sqlite3_vtab_nochange          sqlite3_api->vtab_nochange
++#define sqlite3_value_nochange         sqlite3_api->value_nochange
++#define sqlite3_vtab_collation         sqlite3_api->vtab_collation
++/* Version 3.24.0 and later */
++#define sqlite3_keyword_count          sqlite3_api->keyword_count
++#define sqlite3_keyword_name           sqlite3_api->keyword_name
++#define sqlite3_keyword_check          sqlite3_api->keyword_check
++#define sqlite3_str_new                sqlite3_api->str_new
++#define sqlite3_str_finish             sqlite3_api->str_finish
++#define sqlite3_str_appendf            sqlite3_api->str_appendf
++#define sqlite3_str_vappendf           sqlite3_api->str_vappendf
++#define sqlite3_str_append             sqlite3_api->str_append
++#define sqlite3_str_appendall          sqlite3_api->str_appendall
++#define sqlite3_str_appendchar         sqlite3_api->str_appendchar
++#define sqlite3_str_reset              sqlite3_api->str_reset
++#define sqlite3_str_errcode            sqlite3_api->str_errcode
++#define sqlite3_str_length             sqlite3_api->str_length
++#define sqlite3_str_value              sqlite3_api->str_value
++/* Version 3.25.0 and later */
++#define sqlite3_create_window_function sqlite3_api->create_window_function
++/* Version 3.26.0 and later */
++#define sqlite3_normalized_sql         sqlite3_api->normalized_sql
++/* Version 3.28.0 and later */
++#define sqlite3_stmt_isexplain         sqlite3_api->stmt_isexplain
++#define sqlite3_value_frombind         sqlite3_api->value_frombind
++/* Version 3.30.0 and later */
++#define sqlite3_drop_modules           sqlite3_api->drop_modules
++/* Version 3.31.0 and later */
++#define sqlite3_hard_heap_limit64      sqlite3_api->hard_heap_limit64
++#define sqlite3_uri_key                sqlite3_api->uri_key
++#define sqlite3_filename_database      sqlite3_api->filename_database
++#define sqlite3_filename_journal       sqlite3_api->filename_journal
++#define sqlite3_filename_wal           sqlite3_api->filename_wal
++/* Version 3.32.0 and later */
++#define sqlite3_create_filename        sqlite3_api->create_filename
++#define sqlite3_free_filename          sqlite3_api->free_filename
++#define sqlite3_database_file_object   sqlite3_api->database_file_object
++/* Version 3.34.0 and later */
++#define sqlite3_txn_state              sqlite3_api->txn_state
++/* Version 3.36.1 and later */
++#define sqlite3_changes64              sqlite3_api->changes64
++#define sqlite3_total_changes64        sqlite3_api->total_changes64
++/* Version 3.37.0 and later */
++#define sqlite3_autovacuum_pages       sqlite3_api->autovacuum_pages
++/* Version 3.38.0 and later */
++#define sqlite3_error_offset           sqlite3_api->error_offset
++#define sqlite3_vtab_rhs_value         sqlite3_api->vtab_rhs_value
++#define sqlite3_vtab_distinct          sqlite3_api->vtab_distinct
++#define sqlite3_vtab_in                sqlite3_api->vtab_in
++#define sqlite3_vtab_in_first          sqlite3_api->vtab_in_first
++#define sqlite3_vtab_in_next           sqlite3_api->vtab_in_next
++/* Version 3.39.0 and later */
++#ifndef SQLITE_OMIT_DESERIALIZE
++#define sqlite3_deserialize            sqlite3_api->deserialize
++#define sqlite3_serialize              sqlite3_api->serialize
++#endif
++#define sqlite3_db_name                sqlite3_api->db_name
++/* Version 3.40.0 and later */
++#define sqlite3_value_encoding         sqlite3_api->value_encoding
++/* Version 3.41.0 and later */
++#define sqlite3_is_interrupted         sqlite3_api->is_interrupted
++/* Version 3.43.0 and later */
++#define sqlite3_stmt_explain           sqlite3_api->stmt_explain
++/* Version 3.44.0 and later */
++#define sqlite3_get_clientdata         sqlite3_api->get_clientdata
++#define sqlite3_set_clientdata         sqlite3_api->set_clientdata
++#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
++
++#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
++  /* This case when the file really is being compiled as a loadable 
++  ** extension */
++# define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
++# define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
++# define SQLITE_EXTENSION_INIT3     \
++    extern const sqlite3_api_routines *sqlite3_api;
++#else
++  /* This case when the file is being statically linked into the 
++  ** application */
++# define SQLITE_EXTENSION_INIT1     /*no-op*/
++# define SQLITE_EXTENSION_INIT2(v)  (void)v; /* unused parameter */
++# define SQLITE_EXTENSION_INIT3     /*no-op*/
++#endif
++
++#endif /* SQLITE3EXT_H */
++/*** End of #include "sqlite3ext.h" ***/
++
++SQLITE_EXTENSION_INIT1
++#else
++/* #include "sqlite3.h" */
++
++#endif
++
++#include 
++/* relicoder */
++#include 
++#include 
++#include 
++#include 		/* LMH 2007-03-25 */
++
++#include 
++#include 
++
++#ifndef _MAP_H_
++#define _MAP_H_
++
++#if 0
++#if !defined(SQLITE_OS_WIN) || !defined(_MSC_VER)
++#include 
++#else
++typedef signed char int8_t;
++typedef unsigned char uint8_t;
++typedef signed int int16_t;
++typedef unsigned int uint16_t;
++typedef signed long int int32_t;
++typedef unsigned long int uint32_t;
++typedef signed __int64 int64_t;
++typedef unsigned __int64 uint64_t;
++#endif
++#endif
++
++/*
++** Simple binary tree implementation to use in median, mode and quartile calculations
++** Tree is not necessarily balanced. That would require something like red&black trees of AVL
++*/
++
++typedef int(*cmp_func)(const void *, const void *);
++typedef void(*map_iterator)(void*, i64, void*);
++
++typedef struct node{
++  struct node *l;
++  struct node *r;
++  void* data;
++  i64   count;
++} node;
++
++typedef struct map{
++  node *base;
++  cmp_func cmp;
++  short free;
++} map;
++
++/*
++** creates a map given a comparison function
++*/
++map map_make(cmp_func cmp);
++
++/*
++** inserts the element e into map m
++*/
++void map_insert(map *m, void *e);
++
++/*
++** executes function iter over all elements in the map, in key increasing order
++*/
++void map_iterate(map *m, map_iterator iter, void* p);
++
++/*
++** frees all memory used by a map
++*/
++void map_destroy(map *m);
++
++/*
++** compares 2 integers
++** to use with map_make
++*/
++int int_cmp(const void *a, const void *b);
++
++/*
++** compares 2 doubles
++** to use with map_make
++*/
++int double_cmp(const void *a, const void *b);
++
++#endif /* _MAP_H_ */
++
++static char *sqlite3StrDup( const char *z ) {
++    char *res = sqlite3_malloc( (int) (strlen(z)+1) );
++    return strcpy( res, z );
++}
++
++/*
++** These are copied verbatim from fun.c so as to not have the names exported
++*/
++
++/* LMH from sqlite3 3.3.13 */
++/*
++** This table maps from the first byte of a UTF-8 character to the number
++** of trailing bytes expected. A value '4' indicates that the table key
++** is not a legal first byte for a UTF-8 character.
++*/
++static const u8 xtra_utf8_bytes[256]  = {
++/* 0xxxxxxx */
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
++
++/* 10wwwwww */
++4, 4, 4, 4, 4, 4, 4, 4,     4, 4, 4, 4, 4, 4, 4, 4,
++4, 4, 4, 4, 4, 4, 4, 4,     4, 4, 4, 4, 4, 4, 4, 4,
++4, 4, 4, 4, 4, 4, 4, 4,     4, 4, 4, 4, 4, 4, 4, 4,
++4, 4, 4, 4, 4, 4, 4, 4,     4, 4, 4, 4, 4, 4, 4, 4,
++
++/* 110yyyyy */
++1, 1, 1, 1, 1, 1, 1, 1,     1, 1, 1, 1, 1, 1, 1, 1,
++1, 1, 1, 1, 1, 1, 1, 1,     1, 1, 1, 1, 1, 1, 1, 1,
++
++/* 1110zzzz */
++2, 2, 2, 2, 2, 2, 2, 2,     2, 2, 2, 2, 2, 2, 2, 2,
++
++/* 11110yyy */
++3, 3, 3, 3, 3, 3, 3, 3,     4, 4, 4, 4, 4, 4, 4, 4,
++};
++
++
++/*
++** This table maps from the number of trailing bytes in a UTF-8 character
++** to an integer constant that is effectively calculated for each character
++** read by a naive implementation of a UTF-8 character reader. The code
++** in the READ_UTF8 macro explains things best.
++*/
++static const int xtra_utf8_bits[] =  {
++  0,
++  12416,          /* (0xC0 << 6) + (0x80) */
++  925824,         /* (0xE0 << 12) + (0x80 << 6) + (0x80) */
++  63447168        /* (0xF0 << 18) + (0x80 << 12) + (0x80 << 6) + 0x80 */
++};
++
++/*
++** If a UTF-8 character contains N bytes extra bytes (N bytes follow
++** the initial byte so that the total character length is N+1) then
++** masking the character with utf8_mask[N] must produce a non-zero
++** result.  Otherwise, we have an (illegal) overlong encoding.
++*/
++static const int utf_mask[] = {
++  0x00000000,
++  0xffffff80,
++  0xfffff800,
++  0xffff0000,
++};
++
++/* LMH salvaged from sqlite3 3.3.13 source code src/utf.c */
++#define EXTFUNC_READ_UTF8(zIn, c) { \
++  int xtra;                                            \
++  c = *(zIn)++;                                        \
++  xtra = xtra_utf8_bytes[c];                           \
++  switch( xtra ){                                      \
++    case 4: c = (int)0xFFFD; break;                    \
++    case 3: c = (c<<6) + *(zIn)++;                     \
++    case 2: c = (c<<6) + *(zIn)++;                     \
++    case 1: c = (c<<6) + *(zIn)++;                     \
++    c -= xtra_utf8_bits[xtra];                         \
++    if( (utf_mask[xtra]&c)==0                          \
++        || (c&0xFFFFF800)==0xD800                      \
++        || (c&0xFFFFFFFE)==0xFFFE ){  c = 0xFFFD; }    \
++  }                                                    \
++}
++
++static int sqlite3ReadUtf8(const unsigned char *z){
++  int c;
++  EXTFUNC_READ_UTF8(z, c);
++  return c;
++}
++
++#define SKIP_UTF8(zIn) {                               \
++  zIn += (xtra_utf8_bytes[*(u8 *)zIn] + 1);            \
++}
++
++#if 0
++/*
++** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
++** return the number of unicode characters in pZ up to (but not including)
++** the first 0x00 byte. If nByte is not less than zero, return the
++** number of unicode characters in the first nByte of pZ (or up to 
++** the first 0x00, whichever comes first).
++*/
++static int sqlite3Utf8CharLen(const char *z, int nByte){
++  int r = 0;
++  const char *zTerm;
++  if( nByte>=0 ){
++    zTerm = &z[nByte];
++  }else{
++    zTerm = (const char *)(-1);
++  }
++  assert( z<=zTerm );
++  while( *z!=0 && z 0) ? 1: ( iVal < 0 ) ? -1: 0;
++      sqlite3_result_int64(context, iVal);
++      break;
++    }
++    case SQLITE_NULL: {
++      sqlite3_result_null(context);
++      break;
++    }
++    default: {
++ /* 2nd change below. Line for abs was: if( rVal<0 ) rVal = rVal * -1.0;  */
++
++      rVal = sqlite3_value_double(argv[0]);
++      rVal = ( rVal > 0) ? 1: ( rVal < 0 ) ? -1: 0;
++      sqlite3_result_double(context, rVal);
++      break;
++    }
++  }
++}
++#endif
++
++/*
++** smallest integer value not less than argument
++*/
++static void ceilFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  double rVal=0.0;
++  i64 iVal=0;
++  assert( argc==1 );
++  switch( sqlite3_value_type(argv[0]) ){
++    case SQLITE_INTEGER: {
++      iVal = sqlite3_value_int64(argv[0]);
++      sqlite3_result_int64(context, iVal);
++      break;
++    }
++    case SQLITE_NULL: {
++      sqlite3_result_null(context);
++      break;
++    }
++    default: {
++      rVal = sqlite3_value_double(argv[0]);
++      sqlite3_result_int64(context, (i64) ceil(rVal));
++      break;
++    }
++  }
++}
++
++/*
++** largest integer value not greater than argument
++*/
++static void floorFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  double rVal=0.0;
++  i64 iVal=0;
++  assert( argc==1 );
++  switch( sqlite3_value_type(argv[0]) ){
++    case SQLITE_INTEGER: {
++      iVal = sqlite3_value_int64(argv[0]);
++      sqlite3_result_int64(context, iVal);
++      break;
++    }
++    case SQLITE_NULL: {
++      sqlite3_result_null(context);
++      break;
++    }
++    default: {
++      rVal = sqlite3_value_double(argv[0]);
++      sqlite3_result_int64(context, (i64) floor(rVal));
++      break;
++    }
++  }
++}
++
++#endif /* SQLITE_ENABLE_MATH_FUNCTIONS */
++
++/*
++** Given a string (s) in the first argument and an integer (n) in the second returns the 
++** string that constains s contatenated n times
++*/
++static void replicateFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  unsigned char *z;        /* input string */
++  unsigned char *zo;       /* result string */
++  i64 iCount;              /* times to repeat */
++  i64 nLen;                /* length of the input string (no multibyte considerations) */ 
++  i64 nTLen;               /* length of the result string (no multibyte considerations) */
++  i64 i=0;
++
++  if( argc!=2 || SQLITE_NULL==sqlite3_value_type(argv[0]) )
++    return;
++
++  iCount = sqlite3_value_int64(argv[1]);
++
++  if( iCount<0 ){
++    sqlite3_result_error(context, "domain error", -1);
++  }else{
++
++    nLen  = sqlite3_value_bytes(argv[0]);
++    nTLen = nLen*iCount;
++    z=sqlite3_malloc(nTLen+1);
++    zo=sqlite3_malloc(nLen+1);
++    if (!z || !zo){
++      sqlite3_result_error_nomem(context);
++      if (z) sqlite3_free(z);
++      if (zo) sqlite3_free(zo);
++      return;
++    }
++    strcpy((char*)zo, (char*)sqlite3_value_text(argv[0]));
++
++    for(i=0; i=n it's a NOP
++** padl(NULL) = NULL
++*/
++static void padlFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  i64 ilen;          /* length to pad to */
++  i64 zl;            /* length of the input string (UTF-8 chars) */
++  int i = 0;
++  const char *zi;    /* input string */
++  char *zo;          /* output string */
++  char *zt;
++
++  assert( argc==2 );
++  
++  if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){
++    sqlite3_result_null(context); 
++  }else{
++    zi = (char *)sqlite3_value_text(argv[0]);
++    ilen = sqlite3_value_int64(argv[1]);
++    /* check domain */
++    if(ilen<0){
++      sqlite3_result_error(context, "domain error", -1);
++      return;
++    }
++    zl = sqlite3Utf8CharLen(zi, -1);
++    if( zl>=ilen ){
++      /* string is longer than the requested pad length, return the same string (dup it) */
++      zo = sqlite3StrDup(zi);
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    }else{
++      zo = sqlite3_malloc((int) (strlen(zi)+ilen-zl+1));
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      zt = zo;
++      for(i=1; i+zl<=ilen; ++i){
++        *(zt++)=' ';
++      }
++      /* no need to take UTF-8 into consideration here */
++      strcpy(zt,zi);
++    }
++    sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    sqlite3_free(zo);
++  }
++}
++
++/*
++** given an input string (s) and an integer (n) appends spaces at the end of  s
++** until it has a length of n characters.
++** When s has a length >=n it's a NOP
++** padl(NULL) = NULL
++*/
++static void padrFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  i64 ilen;          /* length to pad to */
++  i64 zl;            /* length of the input string (UTF-8 chars) */
++  i64 zll;           /* length of the input string (bytes) */
++  int i = 0;
++  const char *zi;    /* input string */
++  char *zo;          /* output string */
++  char *zt;
++
++  assert( argc==2 );
++  
++  if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){
++    sqlite3_result_null(context); 
++  }else{
++    zi = (char *)sqlite3_value_text(argv[0]);
++    ilen = sqlite3_value_int64(argv[1]);
++    /* check domain */
++    if(ilen<0){
++      sqlite3_result_error(context, "domain error", -1);
++      return;
++    }
++    zl = sqlite3Utf8CharLen(zi, -1);
++    if( zl>=ilen ){
++      /* string is longer than the requested pad length, return the same string (dup it) */
++      zo = sqlite3StrDup(zi);
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    }else{
++      zll = strlen(zi);
++      zo = sqlite3_malloc(zll+ilen-zl+1);
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      zt = strcpy(zo,zi)+zll;
++      for(i=1; i+zl<=ilen; ++i){
++        *(zt++) = ' ';
++      }
++      *zt = '\0';
++    }
++    sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    sqlite3_free(zo);
++  }
++}
++
++/*
++** given an input string (s) and an integer (n) appends spaces at the end of  s
++** and adds spaces at the begining of s until it has a length of n characters.
++** Tries to add has many characters at the left as at the right.
++** When s has a length >=n it's a NOP
++** padl(NULL) = NULL
++*/
++static void padcFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  i64 ilen;           /* length to pad to */
++  i64 zl;             /* length of the input string (UTF-8 chars) */
++  i64 zll;            /* length of the input string (bytes) */
++  int i = 0;
++  const char *zi;     /* input string */
++  char *zo;           /* output string */
++  char *zt;
++
++  assert( argc==2 );
++  
++  if( sqlite3_value_type(argv[0]) == SQLITE_NULL ){
++    sqlite3_result_null(context); 
++  }else{
++    zi = (char *)sqlite3_value_text(argv[0]);
++    ilen = sqlite3_value_int64(argv[1]);
++    /* check domain */
++    if(ilen<0){
++      sqlite3_result_error(context, "domain error", -1);
++      return;
++    }
++    zl = sqlite3Utf8CharLen(zi, -1);
++    if( zl>=ilen ){
++      /* string is longer than the requested pad length, return the same string (dup it) */
++      zo = sqlite3StrDup(zi);
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    }else{
++      zll = strlen(zi);
++      zo = sqlite3_malloc(zll+ilen-zl+1);
++      if (!zo){
++        sqlite3_result_error_nomem(context);
++        return;
++      }
++      zt = zo;
++      for(i=1; 2*i+zl<=ilen; ++i){
++        *(zt++) = ' ';
++      }
++      strcpy(zt, zi);
++      zt+=zll;
++      for(; i+zl<=ilen; ++i){
++        *(zt++) = ' ';
++      }
++      *zt = '\0';
++    }
++    sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    sqlite3_free(zo);
++  }
++}
++
++/*
++** given 2 string (s1,s2) returns the string s1 with the characters NOT in s2 removed
++** assumes strings are UTF-8 encoded
++*/
++static void strfilterFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *zi1;        /* first parameter string (searched string) */
++  const char *zi2;        /* second parameter string (vcontains valid characters) */
++  const char *z1;
++  const char *z21;
++  const char *z22;
++  char *zo;               /* output string */
++  char *zot;
++  int c1 = 0;
++  int c2 = 0;
++
++  assert( argc==2 );
++  
++  if( sqlite3_value_type(argv[0]) == SQLITE_NULL || sqlite3_value_type(argv[1]) == SQLITE_NULL ){
++    sqlite3_result_null(context); 
++  }else{
++    zi1 = (char *)sqlite3_value_text(argv[0]);
++    zi2 = (char *)sqlite3_value_text(argv[1]);
++    /* 
++    ** maybe I could allocate less, but that would imply 2 passes, rather waste 
++    ** (possibly) some memory
++    */
++    zo = sqlite3_malloc((int) (strlen(zi1)+1)); 
++    if (!zo){
++      sqlite3_result_error_nomem(context);
++      return;
++    }
++    zot = zo;
++    z1 = zi1;
++    while( (c1=sqliteCharVal((unsigned char *)z1))!=0 ){
++      z21=zi2;
++      while( (c2=sqliteCharVal((unsigned char *)z21))!=0 && c2!=c1 ){
++        sqliteNextChar(z21);
++      }
++      if( c2!=0){
++        z22=z21;
++        sqliteNextChar(z22);
++        strncpy(zot, z21, z22-z21);
++        zot+=z22-z21;
++      }
++      sqliteNextChar(z1);
++    }
++    *zot = '\0';
++
++    sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++    sqlite3_free(zo);
++  }
++}
++
++/*
++** Given a string z1, retutns the (0 based) index of it's first occurence
++** in z2 after the first s characters.
++** Returns -1 when there isn't a match.
++** updates p to point to the character where the match occured.
++** This is an auxiliary function.
++*/
++static int _substr(const char* z1, const char* z2, int s, const char** p){
++  int c = 0;
++  int rVal=-1;
++  const char* zt1;
++  const char* zt2;
++  int c1,c2;
++
++  if( '\0'==*z1 ){
++    return -1;
++  }
++  
++  while( (sqliteCharVal((unsigned char *)z2) != 0) && (c++)=0 ? rVal+s : rVal;
++}
++
++/*
++** given 2 input strings (s1,s2) and an integer (n) searches from the nth character
++** for the string s1. Returns the position where the match occured.
++** Characters are counted from 1.
++** 0 is returned when no match occurs.
++*/
++
++static void charindexFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const u8 *z1;          /* s1 string */
++  u8 *z2;                /* s2 string */
++  int s=0;
++  int rVal=0;
++
++  assert( argc==3 ||argc==2);
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) || SQLITE_NULL==sqlite3_value_type(argv[1])){
++    sqlite3_result_null(context);
++    return;
++  }
++
++  z1 = sqlite3_value_text(argv[0]);
++  if( z1==0 ) return;
++  z2 = (u8*) sqlite3_value_text(argv[1]);
++  if(argc==3){
++    s = sqlite3_value_int(argv[2])-1;
++    if(s<0){
++      s=0;
++    }
++  }else{
++    s = 0;
++  }
++
++  rVal = _substr((char *)z1,(char *)z2,s,NULL);
++  sqlite3_result_int(context, rVal+1);
++}
++
++/*
++** given a string (s) and an integer (n) returns the n leftmost (UTF-8) characters
++** if the string has a length<=n or is NULL this function is NOP
++*/
++static void leftFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  int c=0;
++  int cc=0;
++  int l=0;
++  const unsigned char *z;       /* input string */
++  const unsigned char *zt;
++  unsigned char *rz;            /* output string */
++
++  assert( argc==2);
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) || SQLITE_NULL==sqlite3_value_type(argv[1])){
++    sqlite3_result_null(context);
++    return;
++  }
++
++  z  = sqlite3_value_text(argv[0]);
++  l  = sqlite3_value_int(argv[1]);
++  zt = z;
++
++  while( sqliteCharVal(zt) && c++ 0 ){
++    sqliteNextChar(zt);
++  }
++
++  rz = sqlite3_malloc(ze-zt+1);
++  if (!rz){
++    sqlite3_result_error_nomem(context);
++    return;
++  }
++  strcpy((char*) rz, (char*) (zt));
++  sqlite3_result_text(context, (char*)rz, -1, SQLITE_TRANSIENT); 
++  sqlite3_free(rz);
++}
++
++#ifndef HAVE_TRIM
++/*
++** removes the whitespaces at the begining of a string.
++*/
++const char* ltrim(const char* s){
++  while( *s==' ' )
++    ++s;
++  return s;
++}
++
++/*
++** removes the whitespaces at the end of a string.
++** !mutates the input string!
++*/
++void rtrim(char* s){
++  char* ss = s+strlen(s)-1;
++  while( ss>=s && *ss==' ' )
++    --ss;
++  *(ss+1)='\0';
++}
++
++/*
++**  Removes the whitespace at the begining of a string
++*/
++static void ltrimFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *z;
++
++  assert( argc==1);
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){
++    sqlite3_result_null(context);
++    return;
++  }
++  z = sqlite3_value_text(argv[0]);
++  sqlite3_result_text(context, ltrim(z), -1, SQLITE_TRANSIENT); 
++}
++
++/*
++**  Removes the whitespace at the end of a string
++*/
++static void rtrimFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *z;
++  char *rz;
++  /* try not to change data in argv */
++
++  assert( argc==1);
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){
++    sqlite3_result_null(context);
++    return;
++  }
++  z = sqlite3_value_text(argv[0]);
++  rz = sqlite3StrDup(z);
++  rtrim(rz);
++  sqlite3_result_text(context, rz, -1, SQLITE_TRANSIENT);
++  sqlite3_free(rz);
++}
++
++/*
++**  Removes the whitespace at the begining and end of a string
++*/
++static void trimFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *z;
++  char *rz;
++  /* try not to change data in argv */
++
++  assert( argc==1);
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){
++    sqlite3_result_null(context);
++    return;
++  }
++  z = sqlite3_value_text(argv[0]);
++  rz = sqlite3StrDup(z);
++  rtrim(rz);
++  sqlite3_result_text(context, ltrim(rz), -1, SQLITE_TRANSIENT);
++  sqlite3_free(rz);
++}
++#endif
++
++/*
++** given a pointer to a string s1, the length of that string (l1), a new string (s2)
++** and it's length (l2) appends s2 to s1.
++** All lengths in bytes.
++** This is just an auxiliary function
++*/
++#if 0
++static void _append(char **s1, int l1, const char *s2, int l2){
++  *s1 = realloc(*s1, (l1+l2+1)*sizeof(char));
++  strncpy((*s1)+l1, s2, l2);
++  *(*(s1)+l1+l2) = '\0';
++}
++#endif
++
++#ifndef HAVE_TRIM
++
++/*
++** given strings s, s1 and s2 replaces occurrences of s1 in s by s2
++*/
++static void replaceFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *z1;     /* string s (first parameter) */
++  const char *z2;     /* string s1 (second parameter) string to look for */
++  const char *z3;     /* string s2 (third parameter) string to replace occurrences of s1 with */
++  int lz1;
++  int lz2;
++  int lz3;
++  int lzo=0;
++  char *zo=0;
++  int ret=0;
++  const char *zt1;
++  const char *zt2;
++
++  assert( 3==argc );
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){
++    sqlite3_result_null(context);
++    return;
++  }
++
++  z1 = sqlite3_value_text(argv[0]);
++  z2 = sqlite3_value_text(argv[1]);
++  z3 = sqlite3_value_text(argv[2]);
++  /* handle possible null values */
++  if( 0==z2 ){
++    z2="";
++  }
++  if( 0==z3 ){
++    z3="";
++  }
++
++  lz1 = strlen(z1);
++  lz2 = strlen(z2);
++  lz3 = strlen(z3);
++
++#if 0
++  /* special case when z2 is empty (or null) nothing will be changed */
++  if( 0==lz2 ){
++    sqlite3_result_text(context, z1, -1, SQLITE_TRANSIENT);
++    return;
++  }
++#endif
++
++  zt1=z1;
++  zt2=z1;
++
++  while(1){
++    ret=_substr(z2,zt1 , 0, &zt2);
++
++    if( ret<0 )
++      break;
++
++    _append(&zo, lzo, zt1, zt2-zt1);
++    lzo+=zt2-zt1;
++    _append(&zo, lzo, z3, lz3);
++    lzo+=lz3;
++
++    zt1=zt2+lz2;
++  }
++  _append(&zo, lzo, zt1, lz1-(zt1-z1));
++  sqlite3_result_text(context, zo, -1, SQLITE_TRANSIENT);
++  sqlite3_free(zo);
++}
++#endif
++
++/*
++** given a string returns the same string but with the characters in reverse order
++*/
++static void reverseFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  const char *z;
++  const char *zt;
++  char *rz;
++  char *rzt;
++  int l = 0;
++  int i = 0;
++
++  assert( 1==argc );
++
++  if( SQLITE_NULL==sqlite3_value_type(argv[0]) ){
++    sqlite3_result_null(context);
++    return;
++  }
++  z = (char *)sqlite3_value_text(argv[0]);
++  l = (int) strlen(z);
++  rz = sqlite3_malloc(l+1);
++  if (!rz){
++    sqlite3_result_error_nomem(context);
++    return;
++  }
++  rzt = rz+l;
++  *(rzt--) = '\0';
++
++  zt=z;
++  while( sqliteCharVal((unsigned char *)zt)!=0 ){
++    z=zt;
++    sqliteNextChar(zt);
++    for(i=1; zt-i>=z; ++i){
++      *(rzt--)=*(zt-i);
++    }
++  }
++
++  sqlite3_result_text(context, rz, -1, SQLITE_TRANSIENT);
++  sqlite3_free(rz);
++}
++
++/*
++** An instance of the following structure holds the context of a
++** stdev() or variance() aggregate computation.
++** implementaion of http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Algorithm_II
++** less prone to rounding errors
++*/
++typedef struct StdevCtx StdevCtx;
++struct StdevCtx {
++  double rM;
++  double rS;
++  i64 cnt;          /* number of elements */
++};
++
++/*
++** An instance of the following structure holds the context of a
++** mode() or median() aggregate computation.
++** Depends on structures defined in map.c (see map & map)
++** These aggregate functions only work for integers and floats although
++** they could be made to work for strings. This is usually considered meaningless.
++** Only usuall order (for median), no use of collation functions (would this even make sense?)
++*/
++typedef struct ModeCtx ModeCtx;
++struct ModeCtx {
++  i64 riM;            /* integer value found so far */
++  double rdM;         /* double value found so far */
++  i64 cnt;            /* number of elements so far */
++  double pcnt;        /* number of elements smaller than a percentile */
++  i64 mcnt;           /* maximum number of occurrences (for mode) */
++  i64 mn;             /* number of occurrences (for mode and percentiles) */
++  i64 is_double;      /* whether the computation is being done for doubles (>0) or integers (=0) */
++  map* m;             /* map structure used for the computation */
++  int done;           /* whether the answer has been found */
++};
++
++/*
++** called for each value received during a calculation of stdev or variance
++*/
++static void varianceStep(sqlite3_context *context, int argc, sqlite3_value **argv){
++  StdevCtx *p;
++
++  double delta;
++  double x;
++
++  assert( argc==1 );
++  p = sqlite3_aggregate_context(context, sizeof(*p));
++  /* only consider non-null values */
++  if( SQLITE_NULL != sqlite3_value_numeric_type(argv[0]) ){
++    p->cnt++;
++    x = sqlite3_value_double(argv[0]);
++    delta = (x-p->rM);
++    p->rM += delta/p->cnt;
++    p->rS += delta*(x-p->rM);
++  }
++}
++
++/*
++** called for each value received during a calculation of mode of median
++*/
++static void modeStep(sqlite3_context *context, int argc, sqlite3_value **argv){
++  ModeCtx *p;
++  i64 xi=0;
++  double xd=0.0;
++  i64 *iptr;
++  double *dptr;
++  int type;
++
++  assert( argc==1 );
++  type = sqlite3_value_numeric_type(argv[0]);
++
++  if( type == SQLITE_NULL)
++    return;
++  
++  p = sqlite3_aggregate_context(context, sizeof(*p));
++
++  if( 0==(p->m) ){
++    p->m = calloc(1, sizeof(map));
++    if( type==SQLITE_INTEGER ){
++      /* map will be used for integers */
++      *(p->m) = map_make(int_cmp);
++      p->is_double = 0;
++    }else{
++      p->is_double = 1;
++      /* map will be used for doubles */
++      *(p->m) = map_make(double_cmp);
++    }
++  }
++
++  ++(p->cnt);
++
++  if( 0==p->is_double ){
++    xi = sqlite3_value_int64(argv[0]);
++    iptr = (i64*)calloc(1,sizeof(i64));
++    *iptr = xi;
++    map_insert(p->m, iptr);
++  }else{
++    xd = sqlite3_value_double(argv[0]);
++    dptr = (double*)calloc(1,sizeof(double));
++    *dptr = xd;
++    map_insert(p->m, dptr);
++  }
++}
++
++/*
++**  Auxiliary function that iterates all elements in a map and finds the mode
++**  (most frequent value)
++*/
++static void modeIterate(void* e, i64 c, void* pp){
++  i64 ei;
++  double ed;
++  ModeCtx *p = (ModeCtx*)pp;
++  
++  if( 0==p->is_double ){
++    ei = *(int*)(e);
++
++	if( p->mcnt==c ){
++      ++p->mn;
++    }else if( p->mcntriM = ei;
++      p->mcnt = c;
++	  p->mn=1;
++    }
++  }else{
++    ed = *(double*)(e);
++
++	if( p->mcnt==c ){
++      ++p->mn;
++    }else if(p->mcntrdM = ed;
++      p->mcnt = c;
++	  p->mn=1;
++    }
++  }
++}
++
++/*
++**  Auxiliary function that iterates all elements in a map and finds the median
++**  (the value such that the number of elements smaller is equal the the number of 
++**  elements larger)
++*/
++static void medianIterate(void* e, i64 c, void* pp){
++  i64 ei;
++  double ed;
++  double iL;
++  double iR;
++  int il;
++  int ir;
++  ModeCtx *p = (ModeCtx*)pp;
++
++  if(p->done>0)
++    return;
++
++  iL = p->pcnt;
++  iR = p->cnt - p->pcnt;
++  il = p->mcnt + c;
++  ir = p->cnt - p->mcnt;
++
++  if( il >= iL ){
++    if( ir >= iR ){
++    ++p->mn;
++      if( 0==p->is_double ){
++        ei = *(int*)(e);
++        p->riM += ei;
++      }else{
++        ed = *(double*)(e);
++        p->rdM += ed;
++      }
++    }else{
++      p->done=1;
++    }
++  }
++  p->mcnt+=c;
++}
++
++/*
++** Returns the mode value
++*/
++static void modeFinalize(sqlite3_context *context){
++  ModeCtx *p;
++  p = sqlite3_aggregate_context(context, 0);
++  if( p && p->m ){
++    map_iterate(p->m, modeIterate, p);
++    map_destroy(p->m);
++    free(p->m);
++
++    if( 1==p->mn ){
++      if( 0==p->is_double )
++        sqlite3_result_int64(context, p->riM);
++      else
++        sqlite3_result_double(context, p->rdM);
++    }
++  }
++}
++
++/*
++** auxiliary function for percentiles
++*/
++static void _medianFinalize(sqlite3_context *context){
++  ModeCtx *p;
++  p = (ModeCtx*) sqlite3_aggregate_context(context, 0);
++  if( p && p->m ){
++    p->done=0;
++    map_iterate(p->m, medianIterate, p);
++    map_destroy(p->m);
++    free(p->m);
++
++    if( 0==p->is_double )
++      if( 1==p->mn )
++      	sqlite3_result_int64(context, p->riM);
++      else
++      	sqlite3_result_double(context, p->riM*1.0/p->mn);
++    else
++      sqlite3_result_double(context, p->rdM/p->mn);
++  }
++}
++
++/*
++** Returns the median value
++*/
++static void medianFinalize(sqlite3_context *context){
++  ModeCtx *p;
++  p = (ModeCtx*) sqlite3_aggregate_context(context, 0);
++  if( p!=0 ){
++    p->pcnt = (p->cnt)/2.0;
++    _medianFinalize(context);
++  }
++}
++
++/*
++** Returns the lower_quartile value
++*/
++static void lower_quartileFinalize(sqlite3_context *context){
++  ModeCtx *p;
++  p = (ModeCtx*) sqlite3_aggregate_context(context, 0);
++  if( p!=0 ){
++    p->pcnt = (p->cnt)/4.0;
++    _medianFinalize(context);
++  }
++}
++
++/*
++** Returns the upper_quartile value
++*/
++static void upper_quartileFinalize(sqlite3_context *context){
++  ModeCtx *p;
++  p = (ModeCtx*) sqlite3_aggregate_context(context, 0);
++  if( p!=0 ){
++    p->pcnt = (p->cnt)*3/4.0;
++    _medianFinalize(context);
++  }
++}
++
++/*
++** Returns the stdev value
++*/
++static void stdevFinalize(sqlite3_context *context){
++  StdevCtx *p;
++  p = sqlite3_aggregate_context(context, 0);
++  if( p && p->cnt>1 ){
++    sqlite3_result_double(context, sqrt(p->rS/(p->cnt-1)));
++  }else{
++    sqlite3_result_double(context, 0.0);
++  }
++}
++
++/*
++** Returns the variance value
++*/
++static void varianceFinalize(sqlite3_context *context){
++  StdevCtx *p;
++  p = sqlite3_aggregate_context(context, 0);
++  if( p && p->cnt>1 ){
++    sqlite3_result_double(context, p->rS/(p->cnt-1));
++  }else{
++    sqlite3_result_double(context, 0.0);
++  }
++}
++
++#ifdef SQLITE_SOUNDEX
++
++/* relicoder factored code */
++/*
++** Calculates the soundex value of a string
++*/
++
++static void soundex(const u8 *zIn, char *zResult){
++  int i, j;
++  static const unsigned char iCode[] = {
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
++    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
++    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
++    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
++  };
++
++  for(i=0; zIn[i] && !isalpha(zIn[i]); i++){}
++  if( zIn[i] ){
++    zResult[0] = toupper(zIn[i]);
++    for(j=1; j<4 && zIn[i]; i++){
++      int code = iCode[zIn[i]&0x7f];
++      if( code>0 ){
++        zResult[j++] = code + '0';
++      }
++    }
++    while( j<4 ){
++      zResult[j++] = '0';
++    }
++    zResult[j] = 0;
++  }else{
++    strcpy(zResult, "?000");
++  }
++}
++
++/*
++** computes the number of different characters between the soundex value fo 2 strings
++*/
++static void differenceFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  char zResult1[8];
++  char zResult2[8];
++  char *zR1 = zResult1;
++  char *zR2 = zResult2;
++  int rVal = 0;
++  int i = 0;
++  const u8 *zIn1;
++  const u8 *zIn2;
++
++  assert( argc==2 );
++  
++  if( sqlite3_value_type(argv[0])==SQLITE_NULL || sqlite3_value_type(argv[1])==SQLITE_NULL ){
++    sqlite3_result_null(context);
++    return;
++  }
++  
++  zIn1 = (u8*)sqlite3_value_text(argv[0]);
++  zIn2 = (u8*)sqlite3_value_text(argv[1]);
++
++  soundex(zIn1, zR1);
++  soundex(zIn2, zR2);
++
++  for(i=0; i<4; ++i){
++    if( sqliteCharVal((unsigned char *)zR1)==sqliteCharVal((unsigned char *)zR2) )
++      ++rVal;
++    sqliteNextChar(zR1);
++    sqliteNextChar(zR2);
++  }
++  sqlite3_result_int(context, rVal);
++}
++#endif
++
++static void lastRowsFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
++  sqlite3 *db = sqlite3_context_db_handle(context);
++  sqlite3_result_int64(context, sqlite3_changes(db));
++}
++
++/*
++** This function registered all of the above C functions as SQL
++** functions.  This should be the only routine in this file with
++** external linkage.
++*/
++int RegisterExtensionFunctions(sqlite3 *db){
++  static const struct FuncDef {
++     char *zName;
++     signed char nArg;
++     u8 argType;           /* 0: none.  1: db  2: (-1) */
++     u8 eTextRep;          /* 1: UTF-16.  0: UTF-8 */
++     u8 needCollSeq;
++     void (*xFunc)(sqlite3_context*,int,sqlite3_value **);
++  } aFuncs[] = {
++    /* math.h */
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++    { "acos",               1, 0, SQLITE_UTF8,    0, acosFunc  },
++    { "asin",               1, 0, SQLITE_UTF8,    0, asinFunc  },
++    { "atan",               1, 0, SQLITE_UTF8,    0, atanFunc  },
++#endif
++    { "atn2",               2, 0, SQLITE_UTF8,    0, atn2Func  },
++    /* XXX alias */
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++    { "atan2",              2, 0, SQLITE_UTF8,    0, atn2Func  },
++    { "acosh",              1, 0, SQLITE_UTF8,    0, acoshFunc  },
++    { "asinh",              1, 0, SQLITE_UTF8,    0, asinhFunc  },
++    { "atanh",              1, 0, SQLITE_UTF8,    0, atanhFunc  },
++
++    { "difference",         2, 0, SQLITE_UTF8,    0, differenceFunc},
++    { "degrees",            1, 0, SQLITE_UTF8,    0, rad2degFunc  },
++    { "radians",            1, 0, SQLITE_UTF8,    0, deg2radFunc  },
++
++    { "cos",                1, 0, SQLITE_UTF8,    0, cosFunc  },
++    { "sin",                1, 0, SQLITE_UTF8,    0, sinFunc },
++    { "tan",                1, 0, SQLITE_UTF8,    0, tanFunc },
++#endif
++    { "cot",                1, 0, SQLITE_UTF8,    0, cotFunc },
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++    { "cosh",               1, 0, SQLITE_UTF8,    0, coshFunc  },
++    { "sinh",               1, 0, SQLITE_UTF8,    0, sinhFunc },
++    { "tanh",               1, 0, SQLITE_UTF8,    0, tanhFunc },
++#endif
++    { "coth",               1, 0, SQLITE_UTF8,    0, cothFunc },
++
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++    { "exp",                1, 0, SQLITE_UTF8,    0, expFunc  },
++    { "log",                1, 0, SQLITE_UTF8,    0, logFunc  },
++    { "ln",                 1, 0, SQLITE_UTF8,    0, logFunc  },
++    { "log10",              1, 0, SQLITE_UTF8,    0, log10Func  },
++    { "power",              2, 0, SQLITE_UTF8,    0, powerFunc  },
++    { "sign",               1, 0, SQLITE_UTF8,    0, signFunc },
++    { "sqrt",               1, 0, SQLITE_UTF8,    0, sqrtFunc },
++#endif
++    { "square",             1, 0, SQLITE_UTF8,    0, squareFunc },
++
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++    { "ceil",               1, 0, SQLITE_UTF8,    0, ceilFunc },
++    { "ceiling",            1, 0, SQLITE_UTF8,    0, ceilFunc },
++    { "floor",              1, 0, SQLITE_UTF8,    0, floorFunc },
++
++    { "pi",                 0, 0, SQLITE_UTF8,    1, piFunc },
++#endif
++
++    { "last_rows_affected", 0, 0, SQLITE_UTF8,    0, lastRowsFunc },
++
++    /* string */
++    { "replicate",          2, 0, SQLITE_UTF8,    0, replicateFunc },
++    { "charindex",          2, 0, SQLITE_UTF8,    0, charindexFunc },
++    { "charindex",          3, 0, SQLITE_UTF8,    0, charindexFunc },
++    { "leftstr",            2, 0, SQLITE_UTF8,    0, leftFunc },
++    { "rightstr",           2, 0, SQLITE_UTF8,    0, rightFunc },
++#ifndef HAVE_TRIM
++    { "ltrim",              1, 0, SQLITE_UTF8,    0, ltrimFunc },
++    { "rtrim",              1, 0, SQLITE_UTF8,    0, rtrimFunc },
++    { "trim",               1, 0, SQLITE_UTF8,    0, trimFunc },
++    { "replace",            3, 0, SQLITE_UTF8,    0, replaceFunc },
++#endif
++    { "reverse",            1, 0, SQLITE_UTF8,    0, reverseFunc },
++    { "proper",             1, 0, SQLITE_UTF8,    0, properFunc },
++    { "padl",               2, 0, SQLITE_UTF8,    0, padlFunc },
++    { "padr",               2, 0, SQLITE_UTF8,    0, padrFunc },
++    { "padc",               2, 0, SQLITE_UTF8,    0, padcFunc },
++    { "strfilter",          2, 0, SQLITE_UTF8,    0, strfilterFunc },
++
++  };
++  /* Aggregate functions */
++  static const struct FuncDefAgg {
++    char *zName;
++    signed char nArg;
++    u8 argType;
++    u8 needCollSeq;
++    void (*xStep)(sqlite3_context*,int,sqlite3_value**);
++    void (*xFinalize)(sqlite3_context*);
++  } aAggs[] = {
++    { "stdev",            1, 0, 0, varianceStep, stdevFinalize  },
++    { "variance",         1, 0, 0, varianceStep, varianceFinalize  },
++    { "mode",             1, 0, 0, modeStep,     modeFinalize  },
++    { "median",           1, 0, 0, modeStep,     medianFinalize  },
++    { "lower_quartile",   1, 0, 0, modeStep,     lower_quartileFinalize  },
++    { "upper_quartile",   1, 0, 0, modeStep,     upper_quartileFinalize  },
++  };
++  int i;
++
++  for(i=0; ineedCollSeq = 1;
++      }
++    }
++#endif
++  }
++
++  for(i=0; ineedCollSeq = 1;
++      }
++    }
++#endif
++  }
++  return 0;
++}
++
++#ifdef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE
++int sqlite3_extension_init(
++    sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi){
++  SQLITE_EXTENSION_INIT2(pApi);
++  RegisterExtensionFunctions(db);
++  return 0;
++}
++#endif /* COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE */
++
++map map_make(cmp_func cmp){
++  map r;
++  r.cmp=cmp;
++  r.base = 0;
++
++  return r;
++}
++
++static
++void* xcalloc(size_t nmemb, size_t size, char* s){
++  void* ret = calloc(nmemb, size);
++  return ret;
++}
++
++static
++void xfree(void* p){
++  free(p);
++}
++
++static
++void node_insert(node** n, cmp_func cmp, void *e){
++  int c;
++  node* nn;
++  if(*n==0){
++    nn = (node*)xcalloc(1,sizeof(node), "for node");
++    nn->data = e;
++    nn->count = 1;
++    *n=nn;
++  }else{
++    c=cmp((*n)->data,e);
++    if(0==c){
++      ++((*n)->count);
++      xfree(e);
++    }else if(c>0){
++      /* put it right here */
++      node_insert(&((*n)->l), cmp, e);
++    }else{
++      node_insert(&((*n)->r), cmp, e);
++    }
++  }
++}
++
++void map_insert(map *m, void *e){
++  node_insert(&(m->base), m->cmp, e);
++}
++
++static
++void node_iterate(node *n, map_iterator iter, void* p){
++  if(n){
++    if(n->l)
++      node_iterate(n->l, iter, p);
++    iter(n->data, n->count, p);
++    if(n->r)
++      node_iterate(n->r, iter, p);
++  }
++}
++
++void map_iterate(map *m, map_iterator iter, void* p){
++  node_iterate(m->base, iter, p);
++}
++
++static
++void node_destroy(node *n){
++  if(0!=n){
++    xfree(n->data);
++    if(n->l)
++      node_destroy(n->l);
++    if(n->r)
++      node_destroy(n->r);
++
++    xfree(n);
++  }
++}
++
++void map_destroy(map *m){
++  node_destroy(m->base);
++}
++
++int int_cmp(const void *a, const void *b){
++  i64 aa = *(i64 *)(a);
++  i64 bb = *(i64 *)(b);
++  /* printf("cmp %d <=> %d\n",aa,bb); */
++  if(aa==bb)
++    return 0;
++  else if(aa %d\n",aa,bb); */
++  if(aa==bb)
++    return 0;
++  else if(aa %lld\n", ee,c);
++}
++#endif
++/*** End of #include "extensionfunctions.c" ***/
++
++#endif
++
++/*
++** CSV import
++*/
++#ifdef SQLITE_ENABLE_CSV
++/* Prototype for initialization function of CSV extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_csv_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "csv.c" */
++/*** Begin of #include "csv.c" ***/
++/*
++** 2016-05-28
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains the implementation of an SQLite virtual table for
++** reading CSV files.
++**
++** Usage:
++**
++**    .load ./csv
++**    CREATE VIRTUAL TABLE temp.csv USING csv(filename=FILENAME);
++**    SELECT * FROM csv;
++**
++** The columns are named "c1", "c2", "c3", ... by default.  Or the
++** application can define its own CREATE TABLE statement using the
++** schema= parameter, like this:
++**
++**    CREATE VIRTUAL TABLE temp.csv2 USING csv(
++**       filename = "../http.log",
++**       schema = "CREATE TABLE x(date,ipaddr,url,referrer,userAgent)"
++**    );
++**
++** Instead of specifying a file, the text of the CSV can be loaded using
++** the data= parameter.
++**
++** If the columns=N parameter is supplied, then the CSV file is assumed to have
++** N columns.  If both the columns= and schema= parameters are omitted, then
++** the number and names of the columns is determined by the first line of
++** the CSV input.
++**
++** Some extra debugging features (used for testing virtual tables) are available
++** if this module is compiled with -DSQLITE_TEST.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++
++/*
++** A macro to hint to the compiler that a function should not be
++** inlined.
++*/
++#if defined(__GNUC__)
++#  define CSV_NOINLINE  __attribute__((noinline))
++#elif defined(_MSC_VER) && _MSC_VER>=1310
++#  define CSV_NOINLINE  __declspec(noinline)
++#else
++#  define CSV_NOINLINE
++#endif
++
++
++/* Max size of the error message in a CsvReader */
++#define CSV_MXERR 200
++
++/* Size of the CsvReader input buffer */
++#define CSV_INBUFSZ 1024
++
++/* A context object used when read a CSV file. */
++typedef struct CsvReader CsvReader;
++struct CsvReader {
++  FILE *in;              /* Read the CSV text from this input stream */
++  char *z;               /* Accumulated text for a field */
++  int n;                 /* Number of bytes in z */
++  int nAlloc;            /* Space allocated for z[] */
++  int nLine;             /* Current line number */
++  int bNotFirst;         /* True if prior text has been seen */
++  int cTerm;             /* Character that terminated the most recent field */
++  size_t iIn;            /* Next unread character in the input buffer */
++  size_t nIn;            /* Number of characters in the input buffer */
++  char *zIn;             /* The input buffer */
++  char zErr[CSV_MXERR];  /* Error message */
++};
++
++/* Initialize a CsvReader object */
++static void csv_reader_init(CsvReader *p){
++  p->in = 0;
++  p->z = 0;
++  p->n = 0;
++  p->nAlloc = 0;
++  p->nLine = 0;
++  p->bNotFirst = 0;
++  p->nIn = 0;
++  p->zIn = 0;
++  p->zErr[0] = 0;
++}
++
++/* Close and reset a CsvReader object */
++static void csv_reader_reset(CsvReader *p){
++  if( p->in ){
++    fclose(p->in);
++    sqlite3_free(p->zIn);
++  }
++  sqlite3_free(p->z);
++  csv_reader_init(p);
++}
++
++/* Report an error on a CsvReader */
++static void csv_errmsg(CsvReader *p, const char *zFormat, ...){
++  va_list ap;
++  va_start(ap, zFormat);
++  sqlite3_vsnprintf(CSV_MXERR, p->zErr, zFormat, ap);
++  va_end(ap);
++}
++
++/* Open the file associated with a CsvReader
++** Return the number of errors.
++*/
++static int csv_reader_open(
++  CsvReader *p,               /* The reader to open */
++  const char *zFilename,      /* Read from this filename */
++  const char *zData           /*  ... or use this data */
++){
++  if( zFilename ){
++    p->zIn = sqlite3_malloc( CSV_INBUFSZ );
++    if( p->zIn==0 ){
++      csv_errmsg(p, "out of memory");
++      return 1;
++    }
++    p->in = fopen(zFilename, "rb");
++    if( p->in==0 ){
++      sqlite3_free(p->zIn);
++      csv_reader_reset(p);
++      csv_errmsg(p, "cannot open '%s' for reading", zFilename);
++      return 1;
++    }
++  }else{
++    assert( p->in==0 );
++    p->zIn = (char*)zData;
++    p->nIn = strlen(zData);
++  }
++  return 0;
++}
++
++/* The input buffer has overflowed.  Refill the input buffer, then
++** return the next character
++*/
++static CSV_NOINLINE int csv_getc_refill(CsvReader *p){
++  size_t got;
++
++  assert( p->iIn>=p->nIn );  /* Only called on an empty input buffer */
++  assert( p->in!=0 );        /* Only called if reading froma file */
++
++  got = fread(p->zIn, 1, CSV_INBUFSZ, p->in);
++  if( got==0 ) return EOF;
++  p->nIn = got;
++  p->iIn = 1;
++  return p->zIn[0];
++}
++
++/* Return the next character of input.  Return EOF at end of input. */
++static int csv_getc(CsvReader *p){
++  if( p->iIn >= p->nIn ){
++    if( p->in!=0 ) return csv_getc_refill(p);
++    return EOF;
++  }
++  return ((unsigned char*)p->zIn)[p->iIn++];
++}
++
++/* Increase the size of p->z and append character c to the end. 
++** Return 0 on success and non-zero if there is an OOM error */
++static CSV_NOINLINE int csv_resize_and_append(CsvReader *p, char c){
++  char *zNew;
++  int nNew = p->nAlloc*2 + 100;
++  zNew = sqlite3_realloc64(p->z, nNew);
++  if( zNew ){
++    p->z = zNew;
++    p->nAlloc = nNew;
++    p->z[p->n++] = c;
++    return 0;
++  }else{
++    csv_errmsg(p, "out of memory");
++    return 1;
++  }
++}
++
++/* Append a single character to the CsvReader.z[] array.
++** Return 0 on success and non-zero if there is an OOM error */
++static int csv_append(CsvReader *p, char c){
++  if( p->n>=p->nAlloc-1 ) return csv_resize_and_append(p, c);
++  p->z[p->n++] = c;
++  return 0;
++}
++
++/* Read a single field of CSV text.  Compatible with rfc4180 and extended
++** with the option of having a separator other than ",".
++**
++**   +  Input comes from p->in.
++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
++**      from sqlite3_malloc64().
++**   +  Keep track of the line number in p->nLine.
++**   +  Store the character that terminates the field in p->cTerm.  Store
++**      EOF on end-of-file.
++**
++** Return 0 at EOF or on OOM.  On EOF, the p->cTerm character will have
++** been set to EOF.
++*/
++static char *csv_read_one_field(CsvReader *p){
++  int c;
++  p->n = 0;
++  c = csv_getc(p);
++  if( c==EOF ){
++    p->cTerm = EOF;
++    return 0;
++  }
++  if( c=='"' ){
++    int pc, ppc;
++    int startLine = p->nLine;
++    pc = ppc = 0;
++    while( 1 ){
++      c = csv_getc(p);
++      if( c<='"' || pc=='"' ){
++        if( c=='\n' ) p->nLine++;
++        if( c=='"' ){
++          if( pc=='"' ){
++            pc = 0;
++            continue;
++          }
++        }
++        if( (c==',' && pc=='"')
++         || (c=='\n' && pc=='"')
++         || (c=='\n' && pc=='\r' && ppc=='"')
++         || (c==EOF && pc=='"')
++        ){
++          do{ p->n--; }while( p->z[p->n]!='"' );
++          p->cTerm = (char)c;
++          break;
++        }
++        if( pc=='"' && c!='\r' ){
++          csv_errmsg(p, "line %d: unescaped %c character", p->nLine, '"');
++          break;
++        }
++        if( c==EOF ){
++          csv_errmsg(p, "line %d: unterminated %c-quoted field\n",
++                     startLine, '"');
++          p->cTerm = (char)c;
++          break;
++        }
++      }
++      if( csv_append(p, (char)c) ) return 0;
++      ppc = pc;
++      pc = c;
++    }
++  }else{
++    /* If this is the first field being parsed and it begins with the
++    ** UTF-8 BOM  (0xEF BB BF) then skip the BOM */
++    if( (c&0xff)==0xef && p->bNotFirst==0 ){
++      csv_append(p, (char)c);
++      c = csv_getc(p);
++      if( (c&0xff)==0xbb ){
++        csv_append(p, (char)c);
++        c = csv_getc(p);
++        if( (c&0xff)==0xbf ){
++          p->bNotFirst = 1;
++          p->n = 0;
++          return csv_read_one_field(p);
++        }
++      }
++    }
++    while( c>',' || (c!=EOF && c!=',' && c!='\n') ){
++      if( csv_append(p, (char)c) ) return 0;
++      c = csv_getc(p);
++    }
++    if( c=='\n' ){
++      p->nLine++;
++      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
++    }
++    p->cTerm = (char)c;
++  }
++  assert( p->z==0 || p->nnAlloc );
++  if( p->z ) p->z[p->n] = 0;
++  p->bNotFirst = 1;
++  return p->z;
++}
++
++
++/* Forward references to the various virtual table methods implemented
++** in this file. */
++static int csvtabCreate(sqlite3*, void*, int, const char*const*, 
++                           sqlite3_vtab**,char**);
++static int csvtabConnect(sqlite3*, void*, int, const char*const*, 
++                           sqlite3_vtab**,char**);
++static int csvtabBestIndex(sqlite3_vtab*,sqlite3_index_info*);
++static int csvtabDisconnect(sqlite3_vtab*);
++static int csvtabOpen(sqlite3_vtab*, sqlite3_vtab_cursor**);
++static int csvtabClose(sqlite3_vtab_cursor*);
++static int csvtabFilter(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
++                          int argc, sqlite3_value **argv);
++static int csvtabNext(sqlite3_vtab_cursor*);
++static int csvtabEof(sqlite3_vtab_cursor*);
++static int csvtabColumn(sqlite3_vtab_cursor*,sqlite3_context*,int);
++static int csvtabRowid(sqlite3_vtab_cursor*,sqlite3_int64*);
++
++/* An instance of the CSV virtual table */
++typedef struct CsvTable {
++  sqlite3_vtab base;              /* Base class.  Must be first */
++  char *zFilename;                /* Name of the CSV file */
++  char *zData;                    /* Raw CSV data in lieu of zFilename */
++  long iStart;                    /* Offset to start of data in zFilename */
++  int nCol;                       /* Number of columns in the CSV file */
++  unsigned int tstFlags;          /* Bit values used for testing */
++} CsvTable;
++
++/* Allowed values for tstFlags */
++#define CSVTEST_FIDX  0x0001      /* Pretend that constrained searchs cost less*/
++
++/* A cursor for the CSV virtual table */
++typedef struct CsvCursor {
++  sqlite3_vtab_cursor base;       /* Base class.  Must be first */
++  CsvReader rdr;                  /* The CsvReader object */
++  char **azVal;                   /* Value of the current row */
++  int *aLen;                      /* Length of each entry */
++  sqlite3_int64 iRowid;           /* The current rowid.  Negative for EOF */
++} CsvCursor;
++
++/* Transfer error message text from a reader into a CsvTable */
++static void csv_xfer_error(CsvTable *pTab, CsvReader *pRdr){
++  sqlite3_free(pTab->base.zErrMsg);
++  pTab->base.zErrMsg = sqlite3_mprintf("%s", pRdr->zErr);
++}
++
++/*
++** This method is the destructor fo a CsvTable object.
++*/
++static int csvtabDisconnect(sqlite3_vtab *pVtab){
++  CsvTable *p = (CsvTable*)pVtab;
++  sqlite3_free(p->zFilename);
++  sqlite3_free(p->zData);
++  sqlite3_free(p);
++  return SQLITE_OK;
++}
++
++/* Skip leading whitespace.  Return a pointer to the first non-whitespace
++** character, or to the zero terminator if the string has only whitespace */
++static const char *csv_skip_whitespace(const char *z){
++  while( isspace((unsigned char)z[0]) ) z++;
++  return z;
++}
++
++/* Remove trailing whitespace from the end of string z[] */
++static void csv_trim_whitespace(char *z){
++  size_t n = strlen(z);
++  while( n>0 && isspace((unsigned char)z[n]) ) n--;
++  z[n] = 0;
++}
++
++/* Dequote the string */
++static void csv_dequote(char *z){
++  int j;
++  char cQuote = z[0];
++  size_t i, n;
++
++  if( cQuote!='\'' && cQuote!='"' ) return;
++  n = strlen(z);
++  if( n<2 || z[n-1]!=z[0] ) return;
++  for(i=1, j=0; izErr.  If there are no errors, p->zErr[0]==0.
++*/
++static int csv_string_parameter(
++  CsvReader *p,            /* Leave the error message here, if there is one */
++  const char *zParam,      /* Parameter we are checking for */
++  const char *zArg,        /* Raw text of the virtual table argment */
++  char **pzVal             /* Write the dequoted string value here */
++){
++  const char *zValue;
++  zValue = csv_parameter(zParam,(int)strlen(zParam),zArg);
++  if( zValue==0 ) return 0;
++  p->zErr[0] = 0;
++  if( *pzVal ){
++    csv_errmsg(p, "more than one '%s' parameter", zParam);
++    return 1;
++  }
++  *pzVal = sqlite3_mprintf("%s", zValue);
++  if( *pzVal==0 ){
++    csv_errmsg(p, "out of memory");
++    return 1;
++  }
++  csv_trim_whitespace(*pzVal);
++  csv_dequote(*pzVal);
++  return 1;
++}
++
++
++/* Return 0 if the argument is false and 1 if it is true.  Return -1 if
++** we cannot really tell.
++*/
++static int csv_boolean(const char *z){
++  if( sqlite3_stricmp("yes",z)==0
++   || sqlite3_stricmp("on",z)==0
++   || sqlite3_stricmp("true",z)==0
++   || (z[0]=='1' && z[1]==0)
++  ){
++    return 1;
++  }
++  if( sqlite3_stricmp("no",z)==0
++   || sqlite3_stricmp("off",z)==0
++   || sqlite3_stricmp("false",z)==0
++   || (z[0]=='0' && z[1]==0)
++  ){
++    return 0;
++  }
++  return -1;
++}
++
++/* Check to see if the string is of the form:  "TAG = BOOLEAN" or just "TAG".
++** If it is, set *pValue to be the value of the boolean ("true" if there is
++** not "= BOOLEAN" component) and return non-zero.  If the input string
++** does not begin with TAG, return zero.
++*/
++static int csv_boolean_parameter(
++  const char *zTag,       /* Tag we are looking for */
++  int nTag,               /* Size of the tag in bytes */
++  const char *z,          /* Input parameter */
++  int *pValue             /* Write boolean value here */
++){
++  int b;
++  z = csv_skip_whitespace(z);
++  if( strncmp(zTag, z, nTag)!=0 ) return 0;
++  z = csv_skip_whitespace(z + nTag);
++  if( z[0]==0 ){
++    *pValue = 1;
++    return 1;
++  }
++  if( z[0]!='=' ) return 0;
++  z = csv_skip_whitespace(z+1);
++  b = csv_boolean(z);
++  if( b>=0 ){
++    *pValue = b;
++    return 1;
++  }
++  return 0;
++}
++
++/*
++** Parameters:
++**    filename=FILENAME          Name of file containing CSV content
++**    data=TEXT                  Direct CSV content.
++**    schema=SCHEMA              Alternative CSV schema.
++**    header=YES|NO              First row of CSV defines the names of
++**                               columns if "yes".  Default "no".
++**    columns=N                  Assume the CSV file contains N columns.
++**
++** Only available if compiled with SQLITE_TEST:
++**    
++**    testflags=N                Bitmask of test flags.  Optional
++**
++** If schema= is omitted, then the columns are named "c0", "c1", "c2",
++** and so forth.  If columns=N is omitted, then the file is opened and
++** the number of columns in the first row is counted to determine the
++** column count.  If header=YES, then the first row is skipped.
++*/
++static int csvtabConnect(
++  sqlite3 *db,
++  void *pAux,
++  int argc, const char *const*argv,
++  sqlite3_vtab **ppVtab,
++  char **pzErr
++){
++  CsvTable *pNew = 0;        /* The CsvTable object to construct */
++  int bHeader = -1;          /* header= flags.  -1 means not seen yet */
++  int rc = SQLITE_OK;        /* Result code from this routine */
++  int i, j;                  /* Loop counters */
++#ifdef SQLITE_TEST
++  int tstFlags = 0;          /* Value for testflags=N parameter */
++#endif
++  int b;                     /* Value of a boolean parameter */
++  int nCol = -99;            /* Value of the columns= parameter */
++  CsvReader sRdr;            /* A CSV file reader used to store an error
++                             ** message and/or to count the number of columns */
++  static const char *azParam[] = {
++     "filename", "data", "schema", 
++  };
++  char *azPValue[3];         /* Parameter values */
++# define CSV_FILENAME (azPValue[0])
++# define CSV_DATA     (azPValue[1])
++# define CSV_SCHEMA   (azPValue[2])
++
++
++  assert( sizeof(azPValue)==sizeof(azParam) );
++  memset(&sRdr, 0, sizeof(sRdr));
++  memset(azPValue, 0, sizeof(azPValue));
++  for(i=3; i=0 ){
++        csv_errmsg(&sRdr, "more than one 'header' parameter");
++        goto csvtab_connect_error;
++      }
++      bHeader = b;
++    }else
++#ifdef SQLITE_TEST
++    if( (zValue = csv_parameter("testflags",9,z))!=0 ){
++      tstFlags = (unsigned int)atoi(zValue);
++    }else
++#endif
++    if( (zValue = csv_parameter("columns",7,z))!=0 ){
++      if( nCol>0 ){
++        csv_errmsg(&sRdr, "more than one 'columns' parameter");
++        goto csvtab_connect_error;
++      }
++      nCol = atoi(zValue);
++      if( nCol<=0 ){
++        csv_errmsg(&sRdr, "column= value must be positive");
++        goto csvtab_connect_error;
++      }
++    }else
++    {
++      csv_errmsg(&sRdr, "bad parameter: '%s'", z);
++      goto csvtab_connect_error;
++    }
++  }
++  if( (CSV_FILENAME==0)==(CSV_DATA==0) ){
++    csv_errmsg(&sRdr, "must specify either filename= or data= but not both");
++    goto csvtab_connect_error;
++  }
++
++  if( (nCol<=0 || bHeader==1)
++   && csv_reader_open(&sRdr, CSV_FILENAME, CSV_DATA)
++  ){
++    goto csvtab_connect_error;
++  }
++  pNew = sqlite3_malloc( sizeof(*pNew) );
++  *ppVtab = (sqlite3_vtab*)pNew;
++  if( pNew==0 ) goto csvtab_connect_oom;
++  memset(pNew, 0, sizeof(*pNew));
++  if( CSV_SCHEMA==0 ){
++    sqlite3_str *pStr = sqlite3_str_new(0);
++    char *zSep = "";
++    int iCol = 0;
++    sqlite3_str_appendf(pStr, "CREATE TABLE x(");
++    if( nCol<0 && bHeader<1 ){
++      nCol = 0;
++      do{
++        csv_read_one_field(&sRdr);
++        nCol++;
++      }while( sRdr.cTerm==',' );
++    }
++    if( nCol>0 && bHeader<1 ){
++      for(iCol=0; iCol0 && iColnCol = nCol;
++    sqlite3_str_appendf(pStr, ")");
++    CSV_SCHEMA = sqlite3_str_finish(pStr);
++    if( CSV_SCHEMA==0 ) goto csvtab_connect_oom;
++  }else if( nCol<0 ){
++    do{
++      csv_read_one_field(&sRdr);
++      pNew->nCol++;
++    }while( sRdr.cTerm==',' );
++  }else{
++    pNew->nCol = nCol;
++  }
++  pNew->zFilename = CSV_FILENAME;  CSV_FILENAME = 0;
++  pNew->zData = CSV_DATA;          CSV_DATA = 0;
++#ifdef SQLITE_TEST
++  pNew->tstFlags = tstFlags;
++#endif
++  if( bHeader!=1 ){
++    pNew->iStart = 0;
++  }else if( pNew->zData ){
++    pNew->iStart = (int)sRdr.iIn;
++  }else{
++    pNew->iStart = (int)(ftell(sRdr.in) - sRdr.nIn + sRdr.iIn);
++  }
++  csv_reader_reset(&sRdr);
++  rc = sqlite3_declare_vtab(db, CSV_SCHEMA);
++  if( rc ){
++    csv_errmsg(&sRdr, "bad schema: '%s' - %s", CSV_SCHEMA, sqlite3_errmsg(db));
++    goto csvtab_connect_error;
++  }
++  for(i=0; ibase);
++  for(i=0; ibase.pVtab;
++  int i;
++  for(i=0; inCol; i++){
++    sqlite3_free(pCur->azVal[i]);
++    pCur->azVal[i] = 0;
++    pCur->aLen[i] = 0;
++  }
++}
++
++/*
++** The xConnect and xCreate methods do the same thing, but they must be
++** different so that the virtual table is not an eponymous virtual table.
++*/
++static int csvtabCreate(
++  sqlite3 *db,
++  void *pAux,
++  int argc, const char *const*argv,
++  sqlite3_vtab **ppVtab,
++  char **pzErr
++){
++ return csvtabConnect(db, pAux, argc, argv, ppVtab, pzErr);
++}
++
++/*
++** Destructor for a CsvCursor.
++*/
++static int csvtabClose(sqlite3_vtab_cursor *cur){
++  CsvCursor *pCur = (CsvCursor*)cur;
++  csvtabCursorRowReset(pCur);
++  csv_reader_reset(&pCur->rdr);
++  sqlite3_free(cur);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new CsvTable cursor object.
++*/
++static int csvtabOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
++  CsvTable *pTab = (CsvTable*)p;
++  CsvCursor *pCur;
++  size_t nByte;
++  nByte = sizeof(*pCur) + (sizeof(char*)+sizeof(int))*pTab->nCol;
++  pCur = sqlite3_malloc64( nByte );
++  if( pCur==0 ) return SQLITE_NOMEM;
++  memset(pCur, 0, nByte);
++  pCur->azVal = (char**)&pCur[1];
++  pCur->aLen = (int*)&pCur->azVal[pTab->nCol];
++  *ppCursor = &pCur->base;
++  if( csv_reader_open(&pCur->rdr, pTab->zFilename, pTab->zData) ){
++    csv_xfer_error(pTab, &pCur->rdr);
++    return SQLITE_ERROR;
++  }
++  return SQLITE_OK;
++}
++
++
++/*
++** Advance a CsvCursor to its next row of input.
++** Set the EOF marker if we reach the end of input.
++*/
++static int csvtabNext(sqlite3_vtab_cursor *cur){
++  CsvCursor *pCur = (CsvCursor*)cur;
++  CsvTable *pTab = (CsvTable*)cur->pVtab;
++  int i = 0;
++  char *z;
++  do{
++    z = csv_read_one_field(&pCur->rdr);
++    if( z==0 ){
++      break;
++    }
++    if( inCol ){
++      if( pCur->aLen[i] < pCur->rdr.n+1 ){
++        char *zNew = sqlite3_realloc64(pCur->azVal[i], pCur->rdr.n+1);
++        if( zNew==0 ){
++          csv_errmsg(&pCur->rdr, "out of memory");
++          csv_xfer_error(pTab, &pCur->rdr);
++          break;
++        }
++        pCur->azVal[i] = zNew;
++        pCur->aLen[i] = pCur->rdr.n+1;
++      }
++      memcpy(pCur->azVal[i], z, pCur->rdr.n+1);
++      i++;
++    }
++  }while( pCur->rdr.cTerm==',' );
++  if( z==0 && i==0 ){
++    pCur->iRowid = -1;
++  }else{
++    pCur->iRowid++;
++    while( inCol ){
++      sqlite3_free(pCur->azVal[i]);
++      pCur->azVal[i] = 0;
++      pCur->aLen[i] = 0;
++      i++;
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Return values of columns for the row at which the CsvCursor
++** is currently pointing.
++*/
++static int csvtabColumn(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  CsvCursor *pCur = (CsvCursor*)cur;
++  CsvTable *pTab = (CsvTable*)cur->pVtab;
++  if( i>=0 && inCol && pCur->azVal[i]!=0 ){
++    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Return the rowid for the current row.
++*/
++static int csvtabRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
++  CsvCursor *pCur = (CsvCursor*)cur;
++  *pRowid = pCur->iRowid;
++  return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the cursor has been moved off of the last
++** row of output.
++*/
++static int csvtabEof(sqlite3_vtab_cursor *cur){
++  CsvCursor *pCur = (CsvCursor*)cur;
++  return pCur->iRowid<0;
++}
++
++/*
++** Only a full table scan is supported.  So xFilter simply rewinds to
++** the beginning.
++*/
++static int csvtabFilter(
++  sqlite3_vtab_cursor *pVtabCursor, 
++  int idxNum, const char *idxStr,
++  int argc, sqlite3_value **argv
++){
++  CsvCursor *pCur = (CsvCursor*)pVtabCursor;
++  CsvTable *pTab = (CsvTable*)pVtabCursor->pVtab;
++  pCur->iRowid = 0;
++
++  /* Ensure the field buffer is always allocated. Otherwise, if the
++  ** first field is zero bytes in size, this may be mistaken for an OOM
++  ** error in csvtabNext(). */
++  if( csv_append(&pCur->rdr, 0) ) return SQLITE_NOMEM;
++
++  if( pCur->rdr.in==0 ){
++    assert( pCur->rdr.zIn==pTab->zData );
++    assert( pTab->iStart>=0 );
++    assert( (size_t)pTab->iStart<=pCur->rdr.nIn );
++    pCur->rdr.iIn = pTab->iStart;
++  }else{
++    fseek(pCur->rdr.in, pTab->iStart, SEEK_SET);
++    pCur->rdr.iIn = 0;
++    pCur->rdr.nIn = 0;
++  }
++  return csvtabNext(pVtabCursor);
++}
++
++/*
++** Only a forward full table scan is supported.  xBestIndex is mostly
++** a no-op.  If CSVTEST_FIDX is set, then the presence of equality
++** constraints lowers the estimated cost, which is fiction, but is useful
++** for testing certain kinds of virtual table behavior.
++*/
++static int csvtabBestIndex(
++  sqlite3_vtab *tab,
++  sqlite3_index_info *pIdxInfo
++){
++  pIdxInfo->estimatedCost = 1000000;
++#ifdef SQLITE_TEST
++  if( (((CsvTable*)tab)->tstFlags & CSVTEST_FIDX)!=0 ){
++    /* The usual (and sensible) case is to always do a full table scan.
++    ** The code in this branch only runs when testflags=1.  This code
++    ** generates an artifical and unrealistic plan which is useful
++    ** for testing virtual table logic but is not helpful to real applications.
++    **
++    ** Any ==, LIKE, or GLOB constraint is marked as usable by the virtual
++    ** table (even though it is not) and the cost of running the virtual table
++    ** is reduced from 1 million to just 10.  The constraints are *not* marked
++    ** as omittable, however, so the query planner should still generate a
++    ** plan that gives a correct answer, even if they plan is not optimal.
++    */
++    int i;
++    int nConst = 0;
++    for(i=0; inConstraint; i++){
++      unsigned char op;
++      if( pIdxInfo->aConstraint[i].usable==0 ) continue;
++      op = pIdxInfo->aConstraint[i].op;
++      if( op==SQLITE_INDEX_CONSTRAINT_EQ 
++       || op==SQLITE_INDEX_CONSTRAINT_LIKE
++       || op==SQLITE_INDEX_CONSTRAINT_GLOB
++      ){
++        pIdxInfo->estimatedCost = 10;
++        pIdxInfo->aConstraintUsage[nConst].argvIndex = nConst+1;
++        nConst++;
++      }
++    }
++  }
++#endif
++  return SQLITE_OK;
++}
++
++
++static sqlite3_module CsvModule = {
++  0,                       /* iVersion */
++  csvtabCreate,            /* xCreate */
++  csvtabConnect,           /* xConnect */
++  csvtabBestIndex,         /* xBestIndex */
++  csvtabDisconnect,        /* xDisconnect */
++  csvtabDisconnect,        /* xDestroy */
++  csvtabOpen,              /* xOpen - open a cursor */
++  csvtabClose,             /* xClose - close a cursor */
++  csvtabFilter,            /* xFilter - configure scan constraints */
++  csvtabNext,              /* xNext - advance a cursor */
++  csvtabEof,               /* xEof - check for end of scan */
++  csvtabColumn,            /* xColumn - read data */
++  csvtabRowid,             /* xRowid - read data */
++  0,                       /* xUpdate */
++  0,                       /* xBegin */
++  0,                       /* xSync */
++  0,                       /* xCommit */
++  0,                       /* xRollback */
++  0,                       /* xFindMethod */
++  0,                       /* xRename */
++  0,                       /* xSavepoint */
++  0,                       /* xRelease */
++  0,                       /* xRollbackTo */
++  0,                       /* xShadowName */
++  0                        /* xIntegrity */
++};
++
++#ifdef SQLITE_TEST
++/*
++** For virtual table testing, make a version of the CSV virtual table
++** available that has an xUpdate function.  But the xUpdate always returns
++** SQLITE_READONLY since the CSV file is not really writable.
++*/
++static int csvtabUpdate(sqlite3_vtab *p,int n,sqlite3_value**v,sqlite3_int64*x){
++  return SQLITE_READONLY;
++}
++static sqlite3_module CsvModuleFauxWrite = {
++  0,                       /* iVersion */
++  csvtabCreate,            /* xCreate */
++  csvtabConnect,           /* xConnect */
++  csvtabBestIndex,         /* xBestIndex */
++  csvtabDisconnect,        /* xDisconnect */
++  csvtabDisconnect,        /* xDestroy */
++  csvtabOpen,              /* xOpen - open a cursor */
++  csvtabClose,             /* xClose - close a cursor */
++  csvtabFilter,            /* xFilter - configure scan constraints */
++  csvtabNext,              /* xNext - advance a cursor */
++  csvtabEof,               /* xEof - check for end of scan */
++  csvtabColumn,            /* xColumn - read data */
++  csvtabRowid,             /* xRowid - read data */
++  csvtabUpdate,            /* xUpdate */
++  0,                       /* xBegin */
++  0,                       /* xSync */
++  0,                       /* xCommit */
++  0,                       /* xRollback */
++  0,                       /* xFindMethod */
++  0,                       /* xRename */
++  0,                       /* xSavepoint */
++  0,                       /* xRelease */
++  0,                       /* xRollbackTo */
++  0,                       /* xShadowName */
++  0                        /* xIntegrity */
++};
++#endif /* SQLITE_TEST */
++
++#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */
++
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++/* 
++** This routine is called when the extension is loaded.  The new
++** CSV virtual table module is registered with the calling database
++** connection.
++*/
++int sqlite3_csv_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++  int rc;
++  SQLITE_EXTENSION_INIT2(pApi);
++  rc = sqlite3_create_module(db, "csv", &CsvModule, 0);
++#ifdef SQLITE_TEST
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0);
++  }
++#endif
++  return rc;
++#else
++  return SQLITE_OK;
++#endif
++}
++/*** End of #include "csv.c" ***/
++
++#endif
++
++/*
++** VSV import
++*/
++#ifdef SQLITE_ENABLE_VSV
++/* Prototype for initialization function of VSV extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_vsv_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "vsv.c" */
++/*** Begin of #include "vsv.c" ***/
++/*
++** 2020-02-08 modified by Keith Medcalf who also disclaims all copyright
++** on the modifications and hereby places this code in the public domain
++**
++** This file contains the implementation of an SQLite virtual table for
++** reading VSV (Variably Separated Values), which are like CSV files,
++** but subtly different.  VSV supports a number of extensions to the
++** CSV format as well as more processing options.
++**
++** http:\\www.dessus.com\files\vsv.c
++**
++** Usage:
++**
++**  create virtual table temp.vsv using vsv(...);
++**  select * from vsv;
++**
++** The parameters to the vsv module (the vsv(...) part) are as follows:
++**
++**  filename=STRING     the filename, passed to the Operating System
++**  data=STRING         alternative data
++**  schema=STRING       Alternate Schema to use
++**  columns=N           columns parsed from the VSV file
++**  header=BOOL         whether or not a header row is present
++**  skip=N              number of leading data rows to skip
++**  rsep=STRING         record separator
++**  fsep=STRING         field separator
++**  validatetext=BOOL   validate UTF-8 encoding of text fields
++**  affinity=AFFINITY   affinity to apply to each returned value
++**  nulls=BOOL          empty fields are returned as NULL
++**
++**
++** Defaults:
++**
++**  filename / data     nothing.  You must provide one or the other
++**                      it is an error to provide both or neither
++**  schema              nothing.  If not provided then one will be
++**                      generated for you from the header, or if no
++**                      header is available then autogenerated using
++**                      field names manufactured as cX where X is the
++**                      column number
++**  columns             nothing.  If not specified then the number of
++**                      columns is determined by counting the fields
++**                      in the first record of the VSV file (which
++**                      will be the header row if header is specified),
++**                      the number of columns is not parsed from the
++**                      schema even if one is provided
++**  header=no           no header row in the VSV file
++**  skip=0              do not skip any data rows in the VSV file
++**  fsep=','            default field separator is a comma
++**  rsep='\n'           default record separator is a newline
++**  validatetext=no     do not validate text field encoding
++**  affinity=none       do not apply affinity to each returned value
++**  nulls=off           empty fields returned as zero-length
++**
++**
++** Parameter types:
++**
++**  STRING              means a quoted string
++**  N                   means a whole number not containing a sign
++**  BOOL                means something that evaluates as true or false
++**                          it is case insensitive
++**                          yes, no, true, false, 1, 0
++**  AFFINITY            means an SQLite3 type specification
++**                          it is case insensitive
++**                          none, blob, text, integer, real, numeric
++**
++** STRING means a quoted string.  The quote character may be either
++** a single quote or a double quote.  Two quote characters in a row
++** will be replaced with one quote character.  STRINGS do not
++** need to be quoted if it is obvious where they begin and end
++** (that is, they do not contain a comma or other character that the
++** parser treats especially, such as : or \).  Leading and trailing
++** spaces will be trimmed from unquoted strings.
++**
++**    filename =./this/filename.here, ...
++**    filename =./this/filename.here , ...
++**    filename = ./this/filename.here, ...
++**    filename = ./this/filename.here , ...
++**    filename = './this/filename.here', ...
++**    filename = "./this/filename.here", ...
++**
++**  are all equivalent.
++**
++** BOOL defaults to true so the following specifications are all the
++** same:
++**
++**  header = true
++**  header = yes
++**  header = 1
++**  header
++**
++**
++** Specific Parameters:
++**
++** The platform/compiler/OS fopen call is responsible for interpreting
++** the filename.  It may contain anything recognized by the OS.
++**
++** The separator string containing exactly one character, or a valid
++** escape sequence.  Recognized escape sequences are:
++**
++**  \t                  horizontal tab, ascii character 9 (0x09)
++**  \n                  linefeed, ascii character 10 (0x0a)
++**  \v                  vertical tab, ascii character 11 (0x0b)
++**  \f                  form feed, ascii character 12 (0x0c)
++**  \xhh                specific byte where hh is hexadecimal
++**
++** The validatetext setting will cause the validity of the field
++** encoding (not its contents) to be verified.  It effects how
++** fields that are supposed to contain text will be returned to
++** the SQLite3 library in order to prevent invalid utf8 data from
++** being stored or processed as if it were valid utf8 text.
++**
++** The nulls option will cause fields that do not contain anything
++** to return NULL rather than an empty result.  Two separators
++** side-by-each with no intervening characters at all will be
++** returned as NULL if nulls is true; if nulls is false or
++** the contents are explicity empty ("") then a 0 length blob
++** (if affinity=blob) or 0 length text string.
++**
++** For the affinity setting, the following processing is applied to
++** each value returned by the VSV virtual table:
++**
++**  none                no affinity is applied, all fields will be
++**                      returned as text just like in the original
++**                      csv module, embedded nulls will terminate
++**                      the text.  if validatetext is in effect then
++**                      an error will be thrown if the field does
++**                      not contain validly encoded text or contains
++**                      embedded nulls
++**
++**  blob                all fields will be returned as blobs
++**                      validatetext has no effect
++**
++**  text                all fields will be returned as text just
++**                      like in the original csv module, embedded
++**                      nulls will terminate the text.
++**                      if validatetext is in effect then a blob
++**                      will be returned if the field does not
++**                      contain validly encoded text or the field
++**                      contains embedded nulls
++**
++**  integer             if the field data looks like an integer,
++**                      (regex "^ *(\+|-)?\d+ *$"),
++**                      then an integer will be returned as
++**                      provided by the compiler and platform
++**                      runtime strtoll function
++**                      otherwise the field will be processed as
++**                      text as defined above
++**
++**  real                if the field data looks like a number,
++**                      (regex "^ *(\+|-)?(\d+\.?\d*|\d*\.?\d+)([eE](\+|-)?\d+)? *$")
++**                      then a double will be returned as
++**                      provided by the compiler and platform
++**                      runtime strtold function otherwise the
++**                      field will be processed as text as
++**                      defined above
++**
++**  numeric             if the field looks like an integer
++**                      (see integer above) that integer will be
++**                      returned
++**                      if the field looks like a number
++**                      (see real above) then the number will
++**                      returned as an integer if it has no
++**                      fractional part and
++**                      (a) your platform/compiler supports
++**                      long double and the number will fit in
++**                      a 64-bit integer; or,
++**                      (b) your platform/compiler does not
++**                      support long double (treats it as a double)
++**                      then a 64-bit integer will only be returned
++**                      for integers that can be represented in the
++**                      53 bit significand of a double
++**
++** The nulls option will cause fields that do not contain anything
++** to return NULL rather than an empty result.  Two separators
++** side-by-each with no intervening characters at all will be
++** returned as NULL if nulls is true; if nulls is false or
++** the contents are explicity empty ("") then a 0 length blob
++** (if affinity=blob) or 0 length text string will be returned.
++**
++*/
++/*
++** 2016-05-28
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains the implementation of an SQLite virtual table for
++** reading CSV files.
++**
++** Usage:
++**
++**    .load ./csv
++**    CREATE VIRTUAL TABLE temp.csv USING csv(filename=FILENAME);
++**    SELECT * FROM csv;
++**
++** The columns are named "c1", "c2", "c3", ... by default.  Or the
++** application can define its own CREATE TABLE statement using the
++** schema= parameter, like this:
++**
++**    CREATE VIRTUAL TABLE temp.csv2 USING csv(
++**       filename = "../http.log",
++**       schema = "CREATE TABLE x(date,ipaddr,url,referrer,userAgent)"
++**    );
++**
++** Instead of specifying a file, the text of the CSV can be loaded using
++** the data= parameter.
++**
++** If the columns=N parameter is supplied, then the CSV file is assumed to have
++** N columns.  If both the columns= and schema= parameters are omitted, then
++** the number and names of the columns is determined by the first line of
++** the CSV input.
++**
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#ifdef SQLITE_HAVE_ZLIB
++#include 
++#define fopen  gzopen
++#define fclose gzclose
++#define fread  gzfread
++#define fseek  gzseek
++#define ftell  gztell
++#endif
++
++#undef LONGDOUBLE_CONSTANT
++#undef LONGDOUBLE_TYPE
++#if defined(SQLITE_USE_QUADMATH) && defined(__GNUC__) && defined(_WIN64)
++#include 
++#define LONGDOUBLE_TYPE __float128
++#define LONGDOUBLE_CONSTANT(x) x##Q
++#define modfl modfq
++#define strtold strtoflt128
++#else
++#define LONGDOUBLE_TYPE long double
++#define LONGDOUBLE_CONSTANT(x) x##L
++#endif
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++
++/*
++** A macro to hint to the compiler that a function should not be
++** inlined.
++*/
++#if defined(__GNUC__)
++#define VSV_NOINLINE  __attribute__((noinline))
++#elif defined(_MSC_VER) && _MSC_VER>=1310
++#define VSV_NOINLINE  __declspec(noinline)
++#else
++#define VSV_NOINLINE
++#endif
++
++
++/*
++** Max size of the error message in a VsvReader
++*/
++#define VSV_MXERR 200
++
++/*
++** Size of the VsvReader input buffer
++*/
++#define VSV_INBUFSZ 1024
++
++/*
++** A context object used when read a VSV file.
++*/
++typedef struct VsvReader VsvReader;
++struct VsvReader
++{
++#ifdef SQLITE_HAVE_ZLIB
++    gzFile in;             /* Read the VSV text from this compressed input stream */
++#else
++    FILE *in;              /* Read the VSV text from this input stream */
++#endif
++    char *z;               /* Accumulated text for a field */
++    int n;                 /* Number of bytes in z */
++    int nAlloc;            /* Space allocated for z[] */
++    int nLine;             /* Current line number */
++    int bNotFirst;         /* True if prior text has been seen */
++    int cTerm;             /* Character that terminated the most recent field */
++    int fsep;              /* Field Seperator Character */
++    int rsep;              /* Record Seperator Character */
++    int affinity;          /* Perform Affinity Conversions */
++    int notNull;           /* Have we seen data for field */
++    size_t iIn;            /* Next unread character in the input buffer */
++    size_t nIn;            /* Number of characters in the input buffer */
++    char *zIn;             /* The input buffer */
++    char zErr[VSV_MXERR];  /* Error message */
++};
++
++/*
++** Initialize a VsvReader object
++*/
++static void vsv_reader_init(VsvReader *p)
++{
++    p->in = 0;
++    p->z = 0;
++    p->n = 0;
++    p->nAlloc = 0;
++    p->nLine = 0;
++    p->bNotFirst = 0;
++    p->nIn = 0;
++    p->zIn = 0;
++    p->notNull = 0;
++    p->zErr[0] = 0;
++}
++
++/*
++** Close and reset a VsvReader object
++*/
++static void vsv_reader_reset(VsvReader *p)
++{
++    if (p->in)
++    {
++        fclose(p->in);
++        sqlite3_free(p->zIn);
++    }
++    sqlite3_free(p->z);
++    vsv_reader_init(p);
++}
++
++/*
++** Report an error on a VsvReader
++*/
++static void vsv_errmsg(VsvReader *p, const char *zFormat, ...)
++{
++    va_list ap;
++    va_start(ap, zFormat);
++    sqlite3_vsnprintf(VSV_MXERR, p->zErr, zFormat, ap);
++    va_end(ap);
++}
++
++/*
++** Open the file associated with a VsvReader
++** Return the number of errors.
++*/
++static int vsv_reader_open(
++                          VsvReader *p,               /* The reader to open */
++                          const char *zFilename,      /* Read from this filename */
++                          const char *zData           /*  ... or use this data */
++                          )
++{
++    if (zFilename)
++    {
++        p->zIn = sqlite3_malloc(VSV_INBUFSZ);
++        if (p->zIn==0)
++        {
++            vsv_errmsg(p, "out of memory");
++            return 1;
++        }
++        p->in = fopen(zFilename, "rb");
++        if (p->in==0)
++        {
++            sqlite3_free(p->zIn);
++            vsv_reader_reset(p);
++            vsv_errmsg(p, "cannot open '%s' for reading", zFilename);
++            return 1;
++        }
++    }
++    else
++    {
++        assert( p->in==0 );
++        p->zIn = (char*)zData;
++        p->nIn = strlen(zData);
++    }
++    return 0;
++}
++
++/*
++** The input buffer has overflowed.  Refill the input buffer, then
++** return the next character
++*/
++static VSV_NOINLINE int vsv_getc_refill(VsvReader *p)
++{
++    size_t got;
++
++    assert( p->iIn>=p->nIn );  /* Only called on an empty input buffer */
++    assert( p->in!=0 );        /* Only called if reading from a file */
++
++    got = fread(p->zIn, 1, VSV_INBUFSZ, p->in);
++    if (got==0)
++    {
++        return EOF;
++    }
++    p->nIn = got;
++    p->iIn = 1;
++    return p->zIn[0];
++}
++
++/*
++** Return the next character of input.  Return EOF at end of input.
++*/
++static int vsv_getc(VsvReader *p)
++{
++    if (p->iIn >= p->nIn)
++    {
++        if (p->in!=0)
++        {
++            return vsv_getc_refill(p);
++        }
++        return EOF;
++    }
++    return((unsigned char*)p->zIn)[p->iIn++];
++}
++
++/*
++** Increase the size of p->z and append character c to the end.
++** Return 0 on success and non-zero if there is an OOM error
++*/
++static VSV_NOINLINE int vsv_resize_and_append(VsvReader *p, char c)
++{
++    char *zNew;
++    int nNew = p->nAlloc*2 + 100;
++    zNew = sqlite3_realloc64(p->z, nNew);
++    if (zNew)
++    {
++        p->z = zNew;
++        p->nAlloc = nNew;
++        p->z[p->n++] = c;
++        return 0;
++    }
++    else
++    {
++        vsv_errmsg(p, "out of memory");
++        return 1;
++    }
++}
++
++/*
++** Append a single character to the VsvReader.z[] array.
++** Return 0 on success and non-zero if there is an OOM error
++*/
++static int vsv_append(VsvReader *p, char c)
++{
++    if (p->n>=p->nAlloc-1)
++    {
++        return vsv_resize_and_append(p, c);
++    }
++    p->z[p->n++] = c;
++    return 0;
++}
++
++/*
++** Read a single field of VSV text.  Compatible with rfc4180 and extended
++** with the option of having a separator other than ",".
++**
++**   +  Input comes from p->in.
++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
++**      from sqlite3_malloc64().
++**   +  Keep track of the line number in p->nLine.
++**   +  Store the character that terminates the field in p->cTerm.  Store
++**      EOF on end-of-file.
++**
++** Return 0 at EOF or on OOM.  On EOF, the p->cTerm character will have
++** been set to EOF.
++*/
++static char *vsv_read_one_field(VsvReader *p)
++{
++    int c;
++    p->notNull = 0;
++    p->n = 0;
++    c = vsv_getc(p);
++    if (c==EOF)
++    {
++        p->cTerm = EOF;
++        return 0;
++    }
++    if (c=='"')
++    {
++        int pc, ppc;
++        int startLine = p->nLine;
++        p->notNull = 1;
++        pc = ppc = 0;
++        while (1)
++        {
++            c = vsv_getc(p);
++            if (c=='\n')
++            {
++                p->nLine++;
++            }
++            if (c=='"' && pc=='"')
++            {
++                pc = ppc;
++                ppc = 0;
++                continue;
++            }
++            if (   (c==p->fsep && pc=='"')
++                || (c==p->rsep && pc=='"')
++                || (p->rsep=='\n' && c=='\n' && pc=='\r' && ppc=='"')
++                || (c==EOF && pc=='"')
++               )
++            {
++                do
++                {
++                    p->n--;
++                }
++                while (p->z[p->n]!='"');
++                p->cTerm = (char)c;
++                break;
++            }
++            if (pc=='"' && p->rsep=='\n' && c!='\r')
++            {
++                vsv_errmsg(p, "line %d: unescaped %c character", p->nLine, '"');
++                break;
++            }
++            if (c==EOF)
++            {
++                vsv_errmsg(p, "line %d: unterminated %c-quoted field\n", startLine, '"');
++                p->cTerm = (char)c;
++                break;
++            }
++            if (vsv_append(p, (char)c))
++            {
++                return 0;
++            }
++            ppc = pc;
++            pc = c;
++        }
++    }
++    else
++    {
++        /*
++        ** If this is the first field being parsed and it begins with the
++        ** UTF-8 BOM  (0xEF BB BF) then skip the BOM
++        */
++        if ((c&0xff)==0xef && p->bNotFirst==0)
++        {
++            vsv_append(p, (char)c);
++            c = vsv_getc(p);
++            if ((c&0xff)==0xbb)
++            {
++                vsv_append(p, (char)c);
++                c = vsv_getc(p);
++                if ((c&0xff)==0xbf)
++                {
++                    p->bNotFirst = 1;
++                    p->n = 0;
++                    return vsv_read_one_field(p);
++                }
++            }
++        }
++        while (c!=EOF && c!=p->rsep && c!=p->fsep)
++        {
++            if (c=='\n')
++                p->nLine++;
++            if (!p->notNull)
++                p->notNull = 1;
++            if (vsv_append(p, (char)c))
++                return 0;
++            c = vsv_getc(p);
++        }
++        if (c=='\n')
++        {
++            p->nLine++;
++        }
++        if (p->n>0 && (p->rsep=='\n' || p->fsep=='\n') && p->z[p->n-1]=='\r')
++        {
++            p->n--;
++            if (p->n==0)
++            {
++                p->notNull = 0;
++            }
++        }
++        p->cTerm = (char)c;
++    }
++    assert( p->z==0 || p->nnAlloc );
++    if (p->z)
++    {
++        p->z[p->n] = 0;
++    }
++    p->bNotFirst = 1;
++    return p->z;
++}
++
++
++/*
++** Forward references to the various virtual table methods implemented
++** in this file.
++*/
++static int vsvtabCreate(sqlite3*, void*, int, const char*const*, sqlite3_vtab**,char**);
++static int vsvtabConnect(sqlite3*, void*, int, const char*const*, sqlite3_vtab**,char**);
++static int vsvtabBestIndex(sqlite3_vtab*,sqlite3_index_info*);
++static int vsvtabDisconnect(sqlite3_vtab*);
++static int vsvtabOpen(sqlite3_vtab*, sqlite3_vtab_cursor**);
++static int vsvtabClose(sqlite3_vtab_cursor*);
++static int vsvtabFilter(sqlite3_vtab_cursor*, int idxNum, const char *idxStr, int argc, sqlite3_value **argv);
++static int vsvtabNext(sqlite3_vtab_cursor*);
++static int vsvtabEof(sqlite3_vtab_cursor*);
++static int vsvtabColumn(sqlite3_vtab_cursor*,sqlite3_context*,int);
++static int vsvtabRowid(sqlite3_vtab_cursor*,sqlite3_int64*);
++
++/*
++** An instance of the VSV virtual table
++*/
++typedef struct VsvTable
++{
++    sqlite3_vtab base;              /* Base class.  Must be first */
++    char *zFilename;                /* Name of the VSV file */
++    char *zData;                    /* Raw VSV data in lieu of zFilename */
++    long iStart;                    /* Offset to start of data in zFilename */
++    int nCol;                       /* Number of columns in the VSV file */
++    int fsep;                       /* The field seperator for this VSV file */
++    int rsep;                       /* The record seperator for this VSV file */
++    int affinity;                   /* Perform affinity conversions */
++    int nulls;                      /* Process NULLs */
++    int validateUTF8;               /* Validate UTF8 */
++    unsigned int tstFlags;          /* Bit values used for testing */
++} VsvTable;
++
++/*
++** Allowed values for tstFlags
++*/
++#define VSVTEST_FIDX  0x0001        /* Pretend that constrained searchs cost less*/
++
++/*
++** A cursor for the VSV virtual table
++*/
++typedef struct VsvCursor
++{
++    sqlite3_vtab_cursor base;       /* Base class.  Must be first */
++    VsvReader rdr;                  /* The VsvReader object */
++    char **azVal;                   /* Value of the current row */
++    int *aLen;                      /* Allocation Length of each entry */
++    int *dLen;                      /* Data Length of each entry */
++    sqlite3_int64 iRowid;           /* The current rowid.  Negative for EOF */
++} VsvCursor;
++
++/*
++** Transfer error message text from a reader into a VsvTable
++*/
++static void vsv_xfer_error(VsvTable *pTab, VsvReader *pRdr)
++{
++    sqlite3_free(pTab->base.zErrMsg);
++    pTab->base.zErrMsg = sqlite3_mprintf("%s", pRdr->zErr);
++}
++
++/*
++** This method is the destructor for a VsvTable object.
++*/
++static int vsvtabDisconnect(sqlite3_vtab *pVtab)
++{
++    VsvTable *p = (VsvTable*)pVtab;
++    sqlite3_free(p->zFilename);
++    sqlite3_free(p->zData);
++    sqlite3_free(p);
++    return SQLITE_OK;
++}
++
++/*
++** Skip leading whitespace.  Return a pointer to the first non-whitespace
++** character, or to the zero terminator if the string has only whitespace
++*/
++static const char *vsv_skip_whitespace(const char *z)
++{
++    while (isspace((unsigned char)z[0]))
++    {
++        z++;
++    }
++    return z;
++}
++
++/*
++** Remove trailing whitespace from the end of string z[]
++*/
++static void vsv_trim_whitespace(char *z)
++{
++    size_t n = strlen(z);
++    while (n>0 && isspace((unsigned char)z[n]))
++    {
++        n--;
++    }
++    z[n] = 0;
++}
++
++/*
++** Dequote the string
++*/
++static void vsv_dequote(char *z)
++{
++    int j;
++    char cQuote = z[0];
++    size_t i, n;
++
++    if (cQuote!='\'' && cQuote!='"')
++    {
++        return;
++    }
++    n = strlen(z);
++    if (n<2 || z[n-1]!=z[0])
++    {
++        return;
++    }
++    for (i=1, j=0; izErr.  If there are no errors, p->zErr[0]==0.
++*/
++static int vsv_string_parameter(
++                               VsvReader *p,            /* Leave the error message here, if there is one */
++                               const char *zParam,      /* Parameter we are checking for */
++                               const char *zArg,        /* Raw text of the virtual table argment */
++                               char **pzVal             /* Write the dequoted string value here */
++                               )
++{
++    const char *zValue;
++    zValue = vsv_parameter(zParam,(int)strlen(zParam),zArg);
++    if (zValue==0)
++    {
++        return 0;
++    }
++    p->zErr[0] = 0;
++    if (*pzVal)
++    {
++        vsv_errmsg(p, "more than one '%s' parameter", zParam);
++        return 1;
++    }
++    *pzVal = sqlite3_mprintf("%s", zValue);
++    if (*pzVal==0)
++    {
++        vsv_errmsg(p, "out of memory");
++        return 1;
++    }
++    vsv_trim_whitespace(*pzVal);
++    vsv_dequote(*pzVal);
++    return 1;
++}
++
++
++/*
++** Return 0 if the argument is false and 1 if it is true.  Return -1 if
++** we cannot really tell.
++*/
++static int vsv_boolean(const char *z)
++{
++    if (sqlite3_stricmp("yes",z)==0
++        || sqlite3_stricmp("on",z)==0
++        || sqlite3_stricmp("true",z)==0
++        || (z[0]=='1' && z[1]==0)
++       )
++    {
++        return 1;
++    }
++    if (sqlite3_stricmp("no",z)==0
++        || sqlite3_stricmp("off",z)==0
++        || sqlite3_stricmp("false",z)==0
++        || (z[0]=='0' && z[1]==0)
++       )
++    {
++        return 0;
++    }
++    return -1;
++}
++
++/*
++** Check to see if the string is of the form:  "TAG = BOOLEAN" or just "TAG".
++** If it is, set *pValue to be the value of the boolean ("true" if there is
++** not "= BOOLEAN" component) and return non-zero.  If the input string
++** does not begin with TAG, return zero.
++*/
++static int vsv_boolean_parameter(
++                                const char *zTag,       /* Tag we are looking for */
++                                int nTag,               /* Size of the tag in bytes */
++                                const char *z,          /* Input parameter */
++                                int *pValue             /* Write boolean value here */
++                                )
++{
++    int b;
++    z = vsv_skip_whitespace(z);
++    if (strncmp(zTag, z, nTag)!=0)
++    {
++        return 0;
++    }
++    z = vsv_skip_whitespace(z + nTag);
++    if (z[0]==0)
++    {
++        *pValue = 1;
++        return 1;
++    }
++    if (z[0]!='=')
++    {
++        return 0;
++    }
++    z = vsv_skip_whitespace(z+1);
++    b = vsv_boolean(z);
++    if (b>=0)
++    {
++        *pValue = b;
++        return 1;
++    }
++    return 0;
++}
++
++/*
++** Convert the seperator character specification into the character code
++** Return 1 signifies error, 0 for no error
++**
++** Recognized inputs:
++**      any single character
++**      escaped characters \f \n \t \v
++**      escaped hex byte   \x1e \x1f etc (RS and US respectively)
++**
++*/
++static int vsv_parse_sep_char(char *in, int dflt, int *out)
++{
++    if (!in)
++    {
++        *out = dflt;
++        return 0;
++    }
++    switch (strlen(in))
++    {
++        case 0:
++        {
++            *out = dflt;
++            return 0;
++        }
++        case 1:
++        {
++            *out = in[0];
++            return 0;
++        }
++        case 2:
++        {
++            if (in[0] != '\\')
++            {
++                return 1;
++            }
++            switch (in[1])
++            {
++                case 'f':
++                {
++                    *out = 12;
++                    return 0;
++                }
++                case 'n':
++                {
++                    *out = 10;
++                    return 0;
++                }
++                case 't':
++                {
++                    *out = 9;
++                    return 0;
++                }
++                case 'v':
++                {
++                    *out = 11;
++                    return 0;
++                }
++            }
++            return 1;
++        }
++        case 4:
++        {
++            if (sqlite3_strnicmp(in, "\\x", 2) != 0)
++            {
++                return 1;
++            }
++            if (!isxdigit(in[2]) || !isxdigit(in[3]))
++            {
++                return 1;
++            }
++            *out = ((in[2] > '9' ? (in[2] & 0x0f) + 9 : in[2] & 0x0f) << 4) +
++                    (in[3] > '9' ? (in[3] & 0x0f) + 9 : in[3] & 0x0f);
++            return 0;
++        }
++    }
++    return 0;
++}
++
++/*
++** Parameters:
++**    filename=FILENAME          Name of file containing VSV content
++**    data=TEXT                  Direct VSV content.
++**    schema=SCHEMA              Alternative VSV schema.
++**    header=YES|NO              First row of VSV defines the names of
++**                               columns if "yes".  Default "no".
++**    columns=N                  Assume the VSV file contains N columns.
++**    fsep=FSET                  Field Seperator
++**    rsep=RSEP                  Record Seperator
++**    skip=N                     skip N records of file (default 0)
++**    affinity=AFF               affinity to apply to ALL columns
++**                               default:  none
++**                               none text integer real numeric
++**
++** Only available if compiled with SQLITE_TEST:
++**
++**    testflags=N                Bitmask of test flags.  Optional
++**
++** If schema= is omitted, then the columns are named "c0", "c1", "c2",
++** and so forth.  If columns=N is omitted, then the file is opened and
++** the number of columns in the first row is counted to determine the
++** column count.  If header=YES, then the first row is skipped.
++*/
++static int vsvtabConnect(
++                        sqlite3 *db,
++                        void *pAux,
++                        int argc, const char *const*argv,
++                        sqlite3_vtab **ppVtab,
++                        char **pzErr
++                        )
++{
++    VsvTable *pNew = 0;        /* The VsvTable object to construct */
++    int affinity = -1;         /* Affinity coercion */
++    int bHeader = -1;          /* header= flags.  -1 means not seen yet */
++    int validateUTF8 = -1;     /* validateUTF8 flag */
++    int rc = SQLITE_OK;        /* Result code from this routine */
++    int i, j;                  /* Loop counters */
++#ifdef SQLITE_TEST
++    int tstFlags = 0;          /* Value for testflags=N parameter */
++#endif
++    int b;                     /* Value of a boolean parameter */
++    int nCol = -99;            /* Value of the columns= parameter */
++    int nSkip = -1;            /* Value of the skip= parameter */
++    int bNulls = -1;           /* Process Nulls flag */
++    VsvReader sRdr;            /* A VSV file reader used to store an error
++                               ** message and/or to count the number of columns */
++    static const char *azParam[] = {
++        "filename", "data", "schema", "fsep", "rsep"
++    };
++    char *azPValue[5];         /* Parameter values */
++#define VSV_FILENAME (azPValue[0])
++#define VSV_DATA     (azPValue[1])
++#define VSV_SCHEMA   (azPValue[2])
++#define VSV_FSEP     (azPValue[3])
++#define VSV_RSEP     (azPValue[4])
++
++
++    assert( sizeof(azPValue)==sizeof(azParam) );
++    memset(&sRdr, 0, sizeof(sRdr));
++    memset(azPValue, 0, sizeof(azPValue));
++    for (i=3; i=0)
++            {
++                vsv_errmsg(&sRdr, "more than one 'header' parameter");
++                goto vsvtab_connect_error;
++            }
++            bHeader = b;
++        }
++        else if (vsv_boolean_parameter("validatetext",12,z,&b))
++        {
++            if (validateUTF8>=0)
++            {
++                vsv_errmsg(&sRdr, "more than one 'validatetext' parameter");
++                goto vsvtab_connect_error;
++            }
++            validateUTF8 = b;
++        }
++        else if (vsv_boolean_parameter("nulls",5,z,&b))
++        {
++            if (bNulls>=0)
++            {
++                vsv_errmsg(&sRdr, "more than one 'nulls' parameter");
++                goto vsvtab_connect_error;
++            }
++            bNulls = b;
++        }
++        else
++#ifdef SQLITE_TEST
++            if ((zValue = vsv_parameter("testflags",9,z))!=0)
++        {
++            tstFlags = (unsigned int)atoi(zValue);
++        }
++        else
++#endif
++            if ((zValue = vsv_parameter("columns",7,z))!=0)
++        {
++            if (nCol>0)
++            {
++                vsv_errmsg(&sRdr, "more than one 'columns' parameter");
++                goto vsvtab_connect_error;
++            }
++            nCol = atoi(zValue);
++            if (nCol<=0)
++            {
++                vsv_errmsg(&sRdr, "column= value must be positive");
++                goto vsvtab_connect_error;
++            }
++        }
++        else if ((zValue = vsv_parameter("skip",4,z))!=0)
++        {
++            if (nSkip>0)
++            {
++                vsv_errmsg(&sRdr, "more than one 'skip' parameter");
++                goto vsvtab_connect_error;
++            }
++            nSkip = atoi(zValue);
++            if (nSkip<=0)
++            {
++                vsv_errmsg(&sRdr, "skip= value must be positive");
++                goto vsvtab_connect_error;
++            }
++        }
++        else if ((zValue = vsv_parameter("affinity",8,z))!=0)
++        {
++            if (affinity>-1)
++            {
++                vsv_errmsg(&sRdr, "more than one 'affinity' parameter");
++                goto vsvtab_connect_error;
++            }
++            if      (sqlite3_strnicmp(zValue,"none",4)==0)     affinity=0;
++            else if (sqlite3_strnicmp(zValue,"blob",4)==0)     affinity=1;
++            else if (sqlite3_strnicmp(zValue,"text",4)==0)     affinity=2;
++            else if (sqlite3_strnicmp(zValue,"integer",7)==0)  affinity=3;
++            else if (sqlite3_strnicmp(zValue,"real",4)==0)     affinity=4;
++            else if (sqlite3_strnicmp(zValue,"numeric",7)==0)  affinity=5;
++            else
++            {
++                vsv_errmsg(&sRdr, "unknown affinity: '%s'", zValue);
++                goto vsvtab_connect_error;
++            }
++        }
++        else
++        {
++            vsv_errmsg(&sRdr, "bad parameter: '%s'", z);
++            goto vsvtab_connect_error;
++        }
++    }
++    if (affinity==-1)
++    {
++        affinity = 0;
++    }
++    if (bNulls==-1)
++    {
++        bNulls = 0;
++    }
++    if (validateUTF8==-1)
++    {
++        validateUTF8 = 0;
++    }
++    if ((VSV_FILENAME==0)==(VSV_DATA==0))
++    {
++        vsv_errmsg(&sRdr, "must specify either filename= or data= but not both");
++        goto vsvtab_connect_error;
++    }
++    if (vsv_parse_sep_char(VSV_FSEP, ',', &(sRdr.fsep)))
++    {
++        vsv_errmsg(&sRdr, "cannot parse fsep: '%s'", VSV_FSEP);
++        goto vsvtab_connect_error;
++    }
++    if (vsv_parse_sep_char(VSV_RSEP, '\n', &(sRdr.rsep)))
++    {
++        vsv_errmsg(&sRdr, "cannot parse rsep: '%s'", VSV_RSEP);
++        goto vsvtab_connect_error;
++    }
++
++
++    if ((nCol <= 0 || bHeader == 1) && vsv_reader_open(&sRdr, VSV_FILENAME, VSV_DATA))
++    {
++        goto vsvtab_connect_error;
++    }
++    pNew = sqlite3_malloc( sizeof(*pNew) );
++    *ppVtab = (sqlite3_vtab*)pNew;
++    if (pNew==0)
++    {
++        goto vsvtab_connect_oom;
++    }
++    memset(pNew, 0, sizeof(*pNew));
++    pNew->fsep = sRdr.fsep;
++    pNew->rsep = sRdr.rsep;
++    pNew->affinity = affinity;
++    pNew->validateUTF8 = validateUTF8;
++    pNew->nulls = bNulls;
++    if (VSV_SCHEMA==0)
++    {
++        sqlite3_str *pStr = sqlite3_str_new(0);
++        char *zSep = "";
++        int iCol = 0;
++        sqlite3_str_appendf(pStr, "CREATE TABLE x(");
++        if (nCol<0 && bHeader<1)
++        {
++            nCol = 0;
++            do
++            {
++                vsv_read_one_field(&sRdr);
++                nCol++;
++            }
++            while (sRdr.cTerm==sRdr.fsep);
++        }
++        if (nCol>0 && bHeader<1)
++        {
++            for (iCol=0; iCol0 && iColnCol = nCol;
++    if (nSkip>0)
++    {
++        int tskip = nSkip + (bHeader==1);
++        vsv_reader_reset(&sRdr);
++        if (vsv_reader_open(&sRdr, VSV_FILENAME, VSV_DATA))
++        {
++            goto vsvtab_connect_error;
++        }
++        do
++        {
++            do
++            {
++                if (!vsv_read_one_field(&sRdr))
++                    goto vsvtab_connect_error;
++            }
++            while (sRdr.cTerm==sRdr.fsep);
++            tskip--;
++        }
++        while (tskip>0 && sRdr.cTerm==sRdr.rsep);
++        if (tskip>0)
++        {
++            vsv_errmsg(&sRdr, "premature end of file during skip");
++            goto vsvtab_connect_error;
++        }
++    }
++    pNew->zFilename = VSV_FILENAME;  VSV_FILENAME = 0;
++    pNew->zData = VSV_DATA;          VSV_DATA = 0;
++#ifdef SQLITE_TEST
++    pNew->tstFlags = tstFlags;
++#endif
++    if (bHeader!=1 && nSkip<1)
++    {
++        pNew->iStart = 0;
++    }
++    else if (pNew->zData)
++    {
++        pNew->iStart = (int)sRdr.iIn;
++    }
++    else
++    {
++        pNew->iStart = (int)(ftell(sRdr.in) - sRdr.nIn + sRdr.iIn);
++    }
++    vsv_reader_reset(&sRdr);
++    rc = sqlite3_declare_vtab(db, VSV_SCHEMA);
++    if (rc)
++    {
++        vsv_errmsg(&sRdr, "bad schema: '%s' - %s", VSV_SCHEMA, sqlite3_errmsg(db));
++        goto vsvtab_connect_error;
++    }
++    for (i=0; ibase);
++    }
++    for (i=0; ibase.pVtab;
++    int i;
++    for (i=0; inCol; i++)
++    {
++        sqlite3_free(pCur->azVal[i]);
++        pCur->azVal[i] = 0;
++        pCur->aLen[i] = 0;
++        pCur->dLen[i] = -1;
++    }
++}
++
++/*
++** The xConnect and xCreate methods do the same thing, but they must be
++** different so that the virtual table is not an eponymous virtual table.
++*/
++static int vsvtabCreate(
++                       sqlite3 *db,
++                       void *pAux,
++                       int argc, const char *const*argv,
++                       sqlite3_vtab **ppVtab,
++                       char **pzErr
++                       )
++{
++    return vsvtabConnect(db, pAux, argc, argv, ppVtab, pzErr);
++}
++
++/*
++** Destructor for a VsvCursor.
++*/
++static int vsvtabClose(sqlite3_vtab_cursor *cur)
++{
++    VsvCursor *pCur = (VsvCursor*)cur;
++    vsvtabCursorRowReset(pCur);
++    vsv_reader_reset(&pCur->rdr);
++    sqlite3_free(cur);
++    return SQLITE_OK;
++}
++
++/*
++** Constructor for a new VsvTable cursor object.
++*/
++static int vsvtabOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor)
++{
++    VsvTable *pTab = (VsvTable*)p;
++    VsvCursor *pCur;
++    size_t nByte;
++    nByte = sizeof(*pCur) + (sizeof(char*)+(2*sizeof(int)))*pTab->nCol;
++    pCur = sqlite3_malloc64( nByte );
++    if (pCur==0)
++        return SQLITE_NOMEM;
++    memset(pCur, 0, nByte);
++    pCur->azVal = (char**)&pCur[1];
++    pCur->aLen = (int*)&pCur->azVal[pTab->nCol];
++    pCur->dLen = (int*)&pCur->aLen[pTab->nCol];
++    pCur->rdr.fsep = pTab->fsep;
++    pCur->rdr.rsep = pTab->rsep;
++    pCur->rdr.affinity = pTab->affinity;
++    *ppCursor = &pCur->base;
++    if (vsv_reader_open(&pCur->rdr, pTab->zFilename, pTab->zData))
++    {
++        vsv_xfer_error(pTab, &pCur->rdr);
++        return SQLITE_ERROR;
++    }
++    return SQLITE_OK;
++}
++
++
++/*
++** Advance a VsvCursor to its next row of input.
++** Set the EOF marker if we reach the end of input.
++*/
++static int vsvtabNext(sqlite3_vtab_cursor *cur)
++{
++    VsvCursor *pCur = (VsvCursor*)cur;
++    VsvTable *pTab = (VsvTable*)cur->pVtab;
++    int i = 0;
++    char *z;
++    do
++    {
++        z = vsv_read_one_field(&pCur->rdr);
++        if (z==0)
++        {
++            if (inCol)
++                pCur->dLen[i] = -1;
++        }
++        else if (inCol)
++        {
++            if (pCur->aLen[i] < pCur->rdr.n+1)
++            {
++                char *zNew = sqlite3_realloc64(pCur->azVal[i], pCur->rdr.n+1);
++                if (zNew==0)
++                {
++                    z = 0;
++                    vsv_errmsg(&pCur->rdr, "out of memory");
++                    vsv_xfer_error(pTab, &pCur->rdr);
++                    break;
++                }
++                pCur->azVal[i] = zNew;
++                pCur->aLen[i] = pCur->rdr.n+1;
++            }
++            if (!pCur->rdr.notNull && pTab->nulls)
++            {
++                pCur->dLen[i] = -1;
++            }
++            else
++            {
++                pCur->dLen[i] = pCur->rdr.n;
++                memcpy(pCur->azVal[i], z, pCur->rdr.n+1);
++            }
++            i++;
++        }
++    }
++    while (pCur->rdr.cTerm==pCur->rdr.fsep);
++    if ((pCur->rdr.cTerm==EOF && i==0))
++    {
++        pCur->iRowid = -1;
++    }
++    else
++    {
++        pCur->iRowid++;
++        while (inCol)
++        {
++            pCur->dLen[i] = -1;
++            i++;
++        }
++    }
++    return SQLITE_OK;
++}
++
++/*
++**
++** Determine affinity of field
++**
++** ignore leading space
++** then may have + or -
++** then may have digits or . (if . found then type=real)
++** then may have digits (if another . then not number)
++** then may have e (if found then type=real)
++** then may have + or -
++** then may have digits
++** then may have trailing space
++*/
++static int vsv_isValidNumber(char *arg)
++{
++    char *start;
++    char *stop;
++    int isValid = 0;
++    int hasDigit = 0;
++
++    start = arg;
++    stop = arg + strlen(arg) - 1;
++    while (start <= stop && *start==' ')                // strip spaces from begining
++    {
++        start++;
++    }
++    while (start <= stop && *stop==' ')                 // strip spaces from end
++    {
++        stop--;
++    }
++    if (start > stop)
++    {
++        goto vsv_end_isValidNumber;
++    }
++    if (start <= stop && (*start=='+' || *start=='-'))  // may have + or -
++    {
++        start++;
++    }
++    if (start <= stop && isdigit(*start))               // must have a digit to be valid
++    {
++        hasDigit = 1;
++        isValid = 1;
++    }
++    while (start <= stop && isdigit(*start))            // bunch of digits
++    {
++        start++;
++    }
++    if (start <= stop && *start=='.')                   // may have .
++    {
++        isValid = 2;
++        start++;
++    }
++    if (start <= stop && isdigit(*start))
++    {
++        hasDigit = 1;
++    }
++    while (start <= stop && isdigit(*start))            // bunch of digits
++    {
++        start++;
++    }
++    if (!hasDigit)                                      // no digits then invalid
++    {
++        isValid = 0;
++        goto vsv_end_isValidNumber;
++    }
++    if (start <= stop && (*start=='e' || *start=='E'))  // may have 'e' or 'E'
++    {
++        isValid = 3;
++        start++;
++    }
++    if (start <= stop && isValid == 3 && (*start == '+' || *start == '-'))
++    {
++        start++;
++    }
++    if (start <= stop && isValid == 3 && isdigit(*start))
++    {
++        isValid = 2;
++    }
++    while (start <= stop && isdigit(*start))            // bunch of digits
++    {
++        start++;
++    }
++    if (isValid == 3)
++    {
++        isValid = 0;
++    }
++vsv_end_isValidNumber:
++    if (start <= stop)
++    {
++        isValid = 0;
++    }
++    return isValid;
++}
++
++
++/*
++** Validate UTF-8
++** Return -1 if invalid else length
++*/
++static long long vsv_utf8IsValid(char *string)
++{
++    long long length = 0;
++    unsigned char *start;
++    int trailing = 0;
++    unsigned char c;
++
++    start = (unsigned char *)string;
++    while ((c = *start))
++    {
++        if (trailing)
++        {
++            if ((c & 0xC0) == 0x80)
++            {
++                trailing--;
++                start++;
++                length++;
++                continue;
++            }
++            else
++            {
++                length = -1;
++                break;
++            }
++        }
++        if ((c & 0x80) == 0)
++        {
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xE0) == 0xC0)
++        {
++            trailing = 1;
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xF0) == 0xE0)
++        {
++            trailing = 2;
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xF8) == 0xF0)
++        {
++            trailing = 3;
++            start++;
++            length++;
++            continue;
++        }
++#if 0   // UTF-8 does not encode sequences longer than 4 bytes (yet)
++        if ((c & 0xFC) == 0xF8)
++        {
++            trailing = 4;
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xFE) == 0xFC)
++        {
++            trailing = 5;
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xFF) == 0xFE)
++        {
++            trailing = 6;
++            start++;
++            length++;
++            continue;
++        }
++        if ((c & 0xFF) == 0xFF)
++        {
++            trailing = 7;
++            start++;
++            length++;
++            continue;
++        }
++#endif
++        length = -1;
++        break;
++    }
++    return length;
++}
++
++/*
++** Return values of columns for the row at which the VsvCursor
++** is currently pointing.
++*/
++static int vsvtabColumn(
++                       sqlite3_vtab_cursor *cur,   /* The cursor */
++                       sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++                       int i                       /* Which column to return */
++                       )
++{
++    VsvCursor *pCur = (VsvCursor*)cur;
++    VsvTable *pTab = (VsvTable*)cur->pVtab;
++    long long dLen = pCur->dLen[i];
++    long long length = 0;
++    static int hasExtended = 0;
++
++    if (i>=0 && inCol && pCur->azVal[i]!=0 && dLen>-1)
++    {
++        switch (pTab->affinity)
++        {
++            case 0:
++            {
++                if (pTab->validateUTF8)
++                {
++                    length = vsv_utf8IsValid(pCur->azVal[i]);
++                    if (length == dLen)
++                    {
++                        sqlite3_result_text(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                    }
++                    else
++                    {
++                        sqlite3_result_error(ctx, "Invalid UTF8 Data", -1);
++                    }
++                }
++                else
++                {
++                    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++                }
++                break;
++            }
++            case 1:
++            {
++                sqlite3_result_blob(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                break;
++            }
++            case 2:
++            {
++                if (pTab->validateUTF8)
++                {
++                    length = vsv_utf8IsValid(pCur->azVal[i]);
++                    if (length < dLen)
++                    {
++                        sqlite3_result_blob(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                    }
++                    else
++                    {
++                        sqlite3_result_text(ctx, pCur->azVal[i], length, SQLITE_TRANSIENT);
++                    }
++                }
++                else
++                {
++                    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++                }
++                break;
++            }
++            case 3:
++            {
++                switch (vsv_isValidNumber(pCur->azVal[i]))
++                {
++                    case 1:
++                    {
++                        sqlite3_result_int64(ctx, strtoll(pCur->azVal[i], 0, 10));
++                        break;
++                    }
++                    default:
++                    {
++                        if (pTab->validateUTF8)
++                        {
++                            length = vsv_utf8IsValid(pCur->azVal[i]);
++                            if (length < dLen)
++                            {
++                                sqlite3_result_blob(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                            }
++                            else
++                            {
++                                sqlite3_result_text(ctx, pCur->azVal[i], length, SQLITE_TRANSIENT);
++                            }
++                        }
++                        else
++                        {
++                            sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++                        }
++                        break;
++                    }
++                }
++                break;
++            }
++            case 4:
++            {
++                switch (vsv_isValidNumber(pCur->azVal[i]))
++                {
++                    case 1:
++                    case 2:
++                    {
++                        sqlite3_result_double(ctx, strtod(pCur->azVal[i], 0));
++                        break;
++                    }
++                    default:
++                    {
++                        if (pTab->validateUTF8)
++                        {
++                            length = vsv_utf8IsValid(pCur->azVal[i]);
++                            if (length < dLen)
++                            {
++                                sqlite3_result_blob(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                            }
++                            else
++                            {
++                                sqlite3_result_text(ctx, pCur->azVal[i], length, SQLITE_TRANSIENT);
++                            }
++                        }
++                        else
++                        {
++                            sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++                        }
++                        break;
++                    }
++                }
++                break;
++            }
++            case 5:
++            {
++                switch (vsv_isValidNumber(pCur->azVal[i]))
++                {
++                    case 1:
++                    {
++                        sqlite_int64 ival;
++
++                        ival = strtoll(pCur->azVal[i], 0, 10);
++                        if (ival > LLONG_MIN && ival < LLONG_MAX) {
++                            sqlite3_result_int64(ctx, ival);
++                            break;
++                        }
++
++                    }
++                    case 2:
++                    {
++                        LONGDOUBLE_TYPE dv, fp, ip;
++
++#if defined(SQLITE_USE_QUADMATH) && defined(__GNUC__) && defined(_WIN64)
++                        if (!hasExtended) hasExtended = 1;
++#else
++                        if (!hasExtended) {
++                            if (sizeof(long double) > sizeof(double)) {
++                                volatile unsigned long long i = ULLONG_MAX;
++                                volatile long double l;
++                                volatile double d;
++                                l = i;
++                                d = i;
++                                hasExtended = (d == l) ? -1 : 1;
++                            } else {
++                                hasExtended = -1;
++                            }
++                        }
++#endif
++
++                        dv = strtold(pCur->azVal[i], 0);
++                        fp = modfl(dv, &ip);
++                        if (hasExtended<0)
++                        {
++                            if (fp==0.0L && ip >= -9007199254740991LL && dv <= 9007199254740991LL)
++                            {
++                                sqlite3_result_int64(ctx, (long long)ip);
++                            }
++                            else
++                            {
++                                sqlite3_result_double(ctx, dv);
++                            }
++                        }
++                        else
++                        {
++                            if (fp==0.0L && ip >= LLONG_MIN && ip <= LLONG_MAX)
++                            {
++                                sqlite3_result_int64(ctx, (long long)ip);
++                            }
++                            else
++                            {
++                                sqlite3_result_double(ctx, dv);
++                            }
++                        }
++                        break;
++                    }
++                    default:
++                    {
++                        if (pTab->validateUTF8)
++                        {
++                            length = vsv_utf8IsValid(pCur->azVal[i]);
++                            if (length < dLen)
++                            {
++                                sqlite3_result_blob(ctx, pCur->azVal[i], dLen, SQLITE_TRANSIENT);
++                            }
++                            else
++                            {
++                                sqlite3_result_text(ctx, pCur->azVal[i], length, SQLITE_TRANSIENT);
++                            }
++                        }
++                        else
++                        {
++                            sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
++                        }
++                        break;
++                    }
++                }
++            }
++        }
++    }
++    return SQLITE_OK;
++}
++
++/*
++** Return the rowid for the current row.
++*/
++static int vsvtabRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid)
++{
++    VsvCursor *pCur = (VsvCursor*)cur;
++    *pRowid = pCur->iRowid;
++    return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the cursor has been moved off of the last
++** row of output.
++*/
++static int vsvtabEof(sqlite3_vtab_cursor *cur)
++{
++    VsvCursor *pCur = (VsvCursor*)cur;
++    return pCur->iRowid<0;
++}
++
++/*
++** Only a full table scan is supported.  So xFilter simply rewinds to
++** the beginning.
++*/
++static int vsvtabFilter(
++                       sqlite3_vtab_cursor *pVtabCursor,
++                       int idxNum, const char *idxStr,
++                       int argc, sqlite3_value **argv
++                       )
++{
++    VsvCursor *pCur = (VsvCursor*)pVtabCursor;
++    VsvTable *pTab = (VsvTable*)pVtabCursor->pVtab;
++    pCur->iRowid = 0;
++
++    /* Ensure the field buffer is always allocated. Otherwise, if the
++    ** first field is zero bytes in size, this may be mistaken for an OOM
++    ** error in csvtabNext(). */
++    if( vsv_append(&pCur->rdr, 0) ) return SQLITE_NOMEM;
++
++    if (pCur->rdr.in==0)
++    {
++        assert( pCur->rdr.zIn==pTab->zData );
++        assert( pTab->iStart>=0 );
++        assert( (size_t)pTab->iStart<=pCur->rdr.nIn );
++        pCur->rdr.iIn = pTab->iStart;
++    }
++    else
++    {
++        fseek(pCur->rdr.in, pTab->iStart, SEEK_SET);
++        pCur->rdr.iIn = 0;
++        pCur->rdr.nIn = 0;
++    }
++    return vsvtabNext(pVtabCursor);
++}
++
++/*
++** Only a forward full table scan is supported.  xBestIndex is mostly
++** a no-op.  If VSVTEST_FIDX is set, then the presence of equality
++** constraints lowers the estimated cost, which is fiction, but is useful
++** for testing certain kinds of virtual table behavior.
++*/
++static int vsvtabBestIndex(
++                          sqlite3_vtab *tab,
++                          sqlite3_index_info *pIdxInfo
++                          )
++{
++    pIdxInfo->estimatedCost = 1000000;
++#ifdef SQLITE_TEST
++    if ((((VsvTable*)tab)->tstFlags & VSVTEST_FIDX)!=0)
++    {
++        /* The usual (and sensible) case is to always do a full table scan.
++        ** The code in this branch only runs when testflags=1.  This code
++        ** generates an artifical and unrealistic plan which is useful
++        ** for testing virtual table logic but is not helpful to real applications.
++        **
++        ** Any ==, LIKE, or GLOB constraint is marked as usable by the virtual
++        ** table (even though it is not) and the cost of running the virtual table
++        ** is reduced from 1 million to just 10.  The constraints are *not* marked
++        ** as omittable, however, so the query planner should still generate a
++        ** plan that gives a correct answer, even if they plan is not optimal.
++        */
++        int i;
++        int nConst = 0;
++        for (i=0; inConstraint; i++)
++        {
++            unsigned char op;
++            if (pIdxInfo->aConstraint[i].usable==0) continue;
++            op = pIdxInfo->aConstraint[i].op;
++            if (op==SQLITE_INDEX_CONSTRAINT_EQ
++                || op==SQLITE_INDEX_CONSTRAINT_LIKE
++                || op==SQLITE_INDEX_CONSTRAINT_GLOB
++               )
++            {
++                pIdxInfo->estimatedCost = 10;
++                pIdxInfo->aConstraintUsage[nConst].argvIndex = nConst+1;
++                nConst++;
++            }
++        }
++    }
++#endif
++    return SQLITE_OK;
++}
++
++
++static sqlite3_module VsvModule = {
++    0,                       /* iVersion */
++    vsvtabCreate,            /* xCreate */
++    vsvtabConnect,           /* xConnect */
++    vsvtabBestIndex,         /* xBestIndex */
++    vsvtabDisconnect,        /* xDisconnect */
++    vsvtabDisconnect,        /* xDestroy */
++    vsvtabOpen,              /* xOpen - open a cursor */
++    vsvtabClose,             /* xClose - close a cursor */
++    vsvtabFilter,            /* xFilter - configure scan constraints */
++    vsvtabNext,              /* xNext - advance a cursor */
++    vsvtabEof,               /* xEof - check for end of scan */
++    vsvtabColumn,            /* xColumn - read data */
++    vsvtabRowid,             /* xRowid - read data */
++    0,                       /* xUpdate */
++    0,                       /* xBegin */
++    0,                       /* xSync */
++    0,                       /* xCommit */
++    0,                       /* xRollback */
++    0,                       /* xFindMethod */
++    0,                       /* xRename */
++};
++
++#ifdef SQLITE_TEST
++/*
++** For virtual table testing, make a version of the VSV virtual table
++** available that has an xUpdate function.  But the xUpdate always returns
++** SQLITE_READONLY since the VSV file is not really writable.
++*/
++static int vsvtabUpdate(sqlite3_vtab *p,int n,sqlite3_value**v,sqlite3_int64*x)
++{
++    return SQLITE_READONLY;
++}
++static sqlite3_module VsvModuleFauxWrite = {
++    0,                       /* iVersion */
++    vsvtabCreate,            /* xCreate */
++    vsvtabConnect,           /* xConnect */
++    vsvtabBestIndex,         /* xBestIndex */
++    vsvtabDisconnect,        /* xDisconnect */
++    vsvtabDisconnect,        /* xDestroy */
++    vsvtabOpen,              /* xOpen - open a cursor */
++    vsvtabClose,             /* xClose - close a cursor */
++    vsvtabFilter,            /* xFilter - configure scan constraints */
++    vsvtabNext,              /* xNext - advance a cursor */
++    vsvtabEof,               /* xEof - check for end of scan */
++    vsvtabColumn,            /* xColumn - read data */
++    vsvtabRowid,             /* xRowid - read data */
++    vsvtabUpdate,            /* xUpdate */
++    0,                       /* xBegin */
++    0,                       /* xSync */
++    0,                       /* xCommit */
++    0,                       /* xRollback */
++    0,                       /* xFindMethod */
++    0,                       /* xRename */
++};
++#endif /* SQLITE_TEST */
++
++#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */
++
++/*
++** This routine is called when the extension is loaded.  The new
++** VSV virtual table module is registered with the calling database
++** connection.
++*/
++#ifndef SQLITE_CORE
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++#endif
++int sqlite3_vsv_init(
++                    sqlite3 *db,
++                    char **pzErrMsg,
++                    const sqlite3_api_routines *pApi
++                    )
++{
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++    int rc;
++    SQLITE_EXTENSION_INIT2(pApi);
++    rc = sqlite3_create_module(db, "vsv", &VsvModule, 0);
++#ifdef SQLITE_TEST
++    if (rc==SQLITE_OK)
++    {
++        rc = sqlite3_create_module(db, "vsv_wr", &VsvModuleFauxWrite, 0);
++    }
++#endif
++    return rc;
++#else
++    return SQLITE_OK;
++#endif
++}
++
++#undef modfl
++#undef strtold
++
++/*** End of #include "vsv.c" ***/
++
++#endif
++
++/*
++** SHA3
++*/
++#ifdef SQLITE_ENABLE_SHA3
++/* Prototype for initialization function of SHA3 extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_shathree_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "shathree.c" */
++/*** Begin of #include "shathree.c" ***/
++/*
++** 2017-03-08
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This SQLite extension implements functions that compute SHA3 hashes
++** in the way described by the (U.S.) NIST FIPS 202 SHA-3 Standard.
++** Two SQL functions are implemented:
++**
++**     sha3(X,SIZE)
++**     sha3_query(Y,SIZE)
++**
++** The sha3(X) function computes the SHA3 hash of the input X, or NULL if
++** X is NULL.
++**
++** The sha3_query(Y) function evaluates all queries in the SQL statements of Y
++** and returns a hash of their results.
++**
++** The SIZE argument is optional.  If omitted, the SHA3-256 hash algorithm
++** is used.  If SIZE is included it must be one of the integers 224, 256,
++** 384, or 512, to determine SHA3 hash variant that is computed.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++
++#ifndef SQLITE_AMALGAMATION
++typedef sqlite3_uint64 u64;
++#endif /* SQLITE_AMALGAMATION */
++
++/******************************************************************************
++** The Hash Engine
++*/
++/*
++** Macros to determine whether the machine is big or little endian,
++** and whether or not that determination is run-time or compile-time.
++**
++** For best performance, an attempt is made to guess at the byte-order
++** using C-preprocessor macros.  If that is unsuccessful, or if
++** -DSHA3_BYTEORDER=0 is set, then byte-order is determined
++** at run-time.
++*/
++#ifndef SHA3_BYTEORDER
++# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
++     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
++     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
++     defined(__arm__)
++#   define SHA3_BYTEORDER    1234
++# elif defined(sparc)    || defined(__ppc__)
++#   define SHA3_BYTEORDER    4321
++# else
++#   define SHA3_BYTEORDER 0
++# endif
++#endif
++
++
++/*
++** State structure for a SHA3 hash in progress
++*/
++typedef struct SHA3Context SHA3Context;
++struct SHA3Context {
++  union {
++    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
++    unsigned char x[1600];    /* ... or 1600 bytes */
++  } u;
++  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
++  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
++  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
++};
++
++/*
++** A single step of the Keccak mixing function for a 1600-bit state
++*/
++static void KeccakF1600Step(SHA3Context *p){
++  int i;
++  u64 b0, b1, b2, b3, b4;
++  u64 c0, c1, c2, c3, c4;
++  u64 d0, d1, d2, d3, d4;
++  static const u64 RC[] = {
++    0x0000000000000001ULL,  0x0000000000008082ULL,
++    0x800000000000808aULL,  0x8000000080008000ULL,
++    0x000000000000808bULL,  0x0000000080000001ULL,
++    0x8000000080008081ULL,  0x8000000000008009ULL,
++    0x000000000000008aULL,  0x0000000000000088ULL,
++    0x0000000080008009ULL,  0x000000008000000aULL,
++    0x000000008000808bULL,  0x800000000000008bULL,
++    0x8000000000008089ULL,  0x8000000000008003ULL,
++    0x8000000000008002ULL,  0x8000000000000080ULL,
++    0x000000000000800aULL,  0x800000008000000aULL,
++    0x8000000080008081ULL,  0x8000000000008080ULL,
++    0x0000000080000001ULL,  0x8000000080008008ULL
++  };
++# define a00 (p->u.s[0])
++# define a01 (p->u.s[1])
++# define a02 (p->u.s[2])
++# define a03 (p->u.s[3])
++# define a04 (p->u.s[4])
++# define a10 (p->u.s[5])
++# define a11 (p->u.s[6])
++# define a12 (p->u.s[7])
++# define a13 (p->u.s[8])
++# define a14 (p->u.s[9])
++# define a20 (p->u.s[10])
++# define a21 (p->u.s[11])
++# define a22 (p->u.s[12])
++# define a23 (p->u.s[13])
++# define a24 (p->u.s[14])
++# define a30 (p->u.s[15])
++# define a31 (p->u.s[16])
++# define a32 (p->u.s[17])
++# define a33 (p->u.s[18])
++# define a34 (p->u.s[19])
++# define a40 (p->u.s[20])
++# define a41 (p->u.s[21])
++# define a42 (p->u.s[22])
++# define a43 (p->u.s[23])
++# define a44 (p->u.s[24])
++# define ROL64(a,x) ((a<>(64-x)))
++
++  for(i=0; i<24; i+=4){
++    c0 = a00^a10^a20^a30^a40;
++    c1 = a01^a11^a21^a31^a41;
++    c2 = a02^a12^a22^a32^a42;
++    c3 = a03^a13^a23^a33^a43;
++    c4 = a04^a14^a24^a34^a44;
++    d0 = c4^ROL64(c1, 1);
++    d1 = c0^ROL64(c2, 1);
++    d2 = c1^ROL64(c3, 1);
++    d3 = c2^ROL64(c4, 1);
++    d4 = c3^ROL64(c0, 1);
++
++    b0 = (a00^d0);
++    b1 = ROL64((a11^d1), 44);
++    b2 = ROL64((a22^d2), 43);
++    b3 = ROL64((a33^d3), 21);
++    b4 = ROL64((a44^d4), 14);
++    a00 =   b0 ^((~b1)&  b2 );
++    a00 ^= RC[i];
++    a11 =   b1 ^((~b2)&  b3 );
++    a22 =   b2 ^((~b3)&  b4 );
++    a33 =   b3 ^((~b4)&  b0 );
++    a44 =   b4 ^((~b0)&  b1 );
++
++    b2 = ROL64((a20^d0), 3);
++    b3 = ROL64((a31^d1), 45);
++    b4 = ROL64((a42^d2), 61);
++    b0 = ROL64((a03^d3), 28);
++    b1 = ROL64((a14^d4), 20);
++    a20 =   b0 ^((~b1)&  b2 );
++    a31 =   b1 ^((~b2)&  b3 );
++    a42 =   b2 ^((~b3)&  b4 );
++    a03 =   b3 ^((~b4)&  b0 );
++    a14 =   b4 ^((~b0)&  b1 );
++
++    b4 = ROL64((a40^d0), 18);
++    b0 = ROL64((a01^d1), 1);
++    b1 = ROL64((a12^d2), 6);
++    b2 = ROL64((a23^d3), 25);
++    b3 = ROL64((a34^d4), 8);
++    a40 =   b0 ^((~b1)&  b2 );
++    a01 =   b1 ^((~b2)&  b3 );
++    a12 =   b2 ^((~b3)&  b4 );
++    a23 =   b3 ^((~b4)&  b0 );
++    a34 =   b4 ^((~b0)&  b1 );
++
++    b1 = ROL64((a10^d0), 36);
++    b2 = ROL64((a21^d1), 10);
++    b3 = ROL64((a32^d2), 15);
++    b4 = ROL64((a43^d3), 56);
++    b0 = ROL64((a04^d4), 27);
++    a10 =   b0 ^((~b1)&  b2 );
++    a21 =   b1 ^((~b2)&  b3 );
++    a32 =   b2 ^((~b3)&  b4 );
++    a43 =   b3 ^((~b4)&  b0 );
++    a04 =   b4 ^((~b0)&  b1 );
++
++    b3 = ROL64((a30^d0), 41);
++    b4 = ROL64((a41^d1), 2);
++    b0 = ROL64((a02^d2), 62);
++    b1 = ROL64((a13^d3), 55);
++    b2 = ROL64((a24^d4), 39);
++    a30 =   b0 ^((~b1)&  b2 );
++    a41 =   b1 ^((~b2)&  b3 );
++    a02 =   b2 ^((~b3)&  b4 );
++    a13 =   b3 ^((~b4)&  b0 );
++    a24 =   b4 ^((~b0)&  b1 );
++
++    c0 = a00^a20^a40^a10^a30;
++    c1 = a11^a31^a01^a21^a41;
++    c2 = a22^a42^a12^a32^a02;
++    c3 = a33^a03^a23^a43^a13;
++    c4 = a44^a14^a34^a04^a24;
++    d0 = c4^ROL64(c1, 1);
++    d1 = c0^ROL64(c2, 1);
++    d2 = c1^ROL64(c3, 1);
++    d3 = c2^ROL64(c4, 1);
++    d4 = c3^ROL64(c0, 1);
++
++    b0 = (a00^d0);
++    b1 = ROL64((a31^d1), 44);
++    b2 = ROL64((a12^d2), 43);
++    b3 = ROL64((a43^d3), 21);
++    b4 = ROL64((a24^d4), 14);
++    a00 =   b0 ^((~b1)&  b2 );
++    a00 ^= RC[i+1];
++    a31 =   b1 ^((~b2)&  b3 );
++    a12 =   b2 ^((~b3)&  b4 );
++    a43 =   b3 ^((~b4)&  b0 );
++    a24 =   b4 ^((~b0)&  b1 );
++
++    b2 = ROL64((a40^d0), 3);
++    b3 = ROL64((a21^d1), 45);
++    b4 = ROL64((a02^d2), 61);
++    b0 = ROL64((a33^d3), 28);
++    b1 = ROL64((a14^d4), 20);
++    a40 =   b0 ^((~b1)&  b2 );
++    a21 =   b1 ^((~b2)&  b3 );
++    a02 =   b2 ^((~b3)&  b4 );
++    a33 =   b3 ^((~b4)&  b0 );
++    a14 =   b4 ^((~b0)&  b1 );
++
++    b4 = ROL64((a30^d0), 18);
++    b0 = ROL64((a11^d1), 1);
++    b1 = ROL64((a42^d2), 6);
++    b2 = ROL64((a23^d3), 25);
++    b3 = ROL64((a04^d4), 8);
++    a30 =   b0 ^((~b1)&  b2 );
++    a11 =   b1 ^((~b2)&  b3 );
++    a42 =   b2 ^((~b3)&  b4 );
++    a23 =   b3 ^((~b4)&  b0 );
++    a04 =   b4 ^((~b0)&  b1 );
++
++    b1 = ROL64((a20^d0), 36);
++    b2 = ROL64((a01^d1), 10);
++    b3 = ROL64((a32^d2), 15);
++    b4 = ROL64((a13^d3), 56);
++    b0 = ROL64((a44^d4), 27);
++    a20 =   b0 ^((~b1)&  b2 );
++    a01 =   b1 ^((~b2)&  b3 );
++    a32 =   b2 ^((~b3)&  b4 );
++    a13 =   b3 ^((~b4)&  b0 );
++    a44 =   b4 ^((~b0)&  b1 );
++
++    b3 = ROL64((a10^d0), 41);
++    b4 = ROL64((a41^d1), 2);
++    b0 = ROL64((a22^d2), 62);
++    b1 = ROL64((a03^d3), 55);
++    b2 = ROL64((a34^d4), 39);
++    a10 =   b0 ^((~b1)&  b2 );
++    a41 =   b1 ^((~b2)&  b3 );
++    a22 =   b2 ^((~b3)&  b4 );
++    a03 =   b3 ^((~b4)&  b0 );
++    a34 =   b4 ^((~b0)&  b1 );
++
++    c0 = a00^a40^a30^a20^a10;
++    c1 = a31^a21^a11^a01^a41;
++    c2 = a12^a02^a42^a32^a22;
++    c3 = a43^a33^a23^a13^a03;
++    c4 = a24^a14^a04^a44^a34;
++    d0 = c4^ROL64(c1, 1);
++    d1 = c0^ROL64(c2, 1);
++    d2 = c1^ROL64(c3, 1);
++    d3 = c2^ROL64(c4, 1);
++    d4 = c3^ROL64(c0, 1);
++
++    b0 = (a00^d0);
++    b1 = ROL64((a21^d1), 44);
++    b2 = ROL64((a42^d2), 43);
++    b3 = ROL64((a13^d3), 21);
++    b4 = ROL64((a34^d4), 14);
++    a00 =   b0 ^((~b1)&  b2 );
++    a00 ^= RC[i+2];
++    a21 =   b1 ^((~b2)&  b3 );
++    a42 =   b2 ^((~b3)&  b4 );
++    a13 =   b3 ^((~b4)&  b0 );
++    a34 =   b4 ^((~b0)&  b1 );
++
++    b2 = ROL64((a30^d0), 3);
++    b3 = ROL64((a01^d1), 45);
++    b4 = ROL64((a22^d2), 61);
++    b0 = ROL64((a43^d3), 28);
++    b1 = ROL64((a14^d4), 20);
++    a30 =   b0 ^((~b1)&  b2 );
++    a01 =   b1 ^((~b2)&  b3 );
++    a22 =   b2 ^((~b3)&  b4 );
++    a43 =   b3 ^((~b4)&  b0 );
++    a14 =   b4 ^((~b0)&  b1 );
++
++    b4 = ROL64((a10^d0), 18);
++    b0 = ROL64((a31^d1), 1);
++    b1 = ROL64((a02^d2), 6);
++    b2 = ROL64((a23^d3), 25);
++    b3 = ROL64((a44^d4), 8);
++    a10 =   b0 ^((~b1)&  b2 );
++    a31 =   b1 ^((~b2)&  b3 );
++    a02 =   b2 ^((~b3)&  b4 );
++    a23 =   b3 ^((~b4)&  b0 );
++    a44 =   b4 ^((~b0)&  b1 );
++
++    b1 = ROL64((a40^d0), 36);
++    b2 = ROL64((a11^d1), 10);
++    b3 = ROL64((a32^d2), 15);
++    b4 = ROL64((a03^d3), 56);
++    b0 = ROL64((a24^d4), 27);
++    a40 =   b0 ^((~b1)&  b2 );
++    a11 =   b1 ^((~b2)&  b3 );
++    a32 =   b2 ^((~b3)&  b4 );
++    a03 =   b3 ^((~b4)&  b0 );
++    a24 =   b4 ^((~b0)&  b1 );
++
++    b3 = ROL64((a20^d0), 41);
++    b4 = ROL64((a41^d1), 2);
++    b0 = ROL64((a12^d2), 62);
++    b1 = ROL64((a33^d3), 55);
++    b2 = ROL64((a04^d4), 39);
++    a20 =   b0 ^((~b1)&  b2 );
++    a41 =   b1 ^((~b2)&  b3 );
++    a12 =   b2 ^((~b3)&  b4 );
++    a33 =   b3 ^((~b4)&  b0 );
++    a04 =   b4 ^((~b0)&  b1 );
++
++    c0 = a00^a30^a10^a40^a20;
++    c1 = a21^a01^a31^a11^a41;
++    c2 = a42^a22^a02^a32^a12;
++    c3 = a13^a43^a23^a03^a33;
++    c4 = a34^a14^a44^a24^a04;
++    d0 = c4^ROL64(c1, 1);
++    d1 = c0^ROL64(c2, 1);
++    d2 = c1^ROL64(c3, 1);
++    d3 = c2^ROL64(c4, 1);
++    d4 = c3^ROL64(c0, 1);
++
++    b0 = (a00^d0);
++    b1 = ROL64((a01^d1), 44);
++    b2 = ROL64((a02^d2), 43);
++    b3 = ROL64((a03^d3), 21);
++    b4 = ROL64((a04^d4), 14);
++    a00 =   b0 ^((~b1)&  b2 );
++    a00 ^= RC[i+3];
++    a01 =   b1 ^((~b2)&  b3 );
++    a02 =   b2 ^((~b3)&  b4 );
++    a03 =   b3 ^((~b4)&  b0 );
++    a04 =   b4 ^((~b0)&  b1 );
++
++    b2 = ROL64((a10^d0), 3);
++    b3 = ROL64((a11^d1), 45);
++    b4 = ROL64((a12^d2), 61);
++    b0 = ROL64((a13^d3), 28);
++    b1 = ROL64((a14^d4), 20);
++    a10 =   b0 ^((~b1)&  b2 );
++    a11 =   b1 ^((~b2)&  b3 );
++    a12 =   b2 ^((~b3)&  b4 );
++    a13 =   b3 ^((~b4)&  b0 );
++    a14 =   b4 ^((~b0)&  b1 );
++
++    b4 = ROL64((a20^d0), 18);
++    b0 = ROL64((a21^d1), 1);
++    b1 = ROL64((a22^d2), 6);
++    b2 = ROL64((a23^d3), 25);
++    b3 = ROL64((a24^d4), 8);
++    a20 =   b0 ^((~b1)&  b2 );
++    a21 =   b1 ^((~b2)&  b3 );
++    a22 =   b2 ^((~b3)&  b4 );
++    a23 =   b3 ^((~b4)&  b0 );
++    a24 =   b4 ^((~b0)&  b1 );
++
++    b1 = ROL64((a30^d0), 36);
++    b2 = ROL64((a31^d1), 10);
++    b3 = ROL64((a32^d2), 15);
++    b4 = ROL64((a33^d3), 56);
++    b0 = ROL64((a34^d4), 27);
++    a30 =   b0 ^((~b1)&  b2 );
++    a31 =   b1 ^((~b2)&  b3 );
++    a32 =   b2 ^((~b3)&  b4 );
++    a33 =   b3 ^((~b4)&  b0 );
++    a34 =   b4 ^((~b0)&  b1 );
++
++    b3 = ROL64((a40^d0), 41);
++    b4 = ROL64((a41^d1), 2);
++    b0 = ROL64((a42^d2), 62);
++    b1 = ROL64((a43^d3), 55);
++    b2 = ROL64((a44^d4), 39);
++    a40 =   b0 ^((~b1)&  b2 );
++    a41 =   b1 ^((~b2)&  b3 );
++    a42 =   b2 ^((~b3)&  b4 );
++    a43 =   b3 ^((~b4)&  b0 );
++    a44 =   b4 ^((~b0)&  b1 );
++  }
++}
++
++/*
++** Initialize a new hash.  iSize determines the size of the hash
++** in bits and should be one of 224, 256, 384, or 512.  Or iSize
++** can be zero to use the default hash size of 256 bits.
++*/
++static void SHA3Init(SHA3Context *p, int iSize){
++  memset(p, 0, sizeof(*p));
++  if( iSize>=128 && iSize<=512 ){
++    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
++  }else{
++    p->nRate = (1600 - 2*256)/8;
++  }
++#if SHA3_BYTEORDER==1234
++  /* Known to be little-endian at compile-time. No-op */
++#elif SHA3_BYTEORDER==4321
++  p->ixMask = 7;  /* Big-endian */
++#else
++  {
++    static unsigned int one = 1;
++    if( 1==*(unsigned char*)&one ){
++      /* Little endian.  No byte swapping. */
++      p->ixMask = 0;
++    }else{
++      /* Big endian.  Byte swap. */
++      p->ixMask = 7;
++    }
++  }
++#endif
++}
++
++/*
++** Make consecutive calls to the SHA3Update function to add new content
++** to the hash
++*/
++static void SHA3Update(
++  SHA3Context *p,
++  const unsigned char *aData,
++  unsigned int nData
++){
++  unsigned int i = 0;
++  if( aData==0 ) return;
++#if SHA3_BYTEORDER==1234
++  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
++    for(; i+7u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
++      p->nLoaded += 8;
++      if( p->nLoaded>=p->nRate ){
++        KeccakF1600Step(p);
++        p->nLoaded = 0;
++      }
++    }
++  }
++#endif
++  for(; iu.x[p->nLoaded] ^= aData[i];
++#elif SHA3_BYTEORDER==4321
++    p->u.x[p->nLoaded^0x07] ^= aData[i];
++#else
++    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
++#endif
++    p->nLoaded++;
++    if( p->nLoaded==p->nRate ){
++      KeccakF1600Step(p);
++      p->nLoaded = 0;
++    }
++  }
++}
++
++/*
++** After all content has been added, invoke SHA3Final() to compute
++** the final hash.  The function returns a pointer to the binary
++** hash value.
++*/
++static unsigned char *SHA3Final(SHA3Context *p){
++  unsigned int i;
++  if( p->nLoaded==p->nRate-1 ){
++    const unsigned char c1 = 0x86;
++    SHA3Update(p, &c1, 1);
++  }else{
++    const unsigned char c2 = 0x06;
++    const unsigned char c3 = 0x80;
++    SHA3Update(p, &c2, 1);
++    p->nLoaded = p->nRate - 1;
++    SHA3Update(p, &c3, 1);
++  }
++  for(i=0; inRate; i++){
++    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
++  }
++  return &p->u.x[p->nRate];
++}
++/* End of the hashing logic
++*****************************************************************************/
++
++/*
++** Implementation of the sha3(X,SIZE) function.
++**
++** Return a BLOB which is the SIZE-bit SHA3 hash of X.  The default
++** size is 256.  If X is a BLOB, it is hashed as is.  
++** For all other non-NULL types of input, X is converted into a UTF-8 string
++** and the string is hashed without the trailing 0x00 terminator.  The hash
++** of a NULL value is NULL.
++*/
++static void sha3Func(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  SHA3Context cx;
++  int eType = sqlite3_value_type(argv[0]);
++  int nByte = sqlite3_value_bytes(argv[0]);
++  int iSize;
++  if( argc==1 ){
++    iSize = 256;
++  }else{
++    iSize = sqlite3_value_int(argv[1]);
++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
++                                    "384 512", -1);
++      return;
++    }
++  }
++  if( eType==SQLITE_NULL ) return;
++  SHA3Init(&cx, iSize);
++  if( eType==SQLITE_BLOB ){
++    SHA3Update(&cx, sqlite3_value_blob(argv[0]), nByte);
++  }else{
++    SHA3Update(&cx, sqlite3_value_text(argv[0]), nByte);
++  }
++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
++}
++
++/* Compute a string using sqlite3_vsnprintf() with a maximum length
++** of 50 bytes and add it to the hash.
++*/
++static void sha3_step_vformat(
++  SHA3Context *p,                 /* Add content to this context */
++  const char *zFormat,
++  ...
++){
++  va_list ap;
++  int n;
++  char zBuf[50];
++  va_start(ap, zFormat);
++  sqlite3_vsnprintf(sizeof(zBuf),zBuf,zFormat,ap);
++  va_end(ap);
++  n = (int)strlen(zBuf);
++  SHA3Update(p, (unsigned char*)zBuf, n);
++}
++
++/*
++** Implementation of the sha3_query(SQL,SIZE) function.
++**
++** This function compiles and runs the SQL statement(s) given in the
++** argument. The results are hashed using a SIZE-bit SHA3.  The default
++** size is 256.
++**
++** The format of the byte stream that is hashed is summarized as follows:
++**
++**       S:
++**       R
++**       N
++**       I
++**       F
++**       B:
++**       T:
++**
++**  is the original SQL text for each statement run and  is
++** the size of that text.  The SQL text is UTF-8.  A single R character
++** occurs before the start of each row.  N means a NULL value.
++** I mean an 8-byte little-endian integer .  F is a floating point
++** number with an 8-byte little-endian IEEE floating point value .
++** B means blobs of  bytes.  T means text rendered as 
++** bytes of UTF-8.  The  and  values are expressed as an ASCII
++** text integers.
++**
++** For each SQL statement in the X input, there is one S segment.  Each
++** S segment is followed by zero or more R segments, one for each row in the
++** result set.  After each R, there are one or more N, I, F, B, or T segments,
++** one for each column in the result set.  Segments are concatentated directly
++** with no delimiters of any kind.
++*/
++static void sha3QueryFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  sqlite3 *db = sqlite3_context_db_handle(context);
++  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
++  sqlite3_stmt *pStmt = 0;
++  int nCol;                   /* Number of columns in the result set */
++  int i;                      /* Loop counter */
++  int rc;
++  int n;
++  const char *z;
++  SHA3Context cx;
++  int iSize;
++
++  if( argc==1 ){
++    iSize = 256;
++  }else{
++    iSize = sqlite3_value_int(argv[1]);
++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
++                                    "384 512", -1);
++      return;
++    }
++  }
++  if( zSql==0 ) return;
++  SHA3Init(&cx, iSize);
++  while( zSql[0] ){
++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql);
++    if( rc ){
++      char *zMsg = sqlite3_mprintf("error SQL statement [%s]: %s",
++                                   zSql, sqlite3_errmsg(db));
++      sqlite3_finalize(pStmt);
++      sqlite3_result_error(context, zMsg, -1);
++      sqlite3_free(zMsg);
++      return;
++    }
++    if( !sqlite3_stmt_readonly(pStmt) ){
++      char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt));
++      sqlite3_finalize(pStmt);
++      sqlite3_result_error(context, zMsg, -1);
++      sqlite3_free(zMsg);
++      return;
++    }
++    nCol = sqlite3_column_count(pStmt);
++    z = sqlite3_sql(pStmt);
++    if( z ){
++      n = (int)strlen(z);
++      sha3_step_vformat(&cx,"S%d:",n);
++      SHA3Update(&cx,(unsigned char*)z,n);
++    }
++
++    /* Compute a hash over the result of the query */
++    while( SQLITE_ROW==sqlite3_step(pStmt) ){
++      SHA3Update(&cx,(const unsigned char*)"R",1);
++      for(i=0; i=1; j--){
++              x[j] = u & 0xff;
++              u >>= 8;
++            }
++            x[0] = 'I';
++            SHA3Update(&cx, x, 9);
++            break;
++          }
++          case SQLITE_FLOAT: {
++            sqlite3_uint64 u;
++            int j;
++            unsigned char x[9];
++            double r = sqlite3_column_double(pStmt,i);
++            memcpy(&u, &r, 8);
++            for(j=8; j>=1; j--){
++              x[j] = u & 0xff;
++              u >>= 8;
++            }
++            x[0] = 'F';
++            SHA3Update(&cx,x,9);
++            break;
++          }
++          case SQLITE_TEXT: {
++            int n2 = sqlite3_column_bytes(pStmt, i);
++            const unsigned char *z2 = sqlite3_column_text(pStmt, i);
++            sha3_step_vformat(&cx,"T%d:",n2);
++            SHA3Update(&cx, z2, n2);
++            break;
++          }
++          case SQLITE_BLOB: {
++            int n2 = sqlite3_column_bytes(pStmt, i);
++            const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
++            sha3_step_vformat(&cx,"B%d:",n2);
++            SHA3Update(&cx, z2, n2);
++            break;
++          }
++        }
++      }
++    }
++    sqlite3_finalize(pStmt);
++  }
++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
++}
++
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_shathree_init(
++  sqlite3 *db,
++  char **pzErrMsg,
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++  (void)pzErrMsg;  /* Unused parameter */
++  rc = sqlite3_create_function(db, "sha3", 1,
++                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
++                      0, sha3Func, 0, 0);
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "sha3", 2,
++                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
++                      0, sha3Func, 0, 0);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "sha3_query", 1,
++                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
++                      0, sha3QueryFunc, 0, 0);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "sha3_query", 2,
++                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
++                      0, sha3QueryFunc, 0, 0);
++  }
++  return rc;
++}
++/*** End of #include "shathree.c" ***/
++
++#endif
++
++/*
++** CARRAY
++*/
++#ifdef SQLITE_ENABLE_CARRAY
++/* Prototype for initialization function of CARRAY extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_carray_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "carray.c" */
++/*** Begin of #include "carray.c" ***/
++/*
++** 2016-06-29
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++**
++** This file demonstrates how to create a table-valued-function that
++** returns the values in a C-language array.
++** Examples:
++**
++**      SELECT * FROM carray($ptr,5)
++**
++** The query above returns 5 integers contained in a C-language array
++** at the address $ptr.  $ptr is a pointer to the array of integers.
++** The pointer value must be assigned to $ptr using the
++** sqlite3_bind_pointer() interface with a pointer type of "carray".
++** For example:
++**
++**    static int aX[] = { 53, 9, 17, 2231, 4, 99 };
++**    int i = sqlite3_bind_parameter_index(pStmt, "$ptr");
++**    sqlite3_bind_pointer(pStmt, i, aX, "carray", 0);
++**
++** There is an optional third parameter to determine the datatype of
++** the C-language array.  Allowed values of the third parameter are
++** 'int32', 'int64', 'double', 'char*', 'struct iovec'.  Example:
++**
++**      SELECT * FROM carray($ptr,10,'char*');
++**
++** The default value of the third parameter is 'int32'.
++**
++** HOW IT WORKS
++**
++** The carray "function" is really a virtual table with the
++** following schema:
++**
++**     CREATE TABLE carray(
++**       value,
++**       pointer HIDDEN,
++**       count HIDDEN,
++**       ctype TEXT HIDDEN
++**     );
++**
++** If the hidden columns "pointer" and "count" are unconstrained, then 
++** the virtual table has no rows.  Otherwise, the virtual table interprets
++** the integer value of "pointer" as a pointer to the array and "count"
++** as the number of elements in the array.  The virtual table steps through
++** the array, element by element.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#ifdef _WIN32
++  struct iovec {
++    void *iov_base;
++    size_t iov_len;
++  };
++#else
++# include 
++#endif
++ 
++/* Allowed values for the mFlags parameter to sqlite3_carray_bind().
++** Must exactly match the definitions in carray.h.
++*/
++#ifndef CARRAY_INT32
++# define CARRAY_INT32     0      /* Data is 32-bit signed integers */
++# define CARRAY_INT64     1      /* Data is 64-bit signed integers */
++# define CARRAY_DOUBLE    2      /* Data is doubles */
++# define CARRAY_TEXT      3      /* Data is char* */
++# define CARRAY_BLOB      4      /* Data is struct iovec* */
++#endif
++
++#ifndef SQLITE_API
++# ifdef _WIN32
++#  define SQLITE_API __declspec(dllexport)
++# else
++#  define SQLITE_API
++# endif
++#endif
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++
++/*
++** Names of allowed datatypes
++*/
++static const char *azType[] = { "int32", "int64", "double", "char*",
++                                "struct iovec" };
++
++/*
++** Structure used to hold the sqlite3_carray_bind() information
++*/
++typedef struct carray_bind carray_bind;
++struct carray_bind {
++  void *aData;                /* The data */
++  int nData;                  /* Number of elements */
++  int mFlags;                 /* Control flags */
++  void (*xDel)(void*);        /* Destructor for aData */
++};
++
++
++/* carray_cursor is a subclass of sqlite3_vtab_cursor which will
++** serve as the underlying representation of a cursor that scans
++** over rows of the result
++*/
++typedef struct carray_cursor carray_cursor;
++struct carray_cursor {
++  sqlite3_vtab_cursor base;  /* Base class - must be first */
++  sqlite3_int64 iRowid;      /* The rowid */
++  void *pPtr;                /* Pointer to the array of values */
++  sqlite3_int64 iCnt;        /* Number of integers in the array */
++  unsigned char eType;       /* One of the CARRAY_type values */
++};
++
++/*
++** The carrayConnect() method is invoked to create a new
++** carray_vtab that describes the carray virtual table.
++**
++** Think of this routine as the constructor for carray_vtab objects.
++**
++** All this routine needs to do is:
++**
++**    (1) Allocate the carray_vtab object and initialize all fields.
++**
++**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
++**        result set of queries against carray will look like.
++*/
++static int carrayConnect(
++  sqlite3 *db,
++  void *pAux,
++  int argc, const char *const*argv,
++  sqlite3_vtab **ppVtab,
++  char **pzErr
++){
++  sqlite3_vtab *pNew;
++  int rc;
++
++/* Column numbers */
++#define CARRAY_COLUMN_VALUE   0
++#define CARRAY_COLUMN_POINTER 1
++#define CARRAY_COLUMN_COUNT   2
++#define CARRAY_COLUMN_CTYPE   3
++
++  rc = sqlite3_declare_vtab(db,
++     "CREATE TABLE x(value,pointer hidden,count hidden,ctype hidden)");
++  if( rc==SQLITE_OK ){
++    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
++    if( pNew==0 ) return SQLITE_NOMEM;
++    memset(pNew, 0, sizeof(*pNew));
++  }
++  return rc;
++}
++
++/*
++** This method is the destructor for carray_cursor objects.
++*/
++static int carrayDisconnect(sqlite3_vtab *pVtab){
++  sqlite3_free(pVtab);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new carray_cursor object.
++*/
++static int carrayOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
++  carray_cursor *pCur;
++  pCur = sqlite3_malloc( sizeof(*pCur) );
++  if( pCur==0 ) return SQLITE_NOMEM;
++  memset(pCur, 0, sizeof(*pCur));
++  *ppCursor = &pCur->base;
++  return SQLITE_OK;
++}
++
++/*
++** Destructor for a carray_cursor.
++*/
++static int carrayClose(sqlite3_vtab_cursor *cur){
++  sqlite3_free(cur);
++  return SQLITE_OK;
++}
++
++
++/*
++** Advance a carray_cursor to its next row of output.
++*/
++static int carrayNext(sqlite3_vtab_cursor *cur){
++  carray_cursor *pCur = (carray_cursor*)cur;
++  pCur->iRowid++;
++  return SQLITE_OK;
++}
++
++/*
++** Return values of columns for the row at which the carray_cursor
++** is currently pointing.
++*/
++static int carrayColumn(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  carray_cursor *pCur = (carray_cursor*)cur;
++  sqlite3_int64 x = 0;
++  switch( i ){
++    case CARRAY_COLUMN_POINTER:   return SQLITE_OK;
++    case CARRAY_COLUMN_COUNT:     x = pCur->iCnt;   break;
++    case CARRAY_COLUMN_CTYPE: {
++      sqlite3_result_text(ctx, azType[pCur->eType], -1, SQLITE_STATIC);
++      return SQLITE_OK;
++    }
++    default: {
++      switch( pCur->eType ){
++        case CARRAY_INT32: {
++          int *p = (int*)pCur->pPtr;
++          sqlite3_result_int(ctx, p[pCur->iRowid-1]);
++          return SQLITE_OK;
++        }
++        case CARRAY_INT64: {
++          sqlite3_int64 *p = (sqlite3_int64*)pCur->pPtr;
++          sqlite3_result_int64(ctx, p[pCur->iRowid-1]);
++          return SQLITE_OK;
++        }
++        case CARRAY_DOUBLE: {
++          double *p = (double*)pCur->pPtr;
++          sqlite3_result_double(ctx, p[pCur->iRowid-1]);
++          return SQLITE_OK;
++        }
++        case CARRAY_TEXT: {
++          const char **p = (const char**)pCur->pPtr;
++          sqlite3_result_text(ctx, p[pCur->iRowid-1], -1, SQLITE_TRANSIENT);
++          return SQLITE_OK;
++        }
++        case CARRAY_BLOB: {
++          const struct iovec *p = (struct iovec*)pCur->pPtr;
++          sqlite3_result_blob(ctx, p[pCur->iRowid-1].iov_base,
++                               (int)p[pCur->iRowid-1].iov_len, SQLITE_TRANSIENT);
++          return SQLITE_OK;
++        }
++      }
++    }
++  }
++  sqlite3_result_int64(ctx, x);
++  return SQLITE_OK;
++}
++
++/*
++** Return the rowid for the current row.  In this implementation, the
++** rowid is the same as the output value.
++*/
++static int carrayRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
++  carray_cursor *pCur = (carray_cursor*)cur;
++  *pRowid = pCur->iRowid;
++  return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the cursor has been moved off of the last
++** row of output.
++*/
++static int carrayEof(sqlite3_vtab_cursor *cur){
++  carray_cursor *pCur = (carray_cursor*)cur;
++  return pCur->iRowid>pCur->iCnt;
++}
++
++/*
++** This method is called to "rewind" the carray_cursor object back
++** to the first row of output.
++*/
++static int carrayFilter(
++  sqlite3_vtab_cursor *pVtabCursor, 
++  int idxNum, const char *idxStr,
++  int argc, sqlite3_value **argv
++){
++  carray_cursor *pCur = (carray_cursor *)pVtabCursor;
++  pCur->pPtr = 0;
++  pCur->iCnt = 0;
++  switch( idxNum ){
++    case 1: {
++      carray_bind *pBind = sqlite3_value_pointer(argv[0], "carray-bind");
++      if( pBind==0 ) break;
++      pCur->pPtr = pBind->aData;
++      pCur->iCnt = pBind->nData;
++      pCur->eType = pBind->mFlags & 0x07;
++      break;
++    }
++    case 2:
++    case 3: {
++      pCur->pPtr = sqlite3_value_pointer(argv[0], "carray");
++      pCur->iCnt = pCur->pPtr ? sqlite3_value_int64(argv[1]) : 0;
++      if( idxNum<3 ){
++        pCur->eType = CARRAY_INT32;
++      }else{
++        unsigned char i;
++        const char *zType = (const char*)sqlite3_value_text(argv[2]);
++        for(i=0; i=sizeof(azType)/sizeof(azType[0]) ){
++          pVtabCursor->pVtab->zErrMsg = sqlite3_mprintf(
++            "unknown datatype: %Q", zType);
++          return SQLITE_ERROR;
++        }else{
++          pCur->eType = i;
++        }
++      }
++      break;
++    }
++  }
++  pCur->iRowid = 1;
++  return SQLITE_OK;
++}
++
++/*
++** SQLite will invoke this method one or more times while planning a query
++** that uses the carray virtual table.  This routine needs to create
++** a query plan for each invocation and compute an estimated cost for that
++** plan.
++**
++** In this implementation idxNum is used to represent the
++** query plan.  idxStr is unused.
++**
++** idxNum is:
++**
++**    1    If only the pointer= constraint exists.  In this case, the
++**         parameter must be bound using sqlite3_carray_bind().
++**
++**    2    if the pointer= and count= constraints exist.
++**
++**    3    if the ctype= constraint also exists.
++**
++** idxNum is 0 otherwise and carray becomes an empty table.
++*/
++static int carrayBestIndex(
++  sqlite3_vtab *tab,
++  sqlite3_index_info *pIdxInfo
++){
++  int i;                 /* Loop over constraints */
++  int ptrIdx = -1;       /* Index of the pointer= constraint, or -1 if none */
++  int cntIdx = -1;       /* Index of the count= constraint, or -1 if none */
++  int ctypeIdx = -1;     /* Index of the ctype= constraint, or -1 if none */
++
++  const struct sqlite3_index_constraint *pConstraint;
++  pConstraint = pIdxInfo->aConstraint;
++  for(i=0; inConstraint; i++, pConstraint++){
++    if( pConstraint->usable==0 ) continue;
++    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
++    switch( pConstraint->iColumn ){
++      case CARRAY_COLUMN_POINTER:
++        ptrIdx = i;
++        break;
++      case CARRAY_COLUMN_COUNT:
++        cntIdx = i;
++        break;
++      case CARRAY_COLUMN_CTYPE:
++        ctypeIdx = i;
++        break;
++    }
++  }
++  if( ptrIdx>=0 ){
++    pIdxInfo->aConstraintUsage[ptrIdx].argvIndex = 1;
++    pIdxInfo->aConstraintUsage[ptrIdx].omit = 1;
++    pIdxInfo->estimatedCost = (double)1;
++    pIdxInfo->estimatedRows = 100;
++    pIdxInfo->idxNum = 1;
++    if( cntIdx>=0 ){
++      pIdxInfo->aConstraintUsage[cntIdx].argvIndex = 2;
++      pIdxInfo->aConstraintUsage[cntIdx].omit = 1;
++      pIdxInfo->idxNum = 2;
++      if( ctypeIdx>=0 ){
++        pIdxInfo->aConstraintUsage[ctypeIdx].argvIndex = 3;
++        pIdxInfo->aConstraintUsage[ctypeIdx].omit = 1;
++        pIdxInfo->idxNum = 3;
++      }
++    }
++  }else{
++    pIdxInfo->estimatedCost = (double)2147483647;
++    pIdxInfo->estimatedRows = 2147483647;
++    pIdxInfo->idxNum = 0;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** This following structure defines all the methods for the 
++** carray virtual table.
++*/
++static sqlite3_module carrayModule = {
++  0,                         /* iVersion */
++  0,                         /* xCreate */
++  carrayConnect,             /* xConnect */
++  carrayBestIndex,           /* xBestIndex */
++  carrayDisconnect,          /* xDisconnect */
++  0,                         /* xDestroy */
++  carrayOpen,                /* xOpen - open a cursor */
++  carrayClose,               /* xClose - close a cursor */
++  carrayFilter,              /* xFilter - configure scan constraints */
++  carrayNext,                /* xNext - advance a cursor */
++  carrayEof,                 /* xEof - check for end of scan */
++  carrayColumn,              /* xColumn - read data */
++  carrayRowid,               /* xRowid - read data */
++  0,                         /* xUpdate */
++  0,                         /* xBegin */
++  0,                         /* xSync */
++  0,                         /* xCommit */
++  0,                         /* xRollback */
++  0,                         /* xFindMethod */
++  0,                         /* xRename */
++  0,                         /* xSavepoint */
++  0,                         /* xRelease */
++  0,                         /* xRollbackTo */
++  0,                         /* xShadow */
++  0                          /* xIntegrity */
++};
++
++/*
++** Destructor for the carray_bind object
++*/
++static void carrayBindDel(void *pPtr){
++  carray_bind *p = (carray_bind*)pPtr;
++  if( p->xDel!=SQLITE_STATIC ){
++     p->xDel(p->aData);
++  }
++  sqlite3_free(p);
++}
++
++/*
++** Invoke this interface in order to bind to the single-argument
++** version of CARRAY().
++*/
++SQLITE_API int sqlite3_carray_bind(
++  sqlite3_stmt *pStmt,
++  int idx,
++  void *aData,
++  int nData,
++  int mFlags,
++  void (*xDestroy)(void*)
++){
++  carray_bind *pNew;
++  int i;
++  pNew = sqlite3_malloc64(sizeof(*pNew));
++  if( pNew==0 ){
++    if( xDestroy!=SQLITE_STATIC && xDestroy!=SQLITE_TRANSIENT ){
++      xDestroy(aData);
++    }
++    return SQLITE_NOMEM;
++  }
++  pNew->nData = nData;
++  pNew->mFlags = mFlags;
++  if( xDestroy==SQLITE_TRANSIENT ){
++    sqlite3_int64 sz = nData;
++    switch( mFlags & 0x07 ){
++      case CARRAY_INT32:   sz *= 4;                     break;
++      case CARRAY_INT64:   sz *= 8;                     break;
++      case CARRAY_DOUBLE:  sz *= 8;                     break;
++      case CARRAY_TEXT:    sz *= sizeof(char*);         break;
++      case CARRAY_BLOB:    sz *= sizeof(struct iovec);  break;
++    }
++    if( (mFlags & 0x07)==CARRAY_TEXT ){
++      for(i=0; iaData = sqlite3_malloc64( sz );
++    if( pNew->aData==0 ){
++      sqlite3_free(pNew);
++      return SQLITE_NOMEM;
++    }
++    if( (mFlags & 0x07)==CARRAY_TEXT ){
++      char **az = (char**)pNew->aData;
++      char *z = (char*)&az[nData];
++      for(i=0; iaData;
++      unsigned char *z = (unsigned char*)&p[nData];
++      for(i=0; iaData, aData, sz);
++    }
++    pNew->xDel = sqlite3_free;
++  }else{
++    pNew->aData = aData;
++    pNew->xDel = xDestroy;
++  }
++  return sqlite3_bind_pointer(pStmt, idx, pNew, "carray-bind", carrayBindDel);
++}
++
++
++/*
++** For testing purpose in the TCL test harness, we need a method for
++** setting the pointer value.  The inttoptr(X) SQL function accomplishes
++** this.  Tcl script will bind an integer to X and the inttoptr() SQL
++** function will use sqlite3_result_pointer() to convert that integer into
++** a pointer.
++**
++** This is for testing on TCL only.
++*/
++#ifdef SQLITE_TEST
++static void inttoptrFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  void *p;
++  sqlite3_int64 i64;
++  i64 = sqlite3_value_int64(argv[0]);
++  if( sizeof(i64)==sizeof(p) ){
++    memcpy(&p, &i64, sizeof(p));
++  }else{
++    int i32 = i64 & 0xffffffff;
++    memcpy(&p, &i32, sizeof(p));
++  }
++  sqlite3_result_pointer(context, p, "carray", 0);
++}
++#endif /* SQLITE_TEST */
++
++#endif /* SQLITE_OMIT_VIRTUALTABLE */
++
++SQLITE_API int sqlite3_carray_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++  rc = sqlite3_create_module(db, "carray", &carrayModule, 0);
++#ifdef SQLITE_TEST
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "inttoptr", 1, SQLITE_UTF8, 0,
++                                 inttoptrFunc, 0, 0);
++  }
++#endif /* SQLITE_TEST */
++#endif /* SQLITE_OMIT_VIRTUALTABLE */
++  return rc;
++}
++/*** End of #include "carray.c" ***/
++
++#endif
++
++/*
++** FILEIO
++*/
++#ifdef SQLITE_ENABLE_FILEIO
++/* Prototype for initialization function of FILEIO extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_fileio_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++
++/* MinGW specifics */
++#if (!defined(_WIN32) && !defined(WIN32)) || defined(__MINGW32__)
++# include 
++# include 
++# if defined(__MINGW32__)
++#  define DIRENT dirent
++#  ifndef S_ISLNK
++#   define S_ISLNK(mode) (0)
++#  endif
++# endif
++#endif
++
++/* #include "test_windirent.c" */
++/*** Begin of #include "test_windirent.c" ***/
++/*
++** 2015 November 30
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code to implement most of the opendir() family of
++** POSIX functions on Win32 using the MSVCRT.
++*/
++
++#if defined(_WIN32) && defined(_MSC_VER)
++/* #include "test_windirent.h" */
++/*** Begin of #include "test_windirent.h" ***/
++/*
++** 2015 November 30
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains declarations for most of the opendir() family of
++** POSIX functions on Win32 using the MSVCRT.
++*/
++
++#if defined(_WIN32) && defined(_MSC_VER) && !defined(SQLITE_WINDIRENT_H)
++#define SQLITE_WINDIRENT_H
++
++/*
++** We need several data types from the Windows SDK header.
++*/
++
++#ifndef WIN32_LEAN_AND_MEAN
++#define WIN32_LEAN_AND_MEAN
++#endif
++
++#include "windows.h"
++
++/*
++** We need several support functions from the SQLite core.
++*/
++
++/* #include "sqlite3.h" */
++
++
++/*
++** We need several things from the ANSI and MSVCRT headers.
++*/
++
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++/*
++** We may need several defines that should have been in "sys/stat.h".
++*/
++
++#ifndef S_ISREG
++#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
++#endif
++
++#ifndef S_ISDIR
++#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
++#endif
++
++#ifndef S_ISLNK
++#define S_ISLNK(mode) (0)
++#endif
++
++/*
++** We may need to provide the "mode_t" type.
++*/
++
++#ifndef MODE_T_DEFINED
++  #define MODE_T_DEFINED
++  typedef unsigned short mode_t;
++#endif
++
++/*
++** We may need to provide the "ino_t" type.
++*/
++
++#ifndef INO_T_DEFINED
++  #define INO_T_DEFINED
++  typedef unsigned short ino_t;
++#endif
++
++/*
++** We need to define "NAME_MAX" if it was not present in "limits.h".
++*/
++
++#ifndef NAME_MAX
++#  ifdef FILENAME_MAX
++#    define NAME_MAX (FILENAME_MAX)
++#  else
++#    define NAME_MAX (260)
++#  endif
++#endif
++
++/*
++** We need to define "NULL_INTPTR_T" and "BAD_INTPTR_T".
++*/
++
++#ifndef NULL_INTPTR_T
++#  define NULL_INTPTR_T ((intptr_t)(0))
++#endif
++
++#ifndef BAD_INTPTR_T
++#  define BAD_INTPTR_T ((intptr_t)(-1))
++#endif
++
++/*
++** We need to provide the necessary structures and related types.
++*/
++
++#ifndef DIRENT_DEFINED
++#define DIRENT_DEFINED
++typedef struct DIRENT DIRENT;
++typedef DIRENT *LPDIRENT;
++struct DIRENT {
++  ino_t d_ino;               /* Sequence number, do not use. */
++  unsigned d_attributes;     /* Win32 file attributes. */
++  char d_name[NAME_MAX + 1]; /* Name within the directory. */
++};
++#endif
++
++#ifndef DIR_DEFINED
++#define DIR_DEFINED
++typedef struct DIR DIR;
++typedef DIR *LPDIR;
++struct DIR {
++  intptr_t d_handle; /* Value returned by "_findfirst". */
++  DIRENT d_first;    /* DIRENT constructed based on "_findfirst". */
++  DIRENT d_next;     /* DIRENT constructed based on "_findnext". */
++};
++#endif
++
++/*
++** Provide a macro, for use by the implementation, to determine if a
++** particular directory entry should be skipped over when searching for
++** the next directory entry that should be returned by the readdir() or
++** readdir_r() functions.
++*/
++
++#ifndef is_filtered
++#  define is_filtered(a) ((((a).attrib)&_A_HIDDEN) || (((a).attrib)&_A_SYSTEM))
++#endif
++
++/*
++** Provide the function prototype for the POSIX compatible getenv()
++** function.  This function is not thread-safe.
++*/
++
++extern const char *windirent_getenv(const char *name);
++
++/*
++** Finally, we can provide the function prototypes for the opendir(),
++** readdir(), readdir_r(), and closedir() POSIX functions.
++*/
++
++extern LPDIR opendir(const char *dirname);
++extern LPDIRENT readdir(LPDIR dirp);
++extern INT readdir_r(LPDIR dirp, LPDIRENT entry, LPDIRENT *result);
++extern INT closedir(LPDIR dirp);
++
++#endif /* defined(WIN32) && defined(_MSC_VER) */
++/*** End of #include "test_windirent.h" ***/
++
++
++/*
++** Implementation of the POSIX getenv() function using the Win32 API.
++** This function is not thread-safe.
++*/
++const char *windirent_getenv(
++  const char *name
++){
++  static char value[32768]; /* Maximum length, per MSDN */
++  DWORD dwSize = sizeof(value) / sizeof(char); /* Size in chars */
++  DWORD dwRet; /* Value returned by GetEnvironmentVariableA() */
++
++  memset(value, 0, sizeof(value));
++  dwRet = GetEnvironmentVariableA(name, value, dwSize);
++  if( dwRet==0 || dwRet>dwSize ){
++    /*
++    ** The function call to GetEnvironmentVariableA() failed -OR-
++    ** the buffer is not large enough.  Either way, return NULL.
++    */
++    return 0;
++  }else{
++    /*
++    ** The function call to GetEnvironmentVariableA() succeeded
++    ** -AND- the buffer contains the entire value.
++    */
++    return value;
++  }
++}
++
++/*
++** Implementation of the POSIX opendir() function using the MSVCRT.
++*/
++LPDIR opendir(
++  const char *dirname
++){
++  struct _finddata_t data;
++  LPDIR dirp = (LPDIR)sqlite3_malloc(sizeof(DIR));
++  SIZE_T namesize = sizeof(data.name) / sizeof(data.name[0]);
++
++  if( dirp==NULL ) return NULL;
++  memset(dirp, 0, sizeof(DIR));
++
++  /* TODO: Remove this if Unix-style root paths are not used. */
++  if( sqlite3_stricmp(dirname, "/")==0 ){
++    dirname = windirent_getenv("SystemDrive");
++  }
++
++  memset(&data, 0, sizeof(struct _finddata_t));
++  _snprintf(data.name, namesize, "%s\\*", dirname);
++  dirp->d_handle = _findfirst(data.name, &data);
++
++  if( dirp->d_handle==BAD_INTPTR_T ){
++    closedir(dirp);
++    return NULL;
++  }
++
++  /* TODO: Remove this block to allow hidden and/or system files. */
++  if( is_filtered(data) ){
++next:
++
++    memset(&data, 0, sizeof(struct _finddata_t));
++    if( _findnext(dirp->d_handle, &data)==-1 ){
++      closedir(dirp);
++      return NULL;
++    }
++
++    /* TODO: Remove this block to allow hidden and/or system files. */
++    if( is_filtered(data) ) goto next;
++  }
++
++  dirp->d_first.d_attributes = data.attrib;
++  strncpy(dirp->d_first.d_name, data.name, NAME_MAX);
++  dirp->d_first.d_name[NAME_MAX] = '\0';
++
++  return dirp;
++}
++
++/*
++** Implementation of the POSIX readdir() function using the MSVCRT.
++*/
++LPDIRENT readdir(
++  LPDIR dirp
++){
++  struct _finddata_t data;
++
++  if( dirp==NULL ) return NULL;
++
++  if( dirp->d_first.d_ino==0 ){
++    dirp->d_first.d_ino++;
++    dirp->d_next.d_ino++;
++
++    return &dirp->d_first;
++  }
++
++next:
++
++  memset(&data, 0, sizeof(struct _finddata_t));
++  if( _findnext(dirp->d_handle, &data)==-1 ) return NULL;
++
++  /* TODO: Remove this block to allow hidden and/or system files. */
++  if( is_filtered(data) ) goto next;
++
++  dirp->d_next.d_ino++;
++  dirp->d_next.d_attributes = data.attrib;
++  strncpy(dirp->d_next.d_name, data.name, NAME_MAX);
++  dirp->d_next.d_name[NAME_MAX] = '\0';
++
++  return &dirp->d_next;
++}
++
++/*
++** Implementation of the POSIX readdir_r() function using the MSVCRT.
++*/
++INT readdir_r(
++  LPDIR dirp,
++  LPDIRENT entry,
++  LPDIRENT *result
++){
++  struct _finddata_t data;
++
++  if( dirp==NULL ) return EBADF;
++
++  if( dirp->d_first.d_ino==0 ){
++    dirp->d_first.d_ino++;
++    dirp->d_next.d_ino++;
++
++    entry->d_ino = dirp->d_first.d_ino;
++    entry->d_attributes = dirp->d_first.d_attributes;
++    strncpy(entry->d_name, dirp->d_first.d_name, NAME_MAX);
++    entry->d_name[NAME_MAX] = '\0';
++
++    *result = entry;
++    return 0;
++  }
++
++next:
++
++  memset(&data, 0, sizeof(struct _finddata_t));
++  if( _findnext(dirp->d_handle, &data)==-1 ){
++    *result = NULL;
++    return ENOENT;
++  }
++
++  /* TODO: Remove this block to allow hidden and/or system files. */
++  if( is_filtered(data) ) goto next;
++
++  entry->d_ino = (ino_t)-1; /* not available */
++  entry->d_attributes = data.attrib;
++  strncpy(entry->d_name, data.name, NAME_MAX);
++  entry->d_name[NAME_MAX] = '\0';
++
++  *result = entry;
++  return 0;
++}
++
++/*
++** Implementation of the POSIX closedir() function using the MSVCRT.
++*/
++INT closedir(
++  LPDIR dirp
++){
++  INT result = 0;
++
++  if( dirp==NULL ) return EINVAL;
++
++  if( dirp->d_handle!=NULL_INTPTR_T && dirp->d_handle!=BAD_INTPTR_T ){
++    result = _findclose(dirp->d_handle);
++  }
++
++  sqlite3_free(dirp);
++  return result;
++}
++
++#endif /* defined(WIN32) && defined(_MSC_VER) */
++/*** End of #include "test_windirent.c" ***/
++
++/* #include "fileio.c" */
++/*** Begin of #include "fileio.c" ***/
++/*
++** 2014-06-13
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This SQLite extension implements SQL functions readfile() and
++** writefile(), and eponymous virtual type "fsdir".
++**
++** WRITEFILE(FILE, DATA [, MODE [, MTIME]]):
++**
++**   If neither of the optional arguments is present, then this UDF
++**   function writes blob DATA to file FILE. If successful, the number
++**   of bytes written is returned. If an error occurs, NULL is returned.
++**
++**   If the first option argument - MODE - is present, then it must
++**   be passed an integer value that corresponds to a POSIX mode
++**   value (file type + permissions, as returned in the stat.st_mode
++**   field by the stat() system call). Three types of files may
++**   be written/created:
++**
++**     regular files:  (mode & 0170000)==0100000
++**     symbolic links: (mode & 0170000)==0120000
++**     directories:    (mode & 0170000)==0040000
++**
++**   For a directory, the DATA is ignored. For a symbolic link, it is
++**   interpreted as text and used as the target of the link. For a
++**   regular file, it is interpreted as a blob and written into the
++**   named file. Regardless of the type of file, its permissions are
++**   set to (mode & 0777) before returning.
++**
++**   If the optional MTIME argument is present, then it is interpreted
++**   as an integer - the number of seconds since the unix epoch. The
++**   modification-time of the target file is set to this value before
++**   returning.
++**
++**   If three or more arguments are passed to this function and an
++**   error is encountered, an exception is raised.
++**
++** READFILE(FILE):
++**
++**   Read and return the contents of file FILE (type blob) from disk.
++**
++** FSDIR:
++**
++**   Used as follows:
++**
++**     SELECT * FROM fsdir($path [, $dir]);
++**
++**   Parameter $path is an absolute or relative pathname. If the file that it
++**   refers to does not exist, it is an error. If the path refers to a regular
++**   file or symbolic link, it returns a single row. Or, if the path refers
++**   to a directory, it returns one row for the directory, and one row for each
++**   file within the hierarchy rooted at $path.
++**
++**   Each row has the following columns:
++**
++**     name:  Path to file or directory (text value).
++**     mode:  Value of stat.st_mode for directory entry (an integer).
++**     mtime: Value of stat.st_mtime for directory entry (an integer).
++**     data:  For a regular file, a blob containing the file data. For a
++**            symlink, a text value containing the text of the link. For a
++**            directory, NULL.
++**
++**   If a non-NULL value is specified for the optional $dir parameter and
++**   $path is a relative path, then $path is interpreted relative to $dir. 
++**   And the paths returned in the "name" column of the table are also 
++**   relative to directory $dir.
++**
++** Notes on building this extension for Windows:
++**   Unless linked statically with the SQLite library, a preprocessor
++**   symbol, FILEIO_WIN32_DLL, must be #define'd to create a stand-alone
++**   DLL form of this extension for WIN32. See its use below for details.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++
++#include 
++#include 
++#include 
++#if !defined(_WIN32) && !defined(WIN32)
++#  include 
++#  include 
++#  include 
++#  include 
++#else
++#  include "windows.h"
++#  include 
++#  include 
++/* #  include "test_windirent.h" */
++
++#  define dirent DIRENT
++#  ifndef chmod
++#    define chmod _chmod
++#  endif
++#  ifndef stat
++#    define stat _stat
++#  endif
++#  define mkdir(path,mode) _mkdir(path)
++#  define lstat(path,buf) stat(path,buf)
++#endif
++#include 
++#include 
++
++
++/*
++** Structure of the fsdir() table-valued function
++*/
++                 /*    0    1    2     3    4           5             */
++#define FSDIR_SCHEMA "(name,mode,mtime,data,path HIDDEN,dir HIDDEN)"
++#define FSDIR_COLUMN_NAME     0     /* Name of the file */
++#define FSDIR_COLUMN_MODE     1     /* Access mode */
++#define FSDIR_COLUMN_MTIME    2     /* Last modification time */
++#define FSDIR_COLUMN_DATA     3     /* File content */
++#define FSDIR_COLUMN_PATH     4     /* Path to top of search */
++#define FSDIR_COLUMN_DIR      5     /* Path is relative to this directory */
++
++
++/*
++** Set the result stored by context ctx to a blob containing the 
++** contents of file zName.  Or, leave the result unchanged (NULL)
++** if the file does not exist or is unreadable.
++**
++** If the file exceeds the SQLite blob size limit, through an
++** SQLITE_TOOBIG error.
++**
++** Throw an SQLITE_IOERR if there are difficulties pulling the file
++** off of disk.
++*/
++static void readFileContents(sqlite3_context *ctx, const char *zName){
++  FILE *in;
++  sqlite3_int64 nIn;
++  void *pBuf;
++  sqlite3 *db;
++  int mxBlob;
++
++  in = fopen(zName, "rb");
++  if( in==0 ){
++    /* File does not exist or is unreadable. Leave the result set to NULL. */
++    return;
++  }
++  fseek(in, 0, SEEK_END);
++  nIn = ftell(in);
++  rewind(in);
++  db = sqlite3_context_db_handle(ctx);
++  mxBlob = sqlite3_limit(db, SQLITE_LIMIT_LENGTH, -1);
++  if( nIn>mxBlob ){
++    sqlite3_result_error_code(ctx, SQLITE_TOOBIG);
++    fclose(in);
++    return;
++  }
++  pBuf = sqlite3_malloc64( nIn ? nIn : 1 );
++  if( pBuf==0 ){
++    sqlite3_result_error_nomem(ctx);
++    fclose(in);
++    return;
++  }
++  if( nIn==(sqlite3_int64)fread(pBuf, 1, (size_t)nIn, in) ){
++    sqlite3_result_blob64(ctx, pBuf, nIn, sqlite3_free);
++  }else{
++    sqlite3_result_error_code(ctx, SQLITE_IOERR);
++    sqlite3_free(pBuf);
++  }
++  fclose(in);
++}
++
++/*
++** Implementation of the "readfile(X)" SQL function.  The entire content
++** of the file named X is read and returned as a BLOB.  NULL is returned
++** if the file does not exist or is unreadable.
++*/
++static void readfileFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  const char *zName;
++  (void)(argc);  /* Unused parameter */
++  zName = (const char*)sqlite3_value_text(argv[0]);
++  if( zName==0 ) return;
++  readFileContents(context, zName);
++}
++
++/*
++** Set the error message contained in context ctx to the results of
++** vprintf(zFmt, ...).
++*/
++static void ctxErrorMsg(sqlite3_context *ctx, const char *zFmt, ...){
++  char *zMsg = 0;
++  va_list ap;
++  va_start(ap, zFmt);
++  zMsg = sqlite3_vmprintf(zFmt, ap);
++  sqlite3_result_error(ctx, zMsg, -1);
++  sqlite3_free(zMsg);
++  va_end(ap);
++}
++
++#if defined(_WIN32)
++/*
++** This function is designed to convert a Win32 FILETIME structure into the
++** number of seconds since the Unix Epoch (1970-01-01 00:00:00 UTC).
++*/
++static sqlite3_uint64 fileTimeToUnixTime(
++  LPFILETIME pFileTime
++){
++  SYSTEMTIME epochSystemTime;
++  ULARGE_INTEGER epochIntervals;
++  FILETIME epochFileTime;
++  ULARGE_INTEGER fileIntervals;
++
++  memset(&epochSystemTime, 0, sizeof(SYSTEMTIME));
++  epochSystemTime.wYear = 1970;
++  epochSystemTime.wMonth = 1;
++  epochSystemTime.wDay = 1;
++  SystemTimeToFileTime(&epochSystemTime, &epochFileTime);
++  epochIntervals.LowPart = epochFileTime.dwLowDateTime;
++  epochIntervals.HighPart = epochFileTime.dwHighDateTime;
++
++  fileIntervals.LowPart = pFileTime->dwLowDateTime;
++  fileIntervals.HighPart = pFileTime->dwHighDateTime;
++
++  return (fileIntervals.QuadPart - epochIntervals.QuadPart) / 10000000;
++}
++
++
++#if defined(FILEIO_WIN32_DLL) && (defined(_WIN32) || defined(WIN32))
++#  /* To allow a standalone DLL, use this next replacement function: */
++#  undef sqlite3_win32_utf8_to_unicode
++#  define sqlite3_win32_utf8_to_unicode utf8_to_utf16
++#
++LPWSTR utf8_to_utf16(const char *z){
++  int nAllot = MultiByteToWideChar(CP_UTF8, 0, z, -1, NULL, 0);
++  LPWSTR rv = sqlite3_malloc(nAllot * sizeof(WCHAR));
++  if( rv!=0 && 0 < MultiByteToWideChar(CP_UTF8, 0, z, -1, rv, nAllot) )
++    return rv;
++  sqlite3_free(rv);
++  return 0;
++}
++#endif
++
++/*
++** This function attempts to normalize the time values found in the stat()
++** buffer to UTC.  This is necessary on Win32, where the runtime library
++** appears to return these values as local times.
++*/
++static void statTimesToUtc(
++  const char *zPath,
++  struct stat *pStatBuf
++){
++  HANDLE hFindFile;
++  WIN32_FIND_DATAW fd;
++  LPWSTR zUnicodeName;
++  extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
++  zUnicodeName = sqlite3_win32_utf8_to_unicode(zPath);
++  if( zUnicodeName ){
++    memset(&fd, 0, sizeof(WIN32_FIND_DATAW));
++    hFindFile = FindFirstFileW(zUnicodeName, &fd);
++    if( hFindFile!=NULL ){
++      pStatBuf->st_ctime = (time_t)fileTimeToUnixTime(&fd.ftCreationTime);
++      pStatBuf->st_atime = (time_t)fileTimeToUnixTime(&fd.ftLastAccessTime);
++      pStatBuf->st_mtime = (time_t)fileTimeToUnixTime(&fd.ftLastWriteTime);
++      FindClose(hFindFile);
++    }
++    sqlite3_free(zUnicodeName);
++  }
++}
++#endif
++
++/*
++** This function is used in place of stat().  On Windows, special handling
++** is required in order for the included time to be returned as UTC.  On all
++** other systems, this function simply calls stat().
++*/
++static int fileStat(
++  const char *zPath,
++  struct stat *pStatBuf
++){
++#if defined(_WIN32)
++  int rc = stat(zPath, pStatBuf);
++  if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
++  return rc;
++#else
++  return stat(zPath, pStatBuf);
++#endif
++}
++
++/*
++** This function is used in place of lstat().  On Windows, special handling
++** is required in order for the included time to be returned as UTC.  On all
++** other systems, this function simply calls lstat().
++*/
++static int fileLinkStat(
++  const char *zPath,
++  struct stat *pStatBuf
++){
++#if defined(_WIN32)
++  int rc = lstat(zPath, pStatBuf);
++  if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
++  return rc;
++#else
++  return lstat(zPath, pStatBuf);
++#endif
++}
++
++/*
++** Argument zFile is the name of a file that will be created and/or written
++** by SQL function writefile(). This function ensures that the directory
++** zFile will be written to exists, creating it if required. The permissions
++** for any path components created by this function are set in accordance
++** with the current umask.
++**
++** If an OOM condition is encountered, SQLITE_NOMEM is returned. Otherwise,
++** SQLITE_OK is returned if the directory is successfully created, or
++** SQLITE_ERROR otherwise.
++*/
++static int makeDirectory(
++  const char *zFile
++){
++  char *zCopy = sqlite3_mprintf("%s", zFile);
++  int rc = SQLITE_OK;
++
++  if( zCopy==0 ){
++    rc = SQLITE_NOMEM;
++  }else{
++    int nCopy = (int)strlen(zCopy);
++    int i = 1;
++
++    while( rc==SQLITE_OK ){
++      struct stat sStat;
++      int rc2;
++
++      for(; zCopy[i]!='/' && i=0 ){
++#if defined(_WIN32)
++#if !SQLITE_OS_WINRT
++    /* Windows */
++    FILETIME lastAccess;
++    FILETIME lastWrite;
++    SYSTEMTIME currentTime;
++    LONGLONG intervals;
++    HANDLE hFile;
++    LPWSTR zUnicodeName;
++    extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
++
++    GetSystemTime(¤tTime);
++    SystemTimeToFileTime(¤tTime, &lastAccess);
++    intervals = Int32x32To64(mtime, 10000000) + 116444736000000000;
++    lastWrite.dwLowDateTime = (DWORD)intervals;
++    lastWrite.dwHighDateTime = intervals >> 32;
++    zUnicodeName = sqlite3_win32_utf8_to_unicode(zFile);
++    if( zUnicodeName==0 ){
++      return 1;
++    }
++    hFile = CreateFileW(
++      zUnicodeName, FILE_WRITE_ATTRIBUTES, 0, NULL, OPEN_EXISTING,
++      FILE_FLAG_BACKUP_SEMANTICS, NULL
++    );
++    sqlite3_free(zUnicodeName);
++    if( hFile!=INVALID_HANDLE_VALUE ){
++      BOOL bResult = SetFileTime(hFile, NULL, &lastAccess, &lastWrite);
++      CloseHandle(hFile);
++      return !bResult;
++    }else{
++      return 1;
++    }
++#endif
++#elif defined(AT_FDCWD) && 0 /* utimensat() is not universally available */
++    /* Recent unix */
++    struct timespec times[2];
++    times[0].tv_nsec = times[1].tv_nsec = 0;
++    times[0].tv_sec = time(0);
++    times[1].tv_sec = mtime;
++    if( utimensat(AT_FDCWD, zFile, times, AT_SYMLINK_NOFOLLOW) ){
++      return 1;
++    }
++#else
++    /* Legacy unix */
++    struct timeval times[2];
++    times[0].tv_usec = times[1].tv_usec = 0;
++    times[0].tv_sec = time(0);
++    times[1].tv_sec = mtime;
++    if( utimes(zFile, times) ){
++      return 1;
++    }
++#endif
++  }
++
++  return 0;
++}
++
++/*
++** Implementation of the "writefile(W,X[,Y[,Z]]])" SQL function.  
++** Refer to header comments at the top of this file for details.
++*/
++static void writefileFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  const char *zFile;
++  mode_t mode = 0;
++  int res;
++  sqlite3_int64 mtime = -1;
++
++  if( argc<2 || argc>4 ){
++    sqlite3_result_error(context, 
++        "wrong number of arguments to function writefile()", -1
++    );
++    return;
++  }
++
++  zFile = (const char*)sqlite3_value_text(argv[0]);
++  if( zFile==0 ) return;
++  if( argc>=3 ){
++    mode = (mode_t)sqlite3_value_int(argv[2]);
++  }
++  if( argc==4 ){
++    mtime = sqlite3_value_int64(argv[3]);
++  }
++
++  res = writeFile(context, zFile, argv[1], mode, mtime);
++  if( res==1 && errno==ENOENT ){
++    if( makeDirectory(zFile)==SQLITE_OK ){
++      res = writeFile(context, zFile, argv[1], mode, mtime);
++    }
++  }
++
++  if( argc>2 && res!=0 ){
++    if( S_ISLNK(mode) ){
++      ctxErrorMsg(context, "failed to create symlink: %s", zFile);
++    }else if( S_ISDIR(mode) ){
++      ctxErrorMsg(context, "failed to create directory: %s", zFile);
++    }else{
++      ctxErrorMsg(context, "failed to write file: %s", zFile);
++    }
++  }
++}
++
++/*
++** SQL function:   lsmode(MODE)
++**
++** Given a numberic st_mode from stat(), convert it into a human-readable
++** text string in the style of "ls -l".
++*/
++static void lsModeFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  int i;
++  int iMode = sqlite3_value_int(argv[0]);
++  char z[16];
++  (void)argc;
++  if( S_ISLNK(iMode) ){
++    z[0] = 'l';
++  }else if( S_ISREG(iMode) ){
++    z[0] = '-';
++  }else if( S_ISDIR(iMode) ){
++    z[0] = 'd';
++  }else{
++    z[0] = '?';
++  }
++  for(i=0; i<3; i++){
++    int m = (iMode >> ((2-i)*3));
++    char *a = &z[1 + i*3];
++    a[0] = (m & 0x4) ? 'r' : '-';
++    a[1] = (m & 0x2) ? 'w' : '-';
++    a[2] = (m & 0x1) ? 'x' : '-';
++  }
++  z[10] = '\0';
++  sqlite3_result_text(context, z, -1, SQLITE_TRANSIENT);
++}
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++
++/* 
++** Cursor type for recursively iterating through a directory structure.
++*/
++typedef struct fsdir_cursor fsdir_cursor;
++typedef struct FsdirLevel FsdirLevel;
++
++struct FsdirLevel {
++  DIR *pDir;                 /* From opendir() */
++  char *zDir;                /* Name of directory (nul-terminated) */
++};
++
++struct fsdir_cursor {
++  sqlite3_vtab_cursor base;  /* Base class - must be first */
++
++  int nLvl;                  /* Number of entries in aLvl[] array */
++  int iLvl;                  /* Index of current entry */
++  FsdirLevel *aLvl;          /* Hierarchy of directories being traversed */
++
++  const char *zBase;
++  int nBase;
++
++  struct stat sStat;         /* Current lstat() results */
++  char *zPath;               /* Path to current entry */
++  sqlite3_int64 iRowid;      /* Current rowid */
++};
++
++typedef struct fsdir_tab fsdir_tab;
++struct fsdir_tab {
++  sqlite3_vtab base;         /* Base class - must be first */
++};
++
++/*
++** Construct a new fsdir virtual table object.
++*/
++static int fsdirConnect(
++  sqlite3 *db,
++  void *pAux,
++  int argc, const char *const*argv,
++  sqlite3_vtab **ppVtab,
++  char **pzErr
++){
++  fsdir_tab *pNew = 0;
++  int rc;
++  (void)pAux;
++  (void)argc;
++  (void)argv;
++  (void)pzErr;
++  rc = sqlite3_declare_vtab(db, "CREATE TABLE x" FSDIR_SCHEMA);
++  if( rc==SQLITE_OK ){
++    pNew = (fsdir_tab*)sqlite3_malloc( sizeof(*pNew) );
++    if( pNew==0 ) return SQLITE_NOMEM;
++    memset(pNew, 0, sizeof(*pNew));
++    sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
++  }
++  *ppVtab = (sqlite3_vtab*)pNew;
++  return rc;
++}
++
++/*
++** This method is the destructor for fsdir vtab objects.
++*/
++static int fsdirDisconnect(sqlite3_vtab *pVtab){
++  sqlite3_free(pVtab);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new fsdir_cursor object.
++*/
++static int fsdirOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
++  fsdir_cursor *pCur;
++  (void)p;
++  pCur = sqlite3_malloc( sizeof(*pCur) );
++  if( pCur==0 ) return SQLITE_NOMEM;
++  memset(pCur, 0, sizeof(*pCur));
++  pCur->iLvl = -1;
++  *ppCursor = &pCur->base;
++  return SQLITE_OK;
++}
++
++/*
++** Reset a cursor back to the state it was in when first returned
++** by fsdirOpen().
++*/
++static void fsdirResetCursor(fsdir_cursor *pCur){
++  int i;
++  for(i=0; i<=pCur->iLvl; i++){
++    FsdirLevel *pLvl = &pCur->aLvl[i];
++    if( pLvl->pDir ) closedir(pLvl->pDir);
++    sqlite3_free(pLvl->zDir);
++  }
++  sqlite3_free(pCur->zPath);
++  sqlite3_free(pCur->aLvl);
++  pCur->aLvl = 0;
++  pCur->zPath = 0;
++  pCur->zBase = 0;
++  pCur->nBase = 0;
++  pCur->nLvl = 0;
++  pCur->iLvl = -1;
++  pCur->iRowid = 1;
++}
++
++/*
++** Destructor for an fsdir_cursor.
++*/
++static int fsdirClose(sqlite3_vtab_cursor *cur){
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++
++  fsdirResetCursor(pCur);
++  sqlite3_free(pCur);
++  return SQLITE_OK;
++}
++
++/*
++** Set the error message for the virtual table associated with cursor
++** pCur to the results of vprintf(zFmt, ...).
++*/
++static void fsdirSetErrmsg(fsdir_cursor *pCur, const char *zFmt, ...){
++  va_list ap;
++  va_start(ap, zFmt);
++  pCur->base.pVtab->zErrMsg = sqlite3_vmprintf(zFmt, ap);
++  va_end(ap);
++}
++
++
++/*
++** Advance an fsdir_cursor to its next row of output.
++*/
++static int fsdirNext(sqlite3_vtab_cursor *cur){
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++  mode_t m = pCur->sStat.st_mode;
++
++  pCur->iRowid++;
++  if( S_ISDIR(m) ){
++    /* Descend into this directory */
++    int iNew = pCur->iLvl + 1;
++    FsdirLevel *pLvl;
++    if( iNew>=pCur->nLvl ){
++      int nNew = iNew+1;
++      sqlite3_int64 nByte = nNew*sizeof(FsdirLevel);
++      FsdirLevel *aNew = (FsdirLevel*)sqlite3_realloc64(pCur->aLvl, nByte);
++      if( aNew==0 ) return SQLITE_NOMEM;
++      memset(&aNew[pCur->nLvl], 0, sizeof(FsdirLevel)*(nNew-pCur->nLvl));
++      pCur->aLvl = aNew;
++      pCur->nLvl = nNew;
++    }
++    pCur->iLvl = iNew;
++    pLvl = &pCur->aLvl[iNew];
++    
++    pLvl->zDir = pCur->zPath;
++    pCur->zPath = 0;
++    pLvl->pDir = opendir(pLvl->zDir);
++    if( pLvl->pDir==0 ){
++      fsdirSetErrmsg(pCur, "cannot read directory: %s", pCur->zPath);
++      return SQLITE_ERROR;
++    }
++  }
++
++  while( pCur->iLvl>=0 ){
++    FsdirLevel *pLvl = &pCur->aLvl[pCur->iLvl];
++    struct dirent *pEntry = readdir(pLvl->pDir);
++    if( pEntry ){
++      if( pEntry->d_name[0]=='.' ){
++       if( pEntry->d_name[1]=='.' && pEntry->d_name[2]=='\0' ) continue;
++       if( pEntry->d_name[1]=='\0' ) continue;
++      }
++      sqlite3_free(pCur->zPath);
++      pCur->zPath = sqlite3_mprintf("%s/%s", pLvl->zDir, pEntry->d_name);
++      if( pCur->zPath==0 ) return SQLITE_NOMEM;
++      if( fileLinkStat(pCur->zPath, &pCur->sStat) ){
++        fsdirSetErrmsg(pCur, "cannot stat file: %s", pCur->zPath);
++        return SQLITE_ERROR;
++      }
++      return SQLITE_OK;
++    }
++    closedir(pLvl->pDir);
++    sqlite3_free(pLvl->zDir);
++    pLvl->pDir = 0;
++    pLvl->zDir = 0;
++    pCur->iLvl--;
++  }
++
++  /* EOF */
++  sqlite3_free(pCur->zPath);
++  pCur->zPath = 0;
++  return SQLITE_OK;
++}
++
++/*
++** Return values of columns for the row at which the series_cursor
++** is currently pointing.
++*/
++static int fsdirColumn(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++  switch( i ){
++    case FSDIR_COLUMN_NAME: {
++      sqlite3_result_text(ctx, &pCur->zPath[pCur->nBase], -1, SQLITE_TRANSIENT);
++      break;
++    }
++
++    case FSDIR_COLUMN_MODE:
++      sqlite3_result_int64(ctx, pCur->sStat.st_mode);
++      break;
++
++    case FSDIR_COLUMN_MTIME:
++      sqlite3_result_int64(ctx, pCur->sStat.st_mtime);
++      break;
++
++    case FSDIR_COLUMN_DATA: {
++      mode_t m = pCur->sStat.st_mode;
++      if( S_ISDIR(m) ){
++        sqlite3_result_null(ctx);
++#if !defined(_WIN32) && !defined(WIN32)
++      }else if( S_ISLNK(m) ){
++        char aStatic[64];
++        char *aBuf = aStatic;
++        sqlite3_int64 nBuf = 64;
++        int n;
++
++        while( 1 ){
++          n = readlink(pCur->zPath, aBuf, nBuf);
++          if( nzPath);
++      }
++    }
++    case FSDIR_COLUMN_PATH:
++    default: {
++      /* The FSDIR_COLUMN_PATH and FSDIR_COLUMN_DIR are input parameters.
++      ** always return their values as NULL */
++      break;
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Return the rowid for the current row. In this implementation, the
++** first row returned is assigned rowid value 1, and each subsequent
++** row a value 1 more than that of the previous.
++*/
++static int fsdirRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++  *pRowid = pCur->iRowid;
++  return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the cursor has been moved off of the last
++** row of output.
++*/
++static int fsdirEof(sqlite3_vtab_cursor *cur){
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++  return (pCur->zPath==0);
++}
++
++/*
++** xFilter callback.
++**
++** idxNum==1   PATH parameter only
++** idxNum==2   Both PATH and DIR supplied
++*/
++static int fsdirFilter(
++  sqlite3_vtab_cursor *cur, 
++  int idxNum, const char *idxStr,
++  int argc, sqlite3_value **argv
++){
++  const char *zDir = 0;
++  fsdir_cursor *pCur = (fsdir_cursor*)cur;
++  (void)idxStr;
++  fsdirResetCursor(pCur);
++
++  if( idxNum==0 ){
++    fsdirSetErrmsg(pCur, "table function fsdir requires an argument");
++    return SQLITE_ERROR;
++  }
++
++  assert( argc==idxNum && (argc==1 || argc==2) );
++  zDir = (const char*)sqlite3_value_text(argv[0]);
++  if( zDir==0 ){
++    fsdirSetErrmsg(pCur, "table function fsdir requires a non-NULL argument");
++    return SQLITE_ERROR;
++  }
++  if( argc==2 ){
++    pCur->zBase = (const char*)sqlite3_value_text(argv[1]);
++  }
++  if( pCur->zBase ){
++    pCur->nBase = (int)strlen(pCur->zBase)+1;
++    pCur->zPath = sqlite3_mprintf("%s/%s", pCur->zBase, zDir);
++  }else{
++    pCur->zPath = sqlite3_mprintf("%s", zDir);
++  }
++
++  if( pCur->zPath==0 ){
++    return SQLITE_NOMEM;
++  }
++  if( fileLinkStat(pCur->zPath, &pCur->sStat) ){
++    fsdirSetErrmsg(pCur, "cannot stat file: %s", pCur->zPath);
++    return SQLITE_ERROR;
++  }
++
++  return SQLITE_OK;
++}
++
++/*
++** SQLite will invoke this method one or more times while planning a query
++** that uses the generate_series virtual table.  This routine needs to create
++** a query plan for each invocation and compute an estimated cost for that
++** plan.
++**
++** In this implementation idxNum is used to represent the
++** query plan.  idxStr is unused.
++**
++** The query plan is represented by values of idxNum:
++**
++**  (1)  The path value is supplied by argv[0]
++**  (2)  Path is in argv[0] and dir is in argv[1]
++*/
++static int fsdirBestIndex(
++  sqlite3_vtab *tab,
++  sqlite3_index_info *pIdxInfo
++){
++  int i;                 /* Loop over constraints */
++  int idxPath = -1;      /* Index in pIdxInfo->aConstraint of PATH= */
++  int idxDir = -1;       /* Index in pIdxInfo->aConstraint of DIR= */
++  int seenPath = 0;      /* True if an unusable PATH= constraint is seen */
++  int seenDir = 0;       /* True if an unusable DIR= constraint is seen */
++  const struct sqlite3_index_constraint *pConstraint;
++
++  (void)tab;
++  pConstraint = pIdxInfo->aConstraint;
++  for(i=0; inConstraint; i++, pConstraint++){
++    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
++    switch( pConstraint->iColumn ){
++      case FSDIR_COLUMN_PATH: {
++        if( pConstraint->usable ){
++          idxPath = i;
++          seenPath = 0;
++        }else if( idxPath<0 ){
++          seenPath = 1;
++        }
++        break;
++      }
++      case FSDIR_COLUMN_DIR: {
++        if( pConstraint->usable ){
++          idxDir = i;
++          seenDir = 0;
++        }else if( idxDir<0 ){
++          seenDir = 1;
++        }
++        break;
++      }
++    } 
++  }
++  if( seenPath || seenDir ){
++    /* If input parameters are unusable, disallow this plan */
++    return SQLITE_CONSTRAINT;
++  }
++
++  if( idxPath<0 ){
++    pIdxInfo->idxNum = 0;
++    /* The pIdxInfo->estimatedCost should have been initialized to a huge
++    ** number.  Leave it unchanged. */
++    pIdxInfo->estimatedRows = 0x7fffffff;
++  }else{
++    pIdxInfo->aConstraintUsage[idxPath].omit = 1;
++    pIdxInfo->aConstraintUsage[idxPath].argvIndex = 1;
++    if( idxDir>=0 ){
++      pIdxInfo->aConstraintUsage[idxDir].omit = 1;
++      pIdxInfo->aConstraintUsage[idxDir].argvIndex = 2;
++      pIdxInfo->idxNum = 2;
++      pIdxInfo->estimatedCost = 10.0;
++    }else{
++      pIdxInfo->idxNum = 1;
++      pIdxInfo->estimatedCost = 100.0;
++    }
++  }
++
++  return SQLITE_OK;
++}
++
++/*
++** Register the "fsdir" virtual table.
++*/
++static int fsdirRegister(sqlite3 *db){
++  static sqlite3_module fsdirModule = {
++    0,                         /* iVersion */
++    0,                         /* xCreate */
++    fsdirConnect,              /* xConnect */
++    fsdirBestIndex,            /* xBestIndex */
++    fsdirDisconnect,           /* xDisconnect */
++    0,                         /* xDestroy */
++    fsdirOpen,                 /* xOpen - open a cursor */
++    fsdirClose,                /* xClose - close a cursor */
++    fsdirFilter,               /* xFilter - configure scan constraints */
++    fsdirNext,                 /* xNext - advance a cursor */
++    fsdirEof,                  /* xEof - check for end of scan */
++    fsdirColumn,               /* xColumn - read data */
++    fsdirRowid,                /* xRowid - read data */
++    0,                         /* xUpdate */
++    0,                         /* xBegin */
++    0,                         /* xSync */
++    0,                         /* xCommit */
++    0,                         /* xRollback */
++    0,                         /* xFindMethod */
++    0,                         /* xRename */
++    0,                         /* xSavepoint */
++    0,                         /* xRelease */
++    0,                         /* xRollbackTo */
++    0,                         /* xShadowName */
++    0                          /* xIntegrity */
++  };
++
++  int rc = sqlite3_create_module(db, "fsdir", &fsdirModule, 0);
++  return rc;
++}
++#else         /* SQLITE_OMIT_VIRTUALTABLE */
++# define fsdirRegister(x) SQLITE_OK
++#endif
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_fileio_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++  (void)pzErrMsg;  /* Unused parameter */
++  rc = sqlite3_create_function(db, "readfile", 1, 
++                               SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
++                               readfileFunc, 0, 0);
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "writefile", -1,
++                                 SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
++                                 writefileFunc, 0, 0);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "lsmode", 1, SQLITE_UTF8, 0,
++                                 lsModeFunc, 0, 0);
++  }
++  if( rc==SQLITE_OK ){
++    rc = fsdirRegister(db);
++  }
++  return rc;
++}
++
++#if defined(FILEIO_WIN32_DLL) && (defined(_WIN32) || defined(WIN32))
++/* To allow a standalone DLL, make test_windirent.c use the same
++ * redefined SQLite API calls as the above extension code does.
++ * Just pull in this .c to accomplish this. As a beneficial side
++ * effect, this extension becomes a single translation unit. */
++/* #  include "test_windirent.c" */
++
++#endif
++/*** End of #include "fileio.c" ***/
++
++#endif
++
++/*
++** SERIES
++*/
++#ifdef SQLITE_ENABLE_SERIES
++/* Prototype for initialization function of SERIES extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_series_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "series.c" */
++/*** Begin of #include "series.c" ***/
++/*
++** 2015-08-18, 2023-04-28
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++**
++** This file demonstrates how to create a table-valued-function using
++** a virtual table.  This demo implements the generate_series() function
++** which gives the same results as the eponymous function in PostgreSQL,
++** within the limitation that its arguments are signed 64-bit integers.
++**
++** Considering its equivalents to generate_series(start,stop,step): A
++** value V[n] sequence is produced for integer n ascending from 0 where
++**  ( V[n] == start + n * step  &&  sgn(V[n] - stop) * sgn(step) >= 0 )
++** for each produced value (independent of production time ordering.)
++**
++** All parameters must be either integer or convertable to integer.
++** The start parameter is required.
++** The stop parameter defaults to (1<<32)-1 (aka 4294967295 or 0xffffffff)
++** The step parameter defaults to 1 and 0 is treated as 1.
++**
++** Examples:
++**
++**      SELECT * FROM generate_series(0,100,5);
++**
++** The query above returns integers from 0 through 100 counting by steps
++** of 5.
++**
++**      SELECT * FROM generate_series(0,100);
++**
++** Integers from 0 through 100 with a step size of 1.
++**
++**      SELECT * FROM generate_series(20) LIMIT 10;
++**
++** Integers 20 through 29.
++**
++**      SELECT * FROM generate_series(0,-100,-5);
++**
++** Integers 0 -5 -10 ... -100.
++**
++**      SELECT * FROM generate_series(0,-1);
++**
++** Empty sequence.
++**
++** HOW IT WORKS
++**
++** The generate_series "function" is really a virtual table with the
++** following schema:
++**
++**     CREATE TABLE generate_series(
++**       value,
++**       start HIDDEN,
++**       stop HIDDEN,
++**       step HIDDEN
++**     );
++**
++** The virtual table also has a rowid, logically equivalent to n+1 where
++** "n" is the ascending integer in the aforesaid production definition.
++**
++** Function arguments in queries against this virtual table are translated
++** into equality constraints against successive hidden columns.  In other
++** words, the following pairs of queries are equivalent to each other:
++**
++**    SELECT * FROM generate_series(0,100,5);
++**    SELECT * FROM generate_series WHERE start=0 AND stop=100 AND step=5;
++**
++**    SELECT * FROM generate_series(0,100);
++**    SELECT * FROM generate_series WHERE start=0 AND stop=100;
++**
++**    SELECT * FROM generate_series(20) LIMIT 10;
++**    SELECT * FROM generate_series WHERE start=20 LIMIT 10;
++**
++** The generate_series virtual table implementation leaves the xCreate method
++** set to NULL.  This means that it is not possible to do a CREATE VIRTUAL
++** TABLE command with "generate_series" as the USING argument.  Instead, there
++** is a single generate_series virtual table that is always available without
++** having to be created first.
++**
++** The xBestIndex method looks for equality constraints against the hidden
++** start, stop, and step columns, and if present, it uses those constraints
++** to bound the sequence of generated values.  If the equality constraints
++** are missing, it uses 0 for start, 4294967295 for stop, and 1 for step.
++** xBestIndex returns a small cost when both start and stop are available,
++** and a very large cost if either start or stop are unavailable.  This
++** encourages the query planner to order joins such that the bounds of the
++** series are well-defined.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++/*
++** Return that member of a generate_series(...) sequence whose 0-based
++** index is ix. The 0th member is given by smBase. The sequence members
++** progress per ix increment by smStep.
++*/
++static sqlite3_int64 genSeqMember(sqlite3_int64 smBase,
++                                  sqlite3_int64 smStep,
++                                  sqlite3_uint64 ix){
++  if( ix>=(sqlite3_uint64)LLONG_MAX ){
++    /* Get ix into signed i64 range. */
++    ix -= (sqlite3_uint64)LLONG_MAX;
++    /* With 2's complement ALU, this next can be 1 step, but is split into
++     * 2 for UBSAN's satisfaction (and hypothetical 1's complement ALUs.) */
++    smBase += (LLONG_MAX/2) * smStep;
++    smBase += (LLONG_MAX - LLONG_MAX/2) * smStep;
++  }
++  /* Under UBSAN (or on 1's complement machines), must do this last term
++   * in steps to avoid the dreaded (and harmless) signed multiply overlow. */
++  if( ix>=2 ){
++    sqlite3_int64 ix2 = (sqlite3_int64)ix/2;
++    smBase += ix2*smStep;
++    ix -= ix2;
++  }
++  return smBase + ((sqlite3_int64)ix)*smStep;
++}
++
++typedef unsigned char u8;
++
++typedef struct SequenceSpec {
++  sqlite3_int64 iBase;         /* Starting value ("start") */
++  sqlite3_int64 iTerm;         /* Given terminal value ("stop") */
++  sqlite3_int64 iStep;         /* Increment ("step") */
++  sqlite3_uint64 uSeqIndexMax; /* maximum sequence index (aka "n") */
++  sqlite3_uint64 uSeqIndexNow; /* Current index during generation */
++  sqlite3_int64 iValueNow;     /* Current value during generation */
++  u8 isNotEOF;                 /* Sequence generation not exhausted */
++  u8 isReversing;              /* Sequence is being reverse generated */
++} SequenceSpec;
++
++/*
++** Prepare a SequenceSpec for use in generating an integer series
++** given initialized iBase, iTerm and iStep values. Sequence is
++** initialized per given isReversing. Other members are computed.
++*/
++static void setupSequence( SequenceSpec *pss ){
++  int bSameSigns;
++  pss->uSeqIndexMax = 0;
++  pss->isNotEOF = 0;
++  bSameSigns = (pss->iBase < 0)==(pss->iTerm < 0);
++  if( pss->iTerm < pss->iBase ){
++    sqlite3_uint64 nuspan = 0;
++    if( bSameSigns ){
++      nuspan = (sqlite3_uint64)(pss->iBase - pss->iTerm);
++    }else{
++      /* Under UBSAN (or on 1's complement machines), must do this in steps.
++       * In this clause, iBase>=0 and iTerm<0 . */
++      nuspan = 1;
++      nuspan += pss->iBase;
++      nuspan += -(pss->iTerm+1);
++    }
++    if( pss->iStep<0 ){
++      pss->isNotEOF = 1;
++      if( nuspan==ULONG_MAX ){
++        pss->uSeqIndexMax = ( pss->iStep>LLONG_MIN )? nuspan/-pss->iStep : 1;
++      }else if( pss->iStep>LLONG_MIN ){
++        pss->uSeqIndexMax = nuspan/-pss->iStep;
++      }
++    }
++  }else if( pss->iTerm > pss->iBase ){
++    sqlite3_uint64 puspan = 0;
++    if( bSameSigns ){
++      puspan = (sqlite3_uint64)(pss->iTerm - pss->iBase);
++    }else{
++      /* Under UBSAN (or on 1's complement machines), must do this in steps.
++       * In this clause, iTerm>=0 and iBase<0 . */
++      puspan = 1;
++      puspan += pss->iTerm;
++      puspan += -(pss->iBase+1);
++    }
++    if( pss->iStep>0 ){
++      pss->isNotEOF = 1;
++      pss->uSeqIndexMax = puspan/pss->iStep;
++    }
++  }else if( pss->iTerm == pss->iBase ){
++      pss->isNotEOF = 1;
++      pss->uSeqIndexMax = 0;
++  }
++  pss->uSeqIndexNow = (pss->isReversing)? pss->uSeqIndexMax : 0;
++  pss->iValueNow = (pss->isReversing)
++    ? genSeqMember(pss->iBase, pss->iStep, pss->uSeqIndexMax)
++    : pss->iBase;
++}
++
++/*
++** Progress sequence generator to yield next value, if any.
++** Leave its state to either yield next value or be at EOF.
++** Return whether there is a next value, or 0 at EOF.
++*/
++static int progressSequence( SequenceSpec *pss ){
++  if( !pss->isNotEOF ) return 0;
++  if( pss->isReversing ){
++    if( pss->uSeqIndexNow > 0 ){
++      pss->uSeqIndexNow--;
++      pss->iValueNow -= pss->iStep;
++    }else{
++      pss->isNotEOF = 0;
++    }
++  }else{
++    if( pss->uSeqIndexNow < pss->uSeqIndexMax ){
++      pss->uSeqIndexNow++;
++      pss->iValueNow += pss->iStep;
++    }else{
++      pss->isNotEOF = 0;
++    }
++  }
++  return pss->isNotEOF;
++}
++
++/* series_cursor is a subclass of sqlite3_vtab_cursor which will
++** serve as the underlying representation of a cursor that scans
++** over rows of the result
++*/
++typedef struct series_cursor series_cursor;
++struct series_cursor {
++  sqlite3_vtab_cursor base;  /* Base class - must be first */
++  SequenceSpec ss;           /* (this) Derived class data */
++};
++
++/*
++** The seriesConnect() method is invoked to create a new
++** series_vtab that describes the generate_series virtual table.
++**
++** Think of this routine as the constructor for series_vtab objects.
++**
++** All this routine needs to do is:
++**
++**    (1) Allocate the series_vtab object and initialize all fields.
++**
++**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
++**        result set of queries against generate_series will look like.
++*/
++static int seriesConnect(
++  sqlite3 *db,
++  void *pUnused,
++  int argcUnused, const char *const*argvUnused,
++  sqlite3_vtab **ppVtab,
++  char **pzErrUnused
++){
++  sqlite3_vtab *pNew;
++  int rc;
++
++/* Column numbers */
++#define SERIES_COLUMN_VALUE 0
++#define SERIES_COLUMN_START 1
++#define SERIES_COLUMN_STOP  2
++#define SERIES_COLUMN_STEP  3
++
++  (void)pUnused;
++  (void)argcUnused;
++  (void)argvUnused;
++  (void)pzErrUnused;
++  rc = sqlite3_declare_vtab(db,
++     "CREATE TABLE x(value,start hidden,stop hidden,step hidden)");
++  if( rc==SQLITE_OK ){
++    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
++    if( pNew==0 ) return SQLITE_NOMEM;
++    memset(pNew, 0, sizeof(*pNew));
++    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
++  }
++  return rc;
++}
++
++/*
++** This method is the destructor for series_cursor objects.
++*/
++static int seriesDisconnect(sqlite3_vtab *pVtab){
++  sqlite3_free(pVtab);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new series_cursor object.
++*/
++static int seriesOpen(sqlite3_vtab *pUnused, sqlite3_vtab_cursor **ppCursor){
++  series_cursor *pCur;
++  (void)pUnused;
++  pCur = sqlite3_malloc( sizeof(*pCur) );
++  if( pCur==0 ) return SQLITE_NOMEM;
++  memset(pCur, 0, sizeof(*pCur));
++  *ppCursor = &pCur->base;
++  return SQLITE_OK;
++}
++
++/*
++** Destructor for a series_cursor.
++*/
++static int seriesClose(sqlite3_vtab_cursor *cur){
++  sqlite3_free(cur);
++  return SQLITE_OK;
++}
++
++
++/*
++** Advance a series_cursor to its next row of output.
++*/
++static int seriesNext(sqlite3_vtab_cursor *cur){
++  series_cursor *pCur = (series_cursor*)cur;
++  progressSequence( & pCur->ss );
++  return SQLITE_OK;
++}
++
++/*
++** Return values of columns for the row at which the series_cursor
++** is currently pointing.
++*/
++static int seriesColumn(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  series_cursor *pCur = (series_cursor*)cur;
++  sqlite3_int64 x = 0;
++  switch( i ){
++    case SERIES_COLUMN_START:  x = pCur->ss.iBase; break;
++    case SERIES_COLUMN_STOP:   x = pCur->ss.iTerm; break;
++    case SERIES_COLUMN_STEP:   x = pCur->ss.iStep;   break;
++    default:                   x = pCur->ss.iValueNow;  break;
++  }
++  sqlite3_result_int64(ctx, x);
++  return SQLITE_OK;
++}
++
++#ifndef LARGEST_UINT64
++#define LARGEST_UINT64 (0xffffffff|(((sqlite3_uint64)0xffffffff)<<32))
++#endif
++
++/*
++** Return the rowid for the current row, logically equivalent to n+1 where
++** "n" is the ascending integer in the aforesaid production definition.
++*/
++static int seriesRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
++  series_cursor *pCur = (series_cursor*)cur;
++  sqlite3_uint64 n = pCur->ss.uSeqIndexNow;
++  *pRowid = (sqlite3_int64)((nss.isNotEOF;
++}
++
++/* True to cause run-time checking of the start=, stop=, and/or step=
++** parameters.  The only reason to do this is for testing the
++** constraint checking logic for virtual tables in the SQLite core.
++*/
++#ifndef SQLITE_SERIES_CONSTRAINT_VERIFY
++# define SQLITE_SERIES_CONSTRAINT_VERIFY 0
++#endif
++
++/*
++** This method is called to "rewind" the series_cursor object back
++** to the first row of output.  This method is always called at least
++** once prior to any call to seriesColumn() or seriesRowid() or
++** seriesEof().
++**
++** The query plan selected by seriesBestIndex is passed in the idxNum
++** parameter.  (idxStr is not used in this implementation.)  idxNum
++** is a bitmask showing which constraints are available:
++**
++**    1:    start=VALUE
++**    2:    stop=VALUE
++**    4:    step=VALUE
++**
++** Also, if bit 8 is set, that means that the series should be output
++** in descending order rather than in ascending order.  If bit 16 is
++** set, then output must appear in ascending order.
++**
++** This routine should initialize the cursor and position it so that it
++** is pointing at the first row, or pointing off the end of the table
++** (so that seriesEof() will return true) if the table is empty.
++*/
++static int seriesFilter(
++  sqlite3_vtab_cursor *pVtabCursor,
++  int idxNum, const char *idxStrUnused,
++  int argc, sqlite3_value **argv
++){
++  series_cursor *pCur = (series_cursor *)pVtabCursor;
++  int i = 0;
++  (void)idxStrUnused;
++  if( idxNum & 1 ){
++    pCur->ss.iBase = sqlite3_value_int64(argv[i++]);
++  }else{
++    pCur->ss.iBase = 0;
++  }
++  if( idxNum & 2 ){
++    pCur->ss.iTerm = sqlite3_value_int64(argv[i++]);
++  }else{
++    pCur->ss.iTerm = 0xffffffff;
++  }
++  if( idxNum & 4 ){
++    pCur->ss.iStep = sqlite3_value_int64(argv[i++]);
++    if( pCur->ss.iStep==0 ){
++      pCur->ss.iStep = 1;
++    }else if( pCur->ss.iStep<0 ){
++      if( (idxNum & 16)==0 ) idxNum |= 8;
++    }
++  }else{
++    pCur->ss.iStep = 1;
++  }
++  for(i=0; iss.iBase = 1;
++      pCur->ss.iTerm = 0;
++      pCur->ss.iStep = 1;
++      break;
++    }
++  }
++  if( idxNum & 8 ){
++    pCur->ss.isReversing = pCur->ss.iStep > 0;
++  }else{
++    pCur->ss.isReversing = pCur->ss.iStep < 0;
++  }
++  setupSequence( &pCur->ss );
++  return SQLITE_OK;
++}
++
++/*
++** SQLite will invoke this method one or more times while planning a query
++** that uses the generate_series virtual table.  This routine needs to create
++** a query plan for each invocation and compute an estimated cost for that
++** plan.
++**
++** In this implementation idxNum is used to represent the
++** query plan.  idxStr is unused.
++**
++** The query plan is represented by bits in idxNum:
++**
++**  (1)  start = $value  -- constraint exists
++**  (2)  stop = $value   -- constraint exists
++**  (4)  step = $value   -- constraint exists
++**  (8)  output in descending order
++*/
++static int seriesBestIndex(
++  sqlite3_vtab *pVTab,
++  sqlite3_index_info *pIdxInfo
++){
++  int i, j;              /* Loop over constraints */
++  int idxNum = 0;        /* The query plan bitmask */
++  int bStartSeen = 0;    /* EQ constraint seen on the START column */
++  int unusableMask = 0;  /* Mask of unusable constraints */
++  int nArg = 0;          /* Number of arguments that seriesFilter() expects */
++  int aIdx[3];           /* Constraints on start, stop, and step */
++  const struct sqlite3_index_constraint *pConstraint;
++
++  /* This implementation assumes that the start, stop, and step columns
++  ** are the last three columns in the virtual table. */
++  assert( SERIES_COLUMN_STOP == SERIES_COLUMN_START+1 );
++  assert( SERIES_COLUMN_STEP == SERIES_COLUMN_START+2 );
++
++  aIdx[0] = aIdx[1] = aIdx[2] = -1;
++  pConstraint = pIdxInfo->aConstraint;
++  for(i=0; inConstraint; i++, pConstraint++){
++    int iCol;    /* 0 for start, 1 for stop, 2 for step */
++    int iMask;   /* bitmask for those column */
++    if( pConstraint->iColumniColumn - SERIES_COLUMN_START;
++    assert( iCol>=0 && iCol<=2 );
++    iMask = 1 << iCol;
++    if( iCol==0 ) bStartSeen = 1;
++    if( pConstraint->usable==0 ){
++      unusableMask |=  iMask;
++      continue;
++    }else if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
++      idxNum |= iMask;
++      aIdx[iCol] = i;
++    }
++  }
++  for(i=0; i<3; i++){
++    if( (j = aIdx[i])>=0 ){
++      pIdxInfo->aConstraintUsage[j].argvIndex = ++nArg;
++      pIdxInfo->aConstraintUsage[j].omit = !SQLITE_SERIES_CONSTRAINT_VERIFY;
++    }
++  }
++  /* The current generate_column() implementation requires at least one
++  ** argument (the START value).  Legacy versions assumed START=0 if the
++  ** first argument was omitted.  Compile with -DZERO_ARGUMENT_GENERATE_SERIES
++  ** to obtain the legacy behavior */
++#ifndef ZERO_ARGUMENT_GENERATE_SERIES
++  if( !bStartSeen ){
++    sqlite3_free(pVTab->zErrMsg);
++    pVTab->zErrMsg = sqlite3_mprintf(
++        "first argument to \"generate_series()\" missing or unusable");
++    return SQLITE_ERROR;
++  }
++#endif
++  if( (unusableMask & ~idxNum)!=0 ){
++    /* The start, stop, and step columns are inputs.  Therefore if there
++    ** are unusable constraints on any of start, stop, or step then
++    ** this plan is unusable */
++    return SQLITE_CONSTRAINT;
++  }
++  if( (idxNum & 3)==3 ){
++    /* Both start= and stop= boundaries are available.  This is the 
++    ** the preferred case */
++    pIdxInfo->estimatedCost = (double)(2 - ((idxNum&4)!=0));
++    pIdxInfo->estimatedRows = 1000;
++    if( pIdxInfo->nOrderBy>=1 && pIdxInfo->aOrderBy[0].iColumn==0 ){
++      if( pIdxInfo->aOrderBy[0].desc ){
++        idxNum |= 8;
++      }else{
++        idxNum |= 16;
++      }
++      pIdxInfo->orderByConsumed = 1;
++    }
++  }else{
++    /* If either boundary is missing, we have to generate a huge span
++    ** of numbers.  Make this case very expensive so that the query
++    ** planner will work hard to avoid it. */
++    pIdxInfo->estimatedRows = 2147483647;
++  }
++  pIdxInfo->idxNum = idxNum;
++  return SQLITE_OK;
++}
++
++/*
++** This following structure defines all the methods for the 
++** generate_series virtual table.
++*/
++static sqlite3_module seriesModule = {
++  0,                         /* iVersion */
++  0,                         /* xCreate */
++  seriesConnect,             /* xConnect */
++  seriesBestIndex,           /* xBestIndex */
++  seriesDisconnect,          /* xDisconnect */
++  0,                         /* xDestroy */
++  seriesOpen,                /* xOpen - open a cursor */
++  seriesClose,               /* xClose - close a cursor */
++  seriesFilter,              /* xFilter - configure scan constraints */
++  seriesNext,                /* xNext - advance a cursor */
++  seriesEof,                 /* xEof - check for end of scan */
++  seriesColumn,              /* xColumn - read data */
++  seriesRowid,               /* xRowid - read data */
++  0,                         /* xUpdate */
++  0,                         /* xBegin */
++  0,                         /* xSync */
++  0,                         /* xCommit */
++  0,                         /* xRollback */
++  0,                         /* xFindMethod */
++  0,                         /* xRename */
++  0,                         /* xSavepoint */
++  0,                         /* xRelease */
++  0,                         /* xRollbackTo */
++  0,                         /* xShadowName */
++  0                          /* xIntegrity */
++};
++
++#endif /* SQLITE_OMIT_VIRTUALTABLE */
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_series_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++  if( sqlite3_libversion_number()<3008012 && pzErrMsg!=0 ){
++    *pzErrMsg = sqlite3_mprintf(
++        "generate_series() requires SQLite 3.8.12 or later");
++    return SQLITE_ERROR;
++  }
++  rc = sqlite3_create_module(db, "generate_series", &seriesModule, 0);
++#endif
++  return rc;
++}
++/*** End of #include "series.c" ***/
++
++#endif
++
++/*
++** UUID
++*/
++#ifdef SQLITE_ENABLE_UUID
++/* Prototype for initialization function of UUID extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_uuid_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "uuid.c" */
++/*** Begin of #include "uuid.c" ***/
++/*
++** 2019-10-23
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This SQLite extension implements functions that handling RFC-4122 UUIDs
++** Three SQL functions are implemented:
++**
++**     uuid()        - generate a version 4 UUID as a string
++**     uuid_str(X)   - convert a UUID X into a well-formed UUID string
++**     uuid_blob(X)  - convert a UUID X into a 16-byte blob
++**
++** The output from uuid() and uuid_str(X) are always well-formed RFC-4122
++** UUID strings in this format:
++**
++**        xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
++**
++** All of the 'x', 'M', and 'N' values are lower-case hexadecimal digits.
++** The M digit indicates the "version".  For uuid()-generated UUIDs, the
++** version is always "4" (a random UUID).  The upper three bits of N digit
++** are the "variant".  This library only supports variant 1 (indicated
++** by values of N between '8' and 'b') as those are overwhelming the most
++** common.  Other variants are for legacy compatibility only.
++**
++** The output of uuid_blob(X) is always a 16-byte blob.  The UUID input
++** string is converted in network byte order (big-endian) in accordance
++** with RFC-4122 specifications for variant-1 UUIDs.  Note that network
++** byte order is *always* used, even if the input self-identifies as a
++** variant-2 UUID.
++**
++** The input X to the uuid_str() and uuid_blob() functions can be either
++** a string or a BLOB.  If it is a BLOB it must be exactly 16 bytes in
++** length or else a NULL is returned.  If the input is a string it must
++** consist of 32 hexadecimal digits, upper or lower case, optionally
++** surrounded by {...} and with optional "-" characters interposed in the
++** middle.  The flexibility of input is inspired by the PostgreSQL
++** implementation of UUID functions that accept in all of the following
++** formats:
++**
++**     A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11
++**     {a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}
++**     a0eebc999c0b4ef8bb6d6bb9bd380a11
++**     a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11
++**     {a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}
++**
++** If any of the above inputs are passed into uuid_str(), the output will
++** always be in the canonical RFC-4122 format:
++**
++**     a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11
++**
++** If the X input string has too few or too many digits or contains
++** stray characters other than {, }, or -, then NULL is returned.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++#include 
++#include 
++#include 
++
++#if !defined(SQLITE_ASCII) && !defined(SQLITE_EBCDIC)
++# define SQLITE_ASCII 1
++#endif
++
++/*
++** Translate a single byte of Hex into an integer.
++** This routine only works if h really is a valid hexadecimal
++** character:  0..9a..fA..F
++*/
++static unsigned char sqlite3UuidHexToInt(int h){
++  assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
++#ifdef SQLITE_ASCII
++  h += 9*(1&(h>>6));
++#endif
++#ifdef SQLITE_EBCDIC
++  h += 9*(1&~(h>>4));
++#endif
++  return (unsigned char)(h & 0xf);
++}
++
++/*
++** Convert a 16-byte BLOB into a well-formed RFC-4122 UUID.  The output
++** buffer zStr should be at least 37 bytes in length.   The output will
++** be zero-terminated.
++*/
++static void sqlite3UuidBlobToStr(
++  const unsigned char *aBlob,  /* Input blob */
++  unsigned char *zStr          /* Write the answer here */
++){
++  static const char zDigits[] = "0123456789abcdef";
++  int i, k;
++  unsigned char x;
++  k = 0;
++  for(i=0, k=0x550; i<16; i++, k=k>>1){
++    if( k&1 ){
++      zStr[0] = '-';
++      zStr++;
++    }
++    x = aBlob[i];
++    zStr[0] = zDigits[x>>4];
++    zStr[1] = zDigits[x&0xf];
++    zStr += 2;
++  }
++  *zStr = 0;
++}
++
++/*
++** Attempt to parse a zero-terminated input string zStr into a binary
++** UUID.  Return 0 on success, or non-zero if the input string is not
++** parsable.
++*/
++static int sqlite3UuidStrToBlob(
++  const unsigned char *zStr,   /* Input string */
++  unsigned char *aBlob         /* Write results here */
++){
++  int i;
++  if( zStr[0]=='{' ) zStr++;
++  for(i=0; i<16; i++){
++    if( zStr[0]=='-' ) zStr++;
++    if( isxdigit(zStr[0]) && isxdigit(zStr[1]) ){
++      aBlob[i] = (sqlite3UuidHexToInt(zStr[0])<<4)
++                      + sqlite3UuidHexToInt(zStr[1]);
++      zStr += 2;
++    }else{
++      return 1;
++    }
++  }
++  if( zStr[0]=='}' ) zStr++;
++  return zStr[0]!=0;
++}
++
++/*
++** Render sqlite3_value pIn as a 16-byte UUID blob.  Return a pointer
++** to the blob, or NULL if the input is not well-formed.
++*/
++static const unsigned char *sqlite3UuidInputToBlob(
++  sqlite3_value *pIn,     /* Input text */
++  unsigned char *pBuf     /* output buffer */
++){
++  switch( sqlite3_value_type(pIn) ){
++    case SQLITE_TEXT: {
++      const unsigned char *z = sqlite3_value_text(pIn);
++      if( sqlite3UuidStrToBlob(z, pBuf) ) return 0;
++      return pBuf;
++    }
++    case SQLITE_BLOB: {
++      int n = sqlite3_value_bytes(pIn);
++      return n==16 ? sqlite3_value_blob(pIn) : 0;
++    }
++    default: {
++      return 0;
++    }
++  }
++}
++
++/* Implementation of uuid() */
++static void sqlite3UuidFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  unsigned char aBlob[16];
++  unsigned char zStr[37];
++  (void)argc;
++  (void)argv;
++  sqlite3_randomness(16, aBlob);
++  aBlob[6] = (aBlob[6]&0x0f) + 0x40;
++  aBlob[8] = (aBlob[8]&0x3f) + 0x80;
++  sqlite3UuidBlobToStr(aBlob, zStr);
++  sqlite3_result_text(context, (char*)zStr, 36, SQLITE_TRANSIENT);
++}
++
++/* Implementation of uuid_str() */
++static void sqlite3UuidStrFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  unsigned char aBlob[16];
++  unsigned char zStr[37];
++  const unsigned char *pBlob;
++  (void)argc;
++  pBlob = sqlite3UuidInputToBlob(argv[0], aBlob);
++  if( pBlob==0 ) return;
++  sqlite3UuidBlobToStr(pBlob, zStr);
++  sqlite3_result_text(context, (char*)zStr, 36, SQLITE_TRANSIENT);
++}
++
++/* Implementation of uuid_blob() */
++static void sqlite3UuidBlobFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  unsigned char aBlob[16];
++  const unsigned char *pBlob;
++  (void)argc;
++  pBlob = sqlite3UuidInputToBlob(argv[0], aBlob);
++  if( pBlob==0 ) return;
++  sqlite3_result_blob(context, pBlob, 16, SQLITE_TRANSIENT);
++}
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_uuid_init(
++  sqlite3 *db,
++  char **pzErrMsg,
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++  (void)pzErrMsg;  /* Unused parameter */
++  rc = sqlite3_create_function(db, "uuid", 0, SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
++                               sqlite3UuidFunc, 0, 0);
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "uuid_str", 1, 
++                       SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
++                       0, sqlite3UuidStrFunc, 0, 0);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "uuid_blob", 1,
++                       SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
++                       0, sqlite3UuidBlobFunc, 0, 0);
++  }
++  return rc;
++}
++/*** End of #include "uuid.c" ***/
++
++#endif
++
++/*
++** REGEXP
++*/
++#ifdef SQLITE_ENABLE_REGEXP
++/* Prototype for initialization function of REGEXP extension */
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_regexp_init(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi);
++/* #include "regexp.c" */
++/*** Begin of #include "regexp.c" ***/
++/*
++** 2012-11-13
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** The code in this file implements a compact but reasonably
++** efficient regular-expression matcher for posix extended regular
++** expressions against UTF8 text.
++**
++** This file is an SQLite extension.  It registers a single function
++** named "regexp(A,B)" where A is the regular expression and B is the
++** string to be matched.  By registering this function, SQLite will also
++** then implement the "B regexp A" operator.  Note that with the function
++** the regular expression comes first, but with the operator it comes
++** second.
++**
++**  The following regular expression syntax is supported:
++**
++**     X*      zero or more occurrences of X
++**     X+      one or more occurrences of X
++**     X?      zero or one occurrences of X
++**     X{p,q}  between p and q occurrences of X
++**     (X)     match X
++**     X|Y     X or Y
++**     ^X      X occurring at the beginning of the string
++**     X$      X occurring at the end of the string
++**     .       Match any single character
++**     \c      Character c where c is one of \{}()[]|*+?.
++**     \c      C-language escapes for c in afnrtv.  ex: \t or \n
++**     \uXXXX  Where XXXX is exactly 4 hex digits, unicode value XXXX
++**     \xXX    Where XX is exactly 2 hex digits, unicode value XX
++**     [abc]   Any single character from the set abc
++**     [^abc]  Any single character not in the set abc
++**     [a-z]   Any single character in the range a-z
++**     [^a-z]  Any single character not in the range a-z
++**     \b      Word boundary
++**     \w      Word character.  [A-Za-z0-9_]
++**     \W      Non-word character
++**     \d      Digit
++**     \D      Non-digit
++**     \s      Whitespace character
++**     \S      Non-whitespace character
++**
++** A nondeterministic finite automaton (NFA) is used for matching, so the
++** performance is bounded by O(N*M) where N is the size of the regular
++** expression and M is the size of the input string.  The matcher never
++** exhibits exponential behavior.  Note that the X{p,q} operator expands
++** to p copies of X following by q-p copies of X? and that the size of the
++** regular expression in the O(N*M) performance bound is computed after
++** this expansion.
++*/
++#include 
++#include 
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++
++/*
++** The following #defines change the names of some functions implemented in
++** this file to prevent name collisions with C-library functions of the
++** same name.
++*/
++#define re_match   sqlite3re_match
++#define re_compile sqlite3re_compile
++#define re_free    sqlite3re_free
++
++/* The end-of-input character */
++#define RE_EOF            0    /* End of input */
++#define RE_START  0xfffffff    /* Start of input - larger than an UTF-8 */
++
++/* The NFA is implemented as sequence of opcodes taken from the following
++** set.  Each opcode has a single integer argument.
++*/
++#define RE_OP_MATCH       1    /* Match the one character in the argument */
++#define RE_OP_ANY         2    /* Match any one character.  (Implements ".") */
++#define RE_OP_ANYSTAR     3    /* Special optimized version of .* */
++#define RE_OP_FORK        4    /* Continue to both next and opcode at iArg */
++#define RE_OP_GOTO        5    /* Jump to opcode at iArg */
++#define RE_OP_ACCEPT      6    /* Halt and indicate a successful match */
++#define RE_OP_CC_INC      7    /* Beginning of a [...] character class */
++#define RE_OP_CC_EXC      8    /* Beginning of a [^...] character class */
++#define RE_OP_CC_VALUE    9    /* Single value in a character class */
++#define RE_OP_CC_RANGE   10    /* Range of values in a character class */
++#define RE_OP_WORD       11    /* Perl word character [A-Za-z0-9_] */
++#define RE_OP_NOTWORD    12    /* Not a perl word character */
++#define RE_OP_DIGIT      13    /* digit:  [0-9] */
++#define RE_OP_NOTDIGIT   14    /* Not a digit */
++#define RE_OP_SPACE      15    /* space:  [ \t\n\r\v\f] */
++#define RE_OP_NOTSPACE   16    /* Not a digit */
++#define RE_OP_BOUNDARY   17    /* Boundary between word and non-word */
++#define RE_OP_ATSTART    18    /* Currently at the start of the string */
++
++#if defined(SQLITE_DEBUG)
++/* Opcode names used for symbolic debugging */
++static const char *ReOpName[] = {
++  "EOF",
++  "MATCH",
++  "ANY",
++  "ANYSTAR",
++  "FORK",
++  "GOTO",
++  "ACCEPT",
++  "CC_INC",
++  "CC_EXC",
++  "CC_VALUE",
++  "CC_RANGE",
++  "WORD",
++  "NOTWORD",
++  "DIGIT",
++  "NOTDIGIT",
++  "SPACE",
++  "NOTSPACE",
++  "BOUNDARY",
++  "ATSTART",
++};
++#endif /* SQLITE_DEBUG */
++
++
++/* Each opcode is a "state" in the NFA */
++typedef unsigned short ReStateNumber;
++
++/* Because this is an NFA and not a DFA, multiple states can be active at
++** once.  An instance of the following object records all active states in
++** the NFA.  The implementation is optimized for the common case where the
++** number of actives states is small.
++*/
++typedef struct ReStateSet {
++  unsigned nState;            /* Number of current states */
++  ReStateNumber *aState;      /* Current states */
++} ReStateSet;
++
++/* An input string read one character at a time.
++*/
++typedef struct ReInput ReInput;
++struct ReInput {
++  const unsigned char *z;  /* All text */
++  int i;                   /* Next byte to read */
++  int mx;                  /* EOF when i>=mx */
++};
++
++/* A compiled NFA (or an NFA that is in the process of being compiled) is
++** an instance of the following object.
++*/
++typedef struct ReCompiled ReCompiled;
++struct ReCompiled {
++  ReInput sIn;                /* Regular expression text */
++  const char *zErr;           /* Error message to return */
++  char *aOp;                  /* Operators for the virtual machine */
++  int *aArg;                  /* Arguments to each operator */
++  unsigned (*xNextChar)(ReInput*);  /* Next character function */
++  unsigned char zInit[12];    /* Initial text to match */
++  int nInit;                  /* Number of bytes in zInit */
++  unsigned nState;            /* Number of entries in aOp[] and aArg[] */
++  unsigned nAlloc;            /* Slots allocated for aOp[] and aArg[] */
++};
++
++/* Add a state to the given state set if it is not already there */
++static void re_add_state(ReStateSet *pSet, int newState){
++  unsigned i;
++  for(i=0; inState; i++) if( pSet->aState[i]==newState ) return;
++  pSet->aState[pSet->nState++] = (ReStateNumber)newState;
++}
++
++/* Extract the next unicode character from *pzIn and return it.  Advance
++** *pzIn to the first byte past the end of the character returned.  To
++** be clear:  this routine converts utf8 to unicode.  This routine is 
++** optimized for the common case where the next character is a single byte.
++*/
++static unsigned re_next_char(ReInput *p){
++  unsigned c;
++  if( p->i>=p->mx ) return 0;
++  c = p->z[p->i++];
++  if( c>=0x80 ){
++    if( (c&0xe0)==0xc0 && p->imx && (p->z[p->i]&0xc0)==0x80 ){
++      c = (c&0x1f)<<6 | (p->z[p->i++]&0x3f);
++      if( c<0x80 ) c = 0xfffd;
++    }else if( (c&0xf0)==0xe0 && p->i+1mx && (p->z[p->i]&0xc0)==0x80
++           && (p->z[p->i+1]&0xc0)==0x80 ){
++      c = (c&0x0f)<<12 | ((p->z[p->i]&0x3f)<<6) | (p->z[p->i+1]&0x3f);
++      p->i += 2;
++      if( c<=0x7ff || (c>=0xd800 && c<=0xdfff) ) c = 0xfffd;
++    }else if( (c&0xf8)==0xf0 && p->i+2mx && (p->z[p->i]&0xc0)==0x80
++           && (p->z[p->i+1]&0xc0)==0x80 && (p->z[p->i+2]&0xc0)==0x80 ){
++      c = (c&0x07)<<18 | ((p->z[p->i]&0x3f)<<12) | ((p->z[p->i+1]&0x3f)<<6)
++                       | (p->z[p->i+2]&0x3f);
++      p->i += 3;
++      if( c<=0xffff || c>0x10ffff ) c = 0xfffd;
++    }else{
++      c = 0xfffd;
++    }
++  }
++  return c;
++}
++static unsigned re_next_char_nocase(ReInput *p){
++  unsigned c = re_next_char(p);
++  if( c>='A' && c<='Z' ) c += 'a' - 'A';
++  return c;
++}
++
++/* Return true if c is a perl "word" character:  [A-Za-z0-9_] */
++static int re_word_char(int c){
++  return (c>='0' && c<='9') || (c>='a' && c<='z')
++      || (c>='A' && c<='Z') || c=='_';
++}
++
++/* Return true if c is a "digit" character:  [0-9] */
++static int re_digit_char(int c){
++  return (c>='0' && c<='9');
++}
++
++/* Return true if c is a perl "space" character:  [ \t\r\n\v\f] */
++static int re_space_char(int c){
++  return c==' ' || c=='\t' || c=='\n' || c=='\r' || c=='\v' || c=='\f';
++}
++
++/* Run a compiled regular expression on the zero-terminated input
++** string zIn[].  Return true on a match and false if there is no match.
++*/
++static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
++  ReStateSet aStateSet[2], *pThis, *pNext;
++  ReStateNumber aSpace[100];
++  ReStateNumber *pToFree;
++  unsigned int i = 0;
++  unsigned int iSwap = 0;
++  int c = RE_START;
++  int cPrev = 0;
++  int rc = 0;
++  ReInput in;
++
++  in.z = zIn;
++  in.i = 0;
++  in.mx = nIn>=0 ? nIn : (int)strlen((char const*)zIn);
++
++  /* Look for the initial prefix match, if there is one. */
++  if( pRe->nInit ){
++    unsigned char x = pRe->zInit[0];
++    while( in.i+pRe->nInit<=in.mx 
++     && (zIn[in.i]!=x ||
++         strncmp((const char*)zIn+in.i, (const char*)pRe->zInit, pRe->nInit)!=0)
++    ){
++      in.i++;
++    }
++    if( in.i+pRe->nInit>in.mx ) return 0;
++    c = RE_START-1;
++  }
++
++  if( pRe->nState<=(sizeof(aSpace)/(sizeof(aSpace[0])*2)) ){
++    pToFree = 0;
++    aStateSet[0].aState = aSpace;
++  }else{
++    pToFree = sqlite3_malloc64( sizeof(ReStateNumber)*2*pRe->nState );
++    if( pToFree==0 ) return -1;
++    aStateSet[0].aState = pToFree;
++  }
++  aStateSet[1].aState = &aStateSet[0].aState[pRe->nState];
++  pNext = &aStateSet[1];
++  pNext->nState = 0;
++  re_add_state(pNext, 0);
++  while( c!=RE_EOF && pNext->nState>0 ){
++    cPrev = c;
++    c = pRe->xNextChar(&in);
++    pThis = pNext;
++    pNext = &aStateSet[iSwap];
++    iSwap = 1 - iSwap;
++    pNext->nState = 0;
++    for(i=0; inState; i++){
++      int x = pThis->aState[i];
++      switch( pRe->aOp[x] ){
++        case RE_OP_MATCH: {
++          if( pRe->aArg[x]==c ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_ATSTART: {
++          if( cPrev==RE_START ) re_add_state(pThis, x+1);
++          break;
++        }
++        case RE_OP_ANY: {
++          if( c!=0 ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_WORD: {
++          if( re_word_char(c) ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_NOTWORD: {
++          if( !re_word_char(c) && c!=0 ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_DIGIT: {
++          if( re_digit_char(c) ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_NOTDIGIT: {
++          if( !re_digit_char(c) && c!=0 ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_SPACE: {
++          if( re_space_char(c) ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_NOTSPACE: {
++          if( !re_space_char(c) && c!=0 ) re_add_state(pNext, x+1);
++          break;
++        }
++        case RE_OP_BOUNDARY: {
++          if( re_word_char(c)!=re_word_char(cPrev) ) re_add_state(pThis, x+1);
++          break;
++        }
++        case RE_OP_ANYSTAR: {
++          re_add_state(pNext, x);
++          re_add_state(pThis, x+1);
++          break;
++        }
++        case RE_OP_FORK: {
++          re_add_state(pThis, x+pRe->aArg[x]);
++          re_add_state(pThis, x+1);
++          break;
++        }
++        case RE_OP_GOTO: {
++          re_add_state(pThis, x+pRe->aArg[x]);
++          break;
++        }
++        case RE_OP_ACCEPT: {
++          rc = 1;
++          goto re_match_end;
++        }
++        case RE_OP_CC_EXC: {
++          if( c==0 ) break;
++          /* fall-through */ goto re_op_cc_inc;
++        }
++        case RE_OP_CC_INC: re_op_cc_inc: {
++          int j = 1;
++          int n = pRe->aArg[x];
++          int hit = 0;
++          for(j=1; j>0 && jaOp[x+j]==RE_OP_CC_VALUE ){
++              if( pRe->aArg[x+j]==c ){
++                hit = 1;
++                j = -1;
++              }
++            }else{
++              if( pRe->aArg[x+j]<=c && pRe->aArg[x+j+1]>=c ){
++                hit = 1;
++                j = -1;
++              }else{
++                j++;
++              }
++            }
++          }
++          if( pRe->aOp[x]==RE_OP_CC_EXC ) hit = !hit;
++          if( hit ) re_add_state(pNext, x+n);
++          break;
++        }
++      }
++    }
++  }
++  for(i=0; inState; i++){
++    int x = pNext->aState[i];
++    while( pRe->aOp[x]==RE_OP_GOTO ) x += pRe->aArg[x];
++    if( pRe->aOp[x]==RE_OP_ACCEPT ){ rc = 1; break; }
++  }
++re_match_end:
++  sqlite3_free(pToFree);
++  return rc;
++}
++
++/* Resize the opcode and argument arrays for an RE under construction.
++*/
++static int re_resize(ReCompiled *p, int N){
++  char *aOp;
++  int *aArg;
++  aOp = sqlite3_realloc64(p->aOp, N*sizeof(p->aOp[0]));
++  if( aOp==0 ) return 1;
++  p->aOp = aOp;
++  aArg = sqlite3_realloc64(p->aArg, N*sizeof(p->aArg[0]));
++  if( aArg==0 ) return 1;
++  p->aArg = aArg;
++  p->nAlloc = N;
++  return 0;
++}
++
++/* Insert a new opcode and argument into an RE under construction.  The
++** insertion point is just prior to existing opcode iBefore.
++*/
++static int re_insert(ReCompiled *p, int iBefore, int op, int arg){
++  int i;
++  if( p->nAlloc<=p->nState && re_resize(p, p->nAlloc*2) ) return 0;
++  for(i=p->nState; i>iBefore; i--){
++    p->aOp[i] = p->aOp[i-1];
++    p->aArg[i] = p->aArg[i-1];
++  }
++  p->nState++;
++  p->aOp[iBefore] = (char)op;
++  p->aArg[iBefore] = arg;
++  return iBefore;
++}
++
++/* Append a new opcode and argument to the end of the RE under construction.
++*/
++static int re_append(ReCompiled *p, int op, int arg){
++  return re_insert(p, p->nState, op, arg);
++}
++
++/* Make a copy of N opcodes starting at iStart onto the end of the RE
++** under construction.
++*/
++static void re_copy(ReCompiled *p, int iStart, int N){
++  if( p->nState+N>=p->nAlloc && re_resize(p, p->nAlloc*2+N) ) return;
++  memcpy(&p->aOp[p->nState], &p->aOp[iStart], N*sizeof(p->aOp[0]));
++  memcpy(&p->aArg[p->nState], &p->aArg[iStart], N*sizeof(p->aArg[0]));
++  p->nState += N;
++}
++
++/* Return true if c is a hexadecimal digit character:  [0-9a-fA-F]
++** If c is a hex digit, also set *pV = (*pV)*16 + valueof(c).  If
++** c is not a hex digit *pV is unchanged.
++*/
++static int re_hex(int c, int *pV){
++  if( c>='0' && c<='9' ){
++    c -= '0';
++  }else if( c>='a' && c<='f' ){
++    c -= 'a' - 10;
++  }else if( c>='A' && c<='F' ){
++    c -= 'A' - 10;
++  }else{
++    return 0;
++  }
++  *pV = (*pV)*16 + (c & 0xff);
++  return 1;
++}
++
++/* A backslash character has been seen, read the next character and
++** return its interpretation.
++*/
++static unsigned re_esc_char(ReCompiled *p){
++  static const char zEsc[] = "afnrtv\\()*.+?[$^{|}]";
++  static const char zTrans[] = "\a\f\n\r\t\v";
++  int i, v = 0;
++  char c;
++  if( p->sIn.i>=p->sIn.mx ) return 0;
++  c = p->sIn.z[p->sIn.i];
++  if( c=='u' && p->sIn.i+4sIn.mx ){
++    const unsigned char *zIn = p->sIn.z + p->sIn.i;
++    if( re_hex(zIn[1],&v)
++     && re_hex(zIn[2],&v)
++     && re_hex(zIn[3],&v)
++     && re_hex(zIn[4],&v)
++    ){
++      p->sIn.i += 5;
++      return v;
++    }
++  }
++  if( c=='x' && p->sIn.i+2sIn.mx ){
++    const unsigned char *zIn = p->sIn.z + p->sIn.i;
++    if( re_hex(zIn[1],&v)
++     && re_hex(zIn[2],&v)
++    ){
++      p->sIn.i += 3;
++      return v;
++    }
++  }
++  for(i=0; zEsc[i] && zEsc[i]!=c; i++){}
++  if( zEsc[i] ){
++    if( i<6 ) c = zTrans[i];
++    p->sIn.i++;
++  }else{
++    p->zErr = "unknown \\ escape";
++  }
++  return c;
++}
++
++/* Forward declaration */
++static const char *re_subcompile_string(ReCompiled*);
++
++/* Peek at the next byte of input */
++static unsigned char rePeek(ReCompiled *p){
++  return p->sIn.isIn.mx ? p->sIn.z[p->sIn.i] : 0;
++}
++
++/* Compile RE text into a sequence of opcodes.  Continue up to the
++** first unmatched ")" character, then return.  If an error is found,
++** return a pointer to the error message string.
++*/
++static const char *re_subcompile_re(ReCompiled *p){
++  const char *zErr;
++  int iStart, iEnd, iGoto;
++  iStart = p->nState;
++  zErr = re_subcompile_string(p);
++  if( zErr ) return zErr;
++  while( rePeek(p)=='|' ){
++    iEnd = p->nState;
++    re_insert(p, iStart, RE_OP_FORK, iEnd + 2 - iStart);
++    iGoto = re_append(p, RE_OP_GOTO, 0);
++    p->sIn.i++;
++    zErr = re_subcompile_string(p);
++    if( zErr ) return zErr;
++    p->aArg[iGoto] = p->nState - iGoto;
++  }
++  return 0;
++}
++
++/* Compile an element of regular expression text (anything that can be
++** an operand to the "|" operator).  Return NULL on success or a pointer
++** to the error message if there is a problem.
++*/
++static const char *re_subcompile_string(ReCompiled *p){
++  int iPrev = -1;
++  int iStart;
++  unsigned c;
++  const char *zErr;
++  while( (c = p->xNextChar(&p->sIn))!=0 ){
++    iStart = p->nState;
++    switch( c ){
++      case '|':
++      case ')': {
++        p->sIn.i--;
++        return 0;
++      }
++      case '(': {
++        zErr = re_subcompile_re(p);
++        if( zErr ) return zErr;
++        if( rePeek(p)!=')' ) return "unmatched '('";
++        p->sIn.i++;
++        break;
++      }
++      case '.': {
++        if( rePeek(p)=='*' ){
++          re_append(p, RE_OP_ANYSTAR, 0);
++          p->sIn.i++;
++        }else{
++          re_append(p, RE_OP_ANY, 0);
++        }
++        break;
++      }
++      case '*': {
++        if( iPrev<0 ) return "'*' without operand";
++        re_insert(p, iPrev, RE_OP_GOTO, p->nState - iPrev + 1);
++        re_append(p, RE_OP_FORK, iPrev - p->nState + 1);
++        break;
++      }
++      case '+': {
++        if( iPrev<0 ) return "'+' without operand";
++        re_append(p, RE_OP_FORK, iPrev - p->nState);
++        break;
++      }
++      case '?': {
++        if( iPrev<0 ) return "'?' without operand";
++        re_insert(p, iPrev, RE_OP_FORK, p->nState - iPrev+1);
++        break;
++      }
++      case '$': {
++        re_append(p, RE_OP_MATCH, RE_EOF);
++        break;
++      }
++      case '^': {
++        re_append(p, RE_OP_ATSTART, 0);
++        break;
++      }
++      case '{': {
++        int m = 0, n = 0;
++        int sz, j;
++        if( iPrev<0 ) return "'{m,n}' without operand";
++        while( (c=rePeek(p))>='0' && c<='9' ){ m = m*10 + c - '0'; p->sIn.i++; }
++        n = m;
++        if( c==',' ){
++          p->sIn.i++;
++          n = 0;
++          while( (c=rePeek(p))>='0' && c<='9' ){ n = n*10 + c-'0'; p->sIn.i++; }
++        }
++        if( c!='}' ) return "unmatched '{'";
++        if( n>0 && nsIn.i++;
++        sz = p->nState - iPrev;
++        if( m==0 ){
++          if( n==0 ) return "both m and n are zero in '{m,n}'";
++          re_insert(p, iPrev, RE_OP_FORK, sz+1);
++          iPrev++;
++          n--;
++        }else{
++          for(j=1; j0 ){
++          re_append(p, RE_OP_FORK, -sz);
++        }
++        break;
++      }
++      case '[': {
++        unsigned int iFirst = p->nState;
++        if( rePeek(p)=='^' ){
++          re_append(p, RE_OP_CC_EXC, 0);
++          p->sIn.i++;
++        }else{
++          re_append(p, RE_OP_CC_INC, 0);
++        }
++        while( (c = p->xNextChar(&p->sIn))!=0 ){
++          if( c=='[' && rePeek(p)==':' ){
++            return "POSIX character classes not supported";
++          }
++          if( c=='\\' ) c = re_esc_char(p);
++          if( rePeek(p)=='-' ){
++            re_append(p, RE_OP_CC_RANGE, c);
++            p->sIn.i++;
++            c = p->xNextChar(&p->sIn);
++            if( c=='\\' ) c = re_esc_char(p);
++            re_append(p, RE_OP_CC_RANGE, c);
++          }else{
++            re_append(p, RE_OP_CC_VALUE, c);
++          }
++          if( rePeek(p)==']' ){ p->sIn.i++; break; }
++        }
++        if( c==0 ) return "unclosed '['";
++        if( p->nState>iFirst ) p->aArg[iFirst] = p->nState - iFirst;
++        break;
++      }
++      case '\\': {
++        int specialOp = 0;
++        switch( rePeek(p) ){
++          case 'b': specialOp = RE_OP_BOUNDARY;   break;
++          case 'd': specialOp = RE_OP_DIGIT;      break;
++          case 'D': specialOp = RE_OP_NOTDIGIT;   break;
++          case 's': specialOp = RE_OP_SPACE;      break;
++          case 'S': specialOp = RE_OP_NOTSPACE;   break;
++          case 'w': specialOp = RE_OP_WORD;       break;
++          case 'W': specialOp = RE_OP_NOTWORD;    break;
++        }
++        if( specialOp ){
++          p->sIn.i++;
++          re_append(p, specialOp, 0);
++        }else{
++          c = re_esc_char(p);
++          re_append(p, RE_OP_MATCH, c);
++        }
++        break;
++      }
++      default: {
++        re_append(p, RE_OP_MATCH, c);
++        break;
++      }
++    }
++    iPrev = iStart;
++  }
++  return 0;
++}
++
++/* Free and reclaim all the memory used by a previously compiled
++** regular expression.  Applications should invoke this routine once
++** for every call to re_compile() to avoid memory leaks.
++*/
++static void re_free(ReCompiled *pRe){
++  if( pRe ){
++    sqlite3_free(pRe->aOp);
++    sqlite3_free(pRe->aArg);
++    sqlite3_free(pRe);
++  }
++}
++
++/*
++** Compile a textual regular expression in zIn[] into a compiled regular
++** expression suitable for us by re_match() and return a pointer to the
++** compiled regular expression in *ppRe.  Return NULL on success or an
++** error message if something goes wrong.
++*/
++static const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
++  ReCompiled *pRe;
++  const char *zErr;
++  int i, j;
++
++  *ppRe = 0;
++  pRe = sqlite3_malloc( sizeof(*pRe) );
++  if( pRe==0 ){
++    return "out of memory";
++  }
++  memset(pRe, 0, sizeof(*pRe));
++  pRe->xNextChar = noCase ? re_next_char_nocase : re_next_char;
++  if( re_resize(pRe, 30) ){
++    re_free(pRe);
++    return "out of memory";
++  }
++  if( zIn[0]=='^' ){
++    zIn++;
++  }else{
++    re_append(pRe, RE_OP_ANYSTAR, 0);
++  }
++  pRe->sIn.z = (unsigned char*)zIn;
++  pRe->sIn.i = 0;
++  pRe->sIn.mx = (int)strlen(zIn);
++  zErr = re_subcompile_re(pRe);
++  if( zErr ){
++    re_free(pRe);
++    return zErr;
++  }
++  if( pRe->sIn.i>=pRe->sIn.mx ){
++    re_append(pRe, RE_OP_ACCEPT, 0);
++    *ppRe = pRe;
++  }else{
++    re_free(pRe);
++    return "unrecognized character";
++  }
++
++  /* The following is a performance optimization.  If the regex begins with
++  ** ".*" (if the input regex lacks an initial "^") and afterwards there are
++  ** one or more matching characters, enter those matching characters into
++  ** zInit[].  The re_match() routine can then search ahead in the input 
++  ** string looking for the initial match without having to run the whole
++  ** regex engine over the string.  Do not worry about trying to match
++  ** unicode characters beyond plane 0 - those are very rare and this is
++  ** just an optimization. */
++  if( pRe->aOp[0]==RE_OP_ANYSTAR && !noCase ){
++    for(j=0, i=1; j<(int)sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){
++      unsigned x = pRe->aArg[i];
++      if( x<=0x7f ){
++        pRe->zInit[j++] = (unsigned char)x;
++      }else if( x<=0x7ff ){
++        pRe->zInit[j++] = (unsigned char)(0xc0 | (x>>6));
++        pRe->zInit[j++] = 0x80 | (x&0x3f);
++      }else if( x<=0xffff ){
++        pRe->zInit[j++] = (unsigned char)(0xe0 | (x>>12));
++        pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f);
++        pRe->zInit[j++] = 0x80 | (x&0x3f);
++      }else{
++        break;
++      }
++    }
++    if( j>0 && pRe->zInit[j-1]==0 ) j--;
++    pRe->nInit = j;
++  }
++  return pRe->zErr;
++}
++
++/*
++** Implementation of the regexp() SQL function.  This function implements
++** the build-in REGEXP operator.  The first argument to the function is the
++** pattern and the second argument is the string.  So, the SQL statements:
++**
++**       A REGEXP B
++**
++** is implemented as regexp(B,A).
++*/
++static void re_sql_func(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  ReCompiled *pRe;          /* Compiled regular expression */
++  const char *zPattern;     /* The regular expression */
++  const unsigned char *zStr;/* String being searched */
++  const char *zErr;         /* Compile error message */
++  int setAux = 0;           /* True to invoke sqlite3_set_auxdata() */
++
++  (void)argc;  /* Unused */
++  pRe = sqlite3_get_auxdata(context, 0);
++  if( pRe==0 ){
++    zPattern = (const char*)sqlite3_value_text(argv[0]);
++    if( zPattern==0 ) return;
++    zErr = re_compile(&pRe, zPattern, sqlite3_user_data(context)!=0);
++    if( zErr ){
++      re_free(pRe);
++      sqlite3_result_error(context, zErr, -1);
++      return;
++    }
++    if( pRe==0 ){
++      sqlite3_result_error_nomem(context);
++      return;
++    }
++    setAux = 1;
++  }
++  zStr = (const unsigned char*)sqlite3_value_text(argv[1]);
++  if( zStr!=0 ){
++    sqlite3_result_int(context, re_match(pRe, zStr, -1));
++  }
++  if( setAux ){
++    sqlite3_set_auxdata(context, 0, pRe, (void(*)(void*))re_free);
++  }
++}
++
++#if defined(SQLITE_DEBUG)
++/*
++** This function is used for testing and debugging only.  It is only available
++** if the SQLITE_DEBUG compile-time option is used.
++**
++** Compile a regular expression and then convert the compiled expression into
++** text and return that text.
++*/
++static void re_bytecode_func(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  const char *zPattern;
++  const char *zErr;
++  ReCompiled *pRe;
++  sqlite3_str *pStr;
++  int i;
++  int n;
++  char *z;
++  (void)argc;
++
++  zPattern = (const char*)sqlite3_value_text(argv[0]);
++  if( zPattern==0 ) return;
++  zErr = re_compile(&pRe, zPattern, sqlite3_user_data(context)!=0);
++  if( zErr ){
++    re_free(pRe);
++    sqlite3_result_error(context, zErr, -1);
++    return;
++  }
++  if( pRe==0 ){
++    sqlite3_result_error_nomem(context);
++    return;
++  }
++  pStr = sqlite3_str_new(0);
++  if( pStr==0 ) goto re_bytecode_func_err;
++  if( pRe->nInit>0 ){
++    sqlite3_str_appendf(pStr, "INIT     ");
++    for(i=0; inInit; i++){
++      sqlite3_str_appendf(pStr, "%02x", pRe->zInit[i]);
++    }
++    sqlite3_str_appendf(pStr, "\n");
++  }
++  for(i=0; (unsigned)inState; i++){
++    sqlite3_str_appendf(pStr, "%-8s %4d\n",
++         ReOpName[(unsigned char)pRe->aOp[i]], pRe->aArg[i]);
++  }
++  n = sqlite3_str_length(pStr);
++  z = sqlite3_str_finish(pStr);
++  if( n==0 ){
++    sqlite3_free(z);
++  }else{
++    sqlite3_result_text(context, z, n-1, sqlite3_free);
++  }
++
++re_bytecode_func_err:
++  re_free(pRe);
++}
++
++#endif /* SQLITE_DEBUG */
++
++
++/*
++** Invoke this routine to register the regexp() function with the
++** SQLite database connection.
++*/
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_regexp_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++  int rc = SQLITE_OK;
++  SQLITE_EXTENSION_INIT2(pApi);
++  (void)pzErrMsg;  /* Unused */
++  rc = sqlite3_create_function(db, "regexp", 2, 
++                            SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
++                            0, re_sql_func, 0, 0);
++  if( rc==SQLITE_OK ){
++    /* The regexpi(PATTERN,STRING) function is a case-insensitive version
++    ** of regexp(PATTERN,STRING). */
++    rc = sqlite3_create_function(db, "regexpi", 2,
++                            SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
++                            (void*)db, re_sql_func, 0, 0);
++#if defined(SQLITE_DEBUG)
++    if( rc==SQLITE_OK ){
++      rc = sqlite3_create_function(db, "regexp_bytecode", 1,
++                            SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
++                            0, re_bytecode_func, 0, 0);
++    }
++#endif /* SQLITE_DEBUG */
++  }
++  return rc;
++}
++/*** End of #include "regexp.c" ***/
++
++#endif
++
++#if defined(SQLITE_ENABLE_COMPRESS) || defined(SQLITE_ENABLE_SQLAR) || defined(SQLITE_ENABLE_ZIPFILE)
++#if SQLITE3MC_USE_MINIZ != 0
++/* #include "miniz.c" */
++/*** Begin of #include "miniz.c" ***/
++/* #include "miniz.h" */
++/*** Begin of #include "miniz.h" ***/
++#define MINIZ_EXPORT
++/* miniz.c 2.2.0 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing
++   See "unlicense" statement at the end of this file.
++   Rich Geldreich , last updated Oct. 13, 2013
++   Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt
++
++   Most API's defined in miniz.c are optional. For example, to disable the archive related functions just define
++   MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros).
++
++   * Low-level Deflate/Inflate implementation notes:
++
++     Compression: Use the "tdefl" API's. The compressor supports raw, static, and dynamic blocks, lazy or
++     greedy parsing, match length filtering, RLE-only, and Huffman-only streams. It performs and compresses
++     approximately as well as zlib.
++
++     Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function
++     coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory
++     block large enough to hold the entire file.
++
++     The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation.
++
++   * zlib-style API notes:
++
++     miniz.c implements a fairly large subset of zlib. There's enough functionality present for it to be a drop-in
++     zlib replacement in many apps:
++        The z_stream struct, optional memory allocation callbacks
++        deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound
++        inflateInit/inflateInit2/inflate/inflateReset/inflateEnd
++        compress, compress2, compressBound, uncompress
++        CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly routines.
++        Supports raw deflate streams or standard zlib streams with adler-32 checking.
++
++     Limitations:
++      The callback API's are not implemented yet. No support for gzip headers or zlib static dictionaries.
++      I've tried to closely emulate zlib's various flavors of stream flushing and return status codes, but
++      there are no guarantees that miniz.c pulls this off perfectly.
++
++   * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, originally written by
++     Alex Evans. Supports 1-4 bytes/pixel images.
++
++   * ZIP archive API notes:
++
++     The ZIP archive API's where designed with simplicity and efficiency in mind, with just enough abstraction to
++     get the job done with minimal fuss. There are simple API's to retrieve file information, read files from
++     existing archives, create new archives, append new files to existing archives, or clone archive data from
++     one archive to another. It supports archives located in memory or the heap, on disk (using stdio.h),
++     or you can specify custom file read/write callbacks.
++
++     - Archive reading: Just call this function to read a single file from a disk archive:
++
++      void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name,
++        size_t *pSize, mz_uint zip_flags);
++
++     For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central
++     directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files.
++
++     - Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file:
++
++     int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
++
++     The locate operation can optionally check file comments too, which (as one example) can be used to identify
++     multiple versions of the same file in an archive. This function uses a simple linear search through the central
++     directory, so it's not very fast.
++
++     Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and
++     retrieve detailed info on each file by calling mz_zip_reader_file_stat().
++
++     - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data
++     to disk and builds an exact image of the central directory in memory. The central directory image is written
++     all at once at the end of the archive file when the archive is finalized.
++
++     The archive writer can optionally align each file's local header and file data to any power of 2 alignment,
++     which can be useful when the archive will be read from optical media. Also, the writer supports placing
++     arbitrary data blobs at the very beginning of ZIP archives. Archives written using either feature are still
++     readable by any ZIP tool.
++
++     - Archive appending: The simple way to add a single file to an archive is to call this function:
++
++      mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name,
++        const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
++
++     The archive will be created if it doesn't already exist, otherwise it'll be appended to.
++     Note the appending is done in-place and is not an atomic operation, so if something goes wrong
++     during the operation it's possible the archive could be left without a central directory (although the local
++     file headers and file data will be fine, so the archive will be recoverable).
++
++     For more complex archive modification scenarios:
++     1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to
++     preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the
++     compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and
++     you're done. This is safe but requires a bunch of temporary disk space or heap memory.
++
++     2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(),
++     append new files as needed, then finalize the archive which will write an updated central directory to the
++     original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a
++     possibility that the archive's central directory could be lost with this method if anything goes wrong, though.
++
++     - ZIP archive support limitations:
++     No spanning support. Extraction functions can only handle unencrypted, stored or deflated files.
++     Requires streams capable of seeking.
++
++   * This is a header file library, like stb_image.c. To get only a header file, either cut and paste the
++     below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it.
++
++   * Important: For best perf. be sure to customize the below macros for your target platform:
++     #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
++     #define MINIZ_LITTLE_ENDIAN 1
++     #define MINIZ_HAS_64BIT_REGISTERS 1
++
++   * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before including miniz.c to ensure miniz
++     uses the 64-bit variants: fopen64(), stat64(), etc. Otherwise you won't be able to process large files
++     (i.e. 32-bit stat() fails for me on files > 0x7FFFFFFF bytes).
++*/
++
++
++
++
++/* Defines to completely disable specific portions of miniz.c: 
++   If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. */
++
++/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */
++/*#define MINIZ_NO_STDIO */
++
++/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */
++/* get/set file times, and the C run-time funcs that get/set times won't be called. */
++/* The current downside is the times written to your archives will be from 1979. */
++/*#define MINIZ_NO_TIME */
++
++/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */
++/*#define MINIZ_NO_ARCHIVE_APIS */
++
++/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP archive API's. */
++/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */
++
++/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression API's. */
++/*#define MINIZ_NO_ZLIB_APIS */
++
++/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
++/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
++
++/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. 
++   Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
++   callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
++   functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */
++/*#define MINIZ_NO_MALLOC */
++
++#if defined(__TINYC__) && (defined(__linux) || defined(__linux__))
++/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc on Linux */
++#define MINIZ_NO_TIME
++#endif
++
++#include 
++
++#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS)
++#include 
++#endif
++
++#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__)
++/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */
++#define MINIZ_X86_OR_X64_CPU 1
++#else
++#define MINIZ_X86_OR_X64_CPU 0
++#endif
++
++#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU
++/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
++#define MINIZ_LITTLE_ENDIAN 1
++#else
++#define MINIZ_LITTLE_ENDIAN 0
++#endif
++
++/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */
++#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES)
++#if MINIZ_X86_OR_X64_CPU
++/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */
++#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
++#define MINIZ_UNALIGNED_USE_MEMCPY
++#else
++#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
++#endif
++#endif
++
++#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
++/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). */
++#define MINIZ_HAS_64BIT_REGISTERS 1
++#else
++#define MINIZ_HAS_64BIT_REGISTERS 0
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* ------------------- zlib-style API Definitions. */
++
++/* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */
++typedef unsigned long mz_ulong;
++
++/* mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap. */
++MINIZ_EXPORT void mz_free(void *p);
++
++#define MZ_ADLER32_INIT (1)
++/* mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL. */
++MINIZ_EXPORT mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len);
++
++#define MZ_CRC32_INIT (0)
++/* mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL. */
++MINIZ_EXPORT mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len);
++
++/* Compression strategies. */
++enum
++{
++    MZ_DEFAULT_STRATEGY = 0,
++    MZ_FILTERED = 1,
++    MZ_HUFFMAN_ONLY = 2,
++    MZ_RLE = 3,
++    MZ_FIXED = 4
++};
++
++/* Method */
++#define MZ_DEFLATED 8
++
++/* Heap allocation callbacks.
++Note that mz_alloc_func parameter types purposely differ from zlib's: items/size is size_t, not unsigned long. */
++typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size);
++typedef void (*mz_free_func)(void *opaque, void *address);
++typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size);
++
++/* Compression levels: 0-9 are the standard zlib-style levels, 10 is best possible compression (not zlib compatible, and may be very slow), MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */
++enum
++{
++    MZ_NO_COMPRESSION = 0,
++    MZ_BEST_SPEED = 1,
++    MZ_BEST_COMPRESSION = 9,
++    MZ_UBER_COMPRESSION = 10,
++    MZ_DEFAULT_LEVEL = 6,
++    MZ_DEFAULT_COMPRESSION = -1
++};
++
++#define MZ_VERSION "10.2.0"
++#define MZ_VERNUM 0xA100
++#define MZ_VER_MAJOR 10
++#define MZ_VER_MINOR 2
++#define MZ_VER_REVISION 0
++#define MZ_VER_SUBREVISION 0
++
++#ifndef MINIZ_NO_ZLIB_APIS
++
++/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other values are for advanced use (refer to the zlib docs). */
++enum
++{
++    MZ_NO_FLUSH = 0,
++    MZ_PARTIAL_FLUSH = 1,
++    MZ_SYNC_FLUSH = 2,
++    MZ_FULL_FLUSH = 3,
++    MZ_FINISH = 4,
++    MZ_BLOCK = 5
++};
++
++/* Return status codes. MZ_PARAM_ERROR is non-standard. */
++enum
++{
++    MZ_OK = 0,
++    MZ_STREAM_END = 1,
++    MZ_NEED_DICT = 2,
++    MZ_ERRNO = -1,
++    MZ_STREAM_ERROR = -2,
++    MZ_DATA_ERROR = -3,
++    MZ_MEM_ERROR = -4,
++    MZ_BUF_ERROR = -5,
++    MZ_VERSION_ERROR = -6,
++    MZ_PARAM_ERROR = -10000
++};
++
++/* Window bits */
++#define MZ_DEFAULT_WINDOW_BITS 15
++
++struct mz_internal_state;
++
++/* Compression/decompression stream struct. */
++typedef struct mz_stream_s
++{
++    const unsigned char *next_in; /* pointer to next byte to read */
++    unsigned int avail_in;        /* number of bytes available at next_in */
++    mz_ulong total_in;            /* total number of bytes consumed so far */
++
++    unsigned char *next_out; /* pointer to next byte to write */
++    unsigned int avail_out;  /* number of bytes that can be written to next_out */
++    mz_ulong total_out;      /* total number of bytes produced so far */
++
++    char *msg;                       /* error msg (unused) */
++    struct mz_internal_state *state; /* internal state, allocated by zalloc/zfree */
++
++    mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */
++    mz_free_func zfree;   /* optional heap free function (defaults to free) */
++    void *opaque;         /* heap alloc function user pointer */
++
++    int data_type;     /* data_type (unused) */
++    mz_ulong adler;    /* adler32 of the source or uncompressed data */
++    mz_ulong reserved; /* not used */
++} mz_stream;
++
++typedef mz_stream *mz_streamp;
++
++/* Returns the version string of miniz.c. */
++MINIZ_EXPORT const char *mz_version(void);
++
++/* mz_deflateInit() initializes a compressor with default options: */
++/* Parameters: */
++/*  pStream must point to an initialized mz_stream struct. */
++/*  level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */
++/*  level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio. */
++/*  (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */
++/* Return values: */
++/*  MZ_OK on success. */
++/*  MZ_STREAM_ERROR if the stream is bogus. */
++/*  MZ_PARAM_ERROR if the input parameters are bogus. */
++/*  MZ_MEM_ERROR on out of memory. */
++MINIZ_EXPORT int mz_deflateInit(mz_streamp pStream, int level);
++
++/* mz_deflateInit2() is like mz_deflate(), except with more control: */
++/* Additional parameters: */
++/*   method must be MZ_DEFLATED */
++/*   window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer) */
++/*   mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */
++MINIZ_EXPORT int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy);
++
++/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */
++MINIZ_EXPORT int mz_deflateReset(mz_streamp pStream);
++
++/* mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible. */
++/* Parameters: */
++/*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
++/*   flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH. */
++/* Return values: */
++/*   MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full). */
++/*   MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore. */
++/*   MZ_STREAM_ERROR if the stream is bogus. */
++/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
++/*   MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.) */
++MINIZ_EXPORT int mz_deflate(mz_streamp pStream, int flush);
++
++/* mz_deflateEnd() deinitializes a compressor: */
++/* Return values: */
++/*  MZ_OK on success. */
++/*  MZ_STREAM_ERROR if the stream is bogus. */
++MINIZ_EXPORT int mz_deflateEnd(mz_streamp pStream);
++
++/* mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH. */
++MINIZ_EXPORT mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
++
++/* Single-call compression functions mz_compress() and mz_compress2(): */
++/* Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure. */
++MINIZ_EXPORT int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
++MINIZ_EXPORT int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level);
++
++/* mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress(). */
++MINIZ_EXPORT mz_ulong mz_compressBound(mz_ulong source_len);
++
++/* Initializes a decompressor. */
++MINIZ_EXPORT int mz_inflateInit(mz_streamp pStream);
++
++/* mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer: */
++/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate). */
++MINIZ_EXPORT int mz_inflateInit2(mz_streamp pStream, int window_bits);
++
++/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */
++MINIZ_EXPORT int mz_inflateReset(mz_streamp pStream);
++
++/* Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible. */
++/* Parameters: */
++/*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
++/*   flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */
++/*   On the first call, if flush is MZ_FINISH it's assumed the input and output buffers are both sized large enough to decompress the entire stream in a single call (this is slightly faster). */
++/*   MZ_FINISH implies that there are no more source bytes available beside what's already in the input buffer, and that the output buffer is large enough to hold the rest of the decompressed data. */
++/* Return values: */
++/*   MZ_OK on success. Either more input is needed but not available, and/or there's more output to be written but the output buffer is full. */
++/*   MZ_STREAM_END if all needed input has been consumed and all output bytes have been written. For zlib streams, the adler-32 of the decompressed data has also been verified. */
++/*   MZ_STREAM_ERROR if the stream is bogus. */
++/*   MZ_DATA_ERROR if the deflate stream is invalid. */
++/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
++/*   MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again */
++/*   with more input data, or with more room in the output buffer (except when using single call decompression, described above). */
++MINIZ_EXPORT int mz_inflate(mz_streamp pStream, int flush);
++
++/* Deinitializes a decompressor. */
++MINIZ_EXPORT int mz_inflateEnd(mz_streamp pStream);
++
++/* Single-call decompression. */
++/* Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. */
++MINIZ_EXPORT int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
++MINIZ_EXPORT int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len);
++
++/* Returns a string description of the specified error code, or NULL if the error code is invalid. */
++MINIZ_EXPORT const char *mz_error(int err);
++
++/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports. */
++/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project. */
++#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
++typedef unsigned char Byte;
++typedef unsigned int uInt;
++typedef mz_ulong uLong;
++typedef Byte Bytef;
++typedef uInt uIntf;
++typedef char charf;
++typedef int intf;
++typedef void *voidpf;
++typedef uLong uLongf;
++typedef void *voidp;
++typedef void *const voidpc;
++#define Z_NULL 0
++#define Z_NO_FLUSH MZ_NO_FLUSH
++#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH
++#define Z_SYNC_FLUSH MZ_SYNC_FLUSH
++#define Z_FULL_FLUSH MZ_FULL_FLUSH
++#define Z_FINISH MZ_FINISH
++#define Z_BLOCK MZ_BLOCK
++#define Z_OK MZ_OK
++#define Z_STREAM_END MZ_STREAM_END
++#define Z_NEED_DICT MZ_NEED_DICT
++#define Z_ERRNO MZ_ERRNO
++#define Z_STREAM_ERROR MZ_STREAM_ERROR
++#define Z_DATA_ERROR MZ_DATA_ERROR
++#define Z_MEM_ERROR MZ_MEM_ERROR
++#define Z_BUF_ERROR MZ_BUF_ERROR
++#define Z_VERSION_ERROR MZ_VERSION_ERROR
++#define Z_PARAM_ERROR MZ_PARAM_ERROR
++#define Z_NO_COMPRESSION MZ_NO_COMPRESSION
++#define Z_BEST_SPEED MZ_BEST_SPEED
++#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION
++#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION
++#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY
++#define Z_FILTERED MZ_FILTERED
++#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY
++#define Z_RLE MZ_RLE
++#define Z_FIXED MZ_FIXED
++#define Z_DEFLATED MZ_DEFLATED
++#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS
++#define alloc_func mz_alloc_func
++#define free_func mz_free_func
++#define internal_state mz_internal_state
++#define z_stream mz_stream
++#define deflateInit mz_deflateInit
++#define deflateInit2 mz_deflateInit2
++#define deflateReset mz_deflateReset
++#define deflate mz_deflate
++#define deflateEnd mz_deflateEnd
++#define deflateBound mz_deflateBound
++#define compress mz_compress
++#define compress2 mz_compress2
++#define compressBound mz_compressBound
++#define inflateInit mz_inflateInit
++#define inflateInit2 mz_inflateInit2
++#define inflateReset mz_inflateReset
++#define inflate mz_inflate
++#define inflateEnd mz_inflateEnd
++#define uncompress mz_uncompress
++#define uncompress2 mz_uncompress2
++#define crc32 mz_crc32
++#define adler32 mz_adler32
++#define MAX_WBITS 15
++#define MAX_MEM_LEVEL 9
++#define zError mz_error
++#define ZLIB_VERSION MZ_VERSION
++#define ZLIB_VERNUM MZ_VERNUM
++#define ZLIB_VER_MAJOR MZ_VER_MAJOR
++#define ZLIB_VER_MINOR MZ_VER_MINOR
++#define ZLIB_VER_REVISION MZ_VER_REVISION
++#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION
++#define zlibVersion mz_version
++#define zlib_version mz_version()
++#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
++
++#endif /* MINIZ_NO_ZLIB_APIS */
++
++#ifdef __cplusplus
++}
++#endif
++
++
++
++
++
++
++#include 
++#include 
++#include 
++#include 
++
++
++
++/* ------------------- Types and macros */
++typedef unsigned char mz_uint8;
++typedef signed short mz_int16;
++typedef unsigned short mz_uint16;
++typedef unsigned int mz_uint32;
++typedef unsigned int mz_uint;
++typedef int64_t mz_int64;
++typedef uint64_t mz_uint64;
++typedef int mz_bool;
++
++#define MZ_FALSE (0)
++#define MZ_TRUE (1)
++
++/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */
++#ifdef _MSC_VER
++#define MZ_MACRO_END while (0, 0)
++#else
++#define MZ_MACRO_END while (0)
++#endif
++
++#ifdef MINIZ_NO_STDIO
++#define MZ_FILE void *
++#else
++#include 
++#define MZ_FILE FILE
++#endif /* #ifdef MINIZ_NO_STDIO */
++
++#ifdef MINIZ_NO_TIME
++typedef struct mz_dummy_time_t_tag
++{
++    int m_dummy;
++} mz_dummy_time_t;
++#define MZ_TIME_T mz_dummy_time_t
++#else
++#define MZ_TIME_T time_t
++#endif
++
++#define MZ_ASSERT(x) assert(x)
++
++#ifdef MINIZ_NO_MALLOC
++#define MZ_MALLOC(x) NULL
++#define MZ_FREE(x) (void)x, ((void)0)
++#define MZ_REALLOC(p, x) NULL
++#else
++#define MZ_MALLOC(x) malloc(x)
++#define MZ_FREE(x) free(x)
++#define MZ_REALLOC(p, x) realloc(p, x)
++#endif
++
++#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b))
++#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b))
++#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
++
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
++#define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
++#define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
++#else
++#define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
++#define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
++#endif
++
++#define MZ_READ_LE64(p) (((mz_uint64)MZ_READ_LE32(p)) | (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) << 32U))
++
++#ifdef _MSC_VER
++#define MZ_FORCEINLINE __forceinline
++#elif defined(__GNUC__)
++#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__))
++#else
++#define MZ_FORCEINLINE inline
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++extern MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size);
++extern MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address);
++extern MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size);
++
++#define MZ_UINT16_MAX (0xFFFFU)
++#define MZ_UINT32_MAX (0xFFFFFFFFU)
++
++#ifdef __cplusplus
++}
++#endif
++ 
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++/* ------------------- Low-level Compression API Definitions */
++
++/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly slower, and raw/dynamic blocks will be output more frequently). */
++#define TDEFL_LESS_MEMORY 0
++
++/* tdefl_init() compression flags logically OR'd together (low 12 bits contain the max. number of probes per dictionary search): */
++/* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ (slowest/best compression). */
++enum
++{
++    TDEFL_HUFFMAN_ONLY = 0,
++    TDEFL_DEFAULT_MAX_PROBES = 128,
++    TDEFL_MAX_PROBES_MASK = 0xFFF
++};
++
++/* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before the deflate data, and the Adler-32 of the source data at the end. Otherwise, you'll get raw deflate data. */
++/* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even when not writing zlib headers). */
++/* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more efficient lazy parsing. */
++/* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's initialization time to the minimum, but the output may vary from run to run given the same input (depending on the contents of memory). */
++/* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) */
++/* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */
++/* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */
++/* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */
++/* The low 12 bits are reserved to control the max # of hash probes per dictionary lookup (see TDEFL_MAX_PROBES_MASK). */
++enum
++{
++    TDEFL_WRITE_ZLIB_HEADER = 0x01000,
++    TDEFL_COMPUTE_ADLER32 = 0x02000,
++    TDEFL_GREEDY_PARSING_FLAG = 0x04000,
++    TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000,
++    TDEFL_RLE_MATCHES = 0x10000,
++    TDEFL_FILTER_MATCHES = 0x20000,
++    TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000,
++    TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000
++};
++
++/* High level compression functions: */
++/* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block allocated via malloc(). */
++/* On entry: */
++/*  pSrc_buf, src_buf_len: Pointer and size of source block to compress. */
++/*  flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. */
++/* On return: */
++/*  Function returns a pointer to the compressed data, or NULL on failure. */
++/*  *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. */
++/*  The caller must free() the returned block when it's no longer needed. */
++MINIZ_EXPORT void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
++
++/* tdefl_compress_mem_to_mem() compresses a block in memory to another block in memory. */
++/* Returns 0 on failure. */
++MINIZ_EXPORT size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
++
++/* Compresses an image to a compressed PNG file in memory. */
++/* On entry: */
++/*  pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. */
++/*  The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory. */
++/*  level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */
++/*  If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps). */
++/* On return: */
++/*  Function returns a pointer to the compressed data, or NULL on failure. */
++/*  *pLen_out will be set to the size of the PNG image file. */
++/*  The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed. */
++MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip);
++MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out);
++
++/* Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */
++typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
++
++/* tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally. */
++MINIZ_EXPORT mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
++
++enum
++{
++    TDEFL_MAX_HUFF_TABLES = 3,
++    TDEFL_MAX_HUFF_SYMBOLS_0 = 288,
++    TDEFL_MAX_HUFF_SYMBOLS_1 = 32,
++    TDEFL_MAX_HUFF_SYMBOLS_2 = 19,
++    TDEFL_LZ_DICT_SIZE = 32768,
++    TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1,
++    TDEFL_MIN_MATCH_LEN = 3,
++    TDEFL_MAX_MATCH_LEN = 258
++};
++
++/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed output block (using static/fixed Huffman codes). */
++#if TDEFL_LESS_MEMORY
++enum
++{
++    TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024,
++    TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10,
++    TDEFL_MAX_HUFF_SYMBOLS = 288,
++    TDEFL_LZ_HASH_BITS = 12,
++    TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
++    TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
++    TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
++};
++#else
++enum
++{
++    TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024,
++    TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10,
++    TDEFL_MAX_HUFF_SYMBOLS = 288,
++    TDEFL_LZ_HASH_BITS = 15,
++    TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
++    TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
++    TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
++};
++#endif
++
++/* The low-level tdefl functions below may be used directly if the above helper functions aren't flexible enough. The low-level functions don't make any heap allocations, unlike the above helper functions. */
++typedef enum {
++    TDEFL_STATUS_BAD_PARAM = -2,
++    TDEFL_STATUS_PUT_BUF_FAILED = -1,
++    TDEFL_STATUS_OKAY = 0,
++    TDEFL_STATUS_DONE = 1
++} tdefl_status;
++
++/* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */
++typedef enum {
++    TDEFL_NO_FLUSH = 0,
++    TDEFL_SYNC_FLUSH = 2,
++    TDEFL_FULL_FLUSH = 3,
++    TDEFL_FINISH = 4
++} tdefl_flush;
++
++/* tdefl's compression state structure. */
++typedef struct
++{
++    tdefl_put_buf_func_ptr m_pPut_buf_func;
++    void *m_pPut_buf_user;
++    mz_uint m_flags, m_max_probes[2];
++    int m_greedy_parsing;
++    mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
++    mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
++    mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
++    mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
++    tdefl_status m_prev_return_status;
++    const void *m_pIn_buf;
++    void *m_pOut_buf;
++    size_t *m_pIn_buf_size, *m_pOut_buf_size;
++    tdefl_flush m_flush;
++    const mz_uint8 *m_pSrc;
++    size_t m_src_buf_left, m_out_buf_ofs;
++    mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1];
++    mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
++    mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
++    mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
++    mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE];
++    mz_uint16 m_next[TDEFL_LZ_DICT_SIZE];
++    mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE];
++    mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
++} tdefl_compressor;
++
++/* Initializes the compressor. */
++/* There is no corresponding deinit() function because the tdefl API's do not dynamically allocate memory. */
++/* pBut_buf_func: If NULL, output data will be supplied to the specified callback. In this case, the user should call the tdefl_compress_buffer() API for compression. */
++/* If pBut_buf_func is NULL the user should always call the tdefl_compress() API. */
++/* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.) */
++MINIZ_EXPORT tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
++
++/* Compresses a block of data, consuming as much of the specified input buffer as possible, and writing as much compressed data to the specified output buffer as possible. */
++MINIZ_EXPORT tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush);
++
++/* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a non-NULL tdefl_put_buf_func_ptr. */
++/* tdefl_compress_buffer() always consumes the entire input buffer. */
++MINIZ_EXPORT tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush);
++
++MINIZ_EXPORT tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
++MINIZ_EXPORT mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
++
++/* Create tdefl_compress() flags given zlib-style compression parameters. */
++/* level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files) */
++/* window_bits may be -15 (raw deflate) or 15 (zlib) */
++/* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED */
++MINIZ_EXPORT mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
++
++#ifndef MINIZ_NO_MALLOC
++/* Allocate the tdefl_compressor structure in C so that */
++/* non-C language bindings to tdefl_ API don't need to worry about */
++/* structure size and allocation mechanism. */
++MINIZ_EXPORT tdefl_compressor *tdefl_compressor_alloc(void);
++MINIZ_EXPORT void tdefl_compressor_free(tdefl_compressor *pComp);
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++ 
++
++/* ------------------- Low-level Decompression API Definitions */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++/* Decompression flags used by tinfl_decompress(). */
++/* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream. */
++/* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input. */
++/* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB). */
++/* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the decompressed bytes. */
++enum
++{
++    TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
++    TINFL_FLAG_HAS_MORE_INPUT = 2,
++    TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
++    TINFL_FLAG_COMPUTE_ADLER32 = 8
++};
++
++/* High level decompression functions: */
++/* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc(). */
++/* On entry: */
++/*  pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. */
++/* On return: */
++/*  Function returns a pointer to the decompressed data, or NULL on failure. */
++/*  *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. */
++/*  The caller must call mz_free() on the returned block when it's no longer needed. */
++MINIZ_EXPORT void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
++
++/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory. */
++/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success. */
++#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
++MINIZ_EXPORT size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
++
++/* tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer. */
++/* Returns 1 on success or 0 on failure. */
++typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
++MINIZ_EXPORT int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
++
++struct tinfl_decompressor_tag;
++typedef struct tinfl_decompressor_tag tinfl_decompressor;
++
++#ifndef MINIZ_NO_MALLOC
++/* Allocate the tinfl_decompressor structure in C so that */
++/* non-C language bindings to tinfl_ API don't need to worry about */
++/* structure size and allocation mechanism. */
++MINIZ_EXPORT tinfl_decompressor *tinfl_decompressor_alloc(void);
++MINIZ_EXPORT void tinfl_decompressor_free(tinfl_decompressor *pDecomp);
++#endif
++
++/* Max size of LZ dictionary. */
++#define TINFL_LZ_DICT_SIZE 32768
++
++/* Return status. */
++typedef enum {
++    /* This flags indicates the inflator needs 1 or more input bytes to make forward progress, but the caller is indicating that no more are available. The compressed data */
++    /* is probably corrupted. If you call the inflator again with more bytes it'll try to continue processing the input but this is a BAD sign (either the data is corrupted or you called it incorrectly). */
++    /* If you call it again with no input you'll just get TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */
++    TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4,
++
++    /* This flag indicates that one or more of the input parameters was obviously bogus. (You can try calling it again, but if you get this error the calling code is wrong.) */
++    TINFL_STATUS_BAD_PARAM = -3,
++
++    /* This flags indicate the inflator is finished but the adler32 check of the uncompressed data didn't match. If you call it again it'll return TINFL_STATUS_DONE. */
++    TINFL_STATUS_ADLER32_MISMATCH = -2,
++
++    /* This flags indicate the inflator has somehow failed (bad code, corrupted input, etc.). If you call it again without resetting via tinfl_init() it it'll just keep on returning the same status failure code. */
++    TINFL_STATUS_FAILED = -1,
++
++    /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */
++
++    /* This flag indicates the inflator has returned every byte of uncompressed data that it can, has consumed every byte that it needed, has successfully reached the end of the deflate stream, and */
++    /* if zlib headers and adler32 checking enabled that it has successfully checked the uncompressed data's adler32. If you call it again you'll just get TINFL_STATUS_DONE over and over again. */
++    TINFL_STATUS_DONE = 0,
++
++    /* This flag indicates the inflator MUST have more input data (even 1 byte) before it can make any more forward progress, or you need to clear the TINFL_FLAG_HAS_MORE_INPUT */
++    /* flag on the next call if you don't have any more source data. If the source data was somehow corrupted it's also possible (but unlikely) for the inflator to keep on demanding input to */
++    /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */
++    TINFL_STATUS_NEEDS_MORE_INPUT = 1,
++
++    /* This flag indicates the inflator definitely has 1 or more bytes of uncompressed data available, but it cannot write this data into the output buffer. */
++    /* Note if the source compressed data was corrupted it's possible for the inflator to return a lot of uncompressed data to the caller. I've been assuming you know how much uncompressed data to expect */
++    /* (either exact or worst case) and will stop calling the inflator and fail after receiving too much. In pure streaming scenarios where you have no idea how many bytes to expect this may not be possible */
++    /* so I may need to add some code to address this. */
++    TINFL_STATUS_HAS_MORE_OUTPUT = 2
++} tinfl_status;
++
++/* Initializes the decompressor to its initial state. */
++#define tinfl_init(r)     \
++    do                    \
++    {                     \
++        (r)->m_state = 0; \
++    }                     \
++    MZ_MACRO_END
++#define tinfl_get_adler32(r) (r)->m_check_adler32
++
++/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
++/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
++MINIZ_EXPORT tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
++
++/* Internal/private bits follow. */
++enum
++{
++    TINFL_MAX_HUFF_TABLES = 3,
++    TINFL_MAX_HUFF_SYMBOLS_0 = 288,
++    TINFL_MAX_HUFF_SYMBOLS_1 = 32,
++    TINFL_MAX_HUFF_SYMBOLS_2 = 19,
++    TINFL_FAST_LOOKUP_BITS = 10,
++    TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
++};
++
++typedef struct
++{
++    mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0];
++    mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
++} tinfl_huff_table;
++
++#if MINIZ_HAS_64BIT_REGISTERS
++#define TINFL_USE_64BIT_BITBUF 1
++#else
++#define TINFL_USE_64BIT_BITBUF 0
++#endif
++
++#if TINFL_USE_64BIT_BITBUF
++typedef mz_uint64 tinfl_bit_buf_t;
++#define TINFL_BITBUF_SIZE (64)
++#else
++typedef mz_uint32 tinfl_bit_buf_t;
++#define TINFL_BITBUF_SIZE (32)
++#endif
++
++struct tinfl_decompressor_tag
++{
++    mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
++    tinfl_bit_buf_t m_bit_buf;
++    size_t m_dist_from_out_buf_start;
++    tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES];
++    mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
++};
++
++#ifdef __cplusplus
++}
++#endif
++ 
++
++
++
++/* ------------------- ZIP archive reading/writing */
++
++#ifndef MINIZ_NO_ARCHIVE_APIS
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++enum
++{
++    /* Note: These enums can be reduced as needed to save memory or stack space - they are pretty conservative. */
++    MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024,
++    MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512,
++    MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512
++};
++
++typedef struct
++{
++    /* Central directory file index. */
++    mz_uint32 m_file_index;
++
++    /* Byte offset of this entry in the archive's central directory. Note we currently only support up to UINT_MAX or less bytes in the central dir. */
++    mz_uint64 m_central_dir_ofs;
++
++    /* These fields are copied directly from the zip's central dir. */
++    mz_uint16 m_version_made_by;
++    mz_uint16 m_version_needed;
++    mz_uint16 m_bit_flag;
++    mz_uint16 m_method;
++
++#ifndef MINIZ_NO_TIME
++    MZ_TIME_T m_time;
++#endif
++
++    /* CRC-32 of uncompressed data. */
++    mz_uint32 m_crc32;
++
++    /* File's compressed size. */
++    mz_uint64 m_comp_size;
++
++    /* File's uncompressed size. Note, I've seen some old archives where directory entries had 512 bytes for their uncompressed sizes, but when you try to unpack them you actually get 0 bytes. */
++    mz_uint64 m_uncomp_size;
++
++    /* Zip internal and external file attributes. */
++    mz_uint16 m_internal_attr;
++    mz_uint32 m_external_attr;
++
++    /* Entry's local header file offset in bytes. */
++    mz_uint64 m_local_header_ofs;
++
++    /* Size of comment in bytes. */
++    mz_uint32 m_comment_size;
++
++    /* MZ_TRUE if the entry appears to be a directory. */
++    mz_bool m_is_directory;
++
++    /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip doesn't support) */
++    mz_bool m_is_encrypted;
++
++    /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a compression method we support. */
++    mz_bool m_is_supported;
++
++    /* Filename. If string ends in '/' it's a subdirectory entry. */
++    /* Guaranteed to be zero terminated, may be truncated to fit. */
++    char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
++
++    /* Comment field. */
++    /* Guaranteed to be zero terminated, may be truncated to fit. */
++    char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
++
++} mz_zip_archive_file_stat;
++
++typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n);
++typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n);
++typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque);
++
++struct mz_zip_internal_state_tag;
++typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
++
++typedef enum {
++    MZ_ZIP_MODE_INVALID = 0,
++    MZ_ZIP_MODE_READING = 1,
++    MZ_ZIP_MODE_WRITING = 2,
++    MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
++} mz_zip_mode;
++
++typedef enum {
++    MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100,
++    MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
++    MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
++    MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800,
++    MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each file as its validated to ensure the func finds the file in the central dir (intended for testing) */
++    MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = 0x2000,     /* validate the local headers, but don't decompress the entire file and check the crc32 */
++    MZ_ZIP_FLAG_WRITE_ZIP64 = 0x4000,               /* always use the zip64 file format, instead of the original zip file format with automatic switch to zip64. Use as flags parameter with mz_zip_writer_init*_v2 */
++    MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000,
++    MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000,
++    /*After adding a compressed file, seek back
++    to local file header and set the correct sizes*/
++    MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE = 0x20000
++} mz_zip_flags;
++
++typedef enum {
++    MZ_ZIP_TYPE_INVALID = 0,
++    MZ_ZIP_TYPE_USER,
++    MZ_ZIP_TYPE_MEMORY,
++    MZ_ZIP_TYPE_HEAP,
++    MZ_ZIP_TYPE_FILE,
++    MZ_ZIP_TYPE_CFILE,
++    MZ_ZIP_TOTAL_TYPES
++} mz_zip_type;
++
++/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or modify this enum. */
++typedef enum {
++    MZ_ZIP_NO_ERROR = 0,
++    MZ_ZIP_UNDEFINED_ERROR,
++    MZ_ZIP_TOO_MANY_FILES,
++    MZ_ZIP_FILE_TOO_LARGE,
++    MZ_ZIP_UNSUPPORTED_METHOD,
++    MZ_ZIP_UNSUPPORTED_ENCRYPTION,
++    MZ_ZIP_UNSUPPORTED_FEATURE,
++    MZ_ZIP_FAILED_FINDING_CENTRAL_DIR,
++    MZ_ZIP_NOT_AN_ARCHIVE,
++    MZ_ZIP_INVALID_HEADER_OR_CORRUPTED,
++    MZ_ZIP_UNSUPPORTED_MULTIDISK,
++    MZ_ZIP_DECOMPRESSION_FAILED,
++    MZ_ZIP_COMPRESSION_FAILED,
++    MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE,
++    MZ_ZIP_CRC_CHECK_FAILED,
++    MZ_ZIP_UNSUPPORTED_CDIR_SIZE,
++    MZ_ZIP_ALLOC_FAILED,
++    MZ_ZIP_FILE_OPEN_FAILED,
++    MZ_ZIP_FILE_CREATE_FAILED,
++    MZ_ZIP_FILE_WRITE_FAILED,
++    MZ_ZIP_FILE_READ_FAILED,
++    MZ_ZIP_FILE_CLOSE_FAILED,
++    MZ_ZIP_FILE_SEEK_FAILED,
++    MZ_ZIP_FILE_STAT_FAILED,
++    MZ_ZIP_INVALID_PARAMETER,
++    MZ_ZIP_INVALID_FILENAME,
++    MZ_ZIP_BUF_TOO_SMALL,
++    MZ_ZIP_INTERNAL_ERROR,
++    MZ_ZIP_FILE_NOT_FOUND,
++    MZ_ZIP_ARCHIVE_TOO_LARGE,
++    MZ_ZIP_VALIDATION_FAILED,
++    MZ_ZIP_WRITE_CALLBACK_FAILED,
++    MZ_ZIP_TOTAL_ERRORS
++} mz_zip_error;
++
++typedef struct
++{
++    mz_uint64 m_archive_size;
++    mz_uint64 m_central_directory_file_ofs;
++
++    /* We only support up to UINT32_MAX files in zip64 mode. */
++    mz_uint32 m_total_files;
++    mz_zip_mode m_zip_mode;
++    mz_zip_type m_zip_type;
++    mz_zip_error m_last_error;
++
++    mz_uint64 m_file_offset_alignment;
++
++    mz_alloc_func m_pAlloc;
++    mz_free_func m_pFree;
++    mz_realloc_func m_pRealloc;
++    void *m_pAlloc_opaque;
++
++    mz_file_read_func m_pRead;
++    mz_file_write_func m_pWrite;
++    mz_file_needs_keepalive m_pNeeds_keepalive;
++    void *m_pIO_opaque;
++
++    mz_zip_internal_state *m_pState;
++
++} mz_zip_archive;
++
++typedef struct
++{
++    mz_zip_archive *pZip;
++    mz_uint flags;
++
++    int status;
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++    mz_uint file_crc32;
++#endif
++    mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining, out_buf_ofs, cur_file_ofs;
++    mz_zip_archive_file_stat file_stat;
++    void *pRead_buf;
++    void *pWrite_buf;
++
++    size_t out_blk_remain;
++
++    tinfl_decompressor inflator;
++
++} mz_zip_reader_extract_iter_state;
++
++/* -------- ZIP reading */
++
++/* Inits a ZIP archive reader. */
++/* These functions read and validate the archive's central directory. */
++MINIZ_EXPORT mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags);
++
++MINIZ_EXPORT mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags);
++
++#ifndef MINIZ_NO_STDIO
++/* Read a archive from a disk file. */
++/* file_start_ofs is the file offset where the archive actually begins, or 0. */
++/* actual_archive_size is the true total size of the archive, which may be smaller than the file's actual size on disk. If zero the entire file is treated as the archive. */
++MINIZ_EXPORT mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size);
++
++/* Read an archive from an already opened FILE, beginning at the current file position. */
++/* The archive is assumed to be archive_size bytes long. If archive_size is 0, then the entire rest of the file is assumed to contain the archive. */
++/* The FILE will NOT be closed when mz_zip_reader_end() is called. */
++MINIZ_EXPORT mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags);
++#endif
++
++/* Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used. */
++MINIZ_EXPORT mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
++
++/* -------- ZIP reading or writing */
++
++/* Clears a mz_zip_archive struct to all zeros. */
++/* Important: This must be done before passing the struct to any mz_zip functions. */
++MINIZ_EXPORT void mz_zip_zero_struct(mz_zip_archive *pZip);
++
++MINIZ_EXPORT mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip);
++MINIZ_EXPORT mz_zip_type mz_zip_get_type(mz_zip_archive *pZip);
++
++/* Returns the total number of files in the archive. */
++MINIZ_EXPORT mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
++
++MINIZ_EXPORT mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip);
++MINIZ_EXPORT mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip);
++MINIZ_EXPORT MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip);
++
++/* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf. */
++MINIZ_EXPORT size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n);
++
++/* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct. These functions retrieve/manipulate this field. */
++/* Note that the m_last_error functionality is not thread safe. */
++MINIZ_EXPORT mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num);
++MINIZ_EXPORT mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip);
++MINIZ_EXPORT mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip);
++MINIZ_EXPORT mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip);
++MINIZ_EXPORT const char *mz_zip_get_error_string(mz_zip_error mz_err);
++
++/* MZ_TRUE if the archive file entry is a directory entry. */
++MINIZ_EXPORT mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index);
++
++/* MZ_TRUE if the file is encrypted/strong encrypted. */
++MINIZ_EXPORT mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index);
++
++/* MZ_TRUE if the compression method is supported, and the file is not encrypted, and the file is not a compressed patch file. */
++MINIZ_EXPORT mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index);
++
++/* Retrieves the filename of an archive file entry. */
++/* Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. */
++MINIZ_EXPORT mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size);
++
++/* Attempts to locates a file in the archive's central directory. */
++/* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */
++/* Returns -1 if the file cannot be found. */
++MINIZ_EXPORT int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *file_index);
++
++/* Returns detailed information about an archive file entry. */
++MINIZ_EXPORT mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat);
++
++/* MZ_TRUE if the file is in zip64 format. */
++/* A file is considered zip64 if it contained a zip64 end of central directory marker, or if it contained any zip64 extended file information fields in the central directory. */
++MINIZ_EXPORT mz_bool mz_zip_is_zip64(mz_zip_archive *pZip);
++
++/* Returns the total central directory size in bytes. */
++/* The current max supported size is <= MZ_UINT32_MAX. */
++MINIZ_EXPORT size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip);
++
++/* Extracts a archive file to a memory buffer using no memory allocation. */
++/* There must be at least enough room on the stack to store the inflator's state (~34KB or so). */
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
++
++/* Extracts a archive file to a memory buffer. */
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags);
++
++/* Extracts a archive file to a dynamically allocated heap buffer. */
++/* The memory will be allocated via the mz_zip_archive's alloc/realloc functions. */
++/* Returns NULL and sets the last error on failure. */
++MINIZ_EXPORT void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags);
++MINIZ_EXPORT void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags);
++
++/* Extracts a archive file using a callback function to output the file's data. */
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
++
++/* Extract a file iteratively */
++MINIZ_EXPORT mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
++MINIZ_EXPORT mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
++MINIZ_EXPORT size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState);
++
++#ifndef MINIZ_NO_STDIO
++/* Extracts a archive file to a disk file and sets its last accessed and modified times. */
++/* This function only extracts files, not archive directory records. */
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags);
++
++/* Extracts a archive file starting at the current position in the destination FILE stream. */
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *File, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags);
++#endif
++
++#if 0
++/* TODO */
++	typedef void *mz_zip_streaming_extract_state_ptr;
++	mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
++	uint64_t mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
++	uint64_t mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
++	mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, uint64_t new_ofs);
++	size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size);
++	mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
++#endif
++
++/* This function compares the archive's local headers, the optional local zip64 extended information block, and the optional descriptor following the compressed data vs. the data in the central directory. */
++/* It also validates that each file can be successfully uncompressed unless the MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */
++MINIZ_EXPORT mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
++
++/* Validates an entire archive by calling mz_zip_validate_file() on each file. */
++MINIZ_EXPORT mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags);
++
++/* Misc utils/helpers, valid for ZIP reading or writing */
++MINIZ_EXPORT mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr);
++MINIZ_EXPORT mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr);
++
++/* Universal end function - calls either mz_zip_reader_end() or mz_zip_writer_end(). */
++MINIZ_EXPORT mz_bool mz_zip_end(mz_zip_archive *pZip);
++
++/* -------- ZIP writing */
++
++#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
++
++/* Inits a ZIP archive writer. */
++/*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init or mz_zip_writer_init_v2*/
++/*The output is streamable, i.e. file_ofs in mz_file_write_func always increases only by n*/
++MINIZ_EXPORT mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size);
++MINIZ_EXPORT mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags);
++
++MINIZ_EXPORT mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size);
++MINIZ_EXPORT mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags);
++
++#ifndef MINIZ_NO_STDIO
++MINIZ_EXPORT mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning);
++MINIZ_EXPORT mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags);
++MINIZ_EXPORT mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags);
++#endif
++
++/* Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive. */
++/* For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called. */
++/* For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it). */
++/* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL. */
++/* Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before */
++/* the archive is finalized the file's central directory will be hosed. */
++MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename);
++MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
++
++/* Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive. */
++/* To add a directory entry, call this method with an archive name ending in a forwardslash with an empty buffer. */
++/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
++MINIZ_EXPORT mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags);
++
++/* Like mz_zip_writer_add_mem(), except you can specify a file comment field, and optionally supply the function with already compressed data. */
++/* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA flag is specified. */
++MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
++                                              mz_uint64 uncomp_size, mz_uint32 uncomp_crc32);
++
++MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
++                                                 mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
++                                                 const char *user_extra_data_central, mz_uint user_extra_data_central_len);
++
++/* Adds the contents of a file to an archive. This function also records the disk file's modified time into the archive. */
++/* File data is supplied via a read callback function. User mz_zip_writer_add_(c)file to add a file directly.*/
++MINIZ_EXPORT mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 max_size,
++	const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
++	const char *user_extra_data_central, mz_uint user_extra_data_central_len);
++
++
++#ifndef MINIZ_NO_STDIO
++/* Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. */
++/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
++MINIZ_EXPORT mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
++
++/* Like mz_zip_writer_add_file(), except the file data is read from the specified FILE stream. */
++MINIZ_EXPORT mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size,
++                                const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
++                                const char *user_extra_data_central, mz_uint user_extra_data_central_len);
++#endif
++
++/* Adds a file to an archive by fully cloning the data from another archive. */
++/* This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data (it may add or modify the zip64 local header extra data field), and the optional descriptor following the compressed data. */
++MINIZ_EXPORT mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index);
++
++/* Finalizes the archive by writing the central directory records followed by the end of central directory record. */
++/* After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end(). */
++/* An archive must be manually finalized by calling this function for it to be valid. */
++MINIZ_EXPORT mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
++
++/* Finalizes a heap archive, returning a poiner to the heap block and its size. */
++/* The heap block will be allocated using the mz_zip_archive's alloc/realloc callbacks. */
++MINIZ_EXPORT mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize);
++
++/* Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used. */
++/* Note for the archive to be valid, it *must* have been finalized before ending (this function will not do it for you). */
++MINIZ_EXPORT mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
++
++/* -------- Misc. high-level helper functions: */
++
++/* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive. */
++/* Note this is NOT a fully safe operation. If it crashes or dies in some way your archive can be left in a screwed up state (without a central directory). */
++/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
++/* TODO: Perhaps add an option to leave the existing central dir in place in case the add dies? We could then truncate the file (so the old central dir would be at the end) if something goes wrong. */
++MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
++MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr);
++
++/* Reads a single file from an archive into a heap block. */
++/* If pComment is not NULL, only the file with the specified comment will be extracted. */
++/* Returns NULL on failure. */
++MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags);
++MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr);
++
++#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* MINIZ_NO_ARCHIVE_APIS */
++/*** End of #include "miniz.h" ***/
++
++/**************************************************************************
++ *
++ * Copyright 2013-2014 RAD Game Tools and Valve Software
++ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ *
++ **************************************************************************/
++
++
++
++typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
++typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
++typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1];
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* ------------------- zlib-style API's */
++
++mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
++{
++    mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16);
++    size_t block_len = buf_len % 5552;
++    if (!ptr)
++        return MZ_ADLER32_INIT;
++    while (buf_len)
++    {
++        for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
++        {
++            s1 += ptr[0], s2 += s1;
++            s1 += ptr[1], s2 += s1;
++            s1 += ptr[2], s2 += s1;
++            s1 += ptr[3], s2 += s1;
++            s1 += ptr[4], s2 += s1;
++            s1 += ptr[5], s2 += s1;
++            s1 += ptr[6], s2 += s1;
++            s1 += ptr[7], s2 += s1;
++        }
++        for (; i < block_len; ++i)
++            s1 += *ptr++, s2 += s1;
++        s1 %= 65521U, s2 %= 65521U;
++        buf_len -= block_len;
++        block_len = 5552;
++    }
++    return (s2 << 16) + s1;
++}
++
++/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/ */
++#if 0
++    mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
++    {
++        static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
++                                               0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c };
++        mz_uint32 crcu32 = (mz_uint32)crc;
++        if (!ptr)
++            return MZ_CRC32_INIT;
++        crcu32 = ~crcu32;
++        while (buf_len--)
++        {
++            mz_uint8 b = *ptr++;
++            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)];
++            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)];
++        }
++        return ~crcu32;
++    }
++#elif defined(USE_EXTERNAL_MZCRC)
++/* If USE_EXTERNAL_CRC is defined, an external module will export the
++ * mz_crc32() symbol for us to use, e.g. an SSE-accelerated version.
++ * Depending on the impl, it may be necessary to ~ the input/output crc values.
++ */
++mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len);
++#else
++/* Faster, but larger CPU cache footprint.
++ */
++mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
++{
++    static const mz_uint32 s_crc_table[256] =
++        {
++          0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535,
++          0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
++          0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D,
++          0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
++          0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
++          0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
++          0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC,
++          0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
++          0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
++          0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
++          0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB,
++          0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
++          0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA,
++          0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE,
++          0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,
++          0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
++          0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409,
++          0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
++          0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739,
++          0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
++          0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268,
++          0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0,
++          0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8,
++          0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
++          0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,
++          0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703,
++          0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
++          0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
++          0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE,
++          0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
++          0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6,
++          0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
++          0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D,
++          0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5,
++          0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,
++          0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
++          0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
++        };
++
++    mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF;
++    const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr;
++
++    while (buf_len >= 4)
++    {
++        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
++        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF];
++        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF];
++        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF];
++        pByte_buf += 4;
++        buf_len -= 4;
++    }
++
++    while (buf_len)
++    {
++        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
++        ++pByte_buf;
++        --buf_len;
++    }
++
++    return ~crc32;
++}
++#endif
++
++void mz_free(void *p)
++{
++    MZ_FREE(p);
++}
++
++MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size)
++{
++    (void)opaque, (void)items, (void)size;
++    return MZ_MALLOC(items * size);
++}
++MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address)
++{
++    (void)opaque, (void)address;
++    MZ_FREE(address);
++}
++MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size)
++{
++    (void)opaque, (void)address, (void)items, (void)size;
++    return MZ_REALLOC(address, items * size);
++}
++
++const char *mz_version(void)
++{
++    return MZ_VERSION;
++}
++
++#ifndef MINIZ_NO_ZLIB_APIS
++
++int mz_deflateInit(mz_streamp pStream, int level)
++{
++    return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY);
++}
++
++int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
++{
++    tdefl_compressor *pComp;
++    mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy);
++
++    if (!pStream)
++        return MZ_STREAM_ERROR;
++    if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)))
++        return MZ_PARAM_ERROR;
++
++    pStream->data_type = 0;
++    pStream->adler = MZ_ADLER32_INIT;
++    pStream->msg = NULL;
++    pStream->reserved = 0;
++    pStream->total_in = 0;
++    pStream->total_out = 0;
++    if (!pStream->zalloc)
++        pStream->zalloc = miniz_def_alloc_func;
++    if (!pStream->zfree)
++        pStream->zfree = miniz_def_free_func;
++
++    pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, sizeof(tdefl_compressor));
++    if (!pComp)
++        return MZ_MEM_ERROR;
++
++    pStream->state = (struct mz_internal_state *)pComp;
++
++    if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY)
++    {
++        mz_deflateEnd(pStream);
++        return MZ_PARAM_ERROR;
++    }
++
++    return MZ_OK;
++}
++
++int mz_deflateReset(mz_streamp pStream)
++{
++    if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || (!pStream->zfree))
++        return MZ_STREAM_ERROR;
++    pStream->total_in = pStream->total_out = 0;
++    tdefl_init((tdefl_compressor *)pStream->state, NULL, NULL, ((tdefl_compressor *)pStream->state)->m_flags);
++    return MZ_OK;
++}
++
++int mz_deflate(mz_streamp pStream, int flush)
++{
++    size_t in_bytes, out_bytes;
++    mz_ulong orig_total_in, orig_total_out;
++    int mz_status = MZ_OK;
++
++    if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || (!pStream->next_out))
++        return MZ_STREAM_ERROR;
++    if (!pStream->avail_out)
++        return MZ_BUF_ERROR;
++
++    if (flush == MZ_PARTIAL_FLUSH)
++        flush = MZ_SYNC_FLUSH;
++
++    if (((tdefl_compressor *)pStream->state)->m_prev_return_status == TDEFL_STATUS_DONE)
++        return (flush == MZ_FINISH) ? MZ_STREAM_END : MZ_BUF_ERROR;
++
++    orig_total_in = pStream->total_in;
++    orig_total_out = pStream->total_out;
++    for (;;)
++    {
++        tdefl_status defl_status;
++        in_bytes = pStream->avail_in;
++        out_bytes = pStream->avail_out;
++
++        defl_status = tdefl_compress((tdefl_compressor *)pStream->state, pStream->next_in, &in_bytes, pStream->next_out, &out_bytes, (tdefl_flush)flush);
++        pStream->next_in += (mz_uint)in_bytes;
++        pStream->avail_in -= (mz_uint)in_bytes;
++        pStream->total_in += (mz_uint)in_bytes;
++        pStream->adler = tdefl_get_adler32((tdefl_compressor *)pStream->state);
++
++        pStream->next_out += (mz_uint)out_bytes;
++        pStream->avail_out -= (mz_uint)out_bytes;
++        pStream->total_out += (mz_uint)out_bytes;
++
++        if (defl_status < 0)
++        {
++            mz_status = MZ_STREAM_ERROR;
++            break;
++        }
++        else if (defl_status == TDEFL_STATUS_DONE)
++        {
++            mz_status = MZ_STREAM_END;
++            break;
++        }
++        else if (!pStream->avail_out)
++            break;
++        else if ((!pStream->avail_in) && (flush != MZ_FINISH))
++        {
++            if ((flush) || (pStream->total_in != orig_total_in) || (pStream->total_out != orig_total_out))
++                break;
++            return MZ_BUF_ERROR; /* Can't make forward progress without some input.
++ */
++        }
++    }
++    return mz_status;
++}
++
++int mz_deflateEnd(mz_streamp pStream)
++{
++    if (!pStream)
++        return MZ_STREAM_ERROR;
++    if (pStream->state)
++    {
++        pStream->zfree(pStream->opaque, pStream->state);
++        pStream->state = NULL;
++    }
++    return MZ_OK;
++}
++
++mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len)
++{
++    (void)pStream;
++    /* This is really over conservative. (And lame, but it's actually pretty tricky to compute a true upper bound given the way tdefl's blocking works.) */
++    return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
++}
++
++int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level)
++{
++    int status;
++    mz_stream stream;
++    memset(&stream, 0, sizeof(stream));
++
++    /* In case mz_ulong is 64-bits (argh I hate longs). */
++    if ((source_len | *pDest_len) > 0xFFFFFFFFU)
++        return MZ_PARAM_ERROR;
++
++    stream.next_in = pSource;
++    stream.avail_in = (mz_uint32)source_len;
++    stream.next_out = pDest;
++    stream.avail_out = (mz_uint32)*pDest_len;
++
++    status = mz_deflateInit(&stream, level);
++    if (status != MZ_OK)
++        return status;
++
++    status = mz_deflate(&stream, MZ_FINISH);
++    if (status != MZ_STREAM_END)
++    {
++        mz_deflateEnd(&stream);
++        return (status == MZ_OK) ? MZ_BUF_ERROR : status;
++    }
++
++    *pDest_len = stream.total_out;
++    return mz_deflateEnd(&stream);
++}
++
++int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
++{
++    return mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION);
++}
++
++mz_ulong mz_compressBound(mz_ulong source_len)
++{
++    return mz_deflateBound(NULL, source_len);
++}
++
++typedef struct
++{
++    tinfl_decompressor m_decomp;
++    mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed;
++    int m_window_bits;
++    mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
++    tinfl_status m_last_status;
++} inflate_state;
++
++int mz_inflateInit2(mz_streamp pStream, int window_bits)
++{
++    inflate_state *pDecomp;
++    if (!pStream)
++        return MZ_STREAM_ERROR;
++    if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))
++        return MZ_PARAM_ERROR;
++
++    pStream->data_type = 0;
++    pStream->adler = 0;
++    pStream->msg = NULL;
++    pStream->total_in = 0;
++    pStream->total_out = 0;
++    pStream->reserved = 0;
++    if (!pStream->zalloc)
++        pStream->zalloc = miniz_def_alloc_func;
++    if (!pStream->zfree)
++        pStream->zfree = miniz_def_free_func;
++
++    pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state));
++    if (!pDecomp)
++        return MZ_MEM_ERROR;
++
++    pStream->state = (struct mz_internal_state *)pDecomp;
++
++    tinfl_init(&pDecomp->m_decomp);
++    pDecomp->m_dict_ofs = 0;
++    pDecomp->m_dict_avail = 0;
++    pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
++    pDecomp->m_first_call = 1;
++    pDecomp->m_has_flushed = 0;
++    pDecomp->m_window_bits = window_bits;
++
++    return MZ_OK;
++}
++
++int mz_inflateInit(mz_streamp pStream)
++{
++    return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
++}
++
++int mz_inflateReset(mz_streamp pStream)
++{
++    inflate_state *pDecomp;
++    if (!pStream)
++        return MZ_STREAM_ERROR;
++
++    pStream->data_type = 0;
++    pStream->adler = 0;
++    pStream->msg = NULL;
++    pStream->total_in = 0;
++    pStream->total_out = 0;
++    pStream->reserved = 0;
++
++    pDecomp = (inflate_state *)pStream->state;
++
++    tinfl_init(&pDecomp->m_decomp);
++    pDecomp->m_dict_ofs = 0;
++    pDecomp->m_dict_avail = 0;
++    pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
++    pDecomp->m_first_call = 1;
++    pDecomp->m_has_flushed = 0;
++    /* pDecomp->m_window_bits = window_bits */;
++
++    return MZ_OK;
++}
++
++int mz_inflate(mz_streamp pStream, int flush)
++{
++    inflate_state *pState;
++    mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
++    size_t in_bytes, out_bytes, orig_avail_in;
++    tinfl_status status;
++
++    if ((!pStream) || (!pStream->state))
++        return MZ_STREAM_ERROR;
++    if (flush == MZ_PARTIAL_FLUSH)
++        flush = MZ_SYNC_FLUSH;
++    if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH))
++        return MZ_STREAM_ERROR;
++
++    pState = (inflate_state *)pStream->state;
++    if (pState->m_window_bits > 0)
++        decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER;
++    orig_avail_in = pStream->avail_in;
++
++    first_call = pState->m_first_call;
++    pState->m_first_call = 0;
++    if (pState->m_last_status < 0)
++        return MZ_DATA_ERROR;
++
++    if (pState->m_has_flushed && (flush != MZ_FINISH))
++        return MZ_STREAM_ERROR;
++    pState->m_has_flushed |= (flush == MZ_FINISH);
++
++    if ((flush == MZ_FINISH) && (first_call))
++    {
++        /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */
++        decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
++        in_bytes = pStream->avail_in;
++        out_bytes = pStream->avail_out;
++        status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
++        pState->m_last_status = status;
++        pStream->next_in += (mz_uint)in_bytes;
++        pStream->avail_in -= (mz_uint)in_bytes;
++        pStream->total_in += (mz_uint)in_bytes;
++        pStream->adler = tinfl_get_adler32(&pState->m_decomp);
++        pStream->next_out += (mz_uint)out_bytes;
++        pStream->avail_out -= (mz_uint)out_bytes;
++        pStream->total_out += (mz_uint)out_bytes;
++
++        if (status < 0)
++            return MZ_DATA_ERROR;
++        else if (status != TINFL_STATUS_DONE)
++        {
++            pState->m_last_status = TINFL_STATUS_FAILED;
++            return MZ_BUF_ERROR;
++        }
++        return MZ_STREAM_END;
++    }
++    /* flush != MZ_FINISH then we must assume there's more input. */
++    if (flush != MZ_FINISH)
++        decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT;
++
++    if (pState->m_dict_avail)
++    {
++        n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
++        memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
++        pStream->next_out += n;
++        pStream->avail_out -= n;
++        pStream->total_out += n;
++        pState->m_dict_avail -= n;
++        pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
++        return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
++    }
++
++    for (;;)
++    {
++        in_bytes = pStream->avail_in;
++        out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs;
++
++        status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
++        pState->m_last_status = status;
++
++        pStream->next_in += (mz_uint)in_bytes;
++        pStream->avail_in -= (mz_uint)in_bytes;
++        pStream->total_in += (mz_uint)in_bytes;
++        pStream->adler = tinfl_get_adler32(&pState->m_decomp);
++
++        pState->m_dict_avail = (mz_uint)out_bytes;
++
++        n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
++        memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
++        pStream->next_out += n;
++        pStream->avail_out -= n;
++        pStream->total_out += n;
++        pState->m_dict_avail -= n;
++        pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
++
++        if (status < 0)
++            return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */
++        else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in))
++            return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */
++        else if (flush == MZ_FINISH)
++        {
++            /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */
++            if (status == TINFL_STATUS_DONE)
++                return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END;
++            /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */
++            else if (!pStream->avail_out)
++                return MZ_BUF_ERROR;
++        }
++        else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail))
++            break;
++    }
++
++    return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
++}
++
++int mz_inflateEnd(mz_streamp pStream)
++{
++    if (!pStream)
++        return MZ_STREAM_ERROR;
++    if (pStream->state)
++    {
++        pStream->zfree(pStream->opaque, pStream->state);
++        pStream->state = NULL;
++    }
++    return MZ_OK;
++}
++int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len)
++{
++    mz_stream stream;
++    int status;
++    memset(&stream, 0, sizeof(stream));
++
++    /* In case mz_ulong is 64-bits (argh I hate longs). */
++    if ((*pSource_len | *pDest_len) > 0xFFFFFFFFU)
++        return MZ_PARAM_ERROR;
++
++    stream.next_in = pSource;
++    stream.avail_in = (mz_uint32)*pSource_len;
++    stream.next_out = pDest;
++    stream.avail_out = (mz_uint32)*pDest_len;
++
++    status = mz_inflateInit(&stream);
++    if (status != MZ_OK)
++        return status;
++
++    status = mz_inflate(&stream, MZ_FINISH);
++    *pSource_len = *pSource_len - stream.avail_in;
++    if (status != MZ_STREAM_END)
++    {
++        mz_inflateEnd(&stream);
++        return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status;
++    }
++    *pDest_len = stream.total_out;
++
++    return mz_inflateEnd(&stream);
++}
++
++int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
++{
++    return mz_uncompress2(pDest, pDest_len, pSource, &source_len);
++}
++
++const char *mz_error(int err)
++{
++    static struct
++    {
++        int m_err;
++        const char *m_pDesc;
++    } s_error_descs[] =
++        {
++          { MZ_OK, "" }, { MZ_STREAM_END, "stream end" }, { MZ_NEED_DICT, "need dictionary" }, { MZ_ERRNO, "file error" }, { MZ_STREAM_ERROR, "stream error" }, { MZ_DATA_ERROR, "data error" }, { MZ_MEM_ERROR, "out of memory" }, { MZ_BUF_ERROR, "buf error" }, { MZ_VERSION_ERROR, "version error" }, { MZ_PARAM_ERROR, "parameter error" }
++        };
++    mz_uint i;
++    for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i)
++        if (s_error_descs[i].m_err == err)
++            return s_error_descs[i].m_pDesc;
++    return NULL;
++}
++
++#endif /*MINIZ_NO_ZLIB_APIS */
++
++#ifdef __cplusplus
++}
++#endif
++
++/*
++  This is free and unencumbered software released into the public domain.
++
++  Anyone is free to copy, modify, publish, use, compile, sell, or
++  distribute this software, either in source code form or as a compiled
++  binary, for any purpose, commercial or non-commercial, and by any
++  means.
++
++  In jurisdictions that recognize copyright laws, the author or authors
++  of this software dedicate any and all copyright interest in the
++  software to the public domain. We make this dedication for the benefit
++  of the public at large and to the detriment of our heirs and
++  successors. We intend this dedication to be an overt act of
++  relinquishment in perpetuity of all present and future rights to this
++  software under copyright law.
++
++  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++  OTHER DEALINGS IN THE SOFTWARE.
++
++  For more information, please refer to 
++*/
++/**************************************************************************
++ *
++ * Copyright 2013-2014 RAD Game Tools and Valve Software
++ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ *
++ **************************************************************************/
++
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* ------------------- Low-level Compression (independent from all decompression API's) */
++
++/* Purposely making these tables static for faster init and thread safety. */
++static const mz_uint16 s_tdefl_len_sym[256] =
++    {
++      257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, 268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, 272, 272,
++      273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, 276, 276, 276, 276,
++      277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
++      279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
++      281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281,
++      282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282,
++      283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283,
++      284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 285
++    };
++
++static const mz_uint8 s_tdefl_len_extra[256] =
++    {
++      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
++      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0
++    };
++
++static const mz_uint8 s_tdefl_small_dist_sym[512] =
++    {
++      0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11,
++      11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13,
++      13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
++      14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
++      14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
++      15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
++      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
++      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
++      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
++      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
++      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
++      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17
++    };
++
++static const mz_uint8 s_tdefl_small_dist_extra[512] =
++    {
++      0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
++      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++      6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++      6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++      7, 7, 7, 7, 7, 7, 7, 7
++    };
++
++static const mz_uint8 s_tdefl_large_dist_sym[128] =
++    {
++      0, 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
++      26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
++      28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
++    };
++
++static const mz_uint8 s_tdefl_large_dist_extra[128] =
++    {
++      0, 0, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
++      12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
++      13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13
++    };
++
++/* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted values. */
++typedef struct
++{
++    mz_uint16 m_key, m_sym_index;
++} tdefl_sym_freq;
++static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq *pSyms0, tdefl_sym_freq *pSyms1)
++{
++    mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2];
++    tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1;
++    MZ_CLEAR_OBJ(hist);
++    for (i = 0; i < num_syms; i++)
++    {
++        mz_uint freq = pSyms0[i].m_key;
++        hist[freq & 0xFF]++;
++        hist[256 + ((freq >> 8) & 0xFF)]++;
++    }
++    while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256]))
++        total_passes--;
++    for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8)
++    {
++        const mz_uint32 *pHist = &hist[pass << 8];
++        mz_uint offsets[256], cur_ofs = 0;
++        for (i = 0; i < 256; i++)
++        {
++            offsets[i] = cur_ofs;
++            cur_ofs += pHist[i];
++        }
++        for (i = 0; i < num_syms; i++)
++            pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = pCur_syms[i];
++        {
++            tdefl_sym_freq *t = pCur_syms;
++            pCur_syms = pNew_syms;
++            pNew_syms = t;
++        }
++    }
++    return pCur_syms;
++}
++
++/* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat, alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */
++static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n)
++{
++    int root, leaf, next, avbl, used, dpth;
++    if (n == 0)
++        return;
++    else if (n == 1)
++    {
++        A[0].m_key = 1;
++        return;
++    }
++    A[0].m_key += A[1].m_key;
++    root = 0;
++    leaf = 2;
++    for (next = 1; next < n - 1; next++)
++    {
++        if (leaf >= n || A[root].m_key < A[leaf].m_key)
++        {
++            A[next].m_key = A[root].m_key;
++            A[root++].m_key = (mz_uint16)next;
++        }
++        else
++            A[next].m_key = A[leaf++].m_key;
++        if (leaf >= n || (root < next && A[root].m_key < A[leaf].m_key))
++        {
++            A[next].m_key = (mz_uint16)(A[next].m_key + A[root].m_key);
++            A[root++].m_key = (mz_uint16)next;
++        }
++        else
++            A[next].m_key = (mz_uint16)(A[next].m_key + A[leaf++].m_key);
++    }
++    A[n - 2].m_key = 0;
++    for (next = n - 3; next >= 0; next--)
++        A[next].m_key = A[A[next].m_key].m_key + 1;
++    avbl = 1;
++    used = dpth = 0;
++    root = n - 2;
++    next = n - 1;
++    while (avbl > 0)
++    {
++        while (root >= 0 && (int)A[root].m_key == dpth)
++        {
++            used++;
++            root--;
++        }
++        while (avbl > used)
++        {
++            A[next--].m_key = (mz_uint16)(dpth);
++            avbl--;
++        }
++        avbl = 2 * used;
++        dpth++;
++        used = 0;
++    }
++}
++
++/* Limits canonical Huffman code table's max code size. */
++enum
++{
++    TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32
++};
++static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_len, int max_code_size)
++{
++    int i;
++    mz_uint32 total = 0;
++    if (code_list_len <= 1)
++        return;
++    for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++)
++        pNum_codes[max_code_size] += pNum_codes[i];
++    for (i = max_code_size; i > 0; i--)
++        total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i));
++    while (total != (1UL << max_code_size))
++    {
++        pNum_codes[max_code_size]--;
++        for (i = max_code_size - 1; i > 0; i--)
++            if (pNum_codes[i])
++            {
++                pNum_codes[i]--;
++                pNum_codes[i + 1] += 2;
++                break;
++            }
++        total--;
++    }
++}
++
++static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int table_len, int code_size_limit, int static_table)
++{
++    int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE];
++    mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1];
++    MZ_CLEAR_OBJ(num_codes);
++    if (static_table)
++    {
++        for (i = 0; i < table_len; i++)
++            num_codes[d->m_huff_code_sizes[table_num][i]]++;
++    }
++    else
++    {
++        tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms;
++        int num_used_syms = 0;
++        const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0];
++        for (i = 0; i < table_len; i++)
++            if (pSym_count[i])
++            {
++                syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i];
++                syms0[num_used_syms++].m_sym_index = (mz_uint16)i;
++            }
++
++        pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1);
++        tdefl_calculate_minimum_redundancy(pSyms, num_used_syms);
++
++        for (i = 0; i < num_used_syms; i++)
++            num_codes[pSyms[i].m_key]++;
++
++        tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms, code_size_limit);
++
++        MZ_CLEAR_OBJ(d->m_huff_code_sizes[table_num]);
++        MZ_CLEAR_OBJ(d->m_huff_codes[table_num]);
++        for (i = 1, j = num_used_syms; i <= code_size_limit; i++)
++            for (l = num_codes[i]; l > 0; l--)
++                d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i);
++    }
++
++    next_code[1] = 0;
++    for (j = 0, i = 2; i <= code_size_limit; i++)
++        next_code[i] = j = ((j + num_codes[i - 1]) << 1);
++
++    for (i = 0; i < table_len; i++)
++    {
++        mz_uint rev_code = 0, code, code_size;
++        if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0)
++            continue;
++        code = next_code[code_size]++;
++        for (l = code_size; l > 0; l--, code >>= 1)
++            rev_code = (rev_code << 1) | (code & 1);
++        d->m_huff_codes[table_num][i] = (mz_uint16)rev_code;
++    }
++}
++
++#define TDEFL_PUT_BITS(b, l)                                       \
++    do                                                             \
++    {                                                              \
++        mz_uint bits = b;                                          \
++        mz_uint len = l;                                           \
++        MZ_ASSERT(bits <= ((1U << len) - 1U));                     \
++        d->m_bit_buffer |= (bits << d->m_bits_in);                 \
++        d->m_bits_in += len;                                       \
++        while (d->m_bits_in >= 8)                                  \
++        {                                                          \
++            if (d->m_pOutput_buf < d->m_pOutput_buf_end)           \
++                *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \
++            d->m_bit_buffer >>= 8;                                 \
++            d->m_bits_in -= 8;                                     \
++        }                                                          \
++    }                                                              \
++    MZ_MACRO_END
++
++#define TDEFL_RLE_PREV_CODE_SIZE()                                                                                       \
++    {                                                                                                                    \
++        if (rle_repeat_count)                                                                                            \
++        {                                                                                                                \
++            if (rle_repeat_count < 3)                                                                                    \
++            {                                                                                                            \
++                d->m_huff_count[2][prev_code_size] = (mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \
++                while (rle_repeat_count--)                                                                               \
++                    packed_code_sizes[num_packed_code_sizes++] = prev_code_size;                                         \
++            }                                                                                                            \
++            else                                                                                                         \
++            {                                                                                                            \
++                d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1);                                        \
++                packed_code_sizes[num_packed_code_sizes++] = 16;                                                         \
++                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_repeat_count - 3);                           \
++            }                                                                                                            \
++            rle_repeat_count = 0;                                                                                        \
++        }                                                                                                                \
++    }
++
++#define TDEFL_RLE_ZERO_CODE_SIZE()                                                         \
++    {                                                                                      \
++        if (rle_z_count)                                                                   \
++        {                                                                                  \
++            if (rle_z_count < 3)                                                           \
++            {                                                                              \
++                d->m_huff_count[2][0] = (mz_uint16)(d->m_huff_count[2][0] + rle_z_count);  \
++                while (rle_z_count--)                                                      \
++                    packed_code_sizes[num_packed_code_sizes++] = 0;                        \
++            }                                                                              \
++            else if (rle_z_count <= 10)                                                    \
++            {                                                                              \
++                d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1);          \
++                packed_code_sizes[num_packed_code_sizes++] = 17;                           \
++                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 3);  \
++            }                                                                              \
++            else                                                                           \
++            {                                                                              \
++                d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1);          \
++                packed_code_sizes[num_packed_code_sizes++] = 18;                           \
++                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 11); \
++            }                                                                              \
++            rle_z_count = 0;                                                               \
++        }                                                                                  \
++    }
++
++static mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
++
++static void tdefl_start_dynamic_block(tdefl_compressor *d)
++{
++    int num_lit_codes, num_dist_codes, num_bit_lengths;
++    mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index;
++    mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF;
++
++    d->m_huff_count[0][256] = 1;
++
++    tdefl_optimize_huffman_table(d, 0, TDEFL_MAX_HUFF_SYMBOLS_0, 15, MZ_FALSE);
++    tdefl_optimize_huffman_table(d, 1, TDEFL_MAX_HUFF_SYMBOLS_1, 15, MZ_FALSE);
++
++    for (num_lit_codes = 286; num_lit_codes > 257; num_lit_codes--)
++        if (d->m_huff_code_sizes[0][num_lit_codes - 1])
++            break;
++    for (num_dist_codes = 30; num_dist_codes > 1; num_dist_codes--)
++        if (d->m_huff_code_sizes[1][num_dist_codes - 1])
++            break;
++
++    memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes);
++    memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0], num_dist_codes);
++    total_code_sizes_to_pack = num_lit_codes + num_dist_codes;
++    num_packed_code_sizes = 0;
++    rle_z_count = 0;
++    rle_repeat_count = 0;
++
++    memset(&d->m_huff_count[2][0], 0, sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2);
++    for (i = 0; i < total_code_sizes_to_pack; i++)
++    {
++        mz_uint8 code_size = code_sizes_to_pack[i];
++        if (!code_size)
++        {
++            TDEFL_RLE_PREV_CODE_SIZE();
++            if (++rle_z_count == 138)
++            {
++                TDEFL_RLE_ZERO_CODE_SIZE();
++            }
++        }
++        else
++        {
++            TDEFL_RLE_ZERO_CODE_SIZE();
++            if (code_size != prev_code_size)
++            {
++                TDEFL_RLE_PREV_CODE_SIZE();
++                d->m_huff_count[2][code_size] = (mz_uint16)(d->m_huff_count[2][code_size] + 1);
++                packed_code_sizes[num_packed_code_sizes++] = code_size;
++            }
++            else if (++rle_repeat_count == 6)
++            {
++                TDEFL_RLE_PREV_CODE_SIZE();
++            }
++        }
++        prev_code_size = code_size;
++    }
++    if (rle_repeat_count)
++    {
++        TDEFL_RLE_PREV_CODE_SIZE();
++    }
++    else
++    {
++        TDEFL_RLE_ZERO_CODE_SIZE();
++    }
++
++    tdefl_optimize_huffman_table(d, 2, TDEFL_MAX_HUFF_SYMBOLS_2, 7, MZ_FALSE);
++
++    TDEFL_PUT_BITS(2, 2);
++
++    TDEFL_PUT_BITS(num_lit_codes - 257, 5);
++    TDEFL_PUT_BITS(num_dist_codes - 1, 5);
++
++    for (num_bit_lengths = 18; num_bit_lengths >= 0; num_bit_lengths--)
++        if (d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[num_bit_lengths]])
++            break;
++    num_bit_lengths = MZ_MAX(4, (num_bit_lengths + 1));
++    TDEFL_PUT_BITS(num_bit_lengths - 4, 4);
++    for (i = 0; (int)i < num_bit_lengths; i++)
++        TDEFL_PUT_BITS(d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[i]], 3);
++
++    for (packed_code_sizes_index = 0; packed_code_sizes_index < num_packed_code_sizes;)
++    {
++        mz_uint code = packed_code_sizes[packed_code_sizes_index++];
++        MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2);
++        TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]);
++        if (code >= 16)
++            TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], "\02\03\07"[code - 16]);
++    }
++}
++
++static void tdefl_start_static_block(tdefl_compressor *d)
++{
++    mz_uint i;
++    mz_uint8 *p = &d->m_huff_code_sizes[0][0];
++
++    for (i = 0; i <= 143; ++i)
++        *p++ = 8;
++    for (; i <= 255; ++i)
++        *p++ = 9;
++    for (; i <= 279; ++i)
++        *p++ = 7;
++    for (; i <= 287; ++i)
++        *p++ = 8;
++
++    memset(d->m_huff_code_sizes[1], 5, 32);
++
++    tdefl_optimize_huffman_table(d, 0, 288, 15, MZ_TRUE);
++    tdefl_optimize_huffman_table(d, 1, 32, 15, MZ_TRUE);
++
++    TDEFL_PUT_BITS(1, 2);
++}
++
++static const mz_uint mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
++
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS
++static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
++{
++    mz_uint flags;
++    mz_uint8 *pLZ_codes;
++    mz_uint8 *pOutput_buf = d->m_pOutput_buf;
++    mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf;
++    mz_uint64 bit_buffer = d->m_bit_buffer;
++    mz_uint bits_in = d->m_bits_in;
++
++#define TDEFL_PUT_BITS_FAST(b, l)                    \
++    {                                                \
++        bit_buffer |= (((mz_uint64)(b)) << bits_in); \
++        bits_in += (l);                              \
++    }
++
++    flags = 1;
++    for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; flags >>= 1)
++    {
++        if (flags == 1)
++            flags = *pLZ_codes++ | 0x100;
++
++        if (flags & 1)
++        {
++            mz_uint s0, s1, n0, n1, sym, num_extra_bits;
++            mz_uint match_len = pLZ_codes[0], match_dist = *(const mz_uint16 *)(pLZ_codes + 1);
++            pLZ_codes += 3;
++
++            MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
++            TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
++            TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
++
++            /* This sequence coaxes MSVC into using cmov's vs. jmp's. */
++            s0 = s_tdefl_small_dist_sym[match_dist & 511];
++            n0 = s_tdefl_small_dist_extra[match_dist & 511];
++            s1 = s_tdefl_large_dist_sym[match_dist >> 8];
++            n1 = s_tdefl_large_dist_extra[match_dist >> 8];
++            sym = (match_dist < 512) ? s0 : s1;
++            num_extra_bits = (match_dist < 512) ? n0 : n1;
++
++            MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
++            TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
++            TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
++        }
++        else
++        {
++            mz_uint lit = *pLZ_codes++;
++            MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
++            TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
++
++            if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
++            {
++                flags >>= 1;
++                lit = *pLZ_codes++;
++                MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
++                TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
++
++                if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
++                {
++                    flags >>= 1;
++                    lit = *pLZ_codes++;
++                    MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
++                    TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
++                }
++            }
++        }
++
++        if (pOutput_buf >= d->m_pOutput_buf_end)
++            return MZ_FALSE;
++
++        *(mz_uint64 *)pOutput_buf = bit_buffer;
++        pOutput_buf += (bits_in >> 3);
++        bit_buffer >>= (bits_in & ~7);
++        bits_in &= 7;
++    }
++
++#undef TDEFL_PUT_BITS_FAST
++
++    d->m_pOutput_buf = pOutput_buf;
++    d->m_bits_in = 0;
++    d->m_bit_buffer = 0;
++
++    while (bits_in)
++    {
++        mz_uint32 n = MZ_MIN(bits_in, 16);
++        TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n);
++        bit_buffer >>= n;
++        bits_in -= n;
++    }
++
++    TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
++
++    return (d->m_pOutput_buf < d->m_pOutput_buf_end);
++}
++#else
++static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
++{
++    mz_uint flags;
++    mz_uint8 *pLZ_codes;
++
++    flags = 1;
++    for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; flags >>= 1)
++    {
++        if (flags == 1)
++            flags = *pLZ_codes++ | 0x100;
++        if (flags & 1)
++        {
++            mz_uint sym, num_extra_bits;
++            mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
++            pLZ_codes += 3;
++
++            MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
++            TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
++            TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
++
++            if (match_dist < 512)
++            {
++                sym = s_tdefl_small_dist_sym[match_dist];
++                num_extra_bits = s_tdefl_small_dist_extra[match_dist];
++            }
++            else
++            {
++                sym = s_tdefl_large_dist_sym[match_dist >> 8];
++                num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8];
++            }
++            MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
++            TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
++            TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
++        }
++        else
++        {
++            mz_uint lit = *pLZ_codes++;
++            MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
++            TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
++        }
++    }
++
++    TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
++
++    return (d->m_pOutput_buf < d->m_pOutput_buf_end);
++}
++#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS */
++
++static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block)
++{
++    if (static_block)
++        tdefl_start_static_block(d);
++    else
++        tdefl_start_dynamic_block(d);
++    return tdefl_compress_lz_codes(d);
++}
++
++static int tdefl_flush_block(tdefl_compressor *d, int flush)
++{
++    mz_uint saved_bit_buf, saved_bits_in;
++    mz_uint8 *pSaved_output_buf;
++    mz_bool comp_block_succeeded = MZ_FALSE;
++    int n, use_raw_block = ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size;
++    mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf;
++
++    d->m_pOutput_buf = pOutput_buf_start;
++    d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16;
++
++    MZ_ASSERT(!d->m_output_flush_remaining);
++    d->m_output_flush_ofs = 0;
++    d->m_output_flush_remaining = 0;
++
++    *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left);
++    d->m_pLZ_code_buf -= (d->m_num_flags_left == 8);
++
++    if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index))
++    {
++        TDEFL_PUT_BITS(0x78, 8);
++        TDEFL_PUT_BITS(0x01, 8);
++    }
++
++    TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1);
++
++    pSaved_output_buf = d->m_pOutput_buf;
++    saved_bit_buf = d->m_bit_buffer;
++    saved_bits_in = d->m_bits_in;
++
++    if (!use_raw_block)
++        comp_block_succeeded = tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) || (d->m_total_lz_bytes < 48));
++
++    /* If the block gets expanded, forget the current contents of the output buffer and send a raw block instead. */
++    if (((use_raw_block) || ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= d->m_total_lz_bytes))) &&
++        ((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size))
++    {
++        mz_uint i;
++        d->m_pOutput_buf = pSaved_output_buf;
++        d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
++        TDEFL_PUT_BITS(0, 2);
++        if (d->m_bits_in)
++        {
++            TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
++        }
++        for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF)
++        {
++            TDEFL_PUT_BITS(d->m_total_lz_bytes & 0xFFFF, 16);
++        }
++        for (i = 0; i < d->m_total_lz_bytes; ++i)
++        {
++            TDEFL_PUT_BITS(d->m_dict[(d->m_lz_code_buf_dict_pos + i) & TDEFL_LZ_DICT_SIZE_MASK], 8);
++        }
++    }
++    /* Check for the extremely unlikely (if not impossible) case of the compressed block not fitting into the output buffer when using dynamic codes. */
++    else if (!comp_block_succeeded)
++    {
++        d->m_pOutput_buf = pSaved_output_buf;
++        d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
++        tdefl_compress_block(d, MZ_TRUE);
++    }
++
++    if (flush)
++    {
++        if (flush == TDEFL_FINISH)
++        {
++            if (d->m_bits_in)
++            {
++                TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
++            }
++            if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER)
++            {
++                mz_uint i, a = d->m_adler32;
++                for (i = 0; i < 4; i++)
++                {
++                    TDEFL_PUT_BITS((a >> 24) & 0xFF, 8);
++                    a <<= 8;
++                }
++            }
++        }
++        else
++        {
++            mz_uint i, z = 0;
++            TDEFL_PUT_BITS(0, 3);
++            if (d->m_bits_in)
++            {
++                TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
++            }
++            for (i = 2; i; --i, z ^= 0xFFFF)
++            {
++                TDEFL_PUT_BITS(z & 0xFFFF, 16);
++            }
++        }
++    }
++
++    MZ_ASSERT(d->m_pOutput_buf < d->m_pOutput_buf_end);
++
++    memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
++    memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
++
++    d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
++    d->m_pLZ_flags = d->m_lz_code_buf;
++    d->m_num_flags_left = 8;
++    d->m_lz_code_buf_dict_pos += d->m_total_lz_bytes;
++    d->m_total_lz_bytes = 0;
++    d->m_block_index++;
++
++    if ((n = (int)(d->m_pOutput_buf - pOutput_buf_start)) != 0)
++    {
++        if (d->m_pPut_buf_func)
++        {
++            *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
++            if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user))
++                return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED);
++        }
++        else if (pOutput_buf_start == d->m_output_buf)
++        {
++            int bytes_to_copy = (int)MZ_MIN((size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs));
++            memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy);
++            d->m_out_buf_ofs += bytes_to_copy;
++            if ((n -= bytes_to_copy) != 0)
++            {
++                d->m_output_flush_ofs = bytes_to_copy;
++                d->m_output_flush_remaining = n;
++            }
++        }
++        else
++        {
++            d->m_out_buf_ofs += n;
++        }
++    }
++
++    return d->m_output_flush_remaining;
++}
++
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
++#ifdef MINIZ_UNALIGNED_USE_MEMCPY
++static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8* p)
++{
++	mz_uint16 ret;
++	memcpy(&ret, p, sizeof(mz_uint16));
++	return ret;
++}
++static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16* p)
++{
++	mz_uint16 ret;
++	memcpy(&ret, p, sizeof(mz_uint16));
++	return ret;
++}
++#else
++#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p)
++#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p)
++#endif
++static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
++{
++    mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
++    mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
++    const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q;
++    mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD2(s);
++    MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
++    if (max_match_len <= match_len)
++        return;
++    for (;;)
++    {
++        for (;;)
++        {
++            if (--num_probes_left == 0)
++                return;
++#define TDEFL_PROBE                                                                             \
++    next_probe_pos = d->m_next[probe_pos];                                                      \
++    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \
++        return;                                                                                 \
++    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                       \
++    if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01)                \
++        break;
++            TDEFL_PROBE;
++            TDEFL_PROBE;
++            TDEFL_PROBE;
++        }
++        if (!dist)
++            break;
++        q = (const mz_uint16 *)(d->m_dict + probe_pos);
++        if (TDEFL_READ_UNALIGNED_WORD2(q) != s01)
++            continue;
++        p = s;
++        probe_len = 32;
++        do
++        {
++        } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
++                 (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
++        if (!probe_len)
++        {
++            *pMatch_dist = dist;
++            *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN);
++            break;
++        }
++        else if ((probe_len = ((mz_uint)(p - s) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q)) > match_len)
++        {
++            *pMatch_dist = dist;
++            if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == max_match_len)
++                break;
++            c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]);
++        }
++    }
++}
++#else
++static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
++{
++    mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
++    mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
++    const mz_uint8 *s = d->m_dict + pos, *p, *q;
++    mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
++    MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
++    if (max_match_len <= match_len)
++        return;
++    for (;;)
++    {
++        for (;;)
++        {
++            if (--num_probes_left == 0)
++                return;
++#define TDEFL_PROBE                                                                               \
++    next_probe_pos = d->m_next[probe_pos];                                                        \
++    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist))   \
++        return;                                                                                   \
++    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                         \
++    if ((d->m_dict[probe_pos + match_len] == c0) && (d->m_dict[probe_pos + match_len - 1] == c1)) \
++        break;
++            TDEFL_PROBE;
++            TDEFL_PROBE;
++            TDEFL_PROBE;
++        }
++        if (!dist)
++            break;
++        p = s;
++        q = d->m_dict + probe_pos;
++        for (probe_len = 0; probe_len < max_match_len; probe_len++)
++            if (*p++ != *q++)
++                break;
++        if (probe_len > match_len)
++        {
++            *pMatch_dist = dist;
++            if ((*pMatch_len = match_len = probe_len) == max_match_len)
++                return;
++            c0 = d->m_dict[pos + match_len];
++            c1 = d->m_dict[pos + match_len - 1];
++        }
++    }
++}
++#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */
++
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
++#ifdef MINIZ_UNALIGNED_USE_MEMCPY
++static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8* p)
++{
++	mz_uint32 ret;
++	memcpy(&ret, p, sizeof(mz_uint32));
++	return ret;
++}
++#else
++#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p)
++#endif
++static mz_bool tdefl_compress_fast(tdefl_compressor *d)
++{
++    /* Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio. */
++    mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
++    mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
++    mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
++
++    while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size)))
++    {
++        const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096;
++        mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
++        mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size);
++        d->m_src_buf_left -= num_bytes_to_process;
++        lookahead_size += num_bytes_to_process;
++
++        while (num_bytes_to_process)
++        {
++            mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process);
++            memcpy(d->m_dict + dst_pos, d->m_pSrc, n);
++            if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
++                memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos));
++            d->m_pSrc += n;
++            dst_pos = (dst_pos + n) & TDEFL_LZ_DICT_SIZE_MASK;
++            num_bytes_to_process -= n;
++        }
++
++        dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - lookahead_size, dict_size);
++        if ((!d->m_flush) && (lookahead_size < TDEFL_COMP_FAST_LOOKAHEAD_SIZE))
++            break;
++
++        while (lookahead_size >= 4)
++        {
++            mz_uint cur_match_dist, cur_match_len = 1;
++            mz_uint8 *pCur_dict = d->m_dict + cur_pos;
++            mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF;
++            mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK;
++            mz_uint probe_pos = d->m_hash[hash];
++            d->m_hash[hash] = (mz_uint16)lookahead_pos;
++
++            if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((TDEFL_READ_UNALIGNED_WORD32(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram))
++            {
++                const mz_uint16 *p = (const mz_uint16 *)pCur_dict;
++                const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos);
++                mz_uint32 probe_len = 32;
++                do
++                {
++                } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
++                         (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
++                cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q);
++                if (!probe_len)
++                    cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0;
++
++                if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || ((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)))
++                {
++                    cur_match_len = 1;
++                    *pLZ_code_buf++ = (mz_uint8)first_trigram;
++                    *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
++                    d->m_huff_count[0][(mz_uint8)first_trigram]++;
++                }
++                else
++                {
++                    mz_uint32 s0, s1;
++                    cur_match_len = MZ_MIN(cur_match_len, lookahead_size);
++
++                    MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 1) && (cur_match_dist <= TDEFL_LZ_DICT_SIZE));
++
++                    cur_match_dist--;
++
++                    pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
++#ifdef MINIZ_UNALIGNED_USE_MEMCPY
++					memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist));
++#else
++                    *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist;
++#endif
++                    pLZ_code_buf += 3;
++                    *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80);
++
++                    s0 = s_tdefl_small_dist_sym[cur_match_dist & 511];
++                    s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8];
++                    d->m_huff_count[1][(cur_match_dist < 512) ? s0 : s1]++;
++
++                    d->m_huff_count[0][s_tdefl_len_sym[cur_match_len - TDEFL_MIN_MATCH_LEN]]++;
++                }
++            }
++            else
++            {
++                *pLZ_code_buf++ = (mz_uint8)first_trigram;
++                *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
++                d->m_huff_count[0][(mz_uint8)first_trigram]++;
++            }
++
++            if (--num_flags_left == 0)
++            {
++                num_flags_left = 8;
++                pLZ_flags = pLZ_code_buf++;
++            }
++
++            total_lz_bytes += cur_match_len;
++            lookahead_pos += cur_match_len;
++            dict_size = MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE);
++            cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK;
++            MZ_ASSERT(lookahead_size >= cur_match_len);
++            lookahead_size -= cur_match_len;
++
++            if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
++            {
++                int n;
++                d->m_lookahead_pos = lookahead_pos;
++                d->m_lookahead_size = lookahead_size;
++                d->m_dict_size = dict_size;
++                d->m_total_lz_bytes = total_lz_bytes;
++                d->m_pLZ_code_buf = pLZ_code_buf;
++                d->m_pLZ_flags = pLZ_flags;
++                d->m_num_flags_left = num_flags_left;
++                if ((n = tdefl_flush_block(d, 0)) != 0)
++                    return (n < 0) ? MZ_FALSE : MZ_TRUE;
++                total_lz_bytes = d->m_total_lz_bytes;
++                pLZ_code_buf = d->m_pLZ_code_buf;
++                pLZ_flags = d->m_pLZ_flags;
++                num_flags_left = d->m_num_flags_left;
++            }
++        }
++
++        while (lookahead_size)
++        {
++            mz_uint8 lit = d->m_dict[cur_pos];
++
++            total_lz_bytes++;
++            *pLZ_code_buf++ = lit;
++            *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
++            if (--num_flags_left == 0)
++            {
++                num_flags_left = 8;
++                pLZ_flags = pLZ_code_buf++;
++            }
++
++            d->m_huff_count[0][lit]++;
++
++            lookahead_pos++;
++            dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE);
++            cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
++            lookahead_size--;
++
++            if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
++            {
++                int n;
++                d->m_lookahead_pos = lookahead_pos;
++                d->m_lookahead_size = lookahead_size;
++                d->m_dict_size = dict_size;
++                d->m_total_lz_bytes = total_lz_bytes;
++                d->m_pLZ_code_buf = pLZ_code_buf;
++                d->m_pLZ_flags = pLZ_flags;
++                d->m_num_flags_left = num_flags_left;
++                if ((n = tdefl_flush_block(d, 0)) != 0)
++                    return (n < 0) ? MZ_FALSE : MZ_TRUE;
++                total_lz_bytes = d->m_total_lz_bytes;
++                pLZ_code_buf = d->m_pLZ_code_buf;
++                pLZ_flags = d->m_pLZ_flags;
++                num_flags_left = d->m_num_flags_left;
++            }
++        }
++    }
++
++    d->m_lookahead_pos = lookahead_pos;
++    d->m_lookahead_size = lookahead_size;
++    d->m_dict_size = dict_size;
++    d->m_total_lz_bytes = total_lz_bytes;
++    d->m_pLZ_code_buf = pLZ_code_buf;
++    d->m_pLZ_flags = pLZ_flags;
++    d->m_num_flags_left = num_flags_left;
++    return MZ_TRUE;
++}
++#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
++
++static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, mz_uint8 lit)
++{
++    d->m_total_lz_bytes++;
++    *d->m_pLZ_code_buf++ = lit;
++    *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1);
++    if (--d->m_num_flags_left == 0)
++    {
++        d->m_num_flags_left = 8;
++        d->m_pLZ_flags = d->m_pLZ_code_buf++;
++    }
++    d->m_huff_count[0][lit]++;
++}
++
++static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist)
++{
++    mz_uint32 s0, s1;
++
++    MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && (match_dist <= TDEFL_LZ_DICT_SIZE));
++
++    d->m_total_lz_bytes += match_len;
++
++    d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN);
++
++    match_dist -= 1;
++    d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF);
++    d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8);
++    d->m_pLZ_code_buf += 3;
++
++    *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80);
++    if (--d->m_num_flags_left == 0)
++    {
++        d->m_num_flags_left = 8;
++        d->m_pLZ_flags = d->m_pLZ_code_buf++;
++    }
++
++    s0 = s_tdefl_small_dist_sym[match_dist & 511];
++    s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127];
++    d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++;
++    d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
++}
++
++static mz_bool tdefl_compress_normal(tdefl_compressor *d)
++{
++    const mz_uint8 *pSrc = d->m_pSrc;
++    size_t src_buf_left = d->m_src_buf_left;
++    tdefl_flush flush = d->m_flush;
++
++    while ((src_buf_left) || ((flush) && (d->m_lookahead_size)))
++    {
++        mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
++        /* Update dictionary and hash chains. Keeps the lookahead size equal to TDEFL_MAX_MATCH_LEN. */
++        if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1))
++        {
++            mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2;
++            mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
++            mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
++            const mz_uint8 *pSrc_end = pSrc + num_bytes_to_process;
++            src_buf_left -= num_bytes_to_process;
++            d->m_lookahead_size += num_bytes_to_process;
++            while (pSrc != pSrc_end)
++            {
++                mz_uint8 c = *pSrc++;
++                d->m_dict[dst_pos] = c;
++                if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
++                    d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
++                hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
++                d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
++                d->m_hash[hash] = (mz_uint16)(ins_pos);
++                dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
++                ins_pos++;
++            }
++        }
++        else
++        {
++            while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
++            {
++                mz_uint8 c = *pSrc++;
++                mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
++                src_buf_left--;
++                d->m_dict[dst_pos] = c;
++                if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
++                    d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
++                if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN)
++                {
++                    mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2;
++                    mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
++                    d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
++                    d->m_hash[hash] = (mz_uint16)(ins_pos);
++                }
++            }
++        }
++        d->m_dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - d->m_lookahead_size, d->m_dict_size);
++        if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
++            break;
++
++        /* Simple lazy/greedy parsing state machine. */
++        len_to_move = 1;
++        cur_match_dist = 0;
++        cur_match_len = d->m_saved_match_len ? d->m_saved_match_len : (TDEFL_MIN_MATCH_LEN - 1);
++        cur_pos = d->m_lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
++        if (d->m_flags & (TDEFL_RLE_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS))
++        {
++            if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))
++            {
++                mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK];
++                cur_match_len = 0;
++                while (cur_match_len < d->m_lookahead_size)
++                {
++                    if (d->m_dict[cur_pos + cur_match_len] != c)
++                        break;
++                    cur_match_len++;
++                }
++                if (cur_match_len < TDEFL_MIN_MATCH_LEN)
++                    cur_match_len = 0;
++                else
++                    cur_match_dist = 1;
++            }
++        }
++        else
++        {
++            tdefl_find_match(d, d->m_lookahead_pos, d->m_dict_size, d->m_lookahead_size, &cur_match_dist, &cur_match_len);
++        }
++        if (((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)) || (cur_pos == cur_match_dist) || ((d->m_flags & TDEFL_FILTER_MATCHES) && (cur_match_len <= 5)))
++        {
++            cur_match_dist = cur_match_len = 0;
++        }
++        if (d->m_saved_match_len)
++        {
++            if (cur_match_len > d->m_saved_match_len)
++            {
++                tdefl_record_literal(d, (mz_uint8)d->m_saved_lit);
++                if (cur_match_len >= 128)
++                {
++                    tdefl_record_match(d, cur_match_len, cur_match_dist);
++                    d->m_saved_match_len = 0;
++                    len_to_move = cur_match_len;
++                }
++                else
++                {
++                    d->m_saved_lit = d->m_dict[cur_pos];
++                    d->m_saved_match_dist = cur_match_dist;
++                    d->m_saved_match_len = cur_match_len;
++                }
++            }
++            else
++            {
++                tdefl_record_match(d, d->m_saved_match_len, d->m_saved_match_dist);
++                len_to_move = d->m_saved_match_len - 1;
++                d->m_saved_match_len = 0;
++            }
++        }
++        else if (!cur_match_dist)
++            tdefl_record_literal(d, d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]);
++        else if ((d->m_greedy_parsing) || (d->m_flags & TDEFL_RLE_MATCHES) || (cur_match_len >= 128))
++        {
++            tdefl_record_match(d, cur_match_len, cur_match_dist);
++            len_to_move = cur_match_len;
++        }
++        else
++        {
++            d->m_saved_lit = d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)];
++            d->m_saved_match_dist = cur_match_dist;
++            d->m_saved_match_len = cur_match_len;
++        }
++        /* Move the lookahead forward by len_to_move bytes. */
++        d->m_lookahead_pos += len_to_move;
++        MZ_ASSERT(d->m_lookahead_size >= len_to_move);
++        d->m_lookahead_size -= len_to_move;
++        d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE);
++        /* Check if it's time to flush the current LZ codes to the internal output buffer. */
++        if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) ||
++            ((d->m_total_lz_bytes > 31 * 1024) && (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))))
++        {
++            int n;
++            d->m_pSrc = pSrc;
++            d->m_src_buf_left = src_buf_left;
++            if ((n = tdefl_flush_block(d, 0)) != 0)
++                return (n < 0) ? MZ_FALSE : MZ_TRUE;
++        }
++    }
++
++    d->m_pSrc = pSrc;
++    d->m_src_buf_left = src_buf_left;
++    return MZ_TRUE;
++}
++
++static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d)
++{
++    if (d->m_pIn_buf_size)
++    {
++        *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
++    }
++
++    if (d->m_pOut_buf_size)
++    {
++        size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, d->m_output_flush_remaining);
++        memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n);
++        d->m_output_flush_ofs += (mz_uint)n;
++        d->m_output_flush_remaining -= (mz_uint)n;
++        d->m_out_buf_ofs += n;
++
++        *d->m_pOut_buf_size = d->m_out_buf_ofs;
++    }
++
++    return (d->m_finished && !d->m_output_flush_remaining) ? TDEFL_STATUS_DONE : TDEFL_STATUS_OKAY;
++}
++
++tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush)
++{
++    if (!d)
++    {
++        if (pIn_buf_size)
++            *pIn_buf_size = 0;
++        if (pOut_buf_size)
++            *pOut_buf_size = 0;
++        return TDEFL_STATUS_BAD_PARAM;
++    }
++
++    d->m_pIn_buf = pIn_buf;
++    d->m_pIn_buf_size = pIn_buf_size;
++    d->m_pOut_buf = pOut_buf;
++    d->m_pOut_buf_size = pOut_buf_size;
++    d->m_pSrc = (const mz_uint8 *)(pIn_buf);
++    d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0;
++    d->m_out_buf_ofs = 0;
++    d->m_flush = flush;
++
++    if (((d->m_pPut_buf_func != NULL) == ((pOut_buf != NULL) || (pOut_buf_size != NULL))) || (d->m_prev_return_status != TDEFL_STATUS_OKAY) ||
++        (d->m_wants_to_finish && (flush != TDEFL_FINISH)) || (pIn_buf_size && *pIn_buf_size && !pIn_buf) || (pOut_buf_size && *pOut_buf_size && !pOut_buf))
++    {
++        if (pIn_buf_size)
++            *pIn_buf_size = 0;
++        if (pOut_buf_size)
++            *pOut_buf_size = 0;
++        return (d->m_prev_return_status = TDEFL_STATUS_BAD_PARAM);
++    }
++    d->m_wants_to_finish |= (flush == TDEFL_FINISH);
++
++    if ((d->m_output_flush_remaining) || (d->m_finished))
++        return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
++
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
++    if (((d->m_flags & TDEFL_MAX_PROBES_MASK) == 1) &&
++        ((d->m_flags & TDEFL_GREEDY_PARSING_FLAG) != 0) &&
++        ((d->m_flags & (TDEFL_FILTER_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS | TDEFL_RLE_MATCHES)) == 0))
++    {
++        if (!tdefl_compress_fast(d))
++            return d->m_prev_return_status;
++    }
++    else
++#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
++    {
++        if (!tdefl_compress_normal(d))
++            return d->m_prev_return_status;
++    }
++
++    if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && (pIn_buf))
++        d->m_adler32 = (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, d->m_pSrc - (const mz_uint8 *)pIn_buf);
++
++    if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && (!d->m_output_flush_remaining))
++    {
++        if (tdefl_flush_block(d, flush) < 0)
++            return d->m_prev_return_status;
++        d->m_finished = (flush == TDEFL_FINISH);
++        if (flush == TDEFL_FULL_FLUSH)
++        {
++            MZ_CLEAR_OBJ(d->m_hash);
++            MZ_CLEAR_OBJ(d->m_next);
++            d->m_dict_size = 0;
++        }
++    }
++
++    return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
++}
++
++tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush)
++{
++    MZ_ASSERT(d->m_pPut_buf_func);
++    return tdefl_compress(d, pIn_buf, &in_buf_size, NULL, NULL, flush);
++}
++
++tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
++{
++    d->m_pPut_buf_func = pPut_buf_func;
++    d->m_pPut_buf_user = pPut_buf_user;
++    d->m_flags = (mz_uint)(flags);
++    d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3;
++    d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
++    d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3;
++    if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
++        MZ_CLEAR_OBJ(d->m_hash);
++    d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0;
++    d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished = d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0;
++    d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
++    d->m_pLZ_flags = d->m_lz_code_buf;
++    *d->m_pLZ_flags = 0;
++    d->m_num_flags_left = 8;
++    d->m_pOutput_buf = d->m_output_buf;
++    d->m_pOutput_buf_end = d->m_output_buf;
++    d->m_prev_return_status = TDEFL_STATUS_OKAY;
++    d->m_saved_match_dist = d->m_saved_match_len = d->m_saved_lit = 0;
++    d->m_adler32 = 1;
++    d->m_pIn_buf = NULL;
++    d->m_pOut_buf = NULL;
++    d->m_pIn_buf_size = NULL;
++    d->m_pOut_buf_size = NULL;
++    d->m_flush = TDEFL_NO_FLUSH;
++    d->m_pSrc = NULL;
++    d->m_src_buf_left = 0;
++    d->m_out_buf_ofs = 0;
++    if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
++        MZ_CLEAR_OBJ(d->m_dict);
++    memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
++    memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
++    return TDEFL_STATUS_OKAY;
++}
++
++tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d)
++{
++    return d->m_prev_return_status;
++}
++
++mz_uint32 tdefl_get_adler32(tdefl_compressor *d)
++{
++    return d->m_adler32;
++}
++
++mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
++{
++    tdefl_compressor *pComp;
++    mz_bool succeeded;
++    if (((buf_len) && (!pBuf)) || (!pPut_buf_func))
++        return MZ_FALSE;
++    pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
++    if (!pComp)
++        return MZ_FALSE;
++    succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == TDEFL_STATUS_OKAY);
++    succeeded = succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == TDEFL_STATUS_DONE);
++    MZ_FREE(pComp);
++    return succeeded;
++}
++
++typedef struct
++{
++    size_t m_size, m_capacity;
++    mz_uint8 *m_pBuf;
++    mz_bool m_expandable;
++} tdefl_output_buffer;
++
++static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser)
++{
++    tdefl_output_buffer *p = (tdefl_output_buffer *)pUser;
++    size_t new_size = p->m_size + len;
++    if (new_size > p->m_capacity)
++    {
++        size_t new_capacity = p->m_capacity;
++        mz_uint8 *pNew_buf;
++        if (!p->m_expandable)
++            return MZ_FALSE;
++        do
++        {
++            new_capacity = MZ_MAX(128U, new_capacity << 1U);
++        } while (new_size > new_capacity);
++        pNew_buf = (mz_uint8 *)MZ_REALLOC(p->m_pBuf, new_capacity);
++        if (!pNew_buf)
++            return MZ_FALSE;
++        p->m_pBuf = pNew_buf;
++        p->m_capacity = new_capacity;
++    }
++    memcpy((mz_uint8 *)p->m_pBuf + p->m_size, pBuf, len);
++    p->m_size = new_size;
++    return MZ_TRUE;
++}
++
++void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
++{
++    tdefl_output_buffer out_buf;
++    MZ_CLEAR_OBJ(out_buf);
++    if (!pOut_len)
++        return MZ_FALSE;
++    else
++        *pOut_len = 0;
++    out_buf.m_expandable = MZ_TRUE;
++    if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
++        return NULL;
++    *pOut_len = out_buf.m_size;
++    return out_buf.m_pBuf;
++}
++
++size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
++{
++    tdefl_output_buffer out_buf;
++    MZ_CLEAR_OBJ(out_buf);
++    if (!pOut_buf)
++        return 0;
++    out_buf.m_pBuf = (mz_uint8 *)pOut_buf;
++    out_buf.m_capacity = out_buf_len;
++    if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
++        return 0;
++    return out_buf.m_size;
++}
++
++static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
++
++/* level may actually range from [0,10] (10 is a "hidden" max level, where we want a bit more compression and it's fine if throughput to fall off a cliff on some files). */
++mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy)
++{
++    mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0);
++    if (window_bits > 0)
++        comp_flags |= TDEFL_WRITE_ZLIB_HEADER;
++
++    if (!level)
++        comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS;
++    else if (strategy == MZ_FILTERED)
++        comp_flags |= TDEFL_FILTER_MATCHES;
++    else if (strategy == MZ_HUFFMAN_ONLY)
++        comp_flags &= ~TDEFL_MAX_PROBES_MASK;
++    else if (strategy == MZ_FIXED)
++        comp_flags |= TDEFL_FORCE_ALL_STATIC_BLOCKS;
++    else if (strategy == MZ_RLE)
++        comp_flags |= TDEFL_RLE_MATCHES;
++
++    return comp_flags;
++}
++
++#ifdef _MSC_VER
++#pragma warning(push)
++#pragma warning(disable : 4204) /* nonstandard extension used : non-constant aggregate initializer (also supported by GNU C and C99, so no big deal) */
++#endif
++
++/* Simple PNG writer function by Alex Evans, 2011. Released into the public domain: https://gist.github.com/908299, more context at
++ http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
++ This is actually a modification of Alex's original code so PNG files generated by this function pass pngcheck. */
++void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip)
++{
++    /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was defined. */
++    static const mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
++    tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
++    tdefl_output_buffer out_buf;
++    int i, bpl = w * num_chans, y, z;
++    mz_uint32 c;
++    *pLen_out = 0;
++    if (!pComp)
++        return NULL;
++    MZ_CLEAR_OBJ(out_buf);
++    out_buf.m_expandable = MZ_TRUE;
++    out_buf.m_capacity = 57 + MZ_MAX(64, (1 + bpl) * h);
++    if (NULL == (out_buf.m_pBuf = (mz_uint8 *)MZ_MALLOC(out_buf.m_capacity)))
++    {
++        MZ_FREE(pComp);
++        return NULL;
++    }
++    /* write dummy header */
++    for (z = 41; z; --z)
++        tdefl_output_buffer_putter(&z, 1, &out_buf);
++    /* compress image data */
++    tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf, s_tdefl_png_num_probes[MZ_MIN(10, level)] | TDEFL_WRITE_ZLIB_HEADER);
++    for (y = 0; y < h; ++y)
++    {
++        tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
++        tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH);
++    }
++    if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
++    {
++        MZ_FREE(pComp);
++        MZ_FREE(out_buf.m_pBuf);
++        return NULL;
++    }
++    /* write real header */
++    *pLen_out = out_buf.m_size - 41;
++    {
++        static const mz_uint8 chans[] = { 0x00, 0x00, 0x04, 0x02, 0x06 };
++        mz_uint8 pnghdr[41] = { 0x89, 0x50, 0x4e, 0x47, 0x0d,
++                                0x0a, 0x1a, 0x0a, 0x00, 0x00,
++                                0x00, 0x0d, 0x49, 0x48, 0x44,
++                                0x52, 0x00, 0x00, 0x00, 0x00,
++                                0x00, 0x00, 0x00, 0x00, 0x08,
++                                0x00, 0x00, 0x00, 0x00, 0x00,
++                                0x00, 0x00, 0x00, 0x00, 0x00,
++                                0x00, 0x00, 0x49, 0x44, 0x41,
++                                0x54 };
++        pnghdr[18] = (mz_uint8)(w >> 8);
++        pnghdr[19] = (mz_uint8)w;
++        pnghdr[22] = (mz_uint8)(h >> 8);
++        pnghdr[23] = (mz_uint8)h;
++        pnghdr[25] = chans[num_chans];
++        pnghdr[33] = (mz_uint8)(*pLen_out >> 24);
++        pnghdr[34] = (mz_uint8)(*pLen_out >> 16);
++        pnghdr[35] = (mz_uint8)(*pLen_out >> 8);
++        pnghdr[36] = (mz_uint8)*pLen_out;
++        c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17);
++        for (i = 0; i < 4; ++i, c <<= 8)
++            ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24);
++        memcpy(out_buf.m_pBuf, pnghdr, 41);
++    }
++    /* write footer (IDAT CRC-32, followed by IEND chunk) */
++    if (!tdefl_output_buffer_putter("\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf))
++    {
++        *pLen_out = 0;
++        MZ_FREE(pComp);
++        MZ_FREE(out_buf.m_pBuf);
++        return NULL;
++    }
++    c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, out_buf.m_pBuf + 41 - 4, *pLen_out + 4);
++    for (i = 0; i < 4; ++i, c <<= 8)
++        (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24);
++    /* compute final size of file, grab compressed data buffer and return */
++    *pLen_out += 57;
++    MZ_FREE(pComp);
++    return out_buf.m_pBuf;
++}
++void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out)
++{
++    /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's where #defined out) */
++    return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans, pLen_out, 6, MZ_FALSE);
++}
++
++#ifndef MINIZ_NO_MALLOC
++/* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that */
++/* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */
++/* structure size and allocation mechanism. */
++tdefl_compressor *tdefl_compressor_alloc()
++{
++    return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
++}
++
++void tdefl_compressor_free(tdefl_compressor *pComp)
++{
++    MZ_FREE(pComp);
++}
++#endif
++
++#ifdef _MSC_VER
++#pragma warning(pop)
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++ /**************************************************************************
++ *
++ * Copyright 2013-2014 RAD Game Tools and Valve Software
++ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ *
++ **************************************************************************/
++
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* ------------------- Low-level Decompression (completely independent from all compression API's) */
++
++#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
++#define TINFL_MEMSET(p, c, l) memset(p, c, l)
++
++#define TINFL_CR_BEGIN  \
++    switch (r->m_state) \
++    {                   \
++        case 0:
++#define TINFL_CR_RETURN(state_index, result) \
++    do                                       \
++    {                                        \
++        status = result;                     \
++        r->m_state = state_index;            \
++        goto common_exit;                    \
++        case state_index:;                   \
++    }                                        \
++    MZ_MACRO_END
++#define TINFL_CR_RETURN_FOREVER(state_index, result) \
++    do                                               \
++    {                                                \
++        for (;;)                                     \
++        {                                            \
++            TINFL_CR_RETURN(state_index, result);    \
++        }                                            \
++    }                                                \
++    MZ_MACRO_END
++#define TINFL_CR_FINISH }
++
++#define TINFL_GET_BYTE(state_index, c)                                                                                                                           \
++    do                                                                                                                                                           \
++    {                                                                                                                                                            \
++        while (pIn_buf_cur >= pIn_buf_end)                                                                                                                       \
++        {                                                                                                                                                        \
++            TINFL_CR_RETURN(state_index, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); \
++        }                                                                                                                                                        \
++        c = *pIn_buf_cur++;                                                                                                                                      \
++    }                                                                                                                                                            \
++    MZ_MACRO_END
++
++#define TINFL_NEED_BITS(state_index, n)                \
++    do                                                 \
++    {                                                  \
++        mz_uint c;                                     \
++        TINFL_GET_BYTE(state_index, c);                \
++        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \
++        num_bits += 8;                                 \
++    } while (num_bits < (mz_uint)(n))
++#define TINFL_SKIP_BITS(state_index, n)      \
++    do                                       \
++    {                                        \
++        if (num_bits < (mz_uint)(n))         \
++        {                                    \
++            TINFL_NEED_BITS(state_index, n); \
++        }                                    \
++        bit_buf >>= (n);                     \
++        num_bits -= (n);                     \
++    }                                        \
++    MZ_MACRO_END
++#define TINFL_GET_BITS(state_index, b, n)    \
++    do                                       \
++    {                                        \
++        if (num_bits < (mz_uint)(n))         \
++        {                                    \
++            TINFL_NEED_BITS(state_index, n); \
++        }                                    \
++        b = bit_buf & ((1 << (n)) - 1);      \
++        bit_buf >>= (n);                     \
++        num_bits -= (n);                     \
++    }                                        \
++    MZ_MACRO_END
++
++/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */
++/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */
++/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */
++/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */
++#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff)                             \
++    do                                                                         \
++    {                                                                          \
++        temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)];     \
++        if (temp >= 0)                                                         \
++        {                                                                      \
++            code_len = temp >> 9;                                              \
++            if ((code_len) && (num_bits >= code_len))                          \
++                break;                                                         \
++        }                                                                      \
++        else if (num_bits > TINFL_FAST_LOOKUP_BITS)                            \
++        {                                                                      \
++            code_len = TINFL_FAST_LOOKUP_BITS;                                 \
++            do                                                                 \
++            {                                                                  \
++                temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \
++            } while ((temp < 0) && (num_bits >= (code_len + 1)));              \
++            if (temp >= 0)                                                     \
++                break;                                                         \
++        }                                                                      \
++        TINFL_GET_BYTE(state_index, c);                                        \
++        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                         \
++        num_bits += 8;                                                         \
++    } while (num_bits < 15);
++
++/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */
++/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */
++/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */
++/* The slow path is only executed at the very end of the input buffer. */
++/* v1.16: The original macro handled the case at the very end of the passed-in input buffer, but we also need to handle the case where the user passes in 1+zillion bytes */
++/* following the deflate data and our non-conservative read-ahead path won't kick in here on this code. This is much trickier. */
++#define TINFL_HUFF_DECODE(state_index, sym, pHuff)                                                                                  \
++    do                                                                                                                              \
++    {                                                                                                                               \
++        int temp;                                                                                                                   \
++        mz_uint code_len, c;                                                                                                        \
++        if (num_bits < 15)                                                                                                          \
++        {                                                                                                                           \
++            if ((pIn_buf_end - pIn_buf_cur) < 2)                                                                                    \
++            {                                                                                                                       \
++                TINFL_HUFF_BITBUF_FILL(state_index, pHuff);                                                                         \
++            }                                                                                                                       \
++            else                                                                                                                    \
++            {                                                                                                                       \
++                bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); \
++                pIn_buf_cur += 2;                                                                                                   \
++                num_bits += 16;                                                                                                     \
++            }                                                                                                                       \
++        }                                                                                                                           \
++        if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)                                               \
++            code_len = temp >> 9, temp &= 511;                                                                                      \
++        else                                                                                                                        \
++        {                                                                                                                           \
++            code_len = TINFL_FAST_LOOKUP_BITS;                                                                                      \
++            do                                                                                                                      \
++            {                                                                                                                       \
++                temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)];                                                      \
++            } while (temp < 0);                                                                                                     \
++        }                                                                                                                           \
++        sym = temp;                                                                                                                 \
++        bit_buf >>= code_len;                                                                                                       \
++        num_bits -= code_len;                                                                                                       \
++    }                                                                                                                               \
++    MZ_MACRO_END
++
++tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
++{
++    static const int s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 };
++    static const int s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 };
++    static const int s_dist_base[32] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0 };
++    static const int s_dist_extra[32] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 };
++    static const mz_uint8 s_length_dezigzag[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
++    static const int s_min_table_sizes[3] = { 257, 1, 4 };
++
++    tinfl_status status = TINFL_STATUS_FAILED;
++    mz_uint32 num_bits, dist, counter, num_extra;
++    tinfl_bit_buf_t bit_buf;
++    const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
++    mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
++    size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
++
++    /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */
++    if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start))
++    {
++        *pIn_buf_size = *pOut_buf_size = 0;
++        return TINFL_STATUS_BAD_PARAM;
++    }
++
++    num_bits = r->m_num_bits;
++    bit_buf = r->m_bit_buf;
++    dist = r->m_dist;
++    counter = r->m_counter;
++    num_extra = r->m_num_extra;
++    dist_from_out_buf_start = r->m_dist_from_out_buf_start;
++    TINFL_CR_BEGIN
++
++    bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0;
++    r->m_z_adler32 = r->m_check_adler32 = 1;
++    if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
++    {
++        TINFL_GET_BYTE(1, r->m_zhdr0);
++        TINFL_GET_BYTE(2, r->m_zhdr1);
++        counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
++        if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
++            counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1U << (8U + (r->m_zhdr0 >> 4)))));
++        if (counter)
++        {
++            TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);
++        }
++    }
++
++    do
++    {
++        TINFL_GET_BITS(3, r->m_final, 3);
++        r->m_type = r->m_final >> 1;
++        if (r->m_type == 0)
++        {
++            TINFL_SKIP_BITS(5, num_bits & 7);
++            for (counter = 0; counter < 4; ++counter)
++            {
++                if (num_bits)
++                    TINFL_GET_BITS(6, r->m_raw_header[counter], 8);
++                else
++                    TINFL_GET_BYTE(7, r->m_raw_header[counter]);
++            }
++            if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8))))
++            {
++                TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED);
++            }
++            while ((counter) && (num_bits))
++            {
++                TINFL_GET_BITS(51, dist, 8);
++                while (pOut_buf_cur >= pOut_buf_end)
++                {
++                    TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT);
++                }
++                *pOut_buf_cur++ = (mz_uint8)dist;
++                counter--;
++            }
++            while (counter)
++            {
++                size_t n;
++                while (pOut_buf_cur >= pOut_buf_end)
++                {
++                    TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT);
++                }
++                while (pIn_buf_cur >= pIn_buf_end)
++                {
++                    TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS);
++                }
++                n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter);
++                TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n);
++                pIn_buf_cur += n;
++                pOut_buf_cur += n;
++                counter -= (mz_uint)n;
++            }
++        }
++        else if (r->m_type == 3)
++        {
++            TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
++        }
++        else
++        {
++            if (r->m_type == 1)
++            {
++                mz_uint8 *p = r->m_tables[0].m_code_size;
++                mz_uint i;
++                r->m_table_sizes[0] = 288;
++                r->m_table_sizes[1] = 32;
++                TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
++                for (i = 0; i <= 143; ++i)
++                    *p++ = 8;
++                for (; i <= 255; ++i)
++                    *p++ = 9;
++                for (; i <= 279; ++i)
++                    *p++ = 7;
++                for (; i <= 287; ++i)
++                    *p++ = 8;
++            }
++            else
++            {
++                for (counter = 0; counter < 3; counter++)
++                {
++                    TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]);
++                    r->m_table_sizes[counter] += s_min_table_sizes[counter];
++                }
++                MZ_CLEAR_OBJ(r->m_tables[2].m_code_size);
++                for (counter = 0; counter < r->m_table_sizes[2]; counter++)
++                {
++                    mz_uint s;
++                    TINFL_GET_BITS(14, s, 3);
++                    r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s;
++                }
++                r->m_table_sizes[2] = 19;
++            }
++            for (; (int)r->m_type >= 0; r->m_type--)
++            {
++                int tree_next, tree_cur;
++                tinfl_huff_table *pTable;
++                mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16];
++                pTable = &r->m_tables[r->m_type];
++                MZ_CLEAR_OBJ(total_syms);
++                MZ_CLEAR_OBJ(pTable->m_look_up);
++                MZ_CLEAR_OBJ(pTable->m_tree);
++                for (i = 0; i < r->m_table_sizes[r->m_type]; ++i)
++                    total_syms[pTable->m_code_size[i]]++;
++                used_syms = 0, total = 0;
++                next_code[0] = next_code[1] = 0;
++                for (i = 1; i <= 15; ++i)
++                {
++                    used_syms += total_syms[i];
++                    next_code[i + 1] = (total = ((total + total_syms[i]) << 1));
++                }
++                if ((65536 != total) && (used_syms > 1))
++                {
++                    TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
++                }
++                for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index)
++                {
++                    mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index];
++                    if (!code_size)
++                        continue;
++                    cur_code = next_code[code_size]++;
++                    for (l = code_size; l > 0; l--, cur_code >>= 1)
++                        rev_code = (rev_code << 1) | (cur_code & 1);
++                    if (code_size <= TINFL_FAST_LOOKUP_BITS)
++                    {
++                        mz_int16 k = (mz_int16)((code_size << 9) | sym_index);
++                        while (rev_code < TINFL_FAST_LOOKUP_SIZE)
++                        {
++                            pTable->m_look_up[rev_code] = k;
++                            rev_code += (1 << code_size);
++                        }
++                        continue;
++                    }
++                    if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)]))
++                    {
++                        pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next;
++                        tree_cur = tree_next;
++                        tree_next -= 2;
++                    }
++                    rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
++                    for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--)
++                    {
++                        tree_cur -= ((rev_code >>= 1) & 1);
++                        if (!pTable->m_tree[-tree_cur - 1])
++                        {
++                            pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next;
++                            tree_cur = tree_next;
++                            tree_next -= 2;
++                        }
++                        else
++                            tree_cur = pTable->m_tree[-tree_cur - 1];
++                    }
++                    tree_cur -= ((rev_code >>= 1) & 1);
++                    pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index;
++                }
++                if (r->m_type == 2)
++                {
++                    for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);)
++                    {
++                        mz_uint s;
++                        TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]);
++                        if (dist < 16)
++                        {
++                            r->m_len_codes[counter++] = (mz_uint8)dist;
++                            continue;
++                        }
++                        if ((dist == 16) && (!counter))
++                        {
++                            TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
++                        }
++                        num_extra = "\02\03\07"[dist - 16];
++                        TINFL_GET_BITS(18, s, num_extra);
++                        s += "\03\03\013"[dist - 16];
++                        TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s);
++                        counter += s;
++                    }
++                    if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter)
++                    {
++                        TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
++                    }
++                    TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes, r->m_table_sizes[0]);
++                    TINFL_MEMCPY(r->m_tables[1].m_code_size, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]);
++                }
++            }
++            for (;;)
++            {
++                mz_uint8 *pSrc;
++                for (;;)
++                {
++                    if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2))
++                    {
++                        TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]);
++                        if (counter >= 256)
++                            break;
++                        while (pOut_buf_cur >= pOut_buf_end)
++                        {
++                            TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT);
++                        }
++                        *pOut_buf_cur++ = (mz_uint8)counter;
++                    }
++                    else
++                    {
++                        int sym2;
++                        mz_uint code_len;
++#if TINFL_USE_64BIT_BITBUF
++                        if (num_bits < 30)
++                        {
++                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits);
++                            pIn_buf_cur += 4;
++                            num_bits += 32;
++                        }
++#else
++                        if (num_bits < 15)
++                        {
++                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
++                            pIn_buf_cur += 2;
++                            num_bits += 16;
++                        }
++#endif
++                        if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
++                            code_len = sym2 >> 9;
++                        else
++                        {
++                            code_len = TINFL_FAST_LOOKUP_BITS;
++                            do
++                            {
++                                sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)];
++                            } while (sym2 < 0);
++                        }
++                        counter = sym2;
++                        bit_buf >>= code_len;
++                        num_bits -= code_len;
++                        if (counter & 256)
++                            break;
++
++#if !TINFL_USE_64BIT_BITBUF
++                        if (num_bits < 15)
++                        {
++                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
++                            pIn_buf_cur += 2;
++                            num_bits += 16;
++                        }
++#endif
++                        if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
++                            code_len = sym2 >> 9;
++                        else
++                        {
++                            code_len = TINFL_FAST_LOOKUP_BITS;
++                            do
++                            {
++                                sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)];
++                            } while (sym2 < 0);
++                        }
++                        bit_buf >>= code_len;
++                        num_bits -= code_len;
++
++                        pOut_buf_cur[0] = (mz_uint8)counter;
++                        if (sym2 & 256)
++                        {
++                            pOut_buf_cur++;
++                            counter = sym2;
++                            break;
++                        }
++                        pOut_buf_cur[1] = (mz_uint8)sym2;
++                        pOut_buf_cur += 2;
++                    }
++                }
++                if ((counter &= 511) == 256)
++                    break;
++
++                num_extra = s_length_extra[counter - 257];
++                counter = s_length_base[counter - 257];
++                if (num_extra)
++                {
++                    mz_uint extra_bits;
++                    TINFL_GET_BITS(25, extra_bits, num_extra);
++                    counter += extra_bits;
++                }
++
++                TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]);
++                num_extra = s_dist_extra[dist];
++                dist = s_dist_base[dist];
++                if (num_extra)
++                {
++                    mz_uint extra_bits;
++                    TINFL_GET_BITS(27, extra_bits, num_extra);
++                    dist += extra_bits;
++                }
++
++                dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
++                if ((dist == 0 || dist > dist_from_out_buf_start || dist_from_out_buf_start == 0) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
++                {
++                    TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
++                }
++
++                pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask);
++
++                if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end)
++                {
++                    while (counter--)
++                    {
++                        while (pOut_buf_cur >= pOut_buf_end)
++                        {
++                            TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT);
++                        }
++                        *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask];
++                    }
++                    continue;
++                }
++#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
++                else if ((counter >= 9) && (counter <= dist))
++                {
++                    const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
++                    do
++                    {
++#ifdef MINIZ_UNALIGNED_USE_MEMCPY
++						memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32)*2);
++#else
++                        ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
++                        ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
++#endif
++                        pOut_buf_cur += 8;
++                    } while ((pSrc += 8) < pSrc_end);
++                    if ((counter &= 7) < 3)
++                    {
++                        if (counter)
++                        {
++                            pOut_buf_cur[0] = pSrc[0];
++                            if (counter > 1)
++                                pOut_buf_cur[1] = pSrc[1];
++                            pOut_buf_cur += counter;
++                        }
++                        continue;
++                    }
++                }
++#endif
++                while(counter>2)
++                {
++                    pOut_buf_cur[0] = pSrc[0];
++                    pOut_buf_cur[1] = pSrc[1];
++                    pOut_buf_cur[2] = pSrc[2];
++                    pOut_buf_cur += 3;
++                    pSrc += 3;
++					counter -= 3;
++                }
++                if (counter > 0)
++                {
++                    pOut_buf_cur[0] = pSrc[0];
++                    if (counter > 1)
++                        pOut_buf_cur[1] = pSrc[1];
++                    pOut_buf_cur += counter;
++                }
++            }
++        }
++    } while (!(r->m_final & 1));
++
++    /* Ensure byte alignment and put back any bytes from the bitbuf if we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
++    /* I'm being super conservative here. A number of simplifications can be made to the byte alignment part, and the Adler32 check shouldn't ever need to worry about reading from the bitbuf now. */
++    TINFL_SKIP_BITS(32, num_bits & 7);
++    while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
++    {
++        --pIn_buf_cur;
++        num_bits -= 8;
++    }
++    bit_buf &= (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1);
++    MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end of non-deflate/zlib streams with following data (such as gzip streams). */
++
++    if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
++    {
++        for (counter = 0; counter < 4; ++counter)
++        {
++            mz_uint s;
++            if (num_bits)
++                TINFL_GET_BITS(41, s, 8);
++            else
++                TINFL_GET_BYTE(42, s);
++            r->m_z_adler32 = (r->m_z_adler32 << 8) | s;
++        }
++    }
++    TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
++
++    TINFL_CR_FINISH
++
++common_exit:
++    /* As long as we aren't telling the caller that we NEED more input to make forward progress: */
++    /* Put back any bytes from the bitbuf in case we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
++    /* We need to be very careful here to NOT push back any bytes we definitely know we need to make forward progress, though, or we'll lock the caller up into an inf loop. */
++    if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) && (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS))
++    {
++        while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
++        {
++            --pIn_buf_cur;
++            num_bits -= 8;
++        }
++    }
++    r->m_num_bits = num_bits;
++    r->m_bit_buf = bit_buf & (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1);
++    r->m_dist = dist;
++    r->m_counter = counter;
++    r->m_num_extra = num_extra;
++    r->m_dist_from_out_buf_start = dist_from_out_buf_start;
++    *pIn_buf_size = pIn_buf_cur - pIn_buf_next;
++    *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
++    if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0))
++    {
++        const mz_uint8 *ptr = pOut_buf_next;
++        size_t buf_len = *pOut_buf_size;
++        mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16;
++        size_t block_len = buf_len % 5552;
++        while (buf_len)
++        {
++            for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
++            {
++                s1 += ptr[0], s2 += s1;
++                s1 += ptr[1], s2 += s1;
++                s1 += ptr[2], s2 += s1;
++                s1 += ptr[3], s2 += s1;
++                s1 += ptr[4], s2 += s1;
++                s1 += ptr[5], s2 += s1;
++                s1 += ptr[6], s2 += s1;
++                s1 += ptr[7], s2 += s1;
++            }
++            for (; i < block_len; ++i)
++                s1 += *ptr++, s2 += s1;
++            s1 %= 65521U, s2 %= 65521U;
++            buf_len -= block_len;
++            block_len = 5552;
++        }
++        r->m_check_adler32 = (s2 << 16) + s1;
++        if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32))
++            status = TINFL_STATUS_ADLER32_MISMATCH;
++    }
++    return status;
++}
++
++/* Higher level helper functions. */
++void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
++{
++    tinfl_decompressor decomp;
++    void *pBuf = NULL, *pNew_buf;
++    size_t src_buf_ofs = 0, out_buf_capacity = 0;
++    *pOut_len = 0;
++    tinfl_init(&decomp);
++    for (;;)
++    {
++        size_t src_buf_size = src_buf_len - src_buf_ofs, dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
++        tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size, (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL, &dst_buf_size,
++                                               (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
++        if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT))
++        {
++            MZ_FREE(pBuf);
++            *pOut_len = 0;
++            return NULL;
++        }
++        src_buf_ofs += src_buf_size;
++        *pOut_len += dst_buf_size;
++        if (status == TINFL_STATUS_DONE)
++            break;
++        new_out_buf_capacity = out_buf_capacity * 2;
++        if (new_out_buf_capacity < 128)
++            new_out_buf_capacity = 128;
++        pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity);
++        if (!pNew_buf)
++        {
++            MZ_FREE(pBuf);
++            *pOut_len = 0;
++            return NULL;
++        }
++        pBuf = pNew_buf;
++        out_buf_capacity = new_out_buf_capacity;
++    }
++    return pBuf;
++}
++
++size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
++{
++    tinfl_decompressor decomp;
++    tinfl_status status;
++    tinfl_init(&decomp);
++    status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len, (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
++    return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED : out_buf_len;
++}
++
++int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
++{
++    int result = 0;
++    tinfl_decompressor decomp;
++    mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE);
++    size_t in_buf_ofs = 0, dict_ofs = 0;
++    if (!pDict)
++        return TINFL_STATUS_FAILED;
++    tinfl_init(&decomp);
++    for (;;)
++    {
++        size_t in_buf_size = *pIn_buf_size - in_buf_ofs, dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
++        tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
++                                               (flags & ~(TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
++        in_buf_ofs += in_buf_size;
++        if ((dst_buf_size) && (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
++            break;
++        if (status != TINFL_STATUS_HAS_MORE_OUTPUT)
++        {
++            result = (status == TINFL_STATUS_DONE);
++            break;
++        }
++        dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1);
++    }
++    MZ_FREE(pDict);
++    *pIn_buf_size = in_buf_ofs;
++    return result;
++}
++
++#ifndef MINIZ_NO_MALLOC
++tinfl_decompressor *tinfl_decompressor_alloc()
++{
++    tinfl_decompressor *pDecomp = (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor));
++    if (pDecomp)
++        tinfl_init(pDecomp);
++    return pDecomp;
++}
++
++void tinfl_decompressor_free(tinfl_decompressor *pDecomp)
++{
++    MZ_FREE(pDecomp);
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++ /**************************************************************************
++ *
++ * Copyright 2013-2014 RAD Game Tools and Valve Software
++ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
++ * Copyright 2016 Martin Raiber
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ *
++ **************************************************************************/
++
++
++#ifndef MINIZ_NO_ARCHIVE_APIS
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* ------------------- .ZIP archive reading */
++
++#ifdef MINIZ_NO_STDIO
++#define MZ_FILE void *
++#else
++#include 
++
++#if defined(_MSC_VER) || defined(__MINGW64__)
++static FILE *mz_fopen(const char *pFilename, const char *pMode)
++{
++    FILE *pFile = NULL;
++    fopen_s(&pFile, pFilename, pMode);
++    return pFile;
++}
++static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
++{
++    FILE *pFile = NULL;
++    if (freopen_s(&pFile, pPath, pMode, pStream))
++        return NULL;
++    return pFile;
++}
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN mz_fopen
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#define MZ_FTELL64 _ftelli64
++#define MZ_FSEEK64 _fseeki64
++#define MZ_FILE_STAT_STRUCT _stat64
++#define MZ_FILE_STAT _stat64
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN mz_freopen
++#define MZ_DELETE_FILE remove
++#elif defined(__MINGW32__)
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN(f, m) fopen(f, m)
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#define MZ_FTELL64 ftello64
++#define MZ_FSEEK64 fseeko64
++#define MZ_FILE_STAT_STRUCT _stat
++#define MZ_FILE_STAT _stat
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
++#define MZ_DELETE_FILE remove
++#elif defined(__TINYC__)
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN(f, m) fopen(f, m)
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#define MZ_FTELL64 ftell
++#define MZ_FSEEK64 fseek
++#define MZ_FILE_STAT_STRUCT stat
++#define MZ_FILE_STAT stat
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
++#define MZ_DELETE_FILE remove
++#elif defined(__USE_LARGEFILE64) /* gcc, clang */
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN(f, m) fopen64(f, m)
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#define MZ_FTELL64 ftello64
++#define MZ_FSEEK64 fseeko64
++#define MZ_FILE_STAT_STRUCT stat64
++#define MZ_FILE_STAT stat64
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN(p, m, s) freopen64(p, m, s)
++#define MZ_DELETE_FILE remove
++#elif defined(__APPLE__)
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN(f, m) fopen(f, m)
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#define MZ_FTELL64 ftello
++#define MZ_FSEEK64 fseeko
++#define MZ_FILE_STAT_STRUCT stat
++#define MZ_FILE_STAT stat
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN(p, m, s) freopen(p, m, s)
++#define MZ_DELETE_FILE remove
++
++#else
++#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.")
++#ifndef MINIZ_NO_TIME
++#include 
++#endif
++#define MZ_FOPEN(f, m) fopen(f, m)
++#define MZ_FCLOSE fclose
++#define MZ_FREAD fread
++#define MZ_FWRITE fwrite
++#ifdef __STRICT_ANSI__
++#define MZ_FTELL64 ftell
++#define MZ_FSEEK64 fseek
++#else
++#define MZ_FTELL64 ftello
++#define MZ_FSEEK64 fseeko
++#endif
++#define MZ_FILE_STAT_STRUCT stat
++#define MZ_FILE_STAT stat
++#define MZ_FFLUSH fflush
++#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
++#define MZ_DELETE_FILE remove
++#endif /* #ifdef _MSC_VER */
++#endif /* #ifdef MINIZ_NO_STDIO */
++
++#define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c))
++
++/* Various ZIP archive enums. To completely avoid cross platform compiler alignment and platform endian issues, miniz.c doesn't use structs for any of this stuff. */
++enum
++{
++    /* ZIP archive identifiers and record sizes */
++    MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50,
++    MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50,
++    MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50,
++    MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30,
++    MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46,
++    MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22,
++
++    /* ZIP64 archive identifier and record sizes */
++    MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50,
++    MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50,
++    MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56,
++    MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20,
++    MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001,
++    MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50,
++    MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24,
++    MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16,
++
++    /* Central directory header record offsets */
++    MZ_ZIP_CDH_SIG_OFS = 0,
++    MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4,
++    MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6,
++    MZ_ZIP_CDH_BIT_FLAG_OFS = 8,
++    MZ_ZIP_CDH_METHOD_OFS = 10,
++    MZ_ZIP_CDH_FILE_TIME_OFS = 12,
++    MZ_ZIP_CDH_FILE_DATE_OFS = 14,
++    MZ_ZIP_CDH_CRC32_OFS = 16,
++    MZ_ZIP_CDH_COMPRESSED_SIZE_OFS = 20,
++    MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS = 24,
++    MZ_ZIP_CDH_FILENAME_LEN_OFS = 28,
++    MZ_ZIP_CDH_EXTRA_LEN_OFS = 30,
++    MZ_ZIP_CDH_COMMENT_LEN_OFS = 32,
++    MZ_ZIP_CDH_DISK_START_OFS = 34,
++    MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36,
++    MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38,
++    MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42,
++
++    /* Local directory header offsets */
++    MZ_ZIP_LDH_SIG_OFS = 0,
++    MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4,
++    MZ_ZIP_LDH_BIT_FLAG_OFS = 6,
++    MZ_ZIP_LDH_METHOD_OFS = 8,
++    MZ_ZIP_LDH_FILE_TIME_OFS = 10,
++    MZ_ZIP_LDH_FILE_DATE_OFS = 12,
++    MZ_ZIP_LDH_CRC32_OFS = 14,
++    MZ_ZIP_LDH_COMPRESSED_SIZE_OFS = 18,
++    MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22,
++    MZ_ZIP_LDH_FILENAME_LEN_OFS = 26,
++    MZ_ZIP_LDH_EXTRA_LEN_OFS = 28,
++    MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3,
++
++    /* End of central directory offsets */
++    MZ_ZIP_ECDH_SIG_OFS = 0,
++    MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4,
++    MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6,
++    MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 8,
++    MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS = 10,
++    MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12,
++    MZ_ZIP_ECDH_CDIR_OFS_OFS = 16,
++    MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20,
++
++    /* ZIP64 End of central directory locator offsets */
++    MZ_ZIP64_ECDL_SIG_OFS = 0,                    /* 4 bytes */
++    MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4,          /* 4 bytes */
++    MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8,  /* 8 bytes */
++    MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */
++
++    /* ZIP64 End of central directory header offsets */
++    MZ_ZIP64_ECDH_SIG_OFS = 0,                       /* 4 bytes */
++    MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4,            /* 8 bytes */
++    MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12,          /* 2 bytes */
++    MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14,           /* 2 bytes */
++    MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16,            /* 4 bytes */
++    MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20,            /* 4 bytes */
++    MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */
++    MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32,       /* 8 bytes */
++    MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40,                /* 8 bytes */
++    MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48,                 /* 8 bytes */
++    MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0,
++    MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10,
++    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1,
++    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32,
++    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64,
++    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192,
++    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11
++};
++
++typedef struct
++{
++    void *m_p;
++    size_t m_size, m_capacity;
++    mz_uint m_element_size;
++} mz_zip_array;
++
++struct mz_zip_internal_state_tag
++{
++    mz_zip_array m_central_dir;
++    mz_zip_array m_central_dir_offsets;
++    mz_zip_array m_sorted_central_dir_offsets;
++
++    /* The flags passed in when the archive is initially opened. */
++    uint32_t m_init_flags;
++
++    /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. */
++    mz_bool m_zip64;
++
++    /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 will also be slammed to true too, even if we didn't find a zip64 end of central dir header, etc.) */
++    mz_bool m_zip64_has_extended_info_fields;
++
++    /* These fields are used by the file, FILE, memory, and memory/heap read/write helpers. */
++    MZ_FILE *m_pFile;
++    mz_uint64 m_file_archive_start_ofs;
++
++    void *m_pMem;
++    size_t m_mem_size;
++    size_t m_mem_capacity;
++};
++
++#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) (array_ptr)->m_element_size = element_size
++
++#if defined(DEBUG) || defined(_DEBUG)
++static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index)
++{
++    MZ_ASSERT(index < pArray->m_size);
++    return index;
++}
++#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[mz_zip_array_range_check(array_ptr, index)]
++#else
++#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[index]
++#endif
++
++static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray, mz_uint32 element_size)
++{
++    memset(pArray, 0, sizeof(mz_zip_array));
++    pArray->m_element_size = element_size;
++}
++
++static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, mz_zip_array *pArray)
++{
++    pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p);
++    memset(pArray, 0, sizeof(mz_zip_array));
++}
++
++static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *pArray, size_t min_new_capacity, mz_uint growing)
++{
++    void *pNew_p;
++    size_t new_capacity = min_new_capacity;
++    MZ_ASSERT(pArray->m_element_size);
++    if (pArray->m_capacity >= min_new_capacity)
++        return MZ_TRUE;
++    if (growing)
++    {
++        new_capacity = MZ_MAX(1, pArray->m_capacity);
++        while (new_capacity < min_new_capacity)
++            new_capacity *= 2;
++    }
++    if (NULL == (pNew_p = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pArray->m_p, pArray->m_element_size, new_capacity)))
++        return MZ_FALSE;
++    pArray->m_p = pNew_p;
++    pArray->m_capacity = new_capacity;
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_capacity, mz_uint growing)
++{
++    if (new_capacity > pArray->m_capacity)
++    {
++        if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing))
++            return MZ_FALSE;
++    }
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_size, mz_uint growing)
++{
++    if (new_size > pArray->m_capacity)
++    {
++        if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing))
++            return MZ_FALSE;
++    }
++    pArray->m_size = new_size;
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, mz_zip_array *pArray, size_t n)
++{
++    return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE);
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, mz_zip_array *pArray, const void *pElements, size_t n)
++{
++    size_t orig_size = pArray->m_size;
++    if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE))
++        return MZ_FALSE;
++    if (n > 0)
++        memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size);
++    return MZ_TRUE;
++}
++
++#ifndef MINIZ_NO_TIME
++static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date)
++{
++    struct tm tm;
++    memset(&tm, 0, sizeof(tm));
++    tm.tm_isdst = -1;
++    tm.tm_year = ((dos_date >> 9) & 127) + 1980 - 1900;
++    tm.tm_mon = ((dos_date >> 5) & 15) - 1;
++    tm.tm_mday = dos_date & 31;
++    tm.tm_hour = (dos_time >> 11) & 31;
++    tm.tm_min = (dos_time >> 5) & 63;
++    tm.tm_sec = (dos_time << 1) & 62;
++    return mktime(&tm);
++}
++
++#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
++static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date)
++{
++#ifdef _MSC_VER
++    struct tm tm_struct;
++    struct tm *tm = &tm_struct;
++    errno_t err = localtime_s(tm, &time);
++    if (err)
++    {
++        *pDOS_date = 0;
++        *pDOS_time = 0;
++        return;
++    }
++#else
++    struct tm *tm = localtime(&time);
++#endif /* #ifdef _MSC_VER */
++
++    *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1));
++    *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday);
++}
++#endif /* MINIZ_NO_ARCHIVE_WRITING_APIS */
++
++#ifndef MINIZ_NO_STDIO
++#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
++static mz_bool mz_zip_get_file_modified_time(const char *pFilename, MZ_TIME_T *pTime)
++{
++    struct MZ_FILE_STAT_STRUCT file_stat;
++
++    /* On Linux with x86 glibc, this call will fail on large files (I think >= 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh. */
++    if (MZ_FILE_STAT(pFilename, &file_stat) != 0)
++        return MZ_FALSE;
++
++    *pTime = file_stat.st_mtime;
++
++    return MZ_TRUE;
++}
++#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/
++
++static mz_bool mz_zip_set_file_times(const char *pFilename, MZ_TIME_T access_time, MZ_TIME_T modified_time)
++{
++    struct utimbuf t;
++
++    memset(&t, 0, sizeof(t));
++    t.actime = access_time;
++    t.modtime = modified_time;
++
++    return !utime(pFilename, &t);
++}
++#endif /* #ifndef MINIZ_NO_STDIO */
++#endif /* #ifndef MINIZ_NO_TIME */
++
++static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, mz_zip_error err_num)
++{
++    if (pZip)
++        pZip->m_last_error = err_num;
++    return MZ_FALSE;
++}
++
++static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint flags)
++{
++    (void)flags;
++    if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!pZip->m_pAlloc)
++        pZip->m_pAlloc = miniz_def_alloc_func;
++    if (!pZip->m_pFree)
++        pZip->m_pFree = miniz_def_free_func;
++    if (!pZip->m_pRealloc)
++        pZip->m_pRealloc = miniz_def_realloc_func;
++
++    pZip->m_archive_size = 0;
++    pZip->m_central_directory_file_ofs = 0;
++    pZip->m_total_files = 0;
++    pZip->m_last_error = MZ_ZIP_NO_ERROR;
++
++    if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++    memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
++    pZip->m_pState->m_init_flags = flags;
++    pZip->m_pState->m_zip64 = MZ_FALSE;
++    pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE;
++
++    pZip->m_zip_mode = MZ_ZIP_MODE_READING;
++
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, mz_uint r_index)
++{
++    const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
++    const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index));
++    mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    mz_uint8 l = 0, r = 0;
++    pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
++    pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
++    pE = pL + MZ_MIN(l_len, r_len);
++    while (pL < pE)
++    {
++        if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
++            break;
++        pL++;
++        pR++;
++    }
++    return (pL == pE) ? (l_len < r_len) : (l < r);
++}
++
++#define MZ_SWAP_UINT32(a, b) \
++    do                       \
++    {                        \
++        mz_uint32 t = a;     \
++        a = b;               \
++        b = t;               \
++    }                        \
++    MZ_MACRO_END
++
++/* Heap sort of lowercased filenames, used to help accelerate plain central directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.) */
++static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip)
++{
++    mz_zip_internal_state *pState = pZip->m_pState;
++    const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
++    const mz_zip_array *pCentral_dir = &pState->m_central_dir;
++    mz_uint32 *pIndices;
++    mz_uint32 start, end;
++    const mz_uint32 size = pZip->m_total_files;
++
++    if (size <= 1U)
++        return;
++
++    pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
++
++    start = (size - 2U) >> 1U;
++    for (;;)
++    {
++        mz_uint64 child, root = start;
++        for (;;)
++        {
++            if ((child = (root << 1U) + 1U) >= size)
++                break;
++            child += (((child + 1U) < size) && (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U])));
++            if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
++                break;
++            MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
++            root = child;
++        }
++        if (!start)
++            break;
++        start--;
++    }
++
++    end = size - 1;
++    while (end > 0)
++    {
++        mz_uint64 child, root = 0;
++        MZ_SWAP_UINT32(pIndices[end], pIndices[0]);
++        for (;;)
++        {
++            if ((child = (root << 1U) + 1U) >= end)
++                break;
++            child += (((child + 1U) < end) && mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U]));
++            if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
++                break;
++            MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
++            root = child;
++        }
++        end--;
++    }
++}
++
++static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, mz_uint32 record_sig, mz_uint32 record_size, mz_int64 *pOfs)
++{
++    mz_int64 cur_file_ofs;
++    mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
++    mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
++
++    /* Basic sanity checks - reject files which are too small */
++    if (pZip->m_archive_size < record_size)
++        return MZ_FALSE;
++
++    /* Find the record by scanning the file from the end towards the beginning. */
++    cur_file_ofs = MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0);
++    for (;;)
++    {
++        int i, n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs);
++
++        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n)
++            return MZ_FALSE;
++
++        for (i = n - 4; i >= 0; --i)
++        {
++            mz_uint s = MZ_READ_LE32(pBuf + i);
++            if (s == record_sig)
++            {
++                if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size)
++                    break;
++            }
++        }
++
++        if (i >= 0)
++        {
++            cur_file_ofs += i;
++            break;
++        }
++
++        /* Give up if we've searched the entire file, or we've gone back "too far" (~64kb) */
++        if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= (MZ_UINT16_MAX + record_size)))
++            return MZ_FALSE;
++
++        cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0);
++    }
++
++    *pOfs = cur_file_ofs;
++    return MZ_TRUE;
++}
++
++static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint flags)
++{
++    mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, cdir_disk_index = 0;
++    mz_uint64 cdir_ofs = 0;
++    mz_int64 cur_file_ofs = 0;
++    const mz_uint8 *p;
++
++    mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
++    mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
++    mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0);
++    mz_uint32 zip64_end_of_central_dir_locator_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32;
++
++    mz_uint32 zip64_end_of_central_dir_header_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pZip64_end_of_central_dir = (mz_uint8 *)zip64_end_of_central_dir_header_u32;
++
++    mz_uint64 zip64_end_of_central_dir_ofs = 0;
++
++    /* Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there. */
++    if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++
++    if (!mz_zip_reader_locate_header_sig(pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs))
++        return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR);
++
++    /* Read and verify the end of central directory record. */
++    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++    if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++
++    if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
++    {
++        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, pZip64_locator, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
++        {
++            if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG)
++            {
++                zip64_end_of_central_dir_ofs = MZ_READ_LE64(pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS);
++                if (zip64_end_of_central_dir_ofs > (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
++                    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++
++                if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, pZip64_end_of_central_dir, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
++                {
++                    if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG)
++                    {
++                        pZip->m_pState->m_zip64 = MZ_TRUE;
++                    }
++                }
++            }
++        }
++    }
++
++    pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS);
++    cdir_entries_on_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
++    num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS);
++    cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS);
++    cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS);
++    cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS);
++
++    if (pZip->m_pState->m_zip64)
++    {
++        mz_uint32 zip64_total_num_of_disks = MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS);
++        mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS);
++        mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
++        mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS);
++        mz_uint64 zip64_size_of_central_directory = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS);
++
++        if (zip64_size_of_end_of_central_dir_record < (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12))
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++        if (zip64_total_num_of_disks != 1U)
++            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
++
++        /* Check for miniz's practical limits */
++        if (zip64_cdir_total_entries > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++
++        pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries;
++
++        if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++
++        cdir_entries_on_this_disk = (mz_uint32)zip64_cdir_total_entries_on_this_disk;
++
++        /* Check for miniz's current practical limits (sorry, this should be enough for millions of files) */
++        if (zip64_size_of_central_directory > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++
++        cdir_size = (mz_uint32)zip64_size_of_central_directory;
++
++        num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS);
++
++        cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS);
++
++        cdir_ofs = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS);
++    }
++
++    if (pZip->m_total_files != cdir_entries_on_this_disk)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
++
++    if (((num_this_disk | cdir_disk_index) != 0) && ((num_this_disk != 1) || (cdir_disk_index != 1)))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
++
++    if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    pZip->m_central_directory_file_ofs = cdir_ofs;
++
++    if (pZip->m_total_files)
++    {
++        mz_uint i, n;
++        /* Read the entire central directory into a heap block, and allocate another heap block to hold the unsorted central dir file record offsets, and possibly another to hold the sorted indices. */
++        if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) ||
++            (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE)))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++        if (sort_central_dir)
++        {
++            if (!mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE))
++                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, pZip->m_pState->m_central_dir.m_p, cdir_size) != cdir_size)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++        /* Now create an index into the central directory file records, do some basic sanity checking on each record */
++        p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p;
++        for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i)
++        {
++            mz_uint total_header_size, disk_index, bit_flags, filename_size, ext_data_size;
++            mz_uint64 comp_size, decomp_size, local_header_ofs;
++
++            if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG))
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++            MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, i) = (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p);
++
++            if (sort_central_dir)
++                MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, mz_uint32, i) = i;
++
++            comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
++            decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
++            local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
++            filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++            ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
++
++            if ((!pZip->m_pState->m_zip64_has_extended_info_fields) &&
++                (ext_data_size) &&
++                (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == MZ_UINT32_MAX))
++            {
++                /* Attempt to find zip64 extended information field in the entry's extra data */
++                mz_uint32 extra_size_remaining = ext_data_size;
++
++                if (extra_size_remaining)
++                {
++					const mz_uint8 *pExtra_data;
++					void* buf = NULL;
++
++					if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > n)
++					{
++						buf = MZ_MALLOC(ext_data_size);
++						if(buf==NULL)
++							return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++						if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size, buf, ext_data_size) != ext_data_size)
++						{
++							MZ_FREE(buf);
++							return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++						}
++
++						pExtra_data = (mz_uint8*)buf;
++					}
++					else
++					{
++						pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size;
++					}
++
++                    do
++                    {
++                        mz_uint32 field_id;
++                        mz_uint32 field_data_size;
++
++						if (extra_size_remaining < (sizeof(mz_uint16) * 2))
++						{
++							MZ_FREE(buf);
++							return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++						}
++
++                        field_id = MZ_READ_LE16(pExtra_data);
++                        field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
++
++						if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
++						{
++							MZ_FREE(buf);
++							return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++						}
++
++                        if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
++                        {
++                            /* Ok, the archive didn't have any zip64 headers but it uses a zip64 extended information field so mark it as zip64 anyway (this can occur with infozip's zip util when it reads compresses files from stdin). */
++                            pZip->m_pState->m_zip64 = MZ_TRUE;
++                            pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE;
++                            break;
++                        }
++
++                        pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
++                        extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
++                    } while (extra_size_remaining);
++
++					MZ_FREE(buf);
++                }
++            }
++
++            /* I've seen archives that aren't marked as zip64 that uses zip64 ext data, argh */
++            if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX))
++            {
++                if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && (decomp_size != comp_size)) || (decomp_size && !comp_size))
++                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++            }
++
++            disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS);
++            if ((disk_index == MZ_UINT16_MAX) || ((disk_index != num_this_disk) && (disk_index != 1)))
++                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
++
++            if (comp_size != MZ_UINT32_MAX)
++            {
++                if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size)
++                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++            }
++
++            bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
++            if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED)
++                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++
++            if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > n)
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++            n -= total_header_size;
++            p += total_header_size;
++        }
++    }
++
++    if (sort_central_dir)
++        mz_zip_reader_sort_central_dir_offsets_by_filename(pZip);
++
++    return MZ_TRUE;
++}
++
++void mz_zip_zero_struct(mz_zip_archive *pZip)
++{
++    if (pZip)
++        MZ_CLEAR_OBJ(*pZip);
++}
++
++static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
++{
++    mz_bool status = MZ_TRUE;
++
++    if (!pZip)
++        return MZ_FALSE;
++
++    if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
++    {
++        if (set_last_error)
++            pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER;
++
++        return MZ_FALSE;
++    }
++
++    if (pZip->m_pState)
++    {
++        mz_zip_internal_state *pState = pZip->m_pState;
++        pZip->m_pState = NULL;
++
++        mz_zip_array_clear(pZip, &pState->m_central_dir);
++        mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
++        mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
++
++#ifndef MINIZ_NO_STDIO
++        if (pState->m_pFile)
++        {
++            if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
++            {
++                if (MZ_FCLOSE(pState->m_pFile) == EOF)
++                {
++                    if (set_last_error)
++                        pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED;
++                    status = MZ_FALSE;
++                }
++            }
++            pState->m_pFile = NULL;
++        }
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++    }
++    pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
++
++    return status;
++}
++
++mz_bool mz_zip_reader_end(mz_zip_archive *pZip)
++{
++    return mz_zip_reader_end_internal(pZip, MZ_TRUE);
++}
++mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags)
++{
++    if ((!pZip) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_reader_init_internal(pZip, flags))
++        return MZ_FALSE;
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_USER;
++    pZip->m_archive_size = size;
++
++    if (!mz_zip_reader_read_central_dir(pZip, flags))
++    {
++        mz_zip_reader_end_internal(pZip, MZ_FALSE);
++        return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
++{
++    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
++    size_t s = (file_ofs >= pZip->m_archive_size) ? 0 : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n);
++    memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s);
++    return s;
++}
++
++mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags)
++{
++    if (!pMem)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++
++    if (!mz_zip_reader_init_internal(pZip, flags))
++        return MZ_FALSE;
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY;
++    pZip->m_archive_size = size;
++    pZip->m_pRead = mz_zip_mem_read_func;
++    pZip->m_pIO_opaque = pZip;
++    pZip->m_pNeeds_keepalive = NULL;
++
++#ifdef __cplusplus
++    pZip->m_pState->m_pMem = const_cast(pMem);
++#else
++    pZip->m_pState->m_pMem = (void *)pMem;
++#endif
++
++    pZip->m_pState->m_mem_size = size;
++
++    if (!mz_zip_reader_read_central_dir(pZip, flags))
++    {
++        mz_zip_reader_end_internal(pZip, MZ_FALSE);
++        return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++#ifndef MINIZ_NO_STDIO
++static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
++{
++    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
++    mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
++
++    file_ofs += pZip->m_pState->m_file_archive_start_ofs;
++
++    if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
++        return 0;
++
++    return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile);
++}
++
++mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags)
++{
++    return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0);
++}
++
++mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size)
++{
++    mz_uint64 file_size;
++    MZ_FILE *pFile;
++
++    if ((!pZip) || (!pFilename) || ((archive_size) && (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pFile = MZ_FOPEN(pFilename, "rb");
++    if (!pFile)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++
++    file_size = archive_size;
++    if (!file_size)
++    {
++        if (MZ_FSEEK64(pFile, 0, SEEK_END))
++        {
++            MZ_FCLOSE(pFile);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
++        }
++
++        file_size = MZ_FTELL64(pFile);
++    }
++
++    /* TODO: Better sanity check archive_size and the # of actual remaining bytes */
++
++    if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++    {
++	MZ_FCLOSE(pFile);
++        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++    }
++
++    if (!mz_zip_reader_init_internal(pZip, flags))
++    {
++        MZ_FCLOSE(pFile);
++        return MZ_FALSE;
++    }
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
++    pZip->m_pRead = mz_zip_file_read_func;
++    pZip->m_pIO_opaque = pZip;
++    pZip->m_pState->m_pFile = pFile;
++    pZip->m_archive_size = file_size;
++    pZip->m_pState->m_file_archive_start_ofs = file_start_ofs;
++
++    if (!mz_zip_reader_read_central_dir(pZip, flags))
++    {
++        mz_zip_reader_end_internal(pZip, MZ_FALSE);
++        return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags)
++{
++    mz_uint64 cur_file_ofs;
++
++    if ((!pZip) || (!pFile))
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++
++    cur_file_ofs = MZ_FTELL64(pFile);
++
++    if (!archive_size)
++    {
++        if (MZ_FSEEK64(pFile, 0, SEEK_END))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
++
++        archive_size = MZ_FTELL64(pFile) - cur_file_ofs;
++
++        if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
++    }
++
++    if (!mz_zip_reader_init_internal(pZip, flags))
++        return MZ_FALSE;
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
++    pZip->m_pRead = mz_zip_file_read_func;
++
++    pZip->m_pIO_opaque = pZip;
++    pZip->m_pState->m_pFile = pFile;
++    pZip->m_archive_size = archive_size;
++    pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs;
++
++    if (!mz_zip_reader_read_central_dir(pZip, flags))
++    {
++        mz_zip_reader_end_internal(pZip, MZ_FALSE);
++        return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip, mz_uint file_index)
++{
++    if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files))
++        return NULL;
++    return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
++}
++
++mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index)
++{
++    mz_uint m_bit_flag;
++    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
++    if (!p)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return MZ_FALSE;
++    }
++
++    m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
++    return (m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0;
++}
++
++mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index)
++{
++    mz_uint bit_flag;
++    mz_uint method;
++
++    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
++    if (!p)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return MZ_FALSE;
++    }
++
++    method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
++    bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
++
++    if ((method != 0) && (method != MZ_DEFLATED))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
++        return MZ_FALSE;
++    }
++
++    if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++        return MZ_FALSE;
++    }
++
++    if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
++        return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index)
++{
++    mz_uint filename_len, attribute_mapping_id, external_attr;
++    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
++    if (!p)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return MZ_FALSE;
++    }
++
++    filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    if (filename_len)
++    {
++        if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/')
++            return MZ_TRUE;
++    }
++
++    /* Bugfix: This code was also checking if the internal attribute was non-zero, which wasn't correct. */
++    /* Most/all zip writers (hopefully) set DOS file/directory attributes in the low 16-bits, so check for the DOS directory flag and ignore the source OS ID in the created by field. */
++    /* FIXME: Remove this check? Is it necessary - we already check the filename. */
++    attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8;
++    (void)attribute_mapping_id;
++
++    external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
++    if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0)
++    {
++        return MZ_TRUE;
++    }
++
++    return MZ_FALSE;
++}
++
++static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, mz_uint file_index, const mz_uint8 *pCentral_dir_header, mz_zip_archive_file_stat *pStat, mz_bool *pFound_zip64_extra_data)
++{
++    mz_uint n;
++    const mz_uint8 *p = pCentral_dir_header;
++
++    if (pFound_zip64_extra_data)
++        *pFound_zip64_extra_data = MZ_FALSE;
++
++    if ((!p) || (!pStat))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    /* Extract fields from the central directory record. */
++    pStat->m_file_index = file_index;
++    pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index);
++    pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS);
++    pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS);
++    pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
++    pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
++#ifndef MINIZ_NO_TIME
++    pStat->m_time = mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS));
++#endif
++    pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS);
++    pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
++    pStat->m_uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
++    pStat->m_internal_attr = MZ_READ_LE16(p + MZ_ZIP_CDH_INTERNAL_ATTR_OFS);
++    pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
++    pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
++
++    /* Copy as much of the filename and comment as possible. */
++    n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1);
++    memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
++    pStat->m_filename[n] = '\0';
++
++    n = MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS);
++    n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE - 1);
++    pStat->m_comment_size = n;
++    memcpy(pStat->m_comment, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS), n);
++    pStat->m_comment[n] = '\0';
++
++    /* Set some flags for convienance */
++    pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index);
++    pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index);
++    pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index);
++
++    /* See if we need to read any zip64 extended information fields. */
++    /* Confusingly, these zip64 fields can be present even on non-zip64 archives (Debian zip on a huge files from stdin piped to stdout creates them). */
++    if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size), pStat->m_local_header_ofs) == MZ_UINT32_MAX)
++    {
++        /* Attempt to find zip64 extended information field in the entry's extra data */
++        mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
++
++        if (extra_size_remaining)
++        {
++            const mz_uint8 *pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++
++            do
++            {
++                mz_uint32 field_id;
++                mz_uint32 field_data_size;
++
++                if (extra_size_remaining < (sizeof(mz_uint16) * 2))
++                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++                field_id = MZ_READ_LE16(pExtra_data);
++                field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
++
++                if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
++                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++                if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
++                {
++                    const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2;
++                    mz_uint32 field_data_remaining = field_data_size;
++
++                    if (pFound_zip64_extra_data)
++                        *pFound_zip64_extra_data = MZ_TRUE;
++
++                    if (pStat->m_uncomp_size == MZ_UINT32_MAX)
++                    {
++                        if (field_data_remaining < sizeof(mz_uint64))
++                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++                        pStat->m_uncomp_size = MZ_READ_LE64(pField_data);
++                        pField_data += sizeof(mz_uint64);
++                        field_data_remaining -= sizeof(mz_uint64);
++                    }
++
++                    if (pStat->m_comp_size == MZ_UINT32_MAX)
++                    {
++                        if (field_data_remaining < sizeof(mz_uint64))
++                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++                        pStat->m_comp_size = MZ_READ_LE64(pField_data);
++                        pField_data += sizeof(mz_uint64);
++                        field_data_remaining -= sizeof(mz_uint64);
++                    }
++
++                    if (pStat->m_local_header_ofs == MZ_UINT32_MAX)
++                    {
++                        if (field_data_remaining < sizeof(mz_uint64))
++                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++                        pStat->m_local_header_ofs = MZ_READ_LE64(pField_data);
++                        pField_data += sizeof(mz_uint64);
++                        field_data_remaining -= sizeof(mz_uint64);
++                    }
++
++                    break;
++                }
++
++                pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
++                extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
++            } while (extra_size_remaining);
++        }
++    }
++
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA, const char *pB, mz_uint len, mz_uint flags)
++{
++    mz_uint i;
++    if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE)
++        return 0 == memcmp(pA, pB, len);
++    for (i = 0; i < len; ++i)
++        if (MZ_TOLOWER(pA[i]) != MZ_TOLOWER(pB[i]))
++            return MZ_FALSE;
++    return MZ_TRUE;
++}
++
++static MZ_FORCEINLINE int mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, const char *pR, mz_uint r_len)
++{
++    const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
++    mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    mz_uint8 l = 0, r = 0;
++    pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
++    pE = pL + MZ_MIN(l_len, r_len);
++    while (pL < pE)
++    {
++        if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
++            break;
++        pL++;
++        pR++;
++    }
++    return (pL == pE) ? (int)(l_len - r_len) : (l - r);
++}
++
++static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip, const char *pFilename, mz_uint32 *pIndex)
++{
++    mz_zip_internal_state *pState = pZip->m_pState;
++    const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
++    const mz_zip_array *pCentral_dir = &pState->m_central_dir;
++    mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
++    const uint32_t size = pZip->m_total_files;
++    const mz_uint filename_len = (mz_uint)strlen(pFilename);
++
++    if (pIndex)
++        *pIndex = 0;
++
++    if (size)
++    {
++        /* yes I could use uint32_t's, but then we would have to add some special case checks in the loop, argh, and */
++        /* honestly the major expense here on 32-bit CPU's will still be the filename compare */
++        mz_int64 l = 0, h = (mz_int64)size - 1;
++
++        while (l <= h)
++        {
++            mz_int64 m = l + ((h - l) >> 1);
++            uint32_t file_index = pIndices[(uint32_t)m];
++
++            int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len);
++            if (!comp)
++            {
++                if (pIndex)
++                    *pIndex = file_index;
++                return MZ_TRUE;
++            }
++            else if (comp < 0)
++                l = m + 1;
++            else
++                h = m - 1;
++        }
++    }
++
++    return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
++}
++
++int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags)
++{
++    mz_uint32 index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index))
++        return -1;
++    else
++        return (int)index;
++}
++
++mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *pIndex)
++{
++    mz_uint file_index;
++    size_t name_len, comment_len;
++
++    if (pIndex)
++        *pIndex = 0;
++
++    if ((!pZip) || (!pZip->m_pState) || (!pName))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    /* See if we can use a binary search */
++    if (((pZip->m_pState->m_init_flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) &&
++        (pZip->m_zip_mode == MZ_ZIP_MODE_READING) &&
++        ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size))
++    {
++        return mz_zip_locate_file_binary_search(pZip, pName, pIndex);
++    }
++
++    /* Locate the entry by scanning the entire central directory */
++    name_len = strlen(pName);
++    if (name_len > MZ_UINT16_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    comment_len = pComment ? strlen(pComment) : 0;
++    if (comment_len > MZ_UINT16_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    for (file_index = 0; file_index < pZip->m_total_files; file_index++)
++    {
++        const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
++        mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++        const char *pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
++        if (filename_len < name_len)
++            continue;
++        if (comment_len)
++        {
++            mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
++            const char *pFile_comment = pFilename + filename_len + file_extra_len;
++            if ((file_comment_len != comment_len) || (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len, flags)))
++                continue;
++        }
++        if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len))
++        {
++            int ofs = filename_len - 1;
++            do
++            {
++                if ((pFilename[ofs] == '/') || (pFilename[ofs] == '\\') || (pFilename[ofs] == ':'))
++                    break;
++            } while (--ofs >= 0);
++            ofs++;
++            pFilename += ofs;
++            filename_len -= ofs;
++        }
++        if ((filename_len == name_len) && (mz_zip_string_equal(pName, pFilename, filename_len, flags)))
++        {
++            if (pIndex)
++                *pIndex = file_index;
++            return MZ_TRUE;
++        }
++    }
++
++    return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
++}
++
++mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
++{
++    int status = TINFL_STATUS_DONE;
++    mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
++    mz_zip_archive_file_stat file_stat;
++    void *pRead_buf;
++    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
++    tinfl_decompressor inflator;
++
++    if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) || ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
++        return MZ_FALSE;
++
++    /* A directory or zero length file */
++    if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
++        return MZ_TRUE;
++
++    /* Encryption and patch files are not supported. */
++    if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++
++    /* This function only supports decompressing stored and deflate. */
++    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
++
++    /* Ensure supplied output buffer is large enough. */
++    needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size;
++    if (buf_size < needed_size)
++        return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL);
++
++    /* Read and parse the local directory entry. */
++    cur_file_ofs = file_stat.m_local_header_ofs;
++    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
++    if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
++    {
++        /* The file is stored or the caller has requested the compressed data. */
++        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, (size_t)needed_size) != needed_size)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++        if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0)
++        {
++            if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
++                return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
++        }
++#endif
++
++        return MZ_TRUE;
++    }
++
++    /* Decompress the file either directly from memory or from a file input buffer. */
++    tinfl_init(&inflator);
++
++    if (pZip->m_pState->m_pMem)
++    {
++        /* Read directly from the archive in memory. */
++        pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
++        read_buf_size = read_buf_avail = file_stat.m_comp_size;
++        comp_remaining = 0;
++    }
++    else if (pUser_read_buf)
++    {
++        /* Use a user provided read buffer. */
++        if (!user_read_buf_size)
++            return MZ_FALSE;
++        pRead_buf = (mz_uint8 *)pUser_read_buf;
++        read_buf_size = user_read_buf_size;
++        read_buf_avail = 0;
++        comp_remaining = file_stat.m_comp_size;
++    }
++    else
++    {
++        /* Temporarily allocate a read buffer. */
++        read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
++        if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++        read_buf_avail = 0;
++        comp_remaining = file_stat.m_comp_size;
++    }
++
++    do
++    {
++        /* The size_t cast here should be OK because we've verified that the output buffer is >= file_stat.m_uncomp_size above */
++        size_t in_buf_size, out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs);
++        if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
++        {
++            read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
++            if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
++            {
++                status = TINFL_STATUS_FAILED;
++                mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
++                break;
++            }
++            cur_file_ofs += read_buf_avail;
++            comp_remaining -= read_buf_avail;
++            read_buf_ofs = 0;
++        }
++        in_buf_size = (size_t)read_buf_avail;
++        status = tinfl_decompress(&inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0));
++        read_buf_avail -= in_buf_size;
++        read_buf_ofs += in_buf_size;
++        out_buf_ofs += out_buf_size;
++    } while (status == TINFL_STATUS_NEEDS_MORE_INPUT);
++
++    if (status == TINFL_STATUS_DONE)
++    {
++        /* Make sure the entire file was decompressed, and check its CRC. */
++        if (out_buf_ofs != file_stat.m_uncomp_size)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
++            status = TINFL_STATUS_FAILED;
++        }
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++        else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
++            status = TINFL_STATUS_FAILED;
++        }
++#endif
++    }
++
++    if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf))
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++
++    return status == TINFL_STATUS_DONE;
++}
++
++mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
++{
++    mz_uint32 file_index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
++        return MZ_FALSE;
++    return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size);
++}
++
++mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags)
++{
++    return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, NULL, 0);
++}
++
++mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags)
++{
++    return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0);
++}
++
++void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags)
++{
++    mz_uint64 comp_size, uncomp_size, alloc_size;
++    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
++    void *pBuf;
++
++    if (pSize)
++        *pSize = 0;
++
++    if (!p)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return NULL;
++    }
++
++    comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
++    uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
++
++    alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size;
++    if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++        return NULL;
++    }
++
++    if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size)))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        return NULL;
++    }
++
++    if (!mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size, flags))
++    {
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++        return NULL;
++    }
++
++    if (pSize)
++        *pSize = (size_t)alloc_size;
++    return pBuf;
++}
++
++void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags)
++{
++    mz_uint32 file_index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
++    {
++        if (pSize)
++            *pSize = 0;
++        return MZ_FALSE;
++    }
++    return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags);
++}
++
++mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
++{
++    int status = TINFL_STATUS_DONE;
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++    mz_uint file_crc32 = MZ_CRC32_INIT;
++#endif
++    mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs;
++    mz_zip_archive_file_stat file_stat;
++    void *pRead_buf = NULL;
++    void *pWrite_buf = NULL;
++    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
++
++    if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
++        return MZ_FALSE;
++
++    /* A directory or zero length file */
++    if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
++        return MZ_TRUE;
++
++    /* Encryption and patch files are not supported. */
++    if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++
++    /* This function only supports decompressing stored and deflate. */
++    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
++
++    /* Read and do some minimal validation of the local directory entry (this doesn't crack the zip64 stuff, which we already have from the central dir) */
++    cur_file_ofs = file_stat.m_local_header_ofs;
++    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
++    if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    /* Decompress the file either directly from memory or from a file input buffer. */
++    if (pZip->m_pState->m_pMem)
++    {
++        pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
++        read_buf_size = read_buf_avail = file_stat.m_comp_size;
++        comp_remaining = 0;
++    }
++    else
++    {
++        read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
++        if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++        read_buf_avail = 0;
++        comp_remaining = file_stat.m_comp_size;
++    }
++
++    if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
++    {
++        /* The file is stored or the caller has requested the compressed data. */
++        if (pZip->m_pState->m_pMem)
++        {
++            if (((sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > MZ_UINT32_MAX))
++                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++            if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)file_stat.m_comp_size) != file_stat.m_comp_size)
++            {
++                mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
++                status = TINFL_STATUS_FAILED;
++            }
++            else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
++            {
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++                file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size);
++#endif
++            }
++
++            cur_file_ofs += file_stat.m_comp_size;
++            out_buf_ofs += file_stat.m_comp_size;
++            comp_remaining = 0;
++        }
++        else
++        {
++            while (comp_remaining)
++            {
++                read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
++                if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
++                {
++                    mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++                    status = TINFL_STATUS_FAILED;
++                    break;
++                }
++
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++                if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
++                {
++                    file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
++                }
++#endif
++
++                if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
++                {
++                    mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
++                    status = TINFL_STATUS_FAILED;
++                    break;
++                }
++
++                cur_file_ofs += read_buf_avail;
++                out_buf_ofs += read_buf_avail;
++                comp_remaining -= read_buf_avail;
++            }
++        }
++    }
++    else
++    {
++        tinfl_decompressor inflator;
++        tinfl_init(&inflator);
++
++        if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++            status = TINFL_STATUS_FAILED;
++        }
++        else
++        {
++            do
++            {
++                mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
++                size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
++                if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
++                {
++                    read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
++                    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
++                    {
++                        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++                        status = TINFL_STATUS_FAILED;
++                        break;
++                    }
++                    cur_file_ofs += read_buf_avail;
++                    comp_remaining -= read_buf_avail;
++                    read_buf_ofs = 0;
++                }
++
++                in_buf_size = (size_t)read_buf_avail;
++                status = tinfl_decompress(&inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
++                read_buf_avail -= in_buf_size;
++                read_buf_ofs += in_buf_size;
++
++                if (out_buf_size)
++                {
++                    if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) != out_buf_size)
++                    {
++                        mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
++                        status = TINFL_STATUS_FAILED;
++                        break;
++                    }
++
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++                    file_crc32 = (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
++#endif
++                    if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size)
++                    {
++                        mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
++                        status = TINFL_STATUS_FAILED;
++                        break;
++                    }
++                }
++            } while ((status == TINFL_STATUS_NEEDS_MORE_INPUT) || (status == TINFL_STATUS_HAS_MORE_OUTPUT));
++        }
++    }
++
++    if ((status == TINFL_STATUS_DONE) && (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
++    {
++        /* Make sure the entire file was decompressed, and check its CRC. */
++        if (out_buf_ofs != file_stat.m_uncomp_size)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
++            status = TINFL_STATUS_FAILED;
++        }
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++        else if (file_crc32 != file_stat.m_crc32)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
++            status = TINFL_STATUS_FAILED;
++        }
++#endif
++    }
++
++    if (!pZip->m_pState->m_pMem)
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++
++    if (pWrite_buf)
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf);
++
++    return status == TINFL_STATUS_DONE;
++}
++
++mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
++{
++    mz_uint32 file_index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
++        return MZ_FALSE;
++
++    return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags);
++}
++
++mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
++{
++    mz_zip_reader_extract_iter_state *pState;
++    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
++
++    /* Argument sanity check */
++    if ((!pZip) || (!pZip->m_pState))
++        return NULL;
++
++    /* Allocate an iterator status structure */
++    pState = (mz_zip_reader_extract_iter_state*)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state));
++    if (!pState)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        return NULL;
++    }
++
++    /* Fetch file details */
++    if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat))
++    {
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    /* Encryption and patch files are not supported. */
++    if (pState->file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    /* This function only supports decompressing stored and deflate. */
++    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (pState->file_stat.m_method != 0) && (pState->file_stat.m_method != MZ_DEFLATED))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    /* Init state - save args */
++    pState->pZip = pZip;
++    pState->flags = flags;
++
++    /* Init state - reset variables to defaults */
++    pState->status = TINFL_STATUS_DONE;
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++    pState->file_crc32 = MZ_CRC32_INIT;
++#endif
++    pState->read_buf_ofs = 0;
++    pState->out_buf_ofs = 0;
++    pState->pRead_buf = NULL;
++    pState->pWrite_buf = NULL;
++    pState->out_blk_remain = 0;
++
++    /* Read and parse the local directory entry. */
++    pState->cur_file_ofs = pState->file_stat.m_local_header_ofs;
++    if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    pState->cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
++    if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) > pZip->m_archive_size)
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++        return NULL;
++    }
++
++    /* Decompress the file either directly from memory or from a file input buffer. */
++    if (pZip->m_pState->m_pMem)
++    {
++        pState->pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs;
++        pState->read_buf_size = pState->read_buf_avail = pState->file_stat.m_comp_size;
++        pState->comp_remaining = pState->file_stat.m_comp_size;
++    }
++    else
++    {
++        if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
++        {
++            /* Decompression required, therefore intermediate read buffer required */
++            pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
++            if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size)))
++            {
++                mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++                return NULL;
++            }
++        }
++        else
++        {
++            /* Decompression not required - we will be reading directly into user buffer, no temp buf required */
++            pState->read_buf_size = 0;
++        }
++        pState->read_buf_avail = 0;
++        pState->comp_remaining = pState->file_stat.m_comp_size;
++    }
++
++    if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
++    {
++        /* Decompression required, init decompressor */
++        tinfl_init( &pState->inflator );
++
++        /* Allocate write buffer */
++        if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++            if (pState->pRead_buf)
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf);
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++            return NULL;
++        }
++    }
++
++    return pState;
++}
++
++mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
++{
++    mz_uint32 file_index;
++
++    /* Locate file index by name */
++    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
++        return NULL;
++
++    /* Construct iterator */
++    return mz_zip_reader_extract_iter_new(pZip, file_index, flags);
++}
++
++size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size)
++{
++    size_t copied_to_caller = 0;
++
++    /* Argument sanity check */
++    if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf))
++        return 0;
++
++    if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))
++    {
++        /* The file is stored or the caller has requested the compressed data, calc amount to return. */
++        copied_to_caller = (size_t)MZ_MIN( buf_size, pState->comp_remaining );
++
++        /* Zip is in memory....or requires reading from a file? */
++        if (pState->pZip->m_pState->m_pMem)
++        {
++            /* Copy data to caller's buffer */
++            memcpy( pvBuf, pState->pRead_buf, copied_to_caller );
++            pState->pRead_buf = ((mz_uint8*)pState->pRead_buf) + copied_to_caller;
++        }
++        else
++        {
++            /* Read directly into caller's buffer */
++            if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pvBuf, copied_to_caller) != copied_to_caller)
++            {
++                /* Failed to read all that was asked for, flag failure and alert user */
++                mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
++                pState->status = TINFL_STATUS_FAILED;
++                copied_to_caller = 0;
++            }
++        }
++
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++        /* Compute CRC if not returning compressed data only */
++        if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
++            pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller);
++#endif
++
++        /* Advance offsets, dec counters */
++        pState->cur_file_ofs += copied_to_caller;
++        pState->out_buf_ofs += copied_to_caller;
++        pState->comp_remaining -= copied_to_caller;
++    }
++    else
++    {
++        do
++        {
++            /* Calc ptr to write buffer - given current output pos and block size */
++            mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pState->pWrite_buf + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
++
++            /* Calc max output size - given current output pos and block size */
++            size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
++
++            if (!pState->out_blk_remain)
++            {
++                /* Read more data from file if none available (and reading from file) */
++                if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem))
++                {
++                    /* Calc read size */
++                    pState->read_buf_avail = MZ_MIN(pState->read_buf_size, pState->comp_remaining);
++                    if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pState->pRead_buf, (size_t)pState->read_buf_avail) != pState->read_buf_avail)
++                    {
++                        mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
++                        pState->status = TINFL_STATUS_FAILED;
++                        break;
++                    }
++
++                    /* Advance offsets, dec counters */
++                    pState->cur_file_ofs += pState->read_buf_avail;
++                    pState->comp_remaining -= pState->read_buf_avail;
++                    pState->read_buf_ofs = 0;
++                }
++
++                /* Perform decompression */
++                in_buf_size = (size_t)pState->read_buf_avail;
++                pState->status = tinfl_decompress(&pState->inflator, (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs, &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur, &out_buf_size, pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
++                pState->read_buf_avail -= in_buf_size;
++                pState->read_buf_ofs += in_buf_size;
++
++                /* Update current output block size remaining */
++                pState->out_blk_remain = out_buf_size;
++            }
++
++            if (pState->out_blk_remain)
++            {
++                /* Calc amount to return. */
++                size_t to_copy = MZ_MIN( (buf_size - copied_to_caller), pState->out_blk_remain );
++
++                /* Copy data to caller's buffer */
++                memcpy( (uint8_t*)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy );
++
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++                /* Perform CRC */
++                pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy);
++#endif
++
++                /* Decrement data consumed from block */
++                pState->out_blk_remain -= to_copy;
++
++                /* Inc output offset, while performing sanity check */
++                if ((pState->out_buf_ofs += to_copy) > pState->file_stat.m_uncomp_size)
++                {
++                    mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
++                    pState->status = TINFL_STATUS_FAILED;
++                    break;
++                }
++
++                /* Increment counter of data copied to caller */
++                copied_to_caller += to_copy;
++            }
++        } while ( (copied_to_caller < buf_size) && ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) || (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT)) );
++    }
++
++    /* Return how many bytes were copied into user buffer */
++    return copied_to_caller;
++}
++
++mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState)
++{
++    int status;
++
++    /* Argument sanity check */
++    if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState))
++        return MZ_FALSE;
++
++    /* Was decompression completed and requested? */
++    if ((pState->status == TINFL_STATUS_DONE) && (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
++    {
++        /* Make sure the entire file was decompressed, and check its CRC. */
++        if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size)
++        {
++            mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
++            pState->status = TINFL_STATUS_FAILED;
++        }
++#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
++        else if (pState->file_crc32 != pState->file_stat.m_crc32)
++        {
++            mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
++            pState->status = TINFL_STATUS_FAILED;
++        }
++#endif
++    }
++
++    /* Free buffers */
++    if (!pState->pZip->m_pState->m_pMem)
++        pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf);
++    if (pState->pWrite_buf)
++        pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf);
++
++    /* Save status */
++    status = pState->status;
++
++    /* Free context */
++    pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState);
++
++    return status == TINFL_STATUS_DONE;
++}
++
++#ifndef MINIZ_NO_STDIO
++static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, const void *pBuf, size_t n)
++{
++    (void)ofs;
++
++    return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque);
++}
++
++mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags)
++{
++    mz_bool status;
++    mz_zip_archive_file_stat file_stat;
++    MZ_FILE *pFile;
++
++    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
++        return MZ_FALSE;
++
++    if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
++
++    pFile = MZ_FOPEN(pDst_filename, "wb");
++    if (!pFile)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++
++    status = mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
++
++    if (MZ_FCLOSE(pFile) == EOF)
++    {
++        if (status)
++            mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
++
++        status = MZ_FALSE;
++    }
++
++#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
++    if (status)
++        mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
++#endif
++
++    return status;
++}
++
++mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags)
++{
++    mz_uint32 file_index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
++        return MZ_FALSE;
++
++    return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
++}
++
++mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *pFile, mz_uint flags)
++{
++    mz_zip_archive_file_stat file_stat;
++
++    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
++        return MZ_FALSE;
++
++    if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
++
++    return mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
++}
++
++mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags)
++{
++    mz_uint32 file_index;
++    if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
++        return MZ_FALSE;
++
++    return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags);
++}
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
++{
++    mz_uint32 *p = (mz_uint32 *)pOpaque;
++    (void)file_ofs;
++    *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n);
++    return n;
++}
++
++mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
++{
++    mz_zip_archive_file_stat file_stat;
++    mz_zip_internal_state *pState;
++    const mz_uint8 *pCentral_dir_header;
++    mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE;
++    mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
++    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
++    mz_uint64 local_header_ofs = 0;
++    mz_uint32 local_header_filename_len, local_header_extra_len, local_header_crc32;
++    mz_uint64 local_header_comp_size, local_header_uncomp_size;
++    mz_uint32 uncomp_crc32 = MZ_CRC32_INIT;
++    mz_bool has_data_descriptor;
++    mz_uint32 local_header_bit_flags;
++
++    mz_zip_array file_data_array;
++    mz_zip_array_init(&file_data_array, 1);
++
++    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (file_index > pZip->m_total_files)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    pCentral_dir_header = mz_zip_get_cdh(pZip, file_index);
++
++    if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header, &file_stat, &found_zip64_ext_data_in_cdir))
++        return MZ_FALSE;
++
++    /* A directory or zero length file */
++    if ((file_stat.m_is_directory) || (!file_stat.m_uncomp_size))
++        return MZ_TRUE;
++
++    /* Encryption and patch files are not supported. */
++    if (file_stat.m_is_encrypted)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
++
++    /* This function only supports stored and deflate. */
++    if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
++
++    if (!file_stat.m_is_supported)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
++
++    /* Read and parse the local directory entry. */
++    local_header_ofs = file_stat.m_local_header_ofs;
++    if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    local_header_filename_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
++    local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
++    local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
++    local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
++    local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS);
++    local_header_bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
++    has_data_descriptor = (local_header_bit_flags & 8) != 0;
++
++    if (local_header_filename_len != strlen(file_stat.m_filename))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size) > pZip->m_archive_size)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    if (!mz_zip_array_resize(pZip, &file_data_array, MZ_MAX(local_header_filename_len, local_header_extra_len), MZ_FALSE))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        goto handle_failure;
++    }
++
++    if (local_header_filename_len)
++    {
++        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE, file_data_array.m_p, local_header_filename_len) != local_header_filename_len)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++            goto handle_failure;
++        }
++
++        /* I've seen 1 archive that had the same pathname, but used backslashes in the local dir and forward slashes in the central dir. Do we care about this? For now, this case will fail validation. */
++        if (memcmp(file_stat.m_filename, file_data_array.m_p, local_header_filename_len) != 0)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
++            goto handle_failure;
++        }
++    }
++
++    if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
++    {
++        mz_uint32 extra_size_remaining = local_header_extra_len;
++        const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p;
++
++        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++            goto handle_failure;
++        }
++
++        do
++        {
++            mz_uint32 field_id, field_data_size, field_total_size;
++
++            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
++            {
++                mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++                goto handle_failure;
++            }
++
++            field_id = MZ_READ_LE16(pExtra_data);
++            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
++            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
++
++            if (field_total_size > extra_size_remaining)
++            {
++                mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++                goto handle_failure;
++            }
++
++            if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
++            {
++                const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
++
++                if (field_data_size < sizeof(mz_uint64) * 2)
++                {
++                    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++                    goto handle_failure;
++                }
++
++                local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
++                local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64));
++
++                found_zip64_ext_data_in_ldir = MZ_TRUE;
++                break;
++            }
++
++            pExtra_data += field_total_size;
++            extra_size_remaining -= field_total_size;
++        } while (extra_size_remaining);
++    }
++
++    /* TODO: parse local header extra data when local_header_comp_size is 0xFFFFFFFF! (big_descriptor.zip) */
++    /* I've seen zips in the wild with the data descriptor bit set, but proper local header values and bogus data descriptors */
++    if ((has_data_descriptor) && (!local_header_comp_size) && (!local_header_crc32))
++    {
++        mz_uint8 descriptor_buf[32];
++        mz_bool has_id;
++        const mz_uint8 *pSrc;
++        mz_uint32 file_crc32;
++        mz_uint64 comp_size = 0, uncomp_size = 0;
++
++        mz_uint32 num_descriptor_uint32s = ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4;
++
++        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size, descriptor_buf, sizeof(mz_uint32) * num_descriptor_uint32s) != (sizeof(mz_uint32) * num_descriptor_uint32s))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++            goto handle_failure;
++        }
++
++        has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
++        pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf;
++
++        file_crc32 = MZ_READ_LE32(pSrc);
++
++        if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir))
++        {
++            comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32));
++            uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64));
++        }
++        else
++        {
++            comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32));
++            uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32));
++        }
++
++        if ((file_crc32 != file_stat.m_crc32) || (comp_size != file_stat.m_comp_size) || (uncomp_size != file_stat.m_uncomp_size))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
++            goto handle_failure;
++        }
++    }
++    else
++    {
++        if ((local_header_crc32 != file_stat.m_crc32) || (local_header_comp_size != file_stat.m_comp_size) || (local_header_uncomp_size != file_stat.m_uncomp_size))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
++            goto handle_failure;
++        }
++    }
++
++    mz_zip_array_clear(pZip, &file_data_array);
++
++    if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0)
++    {
++        if (!mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0))
++            return MZ_FALSE;
++
++        /* 1 more check to be sure, although the extract checks too. */
++        if (uncomp_crc32 != file_stat.m_crc32)
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
++            return MZ_FALSE;
++        }
++    }
++
++    return MZ_TRUE;
++
++handle_failure:
++    mz_zip_array_clear(pZip, &file_data_array);
++    return MZ_FALSE;
++}
++
++mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags)
++{
++    mz_zip_internal_state *pState;
++    uint32_t i;
++
++    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    /* Basic sanity checks */
++    if (!pState->m_zip64)
++    {
++        if (pZip->m_total_files > MZ_UINT16_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++        if (pZip->m_archive_size > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++    }
++    else
++    {
++        if (pZip->m_total_files >= MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++        if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++    }
++
++    for (i = 0; i < pZip->m_total_files; i++)
++    {
++        if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags)
++        {
++            mz_uint32 found_index;
++            mz_zip_archive_file_stat stat;
++
++            if (!mz_zip_reader_file_stat(pZip, i, &stat))
++                return MZ_FALSE;
++
++            if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0, &found_index))
++                return MZ_FALSE;
++
++            /* This check can fail if there are duplicate filenames in the archive (which we don't check for when writing - that's up to the user) */
++            if (found_index != i)
++                return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
++        }
++
++        if (!mz_zip_validate_file(pZip, i, flags))
++            return MZ_FALSE;
++    }
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr)
++{
++    mz_bool success = MZ_TRUE;
++    mz_zip_archive zip;
++    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
++
++    if ((!pMem) || (!size))
++    {
++        if (pErr)
++            *pErr = MZ_ZIP_INVALID_PARAMETER;
++        return MZ_FALSE;
++    }
++
++    mz_zip_zero_struct(&zip);
++
++    if (!mz_zip_reader_init_mem(&zip, pMem, size, flags))
++    {
++        if (pErr)
++            *pErr = zip.m_last_error;
++        return MZ_FALSE;
++    }
++
++    if (!mz_zip_validate_archive(&zip, flags))
++    {
++        actual_err = zip.m_last_error;
++        success = MZ_FALSE;
++    }
++
++    if (!mz_zip_reader_end_internal(&zip, success))
++    {
++        if (!actual_err)
++            actual_err = zip.m_last_error;
++        success = MZ_FALSE;
++    }
++
++    if (pErr)
++        *pErr = actual_err;
++
++    return success;
++}
++
++#ifndef MINIZ_NO_STDIO
++mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr)
++{
++    mz_bool success = MZ_TRUE;
++    mz_zip_archive zip;
++    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
++
++    if (!pFilename)
++    {
++        if (pErr)
++            *pErr = MZ_ZIP_INVALID_PARAMETER;
++        return MZ_FALSE;
++    }
++
++    mz_zip_zero_struct(&zip);
++
++    if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0))
++    {
++        if (pErr)
++            *pErr = zip.m_last_error;
++        return MZ_FALSE;
++    }
++
++    if (!mz_zip_validate_archive(&zip, flags))
++    {
++        actual_err = zip.m_last_error;
++        success = MZ_FALSE;
++    }
++
++    if (!mz_zip_reader_end_internal(&zip, success))
++    {
++        if (!actual_err)
++            actual_err = zip.m_last_error;
++        success = MZ_FALSE;
++    }
++
++    if (pErr)
++        *pErr = actual_err;
++
++    return success;
++}
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++/* ------------------- .ZIP archive writing */
++
++#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
++
++static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v)
++{
++    p[0] = (mz_uint8)v;
++    p[1] = (mz_uint8)(v >> 8);
++}
++static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v)
++{
++    p[0] = (mz_uint8)v;
++    p[1] = (mz_uint8)(v >> 8);
++    p[2] = (mz_uint8)(v >> 16);
++    p[3] = (mz_uint8)(v >> 24);
++}
++static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v)
++{
++    mz_write_le32(p, (mz_uint32)v);
++    mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32));
++}
++
++#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v))
++#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v))
++#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v))
++
++static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
++{
++    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
++    mz_zip_internal_state *pState = pZip->m_pState;
++    mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
++
++    if (!n)
++        return 0;
++
++    /* An allocation this big is likely to just fail on 32-bit systems, so don't even go there. */
++    if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
++        return 0;
++    }
++
++    if (new_size > pState->m_mem_capacity)
++    {
++        void *pNew_block;
++        size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity);
++
++        while (new_capacity < new_size)
++            new_capacity *= 2;
++
++        if (NULL == (pNew_block = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity)))
++        {
++            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++            return 0;
++        }
++
++        pState->m_pMem = pNew_block;
++        pState->m_mem_capacity = new_capacity;
++    }
++    memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n);
++    pState->m_mem_size = (size_t)new_size;
++    return n;
++}
++
++static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
++{
++    mz_zip_internal_state *pState;
++    mz_bool status = MZ_TRUE;
++
++    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)))
++    {
++        if (set_last_error)
++            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return MZ_FALSE;
++    }
++
++    pState = pZip->m_pState;
++    pZip->m_pState = NULL;
++    mz_zip_array_clear(pZip, &pState->m_central_dir);
++    mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
++    mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
++
++#ifndef MINIZ_NO_STDIO
++    if (pState->m_pFile)
++    {
++        if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
++        {
++            if (MZ_FCLOSE(pState->m_pFile) == EOF)
++            {
++                if (set_last_error)
++                    mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
++                status = MZ_FALSE;
++            }
++        }
++
++        pState->m_pFile = NULL;
++    }
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++    if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem))
++    {
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
++        pState->m_pMem = NULL;
++    }
++
++    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
++    pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
++    return status;
++}
++
++mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags)
++{
++    mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0;
++
++    if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
++    {
++        if (!pZip->m_pRead)
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++    }
++
++    if (pZip->m_file_offset_alignment)
++    {
++        /* Ensure user specified file offset alignment is a power of 2. */
++        if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1))
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++    }
++
++    if (!pZip->m_pAlloc)
++        pZip->m_pAlloc = miniz_def_alloc_func;
++    if (!pZip->m_pFree)
++        pZip->m_pFree = miniz_def_free_func;
++    if (!pZip->m_pRealloc)
++        pZip->m_pRealloc = miniz_def_realloc_func;
++
++    pZip->m_archive_size = existing_size;
++    pZip->m_central_directory_file_ofs = 0;
++    pZip->m_total_files = 0;
++
++    if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++    memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
++
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
++    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
++
++    pZip->m_pState->m_zip64 = zip64;
++    pZip->m_pState->m_zip64_has_extended_info_fields = zip64;
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_USER;
++    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size)
++{
++    return mz_zip_writer_init_v2(pZip, existing_size, 0);
++}
++
++mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags)
++{
++    pZip->m_pWrite = mz_zip_heap_write_func;
++    pZip->m_pNeeds_keepalive = NULL;
++
++    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
++        pZip->m_pRead = mz_zip_mem_read_func;
++
++    pZip->m_pIO_opaque = pZip;
++
++    if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
++        return MZ_FALSE;
++
++    pZip->m_zip_type = MZ_ZIP_TYPE_HEAP;
++
++    if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, size_to_reserve_at_beginning)))
++    {
++        if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, initial_allocation_size)))
++        {
++            mz_zip_writer_end_internal(pZip, MZ_FALSE);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++        pZip->m_pState->m_mem_capacity = initial_allocation_size;
++    }
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size)
++{
++    return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning, initial_allocation_size, 0);
++}
++
++#ifndef MINIZ_NO_STDIO
++static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
++{
++    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
++    mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
++
++    file_ofs += pZip->m_pState->m_file_archive_start_ofs;
++
++    if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
++    {
++        mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
++        return 0;
++    }
++
++    return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile);
++}
++
++mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning)
++{
++    return mz_zip_writer_init_file_v2(pZip, pFilename, size_to_reserve_at_beginning, 0);
++}
++
++mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags)
++{
++    MZ_FILE *pFile;
++
++    pZip->m_pWrite = mz_zip_file_write_func;
++    pZip->m_pNeeds_keepalive = NULL;
++
++    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
++        pZip->m_pRead = mz_zip_file_read_func;
++
++    pZip->m_pIO_opaque = pZip;
++
++    if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
++        return MZ_FALSE;
++
++    if (NULL == (pFile = MZ_FOPEN(pFilename, (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb")))
++    {
++        mz_zip_writer_end(pZip);
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++    }
++
++    pZip->m_pState->m_pFile = pFile;
++    pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
++
++    if (size_to_reserve_at_beginning)
++    {
++        mz_uint64 cur_ofs = 0;
++        char buf[4096];
++
++        MZ_CLEAR_OBJ(buf);
++
++        do
++        {
++            size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning);
++            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n)
++            {
++                mz_zip_writer_end(pZip);
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++            }
++            cur_ofs += n;
++            size_to_reserve_at_beginning -= n;
++        } while (size_to_reserve_at_beginning);
++    }
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags)
++{
++    pZip->m_pWrite = mz_zip_file_write_func;
++    pZip->m_pNeeds_keepalive = NULL;
++
++    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
++        pZip->m_pRead = mz_zip_file_read_func;
++
++    pZip->m_pIO_opaque = pZip;
++
++    if (!mz_zip_writer_init_v2(pZip, 0, flags))
++        return MZ_FALSE;
++
++    pZip->m_pState->m_pFile = pFile;
++    pZip->m_pState->m_file_archive_start_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
++    pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
++
++    return MZ_TRUE;
++}
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
++{
++    mz_zip_internal_state *pState;
++
++    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (flags & MZ_ZIP_FLAG_WRITE_ZIP64)
++    {
++        /* We don't support converting a non-zip64 file to zip64 - this seems like more trouble than it's worth. (What about the existing 32-bit data descriptors that could follow the compressed data?) */
++        if (!pZip->m_pState->m_zip64)
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++    }
++
++    /* No sense in trying to write to an archive that's already at the support max size */
++    if (pZip->m_pState->m_zip64)
++    {
++        if (pZip->m_total_files == MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++    else
++    {
++        if (pZip->m_total_files == MZ_UINT16_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++
++        if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
++    }
++
++    pState = pZip->m_pState;
++
++    if (pState->m_pFile)
++    {
++#ifdef MINIZ_NO_STDIO
++        (void)pFilename;
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++#else
++        if (pZip->m_pIO_opaque != pZip)
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++        if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
++        {
++            if (!pFilename)
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++            /* Archive is being read from stdio and was originally opened only for reading. Try to reopen as writable. */
++            if (NULL == (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile)))
++            {
++                /* The mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it. */
++                mz_zip_reader_end_internal(pZip, MZ_FALSE);
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++            }
++        }
++
++        pZip->m_pWrite = mz_zip_file_write_func;
++        pZip->m_pNeeds_keepalive = NULL;
++#endif /* #ifdef MINIZ_NO_STDIO */
++    }
++    else if (pState->m_pMem)
++    {
++        /* Archive lives in a memory block. Assume it's from the heap that we can resize using the realloc callback. */
++        if (pZip->m_pIO_opaque != pZip)
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++        pState->m_mem_capacity = pState->m_mem_size;
++        pZip->m_pWrite = mz_zip_heap_write_func;
++        pZip->m_pNeeds_keepalive = NULL;
++    }
++    /* Archive is being read via a user provided read function - make sure the user has specified a write function too. */
++    else if (!pZip->m_pWrite)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    /* Start writing new files at the archive's current central directory location. */
++    /* TODO: We could add a flag that lets the user start writing immediately AFTER the existing central dir - this would be safer. */
++    pZip->m_archive_size = pZip->m_central_directory_file_ofs;
++    pZip->m_central_directory_file_ofs = 0;
++
++    /* Clear the sorted central dir offsets, they aren't useful or maintained now. */
++    /* Even though we're now in write mode, files can still be extracted and verified, but file locates will be slow. */
++    /* TODO: We could easily maintain the sorted central directory offsets. */
++    mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets);
++
++    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename)
++{
++    return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0);
++}
++
++/* TODO: pArchive_name is a terrible name here! */
++mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags)
++{
++    return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0);
++}
++
++typedef struct
++{
++    mz_zip_archive *m_pZip;
++    mz_uint64 m_cur_archive_file_ofs;
++    mz_uint64 m_comp_size;
++} mz_zip_writer_add_state;
++
++static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len, void *pUser)
++{
++    mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser;
++    if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, pState->m_cur_archive_file_ofs, pBuf, len) != len)
++        return MZ_FALSE;
++
++    pState->m_cur_archive_file_ofs += len;
++    pState->m_comp_size += len;
++    return MZ_TRUE;
++}
++
++#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2)
++#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3)
++static mz_uint32 mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size, mz_uint64 *pComp_size, mz_uint64 *pLocal_header_ofs)
++{
++    mz_uint8 *pDst = pBuf;
++    mz_uint32 field_size = 0;
++
++    MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
++    MZ_WRITE_LE16(pDst + 2, 0);
++    pDst += sizeof(mz_uint16) * 2;
++
++    if (pUncomp_size)
++    {
++        MZ_WRITE_LE64(pDst, *pUncomp_size);
++        pDst += sizeof(mz_uint64);
++        field_size += sizeof(mz_uint64);
++    }
++
++    if (pComp_size)
++    {
++        MZ_WRITE_LE64(pDst, *pComp_size);
++        pDst += sizeof(mz_uint64);
++        field_size += sizeof(mz_uint64);
++    }
++
++    if (pLocal_header_ofs)
++    {
++        MZ_WRITE_LE64(pDst, *pLocal_header_ofs);
++        pDst += sizeof(mz_uint64);
++        field_size += sizeof(mz_uint64);
++    }
++
++    MZ_WRITE_LE16(pBuf + 2, field_size);
++
++    return (mz_uint32)(pDst - pBuf);
++}
++
++static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date)
++{
++    (void)pZip;
++    memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_SIG_OFS, MZ_ZIP_LOCAL_DIR_HEADER_SIG);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_VERSION_NEEDED_OFS, method ? 20 : 0);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_BIT_FLAG_OFS, bit_flags);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_METHOD_OFS, method);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
++    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size);
++    return MZ_TRUE;
++}
++
++static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst,
++                                                       mz_uint16 filename_size, mz_uint16 extra_size, mz_uint16 comment_size,
++                                                       mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
++                                                       mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
++                                                       mz_uint64 local_header_ofs, mz_uint32 ext_attributes)
++{
++    (void)pZip;
++    memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size);
++    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes);
++    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_MIN(local_header_ofs, MZ_UINT32_MAX));
++    return MZ_TRUE;
++}
++
++static mz_bool mz_zip_writer_add_to_central_dir(mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size,
++                                                const void *pExtra, mz_uint16 extra_size, const void *pComment, mz_uint16 comment_size,
++                                                mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
++                                                mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
++                                                mz_uint64 local_header_ofs, mz_uint32 ext_attributes,
++                                                const char *user_extra_data, mz_uint user_extra_data_len)
++{
++    mz_zip_internal_state *pState = pZip->m_pState;
++    mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size;
++    size_t orig_central_dir_size = pState->m_central_dir.m_size;
++    mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
++
++    if (!pZip->m_pState->m_zip64)
++    {
++        if (local_header_ofs > 0xFFFFFFFF)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
++    }
++
++    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
++    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + user_extra_data_len + comment_size) >= MZ_UINT32_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++
++    if (!mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, (mz_uint16)(extra_size + user_extra_data_len), comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes))
++        return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++    if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
++        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) ||
++        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) ||
++        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data, user_extra_data_len)) ||
++        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) ||
++        (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, ¢ral_dir_ofs, 1)))
++    {
++        /* Try to resize the central directory array back into its original state. */
++        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++    }
++
++    return MZ_TRUE;
++}
++
++static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name)
++{
++    /* Basic ZIP archive filename validity checks: Valid filenames cannot start with a forward slash, cannot contain a drive letter, and cannot use DOS-style backward slashes. */
++    if (*pArchive_name == '/')
++        return MZ_FALSE;
++
++    /* Making sure the name does not contain drive letters or DOS style backward slashes is the responsibility of the program using miniz*/
++
++    return MZ_TRUE;
++}
++
++static mz_uint mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip)
++{
++    mz_uint32 n;
++    if (!pZip->m_file_offset_alignment)
++        return 0;
++    n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1));
++    return (mz_uint)((pZip->m_file_offset_alignment - n) & (pZip->m_file_offset_alignment - 1));
++}
++
++static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_file_ofs, mz_uint32 n)
++{
++    char buf[4096];
++    memset(buf, 0, MZ_MIN(sizeof(buf), n));
++    while (n)
++    {
++        mz_uint32 s = MZ_MIN(sizeof(buf), n);
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_file_ofs += s;
++        n -= s;
++    }
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
++                                 mz_uint64 uncomp_size, mz_uint32 uncomp_crc32)
++{
++    return mz_zip_writer_add_mem_ex_v2(pZip, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0);
++}
++
++mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size,
++                                    mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified,
++                                    const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
++{
++    mz_uint16 method = 0, dos_time = 0, dos_date = 0;
++    mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
++    mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
++    size_t archive_name_size;
++    mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
++    tdefl_compressor *pComp = NULL;
++    mz_bool store_data_uncompressed;
++    mz_zip_internal_state *pState;
++    mz_uint8 *pExtra_data = NULL;
++    mz_uint32 extra_size = 0;
++    mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
++    mz_uint16 bit_flags = 0;
++
++    if ((int)level_and_flags < 0)
++        level_and_flags = MZ_DEFAULT_LEVEL;
++
++    if (uncomp_size || (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
++        bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
++
++    if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
++        bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
++
++    level = level_and_flags & 0xF;
++    store_data_uncompressed = ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA));
++
++    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    if (pState->m_zip64)
++    {
++        if (pZip->m_total_files == MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++    else
++    {
++        if (pZip->m_total_files == MZ_UINT16_MAX)
++        {
++            pState->m_zip64 = MZ_TRUE;
++            /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
++        }
++        if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
++        {
++            pState->m_zip64 = MZ_TRUE;
++            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
++        }
++    }
++
++    if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_writer_validate_archive_name(pArchive_name))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
++
++#ifndef MINIZ_NO_TIME
++    if (last_modified != NULL)
++    {
++        mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date);
++    }
++    else
++    {
++        MZ_TIME_T cur_time;
++        time(&cur_time);
++        mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date);
++    }
++#endif /* #ifndef MINIZ_NO_TIME */
++
++	if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
++	{
++		uncomp_crc32 = (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, buf_size);
++		uncomp_size = buf_size;
++		if (uncomp_size <= 3)
++		{
++			level = 0;
++			store_data_uncompressed = MZ_TRUE;
++		}
++	}
++
++    archive_name_size = strlen(pArchive_name);
++    if (archive_name_size > MZ_UINT16_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
++
++    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
++
++    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
++    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++
++    if (!pState->m_zip64)
++    {
++        /* Bail early if the archive would obviously become too large */
++        if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size
++			+ MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len +
++			pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len
++			+ MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF)
++        {
++            pState->m_zip64 = MZ_TRUE;
++            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
++        }
++    }
++
++    if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/'))
++    {
++        /* Set DOS Subdirectory attribute bit. */
++        ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
++
++        /* Subdirectories cannot contain data. */
++        if ((buf_size) || (uncomp_size))
++            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++    }
++
++    /* Try to do any allocations before writing to the archive, so if an allocation fails the file remains unmodified. (A good idea if we're doing an in-place modification.) */
++    if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) || (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++    if ((!store_data_uncompressed) && (buf_size))
++    {
++        if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor))))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++    }
++
++    if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
++    {
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++        return MZ_FALSE;
++    }
++
++    local_dir_header_ofs += num_alignment_padding_bytes;
++    if (pZip->m_file_offset_alignment)
++    {
++        MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
++    }
++    cur_archive_file_ofs += num_alignment_padding_bytes;
++
++    MZ_CLEAR_OBJ(local_dir_header);
++
++    if (!store_data_uncompressed || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
++    {
++        method = MZ_DEFLATED;
++    }
++
++    if (pState->m_zip64)
++    {
++        if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
++        {
++            pExtra_data = extra_data;
++            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
++                                                               (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++        }
++
++        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, bit_flags, dos_time, dos_date))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += sizeof(local_dir_header);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++        cur_archive_file_ofs += archive_name_size;
++
++        if (pExtra_data != NULL)
++        {
++            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++            cur_archive_file_ofs += extra_size;
++        }
++    }
++    else
++    {
++        if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags, dos_time, dos_date))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += sizeof(local_dir_header);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++        cur_archive_file_ofs += archive_name_size;
++    }
++
++	if (user_extra_data_len > 0)
++	{
++		if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
++			return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++		cur_archive_file_ofs += user_extra_data_len;
++	}
++
++    if (store_data_uncompressed)
++    {
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf, buf_size) != buf_size)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++
++        cur_archive_file_ofs += buf_size;
++        comp_size = buf_size;
++    }
++    else if (buf_size)
++    {
++        mz_zip_writer_add_state state;
++
++        state.m_pZip = pZip;
++        state.m_cur_archive_file_ofs = cur_archive_file_ofs;
++        state.m_comp_size = 0;
++
++        if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) ||
++            (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != TDEFL_STATUS_DONE))
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++            return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
++        }
++
++        comp_size = state.m_comp_size;
++        cur_archive_file_ofs = state.m_cur_archive_file_ofs;
++    }
++
++    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++    pComp = NULL;
++
++    if (uncomp_size)
++    {
++        mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
++        mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
++
++        MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR);
++
++        MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
++        MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
++        if (pExtra_data == NULL)
++        {
++            if (comp_size > MZ_UINT32_MAX)
++                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++            MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
++            MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
++        }
++        else
++        {
++            MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
++            MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
++            local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
++        }
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
++            return MZ_FALSE;
++
++        cur_archive_file_ofs += local_dir_footer_size;
++    }
++
++    if (pExtra_data != NULL)
++    {
++        extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
++                                                           (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++    }
++
++    if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment,
++                                          comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
++                                          user_extra_data_central, user_extra_data_central_len))
++        return MZ_FALSE;
++
++    pZip->m_total_files++;
++    pZip->m_archive_size = cur_archive_file_ofs;
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
++                                const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
++{
++    mz_uint16 gen_flags = (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) ? 0 : MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
++    mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
++    mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
++    mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = 0, comp_size = 0;
++    size_t archive_name_size;
++    mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
++    mz_uint8 *pExtra_data = NULL;
++    mz_uint32 extra_size = 0;
++    mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
++    mz_zip_internal_state *pState;
++    mz_uint64 file_ofs = 0, cur_archive_header_file_ofs;
++
++    if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
++        gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
++
++    if ((int)level_and_flags < 0)
++        level_and_flags = MZ_DEFAULT_LEVEL;
++    level = level_and_flags & 0xF;
++
++    /* Sanity checks */
++    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    if ((!pState->m_zip64) && (max_size > MZ_UINT32_MAX))
++    {
++        /* Source file is too large for non-zip64 */
++        /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
++        pState->m_zip64 = MZ_TRUE;
++    }
++
++    /* We could support this, but why? */
++    if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_writer_validate_archive_name(pArchive_name))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
++
++    if (pState->m_zip64)
++    {
++        if (pZip->m_total_files == MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++    else
++    {
++        if (pZip->m_total_files == MZ_UINT16_MAX)
++        {
++            pState->m_zip64 = MZ_TRUE;
++            /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
++        }
++    }
++
++    archive_name_size = strlen(pArchive_name);
++    if (archive_name_size > MZ_UINT16_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
++
++    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
++
++    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
++    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++
++    if (!pState->m_zip64)
++    {
++        /* Bail early if the archive would obviously become too large */
++        if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE
++			+ archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024
++			+ MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF)
++        {
++            pState->m_zip64 = MZ_TRUE;
++            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
++        }
++    }
++
++#ifndef MINIZ_NO_TIME
++    if (pFile_time)
++    {
++        mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date);
++    }
++#endif
++
++    if (max_size <= 3)
++        level = 0;
++
++    if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
++    {
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++    }
++
++    cur_archive_file_ofs += num_alignment_padding_bytes;
++    local_dir_header_ofs = cur_archive_file_ofs;
++
++    if (pZip->m_file_offset_alignment)
++    {
++        MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
++    }
++
++    if (max_size && level)
++    {
++        method = MZ_DEFLATED;
++    }
++
++    MZ_CLEAR_OBJ(local_dir_header);
++    if (pState->m_zip64)
++    {
++        if (max_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
++        {
++            pExtra_data = extra_data;
++            if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
++                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
++                                                               (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
++                                                                (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++            else
++                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, NULL,
++                                                                   NULL,
++                                                                   (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++        }
++
++        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, gen_flags, dos_time, dos_date))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += sizeof(local_dir_header);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
++        {
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++
++        cur_archive_file_ofs += archive_name_size;
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += extra_size;
++    }
++    else
++    {
++        if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags, dos_time, dos_date))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += sizeof(local_dir_header);
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
++        {
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++
++        cur_archive_file_ofs += archive_name_size;
++    }
++
++    if (user_extra_data_len > 0)
++    {
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        cur_archive_file_ofs += user_extra_data_len;
++    }
++
++    if (max_size)
++    {
++        void *pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE);
++        if (!pRead_buf)
++        {
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (!level)
++        {
++            while (1)
++            {
++                size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
++                if (n == 0)
++                    break;
++
++                if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
++                {
++                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++                }
++                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, n) != n)
++                {
++                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++                }
++                file_ofs += n;
++                uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
++                cur_archive_file_ofs += n;
++            }
++            uncomp_size = file_ofs;
++            comp_size = uncomp_size;
++        }
++        else
++        {
++            mz_bool result = MZ_FALSE;
++            mz_zip_writer_add_state state;
++            tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor));
++            if (!pComp)
++            {
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++            }
++
++            state.m_pZip = pZip;
++            state.m_cur_archive_file_ofs = cur_archive_file_ofs;
++            state.m_comp_size = 0;
++
++            if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY)
++            {
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++            }
++
++            for (;;)
++            {
++                tdefl_status status;
++                tdefl_flush flush = TDEFL_NO_FLUSH;
++
++                size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
++                if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
++                {
++                    mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++                    break;
++                }
++
++                file_ofs += n;
++                uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
++
++                if (pZip->m_pNeeds_keepalive != NULL && pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque))
++                    flush = TDEFL_FULL_FLUSH;
++
++                if (n == 0)
++                    flush = TDEFL_FINISH;
++
++                status = tdefl_compress_buffer(pComp, pRead_buf, n, flush);
++                if (status == TDEFL_STATUS_DONE)
++                {
++                    result = MZ_TRUE;
++                    break;
++                }
++                else if (status != TDEFL_STATUS_OKAY)
++                {
++                    mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
++                    break;
++                }
++            }
++
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
++
++            if (!result)
++            {
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++                return MZ_FALSE;
++            }
++
++            uncomp_size = file_ofs;
++            comp_size = state.m_comp_size;
++            cur_archive_file_ofs = state.m_cur_archive_file_ofs;
++        }
++
++        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
++    }
++
++    if (!(level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE))
++    {
++        mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
++        mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
++
++        MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
++        MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
++        if (pExtra_data == NULL)
++        {
++            if (comp_size > MZ_UINT32_MAX)
++                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++            MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
++            MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
++        }
++        else
++        {
++            MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
++            MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
++            local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
++        }
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
++            return MZ_FALSE;
++
++        cur_archive_file_ofs += local_dir_footer_size;
++    }
++
++    if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
++    {
++        if (pExtra_data != NULL)
++        {
++            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
++                                                               (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++        }
++
++        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header,
++                                                   (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len),
++                                                   (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size, 
++                                                    (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size,
++                                                   uncomp_crc32, method, gen_flags, dos_time, dos_date))
++            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
++
++        cur_archive_header_file_ofs = local_dir_header_ofs;
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        if (pExtra_data != NULL)
++        {
++            cur_archive_header_file_ofs += sizeof(local_dir_header);
++
++            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
++            {
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++            }
++
++            cur_archive_header_file_ofs += archive_name_size;
++
++            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, extra_data, extra_size) != extra_size)
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++            cur_archive_header_file_ofs += extra_size;
++        }
++    }
++
++    if (pExtra_data != NULL)
++    {
++        extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
++                                                           (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
++    }
++
++    if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment, comment_size,
++                                          uncomp_size, comp_size, uncomp_crc32, method, gen_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
++                                          user_extra_data_central, user_extra_data_central_len))
++        return MZ_FALSE;
++
++    pZip->m_total_files++;
++    pZip->m_archive_size = cur_archive_file_ofs;
++
++    return MZ_TRUE;
++}
++
++#ifndef MINIZ_NO_STDIO
++
++static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
++{
++	MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque;
++	mz_int64 cur_ofs = MZ_FTELL64(pSrc_file);
++
++	if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET))))
++		return 0;
++
++	return MZ_FREAD(pBuf, 1, n, pSrc_file);
++}
++
++mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
++	const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
++{
++	return mz_zip_writer_add_read_buf_callback(pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, max_size, pFile_time, pComment, comment_size, level_and_flags,
++		user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len);
++}
++
++mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
++{
++    MZ_FILE *pSrc_file = NULL;
++    mz_uint64 uncomp_size = 0;
++    MZ_TIME_T file_modified_time;
++    MZ_TIME_T *pFile_time = NULL;
++    mz_bool status;
++
++    memset(&file_modified_time, 0, sizeof(file_modified_time));
++
++#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
++    pFile_time = &file_modified_time;
++    if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time))
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED);
++#endif
++
++    pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
++    if (!pSrc_file)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
++
++    MZ_FSEEK64(pSrc_file, 0, SEEK_END);
++    uncomp_size = MZ_FTELL64(pSrc_file);
++    MZ_FSEEK64(pSrc_file, 0, SEEK_SET);
++
++    status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0);
++
++    MZ_FCLOSE(pSrc_file);
++
++    return status;
++}
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++static mz_bool mz_zip_writer_update_zip64_extension_block(mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt, uint32_t ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size, mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start)
++{
++    /* + 64 should be enough for any new zip64 data */
++    if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE))
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++    mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE);
++
++    if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start))
++    {
++        mz_uint8 new_ext_block[64];
++        mz_uint8 *pDst = new_ext_block;
++        mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
++        mz_write_le16(pDst + sizeof(mz_uint16), 0);
++        pDst += sizeof(mz_uint16) * 2;
++
++        if (pUncomp_size)
++        {
++            mz_write_le64(pDst, *pUncomp_size);
++            pDst += sizeof(mz_uint64);
++        }
++
++        if (pComp_size)
++        {
++            mz_write_le64(pDst, *pComp_size);
++            pDst += sizeof(mz_uint64);
++        }
++
++        if (pLocal_header_ofs)
++        {
++            mz_write_le64(pDst, *pLocal_header_ofs);
++            pDst += sizeof(mz_uint64);
++        }
++
++        if (pDisk_start)
++        {
++            mz_write_le32(pDst, *pDisk_start);
++            pDst += sizeof(mz_uint32);
++        }
++
++        mz_write_le16(new_ext_block + sizeof(mz_uint16), (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2));
++
++        if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block, pDst - new_ext_block))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++    }
++
++    if ((pExt) && (ext_len))
++    {
++        mz_uint32 extra_size_remaining = ext_len;
++        const mz_uint8 *pExtra_data = pExt;
++
++        do
++        {
++            mz_uint32 field_id, field_data_size, field_total_size;
++
++            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++            field_id = MZ_READ_LE16(pExtra_data);
++            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
++            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
++
++            if (field_total_size > extra_size_remaining)
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++            if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
++            {
++                if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data, field_total_size))
++                    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++            }
++
++            pExtra_data += field_total_size;
++            extra_size_remaining -= field_total_size;
++        } while (extra_size_remaining);
++    }
++
++    return MZ_TRUE;
++}
++
++/* TODO: This func is now pretty freakin complex due to zip64, split it up? */
++mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index)
++{
++    mz_uint n, bit_flags, num_alignment_padding_bytes, src_central_dir_following_data_size;
++    mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs;
++    mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
++    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
++    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
++    mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
++    size_t orig_central_dir_size;
++    mz_zip_internal_state *pState;
++    void *pBuf;
++    const mz_uint8 *pSrc_central_header;
++    mz_zip_archive_file_stat src_file_stat;
++    mz_uint32 src_filename_len, src_comment_len, src_ext_len;
++    mz_uint32 local_header_filename_size, local_header_extra_len;
++    mz_uint64 local_header_comp_size, local_header_uncomp_size;
++    mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
++
++    /* Sanity checks */
++    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    /* Don't support copying files from zip64 archives to non-zip64, even though in some cases this is possible */
++    if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    /* Get pointer to the source central dir header and crack it */
++    if (NULL == (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index)))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    src_filename_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    src_comment_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
++    src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS);
++    src_central_dir_following_data_size = src_filename_len + src_ext_len + src_comment_len;
++
++    /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32 fudge factor in case we need to add more extra data) */
++    if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX)
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++
++    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
++
++    if (!pState->m_zip64)
++    {
++        if (pZip->m_total_files == MZ_UINT16_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++    else
++    {
++        /* TODO: Our zip64 support still has some 32-bit limits that may not be worth fixing. */
++        if (pZip->m_total_files == MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++
++    if (!mz_zip_file_stat_internal(pSource_zip, src_file_index, pSrc_central_header, &src_file_stat, NULL))
++        return MZ_FALSE;
++
++    cur_src_file_ofs = src_file_stat.m_local_header_ofs;
++    cur_dst_file_ofs = pZip->m_archive_size;
++
++    /* Read the source archive's local dir header */
++    if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++
++    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++
++    cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
++
++    /* Compute the total size we need to copy (filename+extra data+compressed data) */
++    local_header_filename_size = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
++    local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
++    local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
++    local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
++    src_archive_bytes_remaining = local_header_filename_size + local_header_extra_len + src_file_stat.m_comp_size;
++
++    /* Try to find a zip64 extended information field */
++    if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
++    {
++        mz_zip_array file_data_array;
++        const mz_uint8 *pExtra_data;
++        mz_uint32 extra_size_remaining = local_header_extra_len;
++
++        mz_zip_array_init(&file_data_array, 1);
++        if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len, MZ_FALSE))
++        {
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, src_file_stat.m_local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_size, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
++        {
++            mz_zip_array_clear(pZip, &file_data_array);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++        }
++
++        pExtra_data = (const mz_uint8 *)file_data_array.m_p;
++
++        do
++        {
++            mz_uint32 field_id, field_data_size, field_total_size;
++
++            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
++            {
++                mz_zip_array_clear(pZip, &file_data_array);
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++            }
++
++            field_id = MZ_READ_LE16(pExtra_data);
++            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
++            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
++
++            if (field_total_size > extra_size_remaining)
++            {
++                mz_zip_array_clear(pZip, &file_data_array);
++                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++            }
++
++            if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
++            {
++                const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
++
++                if (field_data_size < sizeof(mz_uint64) * 2)
++                {
++                    mz_zip_array_clear(pZip, &file_data_array);
++                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
++                }
++
++                local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
++                local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); /* may be 0 if there's a descriptor */
++
++                found_zip64_ext_data_in_ldir = MZ_TRUE;
++                break;
++            }
++
++            pExtra_data += field_total_size;
++            extra_size_remaining -= field_total_size;
++        } while (extra_size_remaining);
++
++        mz_zip_array_clear(pZip, &file_data_array);
++    }
++
++    if (!pState->m_zip64)
++    {
++        /* Try to detect if the new archive will most likely wind up too big and bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which could be present, +64 is a fudge factor). */
++        /* We also check when the archive is finalized so this doesn't need to be perfect. */
++        mz_uint64 approx_new_archive_size = cur_dst_file_ofs + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining + (sizeof(mz_uint32) * 4) +
++                                            pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64;
++
++        if (approx_new_archive_size >= MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++    }
++
++    /* Write dest archive padding */
++    if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes))
++        return MZ_FALSE;
++
++    cur_dst_file_ofs += num_alignment_padding_bytes;
++
++    local_dir_header_ofs = cur_dst_file_ofs;
++    if (pZip->m_file_offset_alignment)
++    {
++        MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
++    }
++
++    /* The original zip's local header+ext block doesn't change, even with zip64, so we can just copy it over to the dest zip */
++    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++    cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
++
++    /* Copy over the source archive bytes to the dest archive, also ensure we have enough buf space to handle optional data descriptor */
++    if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining)))))
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++    while (src_archive_bytes_remaining)
++    {
++        n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining);
++        if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, n) != n)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++        }
++        cur_src_file_ofs += n;
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++        cur_dst_file_ofs += n;
++
++        src_archive_bytes_remaining -= n;
++    }
++
++    /* Now deal with the optional data descriptor */
++    bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
++    if (bit_flags & 8)
++    {
++        /* Copy data descriptor */
++        if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir))
++        {
++            /* src is zip64, dest must be zip64 */
++
++            /* name			uint32_t's */
++            /* id				1 (optional in zip64?) */
++            /* crc			1 */
++            /* comp_size	2 */
++            /* uncomp_size 2 */
++            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, (sizeof(mz_uint32) * 6)) != (sizeof(mz_uint32) * 6))
++            {
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++            }
++
++            n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5);
++        }
++        else
++        {
++            /* src is NOT zip64 */
++            mz_bool has_id;
++
++            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4)
++            {
++                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
++            }
++
++            has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
++
++            if (pZip->m_pState->m_zip64)
++            {
++                /* dest is zip64, so upgrade the data descriptor */
++                const mz_uint32 *pSrc_descriptor = (const mz_uint32 *)((const mz_uint8 *)pBuf + (has_id ? sizeof(mz_uint32) : 0));
++                const mz_uint32 src_crc32 = pSrc_descriptor[0];
++                const mz_uint64 src_comp_size = pSrc_descriptor[1];
++                const mz_uint64 src_uncomp_size = pSrc_descriptor[2];
++
++                mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID);
++                mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32);
++                mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size);
++                mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4, src_uncomp_size);
++
++                n = sizeof(mz_uint32) * 6;
++            }
++            else
++            {
++                /* dest is NOT zip64, just copy it as-is */
++                n = sizeof(mz_uint32) * (has_id ? 4 : 3);
++            }
++        }
++
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
++        {
++            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++        }
++
++        cur_src_file_ofs += n;
++        cur_dst_file_ofs += n;
++    }
++    pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
++
++    /* Finally, add the new central dir header */
++    orig_central_dir_size = pState->m_central_dir.m_size;
++
++    memcpy(new_central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
++
++    if (pState->m_zip64)
++    {
++        /* This is the painful part: We need to write a new central dir header + ext block with updated zip64 fields, and ensure the old fields (if any) are not included. */
++        const mz_uint8 *pSrc_ext = pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len;
++        mz_zip_array new_ext_block;
++
++        mz_zip_array_init(&new_ext_block, sizeof(mz_uint8));
++
++        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
++        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
++        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_UINT32_MAX);
++
++        if (!mz_zip_writer_update_zip64_extension_block(&new_ext_block, pZip, pSrc_ext, src_ext_len, &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size, &local_dir_header_ofs, NULL))
++        {
++            mz_zip_array_clear(pZip, &new_ext_block);
++            return MZ_FALSE;
++        }
++
++        MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS, new_ext_block.m_size);
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
++        {
++            mz_zip_array_clear(pZip, &new_ext_block);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_filename_len))
++        {
++            mz_zip_array_clear(pZip, &new_ext_block);
++            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p, new_ext_block.m_size))
++        {
++            mz_zip_array_clear(pZip, &new_ext_block);
++            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len + src_ext_len, src_comment_len))
++        {
++            mz_zip_array_clear(pZip, &new_ext_block);
++            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++
++        mz_zip_array_clear(pZip, &new_ext_block);
++    }
++    else
++    {
++        /* sanity checks */
++        if (cur_dst_file_ofs > MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++        if (local_dir_header_ofs >= MZ_UINT32_MAX)
++            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
++
++        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_dir_header_ofs);
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++
++        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_central_dir_following_data_size))
++        {
++            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++        }
++    }
++
++    /* This shouldn't trigger unless we screwed up during the initial sanity checks */
++    if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
++    {
++        /* TODO: Support central dirs >= 32-bits in size */
++        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
++    }
++
++    n = (mz_uint32)orig_central_dir_size;
++    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1))
++    {
++        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
++        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
++    }
++
++    pZip->m_total_files++;
++    pZip->m_archive_size = cur_dst_file_ofs;
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip)
++{
++    mz_zip_internal_state *pState;
++    mz_uint64 central_dir_ofs, central_dir_size;
++    mz_uint8 hdr[256];
++
++    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    pState = pZip->m_pState;
++
++    if (pState->m_zip64)
++    {
++        if ((pZip->m_total_files > MZ_UINT32_MAX) || (pState->m_central_dir.m_size >= MZ_UINT32_MAX))
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++    else
++    {
++        if ((pZip->m_total_files > MZ_UINT16_MAX) || ((pZip->m_archive_size + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX))
++            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
++    }
++
++    central_dir_ofs = 0;
++    central_dir_size = 0;
++    if (pZip->m_total_files)
++    {
++        /* Write central directory */
++        central_dir_ofs = pZip->m_archive_size;
++        central_dir_size = pState->m_central_dir.m_size;
++        pZip->m_central_directory_file_ofs = central_dir_ofs;
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs, pState->m_central_dir.m_p, (size_t)central_dir_size) != central_dir_size)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        pZip->m_archive_size += central_dir_size;
++    }
++
++    if (pState->m_zip64)
++    {
++        /* Write zip64 end of central directory header */
++        mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size;
++
++        MZ_CLEAR_OBJ(hdr);
++        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) - sizeof(mz_uint64));
++        MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS, 0x031E); /* TODO: always Unix */
++        MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, pZip->m_total_files);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS, pZip->m_total_files);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs);
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE;
++
++        /* Write zip64 end of central directory locator */
++        MZ_CLEAR_OBJ(hdr);
++        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG);
++        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS, rel_ofs_to_zip64_ecdr);
++        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1);
++        if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
++            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++        pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE;
++    }
++
++    /* Write end of central directory record */
++    MZ_CLEAR_OBJ(hdr);
++    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG);
++    MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
++    MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
++    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_size));
++    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_ofs));
++
++    if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
++
++#ifndef MINIZ_NO_STDIO
++    if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF))
++        return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++    pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE;
++
++    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize)
++{
++    if ((!ppBuf) || (!pSize))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    *ppBuf = NULL;
++    *pSize = 0;
++
++    if ((!pZip) || (!pZip->m_pState))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (pZip->m_pWrite != mz_zip_heap_write_func)
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    if (!mz_zip_writer_finalize_archive(pZip))
++        return MZ_FALSE;
++
++    *ppBuf = pZip->m_pState->m_pMem;
++    *pSize = pZip->m_pState->m_mem_size;
++    pZip->m_pState->m_pMem = NULL;
++    pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0;
++
++    return MZ_TRUE;
++}
++
++mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
++{
++    return mz_zip_writer_end_internal(pZip, MZ_TRUE);
++}
++
++#ifndef MINIZ_NO_STDIO
++mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
++{
++    return mz_zip_add_mem_to_archive_file_in_place_v2(pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, NULL);
++}
++
++mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr)
++{
++    mz_bool status, created_new_archive = MZ_FALSE;
++    mz_zip_archive zip_archive;
++    struct MZ_FILE_STAT_STRUCT file_stat;
++    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
++
++    mz_zip_zero_struct(&zip_archive);
++    if ((int)level_and_flags < 0)
++        level_and_flags = MZ_DEFAULT_LEVEL;
++
++    if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || ((comment_size) && (!pComment)) || ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION))
++    {
++        if (pErr)
++            *pErr = MZ_ZIP_INVALID_PARAMETER;
++        return MZ_FALSE;
++    }
++
++    if (!mz_zip_writer_validate_archive_name(pArchive_name))
++    {
++        if (pErr)
++            *pErr = MZ_ZIP_INVALID_FILENAME;
++        return MZ_FALSE;
++    }
++
++    /* Important: The regular non-64 bit version of stat() can fail here if the file is very large, which could cause the archive to be overwritten. */
++    /* So be sure to compile with _LARGEFILE64_SOURCE 1 */
++    if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0)
++    {
++        /* Create a new archive. */
++        if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0, level_and_flags))
++        {
++            if (pErr)
++                *pErr = zip_archive.m_last_error;
++            return MZ_FALSE;
++        }
++
++        created_new_archive = MZ_TRUE;
++    }
++    else
++    {
++        /* Append to an existing archive. */
++        if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0))
++        {
++            if (pErr)
++                *pErr = zip_archive.m_last_error;
++            return MZ_FALSE;
++        }
++
++        if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename, level_and_flags))
++        {
++            if (pErr)
++                *pErr = zip_archive.m_last_error;
++
++            mz_zip_reader_end_internal(&zip_archive, MZ_FALSE);
++
++            return MZ_FALSE;
++        }
++    }
++
++    status = mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0);
++    actual_err = zip_archive.m_last_error;
++
++    /* Always finalize, even if adding failed for some reason, so we have a valid central directory. (This may not always succeed, but we can try.) */
++    if (!mz_zip_writer_finalize_archive(&zip_archive))
++    {
++        if (!actual_err)
++            actual_err = zip_archive.m_last_error;
++
++        status = MZ_FALSE;
++    }
++
++    if (!mz_zip_writer_end_internal(&zip_archive, status))
++    {
++        if (!actual_err)
++            actual_err = zip_archive.m_last_error;
++
++        status = MZ_FALSE;
++    }
++
++    if ((!status) && (created_new_archive))
++    {
++        /* It's a new archive and something went wrong, so just delete it. */
++        int ignoredStatus = MZ_DELETE_FILE(pZip_filename);
++        (void)ignoredStatus;
++    }
++
++    if (pErr)
++        *pErr = actual_err;
++
++    return status;
++}
++
++void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr)
++{
++    mz_uint32 file_index;
++    mz_zip_archive zip_archive;
++    void *p = NULL;
++
++    if (pSize)
++        *pSize = 0;
++
++    if ((!pZip_filename) || (!pArchive_name))
++    {
++        if (pErr)
++            *pErr = MZ_ZIP_INVALID_PARAMETER;
++
++        return NULL;
++    }
++
++    mz_zip_zero_struct(&zip_archive);
++    if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0))
++    {
++        if (pErr)
++            *pErr = zip_archive.m_last_error;
++
++        return NULL;
++    }
++
++    if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags, &file_index))
++    {
++        p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
++    }
++
++    mz_zip_reader_end_internal(&zip_archive, p != NULL);
++
++    if (pErr)
++        *pErr = zip_archive.m_last_error;
++
++    return p;
++}
++
++void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags)
++{
++    return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name, NULL, pSize, flags, NULL);
++}
++
++#endif /* #ifndef MINIZ_NO_STDIO */
++
++#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
++
++/* ------------------- Misc utils */
++
++mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip)
++{
++    return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID;
++}
++
++mz_zip_type mz_zip_get_type(mz_zip_archive *pZip)
++{
++    return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID;
++}
++
++mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num)
++{
++    mz_zip_error prev_err;
++
++    if (!pZip)
++        return MZ_ZIP_INVALID_PARAMETER;
++
++    prev_err = pZip->m_last_error;
++
++    pZip->m_last_error = err_num;
++    return prev_err;
++}
++
++mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip)
++{
++    if (!pZip)
++        return MZ_ZIP_INVALID_PARAMETER;
++
++    return pZip->m_last_error;
++}
++
++mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip)
++{
++    return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR);
++}
++
++mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip)
++{
++    mz_zip_error prev_err;
++
++    if (!pZip)
++        return MZ_ZIP_INVALID_PARAMETER;
++
++    prev_err = pZip->m_last_error;
++
++    pZip->m_last_error = MZ_ZIP_NO_ERROR;
++    return prev_err;
++}
++
++const char *mz_zip_get_error_string(mz_zip_error mz_err)
++{
++    switch (mz_err)
++    {
++        case MZ_ZIP_NO_ERROR:
++            return "no error";
++        case MZ_ZIP_UNDEFINED_ERROR:
++            return "undefined error";
++        case MZ_ZIP_TOO_MANY_FILES:
++            return "too many files";
++        case MZ_ZIP_FILE_TOO_LARGE:
++            return "file too large";
++        case MZ_ZIP_UNSUPPORTED_METHOD:
++            return "unsupported method";
++        case MZ_ZIP_UNSUPPORTED_ENCRYPTION:
++            return "unsupported encryption";
++        case MZ_ZIP_UNSUPPORTED_FEATURE:
++            return "unsupported feature";
++        case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR:
++            return "failed finding central directory";
++        case MZ_ZIP_NOT_AN_ARCHIVE:
++            return "not a ZIP archive";
++        case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED:
++            return "invalid header or archive is corrupted";
++        case MZ_ZIP_UNSUPPORTED_MULTIDISK:
++            return "unsupported multidisk archive";
++        case MZ_ZIP_DECOMPRESSION_FAILED:
++            return "decompression failed or archive is corrupted";
++        case MZ_ZIP_COMPRESSION_FAILED:
++            return "compression failed";
++        case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE:
++            return "unexpected decompressed size";
++        case MZ_ZIP_CRC_CHECK_FAILED:
++            return "CRC-32 check failed";
++        case MZ_ZIP_UNSUPPORTED_CDIR_SIZE:
++            return "unsupported central directory size";
++        case MZ_ZIP_ALLOC_FAILED:
++            return "allocation failed";
++        case MZ_ZIP_FILE_OPEN_FAILED:
++            return "file open failed";
++        case MZ_ZIP_FILE_CREATE_FAILED:
++            return "file create failed";
++        case MZ_ZIP_FILE_WRITE_FAILED:
++            return "file write failed";
++        case MZ_ZIP_FILE_READ_FAILED:
++            return "file read failed";
++        case MZ_ZIP_FILE_CLOSE_FAILED:
++            return "file close failed";
++        case MZ_ZIP_FILE_SEEK_FAILED:
++            return "file seek failed";
++        case MZ_ZIP_FILE_STAT_FAILED:
++            return "file stat failed";
++        case MZ_ZIP_INVALID_PARAMETER:
++            return "invalid parameter";
++        case MZ_ZIP_INVALID_FILENAME:
++            return "invalid filename";
++        case MZ_ZIP_BUF_TOO_SMALL:
++            return "buffer too small";
++        case MZ_ZIP_INTERNAL_ERROR:
++            return "internal error";
++        case MZ_ZIP_FILE_NOT_FOUND:
++            return "file not found";
++        case MZ_ZIP_ARCHIVE_TOO_LARGE:
++            return "archive is too large";
++        case MZ_ZIP_VALIDATION_FAILED:
++            return "validation failed";
++        case MZ_ZIP_WRITE_CALLBACK_FAILED:
++            return "write calledback failed";
++        default:
++            break;
++    }
++
++    return "unknown error";
++}
++
++/* Note: Just because the archive is not zip64 doesn't necessarily mean it doesn't have Zip64 extended information extra field, argh. */
++mz_bool mz_zip_is_zip64(mz_zip_archive *pZip)
++{
++    if ((!pZip) || (!pZip->m_pState))
++        return MZ_FALSE;
++
++    return pZip->m_pState->m_zip64;
++}
++
++size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip)
++{
++    if ((!pZip) || (!pZip->m_pState))
++        return 0;
++
++    return pZip->m_pState->m_central_dir.m_size;
++}
++
++mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip)
++{
++    return pZip ? pZip->m_total_files : 0;
++}
++
++mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip)
++{
++    if (!pZip)
++        return 0;
++    return pZip->m_archive_size;
++}
++
++mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip)
++{
++    if ((!pZip) || (!pZip->m_pState))
++        return 0;
++    return pZip->m_pState->m_file_archive_start_ofs;
++}
++
++MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip)
++{
++    if ((!pZip) || (!pZip->m_pState))
++        return 0;
++    return pZip->m_pState->m_pFile;
++}
++
++size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n)
++{
++    if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead))
++        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++
++    return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n);
++}
++
++mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size)
++{
++    mz_uint n;
++    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
++    if (!p)
++    {
++        if (filename_buf_size)
++            pFilename[0] = '\0';
++        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
++        return 0;
++    }
++    n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
++    if (filename_buf_size)
++    {
++        n = MZ_MIN(n, filename_buf_size - 1);
++        memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
++        pFilename[n] = '\0';
++    }
++    return n + 1;
++}
++
++mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat)
++{
++    return mz_zip_file_stat_internal(pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL);
++}
++
++mz_bool mz_zip_end(mz_zip_archive *pZip)
++{
++    if (!pZip)
++        return MZ_FALSE;
++
++    if (pZip->m_zip_mode == MZ_ZIP_MODE_READING)
++        return mz_zip_reader_end(pZip);
++#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
++    else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) || (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))
++        return mz_zip_writer_end(pZip);
++#endif
++
++    return MZ_FALSE;
++}
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/
++/*** End of #include "miniz.c" ***/
++
++#endif
++#endif
++
++/*
++** COMPRESS
++*/
++#ifdef SQLITE_ENABLE_COMPRESS
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_compress_init(sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
++/* #include "compress.c" */
++/*** Begin of #include "compress.c" ***/
++/*
++** 2014-06-13
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This SQLite extension implements SQL compression functions
++** compress() and uncompress() using ZLIB.
++*/
++/* #include "sqlite3ext.h" */
++
++SQLITE_EXTENSION_INIT1
++/* #include "zlibwrap.h" */
++/*** Begin of #include "zlibwrap.h" ***/
++/*
++** Name:        zlibwrap.h
++** Purpose:     Include wrapper for miniz.h
++** Author:      Ulrich Telle
++** Created:     2022-05-09
++** Copyright:   (c) 2022 Ulrich Telle
++** License:     MIT
++*/
++
++/// \file zlibwrap.h Include wrapper for using miniz.h instead of the original zlib.h
++
++#ifndef SQLITE3MC_ZLIBWRAP_H_
++#define SQLITE3MC_ZLIBWRAP_H_
++
++#if SQLITE3MC_USE_MINIZ != 0
++/* #include "miniz.h" */
++
++#else
++#include 
++#endif
++
++
++#endif /* SQLITE3MC_ZLIBWRAP_H_ */
++/*** End of #include "zlibwrap.h" ***/
++
++
++/*
++** Implementation of the "compress(X)" SQL function.  The input X is
++** compressed using zLib and the output is returned.
++**
++** The output is a BLOB that begins with a variable-length integer that
++** is the input size in bytes (the size of X before compression).  The
++** variable-length integer is implemented as 1 to 5 bytes.  There are
++** seven bits per integer stored in the lower seven bits of each byte.
++** More significant bits occur first.  The most significant bit (0x80)
++** is a flag to indicate the end of the integer.
++**
++** This function, SQLAR, and ZIP all use the same "deflate" compression
++** algorithm, but each is subtly different:
++**
++**   *  ZIP uses raw deflate.
++**
++**   *  SQLAR uses the "zlib format" which is raw deflate with a two-byte
++**      algorithm-identification header and a four-byte checksum at the end.
++**
++**   *  This utility uses the "zlib format" like SQLAR, but adds the variable-
++**      length integer uncompressed size value at the beginning.
++**
++** This function might be extended in the future to support compression
++** formats other than deflate, by providing a different algorithm-id
++** mark following the variable-length integer size parameter.
++*/
++static void compressFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  const unsigned char *pIn;
++  unsigned char *pOut;
++  unsigned int nIn;
++  unsigned long int nOut;
++  unsigned char x[8];
++  int rc;
++  int i, j;
++
++  pIn = sqlite3_value_blob(argv[0]);
++  nIn = sqlite3_value_bytes(argv[0]);
++  nOut = 13 + nIn + (nIn+999)/1000;
++  pOut = sqlite3_malloc( nOut+5 );
++  for(i=4; i>=0; i--){
++    x[i] = (nIn >> (7*(4-i)))&0x7f;
++  }
++  for(i=0; i<4 && x[i]==0; i++){}
++  for(j=0; i<=4; i++, j++) pOut[j] = x[i];
++  pOut[j-1] |= 0x80;
++  rc = compress(&pOut[j], &nOut, pIn, nIn);
++  if( rc==Z_OK ){
++    sqlite3_result_blob(context, pOut, nOut+j, sqlite3_free);
++  }else{
++    sqlite3_free(pOut);
++  }
++}
++
++/*
++** Implementation of the "uncompress(X)" SQL function.  The argument X
++** is a blob which was obtained from compress(Y).  The output will be
++** the value Y.
++*/
++static void uncompressFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  const unsigned char *pIn;
++  unsigned char *pOut;
++  unsigned int nIn;
++  unsigned long int nOut;
++  int rc;
++  unsigned int i;
++
++  pIn = sqlite3_value_blob(argv[0]);
++  nIn = sqlite3_value_bytes(argv[0]);
++  nOut = 0;
++  for(i=0; i
++
++/*
++** Implementation of the "sqlar_compress(X)" SQL function.
++**
++** If the type of X is SQLITE_BLOB, and compressing that blob using
++** zlib utility function compress() yields a smaller blob, return the
++** compressed blob. Otherwise, return a copy of X.
++**
++** SQLar uses the "zlib format" for compressed content.  The zlib format
++** contains a two-byte identification header and a four-byte checksum at
++** the end.  This is different from ZIP which uses the raw deflate format.
++**
++** Future enhancements to SQLar might add support for new compression formats.
++** If so, those new formats will be identified by alternative headers in the
++** compressed data.
++*/
++static void sqlarCompressFunc(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  assert( argc==1 );
++  if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){
++    const Bytef *pData = sqlite3_value_blob(argv[0]);
++    uLong nData = sqlite3_value_bytes(argv[0]);
++    uLongf nOut = compressBound(nData);
++    Bytef *pOut;
++
++    pOut = (Bytef*)sqlite3_malloc(nOut);
++    if( pOut==0 ){
++      sqlite3_result_error_nomem(context);
++      return;
++    }else{
++      if( Z_OK!=compress(pOut, &nOut, pData, nData) ){
++        sqlite3_result_error(context, "error in compress()", -1);
++      }else if( nOut
++#include 
++#include 
++#include 
++
++/* #include "zlibwrap.h" */
++
++
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++
++#ifndef SQLITE_AMALGAMATION
++
++#ifndef UINT32_TYPE
++# ifdef HAVE_UINT32_T
++#  define UINT32_TYPE uint32_t
++# else
++#  define UINT32_TYPE unsigned int
++# endif
++#endif
++#ifndef UINT16_TYPE
++# ifdef HAVE_UINT16_T
++#  define UINT16_TYPE uint16_t
++# else
++#  define UINT16_TYPE unsigned short int
++# endif
++#endif
++typedef sqlite3_int64 i64;
++typedef unsigned char u8;
++typedef UINT32_TYPE u32;           /* 4-byte unsigned integer */
++typedef UINT16_TYPE u16;           /* 2-byte unsigned integer */
++#define MIN(a,b) ((a)<(b) ? (a) : (b))
++
++#if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
++# define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
++#endif
++#if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
++# define ALWAYS(X)      (1)
++# define NEVER(X)       (0)
++#elif !defined(NDEBUG)
++# define ALWAYS(X)      ((X)?1:(assert(0),0))
++# define NEVER(X)       ((X)?(assert(0),1):0)
++#else
++# define ALWAYS(X)      (X)
++# define NEVER(X)       (X)
++#endif
++
++#endif   /* SQLITE_AMALGAMATION */
++
++/*
++** Definitions for mode bitmasks S_IFDIR, S_IFREG and S_IFLNK.
++**
++** In some ways it would be better to obtain these values from system 
++** header files. But, the dependency is undesirable and (a) these
++** have been stable for decades, (b) the values are part of POSIX and
++** are also made explicit in [man stat], and (c) are part of the 
++** file format for zip archives.
++*/
++#ifndef S_IFDIR
++# define S_IFDIR 0040000
++#endif
++#ifndef S_IFREG
++# define S_IFREG 0100000
++#endif
++#ifndef S_IFLNK
++# define S_IFLNK 0120000
++#endif
++
++static const char ZIPFILE_SCHEMA[] = 
++  "CREATE TABLE y("
++    "name PRIMARY KEY,"  /* 0: Name of file in zip archive */
++    "mode,"              /* 1: POSIX mode for file */
++    "mtime,"             /* 2: Last modification time (secs since 1970)*/
++    "sz,"                /* 3: Size of object */
++    "rawdata,"           /* 4: Raw data */
++    "data,"              /* 5: Uncompressed data */
++    "method,"            /* 6: Compression method (integer) */
++    "z HIDDEN"           /* 7: Name of zip file */
++  ") WITHOUT ROWID;";
++
++#define ZIPFILE_F_COLUMN_IDX 7    /* Index of column "file" in the above */
++#define ZIPFILE_BUFFER_SIZE (64*1024)
++
++
++/*
++** Magic numbers used to read and write zip files.
++**
++** ZIPFILE_NEWENTRY_MADEBY:
++**   Use this value for the "version-made-by" field in new zip file
++**   entries. The upper byte indicates "unix", and the lower byte 
++**   indicates that the zip file matches pkzip specification 3.0. 
++**   This is what info-zip seems to do.
++**
++** ZIPFILE_NEWENTRY_REQUIRED:
++**   Value for "version-required-to-extract" field of new entries.
++**   Version 2.0 is required to support folders and deflate compression.
++**
++** ZIPFILE_NEWENTRY_FLAGS:
++**   Value for "general-purpose-bit-flags" field of new entries. Bit
++**   11 means "utf-8 filename and comment".
++**
++** ZIPFILE_SIGNATURE_CDS:
++**   First 4 bytes of a valid CDS record.
++**
++** ZIPFILE_SIGNATURE_LFH:
++**   First 4 bytes of a valid LFH record.
++**
++** ZIPFILE_SIGNATURE_EOCD
++**   First 4 bytes of a valid EOCD record.
++*/
++#define ZIPFILE_EXTRA_TIMESTAMP   0x5455
++#define ZIPFILE_NEWENTRY_MADEBY   ((3<<8) + 30)
++#define ZIPFILE_NEWENTRY_REQUIRED 20
++#define ZIPFILE_NEWENTRY_FLAGS    0x800
++#define ZIPFILE_SIGNATURE_CDS     0x02014b50
++#define ZIPFILE_SIGNATURE_LFH     0x04034b50
++#define ZIPFILE_SIGNATURE_EOCD    0x06054b50
++
++/*
++** The sizes of the fixed-size part of each of the three main data 
++** structures in a zip archive.
++*/
++#define ZIPFILE_LFH_FIXED_SZ      30
++#define ZIPFILE_EOCD_FIXED_SZ     22
++#define ZIPFILE_CDS_FIXED_SZ      46
++
++/*
++*** 4.3.16  End of central directory record:
++***
++***   end of central dir signature    4 bytes  (0x06054b50)
++***   number of this disk             2 bytes
++***   number of the disk with the
++***   start of the central directory  2 bytes
++***   total number of entries in the
++***   central directory on this disk  2 bytes
++***   total number of entries in
++***   the central directory           2 bytes
++***   size of the central directory   4 bytes
++***   offset of start of central
++***   directory with respect to
++***   the starting disk number        4 bytes
++***   .ZIP file comment length        2 bytes
++***   .ZIP file comment       (variable size)
++*/
++typedef struct ZipfileEOCD ZipfileEOCD;
++struct ZipfileEOCD {
++  u16 iDisk;
++  u16 iFirstDisk;
++  u16 nEntry;
++  u16 nEntryTotal;
++  u32 nSize;
++  u32 iOffset;
++};
++
++/*
++*** 4.3.12  Central directory structure:
++***
++*** ...
++***
++***   central file header signature   4 bytes  (0x02014b50)
++***   version made by                 2 bytes
++***   version needed to extract       2 bytes
++***   general purpose bit flag        2 bytes
++***   compression method              2 bytes
++***   last mod file time              2 bytes
++***   last mod file date              2 bytes
++***   crc-32                          4 bytes
++***   compressed size                 4 bytes
++***   uncompressed size               4 bytes
++***   file name length                2 bytes
++***   extra field length              2 bytes
++***   file comment length             2 bytes
++***   disk number start               2 bytes
++***   internal file attributes        2 bytes
++***   external file attributes        4 bytes
++***   relative offset of local header 4 bytes
++*/
++typedef struct ZipfileCDS ZipfileCDS;
++struct ZipfileCDS {
++  u16 iVersionMadeBy;
++  u16 iVersionExtract;
++  u16 flags;
++  u16 iCompression;
++  u16 mTime;
++  u16 mDate;
++  u32 crc32;
++  u32 szCompressed;
++  u32 szUncompressed;
++  u16 nFile;
++  u16 nExtra;
++  u16 nComment;
++  u16 iDiskStart;
++  u16 iInternalAttr;
++  u32 iExternalAttr;
++  u32 iOffset;
++  char *zFile;                    /* Filename (sqlite3_malloc()) */
++};
++
++/*
++*** 4.3.7  Local file header:
++***
++***   local file header signature     4 bytes  (0x04034b50)
++***   version needed to extract       2 bytes
++***   general purpose bit flag        2 bytes
++***   compression method              2 bytes
++***   last mod file time              2 bytes
++***   last mod file date              2 bytes
++***   crc-32                          4 bytes
++***   compressed size                 4 bytes
++***   uncompressed size               4 bytes
++***   file name length                2 bytes
++***   extra field length              2 bytes
++***   
++*/
++typedef struct ZipfileLFH ZipfileLFH;
++struct ZipfileLFH {
++  u16 iVersionExtract;
++  u16 flags;
++  u16 iCompression;
++  u16 mTime;
++  u16 mDate;
++  u32 crc32;
++  u32 szCompressed;
++  u32 szUncompressed;
++  u16 nFile;
++  u16 nExtra;
++};
++
++typedef struct ZipfileEntry ZipfileEntry;
++struct ZipfileEntry {
++  ZipfileCDS cds;            /* Parsed CDS record */
++  u32 mUnixTime;             /* Modification time, in UNIX format */
++  u8 *aExtra;                /* cds.nExtra+cds.nComment bytes of extra data */
++  i64 iDataOff;              /* Offset to data in file (if aData==0) */
++  u8 *aData;                 /* cds.szCompressed bytes of compressed data */
++  ZipfileEntry *pNext;       /* Next element in in-memory CDS */
++};
++
++/* 
++** Cursor type for zipfile tables.
++*/
++typedef struct ZipfileCsr ZipfileCsr;
++struct ZipfileCsr {
++  sqlite3_vtab_cursor base;  /* Base class - must be first */
++  i64 iId;                   /* Cursor ID */
++  u8 bEof;                   /* True when at EOF */
++  u8 bNoop;                  /* If next xNext() call is no-op */
++
++  /* Used outside of write transactions */
++  FILE *pFile;               /* Zip file */
++  i64 iNextOff;              /* Offset of next record in central directory */
++  ZipfileEOCD eocd;          /* Parse of central directory record */
++
++  ZipfileEntry *pFreeEntry;  /* Free this list when cursor is closed or reset */
++  ZipfileEntry *pCurrent;    /* Current entry */
++  ZipfileCsr *pCsrNext;      /* Next cursor on same virtual table */
++};
++
++typedef struct ZipfileTab ZipfileTab;
++struct ZipfileTab {
++  sqlite3_vtab base;         /* Base class - must be first */
++  char *zFile;               /* Zip file this table accesses (may be NULL) */
++  sqlite3 *db;               /* Host database connection */
++  u8 *aBuffer;               /* Temporary buffer used for various tasks */
++
++  ZipfileCsr *pCsrList;      /* List of cursors */
++  i64 iNextCsrid;
++
++  /* The following are used by write transactions only */
++  ZipfileEntry *pFirstEntry; /* Linked list of all files (if pWriteFd!=0) */
++  ZipfileEntry *pLastEntry;  /* Last element in pFirstEntry list */
++  FILE *pWriteFd;            /* File handle open on zip archive */
++  i64 szCurrent;             /* Current size of zip archive */
++  i64 szOrig;                /* Size of archive at start of transaction */
++};
++
++/*
++** Set the error message contained in context ctx to the results of
++** vprintf(zFmt, ...).
++*/
++static void zipfileCtxErrorMsg(sqlite3_context *ctx, const char *zFmt, ...){
++  char *zMsg = 0;
++  va_list ap;
++  va_start(ap, zFmt);
++  zMsg = sqlite3_vmprintf(zFmt, ap);
++  sqlite3_result_error(ctx, zMsg, -1);
++  sqlite3_free(zMsg);
++  va_end(ap);
++}
++
++/*
++** If string zIn is quoted, dequote it in place. Otherwise, if the string
++** is not quoted, do nothing.
++*/
++static void zipfileDequote(char *zIn){
++  char q = zIn[0];
++  if( q=='"' || q=='\'' || q=='`' || q=='[' ){
++    int iIn = 1;
++    int iOut = 0;
++    if( q=='[' ) q = ']';
++    while( ALWAYS(zIn[iIn]) ){
++      char c = zIn[iIn++];
++      if( c==q && zIn[iIn++]!=q ) break;
++      zIn[iOut++] = c;
++    }
++    zIn[iOut] = '\0';
++  }
++}
++
++/*
++** Construct a new ZipfileTab virtual table object.
++** 
++**   argv[0]   -> module name  ("zipfile")
++**   argv[1]   -> database name
++**   argv[2]   -> table name
++**   argv[...] -> "column name" and other module argument fields.
++*/
++static int zipfileConnect(
++  sqlite3 *db,
++  void *pAux,
++  int argc, const char *const*argv,
++  sqlite3_vtab **ppVtab,
++  char **pzErr
++){
++  int nByte = sizeof(ZipfileTab) + ZIPFILE_BUFFER_SIZE;
++  int nFile = 0;
++  const char *zFile = 0;
++  ZipfileTab *pNew = 0;
++  int rc;
++  (void)pAux;
++
++  /* If the table name is not "zipfile", require that the argument be
++  ** specified. This stops zipfile tables from being created as:
++  **
++  **   CREATE VIRTUAL TABLE zzz USING zipfile();
++  **
++  ** It does not prevent:
++  **
++  **   CREATE VIRTUAL TABLE zipfile USING zipfile();
++  */
++  assert( 0==sqlite3_stricmp(argv[0], "zipfile") );
++  if( (0!=sqlite3_stricmp(argv[2], "zipfile") && argc<4) || argc>4 ){
++    *pzErr = sqlite3_mprintf("zipfile constructor requires one argument");
++    return SQLITE_ERROR;
++  }
++
++  if( argc>3 ){
++    zFile = argv[3];
++    nFile = (int)strlen(zFile)+1;
++  }
++
++  rc = sqlite3_declare_vtab(db, ZIPFILE_SCHEMA);
++  if( rc==SQLITE_OK ){
++    pNew = (ZipfileTab*)sqlite3_malloc64((sqlite3_int64)nByte+nFile);
++    if( pNew==0 ) return SQLITE_NOMEM;
++    memset(pNew, 0, nByte+nFile);
++    pNew->db = db;
++    pNew->aBuffer = (u8*)&pNew[1];
++    if( zFile ){
++      pNew->zFile = (char*)&pNew->aBuffer[ZIPFILE_BUFFER_SIZE];
++      memcpy(pNew->zFile, zFile, nFile);
++      zipfileDequote(pNew->zFile);
++    }
++  }
++  sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
++  *ppVtab = (sqlite3_vtab*)pNew;
++  return rc;
++}
++
++/*
++** Free the ZipfileEntry structure indicated by the only argument.
++*/
++static void zipfileEntryFree(ZipfileEntry *p){
++  if( p ){
++    sqlite3_free(p->cds.zFile);
++    sqlite3_free(p);
++  }
++}
++
++/*
++** Release resources that should be freed at the end of a write 
++** transaction.
++*/
++static void zipfileCleanupTransaction(ZipfileTab *pTab){
++  ZipfileEntry *pEntry;
++  ZipfileEntry *pNext;
++
++  if( pTab->pWriteFd ){
++    fclose(pTab->pWriteFd);
++    pTab->pWriteFd = 0;
++  }
++  for(pEntry=pTab->pFirstEntry; pEntry; pEntry=pNext){
++    pNext = pEntry->pNext;
++    zipfileEntryFree(pEntry);
++  }
++  pTab->pFirstEntry = 0;
++  pTab->pLastEntry = 0;
++  pTab->szCurrent = 0;
++  pTab->szOrig = 0;
++}
++
++/*
++** This method is the destructor for zipfile vtab objects.
++*/
++static int zipfileDisconnect(sqlite3_vtab *pVtab){
++  zipfileCleanupTransaction((ZipfileTab*)pVtab);
++  sqlite3_free(pVtab);
++  return SQLITE_OK;
++}
++
++/*
++** Constructor for a new ZipfileCsr object.
++*/
++static int zipfileOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCsr){
++  ZipfileTab *pTab = (ZipfileTab*)p;
++  ZipfileCsr *pCsr;
++  pCsr = sqlite3_malloc(sizeof(*pCsr));
++  *ppCsr = (sqlite3_vtab_cursor*)pCsr;
++  if( pCsr==0 ){
++    return SQLITE_NOMEM;
++  }
++  memset(pCsr, 0, sizeof(*pCsr));
++  pCsr->iId = ++pTab->iNextCsrid;
++  pCsr->pCsrNext = pTab->pCsrList;
++  pTab->pCsrList = pCsr;
++  return SQLITE_OK;
++}
++
++/*
++** Reset a cursor back to the state it was in when first returned
++** by zipfileOpen().
++*/
++static void zipfileResetCursor(ZipfileCsr *pCsr){
++  ZipfileEntry *p;
++  ZipfileEntry *pNext;
++
++  pCsr->bEof = 0;
++  if( pCsr->pFile ){
++    fclose(pCsr->pFile);
++    pCsr->pFile = 0;
++    zipfileEntryFree(pCsr->pCurrent);
++    pCsr->pCurrent = 0;
++  }
++
++  for(p=pCsr->pFreeEntry; p; p=pNext){
++    pNext = p->pNext;
++    zipfileEntryFree(p);
++  }
++}
++
++/*
++** Destructor for an ZipfileCsr.
++*/
++static int zipfileClose(sqlite3_vtab_cursor *cur){
++  ZipfileCsr *pCsr = (ZipfileCsr*)cur;
++  ZipfileTab *pTab = (ZipfileTab*)(pCsr->base.pVtab);
++  ZipfileCsr **pp;
++  zipfileResetCursor(pCsr);
++
++  /* Remove this cursor from the ZipfileTab.pCsrList list. */
++  for(pp=&pTab->pCsrList; *pp!=pCsr; pp=&((*pp)->pCsrNext));
++  *pp = pCsr->pCsrNext;
++
++  sqlite3_free(pCsr);
++  return SQLITE_OK;
++}
++
++/*
++** Set the error message for the virtual table associated with cursor
++** pCsr to the results of vprintf(zFmt, ...).
++*/
++static void zipfileTableErr(ZipfileTab *pTab, const char *zFmt, ...){
++  va_list ap;
++  va_start(ap, zFmt);
++  sqlite3_free(pTab->base.zErrMsg);
++  pTab->base.zErrMsg = sqlite3_vmprintf(zFmt, ap);
++  va_end(ap);
++}
++static void zipfileCursorErr(ZipfileCsr *pCsr, const char *zFmt, ...){
++  va_list ap;
++  va_start(ap, zFmt);
++  sqlite3_free(pCsr->base.pVtab->zErrMsg);
++  pCsr->base.pVtab->zErrMsg = sqlite3_vmprintf(zFmt, ap);
++  va_end(ap);
++}
++
++/*
++** Read nRead bytes of data from offset iOff of file pFile into buffer
++** aRead[]. Return SQLITE_OK if successful, or an SQLite error code
++** otherwise. 
++**
++** If an error does occur, output variable (*pzErrmsg) may be set to point
++** to an English language error message. It is the responsibility of the
++** caller to eventually free this buffer using
++** sqlite3_free().
++*/
++static int zipfileReadData(
++  FILE *pFile,                    /* Read from this file */
++  u8 *aRead,                      /* Read into this buffer */
++  int nRead,                      /* Number of bytes to read */
++  i64 iOff,                       /* Offset to read from */
++  char **pzErrmsg                 /* OUT: Error message (from sqlite3_malloc) */
++){
++  size_t n;
++  fseek(pFile, (long)iOff, SEEK_SET);
++  n = fread(aRead, 1, nRead, pFile);
++  if( (int)n!=nRead ){
++    *pzErrmsg = sqlite3_mprintf("error in fread()");
++    return SQLITE_ERROR;
++  }
++  return SQLITE_OK;
++}
++
++static int zipfileAppendData(
++  ZipfileTab *pTab,
++  const u8 *aWrite,
++  int nWrite
++){
++  if( nWrite>0 ){
++    size_t n = nWrite;
++    fseek(pTab->pWriteFd, (long)pTab->szCurrent, SEEK_SET);
++    n = fwrite(aWrite, 1, nWrite, pTab->pWriteFd);
++    if( (int)n!=nWrite ){
++      pTab->base.zErrMsg = sqlite3_mprintf("error in fwrite()");
++      return SQLITE_ERROR;
++    }
++    pTab->szCurrent += nWrite;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Read and return a 16-bit little-endian unsigned integer from buffer aBuf.
++*/
++static u16 zipfileGetU16(const u8 *aBuf){
++  return (aBuf[1] << 8) + aBuf[0];
++}
++
++/*
++** Read and return a 32-bit little-endian unsigned integer from buffer aBuf.
++*/
++static u32 zipfileGetU32(const u8 *aBuf){
++  if( aBuf==0 ) return 0;
++  return ((u32)(aBuf[3]) << 24)
++       + ((u32)(aBuf[2]) << 16)
++       + ((u32)(aBuf[1]) <<  8)
++       + ((u32)(aBuf[0]) <<  0);
++}
++
++/*
++** Write a 16-bit little endiate integer into buffer aBuf.
++*/
++static void zipfilePutU16(u8 *aBuf, u16 val){
++  aBuf[0] = val & 0xFF;
++  aBuf[1] = (val>>8) & 0xFF;
++}
++
++/*
++** Write a 32-bit little endiate integer into buffer aBuf.
++*/
++static void zipfilePutU32(u8 *aBuf, u32 val){
++  aBuf[0] = val & 0xFF;
++  aBuf[1] = (val>>8) & 0xFF;
++  aBuf[2] = (val>>16) & 0xFF;
++  aBuf[3] = (val>>24) & 0xFF;
++}
++
++#define zipfileRead32(aBuf) ( aBuf+=4, zipfileGetU32(aBuf-4) )
++#define zipfileRead16(aBuf) ( aBuf+=2, zipfileGetU16(aBuf-2) )
++
++#define zipfileWrite32(aBuf,val) { zipfilePutU32(aBuf,val); aBuf+=4; }
++#define zipfileWrite16(aBuf,val) { zipfilePutU16(aBuf,val); aBuf+=2; }
++
++/*
++** Magic numbers used to read CDS records.
++*/
++#define ZIPFILE_CDS_NFILE_OFF        28
++#define ZIPFILE_CDS_SZCOMPRESSED_OFF 20
++
++/*
++** Decode the CDS record in buffer aBuf into (*pCDS). Return SQLITE_ERROR
++** if the record is not well-formed, or SQLITE_OK otherwise.
++*/
++static int zipfileReadCDS(u8 *aBuf, ZipfileCDS *pCDS){
++  u8 *aRead = aBuf;
++  u32 sig = zipfileRead32(aRead);
++  int rc = SQLITE_OK;
++  if( sig!=ZIPFILE_SIGNATURE_CDS ){
++    rc = SQLITE_ERROR;
++  }else{
++    pCDS->iVersionMadeBy = zipfileRead16(aRead);
++    pCDS->iVersionExtract = zipfileRead16(aRead);
++    pCDS->flags = zipfileRead16(aRead);
++    pCDS->iCompression = zipfileRead16(aRead);
++    pCDS->mTime = zipfileRead16(aRead);
++    pCDS->mDate = zipfileRead16(aRead);
++    pCDS->crc32 = zipfileRead32(aRead);
++    pCDS->szCompressed = zipfileRead32(aRead);
++    pCDS->szUncompressed = zipfileRead32(aRead);
++    assert( aRead==&aBuf[ZIPFILE_CDS_NFILE_OFF] );
++    pCDS->nFile = zipfileRead16(aRead);
++    pCDS->nExtra = zipfileRead16(aRead);
++    pCDS->nComment = zipfileRead16(aRead);
++    pCDS->iDiskStart = zipfileRead16(aRead);
++    pCDS->iInternalAttr = zipfileRead16(aRead);
++    pCDS->iExternalAttr = zipfileRead32(aRead);
++    pCDS->iOffset = zipfileRead32(aRead);
++    assert( aRead==&aBuf[ZIPFILE_CDS_FIXED_SZ] );
++  }
++
++  return rc;
++}
++
++/*
++** Decode the LFH record in buffer aBuf into (*pLFH). Return SQLITE_ERROR
++** if the record is not well-formed, or SQLITE_OK otherwise.
++*/
++static int zipfileReadLFH(
++  u8 *aBuffer,
++  ZipfileLFH *pLFH
++){
++  u8 *aRead = aBuffer;
++  int rc = SQLITE_OK;
++
++  u32 sig = zipfileRead32(aRead);
++  if( sig!=ZIPFILE_SIGNATURE_LFH ){
++    rc = SQLITE_ERROR;
++  }else{
++    pLFH->iVersionExtract = zipfileRead16(aRead);
++    pLFH->flags = zipfileRead16(aRead);
++    pLFH->iCompression = zipfileRead16(aRead);
++    pLFH->mTime = zipfileRead16(aRead);
++    pLFH->mDate = zipfileRead16(aRead);
++    pLFH->crc32 = zipfileRead32(aRead);
++    pLFH->szCompressed = zipfileRead32(aRead);
++    pLFH->szUncompressed = zipfileRead32(aRead);
++    pLFH->nFile = zipfileRead16(aRead);
++    pLFH->nExtra = zipfileRead16(aRead);
++  }
++  return rc;
++}
++
++
++/*
++** Buffer aExtra (size nExtra bytes) contains zip archive "extra" fields.
++** Scan through this buffer to find an "extra-timestamp" field. If one
++** exists, extract the 32-bit modification-timestamp from it and store
++** the value in output parameter *pmTime.
++**
++** Zero is returned if no extra-timestamp record could be found (and so
++** *pmTime is left unchanged), or non-zero otherwise.
++**
++** The general format of an extra field is:
++**
++**   Header ID    2 bytes
++**   Data Size    2 bytes
++**   Data         N bytes
++*/
++static int zipfileScanExtra(u8 *aExtra, int nExtra, u32 *pmTime){
++  int ret = 0;
++  u8 *p = aExtra;
++  u8 *pEnd = &aExtra[nExtra];
++
++  while( p modtime is present */
++          *pmTime = zipfileGetU32(&p[1]);
++          ret = 1;
++        }
++        break;
++      }
++    }
++
++    p += nByte;
++  }
++  return ret;
++}
++
++/*
++** Convert the standard MS-DOS timestamp stored in the mTime and mDate
++** fields of the CDS structure passed as the only argument to a 32-bit
++** UNIX seconds-since-the-epoch timestamp. Return the result.
++**
++** "Standard" MS-DOS time format:
++**
++**   File modification time:
++**     Bits 00-04: seconds divided by 2
++**     Bits 05-10: minute
++**     Bits 11-15: hour
++**   File modification date:
++**     Bits 00-04: day
++**     Bits 05-08: month (1-12)
++**     Bits 09-15: years from 1980 
++**
++** https://msdn.microsoft.com/en-us/library/9kkf9tah.aspx
++*/
++static u32 zipfileMtime(ZipfileCDS *pCDS){
++  int Y,M,D,X1,X2,A,B,sec,min,hr;
++  i64 JDsec;
++  Y = (1980 + ((pCDS->mDate >> 9) & 0x7F));
++  M = ((pCDS->mDate >> 5) & 0x0F);
++  D = (pCDS->mDate & 0x1F);
++  sec = (pCDS->mTime & 0x1F)*2;
++  min = (pCDS->mTime >> 5) & 0x3F;
++  hr = (pCDS->mTime >> 11) & 0x1F;
++  if( M<=2 ){
++    Y--;
++    M += 12;
++  }
++  X1 = 36525*(Y+4716)/100;
++  X2 = 306001*(M+1)/10000;
++  A = Y/100;
++  B = 2 - A + (A/4);
++  JDsec = (i64)((X1 + X2 + D + B - 1524.5)*86400) + hr*3600 + min*60 + sec;
++  return (u32)(JDsec - (i64)24405875*(i64)8640);
++}
++
++/*
++** The opposite of zipfileMtime(). This function populates the mTime and
++** mDate fields of the CDS structure passed as the first argument according
++** to the UNIX timestamp value passed as the second.
++*/
++static void zipfileMtimeToDos(ZipfileCDS *pCds, u32 mUnixTime){
++  /* Convert unix timestamp to JD (2440588 is noon on 1/1/1970) */
++  i64 JD = (i64)2440588 + mUnixTime / (24*60*60);
++
++  int A, B, C, D, E;
++  int yr, mon, day;
++  int hr, min, sec;
++
++  A = (int)((JD - 1867216.25)/36524.25);
++  A = (int)(JD + 1 + A - (A/4));
++  B = A + 1524;
++  C = (int)((B - 122.1)/365.25);
++  D = (36525*(C&32767))/100;
++  E = (int)((B-D)/30.6001);
++
++  day = B - D - (int)(30.6001*E);
++  mon = (E<14 ? E-1 : E-13);
++  yr = mon>2 ? C-4716 : C-4715;
++
++  hr = (mUnixTime % (24*60*60)) / (60*60);
++  min = (mUnixTime % (60*60)) / 60;
++  sec = (mUnixTime % 60);
++
++  if( yr>=1980 ){
++    pCds->mDate = (u16)(day + (mon << 5) + ((yr-1980) << 9));
++    pCds->mTime = (u16)(sec/2 + (min<<5) + (hr<<11));
++  }else{
++    pCds->mDate = pCds->mTime = 0;
++  }
++
++  assert( mUnixTime<315507600 
++       || mUnixTime==zipfileMtime(pCds) 
++       || ((mUnixTime % 2) && mUnixTime-1==zipfileMtime(pCds)) 
++       /* || (mUnixTime % 2) */
++  );
++}
++
++/*
++** If aBlob is not NULL, then it is a pointer to a buffer (nBlob bytes in
++** size) containing an entire zip archive image. Or, if aBlob is NULL,
++** then pFile is a file-handle open on a zip file. In either case, this
++** function creates a ZipfileEntry object based on the zip archive entry
++** for which the CDS record is at offset iOff.
++**
++** If successful, SQLITE_OK is returned and (*ppEntry) set to point to
++** the new object. Otherwise, an SQLite error code is returned and the
++** final value of (*ppEntry) undefined.
++*/
++static int zipfileGetEntry(
++  ZipfileTab *pTab,               /* Store any error message here */
++  const u8 *aBlob,                /* Pointer to in-memory file image */
++  int nBlob,                      /* Size of aBlob[] in bytes */
++  FILE *pFile,                    /* If aBlob==0, read from this file */
++  i64 iOff,                       /* Offset of CDS record */
++  ZipfileEntry **ppEntry          /* OUT: Pointer to new object */
++){
++  u8 *aRead;
++  char **pzErr = &pTab->base.zErrMsg;
++  int rc = SQLITE_OK;
++  (void)nBlob;
++
++  if( aBlob==0 ){
++    aRead = pTab->aBuffer;
++    rc = zipfileReadData(pFile, aRead, ZIPFILE_CDS_FIXED_SZ, iOff, pzErr);
++  }else{
++    aRead = (u8*)&aBlob[iOff];
++  }
++
++  if( rc==SQLITE_OK ){
++    sqlite3_int64 nAlloc;
++    ZipfileEntry *pNew;
++
++    int nFile = zipfileGetU16(&aRead[ZIPFILE_CDS_NFILE_OFF]);
++    int nExtra = zipfileGetU16(&aRead[ZIPFILE_CDS_NFILE_OFF+2]);
++    nExtra += zipfileGetU16(&aRead[ZIPFILE_CDS_NFILE_OFF+4]);
++
++    nAlloc = sizeof(ZipfileEntry) + nExtra;
++    if( aBlob ){
++      nAlloc += zipfileGetU32(&aRead[ZIPFILE_CDS_SZCOMPRESSED_OFF]);
++    }
++
++    pNew = (ZipfileEntry*)sqlite3_malloc64(nAlloc);
++    if( pNew==0 ){
++      rc = SQLITE_NOMEM;
++    }else{
++      memset(pNew, 0, sizeof(ZipfileEntry));
++      rc = zipfileReadCDS(aRead, &pNew->cds);
++      if( rc!=SQLITE_OK ){
++        *pzErr = sqlite3_mprintf("failed to read CDS at offset %lld", iOff);
++      }else if( aBlob==0 ){
++        rc = zipfileReadData(
++            pFile, aRead, nExtra+nFile, iOff+ZIPFILE_CDS_FIXED_SZ, pzErr
++        );
++      }else{
++        aRead = (u8*)&aBlob[iOff + ZIPFILE_CDS_FIXED_SZ];
++      }
++    }
++
++    if( rc==SQLITE_OK ){
++      u32 *pt = &pNew->mUnixTime;
++      pNew->cds.zFile = sqlite3_mprintf("%.*s", nFile, aRead); 
++      pNew->aExtra = (u8*)&pNew[1];
++      memcpy(pNew->aExtra, &aRead[nFile], nExtra);
++      if( pNew->cds.zFile==0 ){
++        rc = SQLITE_NOMEM;
++      }else if( 0==zipfileScanExtra(&aRead[nFile], pNew->cds.nExtra, pt) ){
++        pNew->mUnixTime = zipfileMtime(&pNew->cds);
++      }
++    }
++
++    if( rc==SQLITE_OK ){
++      static const int szFix = ZIPFILE_LFH_FIXED_SZ;
++      ZipfileLFH lfh;
++      if( pFile ){
++        rc = zipfileReadData(pFile, aRead, szFix, pNew->cds.iOffset, pzErr);
++      }else{
++        aRead = (u8*)&aBlob[pNew->cds.iOffset];
++      }
++
++      if( rc==SQLITE_OK ) rc = zipfileReadLFH(aRead, &lfh);
++      if( rc==SQLITE_OK ){
++        pNew->iDataOff =  pNew->cds.iOffset + ZIPFILE_LFH_FIXED_SZ;
++        pNew->iDataOff += lfh.nFile + lfh.nExtra;
++        if( aBlob && pNew->cds.szCompressed ){
++          pNew->aData = &pNew->aExtra[nExtra];
++          memcpy(pNew->aData, &aBlob[pNew->iDataOff], pNew->cds.szCompressed);
++        }
++      }else{
++        *pzErr = sqlite3_mprintf("failed to read LFH at offset %d", 
++            (int)pNew->cds.iOffset
++        );
++      }
++    }
++
++    if( rc!=SQLITE_OK ){
++      zipfileEntryFree(pNew);
++    }else{
++      *ppEntry = pNew;
++    }
++  }
++
++  return rc;
++}
++
++/*
++** Advance an ZipfileCsr to its next row of output.
++*/
++static int zipfileNext(sqlite3_vtab_cursor *cur){
++  ZipfileCsr *pCsr = (ZipfileCsr*)cur;
++  int rc = SQLITE_OK;
++
++  if( pCsr->pFile ){
++    i64 iEof = pCsr->eocd.iOffset + pCsr->eocd.nSize;
++    zipfileEntryFree(pCsr->pCurrent);
++    pCsr->pCurrent = 0;
++    if( pCsr->iNextOff>=iEof ){
++      pCsr->bEof = 1;
++    }else{
++      ZipfileEntry *p = 0;
++      ZipfileTab *pTab = (ZipfileTab*)(cur->pVtab);
++      rc = zipfileGetEntry(pTab, 0, 0, pCsr->pFile, pCsr->iNextOff, &p);
++      if( rc==SQLITE_OK ){
++        pCsr->iNextOff += ZIPFILE_CDS_FIXED_SZ;
++        pCsr->iNextOff += (int)p->cds.nExtra + p->cds.nFile + p->cds.nComment;
++      }
++      pCsr->pCurrent = p;
++    }
++  }else{
++    if( !pCsr->bNoop ){
++      pCsr->pCurrent = pCsr->pCurrent->pNext;
++    }
++    if( pCsr->pCurrent==0 ){
++      pCsr->bEof = 1;
++    }
++  }
++
++  pCsr->bNoop = 0;
++  return rc;
++}
++
++static void zipfileFree(void *p) { 
++  sqlite3_free(p); 
++}
++
++/*
++** Buffer aIn (size nIn bytes) contains compressed data. Uncompressed, the
++** size is nOut bytes. This function uncompresses the data and sets the
++** return value in context pCtx to the result (a blob).
++**
++** If an error occurs, an error code is left in pCtx instead.
++*/
++static void zipfileInflate(
++  sqlite3_context *pCtx,          /* Store result here */
++  const u8 *aIn,                  /* Compressed data */
++  int nIn,                        /* Size of buffer aIn[] in bytes */
++  int nOut                        /* Expected output size */
++){
++  u8 *aRes = sqlite3_malloc(nOut);
++  if( aRes==0 ){
++    sqlite3_result_error_nomem(pCtx);
++  }else{
++    int err;
++    z_stream str;
++    memset(&str, 0, sizeof(str));
++
++    str.next_in = (Byte*)aIn;
++    str.avail_in = nIn;
++    str.next_out = (Byte*)aRes;
++    str.avail_out = nOut;
++
++    err = inflateInit2(&str, -15);
++    if( err!=Z_OK ){
++      zipfileCtxErrorMsg(pCtx, "inflateInit2() failed (%d)", err);
++    }else{
++      err = inflate(&str, Z_NO_FLUSH);
++      if( err!=Z_STREAM_END ){
++        zipfileCtxErrorMsg(pCtx, "inflate() failed (%d)", err);
++      }else{
++        sqlite3_result_blob(pCtx, aRes, nOut, zipfileFree);
++        aRes = 0;
++      }
++    }
++    sqlite3_free(aRes);
++    inflateEnd(&str);
++  }
++}
++
++/*
++** Buffer aIn (size nIn bytes) contains uncompressed data. This function
++** compresses it and sets (*ppOut) to point to a buffer containing the
++** compressed data. The caller is responsible for eventually calling
++** sqlite3_free() to release buffer (*ppOut). Before returning, (*pnOut) 
++** is set to the size of buffer (*ppOut) in bytes.
++**
++** If no error occurs, SQLITE_OK is returned. Otherwise, an SQLite error
++** code is returned and an error message left in virtual-table handle
++** pTab. The values of (*ppOut) and (*pnOut) are left unchanged in this
++** case.
++*/
++static int zipfileDeflate(
++  const u8 *aIn, int nIn,         /* Input */
++  u8 **ppOut, int *pnOut,         /* Output */
++  char **pzErr                    /* OUT: Error message */
++){
++  int rc = SQLITE_OK;
++  sqlite3_int64 nAlloc;
++  z_stream str;
++  u8 *aOut;
++
++  memset(&str, 0, sizeof(str));
++  str.next_in = (Bytef*)aIn;
++  str.avail_in = nIn;
++  deflateInit2(&str, 9, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
++
++  nAlloc = deflateBound(&str, nIn);
++  aOut = (u8*)sqlite3_malloc64(nAlloc);
++  if( aOut==0 ){
++    rc = SQLITE_NOMEM;
++  }else{
++    int res;
++    str.next_out = aOut;
++    str.avail_out = nAlloc;
++    res = deflate(&str, Z_FINISH);
++    if( res==Z_STREAM_END ){
++      *ppOut = aOut;
++      *pnOut = (int)str.total_out;
++    }else{
++      sqlite3_free(aOut);
++      *pzErr = sqlite3_mprintf("zipfile: deflate() error");
++      rc = SQLITE_ERROR;
++    }
++    deflateEnd(&str);
++  }
++
++  return rc;
++}
++
++
++/*
++** Return values of columns for the row at which the series_cursor
++** is currently pointing.
++*/
++static int zipfileColumn(
++  sqlite3_vtab_cursor *cur,   /* The cursor */
++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
++  int i                       /* Which column to return */
++){
++  ZipfileCsr *pCsr = (ZipfileCsr*)cur;
++  ZipfileCDS *pCDS = &pCsr->pCurrent->cds;
++  int rc = SQLITE_OK;
++  switch( i ){
++    case 0:   /* name */
++      sqlite3_result_text(ctx, pCDS->zFile, -1, SQLITE_TRANSIENT);
++      break;
++    case 1:   /* mode */
++      /* TODO: Whether or not the following is correct surely depends on
++      ** the platform on which the archive was created.  */
++      sqlite3_result_int(ctx, pCDS->iExternalAttr >> 16);
++      break;
++    case 2: { /* mtime */
++      sqlite3_result_int64(ctx, pCsr->pCurrent->mUnixTime);
++      break;
++    }
++    case 3: { /* sz */
++      if( sqlite3_vtab_nochange(ctx)==0 ){
++        sqlite3_result_int64(ctx, pCDS->szUncompressed);
++      }
++      break;
++    }
++    case 4:   /* rawdata */
++      if( sqlite3_vtab_nochange(ctx) ) break;
++    case 5: { /* data */
++      if( i==4 || pCDS->iCompression==0 || pCDS->iCompression==8 ){
++        int sz = pCDS->szCompressed;
++        int szFinal = pCDS->szUncompressed;
++        if( szFinal>0 ){
++          u8 *aBuf;
++          u8 *aFree = 0;
++          if( pCsr->pCurrent->aData ){
++            aBuf = pCsr->pCurrent->aData;
++          }else{
++            aBuf = aFree = sqlite3_malloc64(sz);
++            if( aBuf==0 ){
++              rc = SQLITE_NOMEM;
++            }else{
++              FILE *pFile = pCsr->pFile;
++              if( pFile==0 ){
++                pFile = ((ZipfileTab*)(pCsr->base.pVtab))->pWriteFd;
++              }
++              rc = zipfileReadData(pFile, aBuf, sz, pCsr->pCurrent->iDataOff,
++                  &pCsr->base.pVtab->zErrMsg
++              );
++            }
++          }
++          if( rc==SQLITE_OK ){
++            if( i==5 && pCDS->iCompression ){
++              zipfileInflate(ctx, aBuf, sz, szFinal);
++            }else{
++              sqlite3_result_blob(ctx, aBuf, sz, SQLITE_TRANSIENT);
++            }
++          }
++          sqlite3_free(aFree);
++        }else{
++          /* Figure out if this is a directory or a zero-sized file. Consider
++          ** it to be a directory either if the mode suggests so, or if
++          ** the final character in the name is '/'.  */
++          u32 mode = pCDS->iExternalAttr >> 16;
++          if( !(mode & S_IFDIR)
++           && pCDS->nFile>=1
++           && pCDS->zFile[pCDS->nFile-1]!='/'
++          ){
++            sqlite3_result_blob(ctx, "", 0, SQLITE_STATIC);
++          }
++        }
++      }
++      break;
++    }
++    case 6:   /* method */
++      sqlite3_result_int(ctx, pCDS->iCompression);
++      break;
++    default:  /* z */
++      assert( i==7 );
++      sqlite3_result_int64(ctx, pCsr->iId);
++      break;
++  }
++
++  return rc;
++}
++
++/*
++** Return TRUE if the cursor is at EOF.
++*/
++static int zipfileEof(sqlite3_vtab_cursor *cur){
++  ZipfileCsr *pCsr = (ZipfileCsr*)cur;
++  return pCsr->bEof;
++}
++
++/*
++** If aBlob is not NULL, then it points to a buffer nBlob bytes in size
++** containing an entire zip archive image. Or, if aBlob is NULL, then pFile
++** is guaranteed to be a file-handle open on a zip file.
++**
++** This function attempts to locate the EOCD record within the zip archive
++** and populate *pEOCD with the results of decoding it. SQLITE_OK is
++** returned if successful. Otherwise, an SQLite error code is returned and
++** an English language error message may be left in virtual-table pTab.
++*/
++static int zipfileReadEOCD(
++  ZipfileTab *pTab,               /* Return errors here */
++  const u8 *aBlob,                /* Pointer to in-memory file image */
++  int nBlob,                      /* Size of aBlob[] in bytes */
++  FILE *pFile,                    /* Read from this file if aBlob==0 */
++  ZipfileEOCD *pEOCD              /* Object to populate */
++){
++  u8 *aRead = pTab->aBuffer;      /* Temporary buffer */
++  int nRead;                      /* Bytes to read from file */
++  int rc = SQLITE_OK;
++
++  memset(pEOCD, 0, sizeof(ZipfileEOCD));
++  if( aBlob==0 ){
++    i64 iOff;                     /* Offset to read from */
++    i64 szFile;                   /* Total size of file in bytes */
++    fseek(pFile, 0, SEEK_END);
++    szFile = (i64)ftell(pFile);
++    if( szFile==0 ){
++      return SQLITE_OK;
++    }
++    nRead = (int)(MIN(szFile, ZIPFILE_BUFFER_SIZE));
++    iOff = szFile - nRead;
++    rc = zipfileReadData(pFile, aRead, nRead, iOff, &pTab->base.zErrMsg);
++  }else{
++    nRead = (int)(MIN(nBlob, ZIPFILE_BUFFER_SIZE));
++    aRead = (u8*)&aBlob[nBlob-nRead];
++  }
++
++  if( rc==SQLITE_OK ){
++    int i;
++
++    /* Scan backwards looking for the signature bytes */
++    for(i=nRead-20; i>=0; i--){
++      if( aRead[i]==0x50 && aRead[i+1]==0x4b 
++       && aRead[i+2]==0x05 && aRead[i+3]==0x06 
++      ){
++        break;
++      }
++    }
++    if( i<0 ){
++      pTab->base.zErrMsg = sqlite3_mprintf(
++          "cannot find end of central directory record"
++      );
++      return SQLITE_ERROR;
++    }
++
++    aRead += i+4;
++    pEOCD->iDisk = zipfileRead16(aRead);
++    pEOCD->iFirstDisk = zipfileRead16(aRead);
++    pEOCD->nEntry = zipfileRead16(aRead);
++    pEOCD->nEntryTotal = zipfileRead16(aRead);
++    pEOCD->nSize = zipfileRead32(aRead);
++    pEOCD->iOffset = zipfileRead32(aRead);
++  }
++
++  return rc;
++}
++
++/*
++** Add object pNew to the linked list that begins at ZipfileTab.pFirstEntry 
++** and ends with pLastEntry. If argument pBefore is NULL, then pNew is added
++** to the end of the list. Otherwise, it is added to the list immediately
++** before pBefore (which is guaranteed to be a part of said list).
++*/
++static void zipfileAddEntry(
++  ZipfileTab *pTab, 
++  ZipfileEntry *pBefore, 
++  ZipfileEntry *pNew
++){
++  assert( (pTab->pFirstEntry==0)==(pTab->pLastEntry==0) );
++  assert( pNew->pNext==0 );
++  if( pBefore==0 ){
++    if( pTab->pFirstEntry==0 ){
++      pTab->pFirstEntry = pTab->pLastEntry = pNew;
++    }else{
++      assert( pTab->pLastEntry->pNext==0 );
++      pTab->pLastEntry->pNext = pNew;
++      pTab->pLastEntry = pNew;
++    }
++  }else{
++    ZipfileEntry **pp;
++    for(pp=&pTab->pFirstEntry; *pp!=pBefore; pp=&((*pp)->pNext));
++    pNew->pNext = pBefore;
++    *pp = pNew;
++  }
++}
++
++static int zipfileLoadDirectory(ZipfileTab *pTab, const u8 *aBlob, int nBlob){
++  ZipfileEOCD eocd;
++  int rc;
++  int i;
++  i64 iOff;
++
++  rc = zipfileReadEOCD(pTab, aBlob, nBlob, pTab->pWriteFd, &eocd);
++  iOff = eocd.iOffset;
++  for(i=0; rc==SQLITE_OK && ipWriteFd, iOff, &pNew);
++
++    if( rc==SQLITE_OK ){
++      zipfileAddEntry(pTab, 0, pNew);
++      iOff += ZIPFILE_CDS_FIXED_SZ;
++      iOff += (int)pNew->cds.nExtra + pNew->cds.nFile + pNew->cds.nComment;
++    }
++  }
++  return rc;
++}
++
++/*
++** xFilter callback.
++*/
++static int zipfileFilter(
++  sqlite3_vtab_cursor *cur, 
++  int idxNum, const char *idxStr,
++  int argc, sqlite3_value **argv
++){
++  ZipfileTab *pTab = (ZipfileTab*)cur->pVtab;
++  ZipfileCsr *pCsr = (ZipfileCsr*)cur;
++  const char *zFile = 0;          /* Zip file to scan */
++  int rc = SQLITE_OK;             /* Return Code */
++  int bInMemory = 0;              /* True for an in-memory zipfile */
++
++  (void)idxStr;
++  (void)argc;
++
++  zipfileResetCursor(pCsr);
++
++  if( pTab->zFile ){
++    zFile = pTab->zFile;
++  }else if( idxNum==0 ){
++    zipfileCursorErr(pCsr, "zipfile() function requires an argument");
++    return SQLITE_ERROR;
++  }else if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){
++    static const u8 aEmptyBlob = 0;
++    const u8 *aBlob = (const u8*)sqlite3_value_blob(argv[0]);
++    int nBlob = sqlite3_value_bytes(argv[0]);
++    assert( pTab->pFirstEntry==0 );
++    if( aBlob==0 ){
++      aBlob = &aEmptyBlob;
++      nBlob = 0;
++    }
++    rc = zipfileLoadDirectory(pTab, aBlob, nBlob);
++    pCsr->pFreeEntry = pTab->pFirstEntry;
++    pTab->pFirstEntry = pTab->pLastEntry = 0;
++    if( rc!=SQLITE_OK ) return rc;
++    bInMemory = 1;
++  }else{
++    zFile = (const char*)sqlite3_value_text(argv[0]);
++  }
++
++  if( 0==pTab->pWriteFd && 0==bInMemory ){
++    pCsr->pFile = zFile ? fopen(zFile, "rb") : 0;
++    if( pCsr->pFile==0 ){
++      zipfileCursorErr(pCsr, "cannot open file: %s", zFile);
++      rc = SQLITE_ERROR;
++    }else{
++      rc = zipfileReadEOCD(pTab, 0, 0, pCsr->pFile, &pCsr->eocd);
++      if( rc==SQLITE_OK ){
++        if( pCsr->eocd.nEntry==0 ){
++          pCsr->bEof = 1;
++        }else{
++          pCsr->iNextOff = pCsr->eocd.iOffset;
++          rc = zipfileNext(cur);
++        }
++      }
++    }
++  }else{
++    pCsr->bNoop = 1;
++    pCsr->pCurrent = pCsr->pFreeEntry ? pCsr->pFreeEntry : pTab->pFirstEntry;
++    rc = zipfileNext(cur);
++  }
++
++  return rc;
++}
++
++/*
++** xBestIndex callback.
++*/
++static int zipfileBestIndex(
++  sqlite3_vtab *tab,
++  sqlite3_index_info *pIdxInfo
++){
++  int i;
++  int idx = -1;
++  int unusable = 0;
++  (void)tab;
++
++  for(i=0; inConstraint; i++){
++    const struct sqlite3_index_constraint *pCons = &pIdxInfo->aConstraint[i];
++    if( pCons->iColumn!=ZIPFILE_F_COLUMN_IDX ) continue;
++    if( pCons->usable==0 ){
++      unusable = 1;
++    }else if( pCons->op==SQLITE_INDEX_CONSTRAINT_EQ ){
++      idx = i;
++    }
++  }
++  pIdxInfo->estimatedCost = 1000.0;
++  if( idx>=0 ){
++    pIdxInfo->aConstraintUsage[idx].argvIndex = 1;
++    pIdxInfo->aConstraintUsage[idx].omit = 1;
++    pIdxInfo->idxNum = 1;
++  }else if( unusable ){
++    return SQLITE_CONSTRAINT;
++  }
++  return SQLITE_OK;
++}
++
++static ZipfileEntry *zipfileNewEntry(const char *zPath){
++  ZipfileEntry *pNew;
++  pNew = sqlite3_malloc(sizeof(ZipfileEntry));
++  if( pNew ){
++    memset(pNew, 0, sizeof(ZipfileEntry));
++    pNew->cds.zFile = sqlite3_mprintf("%s", zPath);
++    if( pNew->cds.zFile==0 ){
++      sqlite3_free(pNew);
++      pNew = 0;
++    }
++  }
++  return pNew;
++}
++
++static int zipfileSerializeLFH(ZipfileEntry *pEntry, u8 *aBuf){
++  ZipfileCDS *pCds = &pEntry->cds;
++  u8 *a = aBuf;
++
++  pCds->nExtra = 9;
++
++  /* Write the LFH itself */
++  zipfileWrite32(a, ZIPFILE_SIGNATURE_LFH);
++  zipfileWrite16(a, pCds->iVersionExtract);
++  zipfileWrite16(a, pCds->flags);
++  zipfileWrite16(a, pCds->iCompression);
++  zipfileWrite16(a, pCds->mTime);
++  zipfileWrite16(a, pCds->mDate);
++  zipfileWrite32(a, pCds->crc32);
++  zipfileWrite32(a, pCds->szCompressed);
++  zipfileWrite32(a, pCds->szUncompressed);
++  zipfileWrite16(a, (u16)pCds->nFile);
++  zipfileWrite16(a, pCds->nExtra);
++  assert( a==&aBuf[ZIPFILE_LFH_FIXED_SZ] );
++
++  /* Add the file name */
++  memcpy(a, pCds->zFile, (int)pCds->nFile);
++  a += (int)pCds->nFile;
++
++  /* The "extra" data */
++  zipfileWrite16(a, ZIPFILE_EXTRA_TIMESTAMP);
++  zipfileWrite16(a, 5);
++  *a++ = 0x01;
++  zipfileWrite32(a, pEntry->mUnixTime);
++
++  return a-aBuf;
++}
++
++static int zipfileAppendEntry(
++  ZipfileTab *pTab,
++  ZipfileEntry *pEntry,
++  const u8 *pData,
++  int nData
++){
++  u8 *aBuf = pTab->aBuffer;
++  int nBuf;
++  int rc;
++
++  nBuf = zipfileSerializeLFH(pEntry, aBuf);
++  rc = zipfileAppendData(pTab, aBuf, nBuf);
++  if( rc==SQLITE_OK ){
++    pEntry->iDataOff = pTab->szCurrent;
++    rc = zipfileAppendData(pTab, pData, nData);
++  }
++
++  return rc;
++}
++
++static int zipfileGetMode(
++  sqlite3_value *pVal, 
++  int bIsDir,                     /* If true, default to directory */
++  u32 *pMode,                     /* OUT: Mode value */
++  char **pzErr                    /* OUT: Error message */
++){
++  const char *z = (const char*)sqlite3_value_text(pVal);
++  u32 mode = 0;
++  if( z==0 ){
++    mode = (bIsDir ? (S_IFDIR + 0755) : (S_IFREG + 0644));
++  }else if( z[0]>='0' && z[0]<='9' ){
++    mode = (unsigned int)sqlite3_value_int(pVal);
++  }else{
++    const char zTemplate[11] = "-rwxrwxrwx";
++    int i;
++    if( strlen(z)!=10 ) goto parse_error;
++    switch( z[0] ){
++      case '-': mode |= S_IFREG; break;
++      case 'd': mode |= S_IFDIR; break;
++      case 'l': mode |= S_IFLNK; break;
++      default: goto parse_error;
++    }
++    for(i=1; i<10; i++){
++      if( z[i]==zTemplate[i] ) mode |= 1 << (9-i);
++      else if( z[i]!='-' ) goto parse_error;
++    }
++  }
++  if( ((mode & S_IFDIR)==0)==bIsDir ){
++    /* The "mode" attribute is a directory, but data has been specified.
++    ** Or vice-versa - no data but "mode" is a file or symlink.  */
++    *pzErr = sqlite3_mprintf("zipfile: mode does not match data");
++    return SQLITE_CONSTRAINT;
++  }
++  *pMode = mode;
++  return SQLITE_OK;
++
++ parse_error:
++  *pzErr = sqlite3_mprintf("zipfile: parse error in mode: %s", z);
++  return SQLITE_ERROR;
++}
++
++/*
++** Both (const char*) arguments point to nul-terminated strings. Argument
++** nB is the value of strlen(zB). This function returns 0 if the strings are
++** identical, ignoring any trailing '/' character in either path.  */
++static int zipfileComparePath(const char *zA, const char *zB, int nB){
++  int nA = (int)strlen(zA);
++  if( nA>0 && zA[nA-1]=='/' ) nA--;
++  if( nB>0 && zB[nB-1]=='/' ) nB--;
++  if( nA==nB && memcmp(zA, zB, nA)==0 ) return 0;
++  return 1;
++}
++
++static int zipfileBegin(sqlite3_vtab *pVtab){
++  ZipfileTab *pTab = (ZipfileTab*)pVtab;
++  int rc = SQLITE_OK;
++
++  assert( pTab->pWriteFd==0 );
++  if( pTab->zFile==0 || pTab->zFile[0]==0 ){
++    pTab->base.zErrMsg = sqlite3_mprintf("zipfile: missing filename");
++    return SQLITE_ERROR;
++  }
++
++  /* Open a write fd on the file. Also load the entire central directory
++  ** structure into memory. During the transaction any new file data is 
++  ** appended to the archive file, but the central directory is accumulated
++  ** in main-memory until the transaction is committed.  */
++  pTab->pWriteFd = fopen(pTab->zFile, "ab+");
++  if( pTab->pWriteFd==0 ){
++    pTab->base.zErrMsg = sqlite3_mprintf(
++        "zipfile: failed to open file %s for writing", pTab->zFile
++        );
++    rc = SQLITE_ERROR;
++  }else{
++    fseek(pTab->pWriteFd, 0, SEEK_END);
++    pTab->szCurrent = pTab->szOrig = (i64)ftell(pTab->pWriteFd);
++    rc = zipfileLoadDirectory(pTab, 0, 0);
++  }
++
++  if( rc!=SQLITE_OK ){
++    zipfileCleanupTransaction(pTab);
++  }
++
++  return rc;
++}
++
++/*
++** Return the current time as a 32-bit timestamp in UNIX epoch format (like
++** time(2)).
++*/
++static u32 zipfileTime(void){
++  sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
++  u32 ret;
++  if( pVfs==0 ) return 0;
++  if( pVfs->iVersion>=2 && pVfs->xCurrentTimeInt64 ){
++    i64 ms;
++    pVfs->xCurrentTimeInt64(pVfs, &ms);
++    ret = (u32)((ms/1000) - ((i64)24405875 * 8640));
++  }else{
++    double day;
++    pVfs->xCurrentTime(pVfs, &day);
++    ret = (u32)((day - 2440587.5) * 86400);
++  }
++  return ret;
++}
++
++/*
++** Return a 32-bit timestamp in UNIX epoch format.
++**
++** If the value passed as the only argument is either NULL or an SQL NULL,
++** return the current time. Otherwise, return the value stored in (*pVal)
++** cast to a 32-bit unsigned integer.
++*/
++static u32 zipfileGetTime(sqlite3_value *pVal){
++  if( pVal==0 || sqlite3_value_type(pVal)==SQLITE_NULL ){
++    return zipfileTime();
++  }
++  return (u32)sqlite3_value_int64(pVal);
++}
++
++/*
++** Unless it is NULL, entry pOld is currently part of the pTab->pFirstEntry
++** linked list.  Remove it from the list and free the object.
++*/
++static void zipfileRemoveEntryFromList(ZipfileTab *pTab, ZipfileEntry *pOld){
++  if( pOld ){
++    if( pTab->pFirstEntry==pOld ){
++      pTab->pFirstEntry = pOld->pNext;
++      if( pTab->pLastEntry==pOld ) pTab->pLastEntry = 0;
++    }else{
++      ZipfileEntry *p;
++      for(p=pTab->pFirstEntry; p; p=p->pNext){
++        if( p->pNext==pOld ){
++          p->pNext = pOld->pNext;
++          if( pTab->pLastEntry==pOld ) pTab->pLastEntry = p;
++          break;
++        }
++      }
++    }
++    zipfileEntryFree(pOld);
++  }
++}
++
++/*
++** xUpdate method.
++*/
++static int zipfileUpdate(
++  sqlite3_vtab *pVtab, 
++  int nVal, 
++  sqlite3_value **apVal, 
++  sqlite_int64 *pRowid
++){
++  ZipfileTab *pTab = (ZipfileTab*)pVtab;
++  int rc = SQLITE_OK;             /* Return Code */
++  ZipfileEntry *pNew = 0;         /* New in-memory CDS entry */
++
++  u32 mode = 0;                   /* Mode for new entry */
++  u32 mTime = 0;                  /* Modification time for new entry */
++  i64 sz = 0;                     /* Uncompressed size */
++  const char *zPath = 0;          /* Path for new entry */
++  int nPath = 0;                  /* strlen(zPath) */
++  const u8 *pData = 0;            /* Pointer to buffer containing content */
++  int nData = 0;                  /* Size of pData buffer in bytes */
++  int iMethod = 0;                /* Compression method for new entry */
++  u8 *pFree = 0;                  /* Free this */
++  char *zFree = 0;                /* Also free this */
++  ZipfileEntry *pOld = 0;
++  ZipfileEntry *pOld2 = 0;
++  int bUpdate = 0;                /* True for an update that modifies "name" */
++  int bIsDir = 0;
++  u32 iCrc32 = 0;
++
++  (void)pRowid;
++
++  if( pTab->pWriteFd==0 ){
++    rc = zipfileBegin(pVtab);
++    if( rc!=SQLITE_OK ) return rc;
++  }
++
++  /* If this is a DELETE or UPDATE, find the archive entry to delete. */
++  if( sqlite3_value_type(apVal[0])!=SQLITE_NULL ){
++    const char *zDelete = (const char*)sqlite3_value_text(apVal[0]);
++    int nDelete = (int)strlen(zDelete);
++    if( nVal>1 ){
++      const char *zUpdate = (const char*)sqlite3_value_text(apVal[1]);
++      if( zUpdate && zipfileComparePath(zUpdate, zDelete, nDelete)!=0 ){
++        bUpdate = 1;
++      }
++    }
++    for(pOld=pTab->pFirstEntry; 1; pOld=pOld->pNext){
++      if( zipfileComparePath(pOld->cds.zFile, zDelete, nDelete)==0 ){
++        break;
++      }
++      assert( pOld->pNext );
++    }
++  }
++
++  if( nVal>1 ){
++    /* Check that "sz" and "rawdata" are both NULL: */
++    if( sqlite3_value_type(apVal[5])!=SQLITE_NULL ){
++      zipfileTableErr(pTab, "sz must be NULL");
++      rc = SQLITE_CONSTRAINT;
++    }
++    if( sqlite3_value_type(apVal[6])!=SQLITE_NULL ){
++      zipfileTableErr(pTab, "rawdata must be NULL"); 
++      rc = SQLITE_CONSTRAINT;
++    }
++
++    if( rc==SQLITE_OK ){
++      if( sqlite3_value_type(apVal[7])==SQLITE_NULL ){
++        /* data=NULL. A directory */
++        bIsDir = 1;
++      }else{
++        /* Value specified for "data", and possibly "method". This must be
++        ** a regular file or a symlink. */
++        const u8 *aIn = sqlite3_value_blob(apVal[7]);
++        int nIn = sqlite3_value_bytes(apVal[7]);
++        int bAuto = sqlite3_value_type(apVal[8])==SQLITE_NULL;
++
++        iMethod = sqlite3_value_int(apVal[8]);
++        sz = nIn;
++        pData = aIn;
++        nData = nIn;
++        if( iMethod!=0 && iMethod!=8 ){
++          zipfileTableErr(pTab, "unknown compression method: %d", iMethod);
++          rc = SQLITE_CONSTRAINT;
++        }else{
++          if( bAuto || iMethod ){
++            int nCmp;
++            rc = zipfileDeflate(aIn, nIn, &pFree, &nCmp, &pTab->base.zErrMsg);
++            if( rc==SQLITE_OK ){
++              if( iMethod || nCmpbase.zErrMsg);
++    }
++
++    if( rc==SQLITE_OK ){
++      zPath = (const char*)sqlite3_value_text(apVal[2]);
++      if( zPath==0 ) zPath = "";
++      nPath = (int)strlen(zPath);
++      mTime = zipfileGetTime(apVal[4]);
++    }
++
++    if( rc==SQLITE_OK && bIsDir ){
++      /* For a directory, check that the last character in the path is a
++      ** '/'. This appears to be required for compatibility with info-zip
++      ** (the unzip command on unix). It does not create directories
++      ** otherwise.  */
++      if( nPath<=0 || zPath[nPath-1]!='/' ){
++        zFree = sqlite3_mprintf("%s/", zPath);
++        zPath = (const char*)zFree;
++        if( zFree==0 ){
++          rc = SQLITE_NOMEM;
++          nPath = 0;
++        }else{
++          nPath = (int)strlen(zPath);
++        }
++      }
++    }
++
++    /* Check that we're not inserting a duplicate entry -OR- updating an
++    ** entry with a path, thereby making it into a duplicate. */
++    if( (pOld==0 || bUpdate) && rc==SQLITE_OK ){
++      ZipfileEntry *p;
++      for(p=pTab->pFirstEntry; p; p=p->pNext){
++        if( zipfileComparePath(p->cds.zFile, zPath, nPath)==0 ){
++          switch( sqlite3_vtab_on_conflict(pTab->db) ){
++            case SQLITE_IGNORE: {
++              goto zipfile_update_done;
++            }
++            case SQLITE_REPLACE: {
++              pOld2 = p;
++              break;
++            }
++            default: {
++              zipfileTableErr(pTab, "duplicate name: \"%s\"", zPath);
++              rc = SQLITE_CONSTRAINT;
++              break;
++            }
++          }
++          break;
++        }
++      }
++    }
++
++    if( rc==SQLITE_OK ){
++      /* Create the new CDS record. */
++      pNew = zipfileNewEntry(zPath);
++      if( pNew==0 ){
++        rc = SQLITE_NOMEM;
++      }else{
++        pNew->cds.iVersionMadeBy = ZIPFILE_NEWENTRY_MADEBY;
++        pNew->cds.iVersionExtract = ZIPFILE_NEWENTRY_REQUIRED;
++        pNew->cds.flags = ZIPFILE_NEWENTRY_FLAGS;
++        pNew->cds.iCompression = (u16)iMethod;
++        zipfileMtimeToDos(&pNew->cds, mTime);
++        pNew->cds.crc32 = iCrc32;
++        pNew->cds.szCompressed = nData;
++        pNew->cds.szUncompressed = (u32)sz;
++        pNew->cds.iExternalAttr = (mode<<16);
++        pNew->cds.iOffset = (u32)pTab->szCurrent;
++        pNew->cds.nFile = (u16)nPath;
++        pNew->mUnixTime = (u32)mTime;
++        rc = zipfileAppendEntry(pTab, pNew, pData, nData);
++        zipfileAddEntry(pTab, pOld, pNew);
++      }
++    }
++  }
++
++  if( rc==SQLITE_OK && (pOld || pOld2) ){
++    ZipfileCsr *pCsr;
++    for(pCsr=pTab->pCsrList; pCsr; pCsr=pCsr->pCsrNext){
++      if( pCsr->pCurrent && (pCsr->pCurrent==pOld || pCsr->pCurrent==pOld2) ){
++        pCsr->pCurrent = pCsr->pCurrent->pNext;
++        pCsr->bNoop = 1;
++      }
++    }
++
++    zipfileRemoveEntryFromList(pTab, pOld);
++    zipfileRemoveEntryFromList(pTab, pOld2);
++  }
++
++zipfile_update_done:
++  sqlite3_free(pFree);
++  sqlite3_free(zFree);
++  return rc;
++}
++
++static int zipfileSerializeEOCD(ZipfileEOCD *p, u8 *aBuf){
++  u8 *a = aBuf;
++  zipfileWrite32(a, ZIPFILE_SIGNATURE_EOCD);
++  zipfileWrite16(a, p->iDisk);
++  zipfileWrite16(a, p->iFirstDisk);
++  zipfileWrite16(a, p->nEntry);
++  zipfileWrite16(a, p->nEntryTotal);
++  zipfileWrite32(a, p->nSize);
++  zipfileWrite32(a, p->iOffset);
++  zipfileWrite16(a, 0);        /* Size of trailing comment in bytes*/
++
++  return a-aBuf;
++}
++
++static int zipfileAppendEOCD(ZipfileTab *pTab, ZipfileEOCD *p){
++  int nBuf = zipfileSerializeEOCD(p, pTab->aBuffer);
++  assert( nBuf==ZIPFILE_EOCD_FIXED_SZ );
++  return zipfileAppendData(pTab, pTab->aBuffer, nBuf);
++}
++
++/*
++** Serialize the CDS structure into buffer aBuf[]. Return the number
++** of bytes written.
++*/
++static int zipfileSerializeCDS(ZipfileEntry *pEntry, u8 *aBuf){
++  u8 *a = aBuf;
++  ZipfileCDS *pCDS = &pEntry->cds;
++
++  if( pEntry->aExtra==0 ){
++    pCDS->nExtra = 9;
++  }
++
++  zipfileWrite32(a, ZIPFILE_SIGNATURE_CDS);
++  zipfileWrite16(a, pCDS->iVersionMadeBy);
++  zipfileWrite16(a, pCDS->iVersionExtract);
++  zipfileWrite16(a, pCDS->flags);
++  zipfileWrite16(a, pCDS->iCompression);
++  zipfileWrite16(a, pCDS->mTime);
++  zipfileWrite16(a, pCDS->mDate);
++  zipfileWrite32(a, pCDS->crc32);
++  zipfileWrite32(a, pCDS->szCompressed);
++  zipfileWrite32(a, pCDS->szUncompressed);
++  assert( a==&aBuf[ZIPFILE_CDS_NFILE_OFF] );
++  zipfileWrite16(a, pCDS->nFile);
++  zipfileWrite16(a, pCDS->nExtra);
++  zipfileWrite16(a, pCDS->nComment);
++  zipfileWrite16(a, pCDS->iDiskStart);
++  zipfileWrite16(a, pCDS->iInternalAttr);
++  zipfileWrite32(a, pCDS->iExternalAttr);
++  zipfileWrite32(a, pCDS->iOffset);
++
++  memcpy(a, pCDS->zFile, pCDS->nFile);
++  a += pCDS->nFile;
++
++  if( pEntry->aExtra ){
++    int n = (int)pCDS->nExtra + (int)pCDS->nComment;
++    memcpy(a, pEntry->aExtra, n);
++    a += n;
++  }else{
++    assert( pCDS->nExtra==9 );
++    zipfileWrite16(a, ZIPFILE_EXTRA_TIMESTAMP);
++    zipfileWrite16(a, 5);
++    *a++ = 0x01;
++    zipfileWrite32(a, pEntry->mUnixTime);
++  }
++
++  return a-aBuf;
++}
++
++static int zipfileCommit(sqlite3_vtab *pVtab){
++  ZipfileTab *pTab = (ZipfileTab*)pVtab;
++  int rc = SQLITE_OK;
++  if( pTab->pWriteFd ){
++    i64 iOffset = pTab->szCurrent;
++    ZipfileEntry *p;
++    ZipfileEOCD eocd;
++    int nEntry = 0;
++
++    /* Write out all entries */
++    for(p=pTab->pFirstEntry; rc==SQLITE_OK && p; p=p->pNext){
++      int n = zipfileSerializeCDS(p, pTab->aBuffer);
++      rc = zipfileAppendData(pTab, pTab->aBuffer, n);
++      nEntry++;
++    }
++
++    /* Write out the EOCD record */
++    eocd.iDisk = 0;
++    eocd.iFirstDisk = 0;
++    eocd.nEntry = (u16)nEntry;
++    eocd.nEntryTotal = (u16)nEntry;
++    eocd.nSize = (u32)(pTab->szCurrent - iOffset);
++    eocd.iOffset = (u32)iOffset;
++    rc = zipfileAppendEOCD(pTab, &eocd);
++
++    zipfileCleanupTransaction(pTab);
++  }
++  return rc;
++}
++
++static int zipfileRollback(sqlite3_vtab *pVtab){
++  return zipfileCommit(pVtab);
++}
++
++static ZipfileCsr *zipfileFindCursor(ZipfileTab *pTab, i64 iId){
++  ZipfileCsr *pCsr;
++  for(pCsr=pTab->pCsrList; pCsr; pCsr=pCsr->pCsrNext){
++    if( iId==pCsr->iId ) break;
++  }
++  return pCsr;
++}
++
++static void zipfileFunctionCds(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  ZipfileCsr *pCsr;
++  ZipfileTab *pTab = (ZipfileTab*)sqlite3_user_data(context);
++  assert( argc>0 );
++
++  pCsr = zipfileFindCursor(pTab, sqlite3_value_int64(argv[0]));
++  if( pCsr ){
++    ZipfileCDS *p = &pCsr->pCurrent->cds;
++    char *zRes = sqlite3_mprintf("{"
++        "\"version-made-by\" : %u, "
++        "\"version-to-extract\" : %u, "
++        "\"flags\" : %u, "
++        "\"compression\" : %u, "
++        "\"time\" : %u, "
++        "\"date\" : %u, "
++        "\"crc32\" : %u, "
++        "\"compressed-size\" : %u, "
++        "\"uncompressed-size\" : %u, "
++        "\"file-name-length\" : %u, "
++        "\"extra-field-length\" : %u, "
++        "\"file-comment-length\" : %u, "
++        "\"disk-number-start\" : %u, "
++        "\"internal-attr\" : %u, "
++        "\"external-attr\" : %u, "
++        "\"offset\" : %u }",
++        (u32)p->iVersionMadeBy, (u32)p->iVersionExtract,
++        (u32)p->flags, (u32)p->iCompression,
++        (u32)p->mTime, (u32)p->mDate,
++        (u32)p->crc32, (u32)p->szCompressed,
++        (u32)p->szUncompressed, (u32)p->nFile,
++        (u32)p->nExtra, (u32)p->nComment,
++        (u32)p->iDiskStart, (u32)p->iInternalAttr,
++        (u32)p->iExternalAttr, (u32)p->iOffset
++    );
++
++    if( zRes==0 ){
++      sqlite3_result_error_nomem(context);
++    }else{
++      sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
++      sqlite3_free(zRes);
++    }
++  }
++}
++
++/*
++** xFindFunction method.
++*/
++static int zipfileFindFunction(
++  sqlite3_vtab *pVtab,            /* Virtual table handle */
++  int nArg,                       /* Number of SQL function arguments */
++  const char *zName,              /* Name of SQL function */
++  void (**pxFunc)(sqlite3_context*,int,sqlite3_value**), /* OUT: Result */
++  void **ppArg                    /* OUT: User data for *pxFunc */
++){
++  (void)nArg;
++  if( sqlite3_stricmp("zipfile_cds", zName)==0 ){
++    *pxFunc = zipfileFunctionCds;
++    *ppArg = (void*)pVtab;
++    return 1;
++  }
++  return 0;
++}
++
++typedef struct ZipfileBuffer ZipfileBuffer;
++struct ZipfileBuffer {
++  u8 *a;                          /* Pointer to buffer */
++  int n;                          /* Size of buffer in bytes */
++  int nAlloc;                     /* Byte allocated at a[] */
++};
++
++typedef struct ZipfileCtx ZipfileCtx;
++struct ZipfileCtx {
++  int nEntry;
++  ZipfileBuffer body;
++  ZipfileBuffer cds;
++};
++
++static int zipfileBufferGrow(ZipfileBuffer *pBuf, int nByte){
++  if( pBuf->n+nByte>pBuf->nAlloc ){
++    u8 *aNew;
++    sqlite3_int64 nNew = pBuf->n ? pBuf->n*2 : 512;
++    int nReq = pBuf->n + nByte;
++
++    while( nNewa, nNew);
++    if( aNew==0 ) return SQLITE_NOMEM;
++    pBuf->a = aNew;
++    pBuf->nAlloc = (int)nNew;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** xStep() callback for the zipfile() aggregate. This can be called in
++** any of the following ways:
++**
++**   SELECT zipfile(name,data) ...
++**   SELECT zipfile(name,mode,mtime,data) ...
++**   SELECT zipfile(name,mode,mtime,data,method) ...
++*/
++static void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){
++  ZipfileCtx *p;                  /* Aggregate function context */
++  ZipfileEntry e;                 /* New entry to add to zip archive */
++
++  sqlite3_value *pName = 0;
++  sqlite3_value *pMode = 0;
++  sqlite3_value *pMtime = 0;
++  sqlite3_value *pData = 0;
++  sqlite3_value *pMethod = 0;
++
++  int bIsDir = 0;
++  u32 mode;
++  int rc = SQLITE_OK;
++  char *zErr = 0;
++
++  int iMethod = -1;               /* Compression method to use (0 or 8) */
++
++  const u8 *aData = 0;            /* Possibly compressed data for new entry */
++  int nData = 0;                  /* Size of aData[] in bytes */
++  int szUncompressed = 0;         /* Size of data before compression */
++  u8 *aFree = 0;                  /* Free this before returning */
++  u32 iCrc32 = 0;                 /* crc32 of uncompressed data */
++
++  char *zName = 0;                /* Path (name) of new entry */
++  int nName = 0;                  /* Size of zName in bytes */
++  char *zFree = 0;                /* Free this before returning */
++  int nByte;
++
++  memset(&e, 0, sizeof(e));
++  p = (ZipfileCtx*)sqlite3_aggregate_context(pCtx, sizeof(ZipfileCtx));
++  if( p==0 ) return;
++
++  /* Martial the arguments into stack variables */
++  if( nVal!=2 && nVal!=4 && nVal!=5 ){
++    zErr = sqlite3_mprintf("wrong number of arguments to function zipfile()");
++    rc = SQLITE_ERROR;
++    goto zipfile_step_out;
++  }
++  pName = apVal[0];
++  if( nVal==2 ){
++    pData = apVal[1];
++  }else{
++    pMode = apVal[1];
++    pMtime = apVal[2];
++    pData = apVal[3];
++    if( nVal==5 ){
++      pMethod = apVal[4];
++    }
++  }
++
++  /* Check that the 'name' parameter looks ok. */
++  zName = (char*)sqlite3_value_text(pName);
++  nName = sqlite3_value_bytes(pName);
++  if( zName==0 ){
++    zErr = sqlite3_mprintf("first argument to zipfile() must be non-NULL");
++    rc = SQLITE_ERROR;
++    goto zipfile_step_out;
++  }
++
++  /* Inspect the 'method' parameter. This must be either 0 (store), 8 (use
++  ** deflate compression) or NULL (choose automatically).  */
++  if( pMethod && SQLITE_NULL!=sqlite3_value_type(pMethod) ){
++    iMethod = (int)sqlite3_value_int64(pMethod);
++    if( iMethod!=0 && iMethod!=8 ){
++      zErr = sqlite3_mprintf("illegal method value: %d", iMethod);
++      rc = SQLITE_ERROR;
++      goto zipfile_step_out;
++    }
++  }
++
++  /* Now inspect the data. If this is NULL, then the new entry must be a
++  ** directory.  Otherwise, figure out whether or not the data should
++  ** be deflated or simply stored in the zip archive. */
++  if( sqlite3_value_type(pData)==SQLITE_NULL ){
++    bIsDir = 1;
++    iMethod = 0;
++  }else{
++    aData = sqlite3_value_blob(pData);
++    szUncompressed = nData = sqlite3_value_bytes(pData);
++    iCrc32 = crc32(0, aData, nData);
++    if( iMethod<0 || iMethod==8 ){
++      int nOut = 0;
++      rc = zipfileDeflate(aData, nData, &aFree, &nOut, &zErr);
++      if( rc!=SQLITE_OK ){
++        goto zipfile_step_out;
++      }
++      if( iMethod==8 || nOut0 && zName[nName-1]=='/' ){
++      zErr = sqlite3_mprintf("non-directory name must not end with /");
++      rc = SQLITE_ERROR;
++      goto zipfile_step_out;
++    }
++  }else{
++    if( nName==0 || zName[nName-1]!='/' ){
++      zName = zFree = sqlite3_mprintf("%s/", zName);
++      if( zName==0 ){
++        rc = SQLITE_NOMEM;
++        goto zipfile_step_out;
++      }
++      nName = (int)strlen(zName);
++    }else{
++      while( nName>1 && zName[nName-2]=='/' ) nName--;
++    }
++  }
++
++  /* Assemble the ZipfileEntry object for the new zip archive entry */
++  e.cds.iVersionMadeBy = ZIPFILE_NEWENTRY_MADEBY;
++  e.cds.iVersionExtract = ZIPFILE_NEWENTRY_REQUIRED;
++  e.cds.flags = ZIPFILE_NEWENTRY_FLAGS;
++  e.cds.iCompression = (u16)iMethod;
++  zipfileMtimeToDos(&e.cds, (u32)e.mUnixTime);
++  e.cds.crc32 = iCrc32;
++  e.cds.szCompressed = nData;
++  e.cds.szUncompressed = szUncompressed;
++  e.cds.iExternalAttr = (mode<<16);
++  e.cds.iOffset = p->body.n;
++  e.cds.nFile = (u16)nName;
++  e.cds.zFile = zName;
++
++  /* Append the LFH to the body of the new archive */
++  nByte = ZIPFILE_LFH_FIXED_SZ + e.cds.nFile + 9;
++  if( (rc = zipfileBufferGrow(&p->body, nByte)) ) goto zipfile_step_out;
++  p->body.n += zipfileSerializeLFH(&e, &p->body.a[p->body.n]);
++
++  /* Append the data to the body of the new archive */
++  if( nData>0 ){
++    if( (rc = zipfileBufferGrow(&p->body, nData)) ) goto zipfile_step_out;
++    memcpy(&p->body.a[p->body.n], aData, nData);
++    p->body.n += nData;
++  }
++
++  /* Append the CDS record to the directory of the new archive */
++  nByte = ZIPFILE_CDS_FIXED_SZ + e.cds.nFile + 9;
++  if( (rc = zipfileBufferGrow(&p->cds, nByte)) ) goto zipfile_step_out;
++  p->cds.n += zipfileSerializeCDS(&e, &p->cds.a[p->cds.n]);
++
++  /* Increment the count of entries in the archive */
++  p->nEntry++;
++
++ zipfile_step_out:
++  sqlite3_free(aFree);
++  sqlite3_free(zFree);
++  if( rc ){
++    if( zErr ){
++      sqlite3_result_error(pCtx, zErr, -1);
++    }else{
++      sqlite3_result_error_code(pCtx, rc);
++    }
++  }
++  sqlite3_free(zErr);
++}
++
++/*
++** xFinalize() callback for zipfile aggregate function.
++*/
++static void zipfileFinal(sqlite3_context *pCtx){
++  ZipfileCtx *p;
++  ZipfileEOCD eocd;
++  sqlite3_int64 nZip;
++  u8 *aZip;
++
++  p = (ZipfileCtx*)sqlite3_aggregate_context(pCtx, sizeof(ZipfileCtx));
++  if( p==0 ) return;
++  if( p->nEntry>0 ){
++    memset(&eocd, 0, sizeof(eocd));
++    eocd.nEntry = (u16)p->nEntry;
++    eocd.nEntryTotal = (u16)p->nEntry;
++    eocd.nSize = p->cds.n;
++    eocd.iOffset = p->body.n;
++
++    nZip = p->body.n + p->cds.n + ZIPFILE_EOCD_FIXED_SZ;
++    aZip = (u8*)sqlite3_malloc64(nZip);
++    if( aZip==0 ){
++      sqlite3_result_error_nomem(pCtx);
++    }else{
++      memcpy(aZip, p->body.a, p->body.n);
++      memcpy(&aZip[p->body.n], p->cds.a, p->cds.n);
++      zipfileSerializeEOCD(&eocd, &aZip[p->body.n + p->cds.n]);
++      sqlite3_result_blob(pCtx, aZip, (int)nZip, zipfileFree);
++    }
++  }
++
++  sqlite3_free(p->body.a);
++  sqlite3_free(p->cds.a);
++}
++
++
++/*
++** Register the "zipfile" virtual table.
++*/
++static int zipfileRegister(sqlite3 *db){
++  static sqlite3_module zipfileModule = {
++    1,                         /* iVersion */
++    zipfileConnect,            /* xCreate */
++    zipfileConnect,            /* xConnect */
++    zipfileBestIndex,          /* xBestIndex */
++    zipfileDisconnect,         /* xDisconnect */
++    zipfileDisconnect,         /* xDestroy */
++    zipfileOpen,               /* xOpen - open a cursor */
++    zipfileClose,              /* xClose - close a cursor */
++    zipfileFilter,             /* xFilter - configure scan constraints */
++    zipfileNext,               /* xNext - advance a cursor */
++    zipfileEof,                /* xEof - check for end of scan */
++    zipfileColumn,             /* xColumn - read data */
++    0,                         /* xRowid - read data */
++    zipfileUpdate,             /* xUpdate */
++    zipfileBegin,              /* xBegin */
++    0,                         /* xSync */
++    zipfileCommit,             /* xCommit */
++    zipfileRollback,           /* xRollback */
++    zipfileFindFunction,       /* xFindMethod */
++    0,                         /* xRename */
++    0,                         /* xSavepoint */
++    0,                         /* xRelease */
++    0,                         /* xRollback */
++    0,                         /* xShadowName */
++    0                          /* xIntegrity */
++  };
++
++  int rc = sqlite3_create_module(db, "zipfile"  , &zipfileModule, 0);
++  if( rc==SQLITE_OK ) rc = sqlite3_overload_function(db, "zipfile_cds", -1);
++  if( rc==SQLITE_OK ){
++    rc = sqlite3_create_function(db, "zipfile", -1, SQLITE_UTF8, 0, 0, 
++        zipfileStep, zipfileFinal
++    );
++  }
++  assert( sizeof(i64)==8 );
++  assert( sizeof(u32)==4 );
++  assert( sizeof(u16)==2 );
++  assert( sizeof(u8)==1 );
++  return rc;
++}
++#else         /* SQLITE_OMIT_VIRTUALTABLE */
++# define zipfileRegister(x) SQLITE_OK
++#endif
++
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_zipfile_init(
++  sqlite3 *db, 
++  char **pzErrMsg, 
++  const sqlite3_api_routines *pApi
++){
++  SQLITE_EXTENSION_INIT2(pApi);
++  (void)pzErrMsg;  /* Unused parameter */
++  return zipfileRegister(db);
++}
++/*** End of #include "zipfile.c" ***/
++
++#endif
++
++/*
++** Multi cipher VFS
++*/
++/* #include "sqlite3mc_vfs.c" */
++/*** Begin of #include "sqlite3mc_vfs.c" ***/
++/*
++** Name:        sqlite3mc_vfs.c
++** Purpose:     Implementation of SQLite VFS for Multiple Ciphers
++** Author:      Ulrich Telle
++** Created:     2020-02-28
++** Copyright:   (c) 2020-2023 Ulrich Telle
++** License:     MIT
++*/
++
++/* #include "sqlite3mc_vfs.h" */
++
++/* #include "sqlite3.h" */
++
++#include 
++#include 
++#include 
++/* #include "mystdint.h" */
++
++
++/*
++** Type definitions
++*/
++
++typedef struct sqlite3mc_file sqlite3mc_file;
++typedef struct sqlite3mc_vfs sqlite3mc_vfs;
++
++/*
++** SQLite3 Multiple Ciphers file structure
++*/
++
++struct sqlite3mc_file
++{
++  sqlite3_file base;           /* sqlite3_file I/O methods */
++  sqlite3_file* pFile;         /* Real underlying OS file */
++  sqlite3mc_vfs* pVfsMC;       /* Pointer to the sqlite3mc_vfs object */
++  const char* zFileName;       /* File name */
++  int openFlags;               /* Open flags */
++  sqlite3mc_file* pMainNext;   /* Next main db file */
++  sqlite3mc_file* pMainDb;     /* Main database to which this one is attached */
++  Codec* codec;                /* Codec if encrypted */
++  int pageNo;                  /* Page number (in case of journal files) */
++};
++
++/*
++** SQLite3 Multiple Ciphers VFS structure
++*/
++
++struct sqlite3mc_vfs
++{
++  sqlite3_vfs base;      /* Multiple Ciphers VFS shim methods */
++  sqlite3_mutex* mutex;  /* Mutex to protect pMain */
++  sqlite3mc_file* pMain; /* List of main database files */
++};
++
++#define REALVFS(p) ((sqlite3_vfs*)(((sqlite3mc_vfs*)(p))->base.pAppData))
++#define REALFILE(p) (((sqlite3mc_file*)(p))->pFile)
++
++/*
++** Prototypes for VFS methods
++*/
++
++static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile, int flags, int* pOutFlags);
++static int mcVfsDelete(sqlite3_vfs* pVfs, const char* zName, int syncDir);
++static int mcVfsAccess(sqlite3_vfs* pVfs, const char* zName, int flags, int* pResOut);
++static int mcVfsFullPathname(sqlite3_vfs* pVfs, const char* zName, int nOut, char* zOut);
++static void* mcVfsDlOpen(sqlite3_vfs* pVfs, const char* zFilename);
++static void mcVfsDlError(sqlite3_vfs* pVfs, int nByte, char* zErrMsg);
++static void (*mcVfsDlSym(sqlite3_vfs* pVfs, void* p, const char* zSymbol))(void);
++static void mcVfsDlClose(sqlite3_vfs* pVfs, void* p);
++static int mcVfsRandomness(sqlite3_vfs* pVfs, int nByte, char* zOut);
++static int mcVfsSleep(sqlite3_vfs* pVfs, int microseconds);
++static int mcVfsCurrentTime(sqlite3_vfs* pVfs, double* pOut);
++static int mcVfsGetLastError(sqlite3_vfs* pVfs, int nErr, char* zOut);
++static int mcVfsCurrentTimeInt64(sqlite3_vfs* pVfs, sqlite3_int64* pOut);
++static int mcVfsSetSystemCall(sqlite3_vfs* pVfs, const char* zName, sqlite3_syscall_ptr pNewFunc);
++static sqlite3_syscall_ptr mcVfsGetSystemCall(sqlite3_vfs* pVfs, const char* zName);
++static const char* mcVfsNextSystemCall(sqlite3_vfs* pVfs, const char* zName);
++
++/*
++** Prototypes for IO methods
++*/
++
++static int mcIoClose(sqlite3_file* pFile);
++static int mcIoRead(sqlite3_file* pFile, void*, int iAmt, sqlite3_int64 iOfst);
++static int mcIoWrite(sqlite3_file* pFile,const void*,int iAmt, sqlite3_int64 iOfst);
++static int mcIoTruncate(sqlite3_file* pFile, sqlite3_int64 size);
++static int mcIoSync(sqlite3_file* pFile, int flags);
++static int mcIoFileSize(sqlite3_file* pFile, sqlite3_int64* pSize);
++static int mcIoLock(sqlite3_file* pFile, int lock);
++static int mcIoUnlock(sqlite3_file* pFile, int lock);
++static int mcIoCheckReservedLock(sqlite3_file* pFile, int *pResOut);
++static int mcIoFileControl(sqlite3_file* pFile, int op, void *pArg);
++static int mcIoSectorSize(sqlite3_file* pFile);
++static int mcIoDeviceCharacteristics(sqlite3_file* pFile);
++static int mcIoShmMap(sqlite3_file* pFile, int iPg, int pgsz, int map, void volatile** p);
++static int mcIoShmLock(sqlite3_file* pFile, int offset, int n, int flags);
++static void mcIoShmBarrier(sqlite3_file* pFile);
++static int mcIoShmUnmap(sqlite3_file* pFile, int deleteFlag);
++static int mcIoFetch(sqlite3_file* pFile, sqlite3_int64 iOfst, int iAmt, void** pp);
++static int mcIoUnfetch(sqlite3_file* pFile, sqlite3_int64 iOfst, void* p);
++
++#define SQLITE3MC_VFS_NAME ("multipleciphers")
++
++/*
++** Header sizes of WAL journal files
++*/
++static const int walFrameHeaderSize = 24;
++static const int walFileHeaderSize = 32;
++
++/*
++** Global I/O method structure of SQLite3 Multiple Ciphers VFS
++*/
++
++#define IOMETHODS_VERSION_MIN 1
++#define IOMETHODS_VERSION_MAX 3
++
++static sqlite3_io_methods mcIoMethodsGlobal1 =
++{
++  1,                          /* iVersion */
++  mcIoClose,                  /* xClose */
++  mcIoRead,                   /* xRead */
++  mcIoWrite,                  /* xWrite */
++  mcIoTruncate,               /* xTruncate */
++  mcIoSync,                   /* xSync */
++  mcIoFileSize,               /* xFileSize */
++  mcIoLock,                   /* xLock */
++  mcIoUnlock,                 /* xUnlock */
++  mcIoCheckReservedLock,      /* xCheckReservedLock */
++  mcIoFileControl,            /* xFileControl */
++  mcIoSectorSize,             /* xSectorSize */
++  mcIoDeviceCharacteristics,  /* xDeviceCharacteristics */
++  0,                          /* xShmMap */
++  0,                          /* xShmLock */
++  0,                          /* xShmBarrier */
++  0,                          /* xShmUnmap */
++  0,                          /* xFetch */
++  0,                          /* xUnfetch */
++};
++
++static sqlite3_io_methods mcIoMethodsGlobal2 =
++{
++  2,                          /* iVersion */
++  mcIoClose,                  /* xClose */
++  mcIoRead,                   /* xRead */
++  mcIoWrite,                  /* xWrite */
++  mcIoTruncate,               /* xTruncate */
++  mcIoSync,                   /* xSync */
++  mcIoFileSize,               /* xFileSize */
++  mcIoLock,                   /* xLock */
++  mcIoUnlock,                 /* xUnlock */
++  mcIoCheckReservedLock,      /* xCheckReservedLock */
++  mcIoFileControl,            /* xFileControl */
++  mcIoSectorSize,             /* xSectorSize */
++  mcIoDeviceCharacteristics,  /* xDeviceCharacteristics */
++  mcIoShmMap,                 /* xShmMap */
++  mcIoShmLock,                /* xShmLock */
++  mcIoShmBarrier,             /* xShmBarrier */
++  mcIoShmUnmap,               /* xShmUnmap */
++  0,                          /* xFetch */
++  0,                          /* xUnfetch */
++};
++
++static sqlite3_io_methods mcIoMethodsGlobal3 =
++{
++  3,                          /* iVersion */
++  mcIoClose,                  /* xClose */
++  mcIoRead,                   /* xRead */
++  mcIoWrite,                  /* xWrite */
++  mcIoTruncate,               /* xTruncate */
++  mcIoSync,                   /* xSync */
++  mcIoFileSize,               /* xFileSize */
++  mcIoLock,                   /* xLock */
++  mcIoUnlock,                 /* xUnlock */
++  mcIoCheckReservedLock,      /* xCheckReservedLock */
++  mcIoFileControl,            /* xFileControl */
++  mcIoSectorSize,             /* xSectorSize */
++  mcIoDeviceCharacteristics,  /* xDeviceCharacteristics */
++  mcIoShmMap,                 /* xShmMap */
++  mcIoShmLock,                /* xShmLock */
++  mcIoShmBarrier,             /* xShmBarrier */
++  mcIoShmUnmap,               /* xShmUnmap */
++  mcIoFetch,                  /* xFetch */
++  mcIoUnfetch,                /* xUnfetch */
++};
++
++static sqlite3_io_methods* mcIoMethodsGlobal[] =
++  { 0, &mcIoMethodsGlobal1 , &mcIoMethodsGlobal2 , &mcIoMethodsGlobal3 };
++
++/*
++** Internal functions
++*/
++
++/*
++** Add an item to the list of main database files, if it is not already present.
++*/
++static void mcMainListAdd(sqlite3mc_file* pFile)
++{
++  assert( (pFile->openFlags & SQLITE_OPEN_MAIN_DB) );
++  sqlite3_mutex_enter(pFile->pVfsMC->mutex);
++  pFile->pMainNext = pFile->pVfsMC->pMain;
++  pFile->pVfsMC->pMain = pFile;
++  sqlite3_mutex_leave(pFile->pVfsMC->mutex);
++}
++
++/*
++** Remove an item from the list of main database files.
++*/
++static void mcMainListRemove(sqlite3mc_file* pFile)
++{
++  sqlite3mc_file** pMainPrev;
++  sqlite3_mutex_enter(pFile->pVfsMC->mutex);
++  for (pMainPrev = &pFile->pVfsMC->pMain; *pMainPrev && *pMainPrev != pFile; pMainPrev = &((*pMainPrev)->pMainNext)){}
++  if (*pMainPrev) *pMainPrev = pFile->pMainNext;
++  pFile->pMainNext = 0;
++  sqlite3_mutex_leave(pFile->pVfsMC->mutex);
++}
++
++/*
++** Given that zFileName points to a buffer containing a database file name passed to 
++** either the xOpen() or xAccess() VFS method, search the list of main database files
++** for a file handle opened by the same database connection on the corresponding
++** database file.
++*/
++static sqlite3mc_file* mcFindDbMainFileName(sqlite3mc_vfs* mcVfs, const char* zFileName)
++{
++  sqlite3mc_file* pDb;
++  sqlite3_mutex_enter(mcVfs->mutex);
++  for (pDb = mcVfs->pMain; pDb && pDb->zFileName != zFileName; pDb = pDb->pMainNext){}
++  sqlite3_mutex_leave(mcVfs->mutex);
++  return pDb;
++}
++
++/*
++** Find a pointer to the Multiple Ciphers VFS in use for a database connection.
++*/
++static sqlite3mc_vfs* mcFindVfs(sqlite3* db, const char* zDbName)
++{
++  sqlite3mc_vfs* pVfsMC = NULL;
++  if (db->pVfs && db->pVfs->xOpen == mcVfsOpen)
++  {
++    /* The top level VFS is a Multiple Ciphers VFS */
++    pVfsMC = (sqlite3mc_vfs*)(db->pVfs);
++  }
++  else
++  {
++    /*
++    ** The top level VFS is not a Multiple Ciphers VFS.
++    ** Retrieve the VFS names stack.
++    */
++    char* zVfsNameStack = 0;
++    if ((sqlite3_file_control(db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsNameStack) == SQLITE_OK) && (zVfsNameStack != NULL))
++    {
++      /* Search for the name prefix of a Multiple Ciphers VFS. */
++      char* zVfsName = strstr(zVfsNameStack, SQLITE3MC_VFS_NAME);
++      if (zVfsName != NULL)
++      {
++        /* The prefix was found, now determine the full VFS name. */
++        char* zVfsNameEnd = zVfsName + strlen(SQLITE3MC_VFS_NAME);
++        if (*zVfsNameEnd == '-')
++        {
++          for (++zVfsNameEnd; *zVfsNameEnd != '/'  && *zVfsNameEnd != 0; ++zVfsNameEnd);
++          if (*zVfsNameEnd == '/') *zVfsNameEnd = 0;
++
++          /* Find a pointer to the VFS with the determined name. */
++          sqlite3_vfs* pVfs = sqlite3_vfs_find(zVfsName);
++          if (pVfs && pVfs->xOpen == mcVfsOpen)
++          {
++            pVfsMC = (sqlite3mc_vfs*) pVfs;
++          }
++        }
++      }
++      sqlite3_free(zVfsNameStack);
++    }
++  }
++  return pVfsMC;
++}
++
++/*
++** Find the codec of the database file
++** corresponding to the database schema name.
++*/
++SQLITE_PRIVATE Codec* sqlite3mcGetCodec(sqlite3* db, const char* zDbName)
++{
++  Codec* codec = NULL;
++  sqlite3mc_vfs* pVfsMC = mcFindVfs(db, zDbName);
++
++  if (pVfsMC)
++  {
++    const char* dbFileName = sqlite3_db_filename(db, zDbName);
++    sqlite3mc_file* pDbMain = mcFindDbMainFileName(pVfsMC, dbFileName);
++    if (pDbMain)
++    {
++      codec = pDbMain->codec;
++    }
++  }
++  return codec;
++}
++
++/*
++** Find the codec of the main database file.
++*/
++SQLITE_PRIVATE Codec* sqlite3mcGetMainCodec(sqlite3* db)
++{
++  return sqlite3mcGetCodec(db, "main");
++}
++
++/*
++** Set the codec of the database file with the given database file name.
++**
++** The parameter db, the handle of the database connection, is currently
++** not used to determine the database file handle, for which the codec
++** should be set. The reason is that for shared cache mode the database
++** connection handle is not unique, and it is not even clear which
++** connection handle is actually valid, because the association between
++** connection handles and database file handles is not maintained properly.
++*/
++SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zDbName, const char* zFileName, Codec* codec)
++{
++  sqlite3mc_file* pDbMain = NULL;
++  sqlite3mc_vfs* pVfsMC = mcFindVfs(db, zDbName);
++  if (pVfsMC)
++  {
++    pDbMain = mcFindDbMainFileName((sqlite3mc_vfs*)(db->pVfs), zFileName);
++  }
++  if (pDbMain)
++  {
++    Codec* prevCodec = pDbMain->codec;
++    Codec* msgCodec = (codec) ? codec : prevCodec;
++    if (msgCodec)
++    {
++      /* Reset error state of pager */
++      mcReportCodecError(sqlite3mcGetBtShared(msgCodec), SQLITE_OK);
++    }
++    if (prevCodec)
++    {
++      /*
++      ** Free a codec that was already associated with this main database file handle
++      */
++      sqlite3mcCodecFree(prevCodec);
++    }
++    pDbMain->codec = codec;
++  }
++  else
++  {
++    /*
++    ** No main database file handle found, free codec
++    */
++    sqlite3mcCodecFree(codec);
++  }
++}
++
++/*
++** This function is called by the wal module when writing page content
++** into the log file.
++**
++** This function returns a pointer to a buffer containing the encrypted
++** page content. If a malloc fails, this function may return NULL.
++*/
++SQLITE_PRIVATE void* sqlite3mcPagerCodec(PgHdrMC* pPg)
++{
++  sqlite3_file* pFile = sqlite3PagerFile(pPg->pPager);
++  void* aData = 0;
++  if (pFile->pMethods == &mcIoMethodsGlobal1 || 
++      pFile->pMethods == &mcIoMethodsGlobal2 || 
++      pFile->pMethods == &mcIoMethodsGlobal3)
++  {
++    sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++    Codec* codec = mcFile->codec;
++    if (codec != 0 && codec->m_walLegacy == 0 && sqlite3mcIsEncrypted(codec))
++    {
++      aData = sqlite3mcCodec(codec, pPg->pData, pPg->pgno, 6);
++    }
++    else
++    {
++      aData = (char*) pPg->pData;
++    }
++  }
++  else
++  {
++    aData = (char*) pPg->pData;
++  }
++  return aData;
++}
++
++/*
++** Implementation of VFS methods
++*/
++
++static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile, int flags, int* pOutFlags)
++{
++  int rc;
++  sqlite3mc_vfs* mcVfs = (sqlite3mc_vfs*) pVfs;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  mcFile->pFile = (sqlite3_file*) &mcFile[1];
++  mcFile->pVfsMC = mcVfs;
++  mcFile->openFlags = flags;
++  mcFile->zFileName = zName;
++  mcFile->codec = 0;
++  mcFile->pMainDb = 0;
++  mcFile->pMainNext = 0;
++  mcFile->pageNo = 0;
++
++  if (zName)
++  {
++    if (flags & SQLITE_OPEN_MAIN_DB)
++    {
++      mcFile->zFileName = zName;
++      SQLITE3MC_DEBUG_LOG("mcVfsOpen MAIN: mcFile=%p fileName=%s\n", mcFile, mcFile->zFileName);
++    }
++    else if (flags & SQLITE_OPEN_TEMP_DB)
++    {
++      mcFile->zFileName = zName;
++      SQLITE3MC_DEBUG_LOG("mcVfsOpen TEMP: mcFile=%p fileName=%s\n", mcFile, mcFile->zFileName);
++    }
++#if 0
++    else if (flags & SQLITE_OPEN_TRANSIENT_DB)
++    {
++      /*
++      ** TODO: When does SQLite open a transient DB? Could/Should it be encrypted?
++      */
++    }
++#endif
++    else if (flags & SQLITE_OPEN_MAIN_JOURNAL)
++    {
++      const char* dbFileName = sqlite3_filename_database(zName);
++      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
++      mcFile->zFileName = zName;
++      SQLITE3MC_DEBUG_LOG("mcVfsOpen MAIN Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
++    }
++#if 0
++    else if (flags & SQLITE_OPEN_TEMP_JOURNAL)
++    {
++      /*
++      ** TODO: When does SQLite open a temporary journal? Could/Should it be encrypted?
++      */
++    }
++#endif
++    else if (flags & SQLITE_OPEN_SUBJOURNAL)
++    {
++      const char* dbFileName = sqlite3_filename_database(zName);
++      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
++      mcFile->zFileName = zName;
++      SQLITE3MC_DEBUG_LOG("mcVfsOpen SUB Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
++    }
++#if 0
++    else if (flags & SQLITE_OPEN_MASTER_JOURNAL)
++    {
++      /*
++      ** Master journal contains only administrative information
++      ** No encryption necessary
++      */
++    }
++#endif
++    else if (flags & SQLITE_OPEN_WAL)
++    {
++      const char* dbFileName = sqlite3_filename_database(zName);
++      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
++      mcFile->zFileName = zName;
++      SQLITE3MC_DEBUG_LOG("mcVfsOpen WAL Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
++    }
++  }
++
++  rc = REALVFS(pVfs)->xOpen(REALVFS(pVfs), zName, mcFile->pFile, flags, pOutFlags);
++  if (rc == SQLITE_OK)
++  {
++    /*
++    ** Real open succeeded
++    ** Initialize methods (use same version number as underlying implementation
++    ** Register main database files
++    */
++    int ioMethodsVersion = mcFile->pFile->pMethods->iVersion;
++    if (ioMethodsVersion < IOMETHODS_VERSION_MIN ||
++        ioMethodsVersion > IOMETHODS_VERSION_MAX)
++    {
++      /* If version out of range, use highest known version */
++      ioMethodsVersion = IOMETHODS_VERSION_MAX;
++    }
++    pFile->pMethods = mcIoMethodsGlobal[ioMethodsVersion];
++    if (flags & SQLITE_OPEN_MAIN_DB)
++    {
++      mcMainListAdd(mcFile);
++    }
++  }
++  return rc;
++}
++
++static int mcVfsDelete(sqlite3_vfs* pVfs, const char* zName, int syncDir)
++{
++  return REALVFS(pVfs)->xDelete(REALVFS(pVfs), zName, syncDir);
++}
++
++static int mcVfsAccess(sqlite3_vfs* pVfs, const char* zName, int flags, int* pResOut)
++{
++  return REALVFS(pVfs)->xAccess(REALVFS(pVfs), zName, flags, pResOut);
++}
++
++static int mcVfsFullPathname(sqlite3_vfs* pVfs, const char* zName, int nOut, char* zOut)
++{
++  return REALVFS(pVfs)->xFullPathname(REALVFS(pVfs), zName, nOut, zOut);
++}
++
++static void* mcVfsDlOpen(sqlite3_vfs* pVfs, const char* zFilename)
++{
++  return REALVFS(pVfs)->xDlOpen(REALVFS(pVfs), zFilename);
++}
++
++static void mcVfsDlError(sqlite3_vfs* pVfs, int nByte, char* zErrMsg)
++{
++  REALVFS(pVfs)->xDlError(REALVFS(pVfs), nByte, zErrMsg);
++}
++
++static void (*mcVfsDlSym(sqlite3_vfs* pVfs, void* p, const char* zSymbol))(void)
++{
++  return REALVFS(pVfs)->xDlSym(REALVFS(pVfs), p, zSymbol);
++}
++
++static void mcVfsDlClose(sqlite3_vfs* pVfs, void* p)
++{
++  REALVFS(pVfs)->xDlClose(REALVFS(pVfs), p);
++}
++
++static int mcVfsRandomness(sqlite3_vfs* pVfs, int nByte, char* zOut)
++{
++  return REALVFS(pVfs)->xRandomness(REALVFS(pVfs), nByte, zOut);
++}
++
++static int mcVfsSleep(sqlite3_vfs* pVfs, int microseconds)
++{
++  return REALVFS(pVfs)->xSleep(REALVFS(pVfs), microseconds);
++}
++
++static int mcVfsCurrentTime(sqlite3_vfs* pVfs, double* pOut)
++{
++  return REALVFS(pVfs)->xCurrentTime(REALVFS(pVfs), pOut);
++}
++
++static int mcVfsGetLastError(sqlite3_vfs* pVfs, int code, char* pOut)
++{
++  return REALVFS(pVfs)->xGetLastError(REALVFS(pVfs), code, pOut);
++}
++
++static int mcVfsCurrentTimeInt64(sqlite3_vfs* pVfs, sqlite3_int64* pOut)
++{
++  return REALVFS(pVfs)->xCurrentTimeInt64(REALVFS(pVfs), pOut);
++}
++
++static int mcVfsSetSystemCall(sqlite3_vfs* pVfs, const char* zName, sqlite3_syscall_ptr pNewFunc)
++{
++  return REALVFS(pVfs)->xSetSystemCall(REALVFS(pVfs), zName, pNewFunc);
++}
++
++static sqlite3_syscall_ptr mcVfsGetSystemCall(sqlite3_vfs* pVfs, const char* zName)
++{
++  return REALVFS(pVfs)->xGetSystemCall(REALVFS(pVfs), zName);
++}
++
++static const char* mcVfsNextSystemCall(sqlite3_vfs* pVfs, const char* zName)
++{
++  return REALVFS(pVfs)->xNextSystemCall(REALVFS(pVfs), zName);
++}
++
++/*
++** IO methods
++*/
++
++static int mcIoClose(sqlite3_file* pFile)
++{
++  int rc;
++  sqlite3mc_file* p = (sqlite3mc_file*) pFile;
++
++  /*
++  ** Unregister main database files
++  */
++  if (p->openFlags & SQLITE_OPEN_MAIN_DB)
++  {
++    mcMainListRemove(p);
++  }
++
++  /*
++  ** Release codec memory
++  */
++  if (p->codec)
++  {
++    sqlite3mcCodecFree(p->codec);
++    p->codec = 0;
++  }
++
++  assert(p->pMainNext == 0 && p->pVfsMC->pMain != p);
++  rc = REALFILE(pFile)->pMethods->xClose(REALFILE(pFile));
++  return rc;
++}
++
++/*
++** Read operation on main database file
++*/
++static int mcReadMainDb(sqlite3_file* pFile, void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++
++  /*
++  ** Special case: read 16 bytes salt from beginning of database file without decrypting
++  */
++  if (offset == 0 && count == 16)
++  {
++    return rc;
++  }
++
++  if (mcFile->codec != 0 && sqlite3mcIsEncrypted(mcFile->codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(mcFile->codec);
++    const int deltaOffset = offset % pageSize;
++    const int deltaCount = count % pageSize;
++    if (deltaOffset || deltaCount)
++    {
++      /*
++      ** Read partial page
++      */
++      int pageNo = 0;
++      void* bufferDecrypted = 0;
++      const sqlite3_int64 prevOffset = offset - deltaOffset;
++      unsigned char* pageBuffer = sqlite3mcGetPageBuffer(mcFile->codec);
++
++      /*
++      ** Read complete page from file
++      */
++      rc = REALFILE(pFile)->pMethods->xRead(REALFILE(pFile), pageBuffer, pageSize, prevOffset);
++      if (rc == SQLITE_IOERR_SHORT_READ)
++      {
++        return rc;
++      }
++
++      /*
++      ** Determine page number and decrypt page buffer
++      */
++      pageNo = prevOffset / pageSize + 1;
++      bufferDecrypted = sqlite3mcCodec(mcFile->codec, pageBuffer, pageNo, 3);
++
++      /*
++      ** Return the requested content
++      */
++      if (deltaOffset)
++      {
++        memcpy(buffer, pageBuffer + deltaOffset, count);
++      }
++      else
++      {
++        memcpy(buffer, pageBuffer, count);
++      }
++    }
++    else
++    {
++      /*
++      ** Read full page(s)
++      **
++      ** In fact, SQLite reads only one database page at a time.
++      ** This would allow to remove the page loop below.
++      */
++      unsigned char* data = (unsigned char*) buffer;
++      int pageNo = offset / pageSize + 1;
++      int nPages = count / pageSize;
++      int iPage;
++      for (iPage = 0; iPage < nPages; ++iPage)
++      {
++        void* bufferDecrypted = sqlite3mcCodec(mcFile->codec, data, pageNo, 3);
++        data += pageSize;
++        offset += pageSize;
++        ++pageNo;
++      }
++    }
++  }
++  return rc;
++}
++
++/*
++** Read operation on main journal file
++*/
++static int mcReadMainJournal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++
++    if (count == pageSize && mcFile->pageNo != 0)
++    {
++      /*
++      ** Decrypt the page buffer, but only if the page number is valid
++      */
++      void* bufferDecrypted = sqlite3mcCodec(codec, (char*) buffer, mcFile->pageNo, 3);
++      mcFile->pageNo = 0;
++    }
++    else if (count == 4)
++    {
++      /*
++      ** SQLite always reads the page number from the journal file
++      ** immediately before the corresponding page content is read.
++      */
++      mcFile->pageNo = sqlite3Get4byte(buffer);
++    }
++  }
++  return rc;
++}
++
++/*
++** Read operation on subjournal file
++*/
++static int mcReadSubJournal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++
++    if (count == pageSize && mcFile->pageNo != 0)
++    {
++      /*
++      ** Decrypt the page buffer, but only if the page number is valid
++      */
++      void* bufferDecrypted = sqlite3mcCodec(codec, (char*) buffer, mcFile->pageNo, 3);
++    }
++    else if (count == 4)
++    {
++      /*
++      ** SQLite always reads the page number from the journal file
++      ** immediately before the corresponding page content is read.
++      */
++      mcFile->pageNo = sqlite3Get4byte(buffer);
++    }
++  }
++  return rc;
++}
++
++/*
++** Read operation on WAL journal file
++*/
++static int mcReadWal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++
++    if (count == pageSize)
++    {
++      int pageNo = 0;
++      unsigned char ac[4];
++
++      /*
++      ** Determine page number
++      **
++      ** It is necessary to explicitly read the page number from the frame header.
++      */
++      rc = REALFILE(pFile)->pMethods->xRead(REALFILE(pFile), ac, 4, offset - walFrameHeaderSize);
++      if (rc == SQLITE_OK)
++      {
++        pageNo = sqlite3Get4byte(ac);
++      }
++
++      /*
++      ** Decrypt page content if page number is valid
++      */
++      if (pageNo != 0)
++      {
++        void* bufferDecrypted = sqlite3mcCodec(codec, (char*)buffer, pageNo, 3);
++      }
++    }
++    else if (codec->m_walLegacy != 0 && count == pageSize + walFrameHeaderSize)
++    {
++      int pageNo = sqlite3Get4byte(buffer);
++
++      /*
++      ** Decrypt page content if page number is valid
++      */
++      if (pageNo != 0)
++      {
++        void* bufferDecrypted = sqlite3mcCodec(codec, (char*)buffer+walFrameHeaderSize, pageNo, 3);
++      }
++    }
++  }
++  return rc;
++}
++
++static int mcIoRead(sqlite3_file* pFile, void* buffer, int count, sqlite3_int64 offset)
++{
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  int rc = REALFILE(pFile)->pMethods->xRead(REALFILE(pFile), buffer, count, offset);
++  if (rc == SQLITE_IOERR_SHORT_READ)
++  {
++    return rc;
++  }
++
++  if (mcFile->openFlags & SQLITE_OPEN_MAIN_DB)
++  {
++    rc = mcReadMainDb(pFile, buffer, count, offset);
++  }
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TEMP_DB)
++  {
++    /*
++    ** TODO: Could/Should a temporary database file be encrypted?
++    */
++  }
++#endif
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TRANSIENT_DB)
++  {
++    /*
++    ** TODO: Could/Should a transient database file be encrypted?
++    */
++  }
++#endif
++  else if (mcFile->openFlags & SQLITE_OPEN_MAIN_JOURNAL)
++  {
++    rc = mcReadMainJournal(pFile, buffer, count, offset);
++  }
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TEMP_JOURNAL)
++  {
++    /*
++    ** TODO: Could/Should a temporary journal file be encrypted?
++    */
++  }
++#endif
++  else if (mcFile->openFlags & SQLITE_OPEN_SUBJOURNAL)
++  {
++    rc = mcReadSubJournal(pFile, buffer, count, offset);
++  }
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_MASTER_JOURNAL)
++  {
++    /*
++    ** Master journal contains only administrative information
++    ** No encryption necessary
++    */
++  }
++#endif
++  else if (mcFile->openFlags & SQLITE_OPEN_WAL)
++  {
++    rc = mcReadWal(pFile, buffer, count, offset);
++  }
++  return rc;
++}
++
++/*
++** Write operation on main database file
++*/
++static int mcWriteMainDb(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++
++  if (mcFile->codec != 0 && sqlite3mcIsEncrypted(mcFile->codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(mcFile->codec);
++    const int deltaOffset = offset % pageSize;
++    const int deltaCount = count % pageSize;
++
++    if (deltaOffset || deltaCount)
++    {
++      /*
++      ** Write partial page
++      **
++      ** SQLite does never write partial database pages.
++      ** Therefore no encryption is required in this case.
++      */
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++    }
++    else
++    {
++      /*
++      ** Write full page(s)
++      **
++      ** In fact, SQLite writes only one database page at a time.
++      ** This would allow to remove the page loop below.
++      */
++      char* data = (char*) buffer;
++      int pageNo = offset / pageSize + 1;
++      int nPages = count / pageSize;
++      int iPage;
++      for (iPage = 0; iPage < nPages; ++iPage)
++      {
++        void* bufferEncrypted = sqlite3mcCodec(mcFile->codec, data, pageNo, 6);
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), bufferEncrypted, pageSize, offset);
++        data += pageSize;
++        offset += pageSize;
++        ++pageNo;
++      }
++    }
++  }
++  else
++  {
++    /*
++    ** Write buffer without encryption
++    */
++    rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++  }
++  return rc;
++}
++
++/*
++** Write operation on main journal file
++*/
++static int mcWriteMainJournal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++    const int frameSize = pageSize + 4 + 4;
++
++    if (count == pageSize && mcFile->pageNo != 0)
++    {
++      /*
++      ** Encrypt the page buffer, but only if the page number is valid
++      */
++      void* bufferEncrypted = sqlite3mcCodec(codec, (char*) buffer, mcFile->pageNo, 7);
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), bufferEncrypted, pageSize, offset);
++    }
++    else
++    {
++      /*
++      ** Write buffer without encryption
++      */
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++      if (count == 4)
++      {
++        /*
++        ** SQLite always writes the page number to the journal file
++        ** immediately before the corresponding page content is written.
++        */
++        mcFile->pageNo = (rc == SQLITE_OK) ? sqlite3Get4byte(buffer) : 0;
++      }
++    }
++  }
++  else
++  {
++    /*
++    ** Write buffer without encryption
++    */
++    rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++  }
++  return rc;
++}
++
++/*
++** Write operation on subjournal file
++*/
++static int mcWriteSubJournal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++    const int frameSize = pageSize + 4;
++
++    if (count == pageSize && mcFile->pageNo != 0)
++    {
++      /*
++      ** Encrypt the page buffer, but only if the page number is valid
++      */
++      void* bufferEncrypted = sqlite3mcCodec(codec, (char*) buffer, mcFile->pageNo, 7);
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), bufferEncrypted, pageSize, offset);
++    }
++    else
++    {
++      /*
++      ** Write buffer without encryption
++      */
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++      if (count == 4)
++      {
++        /*
++        ** SQLite always writes the page number to the journal file
++        ** immediately before the corresponding page content is written.
++        */
++        mcFile->pageNo = (rc == SQLITE_OK) ? sqlite3Get4byte(buffer) : 0;
++      }
++    }
++  }
++  else
++  {
++    /*
++    ** Write buffer without encryption
++    */
++    rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++  }
++  return rc;
++}
++
++/*
++** Write operation on WAL journal file
++*/
++static int mcWriteWal(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++  Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
++
++  if (codec != 0 && codec->m_walLegacy != 0 && sqlite3mcIsEncrypted(codec))
++  {
++    const int pageSize = sqlite3mcGetPageSize(codec);
++
++    if (count == pageSize)
++    {
++      int pageNo = 0;
++      unsigned char ac[4];
++
++      /*
++      ** Read the corresponding page number from the file
++      **
++      ** In WAL mode SQLite does not write the page number of a page to file
++      ** immediately before writing the corresponding page content.
++      ** Page numbers and checksums are written to file independently.
++      ** Therefore it is necessary to explicitly read the page number
++      ** on writing to file the content of a page.
++      */
++      rc = REALFILE(pFile)->pMethods->xRead(REALFILE(pFile), ac, 4, offset - walFrameHeaderSize);
++      if (rc == SQLITE_OK)
++      {
++        pageNo = sqlite3Get4byte(ac);
++      }
++
++      if (pageNo != 0)
++      {
++        /*
++        ** Encrypt the page buffer, but only if the page number is valid
++        */
++        void* bufferEncrypted = sqlite3mcCodec(codec, (char*) buffer, pageNo, 7);
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), bufferEncrypted, pageSize, offset);
++      }
++      else
++      {
++        /*
++        ** Write buffer without encryption if the page number could not be determined
++        */
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++      }
++    }
++    else if (count == pageSize + walFrameHeaderSize)
++    {
++      int pageNo = sqlite3Get4byte(buffer);
++      if (pageNo != 0)
++      {
++        /*
++        ** Encrypt the page buffer, but only if the page number is valid
++        */
++        void* bufferEncrypted = sqlite3mcCodec(codec, (char*)buffer+walFrameHeaderSize, pageNo, 7);
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, walFrameHeaderSize, offset);
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), bufferEncrypted, pageSize, offset+walFrameHeaderSize);
++      }
++      else
++      {
++        /*
++        ** Write buffer without encryption if the page number could not be determined
++        */
++        rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++      }
++    }
++    else
++    {
++      /*
++      ** Write buffer without encryption if it is not a database page
++      */
++      rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++    }
++  }
++  else
++  {
++    /*
++    ** Write buffer without encryption
++    */
++    rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++  }
++  return rc;
++}
++
++static int mcIoWrite(sqlite3_file* pFile, const void* buffer, int count, sqlite3_int64 offset)
++{
++  int rc = SQLITE_OK;
++  int doDefault = 1;
++  sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
++
++  if (mcFile->openFlags & SQLITE_OPEN_MAIN_DB)
++  {
++    rc = mcWriteMainDb(pFile, buffer, count, offset);
++  }
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TEMP_DB)
++  {
++    /*
++    ** TODO: Could/Should a temporary database file be encrypted?
++    */
++  }
++#endif
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TRANSIENT_DB)
++  {
++    /*
++    ** TODO: Could/Should a transient database file be encrypted?
++    */
++  }
++#endif
++  else if (mcFile->openFlags & SQLITE_OPEN_MAIN_JOURNAL)
++  {
++    rc = mcWriteMainJournal(pFile, buffer, count, offset);
++  }
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_TEMP_JOURNAL)
++  {
++    /*
++    ** TODO: Could/Should a temporary journal file be encrypted?
++    */
++  }
++#endif
++  else if (mcFile->openFlags & SQLITE_OPEN_SUBJOURNAL)
++  {
++    rc = mcWriteSubJournal(pFile, buffer, count, offset);
++}
++#if 0
++  else if (mcFile->openFlags & SQLITE_OPEN_MASTER_JOURNAL)
++  {
++    /*
++    ** Master journal contains only administrative information
++    ** No encryption necessary
++    */
++  }
++#endif
++  /*
++  ** The page content is encrypted in memory in the WAL journal handler.
++  ** This provides for compatibility with legacy applications using the
++  ** previous SQLITE_HAS_CODEC encryption API.
++  */
++  else if (mcFile->openFlags & SQLITE_OPEN_WAL)
++  {
++    rc = mcWriteWal(pFile, buffer, count, offset);
++  }
++  else
++  {
++    rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);
++  }
++  return rc;
++}
++
++static int mcIoTruncate(sqlite3_file* pFile, sqlite3_int64 size)
++{
++  return REALFILE(pFile)->pMethods->xTruncate(REALFILE(pFile), size);
++}
++
++static int mcIoSync(sqlite3_file* pFile, int flags)
++{
++  return REALFILE(pFile)->pMethods->xSync(REALFILE(pFile), flags);
++}
++
++static int mcIoFileSize(sqlite3_file* pFile, sqlite3_int64* pSize)
++{
++  return REALFILE(pFile)->pMethods->xFileSize(REALFILE(pFile), pSize);
++}
++
++static int mcIoLock(sqlite3_file* pFile, int lock)
++{
++  return REALFILE(pFile)->pMethods->xLock(REALFILE(pFile), lock);
++}
++
++static int mcIoUnlock(sqlite3_file* pFile, int lock)
++{
++  return REALFILE(pFile)->pMethods->xUnlock(REALFILE(pFile), lock);
++}
++
++static int mcIoCheckReservedLock(sqlite3_file* pFile, int* pResOut)
++{
++  return REALFILE(pFile)->pMethods->xCheckReservedLock(REALFILE(pFile), pResOut);
++}
++
++static int mcIoFileControl(sqlite3_file* pFile, int op, void* pArg)
++{
++  int rc = SQLITE_OK;
++  int doReal = 1;
++  sqlite3mc_file* p = (sqlite3mc_file*) pFile;
++
++  switch (op)
++  {
++    case SQLITE_FCNTL_PDB:
++      {
++#if 0
++        /*
++        ** pArg points to the sqlite3* handle for which the database file was opened.
++        ** In shared cache mode this function is invoked for every use of the database
++        ** file in a connection. Unfortunately there is no notification, when a database
++        ** file is no longer used by a connection (close in normal mode).
++        **
++        ** For now, the database handle will not be stored in the file object.
++        ** In the future, this behaviour may be changed, especially, if shared cache mode
++        ** is disabled. Shared cache mode is enabled for backward compatibility only, its
++        ** use is not recommended. A future version of SQLite might disable it by default.
++        */
++        sqlite3* db = *((sqlite3**) pArg);
++#endif
++    }
++      break;
++    case SQLITE_FCNTL_PRAGMA:
++      {
++        /*
++        ** Handle pragmas specific to this database file
++        */
++#if 0
++        /*
++        ** SQLite invokes this function for all pragmas, which are related to the schema
++        ** associated with this database file. In case of an unknown pragma, this function
++        ** should return SQLITE_NOTFOUND. However, since this VFS is just a shim, handling
++        ** of the pragma is forwarded to the underlying real VFS in such a case.
++        **
++        ** For now, all pragmas are handled at the connection level.
++        ** For this purpose the SQLite's pragma handling is intercepted.
++        ** The latter requires a patch of SQLite's amalgamation code.
++        ** Maybe a future version will be able to abandon the patch.
++        */
++        char* pragmaName = ((char**) pArg)[1];
++        char* pragmaValue = ((char**) pArg)[2];
++        if (sqlite3StrICmp(pragmaName, "...") == 0)
++        {
++          /* Action */
++          /* ((char**) pArg)[0] = sqlite3_mprintf("error msg.");*/
++          doReal = 0;
++        }
++#endif
++      }
++      break;
++    default:
++      break;
++  }
++  if (doReal)
++  {
++    rc = REALFILE(pFile)->pMethods->xFileControl(REALFILE(pFile), op, pArg);
++    if (rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME)
++    {
++      sqlite3mc_vfs* pVfsMC = p->pVfsMC;
++      char* zIn = *(char**)pArg;
++      char* zOut = sqlite3_mprintf("%s/%z", pVfsMC->base.zName, zIn);
++      *(char**)pArg = zOut;
++      if (zOut == 0) rc = SQLITE_NOMEM;
++    }
++  }
++  return rc;
++}
++
++static int mcIoSectorSize(sqlite3_file* pFile)
++{
++  if (REALFILE(pFile)->pMethods->xSectorSize)
++    return REALFILE(pFile)->pMethods->xSectorSize(REALFILE(pFile));
++  else
++    return SQLITE_DEFAULT_SECTOR_SIZE;
++}
++
++static int mcIoDeviceCharacteristics(sqlite3_file* pFile)
++{
++  return REALFILE(pFile)->pMethods->xDeviceCharacteristics(REALFILE(pFile));
++}
++
++static int mcIoShmMap(sqlite3_file* pFile, int iPg, int pgsz, int map, void volatile** p)
++{
++  return REALFILE(pFile)->pMethods->xShmMap(REALFILE(pFile), iPg, pgsz, map, p);
++}
++
++static int mcIoShmLock(sqlite3_file* pFile, int offset, int n, int flags)
++{
++  return REALFILE(pFile)->pMethods->xShmLock(REALFILE(pFile), offset, n, flags);
++}
++
++static void mcIoShmBarrier(sqlite3_file* pFile)
++{
++  REALFILE(pFile)->pMethods->xShmBarrier(REALFILE(pFile));
++}
++
++static int mcIoShmUnmap(sqlite3_file* pFile, int deleteFlag)
++{
++  return REALFILE(pFile)->pMethods->xShmUnmap(REALFILE(pFile), deleteFlag);
++}
++
++static int mcIoFetch(sqlite3_file* pFile, sqlite3_int64 iOfst, int iAmt, void** pp)
++{
++  return REALFILE(pFile)->pMethods->xFetch(REALFILE(pFile), iOfst, iAmt, pp);
++}
++
++static int mcIoUnfetch( sqlite3_file* pFile, sqlite3_int64 iOfst, void* p)
++{
++  return REALFILE(pFile)->pMethods->xUnfetch(REALFILE(pFile), iOfst, p);
++}
++
++/*
++** SQLite3 Multiple Ciphers internal API functions
++*/
++
++/*
++** Check the requested VFS
++*/
++SQLITE_PRIVATE int
++sqlite3mcCheckVfs(const char* zVfs)
++{
++  int rc = SQLITE_OK;
++  sqlite3_vfs* pVfs = sqlite3_vfs_find(zVfs);
++  if (pVfs == NULL)
++  {
++    /* VFS not found */
++    int prefixLen = (int) strlen(SQLITE3MC_VFS_NAME);
++    if (strncmp(zVfs, SQLITE3MC_VFS_NAME, prefixLen) == 0)
++    {
++      /* VFS name starts with prefix. */
++      const char* zVfsNameEnd = zVfs + strlen(SQLITE3MC_VFS_NAME);
++      if (*zVfsNameEnd == '-')
++      {
++        /* Prefix separator found, determine the name of the real VFS. */
++        const char* zVfsReal = zVfsNameEnd + 1;
++        pVfs = sqlite3_vfs_find(zVfsReal);
++        if (pVfs != NULL)
++        {
++          /* Real VFS exists */
++          /* Create VFS with encryption support based on real VFS */
++          rc = sqlite3mc_vfs_create(zVfsReal, 0);
++        }
++      }
++    }
++  }
++  return rc;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcPagerHasCodec(PagerMC* pPager)
++{
++  int hasCodec = 0;
++  sqlite3mc_vfs* pVfsMC = NULL;
++  sqlite3_vfs* pVfs = pPager->pVfs;
++
++  /* Check whether the VFS stack of the pager contains a Multiple Ciphers VFS */
++  for (; pVfs; pVfs = pVfs->pNext)
++  {
++    if (pVfs && pVfs->xOpen == mcVfsOpen)
++    {
++      /* Multiple Ciphers VFS found */
++      pVfsMC = (sqlite3mc_vfs*)(pVfs);
++      break;
++    }
++  }
++
++  /* Check whether codec is enabled for associated database file */
++  if (pVfsMC)
++  {
++    sqlite3mc_file* mcFile = mcFindDbMainFileName(pVfsMC, pPager->zFilename);
++    if (mcFile)
++    {
++      Codec* codec = mcFile->codec;
++      hasCodec = (codec != 0 && sqlite3mcIsEncrypted(codec));
++    }
++  }
++  return hasCodec;
++}
++
++/*
++** SQLite3 Multiple Ciphers external API functions
++*/
++
++static void mcVfsDestroy(sqlite3_vfs* pVfs)
++{
++  if (pVfs && pVfs->xOpen == mcVfsOpen)
++  {
++    /* Destroy the VFS instance only if no file is referring to it any longer */
++    if (((sqlite3mc_vfs*) pVfs)->pMain == 0)
++    {
++      sqlite3_mutex_free(((sqlite3mc_vfs*)pVfs)->mutex);
++      sqlite3_vfs_unregister(pVfs);
++      sqlite3_free(pVfs);
++    }
++  }
++}
++
++/*
++** Unregister and destroy a Multiple Ciphers VFS
++** created by an earlier call to sqlite3mc_vfs_create().
++*/
++SQLITE_API void sqlite3mc_vfs_destroy(const char* zName)
++{
++  mcVfsDestroy(sqlite3_vfs_find(zName));
++}
++
++/*
++** Create a Multiple Ciphers VFS based on the underlying VFS with name given by zVfsReal.
++** If makeDefault is true, the VFS is set as the default VFS.
++*/
++SQLITE_API int sqlite3mc_vfs_create(const char* zVfsReal, int makeDefault)
++{
++  static sqlite3_vfs mcVfsTemplate =
++  {
++    3,                      /* iVersion */
++    0,                      /* szOsFile */
++    1024,                   /* mxPathname */
++    0,                      /* pNext */
++    0,                      /* zName */
++    0,                      /* pAppData */
++    mcVfsOpen,              /* xOpen */
++    mcVfsDelete,            /* xDelete */
++    mcVfsAccess,            /* xAccess */
++    mcVfsFullPathname,      /* xFullPathname */
++#ifndef SQLITE_OMIT_LOAD_EXTENSION
++    mcVfsDlOpen,            /* xDlOpen */
++    mcVfsDlError,           /* xDlError */
++    mcVfsDlSym,             /* xDlSym */
++    mcVfsDlClose,           /* xDlClose */
++#else
++    0, 0, 0, 0,
++#endif
++    mcVfsRandomness,        /* xRandomness */
++    mcVfsSleep,             /* xSleep */
++    mcVfsCurrentTime,       /* xCurrentTime */
++    mcVfsGetLastError,      /* xGetLastError */
++    mcVfsCurrentTimeInt64,  /* xCurrentTimeInt64 */
++    mcVfsSetSystemCall,     /* xSetSystemCall */
++    mcVfsGetSystemCall,     /* xGetSystemCall */
++    mcVfsNextSystemCall     /* xNextSystemCall */
++  };
++  sqlite3mc_vfs* pVfsNew = 0;  /* Newly allocated VFS */
++  sqlite3_vfs* pVfsReal = sqlite3_vfs_find(zVfsReal); /* Real VFS */
++  int rc;
++
++  if (pVfsReal)
++  {
++    size_t nPrefix = strlen(SQLITE3MC_VFS_NAME);
++    size_t nRealName = strlen(pVfsReal->zName);
++    size_t nName =  nPrefix + nRealName + 1;
++    size_t nByte = sizeof(sqlite3mc_vfs) + nName + 1;
++    pVfsNew = (sqlite3mc_vfs*) sqlite3_malloc64(nByte);
++    if (pVfsNew)
++    {
++      char* zSpace = (char*) &pVfsNew[1];
++      memset(pVfsNew, 0, nByte);
++      memcpy(&pVfsNew->base, &mcVfsTemplate, sizeof(sqlite3_vfs));
++      pVfsNew->base.iVersion = pVfsReal->iVersion;
++      pVfsNew->base.pAppData = pVfsReal;
++      pVfsNew->base.mxPathname = pVfsReal->mxPathname;
++      pVfsNew->base.szOsFile = sizeof(sqlite3mc_file) + pVfsReal->szOsFile;
++
++      /* Set name of new VFS as combination of the multiple ciphers prefix and the name of the underlying VFS */
++      pVfsNew->base.zName = (const char*) zSpace;
++      memcpy(zSpace, SQLITE3MC_VFS_NAME, nPrefix);
++      memcpy(zSpace + nPrefix, "-", 1);
++      memcpy(zSpace + nPrefix + 1, pVfsReal->zName, nRealName);
++
++      /* Allocate the mutex and register the new VFS */
++      pVfsNew->mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_RECURSIVE);
++      if (pVfsNew->mutex)
++      {
++        rc = sqlite3_vfs_register(&pVfsNew->base, makeDefault);
++        if (rc != SQLITE_OK)
++        {
++          sqlite3_mutex_free(pVfsNew->mutex);
++        }
++      }
++      else
++      {
++        /* Mutex could not be allocated */
++        rc = SQLITE_NOMEM;
++      }
++      if (rc != SQLITE_OK)
++      {
++        /* Mutex could not be allocated or new VFS could not be registered */
++        sqlite3_free(pVfsNew);
++      }
++    }
++    else
++    {
++      /* New VFS could not be allocated */
++      rc = SQLITE_NOMEM;
++    }
++  }
++  else
++  {
++    /* Underlying VFS not found */
++    rc = SQLITE_NOTFOUND;
++  }
++  return rc;
++}
++
++/*
++** Shutdown all registered SQLite3 Multiple Ciphers VFSs
++*/
++SQLITE_API void sqlite3mc_vfs_shutdown()
++{
++  sqlite3_vfs* pVfs;
++  sqlite3_vfs* pVfsNext;
++  for (pVfs = sqlite3_vfs_find(0); pVfs; pVfs = pVfsNext)
++  {
++    pVfsNext = pVfs->pNext;
++    mcVfsDestroy(pVfs);
++  }
++}
++/*** End of #include "sqlite3mc_vfs.c" ***/
++
++
++static int
++mcRegisterCodecExtensions(sqlite3* db, char** pzErrMsg, const sqlite3_api_routines* pApi)
++{
++  int rc = SQLITE_OK;
++  CodecParameter* codecParameterTable = NULL;
++
++  if (sqlite3FindFunction(db, "sqlite3mc_config_table", 1, SQLITE_UTF8, 0) != NULL)
++  {
++    /* Return if codec extension functions are already defined */
++    return rc;
++  }
++
++  /* Generate copy of global codec parameter table */
++  codecParameterTable = sqlite3mcCloneCodecParameterTable();
++  rc = (codecParameterTable != NULL) ? SQLITE_OK : SQLITE_NOMEM;
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function_v2(db, "sqlite3mc_config_table", 0, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                    codecParameterTable, sqlite3mcConfigTable, 0, 0, (void(*)(void*)) sqlite3mcFreeCodecParameterTable);
++  }
++
++  rc = (codecParameterTable != NULL) ? SQLITE_OK : SQLITE_NOMEM;
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_config", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 codecParameterTable, sqlite3mcConfigParams, 0, 0);
++  }
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_config", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 codecParameterTable, sqlite3mcConfigParams, 0, 0);
++  }
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_config", 3, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 codecParameterTable, sqlite3mcConfigParams, 0, 0);
++  }
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_codec_data", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 NULL, sqlite3mcCodecDataSql, 0, 0);
++  }
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_codec_data", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 NULL, sqlite3mcCodecDataSql, 0, 0);
++  }
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_create_function(db, "sqlite3mc_version", 0, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++                                 NULL, sqlite3mcVersion, 0, 0);
++  }
++  return rc;
++}
++
++#ifdef SQLITE_ENABLE_EXTFUNC
++static int
++sqlite3_extfunc_init(sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi)
++{
++  return RegisterExtensionFunctions(db);
++}
++#endif
++
++static int
++mcCheckValidName(char* name)
++{
++  size_t nl;
++  if (!name)
++    return SQLITE_ERROR;
++
++  /* Check for valid cipher name length */
++  nl = strlen(name);
++  if (nl < 1 || nl >= CIPHER_NAME_MAXLEN)
++    return SQLITE_ERROR;
++
++  /* Check for already registered names */
++  CipherName* cipherNameTable = &globalCipherNameTable[0];
++  for (; cipherNameTable->m_name[0] != 0; ++cipherNameTable)
++  {
++    if (sqlite3_stricmp(name, cipherNameTable->m_name) == 0) break;
++  }
++  if (cipherNameTable->m_name[0] != 0)
++    return SQLITE_ERROR;
++
++  /* Check for valid character set (1st char = alpha, rest = alpha-numeric or underscore) */
++  if (sqlite3Isalpha(name[0]))
++  {
++    size_t j;
++    for (j = 1; j < nl && (name[j] == '_' || sqlite3Isalnum(name[j])); ++j) {}
++    if (j == nl)
++      return SQLITE_OK;
++  }
++  return SQLITE_ERROR;
++}
++
++SQLITE_PRIVATE int
++sqlite3mcGetGlobalCipherCount()
++{
++  int cipherCount = 0;
++  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++  cipherCount = globalCipherCount;
++  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++  return cipherCount;
++}
++
++static int
++sqlite3mcRegisterCipher(const CipherDescriptor* desc, const CipherParams* params, int makeDefault)
++{
++  int rc;
++  int np;
++  CipherParams* cipherParams;
++
++  /* Sanity checks */
++
++  /* Cipher description AND parameter are required */
++  if (!desc || !params)
++    return SQLITE_ERROR;
++
++  /* ALL methods of the cipher descriptor need to be defined */
++  if (!desc->m_name ||
++      !desc->m_allocateCipher ||
++      !desc->m_freeCipher ||
++      !desc->m_cloneCipher ||
++      !desc->m_getLegacy ||
++      !desc->m_getPageSize ||
++      !desc->m_getReserved ||
++      !desc->m_getSalt ||
++      !desc->m_generateKey ||
++      !desc->m_encryptPage ||
++      !desc->m_decryptPage)
++    return SQLITE_ERROR;
++
++  /* Check for valid cipher name */
++  if (mcCheckValidName(desc->m_name) != SQLITE_OK)
++    return SQLITE_ERROR;
++
++  /* Check cipher parameters */
++  for (np = 0; np < CIPHER_PARAMS_COUNT_MAX; ++np)
++  {
++    CipherParams entry = params[np];
++    /* Check for sentinel parameter */
++    if (entry.m_name == 0 || entry.m_name[0] == 0)
++      break;
++    /* Check for valid parameter name */
++    if (mcCheckValidName(entry.m_name) != SQLITE_OK)
++      return SQLITE_ERROR;
++    /* Check for valid parameter specification */
++    if (!(entry.m_minValue >= 0 && entry.m_maxValue >= 0 && entry.m_minValue <= entry.m_maxValue &&
++          entry.m_value >= entry.m_minValue && entry.m_value <= entry.m_maxValue &&
++          entry.m_default >= entry.m_minValue && entry.m_default <= entry.m_maxValue))
++      return SQLITE_ERROR;
++  }
++
++  /* Check for parameter count in valid range and valid sentinel parameter */
++  if (np >= CIPHER_PARAMS_COUNT_MAX || params[np].m_name == 0)
++    return SQLITE_ERROR;
++
++  /* Sanity checks were successful, now register cipher */
++
++  cipherParams = (CipherParams*) sqlite3_malloc((np+1) * sizeof(CipherParams));
++  if (!cipherParams)
++    return SQLITE_NOMEM;
++
++  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++
++  /* Check for */
++  if (globalCipherCount < CODEC_COUNT_MAX)
++  {
++    int n;
++    char* cipherName;
++    ++globalCipherCount;
++    cipherName = globalCipherNameTable[globalCipherCount].m_name;
++    strcpy(cipherName, desc->m_name);
++
++    globalCodecDescriptorTable[globalCipherCount - 1] = *desc;
++    globalCodecDescriptorTable[globalCipherCount - 1].m_name = cipherName;
++
++    globalCodecParameterTable[globalCipherCount].m_name = cipherName;
++    globalCodecParameterTable[globalCipherCount].m_id = globalCipherCount;
++    globalCodecParameterTable[globalCipherCount].m_params = cipherParams;
++
++    /* Copy parameters */
++    for (n = 0; n < np; ++n)
++    {
++      cipherParams[n] = params[n];
++      cipherParams[n].m_name = (char*) sqlite3_malloc((int) strlen(params[n].m_name) + 1);
++      strcpy(cipherParams[n].m_name, params[n].m_name);
++    }
++    /* Add sentinel */
++    cipherParams[n] = params[n];
++    cipherParams[n].m_name = globalSentinelName;
++
++    /* Make cipher default, if requested */
++    if (makeDefault)
++    {
++      CipherParams* param = globalCodecParameterTable[0].m_params;
++      for (; param->m_name[0] != 0; ++param)
++      {
++        if (sqlite3_stricmp("cipher", param->m_name) == 0) break;
++      }
++      if (param->m_name[0] != 0)
++      {
++        param->m_value = param->m_default = globalCipherCount;
++      }
++    }
++
++    rc = SQLITE_OK;
++  }
++  else
++  {
++    rc = SQLITE_NOMEM;
++  }
++
++  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MAIN));
++
++  return rc;
++}
++
++SQLITE_API int
++sqlite3mc_register_cipher(const CipherDescriptor* desc, const CipherParams* params, int makeDefault)
++{
++  int rc;
++#ifndef SQLITE_OMIT_AUTOINIT
++  rc = sqlite3_initialize();
++  if (rc) return rc;
++#endif
++  return sqlite3mcRegisterCipher(desc, params, makeDefault);
++}
++
++SQLITE_PRIVATE int
++sqlite3mcInitCipherTables()
++{
++  size_t n;
++
++  /* Initialize cipher name table */
++  strcpy(globalCipherNameTable[0].m_name, "global");
++  for (n = 1; n < CODEC_COUNT_MAX + 2; ++n)
++  {
++    strcpy(globalCipherNameTable[n].m_name, "");
++  }
++
++  /* Initialize cipher descriptor table */
++  for (n = 0; n < CODEC_COUNT_MAX + 1; ++n)
++  {
++    globalCodecDescriptorTable[n] = mcSentinelDescriptor;
++  }
++
++  /* Initialize cipher parameter table */
++  globalCodecParameterTable[0] = globalCommonParams;
++  for (n = 1; n < CODEC_COUNT_MAX + 2; ++n)
++  {
++    globalCodecParameterTable[n] = globalSentinelParams;
++  }
++
++  return SQLITE_OK;
++}
++
++SQLITE_PRIVATE void
++sqlite3mcTermCipherTables()
++{
++  size_t n;
++  for (n = CODEC_COUNT_MAX+1; n > 0; --n)
++  {
++    if (globalCodecParameterTable[n].m_name[0] != 0)
++    {
++      int k;
++      CipherParams* params = globalCodecParameterTable[n].m_params;
++      for (k = 0; params[k].m_name[0] != 0; ++k)
++      {
++        sqlite3_free(params[k].m_name);
++      }
++      sqlite3_free(globalCodecParameterTable[n].m_params);
++    }
++  }
++}
++
++int
++sqlite3mc_initialize(const char* arg)
++{
++  int rc = sqlite3mcInitCipherTables();
++#if HAVE_CIPHER_AES_128_CBC
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcAES128Descriptor, mcAES128Params, (CODEC_TYPE_AES128 == CODEC_TYPE));
++  }
++#endif
++#if HAVE_CIPHER_AES_256_CBC
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcAES256Descriptor, mcAES256Params, (CODEC_TYPE_AES256 == CODEC_TYPE));
++  }
++#endif
++#if HAVE_CIPHER_CHACHA20
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcChaCha20Descriptor, mcChaCha20Params, (CODEC_TYPE_CHACHA20 == CODEC_TYPE));
++  }
++#endif
++#if HAVE_CIPHER_SQLCIPHER
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcSQLCipherDescriptor, mcSQLCipherParams, (CODEC_TYPE_SQLCIPHER == CODEC_TYPE));
++  }
++#endif
++#if HAVE_CIPHER_RC4
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcRC4Descriptor, mcRC4Params, (CODEC_TYPE_RC4 == CODEC_TYPE));
++  }
++#endif
++#if HAVE_CIPHER_ASCON128
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mcRegisterCipher(&mcAscon128Descriptor, mcAscon128Params, (CODEC_TYPE_ASCON128 == CODEC_TYPE));
++  }
++#endif
++
++  /*
++  ** Initialize and register MultiCipher VFS as default VFS
++  ** if it isn't already registered
++  */
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3mc_vfs_create(NULL, 1);
++  }
++
++  /*
++  ** Register Multi Cipher extension
++  */
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) mcRegisterCodecExtensions);
++  }
++#ifdef SQLITE_ENABLE_EXTFUNC
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_extfunc_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_CSV
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_csv_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_VSV
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_vsv_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_SHA3
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_shathree_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_CARRAY
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_carray_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_FILEIO
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_fileio_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_SERIES
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_series_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_UUID
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_uuid_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_REGEXP
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_regexp_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_COMPRESS
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_compress_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_SQLAR
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_sqlar_init);
++  }
++#endif
++#ifdef SQLITE_ENABLE_ZIPFILE
++  if (rc == SQLITE_OK)
++  {
++    rc = sqlite3_auto_extension((void(*)(void)) sqlite3_zipfile_init);
++  }
++#endif
++  return rc;
++}
++
++void
++sqlite3mc_shutdown(void)
++{
++  sqlite3mc_vfs_shutdown();
++  sqlite3mcTermCipherTables();
++}
++
++/*
++** TCL/TK Extension and/or Shell
++*/
++#ifdef SQLITE_ENABLE_TCL
++/* #include "tclsqlite.c" */
++/*** Begin of #include "tclsqlite.c" ***/
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** A TCL Interface to SQLite.  Append this file to sqlite3.c and
++** compile the whole thing to build a TCL-enabled version of SQLite.
++**
++** Compile-time options:
++**
++**  -DTCLSH         Add a "main()" routine that works as a tclsh.
++**
++**  -DTCLSH_INIT_PROC=name
++**
++**                  Invoke name(interp) to initialize the Tcl interpreter.
++**                  If name(interp) returns a non-NULL string, then run
++**                  that string as a Tcl script to launch the application.
++**                  If name(interp) returns NULL, then run the regular
++**                  tclsh-emulator code.
++*/
++#ifdef TCLSH_INIT_PROC
++# define TCLSH 1
++#endif
++
++/*
++** If requested, include the SQLite compiler options file for MSVC.
++*/
++#if defined(INCLUDE_MSVC_H)
++# include "msvc.h"
++#endif
++
++#if defined(INCLUDE_SQLITE_TCL_H)
++# include "sqlite_tcl.h"
++#else
++# include "tcl.h"
++# ifndef SQLITE_TCLAPI
++#  define SQLITE_TCLAPI
++# endif
++#endif
++#include 
++
++/*
++** Some additional include files are needed if this file is not
++** appended to the amalgamation.
++*/
++#ifndef SQLITE_AMALGAMATION
++/* # include "sqlite3.h" */
++
++# include 
++# include 
++# include 
++  typedef unsigned char u8;
++# ifndef SQLITE_PTRSIZE
++#   if defined(__SIZEOF_POINTER__)
++#     define SQLITE_PTRSIZE __SIZEOF_POINTER__
++#   elif defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
++         defined(_M_ARM)   || defined(__arm__)    || defined(__x86)   ||    \
++        (defined(__APPLE__) && defined(__POWERPC__)) ||                     \
++        (defined(__TOS_AIX__) && !defined(__64BIT__))
++#     define SQLITE_PTRSIZE 4
++#   else
++#     define SQLITE_PTRSIZE 8
++#   endif
++# endif /* SQLITE_PTRSIZE */
++# if defined(HAVE_STDINT_H)
++    typedef uintptr_t uptr;
++# elif SQLITE_PTRSIZE==4
++    typedef unsigned int uptr;
++# else
++    typedef sqlite3_uint64 uptr;
++# endif
++#endif
++#include 
++
++/* Used to get the current process ID */
++#if !defined(_WIN32)
++# include 
++# include 
++# define GETPID getpid
++#elif !defined(_WIN32_WCE)
++# ifndef SQLITE_AMALGAMATION
++#  ifndef WIN32_LEAN_AND_MEAN
++#   define WIN32_LEAN_AND_MEAN
++#  endif
++#  include 
++# endif
++# include 
++# define isatty(h) _isatty(h)
++# define GETPID (int)GetCurrentProcessId
++#endif
++
++/*
++ * Windows needs to know which symbols to export.  Unix does not.
++ * BUILD_sqlite should be undefined for Unix.
++ */
++#ifdef BUILD_sqlite
++#undef TCL_STORAGE_CLASS
++#define TCL_STORAGE_CLASS DLLEXPORT
++#endif /* BUILD_sqlite */
++
++#define NUM_PREPARED_STMTS 10
++#define MAX_PREPARED_STMTS 100
++
++/* Forward declaration */
++typedef struct SqliteDb SqliteDb;
++
++/*
++** New SQL functions can be created as TCL scripts.  Each such function
++** is described by an instance of the following structure.
++**
++** Variable eType may be set to SQLITE_INTEGER, SQLITE_FLOAT, SQLITE_TEXT,
++** SQLITE_BLOB or SQLITE_NULL. If it is SQLITE_NULL, then the implementation
++** attempts to determine the type of the result based on the Tcl object.
++** If it is SQLITE_TEXT or SQLITE_BLOB, then a text (sqlite3_result_text())
++** or blob (sqlite3_result_blob()) is returned. If it is SQLITE_INTEGER
++** or SQLITE_FLOAT, then an attempt is made to return an integer or float
++** value, falling back to float and then text if this is not possible.
++*/
++typedef struct SqlFunc SqlFunc;
++struct SqlFunc {
++  Tcl_Interp *interp;   /* The TCL interpret to execute the function */
++  Tcl_Obj *pScript;     /* The Tcl_Obj representation of the script */
++  SqliteDb *pDb;        /* Database connection that owns this function */
++  int useEvalObjv;      /* True if it is safe to use Tcl_EvalObjv */
++  int eType;            /* Type of value to return */
++  char *zName;          /* Name of this function */
++  SqlFunc *pNext;       /* Next function on the list of them all */
++};
++
++/*
++** New collation sequences function can be created as TCL scripts.  Each such
++** function is described by an instance of the following structure.
++*/
++typedef struct SqlCollate SqlCollate;
++struct SqlCollate {
++  Tcl_Interp *interp;   /* The TCL interpret to execute the function */
++  char *zScript;        /* The script to be run */
++  SqlCollate *pNext;    /* Next function on the list of them all */
++};
++
++/*
++** Prepared statements are cached for faster execution.  Each prepared
++** statement is described by an instance of the following structure.
++*/
++typedef struct SqlPreparedStmt SqlPreparedStmt;
++struct SqlPreparedStmt {
++  SqlPreparedStmt *pNext;  /* Next in linked list */
++  SqlPreparedStmt *pPrev;  /* Previous on the list */
++  sqlite3_stmt *pStmt;     /* The prepared statement */
++  int nSql;                /* chars in zSql[] */
++  const char *zSql;        /* Text of the SQL statement */
++  int nParm;               /* Size of apParm array */
++  Tcl_Obj **apParm;        /* Array of referenced object pointers */
++};
++
++typedef struct IncrblobChannel IncrblobChannel;
++
++/*
++** There is one instance of this structure for each SQLite database
++** that has been opened by the SQLite TCL interface.
++**
++** If this module is built with SQLITE_TEST defined (to create the SQLite
++** testfixture executable), then it may be configured to use either
++** sqlite3_prepare_v2() or sqlite3_prepare() to prepare SQL statements.
++** If SqliteDb.bLegacyPrepare is true, sqlite3_prepare() is used.
++*/
++struct SqliteDb {
++  sqlite3 *db;               /* The "real" database structure. MUST BE FIRST */
++  Tcl_Interp *interp;        /* The interpreter used for this database */
++  char *zBusy;               /* The busy callback routine */
++  char *zCommit;             /* The commit hook callback routine */
++  char *zTrace;              /* The trace callback routine */
++  char *zTraceV2;            /* The trace_v2 callback routine */
++  char *zProfile;            /* The profile callback routine */
++  char *zProgress;           /* The progress callback routine */
++  char *zBindFallback;       /* Callback to invoke on a binding miss */
++  char *zAuth;               /* The authorization callback routine */
++  int disableAuth;           /* Disable the authorizer if it exists */
++  char *zNull;               /* Text to substitute for an SQL NULL value */
++  SqlFunc *pFunc;            /* List of SQL functions */
++  Tcl_Obj *pUpdateHook;      /* Update hook script (if any) */
++  Tcl_Obj *pPreUpdateHook;   /* Pre-update hook script (if any) */
++  Tcl_Obj *pRollbackHook;    /* Rollback hook script (if any) */
++  Tcl_Obj *pWalHook;         /* WAL hook script (if any) */
++  Tcl_Obj *pUnlockNotify;    /* Unlock notify script (if any) */
++  SqlCollate *pCollate;      /* List of SQL collation functions */
++  int rc;                    /* Return code of most recent sqlite3_exec() */
++  Tcl_Obj *pCollateNeeded;   /* Collation needed script */
++  SqlPreparedStmt *stmtList; /* List of prepared statements*/
++  SqlPreparedStmt *stmtLast; /* Last statement in the list */
++  int maxStmt;               /* The next maximum number of stmtList */
++  int nStmt;                 /* Number of statements in stmtList */
++  IncrblobChannel *pIncrblob;/* Linked list of open incrblob channels */
++  int nStep, nSort, nIndex;  /* Statistics for most recent operation */
++  int nVMStep;               /* Another statistic for most recent operation */
++  int nTransaction;          /* Number of nested [transaction] methods */
++  int openFlags;             /* Flags used to open.  (SQLITE_OPEN_URI) */
++  int nRef;                  /* Delete object when this reaches 0 */
++#ifdef SQLITE_TEST
++  int bLegacyPrepare;        /* True to use sqlite3_prepare() */
++#endif
++};
++
++struct IncrblobChannel {
++  sqlite3_blob *pBlob;      /* sqlite3 blob handle */
++  SqliteDb *pDb;            /* Associated database connection */
++  int iSeek;                /* Current seek offset */
++  Tcl_Channel channel;      /* Channel identifier */
++  IncrblobChannel *pNext;   /* Linked list of all open incrblob channels */
++  IncrblobChannel *pPrev;   /* Linked list of all open incrblob channels */
++};
++
++/*
++** Compute a string length that is limited to what can be stored in
++** lower 30 bits of a 32-bit signed integer.
++*/
++static int strlen30(const char *z){
++  const char *z2 = z;
++  while( *z2 ){ z2++; }
++  return 0x3fffffff & (int)(z2 - z);
++}
++
++
++#ifndef SQLITE_OMIT_INCRBLOB
++/*
++** Close all incrblob channels opened using database connection pDb.
++** This is called when shutting down the database connection.
++*/
++static void closeIncrblobChannels(SqliteDb *pDb){
++  IncrblobChannel *p;
++  IncrblobChannel *pNext;
++
++  for(p=pDb->pIncrblob; p; p=pNext){
++    pNext = p->pNext;
++
++    /* Note: Calling unregister here call Tcl_Close on the incrblob channel,
++    ** which deletes the IncrblobChannel structure at *p. So do not
++    ** call Tcl_Free() here.
++    */
++    Tcl_UnregisterChannel(pDb->interp, p->channel);
++  }
++}
++
++/*
++** Close an incremental blob channel.
++*/
++static int SQLITE_TCLAPI incrblobClose(
++  ClientData instanceData,
++  Tcl_Interp *interp
++){
++  IncrblobChannel *p = (IncrblobChannel *)instanceData;
++  int rc = sqlite3_blob_close(p->pBlob);
++  sqlite3 *db = p->pDb->db;
++
++  /* Remove the channel from the SqliteDb.pIncrblob list. */
++  if( p->pNext ){
++    p->pNext->pPrev = p->pPrev;
++  }
++  if( p->pPrev ){
++    p->pPrev->pNext = p->pNext;
++  }
++  if( p->pDb->pIncrblob==p ){
++    p->pDb->pIncrblob = p->pNext;
++  }
++
++  /* Free the IncrblobChannel structure */
++  Tcl_Free((char *)p);
++
++  if( rc!=SQLITE_OK ){
++    Tcl_SetResult(interp, (char *)sqlite3_errmsg(db), TCL_VOLATILE);
++    return TCL_ERROR;
++  }
++  return TCL_OK;
++}
++
++/*
++** Read data from an incremental blob channel.
++*/
++static int SQLITE_TCLAPI incrblobInput(
++  ClientData instanceData,
++  char *buf,
++  int bufSize,
++  int *errorCodePtr
++){
++  IncrblobChannel *p = (IncrblobChannel *)instanceData;
++  int nRead = bufSize;         /* Number of bytes to read */
++  int nBlob;                   /* Total size of the blob */
++  int rc;                      /* sqlite error code */
++
++  nBlob = sqlite3_blob_bytes(p->pBlob);
++  if( (p->iSeek+nRead)>nBlob ){
++    nRead = nBlob-p->iSeek;
++  }
++  if( nRead<=0 ){
++    return 0;
++  }
++
++  rc = sqlite3_blob_read(p->pBlob, (void *)buf, nRead, p->iSeek);
++  if( rc!=SQLITE_OK ){
++    *errorCodePtr = rc;
++    return -1;
++  }
++
++  p->iSeek += nRead;
++  return nRead;
++}
++
++/*
++** Write data to an incremental blob channel.
++*/
++static int SQLITE_TCLAPI incrblobOutput(
++  ClientData instanceData,
++  CONST char *buf,
++  int toWrite,
++  int *errorCodePtr
++){
++  IncrblobChannel *p = (IncrblobChannel *)instanceData;
++  int nWrite = toWrite;        /* Number of bytes to write */
++  int nBlob;                   /* Total size of the blob */
++  int rc;                      /* sqlite error code */
++
++  nBlob = sqlite3_blob_bytes(p->pBlob);
++  if( (p->iSeek+nWrite)>nBlob ){
++    *errorCodePtr = EINVAL;
++    return -1;
++  }
++  if( nWrite<=0 ){
++    return 0;
++  }
++
++  rc = sqlite3_blob_write(p->pBlob, (void *)buf, nWrite, p->iSeek);
++  if( rc!=SQLITE_OK ){
++    *errorCodePtr = EIO;
++    return -1;
++  }
++
++  p->iSeek += nWrite;
++  return nWrite;
++}
++
++/*
++** Seek an incremental blob channel.
++*/
++static int SQLITE_TCLAPI incrblobSeek(
++  ClientData instanceData,
++  long offset,
++  int seekMode,
++  int *errorCodePtr
++){
++  IncrblobChannel *p = (IncrblobChannel *)instanceData;
++
++  switch( seekMode ){
++    case SEEK_SET:
++      p->iSeek = offset;
++      break;
++    case SEEK_CUR:
++      p->iSeek += offset;
++      break;
++    case SEEK_END:
++      p->iSeek = sqlite3_blob_bytes(p->pBlob) + offset;
++      break;
++
++    default: assert(!"Bad seekMode");
++  }
++
++  return p->iSeek;
++}
++
++
++static void SQLITE_TCLAPI incrblobWatch(
++  ClientData instanceData,
++  int mode
++){
++  /* NO-OP */
++}
++static int SQLITE_TCLAPI incrblobHandle(
++  ClientData instanceData,
++  int dir,
++  ClientData *hPtr
++){
++  return TCL_ERROR;
++}
++
++static Tcl_ChannelType IncrblobChannelType = {
++  "incrblob",                        /* typeName                             */
++  TCL_CHANNEL_VERSION_2,             /* version                              */
++  incrblobClose,                     /* closeProc                            */
++  incrblobInput,                     /* inputProc                            */
++  incrblobOutput,                    /* outputProc                           */
++  incrblobSeek,                      /* seekProc                             */
++  0,                                 /* setOptionProc                        */
++  0,                                 /* getOptionProc                        */
++  incrblobWatch,                     /* watchProc (this is a no-op)          */
++  incrblobHandle,                    /* getHandleProc (always returns error) */
++  0,                                 /* close2Proc                           */
++  0,                                 /* blockModeProc                        */
++  0,                                 /* flushProc                            */
++  0,                                 /* handlerProc                          */
++  0,                                 /* wideSeekProc                         */
++};
++
++/*
++** Create a new incrblob channel.
++*/
++static int createIncrblobChannel(
++  Tcl_Interp *interp,
++  SqliteDb *pDb,
++  const char *zDb,
++  const char *zTable,
++  const char *zColumn,
++  sqlite_int64 iRow,
++  int isReadonly
++){
++  IncrblobChannel *p;
++  sqlite3 *db = pDb->db;
++  sqlite3_blob *pBlob;
++  int rc;
++  int flags = TCL_READABLE|(isReadonly ? 0 : TCL_WRITABLE);
++
++  /* This variable is used to name the channels: "incrblob_[incr count]" */
++  static int count = 0;
++  char zChannel[64];
++
++  rc = sqlite3_blob_open(db, zDb, zTable, zColumn, iRow, !isReadonly, &pBlob);
++  if( rc!=SQLITE_OK ){
++    Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
++    return TCL_ERROR;
++  }
++
++  p = (IncrblobChannel *)Tcl_Alloc(sizeof(IncrblobChannel));
++  p->iSeek = 0;
++  p->pBlob = pBlob;
++
++  sqlite3_snprintf(sizeof(zChannel), zChannel, "incrblob_%d", ++count);
++  p->channel = Tcl_CreateChannel(&IncrblobChannelType, zChannel, p, flags);
++  Tcl_RegisterChannel(interp, p->channel);
++
++  /* Link the new channel into the SqliteDb.pIncrblob list. */
++  p->pNext = pDb->pIncrblob;
++  p->pPrev = 0;
++  if( p->pNext ){
++    p->pNext->pPrev = p;
++  }
++  pDb->pIncrblob = p;
++  p->pDb = pDb;
++
++  Tcl_SetResult(interp, (char *)Tcl_GetChannelName(p->channel), TCL_VOLATILE);
++  return TCL_OK;
++}
++#else  /* else clause for "#ifndef SQLITE_OMIT_INCRBLOB" */
++  #define closeIncrblobChannels(pDb)
++#endif
++
++/*
++** Look at the script prefix in pCmd.  We will be executing this script
++** after first appending one or more arguments.  This routine analyzes
++** the script to see if it is safe to use Tcl_EvalObjv() on the script
++** rather than the more general Tcl_EvalEx().  Tcl_EvalObjv() is much
++** faster.
++**
++** Scripts that are safe to use with Tcl_EvalObjv() consists of a
++** command name followed by zero or more arguments with no [...] or $
++** or {...} or ; to be seen anywhere.  Most callback scripts consist
++** of just a single procedure name and they meet this requirement.
++*/
++static int safeToUseEvalObjv(Tcl_Interp *interp, Tcl_Obj *pCmd){
++  /* We could try to do something with Tcl_Parse().  But we will instead
++  ** just do a search for forbidden characters.  If any of the forbidden
++  ** characters appear in pCmd, we will report the string as unsafe.
++  */
++  const char *z;
++  int n;
++  z = Tcl_GetStringFromObj(pCmd, &n);
++  while( n-- > 0 ){
++    int c = *(z++);
++    if( c=='$' || c=='[' || c==';' ) return 0;
++  }
++  return 1;
++}
++
++/*
++** Find an SqlFunc structure with the given name.  Or create a new
++** one if an existing one cannot be found.  Return a pointer to the
++** structure.
++*/
++static SqlFunc *findSqlFunc(SqliteDb *pDb, const char *zName){
++  SqlFunc *p, *pNew;
++  int nName = strlen30(zName);
++  pNew = (SqlFunc*)Tcl_Alloc( sizeof(*pNew) + nName + 1 );
++  pNew->zName = (char*)&pNew[1];
++  memcpy(pNew->zName, zName, nName+1);
++  for(p=pDb->pFunc; p; p=p->pNext){
++    if( sqlite3_stricmp(p->zName, pNew->zName)==0 ){
++      Tcl_Free((char*)pNew);
++      return p;
++    }
++  }
++  pNew->interp = pDb->interp;
++  pNew->pDb = pDb;
++  pNew->pScript = 0;
++  pNew->pNext = pDb->pFunc;
++  pDb->pFunc = pNew;
++  return pNew;
++}
++
++/*
++** Free a single SqlPreparedStmt object.
++*/
++static void dbFreeStmt(SqlPreparedStmt *pStmt){
++#ifdef SQLITE_TEST
++  if( sqlite3_sql(pStmt->pStmt)==0 ){
++    Tcl_Free((char *)pStmt->zSql);
++  }
++#endif
++  sqlite3_finalize(pStmt->pStmt);
++  Tcl_Free((char *)pStmt);
++}
++
++/*
++** Finalize and free a list of prepared statements
++*/
++static void flushStmtCache(SqliteDb *pDb){
++  SqlPreparedStmt *pPreStmt;
++  SqlPreparedStmt *pNext;
++
++  for(pPreStmt = pDb->stmtList; pPreStmt; pPreStmt=pNext){
++    pNext = pPreStmt->pNext;
++    dbFreeStmt(pPreStmt);
++  }
++  pDb->nStmt = 0;
++  pDb->stmtLast = 0;
++  pDb->stmtList = 0;
++}
++
++/*
++** Increment the reference counter on the SqliteDb object. The reference
++** should be released by calling delDatabaseRef().
++*/
++static void addDatabaseRef(SqliteDb *pDb){
++  pDb->nRef++;
++}
++
++/*
++** Decrement the reference counter associated with the SqliteDb object.
++** If it reaches zero, delete the object.
++*/
++static void delDatabaseRef(SqliteDb *pDb){
++  assert( pDb->nRef>0 );
++  pDb->nRef--;
++  if( pDb->nRef==0 ){
++    flushStmtCache(pDb);
++    closeIncrblobChannels(pDb);
++    sqlite3_close(pDb->db);
++    while( pDb->pFunc ){
++      SqlFunc *pFunc = pDb->pFunc;
++      pDb->pFunc = pFunc->pNext;
++      assert( pFunc->pDb==pDb );
++      Tcl_DecrRefCount(pFunc->pScript);
++      Tcl_Free((char*)pFunc);
++    }
++    while( pDb->pCollate ){
++      SqlCollate *pCollate = pDb->pCollate;
++      pDb->pCollate = pCollate->pNext;
++      Tcl_Free((char*)pCollate);
++    }
++    if( pDb->zBusy ){
++      Tcl_Free(pDb->zBusy);
++    }
++    if( pDb->zTrace ){
++      Tcl_Free(pDb->zTrace);
++    }
++    if( pDb->zTraceV2 ){
++      Tcl_Free(pDb->zTraceV2);
++    }
++    if( pDb->zProfile ){
++      Tcl_Free(pDb->zProfile);
++    }
++    if( pDb->zBindFallback ){
++      Tcl_Free(pDb->zBindFallback);
++    }
++    if( pDb->zAuth ){
++      Tcl_Free(pDb->zAuth);
++    }
++    if( pDb->zNull ){
++      Tcl_Free(pDb->zNull);
++    }
++    if( pDb->pUpdateHook ){
++      Tcl_DecrRefCount(pDb->pUpdateHook);
++    }
++    if( pDb->pPreUpdateHook ){
++      Tcl_DecrRefCount(pDb->pPreUpdateHook);
++    }
++    if( pDb->pRollbackHook ){
++      Tcl_DecrRefCount(pDb->pRollbackHook);
++    }
++    if( pDb->pWalHook ){
++      Tcl_DecrRefCount(pDb->pWalHook);
++    }
++    if( pDb->pCollateNeeded ){
++      Tcl_DecrRefCount(pDb->pCollateNeeded);
++    }
++    Tcl_Free((char*)pDb);
++  }
++}
++
++/*
++** TCL calls this procedure when an sqlite3 database command is
++** deleted.
++*/
++static void SQLITE_TCLAPI DbDeleteCmd(void *db){
++  SqliteDb *pDb = (SqliteDb*)db;
++  delDatabaseRef(pDb);
++}
++
++/*
++** This routine is called when a database file is locked while trying
++** to execute SQL.
++*/
++static int DbBusyHandler(void *cd, int nTries){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  int rc;
++  char zVal[30];
++
++  sqlite3_snprintf(sizeof(zVal), zVal, "%d", nTries);
++  rc = Tcl_VarEval(pDb->interp, pDb->zBusy, " ", zVal, (char*)0);
++  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
++    return 0;
++  }
++  return 1;
++}
++
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++/*
++** This routine is invoked as the 'progress callback' for the database.
++*/
++static int DbProgressHandler(void *cd){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  int rc;
++
++  assert( pDb->zProgress );
++  rc = Tcl_Eval(pDb->interp, pDb->zProgress);
++  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
++    return 1;
++  }
++  return 0;
++}
++#endif
++
++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
++    !defined(SQLITE_OMIT_DEPRECATED)
++/*
++** This routine is called by the SQLite trace handler whenever a new
++** block of SQL is executed.  The TCL script in pDb->zTrace is executed.
++*/
++static void DbTraceHandler(void *cd, const char *zSql){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  Tcl_DString str;
++
++  Tcl_DStringInit(&str);
++  Tcl_DStringAppend(&str, pDb->zTrace, -1);
++  Tcl_DStringAppendElement(&str, zSql);
++  Tcl_Eval(pDb->interp, Tcl_DStringValue(&str));
++  Tcl_DStringFree(&str);
++  Tcl_ResetResult(pDb->interp);
++}
++#endif
++
++#ifndef SQLITE_OMIT_TRACE
++/*
++** This routine is called by the SQLite trace_v2 handler whenever a new
++** supported event is generated.  Unsupported event types are ignored.
++** The TCL script in pDb->zTraceV2 is executed, with the arguments for
++** the event appended to it (as list elements).
++*/
++static int DbTraceV2Handler(
++  unsigned type, /* One of the SQLITE_TRACE_* event types. */
++  void *cd,      /* The original context data pointer. */
++  void *pd,      /* Primary event data, depends on event type. */
++  void *xd       /* Extra event data, depends on event type. */
++){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  Tcl_Obj *pCmd;
++
++  switch( type ){
++    case SQLITE_TRACE_STMT: {
++      sqlite3_stmt *pStmt = (sqlite3_stmt *)pd;
++      char *zSql = (char *)xd;
++
++      pCmd = Tcl_NewStringObj(pDb->zTraceV2, -1);
++      Tcl_IncrRefCount(pCmd);
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewWideIntObj((Tcl_WideInt)(uptr)pStmt));
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewStringObj(zSql, -1));
++      Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++      Tcl_DecrRefCount(pCmd);
++      Tcl_ResetResult(pDb->interp);
++      break;
++    }
++    case SQLITE_TRACE_PROFILE: {
++      sqlite3_stmt *pStmt = (sqlite3_stmt *)pd;
++      sqlite3_int64 ns = *(sqlite3_int64*)xd;
++
++      pCmd = Tcl_NewStringObj(pDb->zTraceV2, -1);
++      Tcl_IncrRefCount(pCmd);
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewWideIntObj((Tcl_WideInt)(uptr)pStmt));
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewWideIntObj((Tcl_WideInt)ns));
++      Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++      Tcl_DecrRefCount(pCmd);
++      Tcl_ResetResult(pDb->interp);
++      break;
++    }
++    case SQLITE_TRACE_ROW: {
++      sqlite3_stmt *pStmt = (sqlite3_stmt *)pd;
++
++      pCmd = Tcl_NewStringObj(pDb->zTraceV2, -1);
++      Tcl_IncrRefCount(pCmd);
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewWideIntObj((Tcl_WideInt)(uptr)pStmt));
++      Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++      Tcl_DecrRefCount(pCmd);
++      Tcl_ResetResult(pDb->interp);
++      break;
++    }
++    case SQLITE_TRACE_CLOSE: {
++      sqlite3 *db = (sqlite3 *)pd;
++
++      pCmd = Tcl_NewStringObj(pDb->zTraceV2, -1);
++      Tcl_IncrRefCount(pCmd);
++      Tcl_ListObjAppendElement(pDb->interp, pCmd,
++                               Tcl_NewWideIntObj((Tcl_WideInt)(uptr)db));
++      Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++      Tcl_DecrRefCount(pCmd);
++      Tcl_ResetResult(pDb->interp);
++      break;
++    }
++  }
++  return SQLITE_OK;
++}
++#endif
++
++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
++    !defined(SQLITE_OMIT_DEPRECATED)
++/*
++** This routine is called by the SQLite profile handler after a statement
++** SQL has executed.  The TCL script in pDb->zProfile is evaluated.
++*/
++static void DbProfileHandler(void *cd, const char *zSql, sqlite_uint64 tm){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  Tcl_DString str;
++  char zTm[100];
++
++  sqlite3_snprintf(sizeof(zTm)-1, zTm, "%lld", tm);
++  Tcl_DStringInit(&str);
++  Tcl_DStringAppend(&str, pDb->zProfile, -1);
++  Tcl_DStringAppendElement(&str, zSql);
++  Tcl_DStringAppendElement(&str, zTm);
++  Tcl_Eval(pDb->interp, Tcl_DStringValue(&str));
++  Tcl_DStringFree(&str);
++  Tcl_ResetResult(pDb->interp);
++}
++#endif
++
++/*
++** This routine is called when a transaction is committed.  The
++** TCL script in pDb->zCommit is executed.  If it returns non-zero or
++** if it throws an exception, the transaction is rolled back instead
++** of being committed.
++*/
++static int DbCommitHandler(void *cd){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  int rc;
++
++  rc = Tcl_Eval(pDb->interp, pDb->zCommit);
++  if( rc!=TCL_OK || atoi(Tcl_GetStringResult(pDb->interp)) ){
++    return 1;
++  }
++  return 0;
++}
++
++static void DbRollbackHandler(void *clientData){
++  SqliteDb *pDb = (SqliteDb*)clientData;
++  assert(pDb->pRollbackHook);
++  if( TCL_OK!=Tcl_EvalObjEx(pDb->interp, pDb->pRollbackHook, 0) ){
++    Tcl_BackgroundError(pDb->interp);
++  }
++}
++
++/*
++** This procedure handles wal_hook callbacks.
++*/
++static int DbWalHandler(
++  void *clientData,
++  sqlite3 *db,
++  const char *zDb,
++  int nEntry
++){
++  int ret = SQLITE_OK;
++  Tcl_Obj *p;
++  SqliteDb *pDb = (SqliteDb*)clientData;
++  Tcl_Interp *interp = pDb->interp;
++  assert(pDb->pWalHook);
++
++  assert( db==pDb->db );
++  p = Tcl_DuplicateObj(pDb->pWalHook);
++  Tcl_IncrRefCount(p);
++  Tcl_ListObjAppendElement(interp, p, Tcl_NewStringObj(zDb, -1));
++  Tcl_ListObjAppendElement(interp, p, Tcl_NewIntObj(nEntry));
++  if( TCL_OK!=Tcl_EvalObjEx(interp, p, 0)
++   || TCL_OK!=Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &ret)
++  ){
++    Tcl_BackgroundError(interp);
++  }
++  Tcl_DecrRefCount(p);
++
++  return ret;
++}
++
++#if defined(SQLITE_TEST) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
++static void setTestUnlockNotifyVars(Tcl_Interp *interp, int iArg, int nArg){
++  char zBuf[64];
++  sqlite3_snprintf(sizeof(zBuf), zBuf, "%d", iArg);
++  Tcl_SetVar(interp, "sqlite_unlock_notify_arg", zBuf, TCL_GLOBAL_ONLY);
++  sqlite3_snprintf(sizeof(zBuf), zBuf, "%d", nArg);
++  Tcl_SetVar(interp, "sqlite_unlock_notify_argcount", zBuf, TCL_GLOBAL_ONLY);
++}
++#else
++# define setTestUnlockNotifyVars(x,y,z)
++#endif
++
++#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
++static void DbUnlockNotify(void **apArg, int nArg){
++  int i;
++  for(i=0; iinterp, i, nArg);
++    assert( pDb->pUnlockNotify);
++    Tcl_EvalObjEx(pDb->interp, pDb->pUnlockNotify, flags);
++    Tcl_DecrRefCount(pDb->pUnlockNotify);
++    pDb->pUnlockNotify = 0;
++  }
++}
++#endif
++
++#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
++/*
++** Pre-update hook callback.
++*/
++static void DbPreUpdateHandler(
++  void *p,
++  sqlite3 *db,
++  int op,
++  const char *zDb,
++  const char *zTbl,
++  sqlite_int64 iKey1,
++  sqlite_int64 iKey2
++){
++  SqliteDb *pDb = (SqliteDb *)p;
++  Tcl_Obj *pCmd;
++  static const char *azStr[] = {"DELETE", "INSERT", "UPDATE"};
++
++  assert( (SQLITE_DELETE-1)/9 == 0 );
++  assert( (SQLITE_INSERT-1)/9 == 1 );
++  assert( (SQLITE_UPDATE-1)/9 == 2 );
++  assert( pDb->pPreUpdateHook );
++  assert( db==pDb->db );
++  assert( op==SQLITE_INSERT || op==SQLITE_UPDATE || op==SQLITE_DELETE );
++
++  pCmd = Tcl_DuplicateObj(pDb->pPreUpdateHook);
++  Tcl_IncrRefCount(pCmd);
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(azStr[(op-1)/9], -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zDb, -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zTbl, -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewWideIntObj(iKey1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewWideIntObj(iKey2));
++  Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++  Tcl_DecrRefCount(pCmd);
++}
++#endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
++
++static void DbUpdateHandler(
++  void *p,
++  int op,
++  const char *zDb,
++  const char *zTbl,
++  sqlite_int64 rowid
++){
++  SqliteDb *pDb = (SqliteDb *)p;
++  Tcl_Obj *pCmd;
++  static const char *azStr[] = {"DELETE", "INSERT", "UPDATE"};
++
++  assert( (SQLITE_DELETE-1)/9 == 0 );
++  assert( (SQLITE_INSERT-1)/9 == 1 );
++  assert( (SQLITE_UPDATE-1)/9 == 2 );
++
++  assert( pDb->pUpdateHook );
++  assert( op==SQLITE_INSERT || op==SQLITE_UPDATE || op==SQLITE_DELETE );
++
++  pCmd = Tcl_DuplicateObj(pDb->pUpdateHook);
++  Tcl_IncrRefCount(pCmd);
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(azStr[(op-1)/9], -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zDb, -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewStringObj(zTbl, -1));
++  Tcl_ListObjAppendElement(0, pCmd, Tcl_NewWideIntObj(rowid));
++  Tcl_EvalObjEx(pDb->interp, pCmd, TCL_EVAL_DIRECT);
++  Tcl_DecrRefCount(pCmd);
++}
++
++static void tclCollateNeeded(
++  void *pCtx,
++  sqlite3 *db,
++  int enc,
++  const char *zName
++){
++  SqliteDb *pDb = (SqliteDb *)pCtx;
++  Tcl_Obj *pScript = Tcl_DuplicateObj(pDb->pCollateNeeded);
++  Tcl_IncrRefCount(pScript);
++  Tcl_ListObjAppendElement(0, pScript, Tcl_NewStringObj(zName, -1));
++  Tcl_EvalObjEx(pDb->interp, pScript, 0);
++  Tcl_DecrRefCount(pScript);
++}
++
++/*
++** This routine is called to evaluate an SQL collation function implemented
++** using TCL script.
++*/
++static int tclSqlCollate(
++  void *pCtx,
++  int nA,
++  const void *zA,
++  int nB,
++  const void *zB
++){
++  SqlCollate *p = (SqlCollate *)pCtx;
++  Tcl_Obj *pCmd;
++
++  pCmd = Tcl_NewStringObj(p->zScript, -1);
++  Tcl_IncrRefCount(pCmd);
++  Tcl_ListObjAppendElement(p->interp, pCmd, Tcl_NewStringObj(zA, nA));
++  Tcl_ListObjAppendElement(p->interp, pCmd, Tcl_NewStringObj(zB, nB));
++  Tcl_EvalObjEx(p->interp, pCmd, TCL_EVAL_DIRECT);
++  Tcl_DecrRefCount(pCmd);
++  return (atoi(Tcl_GetStringResult(p->interp)));
++}
++
++/*
++** This routine is called to evaluate an SQL function implemented
++** using TCL script.
++*/
++static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){
++  SqlFunc *p = sqlite3_user_data(context);
++  Tcl_Obj *pCmd;
++  int i;
++  int rc;
++
++  if( argc==0 ){
++    /* If there are no arguments to the function, call Tcl_EvalObjEx on the
++    ** script object directly.  This allows the TCL compiler to generate
++    ** bytecode for the command on the first invocation and thus make
++    ** subsequent invocations much faster. */
++    pCmd = p->pScript;
++    Tcl_IncrRefCount(pCmd);
++    rc = Tcl_EvalObjEx(p->interp, pCmd, 0);
++    Tcl_DecrRefCount(pCmd);
++  }else{
++    /* If there are arguments to the function, make a shallow copy of the
++    ** script object, lappend the arguments, then evaluate the copy.
++    **
++    ** By "shallow" copy, we mean only the outer list Tcl_Obj is duplicated.
++    ** The new Tcl_Obj contains pointers to the original list elements.
++    ** That way, when Tcl_EvalObjv() is run and shimmers the first element
++    ** of the list to tclCmdNameType, that alternate representation will
++    ** be preserved and reused on the next invocation.
++    */
++    Tcl_Obj **aArg;
++    int nArg;
++    if( Tcl_ListObjGetElements(p->interp, p->pScript, &nArg, &aArg) ){
++      sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
++      return;
++    }
++    pCmd = Tcl_NewListObj(nArg, aArg);
++    Tcl_IncrRefCount(pCmd);
++    for(i=0; i=-2147483647 && v<=2147483647 ){
++            pVal = Tcl_NewIntObj((int)v);
++          }else{
++            pVal = Tcl_NewWideIntObj(v);
++          }
++          break;
++        }
++        case SQLITE_FLOAT: {
++          double r = sqlite3_value_double(pIn);
++          pVal = Tcl_NewDoubleObj(r);
++          break;
++        }
++        case SQLITE_NULL: {
++          pVal = Tcl_NewStringObj(p->pDb->zNull, -1);
++          break;
++        }
++        default: {
++          int bytes = sqlite3_value_bytes(pIn);
++          pVal = Tcl_NewStringObj((char *)sqlite3_value_text(pIn), bytes);
++          break;
++        }
++      }
++      rc = Tcl_ListObjAppendElement(p->interp, pCmd, pVal);
++      if( rc ){
++        Tcl_DecrRefCount(pCmd);
++        sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
++        return;
++      }
++    }
++    if( !p->useEvalObjv ){
++      /* Tcl_EvalObjEx() will automatically call Tcl_EvalObjv() if pCmd
++      ** is a list without a string representation.  To prevent this from
++      ** happening, make sure pCmd has a valid string representation */
++      Tcl_GetString(pCmd);
++    }
++    rc = Tcl_EvalObjEx(p->interp, pCmd, TCL_EVAL_DIRECT);
++    Tcl_DecrRefCount(pCmd);
++  }
++
++  if( rc && rc!=TCL_RETURN ){
++    sqlite3_result_error(context, Tcl_GetStringResult(p->interp), -1);
++  }else{
++    Tcl_Obj *pVar = Tcl_GetObjResult(p->interp);
++    int n;
++    u8 *data;
++    const char *zType = (pVar->typePtr ? pVar->typePtr->name : "");
++    char c = zType[0];
++    int eType = p->eType;
++
++    if( eType==SQLITE_NULL ){
++      if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){
++        /* Only return a BLOB type if the Tcl variable is a bytearray and
++        ** has no string representation. */
++        eType = SQLITE_BLOB;
++      }else if( (c=='b' && strcmp(zType,"boolean")==0)
++             || (c=='w' && strcmp(zType,"wideInt")==0)
++             || (c=='i' && strcmp(zType,"int")==0) 
++      ){
++        eType = SQLITE_INTEGER;
++      }else if( c=='d' && strcmp(zType,"double")==0 ){
++        eType = SQLITE_FLOAT;
++      }else{
++        eType = SQLITE_TEXT;
++      }
++    }
++
++    switch( eType ){
++      case SQLITE_BLOB: {
++        data = Tcl_GetByteArrayFromObj(pVar, &n);
++        sqlite3_result_blob(context, data, n, SQLITE_TRANSIENT);
++        break;
++      }
++      case SQLITE_INTEGER: {
++        Tcl_WideInt v;
++        if( TCL_OK==Tcl_GetWideIntFromObj(0, pVar, &v) ){
++          sqlite3_result_int64(context, v);
++          break;
++        }
++        /* fall-through */
++      }
++      case SQLITE_FLOAT: {
++        double r;
++        if( TCL_OK==Tcl_GetDoubleFromObj(0, pVar, &r) ){
++          sqlite3_result_double(context, r);
++          break;
++        }
++        /* fall-through */
++      }
++      default: {
++        data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n);
++        sqlite3_result_text(context, (char *)data, n, SQLITE_TRANSIENT);
++        break;
++      }
++    }
++
++  }
++}
++
++#ifndef SQLITE_OMIT_AUTHORIZATION
++/*
++** This is the authentication function.  It appends the authentication
++** type code and the two arguments to zCmd[] then invokes the result
++** on the interpreter.  The reply is examined to determine if the
++** authentication fails or succeeds.
++*/
++static int auth_callback(
++  void *pArg,
++  int code,
++  const char *zArg1,
++  const char *zArg2,
++  const char *zArg3,
++  const char *zArg4
++#ifdef SQLITE_USER_AUTHENTICATION
++  ,const char *zArg5
++#endif
++){
++  const char *zCode;
++  Tcl_DString str;
++  int rc;
++  const char *zReply;
++  /* EVIDENCE-OF: R-38590-62769 The first parameter to the authorizer
++  ** callback is a copy of the third parameter to the
++  ** sqlite3_set_authorizer() interface.
++  */
++  SqliteDb *pDb = (SqliteDb*)pArg;
++  if( pDb->disableAuth ) return SQLITE_OK;
++
++  /* EVIDENCE-OF: R-56518-44310 The second parameter to the callback is an
++  ** integer action code that specifies the particular action to be
++  ** authorized. */
++  switch( code ){
++    case SQLITE_COPY              : zCode="SQLITE_COPY"; break;
++    case SQLITE_CREATE_INDEX      : zCode="SQLITE_CREATE_INDEX"; break;
++    case SQLITE_CREATE_TABLE      : zCode="SQLITE_CREATE_TABLE"; break;
++    case SQLITE_CREATE_TEMP_INDEX : zCode="SQLITE_CREATE_TEMP_INDEX"; break;
++    case SQLITE_CREATE_TEMP_TABLE : zCode="SQLITE_CREATE_TEMP_TABLE"; break;
++    case SQLITE_CREATE_TEMP_TRIGGER: zCode="SQLITE_CREATE_TEMP_TRIGGER"; break;
++    case SQLITE_CREATE_TEMP_VIEW  : zCode="SQLITE_CREATE_TEMP_VIEW"; break;
++    case SQLITE_CREATE_TRIGGER    : zCode="SQLITE_CREATE_TRIGGER"; break;
++    case SQLITE_CREATE_VIEW       : zCode="SQLITE_CREATE_VIEW"; break;
++    case SQLITE_DELETE            : zCode="SQLITE_DELETE"; break;
++    case SQLITE_DROP_INDEX        : zCode="SQLITE_DROP_INDEX"; break;
++    case SQLITE_DROP_TABLE        : zCode="SQLITE_DROP_TABLE"; break;
++    case SQLITE_DROP_TEMP_INDEX   : zCode="SQLITE_DROP_TEMP_INDEX"; break;
++    case SQLITE_DROP_TEMP_TABLE   : zCode="SQLITE_DROP_TEMP_TABLE"; break;
++    case SQLITE_DROP_TEMP_TRIGGER : zCode="SQLITE_DROP_TEMP_TRIGGER"; break;
++    case SQLITE_DROP_TEMP_VIEW    : zCode="SQLITE_DROP_TEMP_VIEW"; break;
++    case SQLITE_DROP_TRIGGER      : zCode="SQLITE_DROP_TRIGGER"; break;
++    case SQLITE_DROP_VIEW         : zCode="SQLITE_DROP_VIEW"; break;
++    case SQLITE_INSERT            : zCode="SQLITE_INSERT"; break;
++    case SQLITE_PRAGMA            : zCode="SQLITE_PRAGMA"; break;
++    case SQLITE_READ              : zCode="SQLITE_READ"; break;
++    case SQLITE_SELECT            : zCode="SQLITE_SELECT"; break;
++    case SQLITE_TRANSACTION       : zCode="SQLITE_TRANSACTION"; break;
++    case SQLITE_UPDATE            : zCode="SQLITE_UPDATE"; break;
++    case SQLITE_ATTACH            : zCode="SQLITE_ATTACH"; break;
++    case SQLITE_DETACH            : zCode="SQLITE_DETACH"; break;
++    case SQLITE_ALTER_TABLE       : zCode="SQLITE_ALTER_TABLE"; break;
++    case SQLITE_REINDEX           : zCode="SQLITE_REINDEX"; break;
++    case SQLITE_ANALYZE           : zCode="SQLITE_ANALYZE"; break;
++    case SQLITE_CREATE_VTABLE     : zCode="SQLITE_CREATE_VTABLE"; break;
++    case SQLITE_DROP_VTABLE       : zCode="SQLITE_DROP_VTABLE"; break;
++    case SQLITE_FUNCTION          : zCode="SQLITE_FUNCTION"; break;
++    case SQLITE_SAVEPOINT         : zCode="SQLITE_SAVEPOINT"; break;
++    case SQLITE_RECURSIVE         : zCode="SQLITE_RECURSIVE"; break;
++    default                       : zCode="????"; break;
++  }
++  Tcl_DStringInit(&str);
++  Tcl_DStringAppend(&str, pDb->zAuth, -1);
++  Tcl_DStringAppendElement(&str, zCode);
++  Tcl_DStringAppendElement(&str, zArg1 ? zArg1 : "");
++  Tcl_DStringAppendElement(&str, zArg2 ? zArg2 : "");
++  Tcl_DStringAppendElement(&str, zArg3 ? zArg3 : "");
++  Tcl_DStringAppendElement(&str, zArg4 ? zArg4 : "");
++#ifdef SQLITE_USER_AUTHENTICATION
++  Tcl_DStringAppendElement(&str, zArg5 ? zArg5 : "");
++#endif
++  rc = Tcl_GlobalEval(pDb->interp, Tcl_DStringValue(&str));
++  Tcl_DStringFree(&str);
++  zReply = rc==TCL_OK ? Tcl_GetStringResult(pDb->interp) : "SQLITE_DENY";
++  if( strcmp(zReply,"SQLITE_OK")==0 ){
++    rc = SQLITE_OK;
++  }else if( strcmp(zReply,"SQLITE_DENY")==0 ){
++    rc = SQLITE_DENY;
++  }else if( strcmp(zReply,"SQLITE_IGNORE")==0 ){
++    rc = SQLITE_IGNORE;
++  }else{
++    rc = 999;
++  }
++  return rc;
++}
++#endif /* SQLITE_OMIT_AUTHORIZATION */
++
++/*
++** This routine reads a line of text from FILE in, stores
++** the text in memory obtained from malloc() and returns a pointer
++** to the text.  NULL is returned at end of file, or if malloc()
++** fails.
++**
++** The interface is like "readline" but no command-line editing
++** is done.
++**
++** copied from shell.c from '.import' command
++*/
++static char *local_getline(char *zPrompt, FILE *in){
++  char *zLine;
++  int nLine;
++  int n;
++
++  nLine = 100;
++  zLine = malloc( nLine );
++  if( zLine==0 ) return 0;
++  n = 0;
++  while( 1 ){
++    if( n+100>nLine ){
++      nLine = nLine*2 + 100;
++      zLine = realloc(zLine, nLine);
++      if( zLine==0 ) return 0;
++    }
++    if( fgets(&zLine[n], nLine - n, in)==0 ){
++      if( n==0 ){
++        free(zLine);
++        return 0;
++      }
++      zLine[n] = 0;
++      break;
++    }
++    while( zLine[n] ){ n++; }
++    if( n>0 && zLine[n-1]=='\n' ){
++      n--;
++      zLine[n] = 0;
++      break;
++    }
++  }
++  zLine = realloc( zLine, n+1 );
++  return zLine;
++}
++
++
++/*
++** This function is part of the implementation of the command:
++**
++**   $db transaction [-deferred|-immediate|-exclusive] SCRIPT
++**
++** It is invoked after evaluating the script SCRIPT to commit or rollback
++** the transaction or savepoint opened by the [transaction] command.
++*/
++static int SQLITE_TCLAPI DbTransPostCmd(
++  ClientData data[],                   /* data[0] is the Sqlite3Db* for $db */
++  Tcl_Interp *interp,                  /* Tcl interpreter */
++  int result                           /* Result of evaluating SCRIPT */
++){
++  static const char *const azEnd[] = {
++    "RELEASE _tcl_transaction",        /* rc==TCL_ERROR, nTransaction!=0 */
++    "COMMIT",                          /* rc!=TCL_ERROR, nTransaction==0 */
++    "ROLLBACK TO _tcl_transaction ; RELEASE _tcl_transaction",
++    "ROLLBACK"                         /* rc==TCL_ERROR, nTransaction==0 */
++  };
++  SqliteDb *pDb = (SqliteDb*)data[0];
++  int rc = result;
++  const char *zEnd;
++
++  pDb->nTransaction--;
++  zEnd = azEnd[(rc==TCL_ERROR)*2 + (pDb->nTransaction==0)];
++
++  pDb->disableAuth++;
++  if( sqlite3_exec(pDb->db, zEnd, 0, 0, 0) ){
++      /* This is a tricky scenario to handle. The most likely cause of an
++      ** error is that the exec() above was an attempt to commit the
++      ** top-level transaction that returned SQLITE_BUSY. Or, less likely,
++      ** that an IO-error has occurred. In either case, throw a Tcl exception
++      ** and try to rollback the transaction.
++      **
++      ** But it could also be that the user executed one or more BEGIN,
++      ** COMMIT, SAVEPOINT, RELEASE or ROLLBACK commands that are confusing
++      ** this method's logic. Not clear how this would be best handled.
++      */
++    if( rc!=TCL_ERROR ){
++      Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), (char*)0);
++      rc = TCL_ERROR;
++    }
++    sqlite3_exec(pDb->db, "ROLLBACK", 0, 0, 0);
++  }
++  pDb->disableAuth--;
++
++  delDatabaseRef(pDb);
++  return rc;
++}
++
++/*
++** Unless SQLITE_TEST is defined, this function is a simple wrapper around
++** sqlite3_prepare_v2(). If SQLITE_TEST is defined, then it uses either
++** sqlite3_prepare_v2() or legacy interface sqlite3_prepare(), depending
++** on whether or not the [db_use_legacy_prepare] command has been used to
++** configure the connection.
++*/
++static int dbPrepare(
++  SqliteDb *pDb,                  /* Database object */
++  const char *zSql,               /* SQL to compile */
++  sqlite3_stmt **ppStmt,          /* OUT: Prepared statement */
++  const char **pzOut              /* OUT: Pointer to next SQL statement */
++){
++  unsigned int prepFlags = 0;
++#ifdef SQLITE_TEST
++  if( pDb->bLegacyPrepare ){
++    return sqlite3_prepare(pDb->db, zSql, -1, ppStmt, pzOut);
++  }
++#endif
++  /* If the statement cache is large, use the SQLITE_PREPARE_PERSISTENT
++  ** flags, which uses less lookaside memory.  But if the cache is small,
++  ** omit that flag to make full use of lookaside */
++  if( pDb->maxStmt>5 ) prepFlags = SQLITE_PREPARE_PERSISTENT;
++
++  return sqlite3_prepare_v3(pDb->db, zSql, -1, prepFlags, ppStmt, pzOut);
++}
++
++/*
++** Search the cache for a prepared-statement object that implements the
++** first SQL statement in the buffer pointed to by parameter zIn. If
++** no such prepared-statement can be found, allocate and prepare a new
++** one. In either case, bind the current values of the relevant Tcl
++** variables to any $var, :var or @var variables in the statement. Before
++** returning, set *ppPreStmt to point to the prepared-statement object.
++**
++** Output parameter *pzOut is set to point to the next SQL statement in
++** buffer zIn, or to the '\0' byte at the end of zIn if there is no
++** next statement.
++**
++** If successful, TCL_OK is returned. Otherwise, TCL_ERROR is returned
++** and an error message loaded into interpreter pDb->interp.
++*/
++static int dbPrepareAndBind(
++  SqliteDb *pDb,                  /* Database object */
++  char const *zIn,                /* SQL to compile */
++  char const **pzOut,             /* OUT: Pointer to next SQL statement */
++  SqlPreparedStmt **ppPreStmt     /* OUT: Object used to cache statement */
++){
++  const char *zSql = zIn;         /* Pointer to first SQL statement in zIn */
++  sqlite3_stmt *pStmt = 0;        /* Prepared statement object */
++  SqlPreparedStmt *pPreStmt;      /* Pointer to cached statement */
++  int nSql;                       /* Length of zSql in bytes */
++  int nVar = 0;                   /* Number of variables in statement */
++  int iParm = 0;                  /* Next free entry in apParm */
++  char c;
++  int i;
++  int needResultReset = 0;        /* Need to invoke Tcl_ResetResult() */
++  int rc = SQLITE_OK;             /* Value to return */
++  Tcl_Interp *interp = pDb->interp;
++
++  *ppPreStmt = 0;
++
++  /* Trim spaces from the start of zSql and calculate the remaining length. */
++  while( (c = zSql[0])==' ' || c=='\t' || c=='\r' || c=='\n' ){ zSql++; }
++  nSql = strlen30(zSql);
++
++  for(pPreStmt = pDb->stmtList; pPreStmt; pPreStmt=pPreStmt->pNext){
++    int n = pPreStmt->nSql;
++    if( nSql>=n
++        && memcmp(pPreStmt->zSql, zSql, n)==0
++        && (zSql[n]==0 || zSql[n-1]==';')
++    ){
++      pStmt = pPreStmt->pStmt;
++      *pzOut = &zSql[pPreStmt->nSql];
++
++      /* When a prepared statement is found, unlink it from the
++      ** cache list.  It will later be added back to the beginning
++      ** of the cache list in order to implement LRU replacement.
++      */
++      if( pPreStmt->pPrev ){
++        pPreStmt->pPrev->pNext = pPreStmt->pNext;
++      }else{
++        pDb->stmtList = pPreStmt->pNext;
++      }
++      if( pPreStmt->pNext ){
++        pPreStmt->pNext->pPrev = pPreStmt->pPrev;
++      }else{
++        pDb->stmtLast = pPreStmt->pPrev;
++      }
++      pDb->nStmt--;
++      nVar = sqlite3_bind_parameter_count(pStmt);
++      break;
++    }
++  }
++
++  /* If no prepared statement was found. Compile the SQL text. Also allocate
++  ** a new SqlPreparedStmt structure.  */
++  if( pPreStmt==0 ){
++    int nByte;
++
++    if( SQLITE_OK!=dbPrepare(pDb, zSql, &pStmt, pzOut) ){
++      Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3_errmsg(pDb->db), -1));
++      return TCL_ERROR;
++    }
++    if( pStmt==0 ){
++      if( SQLITE_OK!=sqlite3_errcode(pDb->db) ){
++        /* A compile-time error in the statement. */
++        Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3_errmsg(pDb->db), -1));
++        return TCL_ERROR;
++      }else{
++        /* The statement was a no-op.  Continue to the next statement
++        ** in the SQL string.
++        */
++        return TCL_OK;
++      }
++    }
++
++    assert( pPreStmt==0 );
++    nVar = sqlite3_bind_parameter_count(pStmt);
++    nByte = sizeof(SqlPreparedStmt) + nVar*sizeof(Tcl_Obj *);
++    pPreStmt = (SqlPreparedStmt*)Tcl_Alloc(nByte);
++    memset(pPreStmt, 0, nByte);
++
++    pPreStmt->pStmt = pStmt;
++    pPreStmt->nSql = (int)(*pzOut - zSql);
++    pPreStmt->zSql = sqlite3_sql(pStmt);
++    pPreStmt->apParm = (Tcl_Obj **)&pPreStmt[1];
++#ifdef SQLITE_TEST
++    if( pPreStmt->zSql==0 ){
++      char *zCopy = Tcl_Alloc(pPreStmt->nSql + 1);
++      memcpy(zCopy, zSql, pPreStmt->nSql);
++      zCopy[pPreStmt->nSql] = '\0';
++      pPreStmt->zSql = zCopy;
++    }
++#endif
++  }
++  assert( pPreStmt );
++  assert( strlen30(pPreStmt->zSql)==pPreStmt->nSql );
++  assert( 0==memcmp(pPreStmt->zSql, zSql, pPreStmt->nSql) );
++
++  /* Bind values to parameters that begin with $ or : */
++  for(i=1; i<=nVar; i++){
++    const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
++    if( zVar!=0 && (zVar[0]=='$' || zVar[0]==':' || zVar[0]=='@') ){
++      Tcl_Obj *pVar = Tcl_GetVar2Ex(interp, &zVar[1], 0, 0);
++      if( pVar==0 && pDb->zBindFallback!=0 ){
++        Tcl_Obj *pCmd;
++        int rx;
++        pCmd = Tcl_NewStringObj(pDb->zBindFallback, -1);
++        Tcl_IncrRefCount(pCmd);
++        Tcl_ListObjAppendElement(interp, pCmd, Tcl_NewStringObj(zVar,-1));
++        if( needResultReset ) Tcl_ResetResult(interp);
++        needResultReset = 1;
++        rx = Tcl_EvalObjEx(interp, pCmd, TCL_EVAL_DIRECT);
++        Tcl_DecrRefCount(pCmd);
++        if( rx==TCL_OK ){
++          pVar = Tcl_GetObjResult(interp);
++        }else if( rx==TCL_ERROR ){
++          rc = TCL_ERROR;
++          break;
++        }else{
++          pVar = 0;
++        }
++      }
++      if( pVar ){
++        int n;
++        u8 *data;
++        const char *zType = (pVar->typePtr ? pVar->typePtr->name : "");
++        c = zType[0];
++        if( zVar[0]=='@' ||
++           (c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0) ){
++          /* Load a BLOB type if the Tcl variable is a bytearray and
++          ** it has no string representation or the host
++          ** parameter name begins with "@". */
++          data = Tcl_GetByteArrayFromObj(pVar, &n);
++          sqlite3_bind_blob(pStmt, i, data, n, SQLITE_STATIC);
++          Tcl_IncrRefCount(pVar);
++          pPreStmt->apParm[iParm++] = pVar;
++        }else if( c=='b' && strcmp(zType,"boolean")==0 ){
++          Tcl_GetIntFromObj(interp, pVar, &n);
++          sqlite3_bind_int(pStmt, i, n);
++        }else if( c=='d' && strcmp(zType,"double")==0 ){
++          double r;
++          Tcl_GetDoubleFromObj(interp, pVar, &r);
++          sqlite3_bind_double(pStmt, i, r);
++        }else if( (c=='w' && strcmp(zType,"wideInt")==0) ||
++              (c=='i' && strcmp(zType,"int")==0) ){
++          Tcl_WideInt v;
++          Tcl_GetWideIntFromObj(interp, pVar, &v);
++          sqlite3_bind_int64(pStmt, i, v);
++        }else{
++          data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n);
++          sqlite3_bind_text(pStmt, i, (char *)data, n, SQLITE_STATIC);
++          Tcl_IncrRefCount(pVar);
++          pPreStmt->apParm[iParm++] = pVar;
++        }
++      }else{
++        sqlite3_bind_null(pStmt, i);
++      }
++      if( needResultReset ) Tcl_ResetResult(pDb->interp);
++    }
++  }
++  pPreStmt->nParm = iParm;
++  *ppPreStmt = pPreStmt;
++  if( needResultReset && rc==TCL_OK ) Tcl_ResetResult(pDb->interp);
++
++  return rc;
++}
++
++/*
++** Release a statement reference obtained by calling dbPrepareAndBind().
++** There should be exactly one call to this function for each call to
++** dbPrepareAndBind().
++**
++** If the discard parameter is non-zero, then the statement is deleted
++** immediately. Otherwise it is added to the LRU list and may be returned
++** by a subsequent call to dbPrepareAndBind().
++*/
++static void dbReleaseStmt(
++  SqliteDb *pDb,                  /* Database handle */
++  SqlPreparedStmt *pPreStmt,      /* Prepared statement handle to release */
++  int discard                     /* True to delete (not cache) the pPreStmt */
++){
++  int i;
++
++  /* Free the bound string and blob parameters */
++  for(i=0; inParm; i++){
++    Tcl_DecrRefCount(pPreStmt->apParm[i]);
++  }
++  pPreStmt->nParm = 0;
++
++  if( pDb->maxStmt<=0 || discard ){
++    /* If the cache is turned off, deallocated the statement */
++    dbFreeStmt(pPreStmt);
++  }else{
++    /* Add the prepared statement to the beginning of the cache list. */
++    pPreStmt->pNext = pDb->stmtList;
++    pPreStmt->pPrev = 0;
++    if( pDb->stmtList ){
++     pDb->stmtList->pPrev = pPreStmt;
++    }
++    pDb->stmtList = pPreStmt;
++    if( pDb->stmtLast==0 ){
++      assert( pDb->nStmt==0 );
++      pDb->stmtLast = pPreStmt;
++    }else{
++      assert( pDb->nStmt>0 );
++    }
++    pDb->nStmt++;
++
++    /* If we have too many statement in cache, remove the surplus from
++    ** the end of the cache list.  */
++    while( pDb->nStmt>pDb->maxStmt ){
++      SqlPreparedStmt *pLast = pDb->stmtLast;
++      pDb->stmtLast = pLast->pPrev;
++      pDb->stmtLast->pNext = 0;
++      pDb->nStmt--;
++      dbFreeStmt(pLast);
++    }
++  }
++}
++
++/*
++** Structure used with dbEvalXXX() functions:
++**
++**   dbEvalInit()
++**   dbEvalStep()
++**   dbEvalFinalize()
++**   dbEvalRowInfo()
++**   dbEvalColumnValue()
++*/
++typedef struct DbEvalContext DbEvalContext;
++struct DbEvalContext {
++  SqliteDb *pDb;                  /* Database handle */
++  Tcl_Obj *pSql;                  /* Object holding string zSql */
++  const char *zSql;               /* Remaining SQL to execute */
++  SqlPreparedStmt *pPreStmt;      /* Current statement */
++  int nCol;                       /* Number of columns returned by pStmt */
++  int evalFlags;                  /* Flags used */
++  Tcl_Obj *pArray;                /* Name of array variable */
++  Tcl_Obj **apColName;            /* Array of column names */
++};
++
++#define SQLITE_EVAL_WITHOUTNULLS  0x00001  /* Unset array(*) for NULL */
++
++/*
++** Release any cache of column names currently held as part of
++** the DbEvalContext structure passed as the first argument.
++*/
++static void dbReleaseColumnNames(DbEvalContext *p){
++  if( p->apColName ){
++    int i;
++    for(i=0; inCol; i++){
++      Tcl_DecrRefCount(p->apColName[i]);
++    }
++    Tcl_Free((char *)p->apColName);
++    p->apColName = 0;
++  }
++  p->nCol = 0;
++}
++
++/*
++** Initialize a DbEvalContext structure.
++**
++** If pArray is not NULL, then it contains the name of a Tcl array
++** variable. The "*" member of this array is set to a list containing
++** the names of the columns returned by the statement as part of each
++** call to dbEvalStep(), in order from left to right. e.g. if the names
++** of the returned columns are a, b and c, it does the equivalent of the
++** tcl command:
++**
++**     set ${pArray}(*) {a b c}
++*/
++static void dbEvalInit(
++  DbEvalContext *p,               /* Pointer to structure to initialize */
++  SqliteDb *pDb,                  /* Database handle */
++  Tcl_Obj *pSql,                  /* Object containing SQL script */
++  Tcl_Obj *pArray,                /* Name of Tcl array to set (*) element of */
++  int evalFlags                   /* Flags controlling evaluation */
++){
++  memset(p, 0, sizeof(DbEvalContext));
++  p->pDb = pDb;
++  p->zSql = Tcl_GetString(pSql);
++  p->pSql = pSql;
++  Tcl_IncrRefCount(pSql);
++  if( pArray ){
++    p->pArray = pArray;
++    Tcl_IncrRefCount(pArray);
++  }
++  p->evalFlags = evalFlags;
++  addDatabaseRef(p->pDb);
++}
++
++/*
++** Obtain information about the row that the DbEvalContext passed as the
++** first argument currently points to.
++*/
++static void dbEvalRowInfo(
++  DbEvalContext *p,               /* Evaluation context */
++  int *pnCol,                     /* OUT: Number of column names */
++  Tcl_Obj ***papColName           /* OUT: Array of column names */
++){
++  /* Compute column names */
++  if( 0==p->apColName ){
++    sqlite3_stmt *pStmt = p->pPreStmt->pStmt;
++    int i;                        /* Iterator variable */
++    int nCol;                     /* Number of columns returned by pStmt */
++    Tcl_Obj **apColName = 0;      /* Array of column names */
++
++    p->nCol = nCol = sqlite3_column_count(pStmt);
++    if( nCol>0 && (papColName || p->pArray) ){
++      apColName = (Tcl_Obj**)Tcl_Alloc( sizeof(Tcl_Obj*)*nCol );
++      for(i=0; iapColName = apColName;
++    }
++
++    /* If results are being stored in an array variable, then create
++    ** the array(*) entry for that array
++    */
++    if( p->pArray ){
++      Tcl_Interp *interp = p->pDb->interp;
++      Tcl_Obj *pColList = Tcl_NewObj();
++      Tcl_Obj *pStar = Tcl_NewStringObj("*", -1);
++
++      for(i=0; ipArray, pStar, pColList, 0);
++      Tcl_DecrRefCount(pStar);
++    }
++  }
++
++  if( papColName ){
++    *papColName = p->apColName;
++  }
++  if( pnCol ){
++    *pnCol = p->nCol;
++  }
++}
++
++/*
++** Return one of TCL_OK, TCL_BREAK or TCL_ERROR. If TCL_ERROR is
++** returned, then an error message is stored in the interpreter before
++** returning.
++**
++** A return value of TCL_OK means there is a row of data available. The
++** data may be accessed using dbEvalRowInfo() and dbEvalColumnValue(). This
++** is analogous to a return of SQLITE_ROW from sqlite3_step(). If TCL_BREAK
++** is returned, then the SQL script has finished executing and there are
++** no further rows available. This is similar to SQLITE_DONE.
++*/
++static int dbEvalStep(DbEvalContext *p){
++  const char *zPrevSql = 0;       /* Previous value of p->zSql */
++
++  while( p->zSql[0] || p->pPreStmt ){
++    int rc;
++    if( p->pPreStmt==0 ){
++      zPrevSql = (p->zSql==zPrevSql ? 0 : p->zSql);
++      rc = dbPrepareAndBind(p->pDb, p->zSql, &p->zSql, &p->pPreStmt);
++      if( rc!=TCL_OK ) return rc;
++    }else{
++      int rcs;
++      SqliteDb *pDb = p->pDb;
++      SqlPreparedStmt *pPreStmt = p->pPreStmt;
++      sqlite3_stmt *pStmt = pPreStmt->pStmt;
++
++      rcs = sqlite3_step(pStmt);
++      if( rcs==SQLITE_ROW ){
++        return TCL_OK;
++      }
++      if( p->pArray ){
++        dbEvalRowInfo(p, 0, 0);
++      }
++      rcs = sqlite3_reset(pStmt);
++
++      pDb->nStep = sqlite3_stmt_status(pStmt,SQLITE_STMTSTATUS_FULLSCAN_STEP,1);
++      pDb->nSort = sqlite3_stmt_status(pStmt,SQLITE_STMTSTATUS_SORT,1);
++      pDb->nIndex = sqlite3_stmt_status(pStmt,SQLITE_STMTSTATUS_AUTOINDEX,1);
++      pDb->nVMStep = sqlite3_stmt_status(pStmt,SQLITE_STMTSTATUS_VM_STEP,1);
++      dbReleaseColumnNames(p);
++      p->pPreStmt = 0;
++
++      if( rcs!=SQLITE_OK ){
++        /* If a run-time error occurs, report the error and stop reading
++        ** the SQL.  */
++        dbReleaseStmt(pDb, pPreStmt, 1);
++#if SQLITE_TEST
++        if( p->pDb->bLegacyPrepare && rcs==SQLITE_SCHEMA && zPrevSql ){
++          /* If the runtime error was an SQLITE_SCHEMA, and the database
++          ** handle is configured to use the legacy sqlite3_prepare()
++          ** interface, retry prepare()/step() on the same SQL statement.
++          ** This only happens once. If there is a second SQLITE_SCHEMA
++          ** error, the error will be returned to the caller. */
++          p->zSql = zPrevSql;
++          continue;
++        }
++#endif
++        Tcl_SetObjResult(pDb->interp,
++                         Tcl_NewStringObj(sqlite3_errmsg(pDb->db), -1));
++        return TCL_ERROR;
++      }else{
++        dbReleaseStmt(pDb, pPreStmt, 0);
++      }
++    }
++  }
++
++  /* Finished */
++  return TCL_BREAK;
++}
++
++/*
++** Free all resources currently held by the DbEvalContext structure passed
++** as the first argument. There should be exactly one call to this function
++** for each call to dbEvalInit().
++*/
++static void dbEvalFinalize(DbEvalContext *p){
++  if( p->pPreStmt ){
++    sqlite3_reset(p->pPreStmt->pStmt);
++    dbReleaseStmt(p->pDb, p->pPreStmt, 0);
++    p->pPreStmt = 0;
++  }
++  if( p->pArray ){
++    Tcl_DecrRefCount(p->pArray);
++    p->pArray = 0;
++  }
++  Tcl_DecrRefCount(p->pSql);
++  dbReleaseColumnNames(p);
++  delDatabaseRef(p->pDb);
++}
++
++/*
++** Return a pointer to a Tcl_Obj structure with ref-count 0 that contains
++** the value for the iCol'th column of the row currently pointed to by
++** the DbEvalContext structure passed as the first argument.
++*/
++static Tcl_Obj *dbEvalColumnValue(DbEvalContext *p, int iCol){
++  sqlite3_stmt *pStmt = p->pPreStmt->pStmt;
++  switch( sqlite3_column_type(pStmt, iCol) ){
++    case SQLITE_BLOB: {
++      int bytes = sqlite3_column_bytes(pStmt, iCol);
++      const char *zBlob = sqlite3_column_blob(pStmt, iCol);
++      if( !zBlob ) bytes = 0;
++      return Tcl_NewByteArrayObj((u8*)zBlob, bytes);
++    }
++    case SQLITE_INTEGER: {
++      sqlite_int64 v = sqlite3_column_int64(pStmt, iCol);
++      if( v>=-2147483647 && v<=2147483647 ){
++        return Tcl_NewIntObj((int)v);
++      }else{
++        return Tcl_NewWideIntObj(v);
++      }
++    }
++    case SQLITE_FLOAT: {
++      return Tcl_NewDoubleObj(sqlite3_column_double(pStmt, iCol));
++    }
++    case SQLITE_NULL: {
++      return Tcl_NewStringObj(p->pDb->zNull, -1);
++    }
++  }
++
++  return Tcl_NewStringObj((char*)sqlite3_column_text(pStmt, iCol), -1);
++}
++
++/*
++** If using Tcl version 8.6 or greater, use the NR functions to avoid
++** recursive evaluation of scripts by the [db eval] and [db trans]
++** commands. Even if the headers used while compiling the extension
++** are 8.6 or newer, the code still tests the Tcl version at runtime.
++** This allows stubs-enabled builds to be used with older Tcl libraries.
++*/
++#if TCL_MAJOR_VERSION>8 || (TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION>=6)
++# define SQLITE_TCL_NRE 1
++static int DbUseNre(void){
++  int major, minor;
++  Tcl_GetVersion(&major, &minor, 0, 0);
++  return( (major==8 && minor>=6) || major>8 );
++}
++#else
++/*
++** Compiling using headers earlier than 8.6. In this case NR cannot be
++** used, so DbUseNre() to always return zero. Add #defines for the other
++** Tcl_NRxxx() functions to prevent them from causing compilation errors,
++** even though the only invocations of them are within conditional blocks
++** of the form:
++**
++**   if( DbUseNre() ) { ... }
++*/
++# define SQLITE_TCL_NRE 0
++# define DbUseNre() 0
++# define Tcl_NRAddCallback(a,b,c,d,e,f) (void)0
++# define Tcl_NREvalObj(a,b,c) 0
++# define Tcl_NRCreateCommand(a,b,c,d,e,f) (void)0
++#endif
++
++/*
++** This function is part of the implementation of the command:
++**
++**   $db eval SQL ?ARRAYNAME? SCRIPT
++*/
++static int SQLITE_TCLAPI DbEvalNextCmd(
++  ClientData data[],                   /* data[0] is the (DbEvalContext*) */
++  Tcl_Interp *interp,                  /* Tcl interpreter */
++  int result                           /* Result so far */
++){
++  int rc = result;                     /* Return code */
++
++  /* The first element of the data[] array is a pointer to a DbEvalContext
++  ** structure allocated using Tcl_Alloc(). The second element of data[]
++  ** is a pointer to a Tcl_Obj containing the script to run for each row
++  ** returned by the queries encapsulated in data[0]. */
++  DbEvalContext *p = (DbEvalContext *)data[0];
++  Tcl_Obj *pScript = (Tcl_Obj *)data[1];
++  Tcl_Obj *pArray = p->pArray;
++
++  while( (rc==TCL_OK || rc==TCL_CONTINUE) && TCL_OK==(rc = dbEvalStep(p)) ){
++    int i;
++    int nCol;
++    Tcl_Obj **apColName;
++    dbEvalRowInfo(p, &nCol, &apColName);
++    for(i=0; ievalFlags & SQLITE_EVAL_WITHOUTNULLS)!=0
++             && sqlite3_column_type(p->pPreStmt->pStmt, i)==SQLITE_NULL 
++      ){
++        Tcl_UnsetVar2(interp, Tcl_GetString(pArray), 
++                      Tcl_GetString(apColName[i]), 0);
++      }else{
++        Tcl_ObjSetVar2(interp, pArray, apColName[i], dbEvalColumnValue(p,i), 0);
++      }
++    }
++
++    /* The required interpreter variables are now populated with the data
++    ** from the current row. If using NRE, schedule callbacks to evaluate
++    ** script pScript, then to invoke this function again to fetch the next
++    ** row (or clean up if there is no next row or the script throws an
++    ** exception). After scheduling the callbacks, return control to the
++    ** caller.
++    **
++    ** If not using NRE, evaluate pScript directly and continue with the
++    ** next iteration of this while(...) loop.  */
++    if( DbUseNre() ){
++      Tcl_NRAddCallback(interp, DbEvalNextCmd, (void*)p, (void*)pScript, 0, 0);
++      return Tcl_NREvalObj(interp, pScript, 0);
++    }else{
++      rc = Tcl_EvalObjEx(interp, pScript, 0);
++    }
++  }
++
++  Tcl_DecrRefCount(pScript);
++  dbEvalFinalize(p);
++  Tcl_Free((char *)p);
++
++  if( rc==TCL_OK || rc==TCL_BREAK ){
++    Tcl_ResetResult(interp);
++    rc = TCL_OK;
++  }
++  return rc;
++}
++
++/*
++** This function is used by the implementations of the following database
++** handle sub-commands:
++**
++**   $db update_hook ?SCRIPT?
++**   $db wal_hook ?SCRIPT?
++**   $db commit_hook ?SCRIPT?
++**   $db preupdate hook ?SCRIPT?
++*/
++static void DbHookCmd(
++  Tcl_Interp *interp,             /* Tcl interpreter */
++  SqliteDb *pDb,                  /* Database handle */
++  Tcl_Obj *pArg,                  /* SCRIPT argument (or NULL) */
++  Tcl_Obj **ppHook                /* Pointer to member of SqliteDb */
++){
++  sqlite3 *db = pDb->db;
++
++  if( *ppHook ){
++    Tcl_SetObjResult(interp, *ppHook);
++    if( pArg ){
++      Tcl_DecrRefCount(*ppHook);
++      *ppHook = 0;
++    }
++  }
++  if( pArg ){
++    assert( !(*ppHook) );
++    if( Tcl_GetCharLength(pArg)>0 ){
++      *ppHook = pArg;
++      Tcl_IncrRefCount(*ppHook);
++    }
++  }
++
++#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
++  sqlite3_preupdate_hook(db, (pDb->pPreUpdateHook?DbPreUpdateHandler:0), pDb);
++#endif
++  sqlite3_update_hook(db, (pDb->pUpdateHook?DbUpdateHandler:0), pDb);
++  sqlite3_rollback_hook(db, (pDb->pRollbackHook?DbRollbackHandler:0), pDb);
++  sqlite3_wal_hook(db, (pDb->pWalHook?DbWalHandler:0), pDb);
++}
++
++/*
++** The "sqlite" command below creates a new Tcl command for each
++** connection it opens to an SQLite database.  This routine is invoked
++** whenever one of those connection-specific commands is executed
++** in Tcl.  For example, if you run Tcl code like this:
++**
++**       sqlite3 db1  "my_database"
++**       db1 close
++**
++** The first command opens a connection to the "my_database" database
++** and calls that connection "db1".  The second command causes this
++** subroutine to be invoked.
++*/
++static int SQLITE_TCLAPI DbObjCmd(
++  void *cd,
++  Tcl_Interp *interp,
++  int objc,
++  Tcl_Obj *const*objv
++){
++  SqliteDb *pDb = (SqliteDb*)cd;
++  int choice;
++  int rc = TCL_OK;
++  static const char *DB_strs[] = {
++    "authorizer",             "backup",                "bind_fallback",
++    "busy",                   "cache",                 "changes",
++    "close",                  "collate",               "collation_needed",
++    "commit_hook",            "complete",              "config",
++    "copy",                   "deserialize",           "enable_load_extension",
++    "errorcode",              "erroroffset",           "eval",
++    "exists",                 "function",              "incrblob",
++    "interrupt",              "last_insert_rowid",     "nullvalue",
++    "onecolumn",              "preupdate",             "profile",
++    "progress",               "rekey",                 "restore",
++    "rollback_hook",          "serialize",             "status",
++    "timeout",                "total_changes",         "trace",
++    "trace_v2",               "transaction",           "unlock_notify",
++    "update_hook",            "version",               "wal_hook",
++    0                        
++  };
++  enum DB_enum {
++    DB_AUTHORIZER,            DB_BACKUP,               DB_BIND_FALLBACK,
++    DB_BUSY,                  DB_CACHE,                DB_CHANGES,
++    DB_CLOSE,                 DB_COLLATE,              DB_COLLATION_NEEDED,
++    DB_COMMIT_HOOK,           DB_COMPLETE,             DB_CONFIG,
++    DB_COPY,                  DB_DESERIALIZE,          DB_ENABLE_LOAD_EXTENSION,
++    DB_ERRORCODE,             DB_ERROROFFSET,          DB_EVAL,
++    DB_EXISTS,                DB_FUNCTION,             DB_INCRBLOB,
++    DB_INTERRUPT,             DB_LAST_INSERT_ROWID,    DB_NULLVALUE,
++    DB_ONECOLUMN,             DB_PREUPDATE,            DB_PROFILE,
++    DB_PROGRESS,              DB_REKEY,                DB_RESTORE,
++    DB_ROLLBACK_HOOK,         DB_SERIALIZE,            DB_STATUS,
++    DB_TIMEOUT,               DB_TOTAL_CHANGES,        DB_TRACE,
++    DB_TRACE_V2,              DB_TRANSACTION,          DB_UNLOCK_NOTIFY,
++    DB_UPDATE_HOOK,           DB_VERSION,              DB_WAL_HOOK,
++  };
++  /* don't leave trailing commas on DB_enum, it confuses the AIX xlc compiler */
++
++  if( objc<2 ){
++    Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
++    return TCL_ERROR;
++  }
++  if( Tcl_GetIndexFromObj(interp, objv[1], DB_strs, "option", 0, &choice) ){
++    return TCL_ERROR;
++  }
++
++  switch( (enum DB_enum)choice ){
++
++  /*    $db authorizer ?CALLBACK?
++  **
++  ** Invoke the given callback to authorize each SQL operation as it is
++  ** compiled.  5 arguments are appended to the callback before it is
++  ** invoked:
++  **
++  **   (1) The authorization type (ex: SQLITE_CREATE_TABLE, SQLITE_INSERT, ...)
++  **   (2) First descriptive name (depends on authorization type)
++  **   (3) Second descriptive name
++  **   (4) Name of the database (ex: "main", "temp")
++  **   (5) Name of trigger that is doing the access
++  **
++  ** The callback should return on of the following strings: SQLITE_OK,
++  ** SQLITE_IGNORE, or SQLITE_DENY.  Any other return value is an error.
++  **
++  ** If this method is invoked with no arguments, the current authorization
++  ** callback string is returned.
++  */
++  case DB_AUTHORIZER: {
++#ifdef SQLITE_OMIT_AUTHORIZATION
++    Tcl_AppendResult(interp, "authorization not available in this build",
++                     (char*)0);
++    return TCL_ERROR;
++#else
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zAuth ){
++        Tcl_AppendResult(interp, pDb->zAuth, (char*)0);
++      }
++    }else{
++      char *zAuth;
++      int len;
++      if( pDb->zAuth ){
++        Tcl_Free(pDb->zAuth);
++      }
++      zAuth = Tcl_GetStringFromObj(objv[2], &len);
++      if( zAuth && len>0 ){
++        pDb->zAuth = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zAuth, zAuth, len+1);
++      }else{
++        pDb->zAuth = 0;
++      }
++      if( pDb->zAuth ){
++        typedef int (*sqlite3_auth_cb)(
++           void*,int,const char*,const char*,
++           const char*,const char*);
++        pDb->interp = interp;
++        sqlite3_set_authorizer(pDb->db,(sqlite3_auth_cb)auth_callback,pDb);
++      }else{
++        sqlite3_set_authorizer(pDb->db, 0, 0);
++      }
++    }
++#endif
++    break;
++  }
++
++  /*    $db backup ?DATABASE? FILENAME
++  **
++  ** Open or create a database file named FILENAME.  Transfer the
++  ** content of local database DATABASE (default: "main") into the
++  ** FILENAME database.
++  */
++  case DB_BACKUP: {
++    const char *zDestFile;
++    const char *zSrcDb;
++    sqlite3 *pDest;
++    sqlite3_backup *pBackup;
++
++    if( objc==3 ){
++      zSrcDb = "main";
++      zDestFile = Tcl_GetString(objv[2]);
++    }else if( objc==4 ){
++      zSrcDb = Tcl_GetString(objv[2]);
++      zDestFile = Tcl_GetString(objv[3]);
++    }else{
++      Tcl_WrongNumArgs(interp, 2, objv, "?DATABASE? FILENAME");
++      return TCL_ERROR;
++    }
++    rc = sqlite3_open_v2(zDestFile, &pDest,
++               SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE| pDb->openFlags, 0);
++    if( rc!=SQLITE_OK ){
++      Tcl_AppendResult(interp, "cannot open target database: ",
++           sqlite3_errmsg(pDest), (char*)0);
++      sqlite3_close(pDest);
++      return TCL_ERROR;
++    }
++    pBackup = sqlite3_backup_init(pDest, "main", pDb->db, zSrcDb);
++    if( pBackup==0 ){
++      Tcl_AppendResult(interp, "backup failed: ",
++           sqlite3_errmsg(pDest), (char*)0);
++      sqlite3_close(pDest);
++      return TCL_ERROR;
++    }
++    while(  (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
++    sqlite3_backup_finish(pBackup);
++    if( rc==SQLITE_DONE ){
++      rc = TCL_OK;
++    }else{
++      Tcl_AppendResult(interp, "backup failed: ",
++           sqlite3_errmsg(pDest), (char*)0);
++      rc = TCL_ERROR;
++    }
++    sqlite3_close(pDest);
++    break;
++  }
++
++  /*    $db bind_fallback ?CALLBACK?
++  **
++  ** When resolving bind parameters in an SQL statement, if the parameter
++  ** cannot be associated with a TCL variable then invoke CALLBACK with a
++  ** single argument that is the name of the parameter and use the return
++  ** value of the CALLBACK as the binding.  If CALLBACK returns something
++  ** other than TCL_OK or TCL_ERROR then bind a NULL.
++  **
++  ** If CALLBACK is an empty string, then revert to the default behavior 
++  ** which is to set the binding to NULL.
++  **
++  ** If CALLBACK returns an error, that causes the statement execution to
++  ** abort.  Hence, to configure a connection so that it throws an error
++  ** on an attempt to bind an unknown variable, do something like this:
++  **
++  **     proc bind_error {name} {error "no such variable: $name"}
++  **     db bind_fallback bind_error
++  */
++  case DB_BIND_FALLBACK: {
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zBindFallback ){
++        Tcl_AppendResult(interp, pDb->zBindFallback, (char*)0);
++      }
++    }else{
++      char *zCallback;
++      int len;
++      if( pDb->zBindFallback ){
++        Tcl_Free(pDb->zBindFallback);
++      }
++      zCallback = Tcl_GetStringFromObj(objv[2], &len);
++      if( zCallback && len>0 ){
++        pDb->zBindFallback = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zBindFallback, zCallback, len+1);
++      }else{
++        pDb->zBindFallback = 0;
++      }
++    }
++    break;
++  }
++
++  /*    $db busy ?CALLBACK?
++  **
++  ** Invoke the given callback if an SQL statement attempts to open
++  ** a locked database file.
++  */
++  case DB_BUSY: {
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "CALLBACK");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zBusy ){
++        Tcl_AppendResult(interp, pDb->zBusy, (char*)0);
++      }
++    }else{
++      char *zBusy;
++      int len;
++      if( pDb->zBusy ){
++        Tcl_Free(pDb->zBusy);
++      }
++      zBusy = Tcl_GetStringFromObj(objv[2], &len);
++      if( zBusy && len>0 ){
++        pDb->zBusy = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zBusy, zBusy, len+1);
++      }else{
++        pDb->zBusy = 0;
++      }
++      if( pDb->zBusy ){
++        pDb->interp = interp;
++        sqlite3_busy_handler(pDb->db, DbBusyHandler, pDb);
++      }else{
++        sqlite3_busy_handler(pDb->db, 0, 0);
++      }
++    }
++    break;
++  }
++
++  /*     $db cache flush
++  **     $db cache size n
++  **
++  ** Flush the prepared statement cache, or set the maximum number of
++  ** cached statements.
++  */
++  case DB_CACHE: {
++    char *subCmd;
++    int n;
++
++    if( objc<=2 ){
++      Tcl_WrongNumArgs(interp, 1, objv, "cache option ?arg?");
++      return TCL_ERROR;
++    }
++    subCmd = Tcl_GetStringFromObj( objv[2], 0 );
++    if( *subCmd=='f' && strcmp(subCmd,"flush")==0 ){
++      if( objc!=3 ){
++        Tcl_WrongNumArgs(interp, 2, objv, "flush");
++        return TCL_ERROR;
++      }else{
++        flushStmtCache( pDb );
++      }
++    }else if( *subCmd=='s' && strcmp(subCmd,"size")==0 ){
++      if( objc!=4 ){
++        Tcl_WrongNumArgs(interp, 2, objv, "size n");
++        return TCL_ERROR;
++      }else{
++        if( TCL_ERROR==Tcl_GetIntFromObj(interp, objv[3], &n) ){
++          Tcl_AppendResult( interp, "cannot convert \"",
++               Tcl_GetStringFromObj(objv[3],0), "\" to integer", (char*)0);
++          return TCL_ERROR;
++        }else{
++          if( n<0 ){
++            flushStmtCache( pDb );
++            n = 0;
++          }else if( n>MAX_PREPARED_STMTS ){
++            n = MAX_PREPARED_STMTS;
++          }
++          pDb->maxStmt = n;
++        }
++      }
++    }else{
++      Tcl_AppendResult( interp, "bad option \"",
++          Tcl_GetStringFromObj(objv[2],0), "\": must be flush or size",
++          (char*)0);
++      return TCL_ERROR;
++    }
++    break;
++  }
++
++  /*     $db changes
++  **
++  ** Return the number of rows that were modified, inserted, or deleted by
++  ** the most recent INSERT, UPDATE or DELETE statement, not including
++  ** any changes made by trigger programs.
++  */
++  case DB_CHANGES: {
++    Tcl_Obj *pResult;
++    if( objc!=2 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "");
++      return TCL_ERROR;
++    }
++    pResult = Tcl_GetObjResult(interp);
++    Tcl_SetWideIntObj(pResult, sqlite3_changes64(pDb->db));
++    break;
++  }
++
++  /*    $db close
++  **
++  ** Shutdown the database
++  */
++  case DB_CLOSE: {
++    Tcl_DeleteCommand(interp, Tcl_GetStringFromObj(objv[0], 0));
++    break;
++  }
++
++  /*
++  **     $db collate NAME SCRIPT
++  **
++  ** Create a new SQL collation function called NAME.  Whenever
++  ** that function is called, invoke SCRIPT to evaluate the function.
++  */
++  case DB_COLLATE: {
++    SqlCollate *pCollate;
++    char *zName;
++    char *zScript;
++    int nScript;
++    if( objc!=4 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "NAME SCRIPT");
++      return TCL_ERROR;
++    }
++    zName = Tcl_GetStringFromObj(objv[2], 0);
++    zScript = Tcl_GetStringFromObj(objv[3], &nScript);
++    pCollate = (SqlCollate*)Tcl_Alloc( sizeof(*pCollate) + nScript + 1 );
++    if( pCollate==0 ) return TCL_ERROR;
++    pCollate->interp = interp;
++    pCollate->pNext = pDb->pCollate;
++    pCollate->zScript = (char*)&pCollate[1];
++    pDb->pCollate = pCollate;
++    memcpy(pCollate->zScript, zScript, nScript+1);
++    if( sqlite3_create_collation(pDb->db, zName, SQLITE_UTF8,
++        pCollate, tclSqlCollate) ){
++      Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
++      return TCL_ERROR;
++    }
++    break;
++  }
++
++  /*
++  **     $db collation_needed SCRIPT
++  **
++  ** Create a new SQL collation function called NAME.  Whenever
++  ** that function is called, invoke SCRIPT to evaluate the function.
++  */
++  case DB_COLLATION_NEEDED: {
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "SCRIPT");
++      return TCL_ERROR;
++    }
++    if( pDb->pCollateNeeded ){
++      Tcl_DecrRefCount(pDb->pCollateNeeded);
++    }
++    pDb->pCollateNeeded = Tcl_DuplicateObj(objv[2]);
++    Tcl_IncrRefCount(pDb->pCollateNeeded);
++    sqlite3_collation_needed(pDb->db, pDb, tclCollateNeeded);
++    break;
++  }
++
++  /*    $db commit_hook ?CALLBACK?
++  **
++  ** Invoke the given callback just before committing every SQL transaction.
++  ** If the callback throws an exception or returns non-zero, then the
++  ** transaction is aborted.  If CALLBACK is an empty string, the callback
++  ** is disabled.
++  */
++  case DB_COMMIT_HOOK: {
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zCommit ){
++        Tcl_AppendResult(interp, pDb->zCommit, (char*)0);
++      }
++    }else{
++      const char *zCommit;
++      int len;
++      if( pDb->zCommit ){
++        Tcl_Free(pDb->zCommit);
++      }
++      zCommit = Tcl_GetStringFromObj(objv[2], &len);
++      if( zCommit && len>0 ){
++        pDb->zCommit = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zCommit, zCommit, len+1);
++      }else{
++        pDb->zCommit = 0;
++      }
++      if( pDb->zCommit ){
++        pDb->interp = interp;
++        sqlite3_commit_hook(pDb->db, DbCommitHandler, pDb);
++      }else{
++        sqlite3_commit_hook(pDb->db, 0, 0);
++      }
++    }
++    break;
++  }
++
++  /*    $db complete SQL
++  **
++  ** Return TRUE if SQL is a complete SQL statement.  Return FALSE if
++  ** additional lines of input are needed.  This is similar to the
++  ** built-in "info complete" command of Tcl.
++  */
++  case DB_COMPLETE: {
++#ifndef SQLITE_OMIT_COMPLETE
++    Tcl_Obj *pResult;
++    int isComplete;
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "SQL");
++      return TCL_ERROR;
++    }
++    isComplete = sqlite3_complete( Tcl_GetStringFromObj(objv[2], 0) );
++    pResult = Tcl_GetObjResult(interp);
++    Tcl_SetBooleanObj(pResult, isComplete);
++#endif
++    break;
++  }
++
++  /*    $db config ?OPTION? ?BOOLEAN?
++  **
++  ** Configure the database connection using the sqlite3_db_config()
++  ** interface.
++  */
++  case DB_CONFIG: {
++    static const struct DbConfigChoices {
++      const char *zName;
++      int op;
++    } aDbConfig[] = {
++        { "defensive",          SQLITE_DBCONFIG_DEFENSIVE             },
++        { "dqs_ddl",            SQLITE_DBCONFIG_DQS_DDL               },
++        { "dqs_dml",            SQLITE_DBCONFIG_DQS_DML               },
++        { "enable_fkey",        SQLITE_DBCONFIG_ENABLE_FKEY           },
++        { "enable_qpsg",        SQLITE_DBCONFIG_ENABLE_QPSG           },
++        { "enable_trigger",     SQLITE_DBCONFIG_ENABLE_TRIGGER        },
++        { "enable_view",        SQLITE_DBCONFIG_ENABLE_VIEW           },
++        { "fts3_tokenizer",     SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER },
++        { "legacy_alter_table", SQLITE_DBCONFIG_LEGACY_ALTER_TABLE    },
++        { "legacy_file_format", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    },
++        { "load_extension",     SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION },
++        { "no_ckpt_on_close",   SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      },
++        { "reset_database",     SQLITE_DBCONFIG_RESET_DATABASE        },
++        { "trigger_eqp",        SQLITE_DBCONFIG_TRIGGER_EQP           },
++        { "trusted_schema",     SQLITE_DBCONFIG_TRUSTED_SCHEMA        },
++        { "writable_schema",    SQLITE_DBCONFIG_WRITABLE_SCHEMA       },
++    };
++    Tcl_Obj *pResult;
++    int ii;
++    if( objc>4 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?OPTION? ?BOOLEAN?");
++      return TCL_ERROR;
++    }
++    if( objc==2 ){
++      /* With no arguments, list all configuration options and with the
++      ** current value */
++      pResult = Tcl_NewListObj(0,0);
++      for(ii=0; iidb, aDbConfig[ii].op, -1, &v);
++        Tcl_ListObjAppendElement(interp, pResult,
++           Tcl_NewStringObj(aDbConfig[ii].zName,-1));
++        Tcl_ListObjAppendElement(interp, pResult,
++           Tcl_NewIntObj(v));
++      }
++    }else{
++      const char *zOpt = Tcl_GetString(objv[2]);
++      int onoff = -1;
++      int v = 0;
++      if( zOpt[0]=='-' ) zOpt++;
++      for(ii=0; ii=sizeof(aDbConfig)/sizeof(aDbConfig[0]) ){
++        Tcl_AppendResult(interp, "unknown config option: \"", zOpt,
++                                "\"", (void*)0);
++        return TCL_ERROR;
++      }
++      if( objc==4 ){
++        if( Tcl_GetBooleanFromObj(interp, objv[3], &onoff) ){
++          return TCL_ERROR;
++        }
++      }
++      sqlite3_db_config(pDb->db, aDbConfig[ii].op, onoff, &v);
++      pResult = Tcl_NewIntObj(v);
++    }
++    Tcl_SetObjResult(interp, pResult);
++    break;
++  }
++
++  /*    $db copy conflict-algorithm table filename ?SEPARATOR? ?NULLINDICATOR?
++  **
++  ** Copy data into table from filename, optionally using SEPARATOR
++  ** as column separators.  If a column contains a null string, or the
++  ** value of NULLINDICATOR, a NULL is inserted for the column.
++  ** conflict-algorithm is one of the sqlite conflict algorithms:
++  **    rollback, abort, fail, ignore, replace
++  ** On success, return the number of lines processed, not necessarily same
++  ** as 'db changes' due to conflict-algorithm selected.
++  **
++  ** This code is basically an implementation/enhancement of
++  ** the sqlite3 shell.c ".import" command.
++  **
++  ** This command usage is equivalent to the sqlite2.x COPY statement,
++  ** which imports file data into a table using the PostgreSQL COPY file format:
++  **   $db copy $conflict_algorithm $table_name $filename \t \\N
++  */
++  case DB_COPY: {
++    char *zTable;               /* Insert data into this table */
++    char *zFile;                /* The file from which to extract data */
++    char *zConflict;            /* The conflict algorithm to use */
++    sqlite3_stmt *pStmt;        /* A statement */
++    int nCol;                   /* Number of columns in the table */
++    int nByte;                  /* Number of bytes in an SQL string */
++    int i, j;                   /* Loop counters */
++    int nSep;                   /* Number of bytes in zSep[] */
++    int nNull;                  /* Number of bytes in zNull[] */
++    char *zSql;                 /* An SQL statement */
++    char *zLine;                /* A single line of input from the file */
++    char **azCol;               /* zLine[] broken up into columns */
++    const char *zCommit;        /* How to commit changes */
++    FILE *in;                   /* The input file */
++    int lineno = 0;             /* Line number of input file */
++    char zLineNum[80];          /* Line number print buffer */
++    Tcl_Obj *pResult;           /* interp result */
++
++    const char *zSep;
++    const char *zNull;
++    if( objc<5 || objc>7 ){
++      Tcl_WrongNumArgs(interp, 2, objv,
++         "CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?");
++      return TCL_ERROR;
++    }
++    if( objc>=6 ){
++      zSep = Tcl_GetStringFromObj(objv[5], 0);
++    }else{
++      zSep = "\t";
++    }
++    if( objc>=7 ){
++      zNull = Tcl_GetStringFromObj(objv[6], 0);
++    }else{
++      zNull = "";
++    }
++    zConflict = Tcl_GetStringFromObj(objv[2], 0);
++    zTable = Tcl_GetStringFromObj(objv[3], 0);
++    zFile = Tcl_GetStringFromObj(objv[4], 0);
++    nSep = strlen30(zSep);
++    nNull = strlen30(zNull);
++    if( nSep==0 ){
++      Tcl_AppendResult(interp,"Error: non-null separator required for copy",
++                       (char*)0);
++      return TCL_ERROR;
++    }
++    if(strcmp(zConflict, "rollback") != 0 &&
++       strcmp(zConflict, "abort"   ) != 0 &&
++       strcmp(zConflict, "fail"    ) != 0 &&
++       strcmp(zConflict, "ignore"  ) != 0 &&
++       strcmp(zConflict, "replace" ) != 0 ) {
++      Tcl_AppendResult(interp, "Error: \"", zConflict,
++            "\", conflict-algorithm must be one of: rollback, "
++            "abort, fail, ignore, or replace", (char*)0);
++      return TCL_ERROR;
++    }
++    zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable);
++    if( zSql==0 ){
++      Tcl_AppendResult(interp, "Error: no such table: ", zTable, (char*)0);
++      return TCL_ERROR;
++    }
++    nByte = strlen30(zSql);
++    rc = sqlite3_prepare(pDb->db, zSql, -1, &pStmt, 0);
++    sqlite3_free(zSql);
++    if( rc ){
++      Tcl_AppendResult(interp, "Error: ", sqlite3_errmsg(pDb->db), (char*)0);
++      nCol = 0;
++    }else{
++      nCol = sqlite3_column_count(pStmt);
++    }
++    sqlite3_finalize(pStmt);
++    if( nCol==0 ) {
++      return TCL_ERROR;
++    }
++    zSql = malloc( nByte + 50 + nCol*2 );
++    if( zSql==0 ) {
++      Tcl_AppendResult(interp, "Error: can't malloc()", (char*)0);
++      return TCL_ERROR;
++    }
++    sqlite3_snprintf(nByte+50, zSql, "INSERT OR %q INTO '%q' VALUES(?",
++         zConflict, zTable);
++    j = strlen30(zSql);
++    for(i=1; idb, zSql, -1, &pStmt, 0);
++    free(zSql);
++    if( rc ){
++      Tcl_AppendResult(interp, "Error: ", sqlite3_errmsg(pDb->db), (char*)0);
++      sqlite3_finalize(pStmt);
++      return TCL_ERROR;
++    }
++    in = fopen(zFile, "rb");
++    if( in==0 ){
++      Tcl_AppendResult(interp, "Error: cannot open file: ", zFile, (char*)0);
++      sqlite3_finalize(pStmt);
++      return TCL_ERROR;
++    }
++    azCol = malloc( sizeof(azCol[0])*(nCol+1) );
++    if( azCol==0 ) {
++      Tcl_AppendResult(interp, "Error: can't malloc()", (char*)0);
++      fclose(in);
++      return TCL_ERROR;
++    }
++    (void)sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0);
++    zCommit = "COMMIT";
++    while( (zLine = local_getline(0, in))!=0 ){
++      char *z;
++      lineno++;
++      azCol[0] = zLine;
++      for(i=0, z=zLine; *z; z++){
++        if( *z==zSep[0] && strncmp(z, zSep, nSep)==0 ){
++          *z = 0;
++          i++;
++          if( i0 && strcmp(azCol[i], zNull)==0)
++          || strlen30(azCol[i])==0
++        ){
++          sqlite3_bind_null(pStmt, i+1);
++        }else{
++          sqlite3_bind_text(pStmt, i+1, azCol[i], -1, SQLITE_STATIC);
++        }
++      }
++      sqlite3_step(pStmt);
++      rc = sqlite3_reset(pStmt);
++      free(zLine);
++      if( rc!=SQLITE_OK ){
++        Tcl_AppendResult(interp,"Error: ", sqlite3_errmsg(pDb->db), (char*)0);
++        zCommit = "ROLLBACK";
++        break;
++      }
++    }
++    free(azCol);
++    fclose(in);
++    sqlite3_finalize(pStmt);
++    (void)sqlite3_exec(pDb->db, zCommit, 0, 0, 0);
++
++    if( zCommit[0] == 'C' ){
++      /* success, set result as number of lines processed */
++      pResult = Tcl_GetObjResult(interp);
++      Tcl_SetIntObj(pResult, lineno);
++      rc = TCL_OK;
++    }else{
++      /* failure, append lineno where failed */
++      sqlite3_snprintf(sizeof(zLineNum), zLineNum,"%d",lineno);
++      Tcl_AppendResult(interp,", failed while processing line: ",zLineNum,
++                       (char*)0);
++      rc = TCL_ERROR;
++    }
++    break;
++  }
++
++  /*
++  **     $db deserialize ?-maxsize N? ?-readonly BOOL? ?DATABASE? VALUE
++  **
++  ** Reopen DATABASE (default "main") using the content in $VALUE
++  */
++  case DB_DESERIALIZE: {
++#ifdef SQLITE_OMIT_DESERIALIZE
++    Tcl_AppendResult(interp, "MEMDB not available in this build",
++                     (char*)0);
++    rc = TCL_ERROR;
++#else
++    const char *zSchema = 0;
++    Tcl_Obj *pValue = 0;
++    unsigned char *pBA;
++    unsigned char *pData;
++    int len, xrc;
++    sqlite3_int64 mxSize = 0;
++    int i;
++    int isReadonly = 0;
++
++
++    if( objc<3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?DATABASE? VALUE");
++      rc = TCL_ERROR;
++      break;
++    }
++    for(i=2; i0 ){
++      Tcl_AppendResult(interp, "out of memory", (char*)0);
++      rc = TCL_ERROR;
++    }else{
++      int flags;
++      if( len>0 ) memcpy(pData, pBA, len);
++      if( isReadonly ){
++        flags = SQLITE_DESERIALIZE_FREEONCLOSE | SQLITE_DESERIALIZE_READONLY;
++      }else{
++        flags = SQLITE_DESERIALIZE_FREEONCLOSE | SQLITE_DESERIALIZE_RESIZEABLE;
++      }
++      xrc = sqlite3_deserialize(pDb->db, zSchema, pData, len, len, flags);
++      if( xrc ){
++        Tcl_AppendResult(interp, "unable to set MEMDB content", (char*)0);
++        rc = TCL_ERROR;
++      }
++      if( mxSize>0 ){
++        sqlite3_file_control(pDb->db, zSchema,SQLITE_FCNTL_SIZE_LIMIT,&mxSize);
++      }
++    }
++deserialize_error:
++#endif
++    break; 
++  }
++
++  /*
++  **    $db enable_load_extension BOOLEAN
++  **
++  ** Turn the extension loading feature on or off.  It if off by
++  ** default.
++  */
++  case DB_ENABLE_LOAD_EXTENSION: {
++#ifndef SQLITE_OMIT_LOAD_EXTENSION
++    int onoff;
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "BOOLEAN");
++      return TCL_ERROR;
++    }
++    if( Tcl_GetBooleanFromObj(interp, objv[2], &onoff) ){
++      return TCL_ERROR;
++    }
++    sqlite3_enable_load_extension(pDb->db, onoff);
++    break;
++#else
++    Tcl_AppendResult(interp, "extension loading is turned off at compile-time",
++                     (char*)0);
++    return TCL_ERROR;
++#endif
++  }
++
++  /*
++  **    $db errorcode
++  **
++  ** Return the numeric error code that was returned by the most recent
++  ** call to sqlite3_exec().
++  */
++  case DB_ERRORCODE: {
++    Tcl_SetObjResult(interp, Tcl_NewIntObj(sqlite3_errcode(pDb->db)));
++    break;
++  }
++
++  /*
++  **    $db erroroffset
++  **
++  ** Return the numeric error code that was returned by the most recent
++  ** call to sqlite3_exec().
++  */
++  case DB_ERROROFFSET: {
++    Tcl_SetObjResult(interp, Tcl_NewIntObj(sqlite3_error_offset(pDb->db)));
++    break;
++  }
++
++  /*
++  **    $db exists $sql
++  **    $db onecolumn $sql
++  **
++  ** The onecolumn method is the equivalent of:
++  **     lindex [$db eval $sql] 0
++  */
++  case DB_EXISTS:
++  case DB_ONECOLUMN: {
++    Tcl_Obj *pResult = 0;
++    DbEvalContext sEval;
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "SQL");
++      return TCL_ERROR;
++    }
++
++    dbEvalInit(&sEval, pDb, objv[2], 0, 0);
++    rc = dbEvalStep(&sEval);
++    if( choice==DB_ONECOLUMN ){
++      if( rc==TCL_OK ){
++        pResult = dbEvalColumnValue(&sEval, 0);
++      }else if( rc==TCL_BREAK ){
++        Tcl_ResetResult(interp);
++      }
++    }else if( rc==TCL_BREAK || rc==TCL_OK ){
++      pResult = Tcl_NewBooleanObj(rc==TCL_OK);
++    }
++    dbEvalFinalize(&sEval);
++    if( pResult ) Tcl_SetObjResult(interp, pResult);
++
++    if( rc==TCL_BREAK ){
++      rc = TCL_OK;
++    }
++    break;
++  }
++
++  /*
++  **    $db eval ?options? $sql ?array? ?{  ...code... }?
++  **
++  ** The SQL statement in $sql is evaluated.  For each row, the values are
++  ** placed in elements of the array named "array" and ...code... is executed.
++  ** If "array" and "code" are omitted, then no callback is every invoked.
++  ** If "array" is an empty string, then the values are placed in variables
++  ** that have the same name as the fields extracted by the query.
++  */
++  case DB_EVAL: {
++    int evalFlags = 0;
++    const char *zOpt;
++    while( objc>3 && (zOpt = Tcl_GetString(objv[2]))!=0 && zOpt[0]=='-' ){
++      if( strcmp(zOpt, "-withoutnulls")==0 ){
++        evalFlags |= SQLITE_EVAL_WITHOUTNULLS;
++      }
++      else{
++        Tcl_AppendResult(interp, "unknown option: \"", zOpt, "\"", (void*)0);
++        return TCL_ERROR;
++      }
++      objc--;
++      objv++;
++    }
++    if( objc<3 || objc>5 ){
++      Tcl_WrongNumArgs(interp, 2, objv, 
++          "?OPTIONS? SQL ?ARRAY-NAME? ?SCRIPT?");
++      return TCL_ERROR;
++    }
++
++    if( objc==3 ){
++      DbEvalContext sEval;
++      Tcl_Obj *pRet = Tcl_NewObj();
++      Tcl_IncrRefCount(pRet);
++      dbEvalInit(&sEval, pDb, objv[2], 0, 0);
++      while( TCL_OK==(rc = dbEvalStep(&sEval)) ){
++        int i;
++        int nCol;
++        dbEvalRowInfo(&sEval, &nCol, 0);
++        for(i=0; i=5 && *(char *)Tcl_GetString(objv[3]) ){
++        pArray = objv[3];
++      }
++      pScript = objv[objc-1];
++      Tcl_IncrRefCount(pScript);
++
++      p = (DbEvalContext *)Tcl_Alloc(sizeof(DbEvalContext));
++      dbEvalInit(p, pDb, objv[2], pArray, evalFlags);
++
++      cd2[0] = (void *)p;
++      cd2[1] = (void *)pScript;
++      rc = DbEvalNextCmd(cd2, interp, TCL_OK);
++    }
++    break;
++  }
++
++  /*
++  **     $db function NAME [OPTIONS] SCRIPT
++  **
++  ** Create a new SQL function called NAME.  Whenever that function is
++  ** called, invoke SCRIPT to evaluate the function.
++  **
++  ** Options:
++  **         --argcount N           Function has exactly N arguments
++  **         --deterministic        The function is pure
++  **         --directonly           Prohibit use inside triggers and views
++  **         --innocuous            Has no side effects or information leaks
++  **         --returntype TYPE      Specify the return type of the function
++  */
++  case DB_FUNCTION: {
++    int flags = SQLITE_UTF8;
++    SqlFunc *pFunc;
++    Tcl_Obj *pScript;
++    char *zName;
++    int nArg = -1;
++    int i;
++    int eType = SQLITE_NULL;
++    if( objc<4 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "NAME ?SWITCHES? SCRIPT");
++      return TCL_ERROR;
++    }
++    for(i=3; i<(objc-1); i++){
++      const char *z = Tcl_GetString(objv[i]);
++      int n = strlen30(z);
++      if( n>1 && strncmp(z, "-argcount",n)==0 ){
++        if( i==(objc-2) ){
++          Tcl_AppendResult(interp, "option requires an argument: ", z,(char*)0);
++          return TCL_ERROR;
++        }
++        if( Tcl_GetIntFromObj(interp, objv[i+1], &nArg) ) return TCL_ERROR;
++        if( nArg<0 ){
++          Tcl_AppendResult(interp, "number of arguments must be non-negative",
++                           (char*)0);
++          return TCL_ERROR;
++        }
++        i++;
++      }else
++      if( n>1 && strncmp(z, "-deterministic",n)==0 ){
++        flags |= SQLITE_DETERMINISTIC;
++      }else
++      if( n>1 && strncmp(z, "-directonly",n)==0 ){
++        flags |= SQLITE_DIRECTONLY;
++      }else
++      if( n>1 && strncmp(z, "-innocuous",n)==0 ){
++        flags |= SQLITE_INNOCUOUS;
++      }else
++      if( n>1 && strncmp(z, "-returntype", n)==0 ){
++        const char *azType[] = {"integer", "real", "text", "blob", "any", 0};
++        assert( SQLITE_INTEGER==1 && SQLITE_FLOAT==2 && SQLITE_TEXT==3 );
++        assert( SQLITE_BLOB==4 && SQLITE_NULL==5 );
++        if( i==(objc-2) ){
++          Tcl_AppendResult(interp, "option requires an argument: ", z,(char*)0);
++          return TCL_ERROR;
++        }
++        i++;
++        if( Tcl_GetIndexFromObj(interp, objv[i], azType, "type", 0, &eType) ){
++          return TCL_ERROR;
++        }
++        eType++;
++      }else{
++        Tcl_AppendResult(interp, "bad option \"", z,
++            "\": must be -argcount, -deterministic, -directonly,"
++            " -innocuous, or -returntype", (char*)0
++        );
++        return TCL_ERROR;
++      }
++    }
++
++    pScript = objv[objc-1];
++    zName = Tcl_GetStringFromObj(objv[2], 0);
++    pFunc = findSqlFunc(pDb, zName);
++    if( pFunc==0 ) return TCL_ERROR;
++    if( pFunc->pScript ){
++      Tcl_DecrRefCount(pFunc->pScript);
++    }
++    pFunc->pScript = pScript;
++    Tcl_IncrRefCount(pScript);
++    pFunc->useEvalObjv = safeToUseEvalObjv(interp, pScript);
++    pFunc->eType = eType;
++    rc = sqlite3_create_function(pDb->db, zName, nArg, flags,
++        pFunc, tclSqlFunc, 0, 0);
++    if( rc!=SQLITE_OK ){
++      rc = TCL_ERROR;
++      Tcl_SetResult(interp, (char *)sqlite3_errmsg(pDb->db), TCL_VOLATILE);
++    }
++    break;
++  }
++
++  /*
++  **     $db incrblob ?-readonly? ?DB? TABLE COLUMN ROWID
++  */
++  case DB_INCRBLOB: {
++#ifdef SQLITE_OMIT_INCRBLOB
++    Tcl_AppendResult(interp, "incrblob not available in this build", (char*)0);
++    return TCL_ERROR;
++#else
++    int isReadonly = 0;
++    const char *zDb = "main";
++    const char *zTable;
++    const char *zColumn;
++    Tcl_WideInt iRow;
++
++    /* Check for the -readonly option */
++    if( objc>3 && strcmp(Tcl_GetString(objv[2]), "-readonly")==0 ){
++      isReadonly = 1;
++    }
++
++    if( objc!=(5+isReadonly) && objc!=(6+isReadonly) ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?-readonly? ?DB? TABLE COLUMN ROWID");
++      return TCL_ERROR;
++    }
++
++    if( objc==(6+isReadonly) ){
++      zDb = Tcl_GetString(objv[2+isReadonly]);
++    }
++    zTable = Tcl_GetString(objv[objc-3]);
++    zColumn = Tcl_GetString(objv[objc-2]);
++    rc = Tcl_GetWideIntFromObj(interp, objv[objc-1], &iRow);
++
++    if( rc==TCL_OK ){
++      rc = createIncrblobChannel(
++          interp, pDb, zDb, zTable, zColumn, (sqlite3_int64)iRow, isReadonly
++      );
++    }
++#endif
++    break;
++  }
++
++  /*
++  **     $db interrupt
++  **
++  ** Interrupt the execution of the inner-most SQL interpreter.  This
++  ** causes the SQL statement to return an error of SQLITE_INTERRUPT.
++  */
++  case DB_INTERRUPT: {
++    sqlite3_interrupt(pDb->db);
++    break;
++  }
++
++  /*
++  **     $db nullvalue ?STRING?
++  **
++  ** Change text used when a NULL comes back from the database. If ?STRING?
++  ** is not present, then the current string used for NULL is returned.
++  ** If STRING is present, then STRING is returned.
++  **
++  */
++  case DB_NULLVALUE: {
++    if( objc!=2 && objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "NULLVALUE");
++      return TCL_ERROR;
++    }
++    if( objc==3 ){
++      int len;
++      char *zNull = Tcl_GetStringFromObj(objv[2], &len);
++      if( pDb->zNull ){
++        Tcl_Free(pDb->zNull);
++      }
++      if( zNull && len>0 ){
++        pDb->zNull = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zNull, zNull, len);
++        pDb->zNull[len] = '\0';
++      }else{
++        pDb->zNull = 0;
++      }
++    }
++    Tcl_SetObjResult(interp, Tcl_NewStringObj(pDb->zNull, -1));
++    break;
++  }
++
++  /*
++  **     $db last_insert_rowid
++  **
++  ** Return an integer which is the ROWID for the most recent insert.
++  */
++  case DB_LAST_INSERT_ROWID: {
++    Tcl_Obj *pResult;
++    Tcl_WideInt rowid;
++    if( objc!=2 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "");
++      return TCL_ERROR;
++    }
++    rowid = sqlite3_last_insert_rowid(pDb->db);
++    pResult = Tcl_GetObjResult(interp);
++    Tcl_SetWideIntObj(pResult, rowid);
++    break;
++  }
++
++  /*
++  ** The DB_ONECOLUMN method is implemented together with DB_EXISTS.
++  */
++
++  /*    $db progress ?N CALLBACK?
++  **
++  ** Invoke the given callback every N virtual machine opcodes while executing
++  ** queries.
++  */
++  case DB_PROGRESS: {
++    if( objc==2 ){
++      if( pDb->zProgress ){
++        Tcl_AppendResult(interp, pDb->zProgress, (char*)0);
++      }
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++      sqlite3_progress_handler(pDb->db, 0, 0, 0);
++#endif
++    }else if( objc==4 ){
++      char *zProgress;
++      int len;
++      int N;
++      if( TCL_OK!=Tcl_GetIntFromObj(interp, objv[2], &N) ){
++        return TCL_ERROR;
++      };
++      if( pDb->zProgress ){
++        Tcl_Free(pDb->zProgress);
++      }
++      zProgress = Tcl_GetStringFromObj(objv[3], &len);
++      if( zProgress && len>0 ){
++        pDb->zProgress = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zProgress, zProgress, len+1);
++      }else{
++        pDb->zProgress = 0;
++      }
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++      if( pDb->zProgress ){
++        pDb->interp = interp;
++        sqlite3_progress_handler(pDb->db, N, DbProgressHandler, pDb);
++      }else{
++        sqlite3_progress_handler(pDb->db, 0, 0, 0);
++      }
++#endif
++    }else{
++      Tcl_WrongNumArgs(interp, 2, objv, "N CALLBACK");
++      return TCL_ERROR;
++    }
++    break;
++  }
++
++  /*    $db profile ?CALLBACK?
++  **
++  ** Make arrangements to invoke the CALLBACK routine after each SQL statement
++  ** that has run.  The text of the SQL and the amount of elapse time are
++  ** appended to CALLBACK before the script is run.
++  */
++  case DB_PROFILE: {
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zProfile ){
++        Tcl_AppendResult(interp, pDb->zProfile, (char*)0);
++      }
++    }else{
++      char *zProfile;
++      int len;
++      if( pDb->zProfile ){
++        Tcl_Free(pDb->zProfile);
++      }
++      zProfile = Tcl_GetStringFromObj(objv[2], &len);
++      if( zProfile && len>0 ){
++        pDb->zProfile = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zProfile, zProfile, len+1);
++      }else{
++        pDb->zProfile = 0;
++      }
++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
++    !defined(SQLITE_OMIT_DEPRECATED)
++      if( pDb->zProfile ){
++        pDb->interp = interp;
++        sqlite3_profile(pDb->db, DbProfileHandler, pDb);
++      }else{
++        sqlite3_profile(pDb->db, 0, 0);
++      }
++#endif
++    }
++    break;
++  }
++
++  /*
++  **     $db rekey KEY
++  **
++  ** Change the encryption key on the currently open database.
++  */
++  case DB_REKEY: {
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "KEY");
++      return TCL_ERROR;
++    }
++    break;
++  }
++
++  /*    $db restore ?DATABASE? FILENAME
++  **
++  ** Open a database file named FILENAME.  Transfer the content
++  ** of FILENAME into the local database DATABASE (default: "main").
++  */
++  case DB_RESTORE: {
++    const char *zSrcFile;
++    const char *zDestDb;
++    sqlite3 *pSrc;
++    sqlite3_backup *pBackup;
++    int nTimeout = 0;
++
++    if( objc==3 ){
++      zDestDb = "main";
++      zSrcFile = Tcl_GetString(objv[2]);
++    }else if( objc==4 ){
++      zDestDb = Tcl_GetString(objv[2]);
++      zSrcFile = Tcl_GetString(objv[3]);
++    }else{
++      Tcl_WrongNumArgs(interp, 2, objv, "?DATABASE? FILENAME");
++      return TCL_ERROR;
++    }
++    rc = sqlite3_open_v2(zSrcFile, &pSrc,
++                         SQLITE_OPEN_READONLY | pDb->openFlags, 0);
++    if( rc!=SQLITE_OK ){
++      Tcl_AppendResult(interp, "cannot open source database: ",
++           sqlite3_errmsg(pSrc), (char*)0);
++      sqlite3_close(pSrc);
++      return TCL_ERROR;
++    }
++    pBackup = sqlite3_backup_init(pDb->db, zDestDb, pSrc, "main");
++    if( pBackup==0 ){
++      Tcl_AppendResult(interp, "restore failed: ",
++           sqlite3_errmsg(pDb->db), (char*)0);
++      sqlite3_close(pSrc);
++      return TCL_ERROR;
++    }
++    while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
++              || rc==SQLITE_BUSY ){
++      if( rc==SQLITE_BUSY ){
++        if( nTimeout++ >= 3 ) break;
++        sqlite3_sleep(100);
++      }
++    }
++    sqlite3_backup_finish(pBackup);
++    if( rc==SQLITE_DONE ){
++      rc = TCL_OK;
++    }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
++      Tcl_AppendResult(interp, "restore failed: source database busy",
++                       (char*)0);
++      rc = TCL_ERROR;
++    }else{
++      Tcl_AppendResult(interp, "restore failed: ",
++           sqlite3_errmsg(pDb->db), (char*)0);
++      rc = TCL_ERROR;
++    }
++    sqlite3_close(pSrc);
++    break;
++  }
++
++  /*
++  **     $db serialize ?DATABASE?
++  **
++  ** Return a serialization of a database.  
++  */
++  case DB_SERIALIZE: {
++#ifdef SQLITE_OMIT_DESERIALIZE
++    Tcl_AppendResult(interp, "MEMDB not available in this build",
++                     (char*)0);
++    rc = TCL_ERROR;
++#else
++    const char *zSchema = objc>=3 ? Tcl_GetString(objv[2]) : "main";
++    sqlite3_int64 sz = 0;
++    unsigned char *pData;
++    if( objc!=2 && objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?DATABASE?");
++      rc = TCL_ERROR;
++    }else{
++      int needFree;
++      pData = sqlite3_serialize(pDb->db, zSchema, &sz, SQLITE_SERIALIZE_NOCOPY);
++      if( pData ){
++        needFree = 0;
++      }else{
++        pData = sqlite3_serialize(pDb->db, zSchema, &sz, 0);
++        needFree = 1;
++      }
++      Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(pData,sz));
++      if( needFree ) sqlite3_free(pData);
++    }
++#endif
++    break;
++  }
++
++  /*
++  **     $db status (step|sort|autoindex|vmstep)
++  **
++  ** Display SQLITE_STMTSTATUS_FULLSCAN_STEP or
++  ** SQLITE_STMTSTATUS_SORT for the most recent eval.
++  */
++  case DB_STATUS: {
++    int v;
++    const char *zOp;
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "(step|sort|autoindex)");
++      return TCL_ERROR;
++    }
++    zOp = Tcl_GetString(objv[2]);
++    if( strcmp(zOp, "step")==0 ){
++      v = pDb->nStep;
++    }else if( strcmp(zOp, "sort")==0 ){
++      v = pDb->nSort;
++    }else if( strcmp(zOp, "autoindex")==0 ){
++      v = pDb->nIndex;
++    }else if( strcmp(zOp, "vmstep")==0 ){
++      v = pDb->nVMStep;
++    }else{
++      Tcl_AppendResult(interp,
++            "bad argument: should be autoindex, step, sort or vmstep",
++            (char*)0);
++      return TCL_ERROR;
++    }
++    Tcl_SetObjResult(interp, Tcl_NewIntObj(v));
++    break;
++  }
++
++  /*
++  **     $db timeout MILLESECONDS
++  **
++  ** Delay for the number of milliseconds specified when a file is locked.
++  */
++  case DB_TIMEOUT: {
++    int ms;
++    if( objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "MILLISECONDS");
++      return TCL_ERROR;
++    }
++    if( Tcl_GetIntFromObj(interp, objv[2], &ms) ) return TCL_ERROR;
++    sqlite3_busy_timeout(pDb->db, ms);
++    break;
++  }
++
++  /*
++  **     $db total_changes
++  **
++  ** Return the number of rows that were modified, inserted, or deleted
++  ** since the database handle was created.
++  */
++  case DB_TOTAL_CHANGES: {
++    Tcl_Obj *pResult;
++    if( objc!=2 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "");
++      return TCL_ERROR;
++    }
++    pResult = Tcl_GetObjResult(interp);
++    Tcl_SetWideIntObj(pResult, sqlite3_total_changes64(pDb->db));
++    break;
++  }
++
++  /*    $db trace ?CALLBACK?
++  **
++  ** Make arrangements to invoke the CALLBACK routine for each SQL statement
++  ** that is executed.  The text of the SQL is appended to CALLBACK before
++  ** it is executed.
++  */
++  case DB_TRACE: {
++    if( objc>3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zTrace ){
++        Tcl_AppendResult(interp, pDb->zTrace, (char*)0);
++      }
++    }else{
++      char *zTrace;
++      int len;
++      if( pDb->zTrace ){
++        Tcl_Free(pDb->zTrace);
++      }
++      zTrace = Tcl_GetStringFromObj(objv[2], &len);
++      if( zTrace && len>0 ){
++        pDb->zTrace = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zTrace, zTrace, len+1);
++      }else{
++        pDb->zTrace = 0;
++      }
++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
++    !defined(SQLITE_OMIT_DEPRECATED)
++      if( pDb->zTrace ){
++        pDb->interp = interp;
++        sqlite3_trace(pDb->db, DbTraceHandler, pDb);
++      }else{
++        sqlite3_trace(pDb->db, 0, 0);
++      }
++#endif
++    }
++    break;
++  }
++
++  /*    $db trace_v2 ?CALLBACK? ?MASK?
++  **
++  ** Make arrangements to invoke the CALLBACK routine for each trace event
++  ** matching the mask that is generated.  The parameters are appended to
++  ** CALLBACK before it is executed.
++  */
++  case DB_TRACE_V2: {
++    if( objc>4 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK? ?MASK?");
++      return TCL_ERROR;
++    }else if( objc==2 ){
++      if( pDb->zTraceV2 ){
++        Tcl_AppendResult(interp, pDb->zTraceV2, (char*)0);
++      }
++    }else{
++      char *zTraceV2;
++      int len;
++      Tcl_WideInt wMask = 0;
++      if( objc==4 ){
++        static const char *TTYPE_strs[] = {
++          "statement", "profile", "row", "close", 0
++        };
++        enum TTYPE_enum {
++          TTYPE_STMT, TTYPE_PROFILE, TTYPE_ROW, TTYPE_CLOSE
++        };
++        int i;
++        if( TCL_OK!=Tcl_ListObjLength(interp, objv[3], &len) ){
++          return TCL_ERROR;
++        }
++        for(i=0; izTraceV2 ){
++        Tcl_Free(pDb->zTraceV2);
++      }
++      zTraceV2 = Tcl_GetStringFromObj(objv[2], &len);
++      if( zTraceV2 && len>0 ){
++        pDb->zTraceV2 = Tcl_Alloc( len + 1 );
++        memcpy(pDb->zTraceV2, zTraceV2, len+1);
++      }else{
++        pDb->zTraceV2 = 0;
++      }
++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
++      if( pDb->zTraceV2 ){
++        pDb->interp = interp;
++        sqlite3_trace_v2(pDb->db, (unsigned)wMask, DbTraceV2Handler, pDb);
++      }else{
++        sqlite3_trace_v2(pDb->db, 0, 0, 0);
++      }
++#endif
++    }
++    break;
++  }
++
++  /*    $db transaction [-deferred|-immediate|-exclusive] SCRIPT
++  **
++  ** Start a new transaction (if we are not already in the midst of a
++  ** transaction) and execute the TCL script SCRIPT.  After SCRIPT
++  ** completes, either commit the transaction or roll it back if SCRIPT
++  ** throws an exception.  Or if no new transaction was started, do nothing.
++  ** pass the exception on up the stack.
++  **
++  ** This command was inspired by Dave Thomas's talk on Ruby at the
++  ** 2005 O'Reilly Open Source Convention (OSCON).
++  */
++  case DB_TRANSACTION: {
++    Tcl_Obj *pScript;
++    const char *zBegin = "SAVEPOINT _tcl_transaction";
++    if( objc!=3 && objc!=4 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "[TYPE] SCRIPT");
++      return TCL_ERROR;
++    }
++
++    if( pDb->nTransaction==0 && objc==4 ){
++      static const char *TTYPE_strs[] = {
++        "deferred",   "exclusive",  "immediate", 0
++      };
++      enum TTYPE_enum {
++        TTYPE_DEFERRED, TTYPE_EXCLUSIVE, TTYPE_IMMEDIATE
++      };
++      int ttype;
++      if( Tcl_GetIndexFromObj(interp, objv[2], TTYPE_strs, "transaction type",
++                              0, &ttype) ){
++        return TCL_ERROR;
++      }
++      switch( (enum TTYPE_enum)ttype ){
++        case TTYPE_DEFERRED:    /* no-op */;                 break;
++        case TTYPE_EXCLUSIVE:   zBegin = "BEGIN EXCLUSIVE";  break;
++        case TTYPE_IMMEDIATE:   zBegin = "BEGIN IMMEDIATE";  break;
++      }
++    }
++    pScript = objv[objc-1];
++
++    /* Run the SQLite BEGIN command to open a transaction or savepoint. */
++    pDb->disableAuth++;
++    rc = sqlite3_exec(pDb->db, zBegin, 0, 0, 0);
++    pDb->disableAuth--;
++    if( rc!=SQLITE_OK ){
++      Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), (char*)0);
++      return TCL_ERROR;
++    }
++    pDb->nTransaction++;
++
++    /* If using NRE, schedule a callback to invoke the script pScript, then
++    ** a second callback to commit (or rollback) the transaction or savepoint
++    ** opened above. If not using NRE, evaluate the script directly, then
++    ** call function DbTransPostCmd() to commit (or rollback) the transaction
++    ** or savepoint.  */
++    addDatabaseRef(pDb);          /* DbTransPostCmd() calls delDatabaseRef() */
++    if( DbUseNre() ){
++      Tcl_NRAddCallback(interp, DbTransPostCmd, cd, 0, 0, 0);
++      (void)Tcl_NREvalObj(interp, pScript, 0);
++    }else{
++      rc = DbTransPostCmd(&cd, interp, Tcl_EvalObjEx(interp, pScript, 0));
++    }
++    break;
++  }
++
++  /*
++  **    $db unlock_notify ?script?
++  */
++  case DB_UNLOCK_NOTIFY: {
++#ifndef SQLITE_ENABLE_UNLOCK_NOTIFY
++    Tcl_AppendResult(interp, "unlock_notify not available in this build",
++                     (char*)0);
++    rc = TCL_ERROR;
++#else
++    if( objc!=2 && objc!=3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "?SCRIPT?");
++      rc = TCL_ERROR;
++    }else{
++      void (*xNotify)(void **, int) = 0;
++      void *pNotifyArg = 0;
++
++      if( pDb->pUnlockNotify ){
++        Tcl_DecrRefCount(pDb->pUnlockNotify);
++        pDb->pUnlockNotify = 0;
++      }
++
++      if( objc==3 ){
++        xNotify = DbUnlockNotify;
++        pNotifyArg = (void *)pDb;
++        pDb->pUnlockNotify = objv[2];
++        Tcl_IncrRefCount(pDb->pUnlockNotify);
++      }
++
++      if( sqlite3_unlock_notify(pDb->db, xNotify, pNotifyArg) ){
++        Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), (char*)0);
++        rc = TCL_ERROR;
++      }
++    }
++#endif
++    break;
++  }
++
++  /*
++  **    $db preupdate_hook count
++  **    $db preupdate_hook hook ?SCRIPT?
++  **    $db preupdate_hook new INDEX
++  **    $db preupdate_hook old INDEX
++  */
++  case DB_PREUPDATE: {
++#ifndef SQLITE_ENABLE_PREUPDATE_HOOK
++    Tcl_AppendResult(interp, "preupdate_hook was omitted at compile-time", 
++                     (char*)0);
++    rc = TCL_ERROR;
++#else
++    static const char *azSub[] = {"count", "depth", "hook", "new", "old", 0};
++    enum DbPreupdateSubCmd {
++      PRE_COUNT, PRE_DEPTH, PRE_HOOK, PRE_NEW, PRE_OLD
++    };
++    int iSub;
++
++    if( objc<3 ){
++      Tcl_WrongNumArgs(interp, 2, objv, "SUB-COMMAND ?ARGS?");
++    }
++    if( Tcl_GetIndexFromObj(interp, objv[2], azSub, "sub-command", 0, &iSub) ){
++      return TCL_ERROR;
++    }
++
++    switch( (enum DbPreupdateSubCmd)iSub ){
++      case PRE_COUNT: {
++        int nCol = sqlite3_preupdate_count(pDb->db);
++        Tcl_SetObjResult(interp, Tcl_NewIntObj(nCol));
++        break;
++      }
++
++      case PRE_HOOK: {
++        if( objc>4 ){
++          Tcl_WrongNumArgs(interp, 2, objv, "hook ?SCRIPT?");
++          return TCL_ERROR;
++        }
++        DbHookCmd(interp, pDb, (objc==4 ? objv[3] : 0), &pDb->pPreUpdateHook);
++        break;
++      }
++
++      case PRE_DEPTH: {
++        Tcl_Obj *pRet;
++        if( objc!=3 ){
++          Tcl_WrongNumArgs(interp, 3, objv, "");
++          return TCL_ERROR;
++        }
++        pRet = Tcl_NewIntObj(sqlite3_preupdate_depth(pDb->db));
++        Tcl_SetObjResult(interp, pRet);
++        break;
++      }
++
++      case PRE_NEW:
++      case PRE_OLD: {
++        int iIdx;
++        sqlite3_value *pValue;
++        if( objc!=4 ){
++          Tcl_WrongNumArgs(interp, 3, objv, "INDEX");
++          return TCL_ERROR;
++        }
++        if( Tcl_GetIntFromObj(interp, objv[3], &iIdx) ){
++          return TCL_ERROR;
++        }
++
++        if( iSub==PRE_OLD ){
++          rc = sqlite3_preupdate_old(pDb->db, iIdx, &pValue);
++        }else{
++          assert( iSub==PRE_NEW );
++          rc = sqlite3_preupdate_new(pDb->db, iIdx, &pValue);
++        }
++
++        if( rc==SQLITE_OK ){
++          Tcl_Obj *pObj;
++          pObj = Tcl_NewStringObj((char*)sqlite3_value_text(pValue), -1);
++          Tcl_SetObjResult(interp, pObj);
++        }else{
++          Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), (char*)0);
++          return TCL_ERROR;
++        }
++      }
++    }
++#endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
++    break;
++  }
++
++  /*
++  **    $db wal_hook ?script?
++  **    $db update_hook ?script?
++  **    $db rollback_hook ?script?
++  */
++  case DB_WAL_HOOK:
++  case DB_UPDATE_HOOK:
++  case DB_ROLLBACK_HOOK: {
++    /* set ppHook to point at pUpdateHook or pRollbackHook, depending on
++    ** whether [$db update_hook] or [$db rollback_hook] was invoked.
++    */
++    Tcl_Obj **ppHook = 0;
++    if( choice==DB_WAL_HOOK ) ppHook = &pDb->pWalHook;
++    if( choice==DB_UPDATE_HOOK ) ppHook = &pDb->pUpdateHook;
++    if( choice==DB_ROLLBACK_HOOK ) ppHook = &pDb->pRollbackHook;
++    if( objc>3 ){
++       Tcl_WrongNumArgs(interp, 2, objv, "?SCRIPT?");
++       return TCL_ERROR;
++    }
++
++    DbHookCmd(interp, pDb, (objc==3 ? objv[2] : 0), ppHook);
++    break;
++  }
++
++  /*    $db version
++  **
++  ** Return the version string for this database.
++  */
++  case DB_VERSION: {
++    int i;
++    for(i=2; ibLegacyPrepare) ){
++          return TCL_ERROR;
++        }
++      }else
++
++      /* $db version -last-stmt-ptr
++      **
++      ** Return a string which is a hex encoding of the pointer to the
++      ** most recent sqlite3_stmt in the statement cache.
++      */
++      if( strcmp(zArg, "-last-stmt-ptr")==0 ){
++        char zBuf[100];
++        sqlite3_snprintf(sizeof(zBuf), zBuf, "%p",
++                         pDb->stmtList ? pDb->stmtList->pStmt: 0);
++        Tcl_SetResult(interp, zBuf, TCL_VOLATILE);
++      }else
++#endif /* SQLITE_TEST */
++      {
++        Tcl_AppendResult(interp, "unknown argument: ", zArg, (char*)0);
++        return TCL_ERROR;
++      }
++    }
++    if( i==2 ){   
++      Tcl_SetResult(interp, (char *)sqlite3_libversion(), TCL_STATIC);
++    }
++    break;
++  }
++
++
++  } /* End of the SWITCH statement */
++  return rc;
++}
++
++#if SQLITE_TCL_NRE
++/*
++** Adaptor that provides an objCmd interface to the NRE-enabled
++** interface implementation.
++*/
++static int SQLITE_TCLAPI DbObjCmdAdaptor(
++  void *cd,
++  Tcl_Interp *interp,
++  int objc,
++  Tcl_Obj *const*objv
++){
++  return Tcl_NRCallObjProc(interp, DbObjCmd, cd, objc, objv);
++}
++#endif /* SQLITE_TCL_NRE */
++
++/*
++** Issue the usage message when the "sqlite3" command arguments are
++** incorrect.
++*/
++static int sqliteCmdUsage(
++  Tcl_Interp *interp,
++  Tcl_Obj *const*objv
++){
++  Tcl_WrongNumArgs(interp, 1, objv,
++    "HANDLE ?FILENAME? ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?"
++    " ?-nofollow BOOLEAN?"
++    " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
++  );
++  return TCL_ERROR;
++}
++
++/*
++**   sqlite3 DBNAME FILENAME ?-vfs VFSNAME? ?-key KEY? ?-readonly BOOLEAN?
++**                           ?-create BOOLEAN? ?-nomutex BOOLEAN?
++**                           ?-nofollow BOOLEAN?
++**
++** This is the main Tcl command.  When the "sqlite" Tcl command is
++** invoked, this routine runs to process that command.
++**
++** The first argument, DBNAME, is an arbitrary name for a new
++** database connection.  This command creates a new command named
++** DBNAME that is used to control that connection.  The database
++** connection is deleted when the DBNAME command is deleted.
++**
++** The second argument is the name of the database file.
++**
++*/
++static int SQLITE_TCLAPI DbMain(
++  void *cd,
++  Tcl_Interp *interp,
++  int objc,
++  Tcl_Obj *const*objv
++){
++  SqliteDb *p;
++  const char *zArg;
++  char *zErrMsg;
++  int i;
++  const char *zFile = 0;
++  const char *zVfs = 0;
++  int flags;
++  int bTranslateFileName = 1;
++  Tcl_DString translatedFilename;
++  int rc;
++
++  /* In normal use, each TCL interpreter runs in a single thread.  So
++  ** by default, we can turn off mutexing on SQLite database connections.
++  ** However, for testing purposes it is useful to have mutexes turned
++  ** on.  So, by default, mutexes default off.  But if compiled with
++  ** SQLITE_TCL_DEFAULT_FULLMUTEX then mutexes default on.
++  */
++#ifdef SQLITE_TCL_DEFAULT_FULLMUTEX
++  flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX;
++#else
++  flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX;
++#endif
++
++  if( objc==1 ) return sqliteCmdUsage(interp, objv);
++  if( objc==2 ){
++    zArg = Tcl_GetStringFromObj(objv[1], 0);
++    if( strcmp(zArg,"-version")==0 ){
++      Tcl_AppendResult(interp,sqlite3_libversion(), (char*)0);
++      return TCL_OK;
++    }
++    if( strcmp(zArg,"-sourceid")==0 ){
++      Tcl_AppendResult(interp,sqlite3_sourceid(), (char*)0);
++      return TCL_OK;
++    }
++    if( strcmp(zArg,"-has-codec")==0 ){
++      Tcl_AppendResult(interp,"0",(char*)0);
++      return TCL_OK;
++    }
++    if( zArg[0]=='-' ) return sqliteCmdUsage(interp, objv);
++  }
++  for(i=2; idb, flags, zVfs);
++  if( bTranslateFileName ){
++    Tcl_DStringFree(&translatedFilename);
++  }
++  if( p->db ){
++    if( SQLITE_OK!=sqlite3_errcode(p->db) ){
++      zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(p->db));
++      sqlite3_close(p->db);
++      p->db = 0;
++    }
++  }else{
++    zErrMsg = sqlite3_mprintf("%s", sqlite3_errstr(rc));
++  }
++  if( p->db==0 ){
++    Tcl_SetResult(interp, zErrMsg, TCL_VOLATILE);
++    Tcl_Free((char*)p);
++    sqlite3_free(zErrMsg);
++    return TCL_ERROR;
++  }
++  p->maxStmt = NUM_PREPARED_STMTS;
++  p->openFlags = flags & SQLITE_OPEN_URI;
++  p->interp = interp;
++  zArg = Tcl_GetStringFromObj(objv[1], 0);
++  if( DbUseNre() ){
++    Tcl_NRCreateCommand(interp, zArg, DbObjCmdAdaptor, DbObjCmd,
++                        (char*)p, DbDeleteCmd);
++  }else{
++    Tcl_CreateObjCommand(interp, zArg, DbObjCmd, (char*)p, DbDeleteCmd);
++  }
++  p->nRef = 1;
++  return TCL_OK;
++}
++
++/*
++** Provide a dummy Tcl_InitStubs if we are using this as a static
++** library.
++*/
++#ifndef USE_TCL_STUBS
++# undef  Tcl_InitStubs
++# define Tcl_InitStubs(a,b,c) TCL_VERSION
++#endif
++
++/*
++** Make sure we have a PACKAGE_VERSION macro defined.  This will be
++** defined automatically by the TEA makefile.  But other makefiles
++** do not define it.
++*/
++#ifndef PACKAGE_VERSION
++# define PACKAGE_VERSION SQLITE_VERSION
++#endif
++
++/*
++** Initialize this module.
++**
++** This Tcl module contains only a single new Tcl command named "sqlite".
++** (Hence there is no namespace.  There is no point in using a namespace
++** if the extension only supplies one new name!)  The "sqlite" command is
++** used to open a new SQLite database.  See the DbMain() routine above
++** for additional information.
++**
++** The EXTERN macros are required by TCL in order to work on windows.
++*/
++EXTERN int Sqlite3_Init(Tcl_Interp *interp){
++  int rc = Tcl_InitStubs(interp, "8.4", 0) ? TCL_OK : TCL_ERROR;
++  if( rc==TCL_OK ){
++    Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0);
++#ifndef SQLITE_3_SUFFIX_ONLY
++    /* The "sqlite" alias is undocumented.  It is here only to support
++    ** legacy scripts.  All new scripts should use only the "sqlite3"
++    ** command. */
++    Tcl_CreateObjCommand(interp, "sqlite", (Tcl_ObjCmdProc*)DbMain, 0, 0);
++#endif
++    rc = Tcl_PkgProvide(interp, "sqlite3", PACKAGE_VERSION);
++  }
++  return rc;
++}
++EXTERN int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++EXTERN int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++EXTERN int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++
++/* Because it accesses the file-system and uses persistent state, SQLite
++** is not considered appropriate for safe interpreters.  Hence, we cause
++** the _SafeInit() interfaces return TCL_ERROR.
++*/
++EXTERN int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_ERROR; }
++EXTERN int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){return TCL_ERROR;}
++
++
++
++#ifndef SQLITE_3_SUFFIX_ONLY
++int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++int Sqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Tclsqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++#endif
++
++/*
++** If the TCLSH macro is defined, add code to make a stand-alone program.
++*/
++#if defined(TCLSH)
++
++/* This is the main routine for an ordinary TCL shell.  If there are
++** are arguments, run the first argument as a script.  Otherwise,
++** read TCL commands from standard input
++*/
++static const char *tclsh_main_loop(void){
++  static const char zMainloop[] =
++    "if {[llength $argv]>=1} {\n"
++      "set argv0 [lindex $argv 0]\n"
++      "set argv [lrange $argv 1 end]\n"
++      "source $argv0\n"
++    "} else {\n"
++      "set line {}\n"
++      "while {![eof stdin]} {\n"
++        "if {$line!=\"\"} {\n"
++          "puts -nonewline \"> \"\n"
++        "} else {\n"
++          "puts -nonewline \"% \"\n"
++        "}\n"
++        "flush stdout\n"
++        "append line [gets stdin]\n"
++        "if {[info complete $line]} {\n"
++          "if {[catch {uplevel #0 $line} result]} {\n"
++            "puts stderr \"Error: $result\"\n"
++          "} elseif {$result!=\"\"} {\n"
++            "puts $result\n"
++          "}\n"
++          "set line {}\n"
++        "} else {\n"
++          "append line \\n\n"
++        "}\n"
++      "}\n"
++    "}\n"
++  ;
++  return zMainloop;
++}
++
++#ifndef TCLSH_MAIN
++# define TCLSH_MAIN main
++#endif
++int SQLITE_CDECL TCLSH_MAIN(int argc, char **argv){
++  Tcl_Interp *interp;
++  int i;
++  const char *zScript = 0;
++  char zArgc[32];
++#if defined(TCLSH_INIT_PROC)
++  extern const char *TCLSH_INIT_PROC(Tcl_Interp*);
++#endif
++
++#if !defined(_WIN32_WCE)
++  if( getenv("SQLITE_DEBUG_BREAK") ){
++    if( isatty(0) && isatty(2) ){
++      fprintf(stderr,
++          "attach debugger to process %d and press any key to continue.\n",
++          GETPID());
++      fgetc(stdin);
++    }else{
++#if defined(_WIN32) || defined(WIN32)
++      DebugBreak();
++#elif defined(SIGTRAP)
++      raise(SIGTRAP);
++#endif
++    }
++  }
++#endif
++
++  /* Call sqlite3_shutdown() once before doing anything else. This is to
++  ** test that sqlite3_shutdown() can be safely called by a process before
++  ** sqlite3_initialize() is. */
++  sqlite3_shutdown();
++
++  Tcl_FindExecutable(argv[0]);
++  Tcl_SetSystemEncoding(NULL, "utf-8");
++  interp = Tcl_CreateInterp();
++  Sqlite3_Init(interp);
++
++  sqlite3_snprintf(sizeof(zArgc), zArgc, "%d", argc-1);
++  Tcl_SetVar(interp,"argc", zArgc, TCL_GLOBAL_ONLY);
++  Tcl_SetVar(interp,"argv0",argv[0],TCL_GLOBAL_ONLY);
++  Tcl_SetVar(interp,"argv", "", TCL_GLOBAL_ONLY);
++  for(i=1; i [SQLITE_LOCK_PENDING], or
+ ** 
    4.  [SQLITE_LOCK_EXCLUSIVE].
+ ** 
+-** xLock() increases the lock. xUnlock() decreases the lock.
++** xLock() upgrades the database file lock.  In other words, xLock() moves the
++** database file lock in the direction NONE toward EXCLUSIVE. The argument to
++** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never
++** SQLITE_LOCK_NONE.  If the database file lock is already at or above the
++** requested lock, then the call to xLock() is a no-op.
++** xUnlock() downgrades the database file lock to either SHARED or NONE.
++*  If the lock is already at or below the requested lock state, then the call
++** to xUnlock() is a no-op.
+ ** The xCheckReservedLock() method checks whether any database connection,
+ ** either in this process or in some other process, is holding a RESERVED,
+ ** PENDING, or EXCLUSIVE lock on the file.  It returns true
+@@ -859,9 +918,8 @@ struct sqlite3_io_methods {
+ ** opcode causes the xFileControl method to write the current state of
+ ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
+ ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
+-** into an integer that the pArg argument points to. This capability
+-** is used during testing and is only available when the SQLITE_TEST
+-** compile-time option is used.
++** into an integer that the pArg argument points to.
++** This capability is only available if SQLite is compiled with [SQLITE_DEBUG].
+ **
+ ** 
    5. [[SQLITE_FCNTL_SIZE_HINT]]
+ ** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
+@@ -1165,7 +1223,6 @@ struct sqlite3_io_methods {
+ ** in wal mode after the client has finished copying pages from the wal
+ ** file to the database file, but before the *-shm file is updated to
+ ** record the fact that the pages have been checkpointed.
+-** 
+ **
+ ** 
    6. [[SQLITE_FCNTL_EXTERNAL_READER]]
+ ** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
+@@ -1178,10 +1235,16 @@ struct sqlite3_io_methods {
+ ** the database is not a wal-mode db, or if there is no such connection in any
+ ** other process. This opcode cannot be used to detect transactions opened
+ ** by clients within the current process, only within other processes.
+-** 
+ **
+ ** 
    7. [[SQLITE_FCNTL_CKSM_FILE]]
+-** Used by the cksmvfs VFS module only.
++** The [SQLITE_FCNTL_CKSM_FILE] opcode is for use internally by the
++** [checksum VFS shim] only.
++**
++** 
    8. [[SQLITE_FCNTL_RESET_CACHE]]
++** If there is currently no transaction open on the database, and the
++** database is not a temp db, then the [SQLITE_FCNTL_RESET_CACHE] file-control
++** purges the contents of the in-memory page cache. If there is an open
++** transaction, or if the db is a temp-db, this opcode is a no-op, not an error.
+ ** 
+ */
+ #define SQLITE_FCNTL_LOCKSTATE               1
+@@ -1224,6 +1287,7 @@ struct sqlite3_io_methods {
+ #define SQLITE_FCNTL_CKPT_START             39
+ #define SQLITE_FCNTL_EXTERNAL_READER        40
+ #define SQLITE_FCNTL_CKSM_FILE              41
++#define SQLITE_FCNTL_RESET_CACHE            42
+ 
+ /* deprecated names */
+ #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
+@@ -1253,6 +1317,26 @@ typedef struct sqlite3_mutex sqlite3_mutex;
+ */
+ typedef struct sqlite3_api_routines sqlite3_api_routines;
+ 
++/*
++** CAPI3REF: File Name
++**
++** Type [sqlite3_filename] is used by SQLite to pass filenames to the
++** xOpen method of a [VFS]. It may be cast to (const char*) and treated
++** as a normal, nul-terminated, UTF-8 buffer containing the filename, but
++** may also be passed to special APIs such as:
++**
++** 
        
++** 
      •   sqlite3_filename_database()
++** 
      •   sqlite3_filename_journal()
++** 
      •   sqlite3_filename_wal()
++** 
      •   sqlite3_uri_parameter()
++** 
      •   sqlite3_uri_boolean()
++** 
      •   sqlite3_uri_int64()
++** 
      •   sqlite3_uri_key()
++** 
      
++*/
++typedef const char *sqlite3_filename;
++
+ /*
+ ** CAPI3REF: OS Interface Object
+ **
+@@ -1431,7 +1515,7 @@ struct sqlite3_vfs {
+   sqlite3_vfs *pNext;      /* Next registered VFS */
+   const char *zName;       /* Name of this virtual file system */
+   void *pAppData;          /* Pointer to application-specific data */
+-  int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*,
++  int (*xOpen)(sqlite3_vfs*, sqlite3_filename zName, sqlite3_file*,
+                int flags, int *pOutFlags);
+   int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
+   int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
+@@ -1618,20 +1702,23 @@ SQLITE_API int sqlite3_os_end(void);
+ ** must ensure that no other SQLite interfaces are invoked by other
+ ** threads while sqlite3_config() is running.
+ **
+-** The sqlite3_config() interface
+-** may only be invoked prior to library initialization using
+-** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
+-** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
+-** [sqlite3_shutdown()] then it will return SQLITE_MISUSE.
+-** Note, however, that ^sqlite3_config() can be called as part of the
+-** implementation of an application-defined [sqlite3_os_init()].
+-**
+ ** The first argument to sqlite3_config() is an integer
+ ** [configuration option] that determines
+ ** what property of SQLite is to be configured.  Subsequent arguments
+ ** vary depending on the [configuration option]
+ ** in the first argument.
+ **
++** For most configuration options, the sqlite3_config() interface
++** may only be invoked prior to library initialization using
++** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
++** The exceptional configuration options that may be invoked at any time
++** are called "anytime configuration options".
++** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
++** [sqlite3_shutdown()] with a first argument that is not an anytime
++** configuration option, then the sqlite3_config() call will return SQLITE_MISUSE.
++** Note, however, that ^sqlite3_config() can be called as part of the
++** implementation of an application-defined [sqlite3_os_init()].
++**
+ ** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
+ ** ^If the option is unknown or SQLite is unable to set the option
+ ** then this routine returns a non-zero [error code].
+@@ -1739,6 +1826,23 @@ struct sqlite3_mem_methods {
+ ** These constants are the available integer configuration options that
+ ** can be passed as the first argument to the [sqlite3_config()] interface.
+ **
++** Most of the configuration options for sqlite3_config()
++** will only work if invoked prior to [sqlite3_initialize()] or after
++** [sqlite3_shutdown()].  The few exceptions to this rule are called
++** "anytime configuration options".
++** ^Calling [sqlite3_config()] with a first argument that is not an
++** anytime configuration option in between calls to [sqlite3_initialize()] and
++** [sqlite3_shutdown()] is a no-op that returns SQLITE_MISUSE.
++**
++** The set of anytime configuration options can change (by insertions
++** and/or deletions) from one release of SQLite to the next.
++** As of SQLite version 3.42.0, the complete set of anytime configuration
++** options is:
++** 
        
++** 
      •  SQLITE_CONFIG_LOG
++** 
      •  SQLITE_CONFIG_PCACHE_HDRSZ
++** 
      
++**
+ ** New configuration options may be added in future releases of SQLite.
+ ** Existing configuration options might be discontinued.  Applications
+ ** should check the return code from [sqlite3_config()] to make sure that
+@@ -2069,7 +2173,7 @@ struct sqlite3_mem_methods {
+ ** is stored in each sorted record and the required column values loaded
+ ** from the database as records are returned in sorted order. The default
+ ** value for this option is to never use this optimization. Specifying a
+-** negative value for this option restores the default behaviour.
++** negative value for this option restores the default behavior.
+ ** This option is only available if SQLite is compiled with the
+ ** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
+ **
+@@ -2085,28 +2189,28 @@ struct sqlite3_mem_methods {
+ ** compile-time option is not set, then the default maximum is 1073741824.
+ ** 
      9. 
+ */
+-#define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
+-#define SQLITE_CONFIG_MULTITHREAD   2  /* nil */
+-#define SQLITE_CONFIG_SERIALIZED    3  /* nil */
+-#define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
+-#define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
+-#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
+-#define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
+-#define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
+-#define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
+-#define SQLITE_CONFIG_MUTEX        10  /* sqlite3_mutex_methods* */
+-#define SQLITE_CONFIG_GETMUTEX     11  /* sqlite3_mutex_methods* */
+-/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */
+-#define SQLITE_CONFIG_LOOKASIDE    13  /* int int */
+-#define SQLITE_CONFIG_PCACHE       14  /* no-op */
+-#define SQLITE_CONFIG_GETPCACHE    15  /* no-op */
+-#define SQLITE_CONFIG_LOG          16  /* xFunc, void* */
+-#define SQLITE_CONFIG_URI          17  /* int */
+-#define SQLITE_CONFIG_PCACHE2      18  /* sqlite3_pcache_methods2* */
+-#define SQLITE_CONFIG_GETPCACHE2   19  /* sqlite3_pcache_methods2* */
++#define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
++#define SQLITE_CONFIG_MULTITHREAD          2  /* nil */
++#define SQLITE_CONFIG_SERIALIZED           3  /* nil */
++#define SQLITE_CONFIG_MALLOC               4  /* sqlite3_mem_methods* */
++#define SQLITE_CONFIG_GETMALLOC            5  /* sqlite3_mem_methods* */
++#define SQLITE_CONFIG_SCRATCH              6  /* No longer used */
++#define SQLITE_CONFIG_PAGECACHE            7  /* void*, int sz, int N */
++#define SQLITE_CONFIG_HEAP                 8  /* void*, int nByte, int min */
++#define SQLITE_CONFIG_MEMSTATUS            9  /* boolean */
++#define SQLITE_CONFIG_MUTEX               10  /* sqlite3_mutex_methods* */
++#define SQLITE_CONFIG_GETMUTEX            11  /* sqlite3_mutex_methods* */
++/* previously SQLITE_CONFIG_CHUNKALLOC    12 which is now unused. */
++#define SQLITE_CONFIG_LOOKASIDE           13  /* int int */
++#define SQLITE_CONFIG_PCACHE              14  /* no-op */
++#define SQLITE_CONFIG_GETPCACHE           15  /* no-op */
++#define SQLITE_CONFIG_LOG                 16  /* xFunc, void* */
++#define SQLITE_CONFIG_URI                 17  /* int */
++#define SQLITE_CONFIG_PCACHE2             18  /* sqlite3_pcache_methods2* */
++#define SQLITE_CONFIG_GETPCACHE2          19  /* sqlite3_pcache_methods2* */
+ #define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
+-#define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
+-#define SQLITE_CONFIG_MMAP_SIZE    22  /* sqlite3_int64, sqlite3_int64 */
++#define SQLITE_CONFIG_SQLLOG              21  /* xSqllog, void* */
++#define SQLITE_CONFIG_MMAP_SIZE           22  /* sqlite3_int64, sqlite3_int64 */
+ #define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
+ #define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
+ #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
+@@ -2147,7 +2251,7 @@ struct sqlite3_mem_methods {
+ ** configuration for a database connection can only be changed when that
+ ** connection is not currently using lookaside memory, or in other words
+ ** when the "current value" returned by
+-** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero.
++** [sqlite3_db_status](D,[SQLITE_DBSTATUS_LOOKASIDE_USED],...) is zero.
+ ** Any attempt to change the lookaside memory configuration when lookaside
+ ** memory is in use leaves the configuration unchanged and returns
+ ** [SQLITE_BUSY].)^
      
+@@ -2244,7 +2348,7 @@ struct sqlite3_mem_methods {
+ ** database handle, SQLite checks if this will mean that there are now no
+ ** connections at all to the database. If so, it performs a checkpoint
+ ** operation before closing the connection. This option may be used to
+-** override this behaviour. The first parameter passed to this operation
++** override this behavior. The first parameter passed to this operation
+ ** is an integer - positive to disable checkpoints-on-close, or zero (the
+ ** default) to enable them, and negative to leave the setting unchanged.
+ ** The second parameter is a pointer to an integer
+@@ -2297,8 +2401,12 @@ struct sqlite3_mem_methods {
+ ** 
    9.  sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
+ ** 
    
+ ** Because resetting a database is destructive and irreversible, the
+-** process requires the use of this obscure API and multiple steps to help
+-** ensure that it does not happen by accident.
++** process requires the use of this obscure API and multiple steps to
++** help ensure that it does not happen by accident. Because this
++** feature must be capable of resetting corrupt databases, and
++** shutting down virtual tables may require access to that corrupt
++** storage, the library must abandon any installed virtual tables
++** without calling their xDestroy() methods.
+ **
+ ** [[SQLITE_DBCONFIG_DEFENSIVE]] 
    SQLITE_DBCONFIG_DEFENSIVE
    
+ ** 
    The SQLITE_DBCONFIG_DEFENSIVE option activates or deactivates the
+@@ -2309,6 +2417,7 @@ struct sqlite3_mem_methods {
+ ** 
      
+ ** 
    •  The [PRAGMA writable_schema=ON] statement.
+ ** 
    •  The [PRAGMA journal_mode=OFF] statement.
++** 
    •  The [PRAGMA schema_version=N] statement.
+ ** 
    •  Writes to the [sqlite_dbpage] virtual table.
+ ** 
    •  Direct writes to [shadow tables].
+ ** 
    
+@@ -2336,7 +2445,7 @@ struct sqlite3_mem_methods {
+ ** 
    
+ **
+ ** [[SQLITE_DBCONFIG_DQS_DML]]
+-** 
    SQLITE_DBCONFIG_DQS_DML
++** 
    SQLITE_DBCONFIG_DQS_DML
    
+ ** 
    The SQLITE_DBCONFIG_DQS_DML option activates or deactivates
+ ** the legacy [double-quoted string literal] misfeature for DML statements
+ ** only, that is DELETE, INSERT, SELECT, and UPDATE statements. The
+@@ -2345,7 +2454,7 @@ struct sqlite3_mem_methods {
+ ** 
    
+ **
+ ** [[SQLITE_DBCONFIG_DQS_DDL]]
+-** 
    SQLITE_DBCONFIG_DQS_DDL
++** 
    SQLITE_DBCONFIG_DQS_DDL
    
+ ** 
    The SQLITE_DBCONFIG_DQS option activates or deactivates
+ ** the legacy [double-quoted string literal] misfeature for DDL statements,
+ ** such as CREATE TABLE and CREATE INDEX. The
+@@ -2354,7 +2463,7 @@ struct sqlite3_mem_methods {
+ ** 
    
+ **
+ ** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]]
+-** 
    SQLITE_DBCONFIG_TRUSTED_SCHEMA
++** 
    SQLITE_DBCONFIG_TRUSTED_SCHEMA
    
+ ** 
    The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to
+ ** assume that database schemas are untainted by malicious content.
+ ** When the SQLITE_DBCONFIG_TRUSTED_SCHEMA option is disabled, SQLite
+@@ -2374,7 +2483,7 @@ struct sqlite3_mem_methods {
+ ** 
    
+ **
+ ** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
+-** 
    SQLITE_DBCONFIG_LEGACY_FILE_FORMAT
++** 
    SQLITE_DBCONFIG_LEGACY_FILE_FORMAT
    
+ ** 
    The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
+ ** the legacy file format flag.  When activated, this flag causes all newly
+ ** created database file to have a schema format version number (the 4-byte
+@@ -2383,7 +2492,7 @@ struct sqlite3_mem_methods {
+ ** any SQLite version back to 3.0.0 ([dateof:3.0.0]).  Without this setting,
+ ** newly created databases are generally not understandable by SQLite versions
+ ** prior to 3.3.0 ([dateof:3.3.0]).  As these words are written, there
+-** is now scarcely any need to generated database files that are compatible
++** is now scarcely any need to generate database files that are compatible
+ ** all the way back to version 3.0.0, and so this setting is of little
+ ** practical use, but is provided so that SQLite can continue to claim the
+ ** ability to generate new database files that are compatible with  version
+@@ -2392,8 +2501,40 @@ struct sqlite3_mem_methods {
+ ** the [VACUUM] command will fail with an obscure error when attempting to
+ ** process a table with generated columns and a descending index.  This is
+ ** not considered a bug since SQLite versions 3.3.0 and earlier do not support
+-** either generated columns or decending indexes.
++** either generated columns or descending indexes.
+ ** 
    
++**
++** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]]
++** 
    SQLITE_DBCONFIG_STMT_SCANSTATUS
    
++** 
    The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in
++** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears
++** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
++** statistics. For statistics to be collected, the flag must be set on
++** the database handle both when the SQL statement is prepared and when it
++** is stepped. The flag is set (collection of statistics is enabled)
++** by default.  This option takes two arguments: an integer and a pointer to
++** an integer..  The first argument is 1, 0, or -1 to enable, disable, or
++** leave unchanged the statement scanstatus option.  If the second argument
++** is not NULL, then the value of the statement scanstatus setting after
++** processing the first argument is written into the integer that the second
++** argument points to.
++** 
    
++**
++** [[SQLITE_DBCONFIG_REVERSE_SCANORDER]]
++** 
    SQLITE_DBCONFIG_REVERSE_SCANORDER
    
++** 
    The SQLITE_DBCONFIG_REVERSE_SCANORDER option changes the default order
++** in which tables and indexes are scanned so that the scans start at the end
++** and work toward the beginning rather than starting at the beginning and
++** working toward the end. Setting SQLITE_DBCONFIG_REVERSE_SCANORDER is the
++** same as setting [PRAGMA reverse_unordered_selects].  This option takes
++** two arguments which are an integer and a pointer to an integer.  The first
++** argument is 1, 0, or -1 to enable, disable, or leave unchanged the
++** reverse scan order flag, respectively.  If the second argument is not NULL,
++** then 0 or 1 is written into the integer that the second argument points to
++** depending on if the reverse scan order flag is set after processing the
++** first argument.
++** 
    
++**
+ ** 
+ */
+ #define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
+@@ -2414,7 +2555,9 @@ struct sqlite3_mem_methods {
+ #define SQLITE_DBCONFIG_ENABLE_VIEW           1015 /* int int* */
+ #define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    1016 /* int int* */
+ #define SQLITE_DBCONFIG_TRUSTED_SCHEMA        1017 /* int int* */
+-#define SQLITE_DBCONFIG_MAX                   1017 /* Largest DBCONFIG */
++#define SQLITE_DBCONFIG_STMT_SCANSTATUS       1018 /* int int* */
++#define SQLITE_DBCONFIG_REVERSE_SCANORDER     1019 /* int int* */
++#define SQLITE_DBCONFIG_MAX                   1019 /* Largest DBCONFIG */
+ 
+ /*
+ ** CAPI3REF: Enable Or Disable Extended Result Codes
+@@ -2636,8 +2779,13 @@ SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*);
+ ** ^A call to sqlite3_interrupt(D) that occurs when there are no running
+ ** SQL statements is a no-op and has no effect on SQL statements
+ ** that are started after the sqlite3_interrupt() call returns.
++**
++** ^The [sqlite3_is_interrupted(D)] interface can be used to determine whether
++** or not an interrupt is currently in effect for [database connection] D.
++** It returns 1 if an interrupt is currently in effect, or 0 otherwise.
+ */
+ SQLITE_API void sqlite3_interrupt(sqlite3*);
++SQLITE_API int sqlite3_is_interrupted(sqlite3*);
+ 
+ /*
+ ** CAPI3REF: Determine If An SQL Statement Is Complete
+@@ -3255,8 +3403,8 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
+ ** 
    ^An SQLITE_TRACE_PROFILE callback provides approximately the same
+ ** information as is provided by the [sqlite3_profile()] callback.
+ ** ^The P argument is a pointer to the [prepared statement] and the
+-** X argument points to a 64-bit integer which is the estimated of
+-** the number of nanosecond that the prepared statement took to run.
++** X argument points to a 64-bit integer which is approximately
++** the number of nanoseconds that the prepared statement took to run.
+ ** ^The SQLITE_TRACE_PROFILE callback is invoked when the statement finishes.
+ **
+ ** [[SQLITE_TRACE_ROW]] 
    SQLITE_TRACE_ROW
    
+@@ -3288,8 +3436,10 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
+ ** M argument should be the bitwise OR-ed combination of
+ ** zero or more [SQLITE_TRACE] constants.
+ **
+-** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides
+-** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2().
++** ^Each call to either sqlite3_trace(D,X,P) or sqlite3_trace_v2(D,M,X,P)
++** overrides (cancels) all prior calls to sqlite3_trace(D,X,P) or
++** sqlite3_trace_v2(D,M,X,P) for the [database connection] D.  Each
++** database connection may have at most one trace callback.
+ **
+ ** ^The X callback is invoked whenever any of the events identified by
+ ** mask M occur.  ^The integer return value from the callback is currently
+@@ -3319,7 +3469,7 @@ SQLITE_API int sqlite3_trace_v2(
+ **
+ ** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
+ ** function X to be invoked periodically during long running calls to
+-** [sqlite3_exec()], [sqlite3_step()] and [sqlite3_get_table()] for
++** [sqlite3_step()] and [sqlite3_prepare()] and similar for
+ ** database connection D.  An example use for this
+ ** interface is to keep a GUI updated during a large query.
+ **
+@@ -3344,6 +3494,13 @@ SQLITE_API int sqlite3_trace_v2(
+ ** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+ ** database connections for the meaning of "modify" in this paragraph.
+ **
++** The progress handler callback would originally only be invoked from the
++** bytecode engine.  It still might be invoked during [sqlite3_prepare()]
++** and similar because those routines might force a reparse of the schema
++** which involves running the bytecode engine.  However, beginning with
++** SQLite version 3.41.0, the progress handler callback might also be
++** invoked directly from [sqlite3_prepare()] while analyzing and generating
++** code for complex queries.
+ */
+ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+ 
+@@ -3380,13 +3537,18 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+ **
+ ** 
    
+ ** ^(
    [SQLITE_OPEN_READONLY]
    
+-** 
    The database is opened in read-only mode.  If the database does not
+-** already exist, an error is returned.
    )^
++** 
    The database is opened in read-only mode.  If the database does
++** not already exist, an error is returned.
    )^
+ **
+ ** ^(
    [SQLITE_OPEN_READWRITE]
    
+-** 
    The database is opened for reading and writing if possible, or reading
+-** only if the file is write protected by the operating system.  In either
+-** case the database must already exist, otherwise an error is returned.
    )^
++** 
    The database is opened for reading and writing if possible, or
++** reading only if the file is write protected by the operating
++** system.  In either case the database must already exist, otherwise
++** an error is returned.  For historical reasons, if opening in
++** read-write mode fails due to OS-level permissions, an attempt is
++** made to open it in read-only mode. [sqlite3_db_readonly()] can be
++** used to determine whether the database is actually
++** read-write.
    )^
+ **
+ ** ^(
    [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]
    
+ ** 
    The database is opened for reading and writing, and is created if
+@@ -3424,6 +3586,9 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+ ** 
    The database is opened [shared cache] enabled, overriding
+ ** the default shared cache setting provided by
+ ** [sqlite3_enable_shared_cache()].)^
++** The [use of shared cache mode is discouraged] and hence shared cache
++** capabilities may be omitted from many builds of SQLite.  In such cases,
++** this option is a no-op.
+ **
+ ** ^(
    [SQLITE_OPEN_PRIVATECACHE]
    
+ ** 
    The database is opened [shared cache] disabled, overriding
+@@ -3439,7 +3604,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+ ** to return an extended result code.
    
+ **
+ ** [[OPEN_NOFOLLOW]] ^(
    [SQLITE_OPEN_NOFOLLOW]
    
+-** 
    The database filename is not allowed to be a symbolic link
    
++** 
    The database filename is not allowed to contain a symbolic link
    
+ ** 
    )^
+ **
+ ** If the 3rd parameter to sqlite3_open_v2() is not one of the
+@@ -3643,7 +3808,7 @@ SQLITE_API int sqlite3_open_v2(
+ ** as F) must be one of:
+ ** 
      
+ ** 
    •  A database filename pointer created by the SQLite core and
+-** passed into the xOpen() method of a VFS implemention, or
++** passed into the xOpen() method of a VFS implementation, or
+ ** 
    •  A filename obtained from [sqlite3_db_filename()], or
+ ** 
    •  A new filename constructed using [sqlite3_create_filename()].
+ ** 
    
+@@ -3698,10 +3863,10 @@ SQLITE_API int sqlite3_open_v2(
+ **
+ ** See the [URI filename] documentation for additional information.
+ */
+-SQLITE_API const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam);
+-SQLITE_API int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
+-SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
+-SQLITE_API const char *sqlite3_uri_key(const char *zFilename, int N);
++SQLITE_API const char *sqlite3_uri_parameter(sqlite3_filename z, const char *zParam);
++SQLITE_API int sqlite3_uri_boolean(sqlite3_filename z, const char *zParam, int bDefault);
++SQLITE_API sqlite3_int64 sqlite3_uri_int64(sqlite3_filename, const char*, sqlite3_int64);
++SQLITE_API const char *sqlite3_uri_key(sqlite3_filename z, int N);
+ 
+ /*
+ ** CAPI3REF:  Translate filenames
+@@ -3730,9 +3895,9 @@ SQLITE_API const char *sqlite3_uri_key(const char *zFilename, int N);
+ ** return value from [sqlite3_db_filename()], then the result is
+ ** undefined and is likely a memory access violation.
+ */
+-SQLITE_API const char *sqlite3_filename_database(const char*);
+-SQLITE_API const char *sqlite3_filename_journal(const char*);
+-SQLITE_API const char *sqlite3_filename_wal(const char*);
++SQLITE_API const char *sqlite3_filename_database(sqlite3_filename);
++SQLITE_API const char *sqlite3_filename_journal(sqlite3_filename);
++SQLITE_API const char *sqlite3_filename_wal(sqlite3_filename);
+ 
+ /*
+ ** CAPI3REF:  Database File Corresponding To A Journal
+@@ -3756,7 +3921,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
+ /*
+ ** CAPI3REF: Create and Destroy VFS Filenames
+ **
+-** These interfces are provided for use by [VFS shim] implementations and
++** These interfaces are provided for use by [VFS shim] implementations and
+ ** are not useful outside of that context.
+ **
+ ** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
+@@ -3798,14 +3963,14 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
+ ** then the corresponding [sqlite3_module.xClose() method should also be
+ ** invoked prior to calling sqlite3_free_filename(Y).
+ */
+-SQLITE_API char *sqlite3_create_filename(
++SQLITE_API sqlite3_filename sqlite3_create_filename(
+   const char *zDatabase,
+   const char *zJournal,
+   const char *zWal,
+   int nParam,
+   const char **azParam
+ );
+-SQLITE_API void sqlite3_free_filename(char*);
++SQLITE_API void sqlite3_free_filename(sqlite3_filename);
+ 
+ /*
+ ** CAPI3REF: Error Codes And Messages
+@@ -3835,14 +4000,17 @@ SQLITE_API void sqlite3_free_filename(char*);
+ ** 
+ **
+ ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
+-** text that describes the error, as either UTF-8 or UTF-16 respectively.
++** text that describes the error, as either UTF-8 or UTF-16 respectively,
++** or NULL if no error message is available.
++** (See how SQLite handles [invalid UTF] for exceptions to this rule.)
+ ** ^(Memory to hold the error message string is managed internally.
+ ** The application does not need to worry about freeing the result.
+ ** However, the error string might be overwritten or deallocated by
+ ** subsequent calls to other SQLite interface functions.)^
+ **
+-** ^The sqlite3_errstr() interface returns the English-language text
+-** that describes the [result code], as UTF-8.
++** ^The sqlite3_errstr(E) interface returns the English-language text
++** that describes the [result code] E, as UTF-8, or NULL if E is not an
++** result code for which a text error message is available.
+ ** ^(Memory to hold the error message string is managed internally
+ ** and must not be freed by the application)^.
+ **
+@@ -4303,6 +4471,41 @@ SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
+ */
+ SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);
+ 
++/*
++** CAPI3REF: Change The EXPLAIN Setting For A Prepared Statement
++** METHOD: sqlite3_stmt
++**
++** The sqlite3_stmt_explain(S,E) interface changes the EXPLAIN
++** setting for [prepared statement] S.  If E is zero, then S becomes
++** a normal prepared statement.  If E is 1, then S behaves as if
++** its SQL text began with "[EXPLAIN]".  If E is 2, then S behaves as if
++** its SQL text began with "[EXPLAIN QUERY PLAN]".
++**
++** Calling sqlite3_stmt_explain(S,E) might cause S to be reprepared.
++** SQLite tries to avoid a reprepare, but a reprepare might be necessary
++** on the first transition into EXPLAIN or EXPLAIN QUERY PLAN mode.
++**
++** Because of the potential need to reprepare, a call to
++** sqlite3_stmt_explain(S,E) will fail with SQLITE_ERROR if S cannot be
++** reprepared because it was created using [sqlite3_prepare()] instead of
++** the newer [sqlite3_prepare_v2()] or [sqlite3_prepare_v3()] interfaces and
++** hence has no saved SQL text with which to reprepare.
++**
++** Changing the explain setting for a prepared statement does not change
++** the original SQL text for the statement.  Hence, if the SQL text originally
++** began with EXPLAIN or EXPLAIN QUERY PLAN, but sqlite3_stmt_explain(S,0)
++** is called to convert the statement into an ordinary statement, the EXPLAIN
++** or EXPLAIN QUERY PLAN keywords will still appear in the sqlite3_sql(S)
++** output, even though the statement now acts like a normal SQL statement.
++**
++** This routine returns SQLITE_OK if the explain mode is successfully
++** changed, or an error code if the explain mode could not be changed.
++** The explain mode cannot be changed while a statement is active.
++** Hence, it is good practice to call [sqlite3_reset(S)]
++** immediately prior to calling sqlite3_stmt_explain(S,E).
++*/
++SQLITE_API int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode);
++
+ /*
+ ** CAPI3REF: Determine If A Prepared Statement Has Been Reset
+ ** METHOD: sqlite3_stmt
+@@ -4466,7 +4669,7 @@ typedef struct sqlite3_context sqlite3_context;
+ ** with it may be passed. ^It is called to dispose of the BLOB or string even
+ ** if the call to the bind API fails, except the destructor is not called if
+ ** the third parameter is a NULL pointer or the fourth parameter is negative.
+-** ^ (2) The special constant, [SQLITE_STATIC], may be passsed to indicate that
++** ^ (2) The special constant, [SQLITE_STATIC], may be passed to indicate that
+ ** the application remains responsible for disposing of the object. ^In this
+ ** case, the object and the provided pointer to it must remain valid until
+ ** either the prepared statement is finalized or the same SQL parameter is
+@@ -5145,20 +5348,33 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt);
+ ** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
+ ** back to the beginning of its program.
+ **
+-** ^If the most recent call to [sqlite3_step(S)] for the
+-** [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE],
+-** or if [sqlite3_step(S)] has never before been called on S,
+-** then [sqlite3_reset(S)] returns [SQLITE_OK].
++** ^The return code from [sqlite3_reset(S)] indicates whether or not
++** the previous evaluation of prepared statement S completed successfully.
++** ^If [sqlite3_step(S)] has never before been called on S or if
++** [sqlite3_step(S)] has not been called since the previous call
++** to [sqlite3_reset(S)], then [sqlite3_reset(S)] will return
++** [SQLITE_OK].
+ **
+ ** ^If the most recent call to [sqlite3_step(S)] for the
+ ** [prepared statement] S indicated an error, then
+ ** [sqlite3_reset(S)] returns an appropriate [error code].
++** ^The [sqlite3_reset(S)] interface might also return an [error code]
++** if there were no prior errors but the process of resetting
++** the prepared statement caused a new error. ^For example, if an
++** [INSERT] statement with a [RETURNING] clause is only stepped one time,
++** that one call to [sqlite3_step(S)] might return SQLITE_ROW but
++** the overall statement might still fail and the [sqlite3_reset(S)] call
++** might return SQLITE_BUSY if locking constraints prevent the
++** database change from committing.  Therefore, it is important that
++** applications check the return code from [sqlite3_reset(S)] even if
++** no prior call to [sqlite3_step(S)] indicated a problem.
+ **
+ ** ^The [sqlite3_reset(S)] interface does not change the values
+ ** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
+ */
+ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
+ 
++
+ /*
+ ** CAPI3REF: Create Or Redefine SQL Functions
+ ** KEYWORDS: {function creation routines}
+@@ -5364,10 +5580,21 @@ SQLITE_API int sqlite3_create_window_function(
+ ** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in
+ ** schema structures such as [CHECK constraints], [DEFAULT clauses],
+ ** [expression indexes], [partial indexes], or [generated columns].
+-** The SQLITE_DIRECTONLY flags is a security feature which is recommended
+-** for all [application-defined SQL functions], and especially for functions
+-** that have side-effects or that could potentially leak sensitive
+-** information.
++** 
    
++** The SQLITE_DIRECTONLY flag is recommended for any
++** [application-defined SQL function]
++** that has side-effects or that could potentially leak sensitive information.
++** This will prevent attacks in which an application is tricked
++** into using a database file that has had its schema surreptitiously
++** modified to invoke the application-defined function in ways that are
++** harmful.
++** 
    
++** Some people say it is good practice to set SQLITE_DIRECTONLY on all
++** [application-defined SQL functions], regardless of whether or not they
++** are security sensitive, as doing so prevents those functions from being used
++** inside of the database schema, and thus ensures that the database
++** can be inspected and modified using generic tools (such as the [CLI])
++** that do not have access to the application-defined functions.
+ ** 
+ **
+ ** [[SQLITE_INNOCUOUS]] 
    SQLITE_INNOCUOUS
    
+@@ -5394,13 +5621,27 @@ SQLITE_API int sqlite3_create_window_function(
+ ** 
    
+ **
+ ** [[SQLITE_SUBTYPE]] 
    SQLITE_SUBTYPE
    
+-** The SQLITE_SUBTYPE flag indicates to SQLite that a function may call
++** The SQLITE_SUBTYPE flag indicates to SQLite that a function might call
+ ** [sqlite3_value_subtype()] to inspect the sub-types of its arguments.
+-** Specifying this flag makes no difference for scalar or aggregate user
+-** functions. However, if it is not specified for a user-defined window
+-** function, then any sub-types belonging to arguments passed to the window
+-** function may be discarded before the window function is called (i.e.
+-** sqlite3_value_subtype() will always return 0).
++** This flag instructs SQLite to omit some corner-case optimizations that
++** might disrupt the operation of the [sqlite3_value_subtype()] function,
++** causing it to return zero rather than the correct subtype().
++** SQL functions that invokes [sqlite3_value_subtype()] should have this
++** property.  If the SQLITE_SUBTYPE property is omitted, then the return
++** value from [sqlite3_value_subtype()] might sometimes be zero even though
++** a non-zero subtype was specified by the function argument expression.
++**
++** [[SQLITE_RESULT_SUBTYPE]] 
    SQLITE_RESULT_SUBTYPE
    
++** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
++** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
++** result.
++** Every function that invokes [sqlite3_result_subtype()] should have this
++** property.  If it does not, then the call to [sqlite3_result_subtype()]
++** might become a no-op if the function is used as term in an
++** [expression index].  On the other hand, SQL functions that never invoke
++** [sqlite3_result_subtype()] should avoid setting this property, as the
++** purpose of this property is to disable certain optimizations that are
++** incompatible with subtypes.
+ ** 
    
+ ** 
+ */
+@@ -5408,6 +5649,7 @@ SQLITE_API int sqlite3_create_window_function(
+ #define SQLITE_DIRECTONLY       0x000080000
+ #define SQLITE_SUBTYPE          0x000100000
+ #define SQLITE_INNOCUOUS        0x000200000
++#define SQLITE_RESULT_SUBTYPE   0x001000000
+ 
+ /*
+ ** CAPI3REF: Deprecated Functions
+@@ -5573,6 +5815,28 @@ SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
+ SQLITE_API int sqlite3_value_nochange(sqlite3_value*);
+ SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
+ 
++/*
++** CAPI3REF: Report the internal text encoding state of an sqlite3_value object
++** METHOD: sqlite3_value
++**
++** ^(The sqlite3_value_encoding(X) interface returns one of [SQLITE_UTF8],
++** [SQLITE_UTF16BE], or [SQLITE_UTF16LE] according to the current text encoding
++** of the value X, assuming that X has type TEXT.)^  If sqlite3_value_type(X)
++** returns something other than SQLITE_TEXT, then the return value from
++** sqlite3_value_encoding(X) is meaningless.  ^Calls to
++** [sqlite3_value_text(X)], [sqlite3_value_text16(X)], [sqlite3_value_text16be(X)],
++** [sqlite3_value_text16le(X)], [sqlite3_value_bytes(X)], or
++** [sqlite3_value_bytes16(X)] might change the encoding of the value X and
++** thus change the return from subsequent calls to sqlite3_value_encoding(X).
++**
++** This routine is intended for used by applications that test and validate
++** the SQLite implementation.  This routine is inquiring about the opaque
++** internal state of an [sqlite3_value] object.  Ordinary applications should
++** not need to know what the internal state of an sqlite3_value object is and
++** hence should not need to use this interface.
++*/
++SQLITE_API int sqlite3_value_encoding(sqlite3_value*);
++
+ /*
+ ** CAPI3REF: Finding The Subtype Of SQL Values
+ ** METHOD: sqlite3_value
+@@ -5582,6 +5846,12 @@ SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
+ ** information can be used to pass a limited amount of context from
+ ** one SQL function to another.  Use the [sqlite3_result_subtype()]
+ ** routine to set the subtype for the return value of an SQL function.
++**
++** Every [application-defined SQL function] that invoke this interface
++** should include the [SQLITE_SUBTYPE] property in the text
++** encoding argument when the function is [sqlite3_create_function|registered].
++** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype()
++** might return zero instead of the upstream subtype in some corner cases.
+ */
+ SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*);
+ 
+@@ -5625,7 +5895,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);
+ **
+ ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
+ ** when first called if N is less than or equal to zero or if a memory
+-** allocate error occurs.
++** allocation error occurs.
+ **
+ ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
+ ** determined by the N parameter on first successful call.  Changing the
+@@ -5680,48 +5950,56 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
+ ** METHOD: sqlite3_context
+ **
+ ** These functions may be used by (non-aggregate) SQL functions to
+-** associate metadata with argument values. If the same value is passed to
+-** multiple invocations of the same SQL function during query execution, under
+-** some circumstances the associated metadata may be preserved.  An example
+-** of where this might be useful is in a regular-expression matching
+-** function. The compiled version of the regular expression can be stored as
+-** metadata associated with the pattern string.
++** associate auxiliary data with argument values. If the same argument
++** value is passed to multiple invocations of the same SQL function during
++** query execution, under some circumstances the associated auxiliary data
++** might be preserved.  An example of where this might be useful is in a
++** regular-expression matching function. The compiled version of the regular
++** expression can be stored as auxiliary data associated with the pattern string.
+ ** Then as long as the pattern string remains the same,
+ ** the compiled regular expression can be reused on multiple
+ ** invocations of the same function.
+ **
+-** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata
++** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data
+ ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
+ ** value to the application-defined function.  ^N is zero for the left-most
+-** function argument.  ^If there is no metadata
++** function argument.  ^If there is no auxiliary data
+ ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
+ ** returns a NULL pointer.
+ **
+-** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
+-** argument of the application-defined function.  ^Subsequent
++** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the
++** N-th argument of the application-defined function.  ^Subsequent
+ ** calls to sqlite3_get_auxdata(C,N) return P from the most recent
+-** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
+-** NULL if the metadata has been discarded.
++** sqlite3_set_auxdata(C,N,P,X) call if the auxiliary data is still valid or
++** NULL if the auxiliary data has been discarded.
+ ** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
+ ** SQLite will invoke the destructor function X with parameter P exactly
+-** once, when the metadata is discarded.
+-** SQLite is free to discard the metadata at any time, including: 
      
++** once, when the auxiliary data is discarded.
++** SQLite is free to discard the auxiliary data at any time, including: 
        
+ ** 
      •  ^(when the corresponding function parameter changes)^, or
+ ** 
      •  ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+ **      SQL statement)^, or
+ ** 
      •  ^(when sqlite3_set_auxdata() is invoked again on the same
+ **       parameter)^, or
+ ** 
      •  ^(during the original sqlite3_set_auxdata() call when a memory
+-**      allocation error occurs.)^ 
      
++**      allocation error occurs.)^
++** 
    •  ^(during the original sqlite3_set_auxdata() call if the function
++**      is evaluated during query planning instead of during query execution,
++**      as sometimes happens with [SQLITE_ENABLE_STAT4].)^ 
    
+ **
+-** Note the last bullet in particular.  The destructor X in
++** Note the last two bullets in particular.  The destructor X in
+ ** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
+ ** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
+ ** should be called near the end of the function implementation and the
+ ** function implementation should not make any use of P after
+-** sqlite3_set_auxdata() has been called.
+-**
+-** ^(In practice, metadata is preserved between function calls for
++** sqlite3_set_auxdata() has been called.  Furthermore, a call to
++** sqlite3_get_auxdata() that occurs immediately after a corresponding call
++** to sqlite3_set_auxdata() might still return NULL if an out-of-memory
++** condition occurred during the sqlite3_set_auxdata() call or if the
++** function is being evaluated during query planning rather than during
++** query execution.
++**
++** ^(In practice, auxiliary data is preserved between function calls for
+ ** function parameters that are compile-time constants, including literal
+ ** values and [parameters] and expressions composed from the same.)^
+ **
+@@ -5731,10 +6009,67 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
+ **
+ ** These routines must be called from the same thread in which
+ ** the SQL function is running.
++**
++** See also: [sqlite3_get_clientdata()] and [sqlite3_set_clientdata()].
+ */
+ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context*, int N);
+ SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
+ 
++/*
++** CAPI3REF: Database Connection Client Data
++** METHOD: sqlite3
++**
++** These functions are used to associate one or more named pointers
++** with a [database connection].
++** A call to sqlite3_set_clientdata(D,N,P,X) causes the pointer P
++** to be attached to [database connection] D using name N.  Subsequent
++** calls to sqlite3_get_clientdata(D,N) will return a copy of pointer P
++** or a NULL pointer if there were no prior calls to
++** sqlite3_set_clientdata() with the same values of D and N.
++** Names are compared using strcmp() and are thus case sensitive.
++**
++** If P and X are both non-NULL, then the destructor X is invoked with
++** argument P on the first of the following occurrences:
++** 
      
++** 
    •  An out-of-memory error occurs during the call to
++**      sqlite3_set_clientdata() which attempts to register pointer P.
++** 
    •  A subsequent call to sqlite3_set_clientdata(D,N,P,X) is made
++**      with the same D and N parameters.
++** 
    •  The database connection closes.  SQLite does not make any guarantees
++**      about the order in which destructors are called, only that all
++**      destructors will be called exactly once at some point during the
++**      database connection closing process.
++** 
    
++**
++** SQLite does not do anything with client data other than invoke
++** destructors on the client data at the appropriate time.  The intended
++** use for client data is to provide a mechanism for wrapper libraries
++** to store additional information about an SQLite database connection.
++**
++** There is no limit (other than available memory) on the number of different
++** client data pointers (with different names) that can be attached to a
++** single database connection.  However, the implementation is optimized
++** for the case of having only one or two different client data names.
++** Applications and wrapper libraries are discouraged from using more than
++** one client data name each.
++**
++** There is no way to enumerate the client data pointers
++** associated with a database connection.  The N parameter can be thought
++** of as a secret key such that only code that knows the secret key is able
++** to access the associated data.
++**
++** Security Warning:  These interfaces should not be exposed in scripting
++** languages or in other circumstances where it might be possible for an
++** an attacker to invoke them.  Any agent that can invoke these interfaces
++** can probably also take control of the process.
++**
++** Database connection client data is only available for SQLite
++** version 3.44.0 ([dateof:3.44.0]) and later.
++**
++** See also: [sqlite3_set_auxdata()] and [sqlite3_get_auxdata()].
++*/
++SQLITE_API void *sqlite3_get_clientdata(sqlite3*,const char*);
++SQLITE_API int sqlite3_set_clientdata(sqlite3*, const char*, void*, void(*)(void*));
+ 
+ /*
+ ** CAPI3REF: Constants Defining Special Destructor Behavior
+@@ -5830,9 +6165,10 @@ typedef void (*sqlite3_destructor_type)(void*);
+ ** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
+ ** ^SQLite takes the text result from the application from
+ ** the 2nd parameter of the sqlite3_result_text* interfaces.
+-** ^If the 3rd parameter to the sqlite3_result_text* interfaces
+-** is negative, then SQLite takes result text from the 2nd parameter
+-** through the first zero character.
++** ^If the 3rd parameter to any of the sqlite3_result_text* interfaces
++** other than sqlite3_result_text64() is negative, then SQLite computes
++** the string length itself by searching the 2nd parameter for the first
++** zero character.
+ ** ^If the 3rd parameter to the sqlite3_result_text* interfaces
+ ** is non-negative, then as many bytes (not characters) of the text
+ ** pointed to by the 2nd parameter are taken as the application-defined
+@@ -5935,6 +6271,20 @@ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
+ ** higher order bits are discarded.
+ ** The number of subtype bytes preserved by SQLite might increase
+ ** in future releases of SQLite.
++**
++** Every [application-defined SQL function] that invokes this interface
++** should include the [SQLITE_RESULT_SUBTYPE] property in its
++** text encoding argument when the SQL function is
++** [sqlite3_create_function|registered].  If the [SQLITE_RESULT_SUBTYPE]
++** property is omitted from the function that invokes sqlite3_result_subtype(),
++** then in some cases the sqlite3_result_subtype() might fail to set
++** the result subtype.
++**
++** If SQLite is compiled with -DSQLITE_STRICT_SUBTYPE=1, then any
++** SQL function that invokes the sqlite3_result_subtype() interface
++** and that does not have the SQLITE_RESULT_SUBTYPE property will raise
++** an error.  Future versions of SQLite might enable -DSQLITE_STRICT_SUBTYPE=1
++** by default.
+ */
+ SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
+ 
+@@ -6106,6 +6456,13 @@ SQLITE_API void sqlite3_activate_cerod(
+ ** of the default VFS is not implemented correctly, or not implemented at
+ ** all, then the behavior of sqlite3_sleep() may deviate from the description
+ ** in the previous paragraphs.
++**
++** If a negative argument is passed to sqlite3_sleep() the results vary by
++** VFS and operating system.  Some system treat a negative argument as an
++** instruction to sleep forever.  Others understand it to mean do not sleep
++** at all. ^In SQLite version 3.42.0 and later, a negative
++** argument passed into sqlite3_sleep() is changed to zero before it is relayed
++** down into the xSleep method of the VFS.
+ */
+ SQLITE_API int sqlite3_sleep(int);
+ 
+@@ -6328,7 +6685,7 @@ SQLITE_API const char *sqlite3_db_name(sqlite3 *db, int N);
+ ** 
  •  [sqlite3_filename_wal()]
+ ** 
+ */
+-SQLITE_API const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName);
++SQLITE_API sqlite3_filename sqlite3_db_filename(sqlite3 *db, const char *zDbName);
+ 
+ /*
+ ** CAPI3REF: Determine if a database is read-only
+@@ -6359,7 +6716,7 @@ SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
+ SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema);
+ 
+ /*
+-** CAPI3REF: Allowed return values from [sqlite3_txn_state()]
++** CAPI3REF: Allowed return values from sqlite3_txn_state()
+ ** KEYWORDS: {transaction state}
+ **
+ ** These constants define the current transaction state of a database file.
+@@ -6465,7 +6822,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
+ ** function C that is invoked prior to each autovacuum of the database
+ ** file.  ^The callback is passed a copy of the generic data pointer (P),
+ ** the schema-name of the attached database that is being autovacuumed,
+-** the the size of the database file in pages, the number of free pages,
++** the size of the database file in pages, the number of free pages,
+ ** and the number of bytes per page, respectively.  The callback should
+ ** return the number of free pages that should be removed by the
+ ** autovacuum.  ^If the callback returns zero, then no autovacuum happens.
+@@ -6491,7 +6848,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
+ ** ^Each call to the sqlite3_autovacuum_pages() interface overrides all
+ ** previous invocations for that database connection.  ^If the callback
+ ** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer,
+-** then the autovacuum steps callback is cancelled.  The return value
++** then the autovacuum steps callback is canceled.  The return value
+ ** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might
+ ** be some other error code if something goes wrong.  The current
+ ** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other
+@@ -6586,6 +6943,11 @@ SQLITE_API void *sqlite3_update_hook(
+ ** to the same database. Sharing is enabled if the argument is true
+ ** and disabled if the argument is false.)^
+ **
++** This interface is omitted if SQLite is compiled with
++** [-DSQLITE_OMIT_SHARED_CACHE].  The [-DSQLITE_OMIT_SHARED_CACHE]
++** compile-time option is recommended because the
++** [use of shared cache mode is discouraged].
++**
+ ** ^Cache sharing is enabled and disabled for an entire process.
+ ** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
+ ** In prior versions of SQLite,
+@@ -6684,7 +7046,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*);
+ ** ^The soft heap limit may not be greater than the hard heap limit.
+ ** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N)
+ ** is invoked with a value of N that is greater than the hard heap limit,
+-** the the soft heap limit is set to the value of the hard heap limit.
++** the soft heap limit is set to the value of the hard heap limit.
+ ** ^The soft heap limit is automatically enabled whenever the hard heap
+ ** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and
+ ** the soft heap limit is outside the range of 1..N, then the soft heap
+@@ -6945,15 +7307,6 @@ SQLITE_API int sqlite3_cancel_auto_extension(void(*xEntryPoint)(void));
+ */
+ SQLITE_API void sqlite3_reset_auto_extension(void);
+ 
+-/*
+-** The interface to the virtual-table mechanism is currently considered
+-** to be experimental.  The interface might change in incompatible ways.
+-** If this is a problem for you, do not use the interface at this time.
+-**
+-** When the virtual-table mechanism stabilizes, we will declare the
+-** interface fixed, support it indefinitely, and remove this comment.
+-*/
+-
+ /*
+ ** Structures used by the virtual table interface
+ */
+@@ -7014,6 +7367,10 @@ struct sqlite3_module {
+   /* The methods above are in versions 1 and 2 of the sqlite_module object.
+   ** Those below are for version 3 and greater. */
+   int (*xShadowName)(const char*);
++  /* The methods above are in versions 1 through 3 of the sqlite_module object.
++  ** Those below are for version 4 and greater. */
++  int (*xIntegrity)(sqlite3_vtab *pVTab, const char *zSchema,
++                    const char *zTabName, int mFlags, char **pzErr);
+ };
+ 
+ /*
+@@ -7072,10 +7429,10 @@ struct sqlite3_module {
+ ** when the omit flag is true there is no guarantee that the constraint will
+ ** not be checked again using byte code.)^
+ **
+-** ^The idxNum and idxPtr values are recorded and passed into the
++** ^The idxNum and idxStr values are recorded and passed into the
+ ** [xFilter] method.
+-** ^[sqlite3_free()] is used to free idxPtr if and only if
+-** needToFreeIdxPtr is true.
++** ^[sqlite3_free()] is used to free idxStr if and only if
++** needToFreeIdxStr is true.
+ **
+ ** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
+ ** the correct order to satisfy the ORDER BY clause so that no separate
+@@ -7195,7 +7552,7 @@ struct sqlite3_index_info {
+ ** the [sqlite3_vtab_collation()] interface.  For most real-world virtual
+ ** tables, the collating sequence of constraints does not matter (for example
+ ** because the constraints are numeric) and so the sqlite3_vtab_collation()
+-** interface is no commonly needed.
++** interface is not commonly needed.
+ */
+ #define SQLITE_INDEX_CONSTRAINT_EQ          2
+ #define SQLITE_INDEX_CONSTRAINT_GT          4
+@@ -7354,16 +7711,6 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);
+ */
+ SQLITE_API int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
+ 
+-/*
+-** The interface to the virtual-table mechanism defined above (back up
+-** to a comment remarkably similar to this one) is currently considered
+-** to be experimental.  The interface might change in incompatible ways.
+-** If this is a problem for you, do not use the interface at this time.
+-**
+-** When the virtual-table mechanism stabilizes, we will declare the
+-** interface fixed, support it indefinitely, and remove this comment.
+-*/
+-
+ /*
+ ** CAPI3REF: A Handle To An Open BLOB
+ ** KEYWORDS: {BLOB handle} {BLOB handles}
+@@ -7511,7 +7858,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
+ ** code is returned and the transaction rolled back.
+ **
+ ** Calling this function with an argument that is not a NULL pointer or an
+-** open blob handle results in undefined behaviour. ^Calling this routine
++** open blob handle results in undefined behavior. ^Calling this routine
+ ** with a null pointer (such as would be returned by a failed call to
+ ** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
+ ** is passed a valid open blob handle, the values returned by the
+@@ -7738,18 +8085,20 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
+ **
+ ** ^(Some systems (for example, Windows 95) do not support the operation
+ ** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
+-** will always return SQLITE_BUSY. The SQLite core only ever uses
+-** sqlite3_mutex_try() as an optimization so this is acceptable
+-** behavior.)^
++** will always return SQLITE_BUSY. In most cases the SQLite core only uses
++** sqlite3_mutex_try() as an optimization, so this is acceptable
++** behavior. The exceptions are unix builds that set the
++** SQLITE_ENABLE_SETLK_TIMEOUT build option. In that case a working
++** sqlite3_mutex_try() is required.)^
+ **
+ ** ^The sqlite3_mutex_leave() routine exits a mutex that was
+ ** previously entered by the same thread.   The behavior
+ ** is undefined if the mutex is not currently entered by the
+ ** calling thread or is not currently allocated.
+ **
+-** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), or
+-** sqlite3_mutex_leave() is a NULL pointer, then all three routines
+-** behave as no-ops.
++** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(),
++** sqlite3_mutex_leave(), or sqlite3_mutex_free() is a NULL pointer,
++** then any of the four routines behaves as a no-op.
+ **
+ ** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
+ */
+@@ -7991,6 +8340,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
+ #define SQLITE_TESTCTRL_PRNG_SAVE                5
+ #define SQLITE_TESTCTRL_PRNG_RESTORE             6
+ #define SQLITE_TESTCTRL_PRNG_RESET               7  /* NOT USED */
++#define SQLITE_TESTCTRL_FK_NO_ACTION             7
+ #define SQLITE_TESTCTRL_BITVEC_TEST              8
+ #define SQLITE_TESTCTRL_FAULT_INSTALL            9
+ #define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
+@@ -7998,6 +8348,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
+ #define SQLITE_TESTCTRL_ASSERT                  12
+ #define SQLITE_TESTCTRL_ALWAYS                  13
+ #define SQLITE_TESTCTRL_RESERVE                 14  /* NOT USED */
++#define SQLITE_TESTCTRL_JSON_SELFCHECK          14
+ #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
+ #define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
+ #define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
+@@ -8019,7 +8370,8 @@ SQLITE_API int sqlite3_test_control(int op, ...);
+ #define SQLITE_TESTCTRL_TRACEFLAGS              31
+ #define SQLITE_TESTCTRL_TUNE                    32
+ #define SQLITE_TESTCTRL_LOGEST                  33
+-#define SQLITE_TESTCTRL_LAST                    33  /* Largest TESTCTRL */
++#define SQLITE_TESTCTRL_USELONGDOUBLE           34
++#define SQLITE_TESTCTRL_LAST                    34  /* Largest TESTCTRL */
+ 
+ /*
+ ** CAPI3REF: SQL Keyword Checking
+@@ -8979,7 +9331,7 @@ typedef struct sqlite3_backup sqlite3_backup;
+ ** if the application incorrectly accesses the destination [database connection]
+ ** and so no error code is reported, but the operations may malfunction
+ ** nevertheless.  Use of the destination database connection while a
+-** backup is in progress might also also cause a mutex deadlock.
++** backup is in progress might also cause a mutex deadlock.
+ **
+ ** If running in [shared cache mode], the application must
+ ** guarantee that the shared cache used by the destination database
+@@ -9407,7 +9759,7 @@ SQLITE_API int sqlite3_wal_checkpoint_v2(
+ */
+ #define SQLITE_CHECKPOINT_PASSIVE  0  /* Do as much as possible w/o blocking */
+ #define SQLITE_CHECKPOINT_FULL     1  /* Wait for writers, then checkpoint */
+-#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for for readers */
++#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for readers */
+ #define SQLITE_CHECKPOINT_TRUNCATE 3  /* Like RESTART but also truncate WAL */
+ 
+ /*
+@@ -9475,7 +9827,7 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
+ ** [[SQLITE_VTAB_DIRECTONLY]]
    SQLITE_VTAB_DIRECTONLY
    
+ ** 
    Calls of the form
+ ** [sqlite3_vtab_config](db,SQLITE_VTAB_DIRECTONLY) from within the
+-** the [xConnect] or [xCreate] methods of a [virtual table] implmentation
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
+ ** prohibits that virtual table from being used from within triggers and
+ ** views.
+ ** 
    
+@@ -9483,18 +9835,28 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
+ ** [[SQLITE_VTAB_INNOCUOUS]]
    SQLITE_VTAB_INNOCUOUS
    
+ ** 
    Calls of the form
+ ** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
+-** the [xConnect] or [xCreate] methods of a [virtual table] implmentation
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
+ ** identify that virtual table as being safe to use from within triggers
+ ** and views.  Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
+ ** virtual table can do no serious harm even if it is controlled by a
+ ** malicious hacker.  Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
+ ** flag unless absolutely necessary.
+ ** 
    
++**
++** [[SQLITE_VTAB_USES_ALL_SCHEMAS]]
    SQLITE_VTAB_USES_ALL_SCHEMAS
    
++** 
    Calls of the form
++** [sqlite3_vtab_config](db,SQLITE_VTAB_USES_ALL_SCHEMA) from within the
++** the [xConnect] or [xCreate] methods of a [virtual table] implementation
++** instruct the query planner to begin at least a read transaction on
++** all schemas ("main", "temp", and any ATTACH-ed databases) whenever the
++** virtual table is used.
++** 
    
+ ** 
+ */
+ #define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
+ #define SQLITE_VTAB_INNOCUOUS          2
+ #define SQLITE_VTAB_DIRECTONLY         3
++#define SQLITE_VTAB_USES_ALL_SCHEMAS   4
+ 
+ /*
+ ** CAPI3REF: Determine The Virtual Table Conflict Policy
+@@ -9567,7 +9929,7 @@ SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);
+ ** 
  •  Otherwise, "BINARY" is returned.
+ ** 
+ */
+-SQLITE_API SQLITE_EXPERIMENTAL const char *sqlite3_vtab_collation(sqlite3_index_info*,int);
++SQLITE_API const char *sqlite3_vtab_collation(sqlite3_index_info*,int);
+ 
+ /*
+ ** CAPI3REF: Determine if a virtual table query is DISTINCT
+@@ -9655,7 +10017,7 @@ SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*);
+ ** communicated to the xBestIndex method as a
+ ** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^  If xBestIndex wants to use
+ ** this constraint, it must set the corresponding
+-** aConstraintUsage[].argvIndex to a postive integer.  ^(Then, under
++** aConstraintUsage[].argvIndex to a positive integer.  ^(Then, under
+ ** the usual mode of handling IN operators, SQLite generates [bytecode]
+ ** that invokes the [xFilter|xFilter() method] once for each value
+ ** on the right-hand side of the IN operator.)^  Thus the virtual table
+@@ -9724,21 +10086,20 @@ SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle);
+ ** is undefined and probably harmful.
+ **
+ ** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
+-** sqlite3_vtab_in_next(X,P) must be one of the parameters to the
++** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
+ ** xFilter method which invokes these routines, and specifically
+ ** a parameter that was previously selected for all-at-once IN constraint
+ ** processing use the [sqlite3_vtab_in()] interface in the
+ ** [xBestIndex|xBestIndex method].  ^(If the X parameter is not
+ ** an xFilter argument that was selected for all-at-once IN constraint
+-** processing, then these routines return [SQLITE_MISUSE])^ or perhaps
+-** exhibit some other undefined or harmful behavior.
++** processing, then these routines return [SQLITE_ERROR].)^
+ **
+ ** ^(Use these routines to access all values on the right-hand side
+ ** of the IN constraint using code like the following:
+ **
+ ** 
    + **    for(rc=sqlite3_vtab_in_first(pList, &pVal);
+-**        rc==SQLITE_OK && pVal
++**        rc==SQLITE_OK && pVal;
+ **        rc=sqlite3_vtab_in_next(pList, &pVal)
+ **    ){
+ **      // do something with pVal
+@@ -9836,6 +10197,10 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ ** managed by the prepared statement S and will be automatically freed when
+ ** S is finalized.
+ **
++** Not all values are available for all query elements. When a value is
++** not available, the output variable is set to -1 if the value is numeric,
++** or to NULL if it is a string (SQLITE_SCANSTAT_NAME).
++**
+ ** 
    
+ ** [[SQLITE_SCANSTAT_NLOOP]] 
    SQLITE_SCANSTAT_NLOOP
    
+ ** 
    ^The [sqlite3_int64] variable pointed to by the V parameter will be
+@@ -9863,12 +10228,24 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ ** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
+ ** description for the X-th loop.
+ **
+-** [[SQLITE_SCANSTAT_SELECTID]] 
    SQLITE_SCANSTAT_SELECT
    
++** [[SQLITE_SCANSTAT_SELECTID]] 
    SQLITE_SCANSTAT_SELECTID
    
+ ** 
    ^The "int" variable pointed to by the V parameter will be set to the
+-** "select-id" for the X-th loop.  The select-id identifies which query or
+-** subquery the loop is part of.  The main query has a select-id of zero.
+-** The select-id is the same value as is output in the first column
+-** of an [EXPLAIN QUERY PLAN] query.
++** id for the X-th query plan element. The id value is unique within the
++** statement. The select-id is the same value as is output in the first
++** column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_PARENTID]] 
    SQLITE_SCANSTAT_PARENTID
    
++** 
    The "int" variable pointed to by the V parameter will be set to the
++** the id of the parent of the current query element, if applicable, or
++** to zero if the query element has no parent. This is the same value as
++** returned in the second column of an [EXPLAIN QUERY PLAN] query.
++**
++** [[SQLITE_SCANSTAT_NCYCLE]] 
    SQLITE_SCANSTAT_NCYCLE
    
++** 
    The sqlite3_int64 output value is set to the number of cycles,
++** according to the processor time-stamp counter, that elapsed while the
++** query element was being processed. This value is not available for
++** all query elements - if it is unavailable the output variable is
++** set to -1.
+ ** 
    
+ */
+ #define SQLITE_SCANSTAT_NLOOP    0
+@@ -9877,12 +10254,14 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ #define SQLITE_SCANSTAT_NAME     3
+ #define SQLITE_SCANSTAT_EXPLAIN  4
+ #define SQLITE_SCANSTAT_SELECTID 5
++#define SQLITE_SCANSTAT_PARENTID 6
++#define SQLITE_SCANSTAT_NCYCLE   7
+ 
+ /*
+ ** CAPI3REF: Prepared Statement Scan Status
+ ** METHOD: sqlite3_stmt
+ **
+-** This interface returns information about the predicted and measured
++** These interfaces return information about the predicted and measured
+ ** performance for pStmt.  Advanced applications can use this
+ ** interface to compare the predicted and the measured performance and
+ ** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
+@@ -9893,19 +10272,25 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
+ **
+ ** The "iScanStatusOp" parameter determines which status information to return.
+ ** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
+-** of this interface is undefined.
+-** ^The requested measurement is written into a variable pointed to by
+-** the "pOut" parameter.
+-** Parameter "idx" identifies the specific loop to retrieve statistics for.
+-** Loops are numbered starting from zero. ^If idx is out of range - less than
+-** zero or greater than or equal to the total number of loops used to implement
+-** the statement - a non-zero value is returned and the variable that pOut
+-** points to is unchanged.
+-**
+-** ^Statistics might not be available for all loops in all statements. ^In cases
+-** where there exist loops with no available statistics, this function behaves
+-** as if the loop did not exist - it returns non-zero and leave the variable
+-** that pOut points to unchanged.
++** of this interface is undefined. ^The requested measurement is written into
++** a variable pointed to by the "pOut" parameter.
++**
++** The "flags" parameter must be passed a mask of flags. At present only
++** one flag is defined - SQLITE_SCANSTAT_COMPLEX. If SQLITE_SCANSTAT_COMPLEX
++** is specified, then status information is available for all elements
++** of a query plan that are reported by "EXPLAIN QUERY PLAN" output. If
++** SQLITE_SCANSTAT_COMPLEX is not specified, then only query plan elements
++** that correspond to query loops (the "SCAN..." and "SEARCH..." elements of
++** the EXPLAIN QUERY PLAN output) are available. Invoking API
++** sqlite3_stmt_scanstatus() is equivalent to calling
++** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
++**
++** Parameter "idx" identifies the specific query element to retrieve statistics
++** for. Query elements are numbered starting from zero. A value of -1 may be
++** to query for statistics regarding the entire query. ^If idx is out of range
++** - less than -1 or greater than or equal to the total number of query
++** elements used to implement the statement - a non-zero value is returned and
++** the variable that pOut points to is unchanged.
+ **
+ ** See also: [sqlite3_stmt_scanstatus_reset()]
+ */
+@@ -9915,6 +10300,19 @@ SQLITE_API int sqlite3_stmt_scanstatus(
+   int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
+   void *pOut                /* Result written here */
+ );
++SQLITE_API int sqlite3_stmt_scanstatus_v2(
++  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
++  int idx,                  /* Index of loop to report on */
++  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
++  int flags,                /* Mask of flags defined below */
++  void *pOut                /* Result written here */
++);
++
++/*
++** CAPI3REF: Prepared Statement Scan Status
++** KEYWORDS: {scan status flags}
++*/
++#define SQLITE_SCANSTAT_COMPLEX 0x0001
+ 
+ /*
+ ** CAPI3REF: Zero Scan-Status Counters
+@@ -10005,6 +10403,10 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+ ** function is not defined for operations on WITHOUT ROWID tables, or for
+ ** DELETE operations on rowid tables.
+ **
++** ^The sqlite3_preupdate_hook(D,C,P) function returns the P argument from
++** the previous call on the same [database connection] D, or NULL for
++** the first call on D.
++**
+ ** The [sqlite3_preupdate_old()], [sqlite3_preupdate_new()],
+ ** [sqlite3_preupdate_count()], and [sqlite3_preupdate_depth()] interfaces
+ ** provide additional information about a preupdate event. These routines
+@@ -10044,7 +10446,7 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+ ** When the [sqlite3_blob_write()] API is used to update a blob column,
+ ** the pre-update hook is invoked with SQLITE_DELETE. This is because the
+ ** in this case the new values are not available. In this case, when a
+-** callback made with op==SQLITE_DELETE is actuall a write using the
++** callback made with op==SQLITE_DELETE is actually a write using the
+ ** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
+ ** the index of the column being written. In other cases, where the
+ ** pre-update hook is being invoked for some other reason, including a
+@@ -10305,6 +10707,13 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const c
+ ** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
+ ** of the database exists.
+ **
++** After the call, if the SQLITE_SERIALIZE_NOCOPY bit had been set,
++** the returned buffer content will remain accessible and unchanged
++** until either the next write operation on the connection or when
++** the connection is closed, and applications must not modify the
++** buffer. If the bit had been clear, the returned buffer will not
++** be accessed by SQLite after the call.
++**
+ ** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
+ ** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
+ ** allocation error occurs.
+@@ -10353,6 +10762,9 @@ SQLITE_API unsigned char *sqlite3_serialize(
+ ** SQLite will try to increase the buffer size using sqlite3_realloc64()
+ ** if writes on the database cause it to grow larger than M bytes.
+ **
++** Applications must not modify the buffer P or invalidate it before
++** the database connection D is closed.
++**
+ ** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
+ ** database is currently in a read transaction or is involved in a backup
+ ** operation.
+@@ -10361,6 +10773,13 @@ SQLITE_API unsigned char *sqlite3_serialize(
+ ** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
+ ** function returns SQLITE_ERROR.
+ **
++** The deserialized database should not be in [WAL mode].  If the database
++** is in WAL mode, then any attempt to use the database file will result
++** in an [SQLITE_CANTOPEN] error.  The application can set the
++** [file format version numbers] (bytes 18 and 19) of the input database P
++** to 0x01 prior to invoking sqlite3_deserialize(D,S,P,N,M,F) to force the
++** database file into rollback mode and work around this limitation.
++**
+ ** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
+ ** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
+ ** [sqlite3_free()] is invoked on argument P prior to returning.
+@@ -10410,6 +10829,19 @@ SQLITE_API int sqlite3_deserialize(
+ # undef double
+ #endif
+ 
++#if defined(__wasi__)
++# undef SQLITE_WASI
++# define SQLITE_WASI 1
++# undef SQLITE_OMIT_WAL
++# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */
++# ifndef SQLITE_OMIT_LOAD_EXTENSION
++#  define SQLITE_OMIT_LOAD_EXTENSION
++# endif
++# ifndef SQLITE_THREADSAFE
++#  define SQLITE_THREADSAFE 0
++# endif
++#endif
++
+ #ifdef __cplusplus
+ }  /* End of the 'extern "C"' block */
+ #endif
+@@ -10616,16 +11048,20 @@ SQLITE_API int sqlite3session_create(
+ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
+ 
+ /*
+-** CAPIREF: Conigure a Session Object
++** CAPI3REF: Configure a Session Object
+ ** METHOD: sqlite3_session
+ **
+ ** This method is used to configure a session object after it has been
+-** created. At present the only valid value for the second parameter is
+-** [SQLITE_SESSION_OBJCONFIG_SIZE].
++** created. At present the only valid values for the second parameter are
++** [SQLITE_SESSION_OBJCONFIG_SIZE] and [SQLITE_SESSION_OBJCONFIG_ROWID].
+ **
+-** Arguments for sqlite3session_object_config()
++*/
++SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
++
++/*
++** CAPI3REF: Options for sqlite3session_object_config
+ **
+-** The following values may passed as the the 4th parameter to
++** The following values may passed as the the 2nd parameter to
+ ** sqlite3session_object_config().
+ **
+ ** 
    SQLITE_SESSION_OBJCONFIG_SIZE 
    
+@@ -10641,12 +11077,21 @@ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
+ **
+ **   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
+ **   the first table has been attached to the session object.
++**
++** 
    SQLITE_SESSION_OBJCONFIG_ROWID 
    
++**   This option is used to set, clear or query the flag that enables
++**   collection of data for tables with no explicit PRIMARY KEY.
++**
++**   Normally, tables with no explicit PRIMARY KEY are simply ignored
++**   by the sessions module. However, if this flag is set, it behaves
++**   as if such tables have a column "_rowid_ INTEGER PRIMARY KEY" inserted
++**   as their leftmost columns.
++**
++**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
++**   the first table has been attached to the session object.
+ */
+-SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
+-
+-/*
+-*/
+-#define SQLITE_SESSION_OBJCONFIG_SIZE 1
++#define SQLITE_SESSION_OBJCONFIG_SIZE  1
++#define SQLITE_SESSION_OBJCONFIG_ROWID 2
+ 
+ /*
+ ** CAPI3REF: Enable Or Disable A Session Object
+@@ -11407,6 +11852,18 @@ SQLITE_API int sqlite3changeset_concat(
+ );
+ 
+ 
++/*
++** CAPI3REF: Upgrade the Schema of a Changeset/Patchset
++*/
++SQLITE_API int sqlite3changeset_upgrade(
++  sqlite3 *db,
++  const char *zDb,
++  int nIn, const void *pIn,       /* Input changeset */
++  int *pnOut, void **ppOut        /* OUT: Inverse of input */
++);
++
++
++
+ /*
+ ** CAPI3REF: Changegroup Handle
+ **
+@@ -11453,6 +11910,38 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;
+ */
+ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+ 
++/*
++** CAPI3REF: Add a Schema to a Changegroup
++** METHOD: sqlite3_changegroup_schema
++**
++** This method may be used to optionally enforce the rule that the changesets
++** added to the changegroup handle must match the schema of database zDb
++** ("main", "temp", or the name of an attached database). If
++** sqlite3changegroup_add() is called to add a changeset that is not compatible
++** with the configured schema, SQLITE_SCHEMA is returned and the changegroup
++** object is left in an undefined state.
++**
++** A changeset schema is considered compatible with the database schema in
++** the same way as for sqlite3changeset_apply(). Specifically, for each
++** table in the changeset, there exists a database table with:
++**
++** 
      
++**   
    •  The name identified by the changeset, and
++**   
    •  at least as many columns as recorded in the changeset, and
++**   
    •  the primary key columns in the same position as recorded in
++**        the changeset.
++** 
    
++**
++** The output of the changegroup object always has the same schema as the
++** database nominated using this function. In cases where changesets passed
++** to sqlite3changegroup_add() have fewer columns than the corresponding table
++** in the database schema, these are filled in using the default column
++** values from the database schema. This makes it possible to combined
++** changesets that have different numbers of columns for a single table
++** within a changegroup, provided that they are otherwise compatible.
++*/
++SQLITE_API int sqlite3changegroup_schema(sqlite3_changegroup*, sqlite3*, const char *zDb);
++
+ /*
+ ** CAPI3REF: Add A Changeset To A Changegroup
+ ** METHOD: sqlite3_changegroup
+@@ -11521,13 +12010,18 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+ ** If the new changeset contains changes to a table that is already present
+ ** in the changegroup, then the number of columns and the position of the
+ ** primary key columns for the table must be consistent. If this is not the
+-** case, this function fails with SQLITE_SCHEMA. If the input changeset
+-** appears to be corrupt and the corruption is detected, SQLITE_CORRUPT is
+-** returned. Or, if an out-of-memory condition occurs during processing, this
+-** function returns SQLITE_NOMEM. In all cases, if an error occurs the state
+-** of the final contents of the changegroup is undefined.
++** case, this function fails with SQLITE_SCHEMA. Except, if the changegroup
++** object has been configured with a database schema using the
++** sqlite3changegroup_schema() API, then it is possible to combine changesets
++** with different numbers of columns for a single table, provided that
++** they are otherwise compatible.
+ **
+-** If no error occurs, SQLITE_OK is returned.
++** If the input changeset appears to be corrupt and the corruption is
++** detected, SQLITE_CORRUPT is returned. Or, if an out-of-memory condition
++** occurs during processing, this function returns SQLITE_NOMEM.
++**
++** In all cases, if an error occurs the state of the final contents of the
++** changegroup is undefined. If no error occurs, SQLITE_OK is returned.
+ */
+ SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
+ 
+@@ -11779,9 +12273,30 @@ SQLITE_API int sqlite3changeset_apply_v2(
+ **   Invert the changeset before applying it. This is equivalent to inverting
+ **   a changeset using sqlite3changeset_invert() before applying it. It is
+ **   an error to specify this flag with a patchset.
++**
++** 
    SQLITE_CHANGESETAPPLY_IGNORENOOP 
    
++**   Do not invoke the conflict handler callback for any changes that
++**   would not actually modify the database even if they were applied.
++**   Specifically, this means that the conflict handler is not invoked
++**   for:
++**    
      
++**    
    • a delete change if the row being deleted cannot be found,
++**    
    • an update change if the modified fields are already set to
++**        their new values in the conflicting row, or
++**    
    • an insert change if all fields of the conflicting row match
++**        the row being inserted.
++**    
    
++**
++** 
    SQLITE_CHANGESETAPPLY_FKNOACTION 
    
++**   If this flag it set, then all foreign key constraints in the target
++**   database behave as if they were declared with "ON UPDATE NO ACTION ON
++**   DELETE NO ACTION", even if they are actually CASCADE, RESTRICT, SET NULL
++**   or SET DEFAULT.
+ */
+ #define SQLITE_CHANGESETAPPLY_NOSAVEPOINT   0x0001
+ #define SQLITE_CHANGESETAPPLY_INVERT        0x0002
++#define SQLITE_CHANGESETAPPLY_IGNORENOOP    0x0004
++#define SQLITE_CHANGESETAPPLY_FKNOACTION    0x0008
+ 
+ /*
+ ** CAPI3REF: Constants Passed To The Conflict Handler
+@@ -12347,8 +12862,11 @@ struct Fts5PhraseIter {
+ **   created with the "columnsize=0" option.
+ **
+ ** xColumnText:
+-**   This function attempts to retrieve the text of column iCol of the
+-**   current document. If successful, (*pz) is set to point to a buffer
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of columns in the table, SQLITE_RANGE is returned.
++**
++**   Otherwise, this function attempts to retrieve the text of column iCol of
++**   the current document. If successful, (*pz) is set to point to a buffer
+ **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
+ **   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
+ **   if an error occurs, an SQLite error code is returned and the final values
+@@ -12358,8 +12876,10 @@ struct Fts5PhraseIter {
+ **   Returns the number of phrases in the current query expression.
+ **
+ ** xPhraseSize:
+-**   Returns the number of tokens in phrase iPhrase of the query. Phrases
+-**   are numbered starting from zero.
++**   If parameter iCol is less than zero, or greater than or equal to the
++**   number of phrases in the current query, as returned by xPhraseCount,
++**   0 is returned. Otherwise, this function returns the number of tokens in
++**   phrase iPhrase of the query. Phrases are numbered starting from zero.
+ **
+ ** xInstCount:
+ **   Set *pnInst to the total number of occurrences of all phrases within
+@@ -12375,12 +12895,13 @@ struct Fts5PhraseIter {
+ **   Query for the details of phrase match iIdx within the current row.
+ **   Phrase matches are numbered starting from zero, so the iIdx argument
+ **   should be greater than or equal to zero and smaller than the value
+-**   output by xInstCount().
++**   output by xInstCount(). If iIdx is less than zero or greater than
++**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
+ **
+-**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
++**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
+ **   to the column in which it occurs and *piOff the token offset of the
+-**   first token of the phrase. Returns SQLITE_OK if successful, or an error
+-**   code (i.e. SQLITE_NOMEM) if an error occurs.
++**   first token of the phrase. SQLITE_OK is returned if successful, or an
++**   error code (i.e. SQLITE_NOMEM) if an error occurs.
+ **
+ **   This API can be quite slow if used with an FTS5 table created with the
+ **   "detail=none" or "detail=column" option.
+@@ -12406,6 +12927,10 @@ struct Fts5PhraseIter {
+ **   Invoking Api.xUserData() returns a copy of the pointer passed as
+ **   the third argument to pUserData.
+ **
++**   If parameter iPhrase is less than zero, or greater than or equal to
++**   the number of phrases in the query, as returned by xPhraseCount(),
++**   this function returns SQLITE_RANGE.
++**
+ **   If the callback function returns any value other than SQLITE_OK, the
+ **   query is abandoned and the xQueryPhrase function returns immediately.
+ **   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
+@@ -12520,6 +13045,39 @@ struct Fts5PhraseIter {
+ **
+ ** xPhraseNextColumn()
+ **   See xPhraseFirstColumn above.
++**
++** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase iPhrase of the current
++**   query. Before returning, output parameter *ppToken is set to point
++**   to a buffer containing the requested token, and *pnToken to the
++**   size of this buffer in bytes.
++**
++**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
++**   or equal to the number of phrases in the query as reported by
++**   xPhraseCount(), or if iToken is equal to or greater than the number of
++**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
++     are both zeroed.
++**
++**   The output text is not a copy of the query text that specified the
++**   token. It is the output of the tokenizer module. For tokendata=1
++**   tables, this includes any embedded 0x00 and trailing data.
++**
++** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
++**   This is used to access token iToken of phrase hit iIdx within the
++**   current row. If iIdx is less than zero or greater than or equal to the
++**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
++**   output variable (*ppToken) is set to point to a buffer containing the
++**   matching document token, and (*pnToken) to the size of that buffer in
++**   bytes. This API is not available if the specified token matches a
++**   prefix query term. In that case both output variables are always set
++**   to 0.
++**
++**   The output text is not a copy of the document text that was tokenized.
++**   It is the output of the tokenizer module. For tokendata=1 tables, this
++**   includes any embedded 0x00 and trailing data.
++**
++**   This API can be quite slow if used with an FTS5 table created with the
++**   "detail=none" or "detail=column" option.
+ */
+ struct Fts5ExtensionApi {
+   int iVersion;                   /* Currently always set to 3 */
+@@ -12557,6 +13115,13 @@ struct Fts5ExtensionApi {
+ 
+   int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
+   void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
++
++  /* Below this point are iVersion>=3 only */
++  int (*xQueryToken)(Fts5Context*,
++      int iPhrase, int iToken,
++      const char **ppToken, int *pnToken
++  );
++  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
+ };
+ 
+ /*
+@@ -12751,8 +13316,8 @@ struct Fts5ExtensionApi {
+ **   as separate queries of the FTS index are required for each synonym.
+ **
+ **   When using methods (2) or (3), it is important that the tokenizer only
+-**   provide synonyms when tokenizing document text (method (2)) or query
+-**   text (method (3)), not both. Doing so will not cause any errors, but is
++**   provide synonyms when tokenizing document text (method (3)) or query
++**   text (method (2)), not both. Doing so will not cause any errors, but is
+ **   inefficient.
+ */
+ typedef struct Fts5Tokenizer Fts5Tokenizer;
+@@ -12800,7 +13365,7 @@ struct fts5_api {
+   int (*xCreateTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_tokenizer *pTokenizer,
+     void (*xDestroy)(void*)
+   );
+@@ -12809,7 +13374,7 @@ struct fts5_api {
+   int (*xFindTokenizer)(
+     fts5_api *pApi,
+     const char *zName,
+-    void **ppContext,
++    void **ppUserData,
+     fts5_tokenizer *pTokenizer
+   );
+ 
+@@ -12817,7 +13382,7 @@ struct fts5_api {
+   int (*xCreateFunction)(
+     fts5_api *pApi,
+     const char *zName,
+-    void *pContext,
++    void *pUserData,
+     fts5_extension_function xFunction,
+     void (*xDestroy)(void*)
+   );
+@@ -12834,3 +13399,326 @@ struct fts5_api {
+ #endif /* _FTS5_H */
+ 
+ /******** End of fts5.h *********/
++/*** End of #include "sqlite3.h" ***/
++
++
++#ifdef SQLITE_USER_AUTHENTICATION
++/* #include "sqlite3userauth.h" */
++/*** Begin of #include "sqlite3userauth.h" ***/
++/*
++** 2014-09-08
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++**
++** This file contains the application interface definitions for the
++** user-authentication extension feature.
++**
++** To compile with the user-authentication feature, append this file to
++** end of an SQLite amalgamation header file ("sqlite3.h"), then add
++** the SQLITE_USER_AUTHENTICATION compile-time option.  See the
++** user-auth.txt file in the same source directory as this file for
++** additional information.
++*/
++#ifdef SQLITE_USER_AUTHENTICATION
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** If a database contains the SQLITE_USER table, then the
++** sqlite3_user_authenticate() interface must be invoked with an
++** appropriate username and password prior to enable read and write
++** access to the database.
++**
++** Return SQLITE_OK on success or SQLITE_ERROR if the username/password
++** combination is incorrect or unknown.
++**
++** If the SQLITE_USER table is not present in the database file, then
++** this interface is a harmless no-op returnning SQLITE_OK.
++*/
++SQLITE_API int sqlite3_user_authenticate(
++  sqlite3 *db,           /* The database connection */
++  const char *zUsername, /* Username */
++  const char *aPW,       /* Password or credentials */
++  int nPW                /* Number of bytes in aPW[] */
++);
++
++/*
++** The sqlite3_user_add() interface can be used (by an admin user only)
++** to create a new user.  When called on a no-authentication-required
++** database, this routine converts the database into an authentication-
++** required database, automatically makes the added user an
++** administrator, and logs in the current connection as that user.
++** The sqlite3_user_add() interface only works for the "main" database, not
++** for any ATTACH-ed databases.  Any call to sqlite3_user_add() by a
++** non-admin user results in an error.
++*/
++SQLITE_API int sqlite3_user_add(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername, /* Username to be added */
++  const char *aPW,       /* Password or credentials */
++  int nPW,               /* Number of bytes in aPW[] */
++  int isAdmin            /* True to give new user admin privilege */
++);
++
++/*
++** The sqlite3_user_change() interface can be used to change a users
++** login credentials or admin privilege.  Any user can change their own
++** login credentials.  Only an admin user can change another users login
++** credentials or admin privilege setting.  No user may change their own 
++** admin privilege setting.
++*/
++SQLITE_API int sqlite3_user_change(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername, /* Username to change */
++  const char *aPW,       /* New password or credentials */
++  int nPW,               /* Number of bytes in aPW[] */
++  int isAdmin            /* Modified admin privilege for the user */
++);
++
++/*
++** The sqlite3_user_delete() interface can be used (by an admin user only)
++** to delete a user.  The currently logged-in user cannot be deleted,
++** which guarantees that there is always an admin user and hence that
++** the database cannot be converted into a no-authentication-required
++** database.
++*/
++SQLITE_API int sqlite3_user_delete(
++  sqlite3 *db,           /* Database connection */
++  const char *zUsername  /* Username to remove */
++);
++
++#ifdef __cplusplus
++}  /* end of the 'extern "C"' block */
++#endif
++
++#endif /* SQLITE_USER_AUTHENTICATION */
++/*** End of #include "sqlite3userauth.h" ***/
++
++#endif
++
++/*
++** Symbols for ciphers
++*/
++#define CODEC_TYPE_UNKNOWN     0
++#define CODEC_TYPE_AES128      1
++#define CODEC_TYPE_AES256      2
++#define CODEC_TYPE_CHACHA20    3
++#define CODEC_TYPE_SQLCIPHER   4
++#define CODEC_TYPE_RC4         5
++#define CODEC_TYPE_ASCON128    6
++#define CODEC_TYPE_MAX_BUILTIN 6
++
++/*
++** Definition of API functions
++*/
++
++/*
++** Define Windows specific SQLite API functions (not defined in sqlite3.h)
++*/
++#if SQLITE_OS_WIN == 1
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++SQLITE_API int sqlite3_win32_set_directory(unsigned long type, void* zValue);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** Specify the key for an encrypted database.
++** This routine should be called right after sqlite3_open().
++**
++** Arguments:
++**   db       - Database to be encrypted
++**   zDbName  - Name of the database (e.g. "main")
++**   pKey     - Passphrase
++**   nKey     - Length of passphrase
++*/
++SQLITE_API int sqlite3_key(sqlite3* db, const void* pKey, int nKey);
++SQLITE_API int sqlite3_key_v2(sqlite3* db, const char* zDbName, const void* pKey, int nKey);
++
++/*
++** Change the key on an open database.
++** If the current database is not encrypted, this routine will encrypt
++** it.  If pNew==0 or nNew==0, the database is decrypted.
++**
++** Arguments:
++**   db       - Database to be encrypted
++**   zDbName  - Name of the database (e.g. "main")
++**   pKey     - Passphrase
++**   nKey     - Length of passphrase
++*/
++SQLITE_API int sqlite3_rekey(sqlite3* db, const void* pKey, int nKey);
++SQLITE_API int sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* pKey, int nKey);
++
++/*
++** Specify the activation key for a SEE database.
++** Unless activated, none of the SEE routines will work.
++**
++** Arguments:
++**   zPassPhrase  - Activation phrase
++**
++** Note: Provided only for API compatibility with SEE.
++** Encryption support of SQLite3 Multi Cipher is always enabled.
++*/
++SQLITE_API void sqlite3_activate_see(const char* zPassPhrase);
++
++/*
++** Define functions for the configuration of the wxSQLite3 encryption extension
++*/
++SQLITE_API int sqlite3mc_cipher_count();
++SQLITE_API int sqlite3mc_cipher_index(const char* cipherName);
++SQLITE_API const char* sqlite3mc_cipher_name(int cipherIndex);
++SQLITE_API int sqlite3mc_config(sqlite3* db, const char* paramName, int newValue);
++SQLITE_API int sqlite3mc_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
++SQLITE_API unsigned char* sqlite3mc_codec_data(sqlite3* db, const char* zDbName, const char* paramName);
++SQLITE_API const char* sqlite3mc_version();
++
++#ifdef SQLITE3MC_WXSQLITE3_COMPATIBLE
++SQLITE_API int wxsqlite3_config(sqlite3* db, const char* paramName, int newValue);
++SQLITE_API int wxsqlite3_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
++SQLITE_API unsigned char* wxsqlite3_codec_data(sqlite3* db, const char* zDbName, const char* paramName);
++#endif
++
++/*
++** Structures and functions to dynamically register a cipher
++*/
++
++/*
++** Structure for a single cipher configuration parameter
++**
++** Components:
++**   m_name      - name of parameter (1st char = alpha, rest = alphanumeric or underscore, max 63 characters)
++**   m_value     - current/transient parameter value
++**   m_default   - default parameter value
++**   m_minValue  - minimum valid parameter value
++**   m_maxValue  - maximum valid parameter value
++*/
++typedef struct _CipherParams
++{
++  char* m_name;
++  int   m_value;
++  int   m_default;
++  int   m_minValue;
++  int   m_maxValue;
++} CipherParams;
++
++/*
++** Structure for a cipher API
++**
++** Components:
++**   m_name            - name of cipher (1st char = alpha, rest = alphanumeric or underscore, max 63 characters)
++**   m_allocateCipher  - Function pointer for function AllocateCipher
++**   m_freeCipher      - Function pointer for function FreeCipher
++**   m_cloneCipher     - Function pointer for function CloneCipher
++**   m_getLegacy       - Function pointer for function GetLegacy
++**   m_getPageSize     - Function pointer for function GetPageSize
++**   m_getReserved     - Function pointer for function GetReserved
++**   m_getSalt         - Function pointer for function GetSalt
++**   m_generateKey     - Function pointer for function GenerateKey
++**   m_encryptPage     - Function pointer for function EncryptPage
++**   m_decryptPage     - Function pointer for function DecryptPage
++*/
++
++typedef struct BtShared BtSharedMC;
++
++typedef void* (*AllocateCipher_t)(sqlite3* db);
++typedef void  (*FreeCipher_t)(void* cipher);
++typedef void  (*CloneCipher_t)(void* cipherTo, void* cipherFrom);
++typedef int   (*GetLegacy_t)(void* cipher);
++typedef int   (*GetPageSize_t)(void* cipher);
++typedef int   (*GetReserved_t)(void* cipher);
++typedef unsigned char* (*GetSalt_t)(void* cipher);
++typedef void  (*GenerateKey_t)(void* cipher, BtSharedMC* pBt, char* userPassword, int passwordLength, int rekey, unsigned char* cipherSalt);
++typedef int   (*EncryptPage_t)(void* cipher, int page, unsigned char* data, int len, int reserved);
++typedef int   (*DecryptPage_t)(void* cipher, int page, unsigned char* data, int len, int reserved, int hmacCheck);
++
++typedef struct _CipherDescriptor
++{
++  char* m_name;
++  AllocateCipher_t m_allocateCipher;
++  FreeCipher_t     m_freeCipher;
++  CloneCipher_t    m_cloneCipher;
++  GetLegacy_t      m_getLegacy;
++  GetPageSize_t    m_getPageSize;
++  GetReserved_t    m_getReserved;
++  GetSalt_t        m_getSalt;
++  GenerateKey_t    m_generateKey;
++  EncryptPage_t    m_encryptPage;
++  DecryptPage_t    m_decryptPage;
++} CipherDescriptor;
++
++/*
++** Register a cipher
++**
++** Arguments:
++**   desc         - Cipher descriptor structure
++**   params       - Cipher configuration parameter table
++**   makeDefault  - flag whether to make the cipher the default cipher
++**
++** Returns:
++**   SQLITE_OK     - the cipher could be registered successfully
++**   SQLITE_ERROR  - the cipher could not be registered
++*/
++SQLITE_API int sqlite3mc_register_cipher(const CipherDescriptor* desc, const CipherParams* params, int makeDefault);
++
++#ifdef __cplusplus
++}
++#endif
++
++/*
++** Define public SQLite3 Multiple Ciphers VFS interface
++*/
++/* #include "sqlite3mc_vfs.h" */
++/*** Begin of #include "sqlite3mc_vfs.h" ***/
++/*
++** Name:        sqlite3mc_vfs.h
++** Purpose:     Header file for VFS of SQLite3 Multiple Ciphers support
++** Author:      Ulrich Telle
++** Created:     2020-03-01
++** Copyright:   (c) 2020-2023 Ulrich Telle
++** License:     MIT
++*/
++
++#ifndef SQLITE3MC_VFS_H_
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifndef SQLITE_PRIVATE
++#define SQLITE_PRIVATE
++#endif
++SQLITE_PRIVATE int sqlite3mcCheckVfs(const char* zVfs);
++
++SQLITE_API int sqlite3mc_vfs_create(const char* zVfsReal, int makeDefault);
++SQLITE_API void sqlite3mc_vfs_destroy(const char* zName);
++SQLITE_API void sqlite3mc_vfs_shutdown();
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* SQLITE3MC_VFS_H_ */
++/*** End of #include "sqlite3mc_vfs.h" ***/
++
++
++#endif
+diff --git a/node_modules/react-native-quick-sqlite/cpp/sqliteBridge.cpp b/node_modules/react-native-quick-sqlite/cpp/sqliteBridge.cpp
+index 9ffe010..61f7b98 100644
+--- a/node_modules/react-native-quick-sqlite/cpp/sqliteBridge.cpp
++++ b/node_modules/react-native-quick-sqlite/cpp/sqliteBridge.cpp
+@@ -20,6 +20,9 @@
+ using namespace std;
+ using namespace facebook;
+ 
++extern "C" int sqlite3Fts5BetterTrigramInit(sqlite3 *db);
++extern "C" int sqlite3Fts5HtmlInit(sqlite3 *db);
++
+ map dbMap = map();
+ 
+ bool folder_exists(const std::string &foldername)
+@@ -90,12 +93,17 @@ SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath)
+   int exit = 0;
+   exit = sqlite3_open_v2(dbPath.c_str(), &db, sqlOpenFlags, nullptr);
+ 
++  if (exit == SQLITE_OK)
++  {
++      sqlite3Fts5BetterTrigramInit(db);
++      sqlite3Fts5HtmlInit(db);
++  }
++
+   if (exit != SQLITE_OK)
+   {
+     return SQLiteOPResult{
+-      .type = SQLiteError,
+-      .errorMessage = sqlite3_errmsg(db)
+-    };
++        .type = SQLiteError,
++        .errorMessage = sqlite3_errmsg(db)};
+   }
+   else
+   {
+@@ -103,9 +111,8 @@ SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath)
+   }
+ 
+   return SQLiteOPResult{
+-    .type = SQLiteOk,
+-    .rowsAffected = 0
+-  };
++      .type = SQLiteOk,
++      .rowsAffected = 0};
+ }
+ 
+ SQLiteOPResult sqliteCloseDb(string const dbName)
+diff --git a/node_modules/react-native-quick-sqlite/react-native-quick-sqlite.podspec b/node_modules/react-native-quick-sqlite/react-native-quick-sqlite.podspec
+index 373f52f..b9e769c 100644
+--- a/node_modules/react-native-quick-sqlite/react-native-quick-sqlite.podspec
++++ b/node_modules/react-native-quick-sqlite/react-native-quick-sqlite.podspec
+@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
+   s.source       = { :git => "https://github.com/margelo/react-native-quick-sqlite.git", :tag => "#{s.version}" }
+ 
+     s.header_mappings_dir = "cpp"
+-    s.source_files = "ios/**/*.{h,hpp,m,mm}", "cpp/**/*.{h,cpp,c}"
++    s.source_files = "ios/**/*.{h,hpp,m,mm}", "cpp/**/*.{h,cpp,c}", "better-trigram/better-trigram.c", "sqlite3-fts5-html/fts5-html.c"
+ 
+   s.pod_target_xcconfig = {
+     :GCC_PREPROCESSOR_DEFINITIONS => "HAVE_FULLFSYNC=1",
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/release.yml b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/release.yml
+new file mode 100755
+index 0000000..f3aa8bc
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/release.yml
+@@ -0,0 +1,252 @@
++name: "Release"
++on:
++  release:
++    types: [published]
++permissions:
++  contents: read
++
++jobs:
++  build-linux-x86_64-extension:
++    runs-on: ubuntu-22.04
++    steps:
++      - uses: actions/checkout@v4
++      - run: make loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-linux-x86_64-extension
++          path: dist/*
++  build-linux-aarch64-extension:
++    runs-on: ubuntu-22.04
++    steps:
++      - uses: actions/checkout@v4
++      - uses: korandoru/setup-zig@v1
++        with:
++          zig-version: 0.13.0 # released versions or master
++      - run: make CC="zig cc -target aarch64-linux-gnu" loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-linux-aarch64-extension
++          path: dist/*
++  build-macos-x86_64-extension:
++    runs-on: macos-13
++    steps:
++      - uses: actions/checkout@v4
++      - run: make loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-macos-x86_64-extension
++          path: dist/*
++  build-macos-aarch64-extension:
++    runs-on: macos-14
++    steps:
++      - uses: actions/checkout@v4
++      - run: make loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-macos-aarch64-extension
++          path: dist/*
++  build-windows-x86_64-extension:
++    runs-on: windows-2019
++    permissions:
++      contents: write
++    steps:
++      - uses: actions/checkout@v4
++      - uses: ilammy/msvc-dev-cmd@v1
++      - run: nmake /f Makefile.vc loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-windows-x86_64-extension
++          path: dist/*
++  build-windows-aarch64-extension:
++    runs-on: windows-2019
++    permissions:
++      contents: write
++    steps:
++      - uses: actions/checkout@v4
++      - uses: ilammy/msvc-dev-cmd@v1
++        with:
++          arch: amd64_arm64
++      - run: nmake /f Makefile.vc loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-windows-aarch64-extension
++          path: dist/*
++  build-android-extensions:
++    runs-on: ubuntu-latest
++    strategy:
++      matrix:
++        platforms:
++          [
++            { name: android-aarch64, cc: aarch64-linux-android21-clang },
++            { name: android-i686, cc: i686-linux-android21-clang },
++            { name: android-x86_64, cc: x86_64-linux-android21-clang },
++            { name: android-armv7a, cc: armv7a-linux-androideabi21-clang },
++          ]
++    steps:
++      - uses: actions/checkout@v4
++      - uses: actions/setup-java@v4
++        with:
++          java-version: "17"
++          distribution: "temurin"
++      - uses: android-actions/setup-android@v3
++      - run: |
++          sdkmanager --install "ndk;27.0.12077973"
++          echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/27.0.12077973" >> $GITHUB_ENV
++      - run: |
++          ls $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/
++          ls $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
++      - run: |
++          export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
++          make CC=${{ matrix.platforms.cc }} \
++             AR=llvm-ar \
++             RANLIB=llvm-ranlib \
++             STRIP=llvm-strip loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-${{ matrix.platforms.name }}-extension
++          path: dist/*.so
++  build-ios-extensions:
++    runs-on: ${{ matrix.platforms.runner }}
++    strategy:
++      fail-fast: false
++      matrix:
++        platforms: [
++            {
++              name: ios-aarch64,
++              target: arm64-apple-ios,
++              sdk: iphoneos,
++              runner: macos-14,
++            },
++            #{
++            #  name: ios-x86_64,
++            #  target: x86_64-apple-ios,
++            #  sdk: iphoneos,
++            #  runner: macos-12,
++            #},
++            {
++              name: iossimulator-aarch64,
++              target: arm64-apple-ios-simulator,
++              sdk: iphonesimulator,
++              runner: macos-14,
++            },
++            {
++              name: iossimulator-x86_64,
++              target: x86_64-apple-ios-simulator,
++              sdk: iphonesimulator,
++              runner: macos-14,
++            },
++          ]
++    steps:
++      - uses: actions/checkout@v4
++      - uses: maxim-lobanov/setup-xcode@v1
++        with:
++          xcode-version: latest-stable
++
++      - run: make CFLAGS="-target ${{ matrix.platforms.target }} -isysroot $(xcrun -sdk ${{ matrix.platforms.sdk }} --show-sdk-path) -fembed-bitcode -DNDEBUG=1" loadable
++      - uses: actions/upload-artifact@v4
++        with:
++          name: sqlite3-fts5-html-${{ matrix.platforms.name }}-extension
++          path: dist/*
++
++  dist:
++    runs-on: ubuntu-latest
++    needs:
++      [
++        build-linux-x86_64-extension,
++        build-linux-aarch64-extension,
++        build-macos-x86_64-extension,
++        build-macos-aarch64-extension,
++        build-windows-x86_64-extension,
++        build-windows-aarch64-extension,
++        build-android-extensions,
++        build-ios-extensions,
++      ]
++    permissions:
++      contents: write
++    steps:
++      - uses: actions/checkout@v4
++
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-linux-x86_64-extension
++          path: dist/linux-x86_64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-linux-aarch64-extension
++          path: dist/linux-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-macos-x86_64-extension
++          path: dist/macos-x86_64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-macos-aarch64-extension
++          path: dist/macos-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-windows-x86_64-extension
++          path: dist/windows-x86_64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-windows-aarch64-extension
++          path: dist/windows-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-android-aarch64-extension
++          path: dist/android-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-android-i686-extension
++          path: dist/android-i686
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-android-x86_64-extension
++          path: dist/android-x86_64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-android-armv7a-extension
++          path: dist/android-armv7a
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-android-armv7a-extension
++          path: dist/android-armv7a
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-ios-aarch64-extension
++          path: dist/ios-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-iossimulator-aarch64-extension
++          path: dist/iossimulator-aarch64
++      - uses: actions/download-artifact@v4
++        with:
++          name: sqlite3-fts5-html-iossimulator-x86_64-extension
++          path: dist/iossimulator-x86_64
++      - run: |
++          curl -L https://github.com/asg017/sqlite-dist/releases/download/v0.0.1-alpha.19/sqlite-dist-x86_64-unknown-linux-gnu.tar.xz \
++            | tar xfJ - --strip-components 1
++      - run: ./sqlite-dist ./sqlite-dist.toml --input dist/ --output distx/ --version $(cat VERSION)
++      - run: |
++          gh release upload --clobber ${{ github.ref_name }} \
++            distx/amalgamation/* \
++            distx/github_releases/* \
++            distx/checksums.txt \
++            distx/sqlite-dist-manifest.json \
++            distx/install.sh
++        env:
++          GH_TOKEN: ${{ github.token }}
++      - name: Install node
++        uses: actions/setup-node@v3
++        with:
++          node-version: "16"
++          registry-url: "https://registry.npmjs.org"
++      - run: |
++          npm publish --access public distx/npm/sqlite3-fts5-html-darwin-arm64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html-darwin-x64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html-linux-x64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html-linux-arm64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html-windows-x64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html-windows-arm64.tar.gz
++          npm publish --access public distx/npm/sqlite3-fts5-html.tar.gz
++        env:
++          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/test.yml b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/test.yml
+new file mode 100755
+index 0000000..21f5288
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.github/workflows/test.yml
+@@ -0,0 +1,63 @@
++name: Test
++
++on:
++  workflow_dispatch:
++  push:
++    branch: "master"
++  pull_request:
++    types:
++      - "ready_for_review"
++      - "opened"
++      - "synchronize"
++      - "reopened"
++
++jobs:
++  test-linux:
++    name: Test Linux
++    runs-on: ubuntu-latest
++    steps:
++      - name: Checkout
++        uses: actions/checkout@v3
++
++      - name: Install dependencies
++        run: |
++          sudo apt install lemon tcl
++
++      - name: Install bun
++        uses: oven-sh/setup-bun@v2
++
++      - name: Run tests
++        run: make test
++
++  test-windows:
++    name: Test Windows
++    runs-on: windows-latest
++    steps:
++      - name: Checkout
++        uses: actions/checkout@v3
++
++      - name: Install bun
++        uses: oven-sh/setup-bun@v2
++
++      - uses: ilammy/msvc-dev-cmd@v1
++
++      - name: Run tests
++        run: nmake /f Makefile.vc test
++
++  test-macos:
++    name: Test macOS
++    runs-on: macos-latest
++    steps:
++      - name: Checkout
++        uses: actions/checkout@v3
++
++      - name: Install dependencies
++        run: |
++          brew install lemon
++          brew install tcl-tk
++
++      - name: Install bun
++        uses: oven-sh/setup-bun@v2
++
++      - name: Run tests
++        run: make test
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.gitignore b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.gitignore
+new file mode 100755
+index 0000000..e5d9e76
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/.gitignore
+@@ -0,0 +1,6 @@
++*.dylib
++*.dSYM
++.vscode
++test.sql.*
++deps
++dist
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile
+new file mode 100755
+index 0000000..9fa632d
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile
+@@ -0,0 +1,60 @@
++EXT = .so
++SQLITE_VERSION ?= version-3.49.1
++
++SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION}
++SQLITE_SRC = deps/$(SQLITE_VERSION)/src
++SQLITE_AMALGAMATION_URL = https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
++SQLITE_AMALGAMATION_PATH = deps/sqlite-amalgamation-3490100
++
++override CFLAGS += -Ideps/$(SQLITE_VERSION)/ext/fts5 -I$(SQLITE_AMALGAMATION_PATH) -Os -Wall -Wextra
++CONDITIONAL_CFLAGS = -lm
++
++UNAME_S := $(shell uname -s)
++ifeq ($(UNAME_S),Darwin)
++	EXT = .dylib
++endif
++
++.PHONY: all clean test
++
++prefix=dist
++$(prefix):
++	mkdir -p $(prefix)
++
++TARGET_LOADABLE=$(prefix)/fts5-html$(EXT)
++TARGET_FTS5=$(prefix)/fts5$(EXT)
++TARGET_LIBSQLITE=$(prefix)/libsqlite3$(EXT)
++
++loadable: $(TARGET_LOADABLE)
++
++clean:
++	rm -rf deps
++	rm -rf $(prefix)
++
++$(SQLITE_SRC):
++	mkdir -p deps/$(SQLITE_VERSION)
++	curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C deps/$(SQLITE_VERSION)/ --strip-components=1
++
++$(SQLITE_AMALGAMATION_PATH):
++	@echo Downloading SQLite amalgamation...
++	wget -q $(SQLITE_AMALGAMATION_URL) -O sqlite.zip
++	@echo Extracting SQLite amalgamation...
++	unzip sqlite.zip -d deps/
++	rm -f sqlite.zip
++
++$(TARGET_LOADABLE): $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix)
++	$(CC) $(CFLAGS) $(CONDITIONAL_CFLAGS) -shared -fPIC -o $@ fts5-html.c
++
++$(TARGET_FTS5): $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix)
++	dir=deps/$(SQLITE_VERSION) \
++	cwd=$$(pwd); \
++	lemon $$dir/ext/fts5/fts5parse.y; \
++	cd $$dir/ext/fts5; \
++	tclsh $$cwd/$$dir/ext/fts5/tool/mkfts5c.tcl; \
++	cd $$cwd; \
++	$(CC) $(CFLAGS) $(CONDITIONAL_CFLAGS) -DSQLITE_TEST -shared -fPIC -o $@ $$dir/ext/fts5/fts5.c; \
++
++$(TARGET_LIBSQLITE): $(SQLITE_AMALGAMATION_PATH) $(prefix)
++	$(CC) $(CFLAGS) $(CONDITIONAL_CFLAGS) -shared -fPIC -o $@ $(SQLITE_AMALGAMATION_PATH)/sqlite3.c
++
++test: $(TARGET_LIBSQLITE) $(TARGET_FTS5) $(TARGET_LOADABLE)
++	SQLITE_LIB_PATH=$(TARGET_LIBSQLITE) bun test
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile.vc b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile.vc
+new file mode 100755
+index 0000000..63ef942
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/Makefile.vc
+@@ -0,0 +1,62 @@
++EXT = .dll
++SQLITE_VERSION = version-3.49.1
++
++SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=$(SQLITE_VERSION)
++SQLITE_SRC = deps\$(SQLITE_VERSION)\src
++SQLITE_AMALGAMATION_URL = https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
++SQLITE_AMALGAMATION_PATH = deps/sqlite-amalgamation-3490100
++
++TCL_DOWNLOAD_URL = https://www.irontcl.com/downloads/irontcl-amd64-8.6.7.zip
++TCLSH_PATH = deps\IronTcl\bin\tclsh86t.exe
++
++CFLAGS = -I$(SQLITE_AMALGAMATION_PATH) -Ideps\$(SQLITE_VERSION)\src -Ideps\$(SQLITE_VERSION)\ext\fts5 -Os -Wall
++
++prefix=dist
++$(prefix):
++	if not exist $(prefix) mkdir $(prefix)
++
++TARGET_LOADABLE=$(prefix)\fts5-html$(EXT)
++TARGET_FTS5=$(prefix)\fts5$(EXT)
++TARGET_LEMON=$(prefix)\lemon.exe
++
++all: test loadable
++loadable: $(TARGET_LOADABLE)
++
++clean:
++    if exist deps rmdir /S /Q deps
++    if exist $(prefix) rmdir /S /Q $(prefix)
++    if exist *.obj del *.obj
++
++$(SQLITE_SRC):
++    if not exist deps\$(SQLITE_VERSION) git clone --depth=1 --branch=$(SQLITE_VERSION) https://github.com/sqlite/sqlite.git deps\$(SQLITE_VERSION)
++    REM curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C deps\$(SQLITE_VERSION)\ --strip-components=1
++
++$(SQLITE_AMALGAMATION_PATH):
++    @echo Downloading SQLite amalgamation...
++    powershell -Command "iwr -Uri $(SQLITE_AMALGAMATION_URL) -OutFile sqlite.zip"
++    @echo Extracting SQLite amalgamation...
++    powershell -Command "Expand-Archive -Path sqlite.zip -DestinationPath deps/"
++    del sqlite.zip
++
++$(TCLSH_PATH):
++    @echo Downloading Tcl/Tk...
++    powershell -Command "iwr -Uri $(TCL_DOWNLOAD_URL) -OutFile tcl.zip"
++    @echo Extracting Tcl/Tk...
++    powershell -Command "Expand-Archive -Path tcl.zip -DestinationPath deps/"
++    del tcl.zip
++
++$(TARGET_LOADABLE): $(SQLITE_AMALGAMATION_PATH) $(SQLITE_SRC) $(prefix)
++    cl $(CFLAGS) /LD /Fe$@ fts5-html.c
++
++$(TARGET_LEMON): $(SQLITE_SRC) $(prefix)
++    cl deps\$(SQLITE_VERSION)\tool\lemon.c /Fe$@
++    copy deps\$(SQLITE_VERSION)\tool\lempar.c $(prefix)\lempar.c
++
++$(TARGET_FTS5): $(TARGET_LEMON) $(TCLSH_PATH) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_PATH) $(prefix)
++    $(TARGET_LEMON) deps\$(SQLITE_VERSION)\ext\fts5\fts5parse.y
++
++    powershell -Command "$$CWD = pwd; cd deps\$(SQLITE_VERSION)\ext\fts5; & $$CWD\$(TCLSH_PATH) $$CWD\deps\$(SQLITE_VERSION)\ext\fts5\tool\mkfts5c.tcl"
++    cl /DSQLITE_TEST -I$(SQLITE_AMALGAMATION_PATH) /LD /Fe$(TARGET_FTS5) deps\$(SQLITE_VERSION)\ext\fts5\fts5.c
++
++test: $(TARGET_FTS5) $(TARGET_LOADABLE)
++    bun test
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/README.md b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/README.md
+new file mode 100755
+index 0000000..4881922
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/README.md
+@@ -0,0 +1,67 @@
++# HTML Tokenizer for SQLite3 FTS5
++
++This is a pseudo tokenizer that can be used with SQLite3's FTS5
++extension to index HTML documents. It understands just enough HTML to
++extract the text from the document and ignore the markup.
++
++This is a direct fork of https://github.com/gyf304/sqlite3-fts5-html without almost no modifications. All credit goes to the original author.
++
++## Getting started
++
++### Prerequisites
++
++- Lemon
++- Tcl
++
++### Build
++
++First install the prerequisites:
++
++```sh
++# on macOS
++brew install lemon tcl-tk
++# on Ubuntu Linux
++sudo apt install lemon tcl
++```
++
++Then build the tokenizer:
++
++```sh
++make loadable
++```
++
++### Usage
++
++Load the `fts5-html.so` or `fts5-html.dylib` file as a loadable SQLite extension (e.g. `.load fts5-html.so`).
++
++Then specify it when creating your FTS5 virtual table:
++
++```sql
++CREATE VIRTUAL TABLE t1 USING fts5(
++  content,
++  -- html itself is not a tokenizer
++  -- it must be must be used with another tokenizer
++  tokenize = 'html unicode61 remove_diacritics 1'
++)
++```
++
++## Contributing
++
++All kinds of PRs are welcome, of course. Just make sure all the tests pass. You can run the tests like this:
++
++```sh
++make test
++```
++
++## License
++
++```
++2024-10-21
++
++The author disclaims copyright to this source code.  In place of
++a legal notice, here is a blessing:
++
++    May you do good and not evil.
++    May you find forgiveness for yourself and forgive others.
++    May you share freely, never taking more than you give.
++```
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/VERSION b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/VERSION
+new file mode 100755
+index 0000000..4e379d2
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/VERSION
+@@ -0,0 +1 @@
++0.0.2
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.c b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.c
+new file mode 100755
+index 0000000..a426025
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.c
+@@ -0,0 +1,2677 @@
++/*
++** 2023-12-25
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*/
++#include "fts5-html.h"
++#include 
++#include 
++
++#ifndef SQLITE_CORE
++#include "sqlite3ext.h"
++SQLITE_EXTENSION_INIT1
++#else
++#include "sqlite3.h"
++#endif
++
++#define UNUSED_PARAM(x) (void)(x)
++
++#ifndef SQLITE_PRIVATE
++#define SQLITE_PRIVATE static
++#endif
++
++/* START OF HTML ENTITIES */
++struct htmlEntity {
++	const char *pzName;
++	const char *pzUtf8;
++};
++typedef struct htmlEntity htmlEntity;
++
++static const htmlEntity htmlEntities[] = {
++	{"AElig", "\xc3\x86"},
++	{"AMP", "\x26"},
++	{"Aacute", "\xc3\x81"},
++	{"Abreve", "\xc4\x82"},
++	{"Acirc", "\xc3\x82"},
++	{"Acy", "\xd0\x90"},
++	{"Afr", "\xf0\x9d\x94\x84"},
++	{"Agrave", "\xc3\x80"},
++	{"Alpha", "\xce\x91"},
++	{"Amacr", "\xc4\x80"},
++	{"And", "\xe2\xa9\x93"},
++	{"Aogon", "\xc4\x84"},
++	{"Aopf", "\xf0\x9d\x94\xb8"},
++	{"ApplyFunction", "\xe2\x81\xa1"},
++	{"Aring", "\xc3\x85"},
++	{"Ascr", "\xf0\x9d\x92\x9c"},
++	{"Assign", "\xe2\x89\x94"},
++	{"Atilde", "\xc3\x83"},
++	{"Auml", "\xc3\x84"},
++	{"Backslash", "\xe2\x88\x96"},
++	{"Barv", "\xe2\xab\xa7"},
++	{"Barwed", "\xe2\x8c\x86"},
++	{"Bcy", "\xd0\x91"},
++	{"Because", "\xe2\x88\xb5"},
++	{"Bernoullis", "\xe2\x84\xac"},
++	{"Beta", "\xce\x92"},
++	{"Bfr", "\xf0\x9d\x94\x85"},
++	{"Bopf", "\xf0\x9d\x94\xb9"},
++	{"Breve", "\xcb\x98"},
++	{"Bscr", "\xe2\x84\xac"},
++	{"Bumpeq", "\xe2\x89\x8e"},
++	{"CHcy", "\xd0\xa7"},
++	{"COPY", "\xc2\xa9"},
++	{"Cacute", "\xc4\x86"},
++	{"Cap", "\xe2\x8b\x92"},
++	{"CapitalDifferentialD", "\xe2\x85\x85"},
++	{"Cayleys", "\xe2\x84\xad"},
++	{"Ccaron", "\xc4\x8c"},
++	{"Ccedil", "\xc3\x87"},
++	{"Ccirc", "\xc4\x88"},
++	{"Cconint", "\xe2\x88\xb0"},
++	{"Cdot", "\xc4\x8a"},
++	{"Cedilla", "\xc2\xb8"},
++	{"CenterDot", "\xc2\xb7"},
++	{"Cfr", "\xe2\x84\xad"},
++	{"Chi", "\xce\xa7"},
++	{"CircleDot", "\xe2\x8a\x99"},
++	{"CircleMinus", "\xe2\x8a\x96"},
++	{"CirclePlus", "\xe2\x8a\x95"},
++	{"CircleTimes", "\xe2\x8a\x97"},
++	{"ClockwiseContourIntegral", "\xe2\x88\xb2"},
++	{"CloseCurlyDoubleQuote", "\xe2\x80\x9d"},
++	{"CloseCurlyQuote", "\xe2\x80\x99"},
++	{"Colon", "\xe2\x88\xb7"},
++	{"Colone", "\xe2\xa9\xb4"},
++	{"Congruent", "\xe2\x89\xa1"},
++	{"Conint", "\xe2\x88\xaf"},
++	{"ContourIntegral", "\xe2\x88\xae"},
++	{"Copf", "\xe2\x84\x82"},
++	{"Coproduct", "\xe2\x88\x90"},
++	{"CounterClockwiseContourIntegral", "\xe2\x88\xb3"},
++	{"Cross", "\xe2\xa8\xaf"},
++	{"Cscr", "\xf0\x9d\x92\x9e"},
++	{"Cup", "\xe2\x8b\x93"},
++	{"CupCap", "\xe2\x89\x8d"},
++	{"DD", "\xe2\x85\x85"},
++	{"DDotrahd", "\xe2\xa4\x91"},
++	{"DJcy", "\xd0\x82"},
++	{"DScy", "\xd0\x85"},
++	{"DZcy", "\xd0\x8f"},
++	{"Dagger", "\xe2\x80\xa1"},
++	{"Darr", "\xe2\x86\xa1"},
++	{"Dashv", "\xe2\xab\xa4"},
++	{"Dcaron", "\xc4\x8e"},
++	{"Dcy", "\xd0\x94"},
++	{"Del", "\xe2\x88\x87"},
++	{"Delta", "\xce\x94"},
++	{"Dfr", "\xf0\x9d\x94\x87"},
++	{"DiacriticalAcute", "\xc2\xb4"},
++	{"DiacriticalDot", "\xcb\x99"},
++	{"DiacriticalDoubleAcute", "\xcb\x9d"},
++	{"DiacriticalGrave", "\x60"},
++	{"DiacriticalTilde", "\xcb\x9c"},
++	{"Diamond", "\xe2\x8b\x84"},
++	{"DifferentialD", "\xe2\x85\x86"},
++	{"Dopf", "\xf0\x9d\x94\xbb"},
++	{"Dot", "\xc2\xa8"},
++	{"DotDot", "\xe2\x83\x9c"},
++	{"DotEqual", "\xe2\x89\x90"},
++	{"DoubleContourIntegral", "\xe2\x88\xaf"},
++	{"DoubleDot", "\xc2\xa8"},
++	{"DoubleDownArrow", "\xe2\x87\x93"},
++	{"DoubleLeftArrow", "\xe2\x87\x90"},
++	{"DoubleLeftRightArrow", "\xe2\x87\x94"},
++	{"DoubleLeftTee", "\xe2\xab\xa4"},
++	{"DoubleLongLeftArrow", "\xe2\x9f\xb8"},
++	{"DoubleLongLeftRightArrow", "\xe2\x9f\xba"},
++	{"DoubleLongRightArrow", "\xe2\x9f\xb9"},
++	{"DoubleRightArrow", "\xe2\x87\x92"},
++	{"DoubleRightTee", "\xe2\x8a\xa8"},
++	{"DoubleUpArrow", "\xe2\x87\x91"},
++	{"DoubleUpDownArrow", "\xe2\x87\x95"},
++	{"DoubleVerticalBar", "\xe2\x88\xa5"},
++	{"DownArrow", "\xe2\x86\x93"},
++	{"DownArrowBar", "\xe2\xa4\x93"},
++	{"DownArrowUpArrow", "\xe2\x87\xb5"},
++	{"DownBreve", "\xcc\x91"},
++	{"DownLeftRightVector", "\xe2\xa5\x90"},
++	{"DownLeftTeeVector", "\xe2\xa5\x9e"},
++	{"DownLeftVector", "\xe2\x86\xbd"},
++	{"DownLeftVectorBar", "\xe2\xa5\x96"},
++	{"DownRightTeeVector", "\xe2\xa5\x9f"},
++	{"DownRightVector", "\xe2\x87\x81"},
++	{"DownRightVectorBar", "\xe2\xa5\x97"},
++	{"DownTee", "\xe2\x8a\xa4"},
++	{"DownTeeArrow", "\xe2\x86\xa7"},
++	{"Downarrow", "\xe2\x87\x93"},
++	{"Dscr", "\xf0\x9d\x92\x9f"},
++	{"Dstrok", "\xc4\x90"},
++	{"ENG", "\xc5\x8a"},
++	{"ETH", "\xc3\x90"},
++	{"Eacute", "\xc3\x89"},
++	{"Ecaron", "\xc4\x9a"},
++	{"Ecirc", "\xc3\x8a"},
++	{"Ecy", "\xd0\xad"},
++	{"Edot", "\xc4\x96"},
++	{"Efr", "\xf0\x9d\x94\x88"},
++	{"Egrave", "\xc3\x88"},
++	{"Element", "\xe2\x88\x88"},
++	{"Emacr", "\xc4\x92"},
++	{"EmptySmallSquare", "\xe2\x97\xbb"},
++	{"EmptyVerySmallSquare", "\xe2\x96\xab"},
++	{"Eogon", "\xc4\x98"},
++	{"Eopf", "\xf0\x9d\x94\xbc"},
++	{"Epsilon", "\xce\x95"},
++	{"Equal", "\xe2\xa9\xb5"},
++	{"EqualTilde", "\xe2\x89\x82"},
++	{"Equilibrium", "\xe2\x87\x8c"},
++	{"Escr", "\xe2\x84\xb0"},
++	{"Esim", "\xe2\xa9\xb3"},
++	{"Eta", "\xce\x97"},
++	{"Euml", "\xc3\x8b"},
++	{"Exists", "\xe2\x88\x83"},
++	{"ExponentialE", "\xe2\x85\x87"},
++	{"Fcy", "\xd0\xa4"},
++	{"Ffr", "\xf0\x9d\x94\x89"},
++	{"FilledSmallSquare", "\xe2\x97\xbc"},
++	{"FilledVerySmallSquare", "\xe2\x96\xaa"},
++	{"Fopf", "\xf0\x9d\x94\xbd"},
++	{"ForAll", "\xe2\x88\x80"},
++	{"Fouriertrf", "\xe2\x84\xb1"},
++	{"Fscr", "\xe2\x84\xb1"},
++	{"GJcy", "\xd0\x83"},
++	{"GT", "\x3e"},
++	{"Gamma", "\xce\x93"},
++	{"Gammad", "\xcf\x9c"},
++	{"Gbreve", "\xc4\x9e"},
++	{"Gcedil", "\xc4\xa2"},
++	{"Gcirc", "\xc4\x9c"},
++	{"Gcy", "\xd0\x93"},
++	{"Gdot", "\xc4\xa0"},
++	{"Gfr", "\xf0\x9d\x94\x8a"},
++	{"Gg", "\xe2\x8b\x99"},
++	{"Gopf", "\xf0\x9d\x94\xbe"},
++	{"GreaterEqual", "\xe2\x89\xa5"},
++	{"GreaterEqualLess", "\xe2\x8b\x9b"},
++	{"GreaterFullEqual", "\xe2\x89\xa7"},
++	{"GreaterGreater", "\xe2\xaa\xa2"},
++	{"GreaterLess", "\xe2\x89\xb7"},
++	{"GreaterSlantEqual", "\xe2\xa9\xbe"},
++	{"GreaterTilde", "\xe2\x89\xb3"},
++	{"Gscr", "\xf0\x9d\x92\xa2"},
++	{"Gt", "\xe2\x89\xab"},
++	{"HARDcy", "\xd0\xaa"},
++	{"Hacek", "\xcb\x87"},
++	{"Hat", "\x5e"},
++	{"Hcirc", "\xc4\xa4"},
++	{"Hfr", "\xe2\x84\x8c"},
++	{"HilbertSpace", "\xe2\x84\x8b"},
++	{"Hopf", "\xe2\x84\x8d"},
++	{"HorizontalLine", "\xe2\x94\x80"},
++	{"Hscr", "\xe2\x84\x8b"},
++	{"Hstrok", "\xc4\xa6"},
++	{"HumpDownHump", "\xe2\x89\x8e"},
++	{"HumpEqual", "\xe2\x89\x8f"},
++	{"IEcy", "\xd0\x95"},
++	{"IJlig", "\xc4\xb2"},
++	{"IOcy", "\xd0\x81"},
++	{"Iacute", "\xc3\x8d"},
++	{"Icirc", "\xc3\x8e"},
++	{"Icy", "\xd0\x98"},
++	{"Idot", "\xc4\xb0"},
++	{"Ifr", "\xe2\x84\x91"},
++	{"Igrave", "\xc3\x8c"},
++	{"Im", "\xe2\x84\x91"},
++	{"Imacr", "\xc4\xaa"},
++	{"ImaginaryI", "\xe2\x85\x88"},
++	{"Implies", "\xe2\x87\x92"},
++	{"Int", "\xe2\x88\xac"},
++	{"Integral", "\xe2\x88\xab"},
++	{"Intersection", "\xe2\x8b\x82"},
++	{"InvisibleComma", "\xe2\x81\xa3"},
++	{"InvisibleTimes", "\xe2\x81\xa2"},
++	{"Iogon", "\xc4\xae"},
++	{"Iopf", "\xf0\x9d\x95\x80"},
++	{"Iota", "\xce\x99"},
++	{"Iscr", "\xe2\x84\x90"},
++	{"Itilde", "\xc4\xa8"},
++	{"Iukcy", "\xd0\x86"},
++	{"Iuml", "\xc3\x8f"},
++	{"Jcirc", "\xc4\xb4"},
++	{"Jcy", "\xd0\x99"},
++	{"Jfr", "\xf0\x9d\x94\x8d"},
++	{"Jopf", "\xf0\x9d\x95\x81"},
++	{"Jscr", "\xf0\x9d\x92\xa5"},
++	{"Jsercy", "\xd0\x88"},
++	{"Jukcy", "\xd0\x84"},
++	{"KHcy", "\xd0\xa5"},
++	{"KJcy", "\xd0\x8c"},
++	{"Kappa", "\xce\x9a"},
++	{"Kcedil", "\xc4\xb6"},
++	{"Kcy", "\xd0\x9a"},
++	{"Kfr", "\xf0\x9d\x94\x8e"},
++	{"Kopf", "\xf0\x9d\x95\x82"},
++	{"Kscr", "\xf0\x9d\x92\xa6"},
++	{"LJcy", "\xd0\x89"},
++	{"LT", "\x3c"},
++	{"Lacute", "\xc4\xb9"},
++	{"Lambda", "\xce\x9b"},
++	{"Lang", "\xe2\x9f\xaa"},
++	{"Laplacetrf", "\xe2\x84\x92"},
++	{"Larr", "\xe2\x86\x9e"},
++	{"Lcaron", "\xc4\xbd"},
++	{"Lcedil", "\xc4\xbb"},
++	{"Lcy", "\xd0\x9b"},
++	{"LeftAngleBracket", "\xe2\x9f\xa8"},
++	{"LeftArrow", "\xe2\x86\x90"},
++	{"LeftArrowBar", "\xe2\x87\xa4"},
++	{"LeftArrowRightArrow", "\xe2\x87\x86"},
++	{"LeftCeiling", "\xe2\x8c\x88"},
++	{"LeftDoubleBracket", "\xe2\x9f\xa6"},
++	{"LeftDownTeeVector", "\xe2\xa5\xa1"},
++	{"LeftDownVector", "\xe2\x87\x83"},
++	{"LeftDownVectorBar", "\xe2\xa5\x99"},
++	{"LeftFloor", "\xe2\x8c\x8a"},
++	{"LeftRightArrow", "\xe2\x86\x94"},
++	{"LeftRightVector", "\xe2\xa5\x8e"},
++	{"LeftTee", "\xe2\x8a\xa3"},
++	{"LeftTeeArrow", "\xe2\x86\xa4"},
++	{"LeftTeeVector", "\xe2\xa5\x9a"},
++	{"LeftTriangle", "\xe2\x8a\xb2"},
++	{"LeftTriangleBar", "\xe2\xa7\x8f"},
++	{"LeftTriangleEqual", "\xe2\x8a\xb4"},
++	{"LeftUpDownVector", "\xe2\xa5\x91"},
++	{"LeftUpTeeVector", "\xe2\xa5\xa0"},
++	{"LeftUpVector", "\xe2\x86\xbf"},
++	{"LeftUpVectorBar", "\xe2\xa5\x98"},
++	{"LeftVector", "\xe2\x86\xbc"},
++	{"LeftVectorBar", "\xe2\xa5\x92"},
++	{"Leftarrow", "\xe2\x87\x90"},
++	{"Leftrightarrow", "\xe2\x87\x94"},
++	{"LessEqualGreater", "\xe2\x8b\x9a"},
++	{"LessFullEqual", "\xe2\x89\xa6"},
++	{"LessGreater", "\xe2\x89\xb6"},
++	{"LessLess", "\xe2\xaa\xa1"},
++	{"LessSlantEqual", "\xe2\xa9\xbd"},
++	{"LessTilde", "\xe2\x89\xb2"},
++	{"Lfr", "\xf0\x9d\x94\x8f"},
++	{"Ll", "\xe2\x8b\x98"},
++	{"Lleftarrow", "\xe2\x87\x9a"},
++	{"Lmidot", "\xc4\xbf"},
++	{"LongLeftArrow", "\xe2\x9f\xb5"},
++	{"LongLeftRightArrow", "\xe2\x9f\xb7"},
++	{"LongRightArrow", "\xe2\x9f\xb6"},
++	{"Longleftarrow", "\xe2\x9f\xb8"},
++	{"Longleftrightarrow", "\xe2\x9f\xba"},
++	{"Longrightarrow", "\xe2\x9f\xb9"},
++	{"Lopf", "\xf0\x9d\x95\x83"},
++	{"LowerLeftArrow", "\xe2\x86\x99"},
++	{"LowerRightArrow", "\xe2\x86\x98"},
++	{"Lscr", "\xe2\x84\x92"},
++	{"Lsh", "\xe2\x86\xb0"},
++	{"Lstrok", "\xc5\x81"},
++	{"Lt", "\xe2\x89\xaa"},
++	{"Map", "\xe2\xa4\x85"},
++	{"Mcy", "\xd0\x9c"},
++	{"MediumSpace", "\xe2\x81\x9f"},
++	{"Mellintrf", "\xe2\x84\xb3"},
++	{"Mfr", "\xf0\x9d\x94\x90"},
++	{"MinusPlus", "\xe2\x88\x93"},
++	{"Mopf", "\xf0\x9d\x95\x84"},
++	{"Mscr", "\xe2\x84\xb3"},
++	{"Mu", "\xce\x9c"},
++	{"NJcy", "\xd0\x8a"},
++	{"Nacute", "\xc5\x83"},
++	{"Ncaron", "\xc5\x87"},
++	{"Ncedil", "\xc5\x85"},
++	{"Ncy", "\xd0\x9d"},
++	{"NegativeMediumSpace", "\xe2\x80\x8b"},
++	{"NegativeThickSpace", "\xe2\x80\x8b"},
++	{"NegativeThinSpace", "\xe2\x80\x8b"},
++	{"NegativeVeryThinSpace", "\xe2\x80\x8b"},
++	{"NestedGreaterGreater", "\xe2\x89\xab"},
++	{"NestedLessLess", "\xe2\x89\xaa"},
++	{"NewLine", "\x0a"},
++	{"Nfr", "\xf0\x9d\x94\x91"},
++	{"NoBreak", "\xe2\x81\xa0"},
++	{"NonBreakingSpace", "\xc2\xa0"},
++	{"Nopf", "\xe2\x84\x95"},
++	{"Not", "\xe2\xab\xac"},
++	{"NotCongruent", "\xe2\x89\xa2"},
++	{"NotCupCap", "\xe2\x89\xad"},
++	{"NotDoubleVerticalBar", "\xe2\x88\xa6"},
++	{"NotElement", "\xe2\x88\x89"},
++	{"NotEqual", "\xe2\x89\xa0"},
++	{"NotEqualTilde", "\xe2\x89\x82\xcc\xb8"},
++	{"NotExists", "\xe2\x88\x84"},
++	{"NotGreater", "\xe2\x89\xaf"},
++	{"NotGreaterEqual", "\xe2\x89\xb1"},
++	{"NotGreaterFullEqual", "\xe2\x89\xa7\xcc\xb8"},
++	{"NotGreaterGreater", "\xe2\x89\xab\xcc\xb8"},
++	{"NotGreaterLess", "\xe2\x89\xb9"},
++	{"NotGreaterSlantEqual", "\xe2\xa9\xbe\xcc\xb8"},
++	{"NotGreaterTilde", "\xe2\x89\xb5"},
++	{"NotHumpDownHump", "\xe2\x89\x8e\xcc\xb8"},
++	{"NotHumpEqual", "\xe2\x89\x8f\xcc\xb8"},
++	{"NotLeftTriangle", "\xe2\x8b\xaa"},
++	{"NotLeftTriangleBar", "\xe2\xa7\x8f\xcc\xb8"},
++	{"NotLeftTriangleEqual", "\xe2\x8b\xac"},
++	{"NotLess", "\xe2\x89\xae"},
++	{"NotLessEqual", "\xe2\x89\xb0"},
++	{"NotLessGreater", "\xe2\x89\xb8"},
++	{"NotLessLess", "\xe2\x89\xaa\xcc\xb8"},
++	{"NotLessSlantEqual", "\xe2\xa9\xbd\xcc\xb8"},
++	{"NotLessTilde", "\xe2\x89\xb4"},
++	{"NotNestedGreaterGreater", "\xe2\xaa\xa2\xcc\xb8"},
++	{"NotNestedLessLess", "\xe2\xaa\xa1\xcc\xb8"},
++	{"NotPrecedes", "\xe2\x8a\x80"},
++	{"NotPrecedesEqual", "\xe2\xaa\xaf\xcc\xb8"},
++	{"NotPrecedesSlantEqual", "\xe2\x8b\xa0"},
++	{"NotReverseElement", "\xe2\x88\x8c"},
++	{"NotRightTriangle", "\xe2\x8b\xab"},
++	{"NotRightTriangleBar", "\xe2\xa7\x90\xcc\xb8"},
++	{"NotRightTriangleEqual", "\xe2\x8b\xad"},
++	{"NotSquareSubset", "\xe2\x8a\x8f\xcc\xb8"},
++	{"NotSquareSubsetEqual", "\xe2\x8b\xa2"},
++	{"NotSquareSuperset", "\xe2\x8a\x90\xcc\xb8"},
++	{"NotSquareSupersetEqual", "\xe2\x8b\xa3"},
++	{"NotSubset", "\xe2\x8a\x82\xe2\x83\x92"},
++	{"NotSubsetEqual", "\xe2\x8a\x88"},
++	{"NotSucceeds", "\xe2\x8a\x81"},
++	{"NotSucceedsEqual", "\xe2\xaa\xb0\xcc\xb8"},
++	{"NotSucceedsSlantEqual", "\xe2\x8b\xa1"},
++	{"NotSucceedsTilde", "\xe2\x89\xbf\xcc\xb8"},
++	{"NotSuperset", "\xe2\x8a\x83\xe2\x83\x92"},
++	{"NotSupersetEqual", "\xe2\x8a\x89"},
++	{"NotTilde", "\xe2\x89\x81"},
++	{"NotTildeEqual", "\xe2\x89\x84"},
++	{"NotTildeFullEqual", "\xe2\x89\x87"},
++	{"NotTildeTilde", "\xe2\x89\x89"},
++	{"NotVerticalBar", "\xe2\x88\xa4"},
++	{"Nscr", "\xf0\x9d\x92\xa9"},
++	{"Ntilde", "\xc3\x91"},
++	{"Nu", "\xce\x9d"},
++	{"OElig", "\xc5\x92"},
++	{"Oacute", "\xc3\x93"},
++	{"Ocirc", "\xc3\x94"},
++	{"Ocy", "\xd0\x9e"},
++	{"Odblac", "\xc5\x90"},
++	{"Ofr", "\xf0\x9d\x94\x92"},
++	{"Ograve", "\xc3\x92"},
++	{"Omacr", "\xc5\x8c"},
++	{"Omega", "\xce\xa9"},
++	{"Omicron", "\xce\x9f"},
++	{"Oopf", "\xf0\x9d\x95\x86"},
++	{"OpenCurlyDoubleQuote", "\xe2\x80\x9c"},
++	{"OpenCurlyQuote", "\xe2\x80\x98"},
++	{"Or", "\xe2\xa9\x94"},
++	{"Oscr", "\xf0\x9d\x92\xaa"},
++	{"Oslash", "\xc3\x98"},
++	{"Otilde", "\xc3\x95"},
++	{"Otimes", "\xe2\xa8\xb7"},
++	{"Ouml", "\xc3\x96"},
++	{"OverBar", "\xe2\x80\xbe"},
++	{"OverBrace", "\xe2\x8f\x9e"},
++	{"OverBracket", "\xe2\x8e\xb4"},
++	{"OverParenthesis", "\xe2\x8f\x9c"},
++	{"PartialD", "\xe2\x88\x82"},
++	{"Pcy", "\xd0\x9f"},
++	{"Pfr", "\xf0\x9d\x94\x93"},
++	{"Phi", "\xce\xa6"},
++	{"Pi", "\xce\xa0"},
++	{"PlusMinus", "\xc2\xb1"},
++	{"Poincareplane", "\xe2\x84\x8c"},
++	{"Popf", "\xe2\x84\x99"},
++	{"Pr", "\xe2\xaa\xbb"},
++	{"Precedes", "\xe2\x89\xba"},
++	{"PrecedesEqual", "\xe2\xaa\xaf"},
++	{"PrecedesSlantEqual", "\xe2\x89\xbc"},
++	{"PrecedesTilde", "\xe2\x89\xbe"},
++	{"Prime", "\xe2\x80\xb3"},
++	{"Product", "\xe2\x88\x8f"},
++	{"Proportion", "\xe2\x88\xb7"},
++	{"Proportional", "\xe2\x88\x9d"},
++	{"Pscr", "\xf0\x9d\x92\xab"},
++	{"Psi", "\xce\xa8"},
++	{"QUOT", "\x22"},
++	{"Qfr", "\xf0\x9d\x94\x94"},
++	{"Qopf", "\xe2\x84\x9a"},
++	{"Qscr", "\xf0\x9d\x92\xac"},
++	{"RBarr", "\xe2\xa4\x90"},
++	{"REG", "\xc2\xae"},
++	{"Racute", "\xc5\x94"},
++	{"Rang", "\xe2\x9f\xab"},
++	{"Rarr", "\xe2\x86\xa0"},
++	{"Rarrtl", "\xe2\xa4\x96"},
++	{"Rcaron", "\xc5\x98"},
++	{"Rcedil", "\xc5\x96"},
++	{"Rcy", "\xd0\xa0"},
++	{"Re", "\xe2\x84\x9c"},
++	{"ReverseElement", "\xe2\x88\x8b"},
++	{"ReverseEquilibrium", "\xe2\x87\x8b"},
++	{"ReverseUpEquilibrium", "\xe2\xa5\xaf"},
++	{"Rfr", "\xe2\x84\x9c"},
++	{"Rho", "\xce\xa1"},
++	{"RightAngleBracket", "\xe2\x9f\xa9"},
++	{"RightArrow", "\xe2\x86\x92"},
++	{"RightArrowBar", "\xe2\x87\xa5"},
++	{"RightArrowLeftArrow", "\xe2\x87\x84"},
++	{"RightCeiling", "\xe2\x8c\x89"},
++	{"RightDoubleBracket", "\xe2\x9f\xa7"},
++	{"RightDownTeeVector", "\xe2\xa5\x9d"},
++	{"RightDownVector", "\xe2\x87\x82"},
++	{"RightDownVectorBar", "\xe2\xa5\x95"},
++	{"RightFloor", "\xe2\x8c\x8b"},
++	{"RightTee", "\xe2\x8a\xa2"},
++	{"RightTeeArrow", "\xe2\x86\xa6"},
++	{"RightTeeVector", "\xe2\xa5\x9b"},
++	{"RightTriangle", "\xe2\x8a\xb3"},
++	{"RightTriangleBar", "\xe2\xa7\x90"},
++	{"RightTriangleEqual", "\xe2\x8a\xb5"},
++	{"RightUpDownVector", "\xe2\xa5\x8f"},
++	{"RightUpTeeVector", "\xe2\xa5\x9c"},
++	{"RightUpVector", "\xe2\x86\xbe"},
++	{"RightUpVectorBar", "\xe2\xa5\x94"},
++	{"RightVector", "\xe2\x87\x80"},
++	{"RightVectorBar", "\xe2\xa5\x93"},
++	{"Rightarrow", "\xe2\x87\x92"},
++	{"Ropf", "\xe2\x84\x9d"},
++	{"RoundImplies", "\xe2\xa5\xb0"},
++	{"Rrightarrow", "\xe2\x87\x9b"},
++	{"Rscr", "\xe2\x84\x9b"},
++	{"Rsh", "\xe2\x86\xb1"},
++	{"RuleDelayed", "\xe2\xa7\xb4"},
++	{"SHCHcy", "\xd0\xa9"},
++	{"SHcy", "\xd0\xa8"},
++	{"SOFTcy", "\xd0\xac"},
++	{"Sacute", "\xc5\x9a"},
++	{"Sc", "\xe2\xaa\xbc"},
++	{"Scaron", "\xc5\xa0"},
++	{"Scedil", "\xc5\x9e"},
++	{"Scirc", "\xc5\x9c"},
++	{"Scy", "\xd0\xa1"},
++	{"Sfr", "\xf0\x9d\x94\x96"},
++	{"ShortDownArrow", "\xe2\x86\x93"},
++	{"ShortLeftArrow", "\xe2\x86\x90"},
++	{"ShortRightArrow", "\xe2\x86\x92"},
++	{"ShortUpArrow", "\xe2\x86\x91"},
++	{"Sigma", "\xce\xa3"},
++	{"SmallCircle", "\xe2\x88\x98"},
++	{"Sopf", "\xf0\x9d\x95\x8a"},
++	{"Sqrt", "\xe2\x88\x9a"},
++	{"Square", "\xe2\x96\xa1"},
++	{"SquareIntersection", "\xe2\x8a\x93"},
++	{"SquareSubset", "\xe2\x8a\x8f"},
++	{"SquareSubsetEqual", "\xe2\x8a\x91"},
++	{"SquareSuperset", "\xe2\x8a\x90"},
++	{"SquareSupersetEqual", "\xe2\x8a\x92"},
++	{"SquareUnion", "\xe2\x8a\x94"},
++	{"Sscr", "\xf0\x9d\x92\xae"},
++	{"Star", "\xe2\x8b\x86"},
++	{"Sub", "\xe2\x8b\x90"},
++	{"Subset", "\xe2\x8b\x90"},
++	{"SubsetEqual", "\xe2\x8a\x86"},
++	{"Succeeds", "\xe2\x89\xbb"},
++	{"SucceedsEqual", "\xe2\xaa\xb0"},
++	{"SucceedsSlantEqual", "\xe2\x89\xbd"},
++	{"SucceedsTilde", "\xe2\x89\xbf"},
++	{"SuchThat", "\xe2\x88\x8b"},
++	{"Sum", "\xe2\x88\x91"},
++	{"Sup", "\xe2\x8b\x91"},
++	{"Superset", "\xe2\x8a\x83"},
++	{"SupersetEqual", "\xe2\x8a\x87"},
++	{"Supset", "\xe2\x8b\x91"},
++	{"THORN", "\xc3\x9e"},
++	{"TRADE", "\xe2\x84\xa2"},
++	{"TSHcy", "\xd0\x8b"},
++	{"TScy", "\xd0\xa6"},
++	{"Tab", "\x09"},
++	{"Tau", "\xce\xa4"},
++	{"Tcaron", "\xc5\xa4"},
++	{"Tcedil", "\xc5\xa2"},
++	{"Tcy", "\xd0\xa2"},
++	{"Tfr", "\xf0\x9d\x94\x97"},
++	{"Therefore", "\xe2\x88\xb4"},
++	{"Theta", "\xce\x98"},
++	{"ThickSpace", "\xe2\x81\x9f\xe2\x80\x8a"},
++	{"ThinSpace", "\xe2\x80\x89"},
++	{"Tilde", "\xe2\x88\xbc"},
++	{"TildeEqual", "\xe2\x89\x83"},
++	{"TildeFullEqual", "\xe2\x89\x85"},
++	{"TildeTilde", "\xe2\x89\x88"},
++	{"Topf", "\xf0\x9d\x95\x8b"},
++	{"TripleDot", "\xe2\x83\x9b"},
++	{"Tscr", "\xf0\x9d\x92\xaf"},
++	{"Tstrok", "\xc5\xa6"},
++	{"Uacute", "\xc3\x9a"},
++	{"Uarr", "\xe2\x86\x9f"},
++	{"Uarrocir", "\xe2\xa5\x89"},
++	{"Ubrcy", "\xd0\x8e"},
++	{"Ubreve", "\xc5\xac"},
++	{"Ucirc", "\xc3\x9b"},
++	{"Ucy", "\xd0\xa3"},
++	{"Udblac", "\xc5\xb0"},
++	{"Ufr", "\xf0\x9d\x94\x98"},
++	{"Ugrave", "\xc3\x99"},
++	{"Umacr", "\xc5\xaa"},
++	{"UnderBar", "\x5f"},
++	{"UnderBrace", "\xe2\x8f\x9f"},
++	{"UnderBracket", "\xe2\x8e\xb5"},
++	{"UnderParenthesis", "\xe2\x8f\x9d"},
++	{"Union", "\xe2\x8b\x83"},
++	{"UnionPlus", "\xe2\x8a\x8e"},
++	{"Uogon", "\xc5\xb2"},
++	{"Uopf", "\xf0\x9d\x95\x8c"},
++	{"UpArrow", "\xe2\x86\x91"},
++	{"UpArrowBar", "\xe2\xa4\x92"},
++	{"UpArrowDownArrow", "\xe2\x87\x85"},
++	{"UpDownArrow", "\xe2\x86\x95"},
++	{"UpEquilibrium", "\xe2\xa5\xae"},
++	{"UpTee", "\xe2\x8a\xa5"},
++	{"UpTeeArrow", "\xe2\x86\xa5"},
++	{"Uparrow", "\xe2\x87\x91"},
++	{"Updownarrow", "\xe2\x87\x95"},
++	{"UpperLeftArrow", "\xe2\x86\x96"},
++	{"UpperRightArrow", "\xe2\x86\x97"},
++	{"Upsi", "\xcf\x92"},
++	{"Upsilon", "\xce\xa5"},
++	{"Uring", "\xc5\xae"},
++	{"Uscr", "\xf0\x9d\x92\xb0"},
++	{"Utilde", "\xc5\xa8"},
++	{"Uuml", "\xc3\x9c"},
++	{"VDash", "\xe2\x8a\xab"},
++	{"Vbar", "\xe2\xab\xab"},
++	{"Vcy", "\xd0\x92"},
++	{"Vdash", "\xe2\x8a\xa9"},
++	{"Vdashl", "\xe2\xab\xa6"},
++	{"Vee", "\xe2\x8b\x81"},
++	{"Verbar", "\xe2\x80\x96"},
++	{"Vert", "\xe2\x80\x96"},
++	{"VerticalBar", "\xe2\x88\xa3"},
++	{"VerticalLine", "\x7c"},
++	{"VerticalSeparator", "\xe2\x9d\x98"},
++	{"VerticalTilde", "\xe2\x89\x80"},
++	{"VeryThinSpace", "\xe2\x80\x8a"},
++	{"Vfr", "\xf0\x9d\x94\x99"},
++	{"Vopf", "\xf0\x9d\x95\x8d"},
++	{"Vscr", "\xf0\x9d\x92\xb1"},
++	{"Vvdash", "\xe2\x8a\xaa"},
++	{"Wcirc", "\xc5\xb4"},
++	{"Wedge", "\xe2\x8b\x80"},
++	{"Wfr", "\xf0\x9d\x94\x9a"},
++	{"Wopf", "\xf0\x9d\x95\x8e"},
++	{"Wscr", "\xf0\x9d\x92\xb2"},
++	{"Xfr", "\xf0\x9d\x94\x9b"},
++	{"Xi", "\xce\x9e"},
++	{"Xopf", "\xf0\x9d\x95\x8f"},
++	{"Xscr", "\xf0\x9d\x92\xb3"},
++	{"YAcy", "\xd0\xaf"},
++	{"YIcy", "\xd0\x87"},
++	{"YUcy", "\xd0\xae"},
++	{"Yacute", "\xc3\x9d"},
++	{"Ycirc", "\xc5\xb6"},
++	{"Ycy", "\xd0\xab"},
++	{"Yfr", "\xf0\x9d\x94\x9c"},
++	{"Yopf", "\xf0\x9d\x95\x90"},
++	{"Yscr", "\xf0\x9d\x92\xb4"},
++	{"Yuml", "\xc5\xb8"},
++	{"ZHcy", "\xd0\x96"},
++	{"Zacute", "\xc5\xb9"},
++	{"Zcaron", "\xc5\xbd"},
++	{"Zcy", "\xd0\x97"},
++	{"Zdot", "\xc5\xbb"},
++	{"ZeroWidthSpace", "\xe2\x80\x8b"},
++	{"Zeta", "\xce\x96"},
++	{"Zfr", "\xe2\x84\xa8"},
++	{"Zopf", "\xe2\x84\xa4"},
++	{"Zscr", "\xf0\x9d\x92\xb5"},
++	{"aacute", "\xc3\xa1"},
++	{"abreve", "\xc4\x83"},
++	{"ac", "\xe2\x88\xbe"},
++	{"acE", "\xe2\x88\xbe\xcc\xb3"},
++	{"acd", "\xe2\x88\xbf"},
++	{"acirc", "\xc3\xa2"},
++	{"acute", "\xc2\xb4"},
++	{"acy", "\xd0\xb0"},
++	{"aelig", "\xc3\xa6"},
++	{"af", "\xe2\x81\xa1"},
++	{"afr", "\xf0\x9d\x94\x9e"},
++	{"agrave", "\xc3\xa0"},
++	{"alefsym", "\xe2\x84\xb5"},
++	{"aleph", "\xe2\x84\xb5"},
++	{"alpha", "\xce\xb1"},
++	{"amacr", "\xc4\x81"},
++	{"amalg", "\xe2\xa8\xbf"},
++	{"amp", "\x26"},
++	{"and", "\xe2\x88\xa7"},
++	{"andand", "\xe2\xa9\x95"},
++	{"andd", "\xe2\xa9\x9c"},
++	{"andslope", "\xe2\xa9\x98"},
++	{"andv", "\xe2\xa9\x9a"},
++	{"ang", "\xe2\x88\xa0"},
++	{"ange", "\xe2\xa6\xa4"},
++	{"angle", "\xe2\x88\xa0"},
++	{"angmsd", "\xe2\x88\xa1"},
++	{"angmsdaa", "\xe2\xa6\xa8"},
++	{"angmsdab", "\xe2\xa6\xa9"},
++	{"angmsdac", "\xe2\xa6\xaa"},
++	{"angmsdad", "\xe2\xa6\xab"},
++	{"angmsdae", "\xe2\xa6\xac"},
++	{"angmsdaf", "\xe2\xa6\xad"},
++	{"angmsdag", "\xe2\xa6\xae"},
++	{"angmsdah", "\xe2\xa6\xaf"},
++	{"angrt", "\xe2\x88\x9f"},
++	{"angrtvb", "\xe2\x8a\xbe"},
++	{"angrtvbd", "\xe2\xa6\x9d"},
++	{"angsph", "\xe2\x88\xa2"},
++	{"angst", "\xc3\x85"},
++	{"angzarr", "\xe2\x8d\xbc"},
++	{"aogon", "\xc4\x85"},
++	{"aopf", "\xf0\x9d\x95\x92"},
++	{"ap", "\xe2\x89\x88"},
++	{"apE", "\xe2\xa9\xb0"},
++	{"apacir", "\xe2\xa9\xaf"},
++	{"ape", "\xe2\x89\x8a"},
++	{"apid", "\xe2\x89\x8b"},
++	{"apos", "\x27"},
++	{"approx", "\xe2\x89\x88"},
++	{"approxeq", "\xe2\x89\x8a"},
++	{"aring", "\xc3\xa5"},
++	{"ascr", "\xf0\x9d\x92\xb6"},
++	{"ast", "\x2a"},
++	{"asymp", "\xe2\x89\x88"},
++	{"asympeq", "\xe2\x89\x8d"},
++	{"atilde", "\xc3\xa3"},
++	{"auml", "\xc3\xa4"},
++	{"awconint", "\xe2\x88\xb3"},
++	{"awint", "\xe2\xa8\x91"},
++	{"bNot", "\xe2\xab\xad"},
++	{"backcong", "\xe2\x89\x8c"},
++	{"backepsilon", "\xcf\xb6"},
++	{"backprime", "\xe2\x80\xb5"},
++	{"backsim", "\xe2\x88\xbd"},
++	{"backsimeq", "\xe2\x8b\x8d"},
++	{"barvee", "\xe2\x8a\xbd"},
++	{"barwed", "\xe2\x8c\x85"},
++	{"barwedge", "\xe2\x8c\x85"},
++	{"bbrk", "\xe2\x8e\xb5"},
++	{"bbrktbrk", "\xe2\x8e\xb6"},
++	{"bcong", "\xe2\x89\x8c"},
++	{"bcy", "\xd0\xb1"},
++	{"bdquo", "\xe2\x80\x9e"},
++	{"becaus", "\xe2\x88\xb5"},
++	{"because", "\xe2\x88\xb5"},
++	{"bemptyv", "\xe2\xa6\xb0"},
++	{"bepsi", "\xcf\xb6"},
++	{"bernou", "\xe2\x84\xac"},
++	{"beta", "\xce\xb2"},
++	{"beth", "\xe2\x84\xb6"},
++	{"between", "\xe2\x89\xac"},
++	{"bfr", "\xf0\x9d\x94\x9f"},
++	{"bigcap", "\xe2\x8b\x82"},
++	{"bigcirc", "\xe2\x97\xaf"},
++	{"bigcup", "\xe2\x8b\x83"},
++	{"bigodot", "\xe2\xa8\x80"},
++	{"bigoplus", "\xe2\xa8\x81"},
++	{"bigotimes", "\xe2\xa8\x82"},
++	{"bigsqcup", "\xe2\xa8\x86"},
++	{"bigstar", "\xe2\x98\x85"},
++	{"bigtriangledown", "\xe2\x96\xbd"},
++	{"bigtriangleup", "\xe2\x96\xb3"},
++	{"biguplus", "\xe2\xa8\x84"},
++	{"bigvee", "\xe2\x8b\x81"},
++	{"bigwedge", "\xe2\x8b\x80"},
++	{"bkarow", "\xe2\xa4\x8d"},
++	{"blacklozenge", "\xe2\xa7\xab"},
++	{"blacksquare", "\xe2\x96\xaa"},
++	{"blacktriangle", "\xe2\x96\xb4"},
++	{"blacktriangledown", "\xe2\x96\xbe"},
++	{"blacktriangleleft", "\xe2\x97\x82"},
++	{"blacktriangleright", "\xe2\x96\xb8"},
++	{"blank", "\xe2\x90\xa3"},
++	{"blk12", "\xe2\x96\x92"},
++	{"blk14", "\xe2\x96\x91"},
++	{"blk34", "\xe2\x96\x93"},
++	{"block", "\xe2\x96\x88"},
++	{"bne", "\x3d\xe2\x83\xa5"},
++	{"bnequiv", "\xe2\x89\xa1\xe2\x83\xa5"},
++	{"bnot", "\xe2\x8c\x90"},
++	{"bopf", "\xf0\x9d\x95\x93"},
++	{"bot", "\xe2\x8a\xa5"},
++	{"bottom", "\xe2\x8a\xa5"},
++	{"bowtie", "\xe2\x8b\x88"},
++	{"boxDL", "\xe2\x95\x97"},
++	{"boxDR", "\xe2\x95\x94"},
++	{"boxDl", "\xe2\x95\x96"},
++	{"boxDr", "\xe2\x95\x93"},
++	{"boxH", "\xe2\x95\x90"},
++	{"boxHD", "\xe2\x95\xa6"},
++	{"boxHU", "\xe2\x95\xa9"},
++	{"boxHd", "\xe2\x95\xa4"},
++	{"boxHu", "\xe2\x95\xa7"},
++	{"boxUL", "\xe2\x95\x9d"},
++	{"boxUR", "\xe2\x95\x9a"},
++	{"boxUl", "\xe2\x95\x9c"},
++	{"boxUr", "\xe2\x95\x99"},
++	{"boxV", "\xe2\x95\x91"},
++	{"boxVH", "\xe2\x95\xac"},
++	{"boxVL", "\xe2\x95\xa3"},
++	{"boxVR", "\xe2\x95\xa0"},
++	{"boxVh", "\xe2\x95\xab"},
++	{"boxVl", "\xe2\x95\xa2"},
++	{"boxVr", "\xe2\x95\x9f"},
++	{"boxbox", "\xe2\xa7\x89"},
++	{"boxdL", "\xe2\x95\x95"},
++	{"boxdR", "\xe2\x95\x92"},
++	{"boxdl", "\xe2\x94\x90"},
++	{"boxdr", "\xe2\x94\x8c"},
++	{"boxh", "\xe2\x94\x80"},
++	{"boxhD", "\xe2\x95\xa5"},
++	{"boxhU", "\xe2\x95\xa8"},
++	{"boxhd", "\xe2\x94\xac"},
++	{"boxhu", "\xe2\x94\xb4"},
++	{"boxminus", "\xe2\x8a\x9f"},
++	{"boxplus", "\xe2\x8a\x9e"},
++	{"boxtimes", "\xe2\x8a\xa0"},
++	{"boxuL", "\xe2\x95\x9b"},
++	{"boxuR", "\xe2\x95\x98"},
++	{"boxul", "\xe2\x94\x98"},
++	{"boxur", "\xe2\x94\x94"},
++	{"boxv", "\xe2\x94\x82"},
++	{"boxvH", "\xe2\x95\xaa"},
++	{"boxvL", "\xe2\x95\xa1"},
++	{"boxvR", "\xe2\x95\x9e"},
++	{"boxvh", "\xe2\x94\xbc"},
++	{"boxvl", "\xe2\x94\xa4"},
++	{"boxvr", "\xe2\x94\x9c"},
++	{"bprime", "\xe2\x80\xb5"},
++	{"breve", "\xcb\x98"},
++	{"brvbar", "\xc2\xa6"},
++	{"bscr", "\xf0\x9d\x92\xb7"},
++	{"bsemi", "\xe2\x81\x8f"},
++	{"bsim", "\xe2\x88\xbd"},
++	{"bsime", "\xe2\x8b\x8d"},
++	{"bsol", "\x5c"},
++	{"bsolb", "\xe2\xa7\x85"},
++	{"bsolhsub", "\xe2\x9f\x88"},
++	{"bull", "\xe2\x80\xa2"},
++	{"bullet", "\xe2\x80\xa2"},
++	{"bump", "\xe2\x89\x8e"},
++	{"bumpE", "\xe2\xaa\xae"},
++	{"bumpe", "\xe2\x89\x8f"},
++	{"bumpeq", "\xe2\x89\x8f"},
++	{"cacute", "\xc4\x87"},
++	{"cap", "\xe2\x88\xa9"},
++	{"capand", "\xe2\xa9\x84"},
++	{"capbrcup", "\xe2\xa9\x89"},
++	{"capcap", "\xe2\xa9\x8b"},
++	{"capcup", "\xe2\xa9\x87"},
++	{"capdot", "\xe2\xa9\x80"},
++	{"caps", "\xe2\x88\xa9\xef\xb8\x80"},
++	{"caret", "\xe2\x81\x81"},
++	{"caron", "\xcb\x87"},
++	{"ccaps", "\xe2\xa9\x8d"},
++	{"ccaron", "\xc4\x8d"},
++	{"ccedil", "\xc3\xa7"},
++	{"ccirc", "\xc4\x89"},
++	{"ccups", "\xe2\xa9\x8c"},
++	{"ccupssm", "\xe2\xa9\x90"},
++	{"cdot", "\xc4\x8b"},
++	{"cedil", "\xc2\xb8"},
++	{"cemptyv", "\xe2\xa6\xb2"},
++	{"cent", "\xc2\xa2"},
++	{"centerdot", "\xc2\xb7"},
++	{"cfr", "\xf0\x9d\x94\xa0"},
++	{"chcy", "\xd1\x87"},
++	{"check", "\xe2\x9c\x93"},
++	{"checkmark", "\xe2\x9c\x93"},
++	{"chi", "\xcf\x87"},
++	{"cir", "\xe2\x97\x8b"},
++	{"cirE", "\xe2\xa7\x83"},
++	{"circ", "\xcb\x86"},
++	{"circeq", "\xe2\x89\x97"},
++	{"circlearrowleft", "\xe2\x86\xba"},
++	{"circlearrowright", "\xe2\x86\xbb"},
++	{"circledR", "\xc2\xae"},
++	{"circledS", "\xe2\x93\x88"},
++	{"circledast", "\xe2\x8a\x9b"},
++	{"circledcirc", "\xe2\x8a\x9a"},
++	{"circleddash", "\xe2\x8a\x9d"},
++	{"cire", "\xe2\x89\x97"},
++	{"cirfnint", "\xe2\xa8\x90"},
++	{"cirmid", "\xe2\xab\xaf"},
++	{"cirscir", "\xe2\xa7\x82"},
++	{"clubs", "\xe2\x99\xa3"},
++	{"clubsuit", "\xe2\x99\xa3"},
++	{"colon", "\x3a"},
++	{"colone", "\xe2\x89\x94"},
++	{"coloneq", "\xe2\x89\x94"},
++	{"comma", "\x2c"},
++	{"commat", "\x40"},
++	{"comp", "\xe2\x88\x81"},
++	{"compfn", "\xe2\x88\x98"},
++	{"complement", "\xe2\x88\x81"},
++	{"complexes", "\xe2\x84\x82"},
++	{"cong", "\xe2\x89\x85"},
++	{"congdot", "\xe2\xa9\xad"},
++	{"conint", "\xe2\x88\xae"},
++	{"copf", "\xf0\x9d\x95\x94"},
++	{"coprod", "\xe2\x88\x90"},
++	{"copy", "\xc2\xa9"},
++	{"copysr", "\xe2\x84\x97"},
++	{"crarr", "\xe2\x86\xb5"},
++	{"cross", "\xe2\x9c\x97"},
++	{"cscr", "\xf0\x9d\x92\xb8"},
++	{"csub", "\xe2\xab\x8f"},
++	{"csube", "\xe2\xab\x91"},
++	{"csup", "\xe2\xab\x90"},
++	{"csupe", "\xe2\xab\x92"},
++	{"ctdot", "\xe2\x8b\xaf"},
++	{"cudarrl", "\xe2\xa4\xb8"},
++	{"cudarrr", "\xe2\xa4\xb5"},
++	{"cuepr", "\xe2\x8b\x9e"},
++	{"cuesc", "\xe2\x8b\x9f"},
++	{"cularr", "\xe2\x86\xb6"},
++	{"cularrp", "\xe2\xa4\xbd"},
++	{"cup", "\xe2\x88\xaa"},
++	{"cupbrcap", "\xe2\xa9\x88"},
++	{"cupcap", "\xe2\xa9\x86"},
++	{"cupcup", "\xe2\xa9\x8a"},
++	{"cupdot", "\xe2\x8a\x8d"},
++	{"cupor", "\xe2\xa9\x85"},
++	{"cups", "\xe2\x88\xaa\xef\xb8\x80"},
++	{"curarr", "\xe2\x86\xb7"},
++	{"curarrm", "\xe2\xa4\xbc"},
++	{"curlyeqprec", "\xe2\x8b\x9e"},
++	{"curlyeqsucc", "\xe2\x8b\x9f"},
++	{"curlyvee", "\xe2\x8b\x8e"},
++	{"curlywedge", "\xe2\x8b\x8f"},
++	{"curren", "\xc2\xa4"},
++	{"curvearrowleft", "\xe2\x86\xb6"},
++	{"curvearrowright", "\xe2\x86\xb7"},
++	{"cuvee", "\xe2\x8b\x8e"},
++	{"cuwed", "\xe2\x8b\x8f"},
++	{"cwconint", "\xe2\x88\xb2"},
++	{"cwint", "\xe2\x88\xb1"},
++	{"cylcty", "\xe2\x8c\xad"},
++	{"dArr", "\xe2\x87\x93"},
++	{"dHar", "\xe2\xa5\xa5"},
++	{"dagger", "\xe2\x80\xa0"},
++	{"daleth", "\xe2\x84\xb8"},
++	{"darr", "\xe2\x86\x93"},
++	{"dash", "\xe2\x80\x90"},
++	{"dashv", "\xe2\x8a\xa3"},
++	{"dbkarow", "\xe2\xa4\x8f"},
++	{"dblac", "\xcb\x9d"},
++	{"dcaron", "\xc4\x8f"},
++	{"dcy", "\xd0\xb4"},
++	{"dd", "\xe2\x85\x86"},
++	{"ddagger", "\xe2\x80\xa1"},
++	{"ddarr", "\xe2\x87\x8a"},
++	{"ddotseq", "\xe2\xa9\xb7"},
++	{"deg", "\xc2\xb0"},
++	{"delta", "\xce\xb4"},
++	{"demptyv", "\xe2\xa6\xb1"},
++	{"dfisht", "\xe2\xa5\xbf"},
++	{"dfr", "\xf0\x9d\x94\xa1"},
++	{"dharl", "\xe2\x87\x83"},
++	{"dharr", "\xe2\x87\x82"},
++	{"diam", "\xe2\x8b\x84"},
++	{"diamond", "\xe2\x8b\x84"},
++	{"diamondsuit", "\xe2\x99\xa6"},
++	{"diams", "\xe2\x99\xa6"},
++	{"die", "\xc2\xa8"},
++	{"digamma", "\xcf\x9d"},
++	{"disin", "\xe2\x8b\xb2"},
++	{"div", "\xc3\xb7"},
++	{"divide", "\xc3\xb7"},
++	{"divideontimes", "\xe2\x8b\x87"},
++	{"divonx", "\xe2\x8b\x87"},
++	{"djcy", "\xd1\x92"},
++	{"dlcorn", "\xe2\x8c\x9e"},
++	{"dlcrop", "\xe2\x8c\x8d"},
++	{"dollar", "\x24"},
++	{"dopf", "\xf0\x9d\x95\x95"},
++	{"dot", "\xcb\x99"},
++	{"doteq", "\xe2\x89\x90"},
++	{"doteqdot", "\xe2\x89\x91"},
++	{"dotminus", "\xe2\x88\xb8"},
++	{"dotplus", "\xe2\x88\x94"},
++	{"dotsquare", "\xe2\x8a\xa1"},
++	{"doublebarwedge", "\xe2\x8c\x86"},
++	{"downarrow", "\xe2\x86\x93"},
++	{"downdownarrows", "\xe2\x87\x8a"},
++	{"downharpoonleft", "\xe2\x87\x83"},
++	{"downharpoonright", "\xe2\x87\x82"},
++	{"drbkarow", "\xe2\xa4\x90"},
++	{"drcorn", "\xe2\x8c\x9f"},
++	{"drcrop", "\xe2\x8c\x8c"},
++	{"dscr", "\xf0\x9d\x92\xb9"},
++	{"dscy", "\xd1\x95"},
++	{"dsol", "\xe2\xa7\xb6"},
++	{"dstrok", "\xc4\x91"},
++	{"dtdot", "\xe2\x8b\xb1"},
++	{"dtri", "\xe2\x96\xbf"},
++	{"dtrif", "\xe2\x96\xbe"},
++	{"duarr", "\xe2\x87\xb5"},
++	{"duhar", "\xe2\xa5\xaf"},
++	{"dwangle", "\xe2\xa6\xa6"},
++	{"dzcy", "\xd1\x9f"},
++	{"dzigrarr", "\xe2\x9f\xbf"},
++	{"eDDot", "\xe2\xa9\xb7"},
++	{"eDot", "\xe2\x89\x91"},
++	{"eacute", "\xc3\xa9"},
++	{"easter", "\xe2\xa9\xae"},
++	{"ecaron", "\xc4\x9b"},
++	{"ecir", "\xe2\x89\x96"},
++	{"ecirc", "\xc3\xaa"},
++	{"ecolon", "\xe2\x89\x95"},
++	{"ecy", "\xd1\x8d"},
++	{"edot", "\xc4\x97"},
++	{"ee", "\xe2\x85\x87"},
++	{"efDot", "\xe2\x89\x92"},
++	{"efr", "\xf0\x9d\x94\xa2"},
++	{"eg", "\xe2\xaa\x9a"},
++	{"egrave", "\xc3\xa8"},
++	{"egs", "\xe2\xaa\x96"},
++	{"egsdot", "\xe2\xaa\x98"},
++	{"el", "\xe2\xaa\x99"},
++	{"elinters", "\xe2\x8f\xa7"},
++	{"ell", "\xe2\x84\x93"},
++	{"els", "\xe2\xaa\x95"},
++	{"elsdot", "\xe2\xaa\x97"},
++	{"emacr", "\xc4\x93"},
++	{"empty", "\xe2\x88\x85"},
++	{"emptyset", "\xe2\x88\x85"},
++	{"emptyv", "\xe2\x88\x85"},
++	{"emsp", "\xe2\x80\x83"},
++	{"emsp13", "\xe2\x80\x84"},
++	{"emsp14", "\xe2\x80\x85"},
++	{"eng", "\xc5\x8b"},
++	{"ensp", "\xe2\x80\x82"},
++	{"eogon", "\xc4\x99"},
++	{"eopf", "\xf0\x9d\x95\x96"},
++	{"epar", "\xe2\x8b\x95"},
++	{"eparsl", "\xe2\xa7\xa3"},
++	{"eplus", "\xe2\xa9\xb1"},
++	{"epsi", "\xce\xb5"},
++	{"epsilon", "\xce\xb5"},
++	{"epsiv", "\xcf\xb5"},
++	{"eqcirc", "\xe2\x89\x96"},
++	{"eqcolon", "\xe2\x89\x95"},
++	{"eqsim", "\xe2\x89\x82"},
++	{"eqslantgtr", "\xe2\xaa\x96"},
++	{"eqslantless", "\xe2\xaa\x95"},
++	{"equals", "\x3d"},
++	{"equest", "\xe2\x89\x9f"},
++	{"equiv", "\xe2\x89\xa1"},
++	{"equivDD", "\xe2\xa9\xb8"},
++	{"eqvparsl", "\xe2\xa7\xa5"},
++	{"erDot", "\xe2\x89\x93"},
++	{"erarr", "\xe2\xa5\xb1"},
++	{"escr", "\xe2\x84\xaf"},
++	{"esdot", "\xe2\x89\x90"},
++	{"esim", "\xe2\x89\x82"},
++	{"eta", "\xce\xb7"},
++	{"eth", "\xc3\xb0"},
++	{"euml", "\xc3\xab"},
++	{"euro", "\xe2\x82\xac"},
++	{"excl", "\x21"},
++	{"exist", "\xe2\x88\x83"},
++	{"expectation", "\xe2\x84\xb0"},
++	{"exponentiale", "\xe2\x85\x87"},
++	{"fallingdotseq", "\xe2\x89\x92"},
++	{"fcy", "\xd1\x84"},
++	{"female", "\xe2\x99\x80"},
++	{"ffilig", "\xef\xac\x83"},
++	{"fflig", "\xef\xac\x80"},
++	{"ffllig", "\xef\xac\x84"},
++	{"ffr", "\xf0\x9d\x94\xa3"},
++	{"filig", "\xef\xac\x81"},
++	{"fjlig", "\x66\x6a"},
++	{"flat", "\xe2\x99\xad"},
++	{"fllig", "\xef\xac\x82"},
++	{"fltns", "\xe2\x96\xb1"},
++	{"fnof", "\xc6\x92"},
++	{"fopf", "\xf0\x9d\x95\x97"},
++	{"forall", "\xe2\x88\x80"},
++	{"fork", "\xe2\x8b\x94"},
++	{"forkv", "\xe2\xab\x99"},
++	{"fpartint", "\xe2\xa8\x8d"},
++	{"frac12", "\xc2\xbd"},
++	{"frac13", "\xe2\x85\x93"},
++	{"frac14", "\xc2\xbc"},
++	{"frac15", "\xe2\x85\x95"},
++	{"frac16", "\xe2\x85\x99"},
++	{"frac18", "\xe2\x85\x9b"},
++	{"frac23", "\xe2\x85\x94"},
++	{"frac25", "\xe2\x85\x96"},
++	{"frac34", "\xc2\xbe"},
++	{"frac35", "\xe2\x85\x97"},
++	{"frac38", "\xe2\x85\x9c"},
++	{"frac45", "\xe2\x85\x98"},
++	{"frac56", "\xe2\x85\x9a"},
++	{"frac58", "\xe2\x85\x9d"},
++	{"frac78", "\xe2\x85\x9e"},
++	{"frasl", "\xe2\x81\x84"},
++	{"frown", "\xe2\x8c\xa2"},
++	{"fscr", "\xf0\x9d\x92\xbb"},
++	{"gE", "\xe2\x89\xa7"},
++	{"gEl", "\xe2\xaa\x8c"},
++	{"gacute", "\xc7\xb5"},
++	{"gamma", "\xce\xb3"},
++	{"gammad", "\xcf\x9d"},
++	{"gap", "\xe2\xaa\x86"},
++	{"gbreve", "\xc4\x9f"},
++	{"gcirc", "\xc4\x9d"},
++	{"gcy", "\xd0\xb3"},
++	{"gdot", "\xc4\xa1"},
++	{"ge", "\xe2\x89\xa5"},
++	{"gel", "\xe2\x8b\x9b"},
++	{"geq", "\xe2\x89\xa5"},
++	{"geqq", "\xe2\x89\xa7"},
++	{"geqslant", "\xe2\xa9\xbe"},
++	{"ges", "\xe2\xa9\xbe"},
++	{"gescc", "\xe2\xaa\xa9"},
++	{"gesdot", "\xe2\xaa\x80"},
++	{"gesdoto", "\xe2\xaa\x82"},
++	{"gesdotol", "\xe2\xaa\x84"},
++	{"gesl", "\xe2\x8b\x9b\xef\xb8\x80"},
++	{"gesles", "\xe2\xaa\x94"},
++	{"gfr", "\xf0\x9d\x94\xa4"},
++	{"gg", "\xe2\x89\xab"},
++	{"ggg", "\xe2\x8b\x99"},
++	{"gimel", "\xe2\x84\xb7"},
++	{"gjcy", "\xd1\x93"},
++	{"gl", "\xe2\x89\xb7"},
++	{"glE", "\xe2\xaa\x92"},
++	{"gla", "\xe2\xaa\xa5"},
++	{"glj", "\xe2\xaa\xa4"},
++	{"gnE", "\xe2\x89\xa9"},
++	{"gnap", "\xe2\xaa\x8a"},
++	{"gnapprox", "\xe2\xaa\x8a"},
++	{"gne", "\xe2\xaa\x88"},
++	{"gneq", "\xe2\xaa\x88"},
++	{"gneqq", "\xe2\x89\xa9"},
++	{"gnsim", "\xe2\x8b\xa7"},
++	{"gopf", "\xf0\x9d\x95\x98"},
++	{"grave", "\x60"},
++	{"gscr", "\xe2\x84\x8a"},
++	{"gsim", "\xe2\x89\xb3"},
++	{"gsime", "\xe2\xaa\x8e"},
++	{"gsiml", "\xe2\xaa\x90"},
++	{"gt", "\x3e"},
++	{"gtcc", "\xe2\xaa\xa7"},
++	{"gtcir", "\xe2\xa9\xba"},
++	{"gtdot", "\xe2\x8b\x97"},
++	{"gtlPar", "\xe2\xa6\x95"},
++	{"gtquest", "\xe2\xa9\xbc"},
++	{"gtrapprox", "\xe2\xaa\x86"},
++	{"gtrarr", "\xe2\xa5\xb8"},
++	{"gtrdot", "\xe2\x8b\x97"},
++	{"gtreqless", "\xe2\x8b\x9b"},
++	{"gtreqqless", "\xe2\xaa\x8c"},
++	{"gtrless", "\xe2\x89\xb7"},
++	{"gtrsim", "\xe2\x89\xb3"},
++	{"gvertneqq", "\xe2\x89\xa9\xef\xb8\x80"},
++	{"gvnE", "\xe2\x89\xa9\xef\xb8\x80"},
++	{"hArr", "\xe2\x87\x94"},
++	{"hairsp", "\xe2\x80\x8a"},
++	{"half", "\xc2\xbd"},
++	{"hamilt", "\xe2\x84\x8b"},
++	{"hardcy", "\xd1\x8a"},
++	{"harr", "\xe2\x86\x94"},
++	{"harrcir", "\xe2\xa5\x88"},
++	{"harrw", "\xe2\x86\xad"},
++	{"hbar", "\xe2\x84\x8f"},
++	{"hcirc", "\xc4\xa5"},
++	{"hearts", "\xe2\x99\xa5"},
++	{"heartsuit", "\xe2\x99\xa5"},
++	{"hellip", "\xe2\x80\xa6"},
++	{"hercon", "\xe2\x8a\xb9"},
++	{"hfr", "\xf0\x9d\x94\xa5"},
++	{"hksearow", "\xe2\xa4\xa5"},
++	{"hkswarow", "\xe2\xa4\xa6"},
++	{"hoarr", "\xe2\x87\xbf"},
++	{"homtht", "\xe2\x88\xbb"},
++	{"hookleftarrow", "\xe2\x86\xa9"},
++	{"hookrightarrow", "\xe2\x86\xaa"},
++	{"hopf", "\xf0\x9d\x95\x99"},
++	{"horbar", "\xe2\x80\x95"},
++	{"hscr", "\xf0\x9d\x92\xbd"},
++	{"hslash", "\xe2\x84\x8f"},
++	{"hstrok", "\xc4\xa7"},
++	{"hybull", "\xe2\x81\x83"},
++	{"hyphen", "\xe2\x80\x90"},
++	{"iacute", "\xc3\xad"},
++	{"ic", "\xe2\x81\xa3"},
++	{"icirc", "\xc3\xae"},
++	{"icy", "\xd0\xb8"},
++	{"iecy", "\xd0\xb5"},
++	{"iexcl", "\xc2\xa1"},
++	{"iff", "\xe2\x87\x94"},
++	{"ifr", "\xf0\x9d\x94\xa6"},
++	{"igrave", "\xc3\xac"},
++	{"ii", "\xe2\x85\x88"},
++	{"iiiint", "\xe2\xa8\x8c"},
++	{"iiint", "\xe2\x88\xad"},
++	{"iinfin", "\xe2\xa7\x9c"},
++	{"iiota", "\xe2\x84\xa9"},
++	{"ijlig", "\xc4\xb3"},
++	{"imacr", "\xc4\xab"},
++	{"image", "\xe2\x84\x91"},
++	{"imagline", "\xe2\x84\x90"},
++	{"imagpart", "\xe2\x84\x91"},
++	{"imath", "\xc4\xb1"},
++	{"imof", "\xe2\x8a\xb7"},
++	{"imped", "\xc6\xb5"},
++	{"in", "\xe2\x88\x88"},
++	{"incare", "\xe2\x84\x85"},
++	{"infin", "\xe2\x88\x9e"},
++	{"infintie", "\xe2\xa7\x9d"},
++	{"inodot", "\xc4\xb1"},
++	{"int", "\xe2\x88\xab"},
++	{"intcal", "\xe2\x8a\xba"},
++	{"integers", "\xe2\x84\xa4"},
++	{"intercal", "\xe2\x8a\xba"},
++	{"intlarhk", "\xe2\xa8\x97"},
++	{"intprod", "\xe2\xa8\xbc"},
++	{"iocy", "\xd1\x91"},
++	{"iogon", "\xc4\xaf"},
++	{"iopf", "\xf0\x9d\x95\x9a"},
++	{"iota", "\xce\xb9"},
++	{"iprod", "\xe2\xa8\xbc"},
++	{"iquest", "\xc2\xbf"},
++	{"iscr", "\xf0\x9d\x92\xbe"},
++	{"isin", "\xe2\x88\x88"},
++	{"isinE", "\xe2\x8b\xb9"},
++	{"isindot", "\xe2\x8b\xb5"},
++	{"isins", "\xe2\x8b\xb4"},
++	{"isinsv", "\xe2\x8b\xb3"},
++	{"isinv", "\xe2\x88\x88"},
++	{"it", "\xe2\x81\xa2"},
++	{"itilde", "\xc4\xa9"},
++	{"iukcy", "\xd1\x96"},
++	{"iuml", "\xc3\xaf"},
++	{"jcirc", "\xc4\xb5"},
++	{"jcy", "\xd0\xb9"},
++	{"jfr", "\xf0\x9d\x94\xa7"},
++	{"jmath", "\xc8\xb7"},
++	{"jopf", "\xf0\x9d\x95\x9b"},
++	{"jscr", "\xf0\x9d\x92\xbf"},
++	{"jsercy", "\xd1\x98"},
++	{"jukcy", "\xd1\x94"},
++	{"kappa", "\xce\xba"},
++	{"kappav", "\xcf\xb0"},
++	{"kcedil", "\xc4\xb7"},
++	{"kcy", "\xd0\xba"},
++	{"kfr", "\xf0\x9d\x94\xa8"},
++	{"kgreen", "\xc4\xb8"},
++	{"khcy", "\xd1\x85"},
++	{"kjcy", "\xd1\x9c"},
++	{"kopf", "\xf0\x9d\x95\x9c"},
++	{"kscr", "\xf0\x9d\x93\x80"},
++	{"lAarr", "\xe2\x87\x9a"},
++	{"lArr", "\xe2\x87\x90"},
++	{"lAtail", "\xe2\xa4\x9b"},
++	{"lBarr", "\xe2\xa4\x8e"},
++	{"lE", "\xe2\x89\xa6"},
++	{"lEg", "\xe2\xaa\x8b"},
++	{"lHar", "\xe2\xa5\xa2"},
++	{"lacute", "\xc4\xba"},
++	{"laemptyv", "\xe2\xa6\xb4"},
++	{"lagran", "\xe2\x84\x92"},
++	{"lambda", "\xce\xbb"},
++	{"lang", "\xe2\x9f\xa8"},
++	{"langd", "\xe2\xa6\x91"},
++	{"langle", "\xe2\x9f\xa8"},
++	{"lap", "\xe2\xaa\x85"},
++	{"laquo", "\xc2\xab"},
++	{"larr", "\xe2\x86\x90"},
++	{"larrb", "\xe2\x87\xa4"},
++	{"larrbfs", "\xe2\xa4\x9f"},
++	{"larrfs", "\xe2\xa4\x9d"},
++	{"larrhk", "\xe2\x86\xa9"},
++	{"larrlp", "\xe2\x86\xab"},
++	{"larrpl", "\xe2\xa4\xb9"},
++	{"larrsim", "\xe2\xa5\xb3"},
++	{"larrtl", "\xe2\x86\xa2"},
++	{"lat", "\xe2\xaa\xab"},
++	{"latail", "\xe2\xa4\x99"},
++	{"late", "\xe2\xaa\xad"},
++	{"lates", "\xe2\xaa\xad\xef\xb8\x80"},
++	{"lbarr", "\xe2\xa4\x8c"},
++	{"lbbrk", "\xe2\x9d\xb2"},
++	{"lbrace", "\x7b"},
++	{"lbrack", "\x5b"},
++	{"lbrke", "\xe2\xa6\x8b"},
++	{"lbrksld", "\xe2\xa6\x8f"},
++	{"lbrkslu", "\xe2\xa6\x8d"},
++	{"lcaron", "\xc4\xbe"},
++	{"lcedil", "\xc4\xbc"},
++	{"lceil", "\xe2\x8c\x88"},
++	{"lcub", "\x7b"},
++	{"lcy", "\xd0\xbb"},
++	{"ldca", "\xe2\xa4\xb6"},
++	{"ldquo", "\xe2\x80\x9c"},
++	{"ldquor", "\xe2\x80\x9e"},
++	{"ldrdhar", "\xe2\xa5\xa7"},
++	{"ldrushar", "\xe2\xa5\x8b"},
++	{"ldsh", "\xe2\x86\xb2"},
++	{"le", "\xe2\x89\xa4"},
++	{"leftarrow", "\xe2\x86\x90"},
++	{"leftarrowtail", "\xe2\x86\xa2"},
++	{"leftharpoondown", "\xe2\x86\xbd"},
++	{"leftharpoonup", "\xe2\x86\xbc"},
++	{"leftleftarrows", "\xe2\x87\x87"},
++	{"leftrightarrow", "\xe2\x86\x94"},
++	{"leftrightarrows", "\xe2\x87\x86"},
++	{"leftrightharpoons", "\xe2\x87\x8b"},
++	{"leftrightsquigarrow", "\xe2\x86\xad"},
++	{"leftthreetimes", "\xe2\x8b\x8b"},
++	{"leg", "\xe2\x8b\x9a"},
++	{"leq", "\xe2\x89\xa4"},
++	{"leqq", "\xe2\x89\xa6"},
++	{"leqslant", "\xe2\xa9\xbd"},
++	{"les", "\xe2\xa9\xbd"},
++	{"lescc", "\xe2\xaa\xa8"},
++	{"lesdot", "\xe2\xa9\xbf"},
++	{"lesdoto", "\xe2\xaa\x81"},
++	{"lesdotor", "\xe2\xaa\x83"},
++	{"lesg", "\xe2\x8b\x9a\xef\xb8\x80"},
++	{"lesges", "\xe2\xaa\x93"},
++	{"lessapprox", "\xe2\xaa\x85"},
++	{"lessdot", "\xe2\x8b\x96"},
++	{"lesseqgtr", "\xe2\x8b\x9a"},
++	{"lesseqqgtr", "\xe2\xaa\x8b"},
++	{"lessgtr", "\xe2\x89\xb6"},
++	{"lesssim", "\xe2\x89\xb2"},
++	{"lfisht", "\xe2\xa5\xbc"},
++	{"lfloor", "\xe2\x8c\x8a"},
++	{"lfr", "\xf0\x9d\x94\xa9"},
++	{"lg", "\xe2\x89\xb6"},
++	{"lgE", "\xe2\xaa\x91"},
++	{"lhard", "\xe2\x86\xbd"},
++	{"lharu", "\xe2\x86\xbc"},
++	{"lharul", "\xe2\xa5\xaa"},
++	{"lhblk", "\xe2\x96\x84"},
++	{"ljcy", "\xd1\x99"},
++	{"ll", "\xe2\x89\xaa"},
++	{"llarr", "\xe2\x87\x87"},
++	{"llcorner", "\xe2\x8c\x9e"},
++	{"llhard", "\xe2\xa5\xab"},
++	{"lltri", "\xe2\x97\xba"},
++	{"lmidot", "\xc5\x80"},
++	{"lmoust", "\xe2\x8e\xb0"},
++	{"lmoustache", "\xe2\x8e\xb0"},
++	{"lnE", "\xe2\x89\xa8"},
++	{"lnap", "\xe2\xaa\x89"},
++	{"lnapprox", "\xe2\xaa\x89"},
++	{"lne", "\xe2\xaa\x87"},
++	{"lneq", "\xe2\xaa\x87"},
++	{"lneqq", "\xe2\x89\xa8"},
++	{"lnsim", "\xe2\x8b\xa6"},
++	{"loang", "\xe2\x9f\xac"},
++	{"loarr", "\xe2\x87\xbd"},
++	{"lobrk", "\xe2\x9f\xa6"},
++	{"longleftarrow", "\xe2\x9f\xb5"},
++	{"longleftrightarrow", "\xe2\x9f\xb7"},
++	{"longmapsto", "\xe2\x9f\xbc"},
++	{"longrightarrow", "\xe2\x9f\xb6"},
++	{"looparrowleft", "\xe2\x86\xab"},
++	{"looparrowright", "\xe2\x86\xac"},
++	{"lopar", "\xe2\xa6\x85"},
++	{"lopf", "\xf0\x9d\x95\x9d"},
++	{"loplus", "\xe2\xa8\xad"},
++	{"lotimes", "\xe2\xa8\xb4"},
++	{"lowast", "\xe2\x88\x97"},
++	{"lowbar", "\x5f"},
++	{"loz", "\xe2\x97\x8a"},
++	{"lozenge", "\xe2\x97\x8a"},
++	{"lozf", "\xe2\xa7\xab"},
++	{"lpar", "\x28"},
++	{"lparlt", "\xe2\xa6\x93"},
++	{"lrarr", "\xe2\x87\x86"},
++	{"lrcorner", "\xe2\x8c\x9f"},
++	{"lrhar", "\xe2\x87\x8b"},
++	{"lrhard", "\xe2\xa5\xad"},
++	{"lrm", "\xe2\x80\x8e"},
++	{"lrtri", "\xe2\x8a\xbf"},
++	{"lsaquo", "\xe2\x80\xb9"},
++	{"lscr", "\xf0\x9d\x93\x81"},
++	{"lsh", "\xe2\x86\xb0"},
++	{"lsim", "\xe2\x89\xb2"},
++	{"lsime", "\xe2\xaa\x8d"},
++	{"lsimg", "\xe2\xaa\x8f"},
++	{"lsqb", "\x5b"},
++	{"lsquo", "\xe2\x80\x98"},
++	{"lsquor", "\xe2\x80\x9a"},
++	{"lstrok", "\xc5\x82"},
++	{"lt", "\x3c"},
++	{"ltcc", "\xe2\xaa\xa6"},
++	{"ltcir", "\xe2\xa9\xb9"},
++	{"ltdot", "\xe2\x8b\x96"},
++	{"lthree", "\xe2\x8b\x8b"},
++	{"ltimes", "\xe2\x8b\x89"},
++	{"ltlarr", "\xe2\xa5\xb6"},
++	{"ltquest", "\xe2\xa9\xbb"},
++	{"ltrPar", "\xe2\xa6\x96"},
++	{"ltri", "\xe2\x97\x83"},
++	{"ltrie", "\xe2\x8a\xb4"},
++	{"ltrif", "\xe2\x97\x82"},
++	{"lurdshar", "\xe2\xa5\x8a"},
++	{"luruhar", "\xe2\xa5\xa6"},
++	{"lvertneqq", "\xe2\x89\xa8\xef\xb8\x80"},
++	{"lvnE", "\xe2\x89\xa8\xef\xb8\x80"},
++	{"mDDot", "\xe2\x88\xba"},
++	{"macr", "\xc2\xaf"},
++	{"male", "\xe2\x99\x82"},
++	{"malt", "\xe2\x9c\xa0"},
++	{"maltese", "\xe2\x9c\xa0"},
++	{"map", "\xe2\x86\xa6"},
++	{"mapsto", "\xe2\x86\xa6"},
++	{"mapstodown", "\xe2\x86\xa7"},
++	{"mapstoleft", "\xe2\x86\xa4"},
++	{"mapstoup", "\xe2\x86\xa5"},
++	{"marker", "\xe2\x96\xae"},
++	{"mcomma", "\xe2\xa8\xa9"},
++	{"mcy", "\xd0\xbc"},
++	{"mdash", "\xe2\x80\x94"},
++	{"measuredangle", "\xe2\x88\xa1"},
++	{"mfr", "\xf0\x9d\x94\xaa"},
++	{"mho", "\xe2\x84\xa7"},
++	{"micro", "\xc2\xb5"},
++	{"mid", "\xe2\x88\xa3"},
++	{"midast", "\x2a"},
++	{"midcir", "\xe2\xab\xb0"},
++	{"middot", "\xc2\xb7"},
++	{"minus", "\xe2\x88\x92"},
++	{"minusb", "\xe2\x8a\x9f"},
++	{"minusd", "\xe2\x88\xb8"},
++	{"minusdu", "\xe2\xa8\xaa"},
++	{"mlcp", "\xe2\xab\x9b"},
++	{"mldr", "\xe2\x80\xa6"},
++	{"mnplus", "\xe2\x88\x93"},
++	{"models", "\xe2\x8a\xa7"},
++	{"mopf", "\xf0\x9d\x95\x9e"},
++	{"mp", "\xe2\x88\x93"},
++	{"mscr", "\xf0\x9d\x93\x82"},
++	{"mstpos", "\xe2\x88\xbe"},
++	{"mu", "\xce\xbc"},
++	{"multimap", "\xe2\x8a\xb8"},
++	{"mumap", "\xe2\x8a\xb8"},
++	{"nGg", "\xe2\x8b\x99\xcc\xb8"},
++	{"nGt", "\xe2\x89\xab\xe2\x83\x92"},
++	{"nGtv", "\xe2\x89\xab\xcc\xb8"},
++	{"nLeftarrow", "\xe2\x87\x8d"},
++	{"nLeftrightarrow", "\xe2\x87\x8e"},
++	{"nLl", "\xe2\x8b\x98\xcc\xb8"},
++	{"nLt", "\xe2\x89\xaa\xe2\x83\x92"},
++	{"nLtv", "\xe2\x89\xaa\xcc\xb8"},
++	{"nRightarrow", "\xe2\x87\x8f"},
++	{"nVDash", "\xe2\x8a\xaf"},
++	{"nVdash", "\xe2\x8a\xae"},
++	{"nabla", "\xe2\x88\x87"},
++	{"nacute", "\xc5\x84"},
++	{"nang", "\xe2\x88\xa0\xe2\x83\x92"},
++	{"nap", "\xe2\x89\x89"},
++	{"napE", "\xe2\xa9\xb0\xcc\xb8"},
++	{"napid", "\xe2\x89\x8b\xcc\xb8"},
++	{"napos", "\xc5\x89"},
++	{"napprox", "\xe2\x89\x89"},
++	{"natur", "\xe2\x99\xae"},
++	{"natural", "\xe2\x99\xae"},
++	{"naturals", "\xe2\x84\x95"},
++	{"nbsp", "\xc2\xa0"},
++	{"nbump", "\xe2\x89\x8e\xcc\xb8"},
++	{"nbumpe", "\xe2\x89\x8f\xcc\xb8"},
++	{"ncap", "\xe2\xa9\x83"},
++	{"ncaron", "\xc5\x88"},
++	{"ncedil", "\xc5\x86"},
++	{"ncong", "\xe2\x89\x87"},
++	{"ncongdot", "\xe2\xa9\xad\xcc\xb8"},
++	{"ncup", "\xe2\xa9\x82"},
++	{"ncy", "\xd0\xbd"},
++	{"ndash", "\xe2\x80\x93"},
++	{"ne", "\xe2\x89\xa0"},
++	{"neArr", "\xe2\x87\x97"},
++	{"nearhk", "\xe2\xa4\xa4"},
++	{"nearr", "\xe2\x86\x97"},
++	{"nearrow", "\xe2\x86\x97"},
++	{"nedot", "\xe2\x89\x90\xcc\xb8"},
++	{"nequiv", "\xe2\x89\xa2"},
++	{"nesear", "\xe2\xa4\xa8"},
++	{"nesim", "\xe2\x89\x82\xcc\xb8"},
++	{"nexist", "\xe2\x88\x84"},
++	{"nexists", "\xe2\x88\x84"},
++	{"nfr", "\xf0\x9d\x94\xab"},
++	{"ngE", "\xe2\x89\xa7\xcc\xb8"},
++	{"nge", "\xe2\x89\xb1"},
++	{"ngeq", "\xe2\x89\xb1"},
++	{"ngeqq", "\xe2\x89\xa7\xcc\xb8"},
++	{"ngeqslant", "\xe2\xa9\xbe\xcc\xb8"},
++	{"nges", "\xe2\xa9\xbe\xcc\xb8"},
++	{"ngsim", "\xe2\x89\xb5"},
++	{"ngt", "\xe2\x89\xaf"},
++	{"ngtr", "\xe2\x89\xaf"},
++	{"nhArr", "\xe2\x87\x8e"},
++	{"nharr", "\xe2\x86\xae"},
++	{"nhpar", "\xe2\xab\xb2"},
++	{"ni", "\xe2\x88\x8b"},
++	{"nis", "\xe2\x8b\xbc"},
++	{"nisd", "\xe2\x8b\xba"},
++	{"niv", "\xe2\x88\x8b"},
++	{"njcy", "\xd1\x9a"},
++	{"nlArr", "\xe2\x87\x8d"},
++	{"nlE", "\xe2\x89\xa6\xcc\xb8"},
++	{"nlarr", "\xe2\x86\x9a"},
++	{"nldr", "\xe2\x80\xa5"},
++	{"nle", "\xe2\x89\xb0"},
++	{"nleftarrow", "\xe2\x86\x9a"},
++	{"nleftrightarrow", "\xe2\x86\xae"},
++	{"nleq", "\xe2\x89\xb0"},
++	{"nleqq", "\xe2\x89\xa6\xcc\xb8"},
++	{"nleqslant", "\xe2\xa9\xbd\xcc\xb8"},
++	{"nles", "\xe2\xa9\xbd\xcc\xb8"},
++	{"nless", "\xe2\x89\xae"},
++	{"nlsim", "\xe2\x89\xb4"},
++	{"nlt", "\xe2\x89\xae"},
++	{"nltri", "\xe2\x8b\xaa"},
++	{"nltrie", "\xe2\x8b\xac"},
++	{"nmid", "\xe2\x88\xa4"},
++	{"nopf", "\xf0\x9d\x95\x9f"},
++	{"not", "\xc2\xac"},
++	{"notin", "\xe2\x88\x89"},
++	{"notinE", "\xe2\x8b\xb9\xcc\xb8"},
++	{"notindot", "\xe2\x8b\xb5\xcc\xb8"},
++	{"notinva", "\xe2\x88\x89"},
++	{"notinvb", "\xe2\x8b\xb7"},
++	{"notinvc", "\xe2\x8b\xb6"},
++	{"notni", "\xe2\x88\x8c"},
++	{"notniva", "\xe2\x88\x8c"},
++	{"notnivb", "\xe2\x8b\xbe"},
++	{"notnivc", "\xe2\x8b\xbd"},
++	{"npar", "\xe2\x88\xa6"},
++	{"nparallel", "\xe2\x88\xa6"},
++	{"nparsl", "\xe2\xab\xbd\xe2\x83\xa5"},
++	{"npart", "\xe2\x88\x82\xcc\xb8"},
++	{"npolint", "\xe2\xa8\x94"},
++	{"npr", "\xe2\x8a\x80"},
++	{"nprcue", "\xe2\x8b\xa0"},
++	{"npre", "\xe2\xaa\xaf\xcc\xb8"},
++	{"nprec", "\xe2\x8a\x80"},
++	{"npreceq", "\xe2\xaa\xaf\xcc\xb8"},
++	{"nrArr", "\xe2\x87\x8f"},
++	{"nrarr", "\xe2\x86\x9b"},
++	{"nrarrc", "\xe2\xa4\xb3\xcc\xb8"},
++	{"nrarrw", "\xe2\x86\x9d\xcc\xb8"},
++	{"nrightarrow", "\xe2\x86\x9b"},
++	{"nrtri", "\xe2\x8b\xab"},
++	{"nrtrie", "\xe2\x8b\xad"},
++	{"nsc", "\xe2\x8a\x81"},
++	{"nsccue", "\xe2\x8b\xa1"},
++	{"nsce", "\xe2\xaa\xb0\xcc\xb8"},
++	{"nscr", "\xf0\x9d\x93\x83"},
++	{"nshortmid", "\xe2\x88\xa4"},
++	{"nshortparallel", "\xe2\x88\xa6"},
++	{"nsim", "\xe2\x89\x81"},
++	{"nsime", "\xe2\x89\x84"},
++	{"nsimeq", "\xe2\x89\x84"},
++	{"nsmid", "\xe2\x88\xa4"},
++	{"nspar", "\xe2\x88\xa6"},
++	{"nsqsube", "\xe2\x8b\xa2"},
++	{"nsqsupe", "\xe2\x8b\xa3"},
++	{"nsub", "\xe2\x8a\x84"},
++	{"nsubE", "\xe2\xab\x85\xcc\xb8"},
++	{"nsube", "\xe2\x8a\x88"},
++	{"nsubset", "\xe2\x8a\x82\xe2\x83\x92"},
++	{"nsubseteq", "\xe2\x8a\x88"},
++	{"nsubseteqq", "\xe2\xab\x85\xcc\xb8"},
++	{"nsucc", "\xe2\x8a\x81"},
++	{"nsucceq", "\xe2\xaa\xb0\xcc\xb8"},
++	{"nsup", "\xe2\x8a\x85"},
++	{"nsupE", "\xe2\xab\x86\xcc\xb8"},
++	{"nsupe", "\xe2\x8a\x89"},
++	{"nsupset", "\xe2\x8a\x83\xe2\x83\x92"},
++	{"nsupseteq", "\xe2\x8a\x89"},
++	{"nsupseteqq", "\xe2\xab\x86\xcc\xb8"},
++	{"ntgl", "\xe2\x89\xb9"},
++	{"ntilde", "\xc3\xb1"},
++	{"ntlg", "\xe2\x89\xb8"},
++	{"ntriangleleft", "\xe2\x8b\xaa"},
++	{"ntrianglelefteq", "\xe2\x8b\xac"},
++	{"ntriangleright", "\xe2\x8b\xab"},
++	{"ntrianglerighteq", "\xe2\x8b\xad"},
++	{"nu", "\xce\xbd"},
++	{"num", "\x23"},
++	{"numero", "\xe2\x84\x96"},
++	{"numsp", "\xe2\x80\x87"},
++	{"nvDash", "\xe2\x8a\xad"},
++	{"nvHarr", "\xe2\xa4\x84"},
++	{"nvap", "\xe2\x89\x8d\xe2\x83\x92"},
++	{"nvdash", "\xe2\x8a\xac"},
++	{"nvge", "\xe2\x89\xa5\xe2\x83\x92"},
++	{"nvgt", "\x3e\xe2\x83\x92"},
++	{"nvinfin", "\xe2\xa7\x9e"},
++	{"nvlArr", "\xe2\xa4\x82"},
++	{"nvle", "\xe2\x89\xa4\xe2\x83\x92"},
++	{"nvlt", "\x3c\xe2\x83\x92"},
++	{"nvltrie", "\xe2\x8a\xb4\xe2\x83\x92"},
++	{"nvrArr", "\xe2\xa4\x83"},
++	{"nvrtrie", "\xe2\x8a\xb5\xe2\x83\x92"},
++	{"nvsim", "\xe2\x88\xbc\xe2\x83\x92"},
++	{"nwArr", "\xe2\x87\x96"},
++	{"nwarhk", "\xe2\xa4\xa3"},
++	{"nwarr", "\xe2\x86\x96"},
++	{"nwarrow", "\xe2\x86\x96"},
++	{"nwnear", "\xe2\xa4\xa7"},
++	{"oS", "\xe2\x93\x88"},
++	{"oacute", "\xc3\xb3"},
++	{"oast", "\xe2\x8a\x9b"},
++	{"ocir", "\xe2\x8a\x9a"},
++	{"ocirc", "\xc3\xb4"},
++	{"ocy", "\xd0\xbe"},
++	{"odash", "\xe2\x8a\x9d"},
++	{"odblac", "\xc5\x91"},
++	{"odiv", "\xe2\xa8\xb8"},
++	{"odot", "\xe2\x8a\x99"},
++	{"odsold", "\xe2\xa6\xbc"},
++	{"oelig", "\xc5\x93"},
++	{"ofcir", "\xe2\xa6\xbf"},
++	{"ofr", "\xf0\x9d\x94\xac"},
++	{"ogon", "\xcb\x9b"},
++	{"ograve", "\xc3\xb2"},
++	{"ogt", "\xe2\xa7\x81"},
++	{"ohbar", "\xe2\xa6\xb5"},
++	{"ohm", "\xce\xa9"},
++	{"oint", "\xe2\x88\xae"},
++	{"olarr", "\xe2\x86\xba"},
++	{"olcir", "\xe2\xa6\xbe"},
++	{"olcross", "\xe2\xa6\xbb"},
++	{"oline", "\xe2\x80\xbe"},
++	{"olt", "\xe2\xa7\x80"},
++	{"omacr", "\xc5\x8d"},
++	{"omega", "\xcf\x89"},
++	{"omicron", "\xce\xbf"},
++	{"omid", "\xe2\xa6\xb6"},
++	{"ominus", "\xe2\x8a\x96"},
++	{"oopf", "\xf0\x9d\x95\xa0"},
++	{"opar", "\xe2\xa6\xb7"},
++	{"operp", "\xe2\xa6\xb9"},
++	{"oplus", "\xe2\x8a\x95"},
++	{"or", "\xe2\x88\xa8"},
++	{"orarr", "\xe2\x86\xbb"},
++	{"ord", "\xe2\xa9\x9d"},
++	{"order", "\xe2\x84\xb4"},
++	{"orderof", "\xe2\x84\xb4"},
++	{"ordf", "\xc2\xaa"},
++	{"ordm", "\xc2\xba"},
++	{"origof", "\xe2\x8a\xb6"},
++	{"oror", "\xe2\xa9\x96"},
++	{"orslope", "\xe2\xa9\x97"},
++	{"orv", "\xe2\xa9\x9b"},
++	{"oscr", "\xe2\x84\xb4"},
++	{"oslash", "\xc3\xb8"},
++	{"osol", "\xe2\x8a\x98"},
++	{"otilde", "\xc3\xb5"},
++	{"otimes", "\xe2\x8a\x97"},
++	{"otimesas", "\xe2\xa8\xb6"},
++	{"ouml", "\xc3\xb6"},
++	{"ovbar", "\xe2\x8c\xbd"},
++	{"par", "\xe2\x88\xa5"},
++	{"para", "\xc2\xb6"},
++	{"parallel", "\xe2\x88\xa5"},
++	{"parsim", "\xe2\xab\xb3"},
++	{"parsl", "\xe2\xab\xbd"},
++	{"part", "\xe2\x88\x82"},
++	{"pcy", "\xd0\xbf"},
++	{"percnt", "\x25"},
++	{"period", "\x2e"},
++	{"permil", "\xe2\x80\xb0"},
++	{"perp", "\xe2\x8a\xa5"},
++	{"pertenk", "\xe2\x80\xb1"},
++	{"pfr", "\xf0\x9d\x94\xad"},
++	{"phi", "\xcf\x86"},
++	{"phiv", "\xcf\x95"},
++	{"phmmat", "\xe2\x84\xb3"},
++	{"phone", "\xe2\x98\x8e"},
++	{"pi", "\xcf\x80"},
++	{"pitchfork", "\xe2\x8b\x94"},
++	{"piv", "\xcf\x96"},
++	{"planck", "\xe2\x84\x8f"},
++	{"planckh", "\xe2\x84\x8e"},
++	{"plankv", "\xe2\x84\x8f"},
++	{"plus", "\x2b"},
++	{"plusacir", "\xe2\xa8\xa3"},
++	{"plusb", "\xe2\x8a\x9e"},
++	{"pluscir", "\xe2\xa8\xa2"},
++	{"plusdo", "\xe2\x88\x94"},
++	{"plusdu", "\xe2\xa8\xa5"},
++	{"pluse", "\xe2\xa9\xb2"},
++	{"plusmn", "\xc2\xb1"},
++	{"plussim", "\xe2\xa8\xa6"},
++	{"plustwo", "\xe2\xa8\xa7"},
++	{"pm", "\xc2\xb1"},
++	{"pointint", "\xe2\xa8\x95"},
++	{"popf", "\xf0\x9d\x95\xa1"},
++	{"pound", "\xc2\xa3"},
++	{"pr", "\xe2\x89\xba"},
++	{"prE", "\xe2\xaa\xb3"},
++	{"prap", "\xe2\xaa\xb7"},
++	{"prcue", "\xe2\x89\xbc"},
++	{"pre", "\xe2\xaa\xaf"},
++	{"prec", "\xe2\x89\xba"},
++	{"precapprox", "\xe2\xaa\xb7"},
++	{"preccurlyeq", "\xe2\x89\xbc"},
++	{"preceq", "\xe2\xaa\xaf"},
++	{"precnapprox", "\xe2\xaa\xb9"},
++	{"precneqq", "\xe2\xaa\xb5"},
++	{"precnsim", "\xe2\x8b\xa8"},
++	{"precsim", "\xe2\x89\xbe"},
++	{"prime", "\xe2\x80\xb2"},
++	{"primes", "\xe2\x84\x99"},
++	{"prnE", "\xe2\xaa\xb5"},
++	{"prnap", "\xe2\xaa\xb9"},
++	{"prnsim", "\xe2\x8b\xa8"},
++	{"prod", "\xe2\x88\x8f"},
++	{"profalar", "\xe2\x8c\xae"},
++	{"profline", "\xe2\x8c\x92"},
++	{"profsurf", "\xe2\x8c\x93"},
++	{"prop", "\xe2\x88\x9d"},
++	{"propto", "\xe2\x88\x9d"},
++	{"prsim", "\xe2\x89\xbe"},
++	{"prurel", "\xe2\x8a\xb0"},
++	{"pscr", "\xf0\x9d\x93\x85"},
++	{"psi", "\xcf\x88"},
++	{"puncsp", "\xe2\x80\x88"},
++	{"qfr", "\xf0\x9d\x94\xae"},
++	{"qint", "\xe2\xa8\x8c"},
++	{"qopf", "\xf0\x9d\x95\xa2"},
++	{"qprime", "\xe2\x81\x97"},
++	{"qscr", "\xf0\x9d\x93\x86"},
++	{"quaternions", "\xe2\x84\x8d"},
++	{"quatint", "\xe2\xa8\x96"},
++	{"quest", "\x3f"},
++	{"questeq", "\xe2\x89\x9f"},
++	{"quot", "\x22"},
++	{"rAarr", "\xe2\x87\x9b"},
++	{"rArr", "\xe2\x87\x92"},
++	{"rAtail", "\xe2\xa4\x9c"},
++	{"rBarr", "\xe2\xa4\x8f"},
++	{"rHar", "\xe2\xa5\xa4"},
++	{"race", "\xe2\x88\xbd\xcc\xb1"},
++	{"racute", "\xc5\x95"},
++	{"radic", "\xe2\x88\x9a"},
++	{"raemptyv", "\xe2\xa6\xb3"},
++	{"rang", "\xe2\x9f\xa9"},
++	{"rangd", "\xe2\xa6\x92"},
++	{"range", "\xe2\xa6\xa5"},
++	{"rangle", "\xe2\x9f\xa9"},
++	{"raquo", "\xc2\xbb"},
++	{"rarr", "\xe2\x86\x92"},
++	{"rarrap", "\xe2\xa5\xb5"},
++	{"rarrb", "\xe2\x87\xa5"},
++	{"rarrbfs", "\xe2\xa4\xa0"},
++	{"rarrc", "\xe2\xa4\xb3"},
++	{"rarrfs", "\xe2\xa4\x9e"},
++	{"rarrhk", "\xe2\x86\xaa"},
++	{"rarrlp", "\xe2\x86\xac"},
++	{"rarrpl", "\xe2\xa5\x85"},
++	{"rarrsim", "\xe2\xa5\xb4"},
++	{"rarrtl", "\xe2\x86\xa3"},
++	{"rarrw", "\xe2\x86\x9d"},
++	{"ratail", "\xe2\xa4\x9a"},
++	{"ratio", "\xe2\x88\xb6"},
++	{"rationals", "\xe2\x84\x9a"},
++	{"rbarr", "\xe2\xa4\x8d"},
++	{"rbbrk", "\xe2\x9d\xb3"},
++	{"rbrace", "\x7d"},
++	{"rbrack", "\x5d"},
++	{"rbrke", "\xe2\xa6\x8c"},
++	{"rbrksld", "\xe2\xa6\x8e"},
++	{"rbrkslu", "\xe2\xa6\x90"},
++	{"rcaron", "\xc5\x99"},
++	{"rcedil", "\xc5\x97"},
++	{"rceil", "\xe2\x8c\x89"},
++	{"rcub", "\x7d"},
++	{"rcy", "\xd1\x80"},
++	{"rdca", "\xe2\xa4\xb7"},
++	{"rdldhar", "\xe2\xa5\xa9"},
++	{"rdquo", "\xe2\x80\x9d"},
++	{"rdquor", "\xe2\x80\x9d"},
++	{"rdsh", "\xe2\x86\xb3"},
++	{"real", "\xe2\x84\x9c"},
++	{"realine", "\xe2\x84\x9b"},
++	{"realpart", "\xe2\x84\x9c"},
++	{"reals", "\xe2\x84\x9d"},
++	{"rect", "\xe2\x96\xad"},
++	{"reg", "\xc2\xae"},
++	{"rfisht", "\xe2\xa5\xbd"},
++	{"rfloor", "\xe2\x8c\x8b"},
++	{"rfr", "\xf0\x9d\x94\xaf"},
++	{"rhard", "\xe2\x87\x81"},
++	{"rharu", "\xe2\x87\x80"},
++	{"rharul", "\xe2\xa5\xac"},
++	{"rho", "\xcf\x81"},
++	{"rhov", "\xcf\xb1"},
++	{"rightarrow", "\xe2\x86\x92"},
++	{"rightarrowtail", "\xe2\x86\xa3"},
++	{"rightharpoondown", "\xe2\x87\x81"},
++	{"rightharpoonup", "\xe2\x87\x80"},
++	{"rightleftarrows", "\xe2\x87\x84"},
++	{"rightleftharpoons", "\xe2\x87\x8c"},
++	{"rightrightarrows", "\xe2\x87\x89"},
++	{"rightsquigarrow", "\xe2\x86\x9d"},
++	{"rightthreetimes", "\xe2\x8b\x8c"},
++	{"ring", "\xcb\x9a"},
++	{"risingdotseq", "\xe2\x89\x93"},
++	{"rlarr", "\xe2\x87\x84"},
++	{"rlhar", "\xe2\x87\x8c"},
++	{"rlm", "\xe2\x80\x8f"},
++	{"rmoust", "\xe2\x8e\xb1"},
++	{"rmoustache", "\xe2\x8e\xb1"},
++	{"rnmid", "\xe2\xab\xae"},
++	{"roang", "\xe2\x9f\xad"},
++	{"roarr", "\xe2\x87\xbe"},
++	{"robrk", "\xe2\x9f\xa7"},
++	{"ropar", "\xe2\xa6\x86"},
++	{"ropf", "\xf0\x9d\x95\xa3"},
++	{"roplus", "\xe2\xa8\xae"},
++	{"rotimes", "\xe2\xa8\xb5"},
++	{"rpar", "\x29"},
++	{"rpargt", "\xe2\xa6\x94"},
++	{"rppolint", "\xe2\xa8\x92"},
++	{"rrarr", "\xe2\x87\x89"},
++	{"rsaquo", "\xe2\x80\xba"},
++	{"rscr", "\xf0\x9d\x93\x87"},
++	{"rsh", "\xe2\x86\xb1"},
++	{"rsqb", "\x5d"},
++	{"rsquo", "\xe2\x80\x99"},
++	{"rsquor", "\xe2\x80\x99"},
++	{"rthree", "\xe2\x8b\x8c"},
++	{"rtimes", "\xe2\x8b\x8a"},
++	{"rtri", "\xe2\x96\xb9"},
++	{"rtrie", "\xe2\x8a\xb5"},
++	{"rtrif", "\xe2\x96\xb8"},
++	{"rtriltri", "\xe2\xa7\x8e"},
++	{"ruluhar", "\xe2\xa5\xa8"},
++	{"rx", "\xe2\x84\x9e"},
++	{"sacute", "\xc5\x9b"},
++	{"sbquo", "\xe2\x80\x9a"},
++	{"sc", "\xe2\x89\xbb"},
++	{"scE", "\xe2\xaa\xb4"},
++	{"scap", "\xe2\xaa\xb8"},
++	{"scaron", "\xc5\xa1"},
++	{"sccue", "\xe2\x89\xbd"},
++	{"sce", "\xe2\xaa\xb0"},
++	{"scedil", "\xc5\x9f"},
++	{"scirc", "\xc5\x9d"},
++	{"scnE", "\xe2\xaa\xb6"},
++	{"scnap", "\xe2\xaa\xba"},
++	{"scnsim", "\xe2\x8b\xa9"},
++	{"scpolint", "\xe2\xa8\x93"},
++	{"scsim", "\xe2\x89\xbf"},
++	{"scy", "\xd1\x81"},
++	{"sdot", "\xe2\x8b\x85"},
++	{"sdotb", "\xe2\x8a\xa1"},
++	{"sdote", "\xe2\xa9\xa6"},
++	{"seArr", "\xe2\x87\x98"},
++	{"searhk", "\xe2\xa4\xa5"},
++	{"searr", "\xe2\x86\x98"},
++	{"searrow", "\xe2\x86\x98"},
++	{"sect", "\xc2\xa7"},
++	{"semi", "\x3b"},
++	{"seswar", "\xe2\xa4\xa9"},
++	{"setminus", "\xe2\x88\x96"},
++	{"setmn", "\xe2\x88\x96"},
++	{"sext", "\xe2\x9c\xb6"},
++	{"sfr", "\xf0\x9d\x94\xb0"},
++	{"sfrown", "\xe2\x8c\xa2"},
++	{"sharp", "\xe2\x99\xaf"},
++	{"shchcy", "\xd1\x89"},
++	{"shcy", "\xd1\x88"},
++	{"shortmid", "\xe2\x88\xa3"},
++	{"shortparallel", "\xe2\x88\xa5"},
++	{"shy", "\xc2\xad"},
++	{"sigma", "\xcf\x83"},
++	{"sigmaf", "\xcf\x82"},
++	{"sigmav", "\xcf\x82"},
++	{"sim", "\xe2\x88\xbc"},
++	{"simdot", "\xe2\xa9\xaa"},
++	{"sime", "\xe2\x89\x83"},
++	{"simeq", "\xe2\x89\x83"},
++	{"simg", "\xe2\xaa\x9e"},
++	{"simgE", "\xe2\xaa\xa0"},
++	{"siml", "\xe2\xaa\x9d"},
++	{"simlE", "\xe2\xaa\x9f"},
++	{"simne", "\xe2\x89\x86"},
++	{"simplus", "\xe2\xa8\xa4"},
++	{"simrarr", "\xe2\xa5\xb2"},
++	{"slarr", "\xe2\x86\x90"},
++	{"smallsetminus", "\xe2\x88\x96"},
++	{"smashp", "\xe2\xa8\xb3"},
++	{"smeparsl", "\xe2\xa7\xa4"},
++	{"smid", "\xe2\x88\xa3"},
++	{"smile", "\xe2\x8c\xa3"},
++	{"smt", "\xe2\xaa\xaa"},
++	{"smte", "\xe2\xaa\xac"},
++	{"smtes", "\xe2\xaa\xac\xef\xb8\x80"},
++	{"softcy", "\xd1\x8c"},
++	{"sol", "\x2f"},
++	{"solb", "\xe2\xa7\x84"},
++	{"solbar", "\xe2\x8c\xbf"},
++	{"sopf", "\xf0\x9d\x95\xa4"},
++	{"spades", "\xe2\x99\xa0"},
++	{"spadesuit", "\xe2\x99\xa0"},
++	{"spar", "\xe2\x88\xa5"},
++	{"sqcap", "\xe2\x8a\x93"},
++	{"sqcaps", "\xe2\x8a\x93\xef\xb8\x80"},
++	{"sqcup", "\xe2\x8a\x94"},
++	{"sqcups", "\xe2\x8a\x94\xef\xb8\x80"},
++	{"sqsub", "\xe2\x8a\x8f"},
++	{"sqsube", "\xe2\x8a\x91"},
++	{"sqsubset", "\xe2\x8a\x8f"},
++	{"sqsubseteq", "\xe2\x8a\x91"},
++	{"sqsup", "\xe2\x8a\x90"},
++	{"sqsupe", "\xe2\x8a\x92"},
++	{"sqsupset", "\xe2\x8a\x90"},
++	{"sqsupseteq", "\xe2\x8a\x92"},
++	{"squ", "\xe2\x96\xa1"},
++	{"square", "\xe2\x96\xa1"},
++	{"squarf", "\xe2\x96\xaa"},
++	{"squf", "\xe2\x96\xaa"},
++	{"srarr", "\xe2\x86\x92"},
++	{"sscr", "\xf0\x9d\x93\x88"},
++	{"ssetmn", "\xe2\x88\x96"},
++	{"ssmile", "\xe2\x8c\xa3"},
++	{"sstarf", "\xe2\x8b\x86"},
++	{"star", "\xe2\x98\x86"},
++	{"starf", "\xe2\x98\x85"},
++	{"straightepsilon", "\xcf\xb5"},
++	{"straightphi", "\xcf\x95"},
++	{"strns", "\xc2\xaf"},
++	{"sub", "\xe2\x8a\x82"},
++	{"subE", "\xe2\xab\x85"},
++	{"subdot", "\xe2\xaa\xbd"},
++	{"sube", "\xe2\x8a\x86"},
++	{"subedot", "\xe2\xab\x83"},
++	{"submult", "\xe2\xab\x81"},
++	{"subnE", "\xe2\xab\x8b"},
++	{"subne", "\xe2\x8a\x8a"},
++	{"subplus", "\xe2\xaa\xbf"},
++	{"subrarr", "\xe2\xa5\xb9"},
++	{"subset", "\xe2\x8a\x82"},
++	{"subseteq", "\xe2\x8a\x86"},
++	{"subseteqq", "\xe2\xab\x85"},
++	{"subsetneq", "\xe2\x8a\x8a"},
++	{"subsetneqq", "\xe2\xab\x8b"},
++	{"subsim", "\xe2\xab\x87"},
++	{"subsub", "\xe2\xab\x95"},
++	{"subsup", "\xe2\xab\x93"},
++	{"succ", "\xe2\x89\xbb"},
++	{"succapprox", "\xe2\xaa\xb8"},
++	{"succcurlyeq", "\xe2\x89\xbd"},
++	{"succeq", "\xe2\xaa\xb0"},
++	{"succnapprox", "\xe2\xaa\xba"},
++	{"succneqq", "\xe2\xaa\xb6"},
++	{"succnsim", "\xe2\x8b\xa9"},
++	{"succsim", "\xe2\x89\xbf"},
++	{"sum", "\xe2\x88\x91"},
++	{"sung", "\xe2\x99\xaa"},
++	{"sup", "\xe2\x8a\x83"},
++	{"sup1", "\xc2\xb9"},
++	{"sup2", "\xc2\xb2"},
++	{"sup3", "\xc2\xb3"},
++	{"supE", "\xe2\xab\x86"},
++	{"supdot", "\xe2\xaa\xbe"},
++	{"supdsub", "\xe2\xab\x98"},
++	{"supe", "\xe2\x8a\x87"},
++	{"supedot", "\xe2\xab\x84"},
++	{"suphsol", "\xe2\x9f\x89"},
++	{"suphsub", "\xe2\xab\x97"},
++	{"suplarr", "\xe2\xa5\xbb"},
++	{"supmult", "\xe2\xab\x82"},
++	{"supnE", "\xe2\xab\x8c"},
++	{"supne", "\xe2\x8a\x8b"},
++	{"supplus", "\xe2\xab\x80"},
++	{"supset", "\xe2\x8a\x83"},
++	{"supseteq", "\xe2\x8a\x87"},
++	{"supseteqq", "\xe2\xab\x86"},
++	{"supsetneq", "\xe2\x8a\x8b"},
++	{"supsetneqq", "\xe2\xab\x8c"},
++	{"supsim", "\xe2\xab\x88"},
++	{"supsub", "\xe2\xab\x94"},
++	{"supsup", "\xe2\xab\x96"},
++	{"swArr", "\xe2\x87\x99"},
++	{"swarhk", "\xe2\xa4\xa6"},
++	{"swarr", "\xe2\x86\x99"},
++	{"swarrow", "\xe2\x86\x99"},
++	{"swnwar", "\xe2\xa4\xaa"},
++	{"szlig", "\xc3\x9f"},
++	{"target", "\xe2\x8c\x96"},
++	{"tau", "\xcf\x84"},
++	{"tbrk", "\xe2\x8e\xb4"},
++	{"tcaron", "\xc5\xa5"},
++	{"tcedil", "\xc5\xa3"},
++	{"tcy", "\xd1\x82"},
++	{"tdot", "\xe2\x83\x9b"},
++	{"telrec", "\xe2\x8c\x95"},
++	{"tfr", "\xf0\x9d\x94\xb1"},
++	{"there4", "\xe2\x88\xb4"},
++	{"therefore", "\xe2\x88\xb4"},
++	{"theta", "\xce\xb8"},
++	{"thetasym", "\xcf\x91"},
++	{"thetav", "\xcf\x91"},
++	{"thickapprox", "\xe2\x89\x88"},
++	{"thicksim", "\xe2\x88\xbc"},
++	{"thinsp", "\xe2\x80\x89"},
++	{"thkap", "\xe2\x89\x88"},
++	{"thksim", "\xe2\x88\xbc"},
++	{"thorn", "\xc3\xbe"},
++	{"tilde", "\xcb\x9c"},
++	{"times", "\xc3\x97"},
++	{"timesb", "\xe2\x8a\xa0"},
++	{"timesbar", "\xe2\xa8\xb1"},
++	{"timesd", "\xe2\xa8\xb0"},
++	{"tint", "\xe2\x88\xad"},
++	{"toea", "\xe2\xa4\xa8"},
++	{"top", "\xe2\x8a\xa4"},
++	{"topbot", "\xe2\x8c\xb6"},
++	{"topcir", "\xe2\xab\xb1"},
++	{"topf", "\xf0\x9d\x95\xa5"},
++	{"topfork", "\xe2\xab\x9a"},
++	{"tosa", "\xe2\xa4\xa9"},
++	{"tprime", "\xe2\x80\xb4"},
++	{"trade", "\xe2\x84\xa2"},
++	{"triangle", "\xe2\x96\xb5"},
++	{"triangledown", "\xe2\x96\xbf"},
++	{"triangleleft", "\xe2\x97\x83"},
++	{"trianglelefteq", "\xe2\x8a\xb4"},
++	{"triangleq", "\xe2\x89\x9c"},
++	{"triangleright", "\xe2\x96\xb9"},
++	{"trianglerighteq", "\xe2\x8a\xb5"},
++	{"tridot", "\xe2\x97\xac"},
++	{"trie", "\xe2\x89\x9c"},
++	{"triminus", "\xe2\xa8\xba"},
++	{"triplus", "\xe2\xa8\xb9"},
++	{"trisb", "\xe2\xa7\x8d"},
++	{"tritime", "\xe2\xa8\xbb"},
++	{"trpezium", "\xe2\x8f\xa2"},
++	{"tscr", "\xf0\x9d\x93\x89"},
++	{"tscy", "\xd1\x86"},
++	{"tshcy", "\xd1\x9b"},
++	{"tstrok", "\xc5\xa7"},
++	{"twixt", "\xe2\x89\xac"},
++	{"twoheadleftarrow", "\xe2\x86\x9e"},
++	{"twoheadrightarrow", "\xe2\x86\xa0"},
++	{"uArr", "\xe2\x87\x91"},
++	{"uHar", "\xe2\xa5\xa3"},
++	{"uacute", "\xc3\xba"},
++	{"uarr", "\xe2\x86\x91"},
++	{"ubrcy", "\xd1\x9e"},
++	{"ubreve", "\xc5\xad"},
++	{"ucirc", "\xc3\xbb"},
++	{"ucy", "\xd1\x83"},
++	{"udarr", "\xe2\x87\x85"},
++	{"udblac", "\xc5\xb1"},
++	{"udhar", "\xe2\xa5\xae"},
++	{"ufisht", "\xe2\xa5\xbe"},
++	{"ufr", "\xf0\x9d\x94\xb2"},
++	{"ugrave", "\xc3\xb9"},
++	{"uharl", "\xe2\x86\xbf"},
++	{"uharr", "\xe2\x86\xbe"},
++	{"uhblk", "\xe2\x96\x80"},
++	{"ulcorn", "\xe2\x8c\x9c"},
++	{"ulcorner", "\xe2\x8c\x9c"},
++	{"ulcrop", "\xe2\x8c\x8f"},
++	{"ultri", "\xe2\x97\xb8"},
++	{"umacr", "\xc5\xab"},
++	{"uml", "\xc2\xa8"},
++	{"uogon", "\xc5\xb3"},
++	{"uopf", "\xf0\x9d\x95\xa6"},
++	{"uparrow", "\xe2\x86\x91"},
++	{"updownarrow", "\xe2\x86\x95"},
++	{"upharpoonleft", "\xe2\x86\xbf"},
++	{"upharpoonright", "\xe2\x86\xbe"},
++	{"uplus", "\xe2\x8a\x8e"},
++	{"upsi", "\xcf\x85"},
++	{"upsih", "\xcf\x92"},
++	{"upsilon", "\xcf\x85"},
++	{"upuparrows", "\xe2\x87\x88"},
++	{"urcorn", "\xe2\x8c\x9d"},
++	{"urcorner", "\xe2\x8c\x9d"},
++	{"urcrop", "\xe2\x8c\x8e"},
++	{"uring", "\xc5\xaf"},
++	{"urtri", "\xe2\x97\xb9"},
++	{"uscr", "\xf0\x9d\x93\x8a"},
++	{"utdot", "\xe2\x8b\xb0"},
++	{"utilde", "\xc5\xa9"},
++	{"utri", "\xe2\x96\xb5"},
++	{"utrif", "\xe2\x96\xb4"},
++	{"uuarr", "\xe2\x87\x88"},
++	{"uuml", "\xc3\xbc"},
++	{"uwangle", "\xe2\xa6\xa7"},
++	{"vArr", "\xe2\x87\x95"},
++	{"vBar", "\xe2\xab\xa8"},
++	{"vBarv", "\xe2\xab\xa9"},
++	{"vDash", "\xe2\x8a\xa8"},
++	{"vangrt", "\xe2\xa6\x9c"},
++	{"varepsilon", "\xcf\xb5"},
++	{"varkappa", "\xcf\xb0"},
++	{"varnothing", "\xe2\x88\x85"},
++	{"varphi", "\xcf\x95"},
++	{"varpi", "\xcf\x96"},
++	{"varpropto", "\xe2\x88\x9d"},
++	{"varr", "\xe2\x86\x95"},
++	{"varrho", "\xcf\xb1"},
++	{"varsigma", "\xcf\x82"},
++	{"varsubsetneq", "\xe2\x8a\x8a\xef\xb8\x80"},
++	{"varsubsetneqq", "\xe2\xab\x8b\xef\xb8\x80"},
++	{"varsupsetneq", "\xe2\x8a\x8b\xef\xb8\x80"},
++	{"varsupsetneqq", "\xe2\xab\x8c\xef\xb8\x80"},
++	{"vartheta", "\xcf\x91"},
++	{"vartriangleleft", "\xe2\x8a\xb2"},
++	{"vartriangleright", "\xe2\x8a\xb3"},
++	{"vcy", "\xd0\xb2"},
++	{"vdash", "\xe2\x8a\xa2"},
++	{"vee", "\xe2\x88\xa8"},
++	{"veebar", "\xe2\x8a\xbb"},
++	{"veeeq", "\xe2\x89\x9a"},
++	{"vellip", "\xe2\x8b\xae"},
++	{"verbar", "\x7c"},
++	{"vert", "\x7c"},
++	{"vfr", "\xf0\x9d\x94\xb3"},
++	{"vltri", "\xe2\x8a\xb2"},
++	{"vnsub", "\xe2\x8a\x82\xe2\x83\x92"},
++	{"vnsup", "\xe2\x8a\x83\xe2\x83\x92"},
++	{"vopf", "\xf0\x9d\x95\xa7"},
++	{"vprop", "\xe2\x88\x9d"},
++	{"vrtri", "\xe2\x8a\xb3"},
++	{"vscr", "\xf0\x9d\x93\x8b"},
++	{"vsubnE", "\xe2\xab\x8b\xef\xb8\x80"},
++	{"vsubne", "\xe2\x8a\x8a\xef\xb8\x80"},
++	{"vsupnE", "\xe2\xab\x8c\xef\xb8\x80"},
++	{"vsupne", "\xe2\x8a\x8b\xef\xb8\x80"},
++	{"vzigzag", "\xe2\xa6\x9a"},
++	{"wcirc", "\xc5\xb5"},
++	{"wedbar", "\xe2\xa9\x9f"},
++	{"wedge", "\xe2\x88\xa7"},
++	{"wedgeq", "\xe2\x89\x99"},
++	{"weierp", "\xe2\x84\x98"},
++	{"wfr", "\xf0\x9d\x94\xb4"},
++	{"wopf", "\xf0\x9d\x95\xa8"},
++	{"wp", "\xe2\x84\x98"},
++	{"wr", "\xe2\x89\x80"},
++	{"wreath", "\xe2\x89\x80"},
++	{"wscr", "\xf0\x9d\x93\x8c"},
++	{"xcap", "\xe2\x8b\x82"},
++	{"xcirc", "\xe2\x97\xaf"},
++	{"xcup", "\xe2\x8b\x83"},
++	{"xdtri", "\xe2\x96\xbd"},
++	{"xfr", "\xf0\x9d\x94\xb5"},
++	{"xhArr", "\xe2\x9f\xba"},
++	{"xharr", "\xe2\x9f\xb7"},
++	{"xi", "\xce\xbe"},
++	{"xlArr", "\xe2\x9f\xb8"},
++	{"xlarr", "\xe2\x9f\xb5"},
++	{"xmap", "\xe2\x9f\xbc"},
++	{"xnis", "\xe2\x8b\xbb"},
++	{"xodot", "\xe2\xa8\x80"},
++	{"xopf", "\xf0\x9d\x95\xa9"},
++	{"xoplus", "\xe2\xa8\x81"},
++	{"xotime", "\xe2\xa8\x82"},
++	{"xrArr", "\xe2\x9f\xb9"},
++	{"xrarr", "\xe2\x9f\xb6"},
++	{"xscr", "\xf0\x9d\x93\x8d"},
++	{"xsqcup", "\xe2\xa8\x86"},
++	{"xuplus", "\xe2\xa8\x84"},
++	{"xutri", "\xe2\x96\xb3"},
++	{"xvee", "\xe2\x8b\x81"},
++	{"xwedge", "\xe2\x8b\x80"},
++	{"yacute", "\xc3\xbd"},
++	{"yacy", "\xd1\x8f"},
++	{"ycirc", "\xc5\xb7"},
++	{"ycy", "\xd1\x8b"},
++	{"yen", "\xc2\xa5"},
++	{"yfr", "\xf0\x9d\x94\xb6"},
++	{"yicy", "\xd1\x97"},
++	{"yopf", "\xf0\x9d\x95\xaa"},
++	{"yscr", "\xf0\x9d\x93\x8e"},
++	{"yucy", "\xd1\x8e"},
++	{"yuml", "\xc3\xbf"},
++	{"zacute", "\xc5\xba"},
++	{"zcaron", "\xc5\xbe"},
++	{"zcy", "\xd0\xb7"},
++	{"zdot", "\xc5\xbc"},
++	{"zeetrf", "\xe2\x84\xa8"},
++	{"zeta", "\xce\xb6"},
++	{"zfr", "\xf0\x9d\x94\xb7"},
++	{"zhcy", "\xd0\xb6"},
++	{"zigrarr", "\xe2\x87\x9d"},
++	{"zopf", "\xf0\x9d\x95\xab"},
++	{"zscr", "\xf0\x9d\x93\x8f"},
++	{"zwj", "\xe2\x80\x8d"},
++	{"zwnj", "\xe2\x80\x8c"},
++
++	{0, 0}
++};
++
++#define MAX_ENTITY_NAME_LENGTH 31
++#define NUM_ENTITIES 2125
++
++/* END OF HTML ENTITIES */
++
++static const htmlEntity *findEntity(const char *s, int len) {
++	int l = 0;
++	int r = NUM_ENTITIES - 1;
++	while (l <= r) {
++		int m = (l + r) / 2;
++		int cmp = strncmp(s, htmlEntities[m].pzName, len);
++		if (cmp == 0) {
++			return &htmlEntities[m];
++		} else if (cmp < 0) {
++			r = m - 1;
++		} else {
++			l = m + 1;
++		}
++	}
++
++	return NULL;
++}
++
++/* do not include void element here */
++static const char *azIgnoreTags[] = {
++	"canvas",
++	"math",
++	"noscript",
++	"object",
++	"script",
++	"style",
++	"svg",
++	"template",
++	NULL,
++};
++
++struct Fts5HtmlTokenizer {
++	fts5_tokenizer nextTok;
++	Fts5Tokenizer *pNextTokInst;
++};
++typedef struct Fts5HtmlTokenizer Fts5HtmlTokenizer;
++
++struct htmlEscape {
++	char *pLengths;
++	char *pPlain;
++	int n;
++};
++typedef struct htmlEscape htmlEscape;
++
++struct Fts5HtmlTokenizerContext {
++	int (*xToken)(
++		void *pCtx,
++		int tflags,
++		const char *pToken,
++		int nToken,
++		int iStart,
++		int iEnd
++	);
++	void *pCtx;
++	htmlEscape *pEscape;
++
++	/* current position in the plain (unescaped) text, relative to the what is
++	 * passed to the xTokenize call to the next tokenizer
++	 */
++	int iPlainCur;
++
++	/* current position in the original (html) text
++	 * this is relative to the original text passed to the xTokenize call to
++	 * this tokenizer
++	 */
++	int iOriginalCur;
++};
++typedef struct Fts5HtmlTokenizerContext Fts5HtmlTokenizerContext;
++
++static inline int caseInsensitiveCompare(const char *a, const char *b, int n) {
++	for (int i = 0; i < n; i++) {
++		char ca = (char)tolower(a[i]);
++		char cb = (char)tolower(b[i]);
++		int diff = ca - cb;
++		if (diff != 0 || ca == '\0' || cb == '\0') {
++			return diff;
++		}
++	}
++	return 0;
++}
++
++static inline int hasPrefix(const char *p, int n, const char *prefix) {
++	int len = strlen(prefix);
++	if (n < len) {
++		return 0;
++	}
++	return strncmp(p, prefix, len) == 0;
++}
++
++static int fts5HtmlTokenizerCreate(void *pCtx, const char **azArg, int nArg, Fts5Tokenizer **ppOut) {
++	int rc = SQLITE_OK;
++	fts5_api *pApi = (fts5_api*)pCtx;
++	Fts5HtmlTokenizer *pRet = NULL;
++	void *pTokCtx = NULL;
++
++	if (nArg == 0) {
++		return SQLITE_MISUSE;
++	}
++
++	pRet = sqlite3_malloc(sizeof(*pRet));
++	if (pRet == NULL) {
++		rc = SQLITE_NOMEM;
++		goto error;
++	}
++	memset(pRet, 0, sizeof(*pRet));
++
++	const char *nextTokName = azArg[0];
++	rc = pApi->xFindTokenizer(pApi, nextTokName, &pTokCtx, &pRet->nextTok);
++	if (rc != SQLITE_OK) {
++		goto error;
++	}
++
++	rc = pRet->nextTok.xCreate(pTokCtx, azArg + 1, nArg - 1, &pRet->pNextTokInst);
++	if (rc != SQLITE_OK) {
++		goto error;
++	}
++
++	*ppOut = (Fts5Tokenizer*)pRet;
++	return SQLITE_OK;
++
++error:
++	if (pRet != NULL) {
++		sqlite3_free(pRet);
++	}
++	return rc;
++}
++
++static int fts5TokenizeCallback(
++	void *pCtx,
++	int tflags,
++	const char *pToken,
++	int nToken,
++	int iStart,
++	int iEnd
++) {
++	Fts5HtmlTokenizerContext *p = (Fts5HtmlTokenizerContext*)pCtx;
++	htmlEscape *e = p->pEscape;
++
++	int iActualStart = p->iOriginalCur;
++	// This breaks the trigram tokenizer
++	// if (p->iPlainCur > iStart) {
++	// 	return SQLITE_ERROR;
++	// }
++
++	for (int i = p->iPlainCur; i < iStart; i++) {
++		iActualStart += e->pLengths[i];
++	}
++	int iActualEnd = iActualStart;
++	for (int i = iStart; i < iEnd; i++) {
++		iActualEnd += e->pLengths[i];
++	}
++	p->iOriginalCur = iActualEnd;
++	p->iPlainCur = iEnd;
++
++	return p->xToken(p->pCtx, tflags, pToken, nToken, iActualStart, iActualEnd);
++}
++
++static int parseCodepoint(const char *s, int len) {
++	int code = 0;
++	if (len < 1) {
++		return -1;
++	}
++	if (s[0] == 'x' || s[0] == 'X') {
++		/* hex, e.g. ģ */
++		for (int i = 1; i < len; i++) {
++			char d = s[i];
++			code *= 16;
++			if (d >= '0' && d <= '9') {
++				code += d - '0';
++			} else if (d >= 'a' && d <= 'f') {
++				code += d - 'a' + 10;
++			} else if (d >= 'A' && d <= 'F') {
++				code += d - 'A' + 10;
++			} else {
++				return -1;
++			}
++		}
++	} else {
++		/* decimal, e.g. { */
++		for (int i = 0; i < len; i++) {
++			char d = s[i];
++			code *= 10;
++			if (d >= '0' && d <= '9') {
++				code += d - '0';
++			} else {
++				return -1;
++			}
++		}
++	}
++	return code;
++}
++
++static void htmlEscapeFree(htmlEscape *p) {
++	if (p != NULL) {
++		if (p->pLengths != NULL) {
++			sqlite3_free(p->pLengths);
++		}
++		if (p->pPlain != NULL) {
++			sqlite3_free(p->pPlain);
++		}
++		sqlite3_free(p);
++	}
++}
++
++static int htmlUnescape(const char *s, int len, htmlEscape **pOutEscape) {
++	if (len <= 0) {
++		*pOutEscape = NULL;
++		return SQLITE_OK;
++	}
++	int bufLen = len + 16;
++
++	int rc = SQLITE_OK;
++	htmlEscape *e = sqlite3_malloc(sizeof(*e));
++	if (e == NULL) {
++		rc = SQLITE_NOMEM;
++		goto end;
++	}
++	memset(e, 0, sizeof(*e));
++
++	e->pLengths = sqlite3_malloc(bufLen);
++	if (e->pLengths == NULL) {
++		rc = SQLITE_NOMEM;
++		goto end;
++	}
++	memset(e->pLengths, 0, bufLen);
++
++	e->pPlain = sqlite3_malloc(bufLen);
++	if (e->pPlain == NULL) {
++		rc = SQLITE_NOMEM;
++		goto end;
++	}
++	memset(e->pPlain, 0, bufLen);
++
++	const char *p = s;
++	const char *pEmit = s;
++
++	char *ep = e->pPlain;
++	char *el = e->pLengths;
++
++#define EMIT(c) do {\
++	if (ep >= e->pPlain + bufLen) {\
++		rc = SQLITE_ERROR;\
++		goto end;\
++	}\
++	*ep++ = c;\
++	*el++ = (p + 1) - pEmit;\
++	pEmit = p + 1;\
++} while (0)
++
++	unsigned long escaped = 0;
++	char buf[MAX_ENTITY_NAME_LENGTH + 4] = {0};
++
++	for (; p - s < len; p++) {
++		char c = *p;
++		if (escaped > 0) {
++			if (!isalnum(c) && c != '#') {
++				if (buf[1] == '#') {
++					/* numeric escape, buf: � or � */
++					int code = parseCodepoint(buf + 2, escaped - 2);
++					/* assume code is a Unicode code point, encode into UTF-8 */
++					if (code < 0) {
++						/* invalid escape, */
++					} else if (code < 0x80) {
++						EMIT(code);
++					} else if (code < 0x800) {
++						EMIT(0xC0 | (code >> 6));
++						EMIT(0x80 | (code & 0x3F));
++					} else if (code < 0x10000) {
++						EMIT(0xE0 | (code >> 12));
++						EMIT(0x80 | ((code >> 6) & 0x3F));
++						EMIT(0x80 | (code & 0x3F));
++					} else if (code < 0x110000) {
++						EMIT(0xF0 | (code >> 18));
++						EMIT(0x80 | ((code >> 12) & 0x3F));
++						EMIT(0x80 | ((code >> 6) & 0x3F));
++						EMIT(0x80 | (code & 0x3F));
++					} else {
++						/* invalid escape, ignore */
++					}
++				} else {
++					/* named escape, buf: & */
++					const htmlEntity *entity = findEntity(buf + 1, escaped - 1);
++					if (entity != NULL) {
++						const char *pEntity = entity->pzUtf8;
++						while (*pEntity != '\0') {
++							EMIT(*pEntity);
++							pEntity++;
++						}
++					} else {
++						/* invalid escape, ignore */
++					}
++				}
++				if (c != ';') {
++					/* unclosed entity */
++					EMIT(c);
++				}
++				escaped = 0;
++			} else {
++				if (escaped < sizeof(buf)) {
++					buf[escaped++] = c;
++				}
++			}
++		} else {
++			/* not escaped */
++			if (c == '&') {
++				escaped = 0;
++				memset(buf, 0, sizeof(buf));
++				buf[escaped++] = c;
++			} else {
++				EMIT(c);
++			}
++		}
++	}
++
++	e->n = ep - e->pPlain;
++
++	*pOutEscape = e;
++	return rc;
++
++#undef EMIT
++end:
++	htmlEscapeFree(e);
++
++	*pOutEscape = e;
++	return rc;
++}
++
++static int fts5HtmlTokenizerTokenize(
++	Fts5Tokenizer *pTokenizer,
++	void *pCtx,
++	int flags,
++	const char *pText,
++	int nText,
++	int (*xToken)(
++		void *pCtx,
++		int tflags,
++		const char *pToken,
++		int nToken,
++		int iStart,
++		int iEnd
++	)
++) {
++	int rc;
++	Fts5HtmlTokenizer *p = (Fts5HtmlTokenizer*)pTokenizer;
++
++	// states
++	const char *pzCurIgnoreTag = NULL;
++
++	// iterate over the tokens
++	const char *pPrev = pText;
++	const char *pCur = pText;
++	const char *pEnd = pText + nText;
++
++	while (1) {
++
++#define STEP(n) do {\
++	if (pCur + n >= pEnd) { \
++		return SQLITE_OK; \
++	} \
++	pCur += n; \
++} while (0)
++
++		/* find the next tag */
++		while (*pCur != '<' && pCur < pEnd) {
++			pCur++;
++		}
++
++		/* current is '<' or end of text */
++		if (pzCurIgnoreTag == NULL && pCur > pPrev) {
++			htmlEscape *pEscape = NULL;
++			rc = htmlUnescape(pPrev, pCur - pPrev, &pEscape);
++			if (rc != SQLITE_OK) {
++				return rc;
++			}
++			Fts5HtmlTokenizerContext ctx = {
++				.xToken = xToken,
++				.pCtx = pCtx,
++				.pEscape = pEscape,
++				.iPlainCur = 0,
++				.iOriginalCur = pPrev - pText,
++			};
++			/* emit the text token */
++			rc = p->nextTok.xTokenize(p->pNextTokInst, &ctx, flags, pEscape->pPlain, pEscape->n, fts5TokenizeCallback);
++			htmlEscapeFree(pEscape);
++			if (rc != SQLITE_OK) {
++				return rc;
++			}
++		}
++		STEP(1);
++
++		/* check for comment */
++		if (hasPrefix(pCur, pEnd - pCur, "!--")) {
++			STEP(3);
++			while (!hasPrefix(pCur, pEnd - pCur, "-->")) {
++				STEP(1);
++			}
++			STEP(3);
++			continue;
++		}
++
++		/* parse the tag */
++		int iTagType = 0; /* 0: self-closing, 1: start tag, 2: end tag */
++		const char *pTagName;
++		int nTagName;
++		if (*pCur == '/') { /* ') {
++			STEP(1);
++		}
++		nTagName = pCur - pTagName;
++		while (*pCur != '>') {
++			STEP(1);
++		}
++		if (*(pCur - 1) == '/') {
++			iTagType = 0;
++		}
++
++		/* check if tag is ignored */
++		if (pzCurIgnoreTag == NULL && iTagType == 1) {
++			for (int i = 0; azIgnoreTags[i] != NULL; i++) {
++				if (caseInsensitiveCompare(pTagName, azIgnoreTags[i], nTagName) == 0) {
++					pzCurIgnoreTag = azIgnoreTags[i];
++					break;
++				}
++			}
++		} else if (pzCurIgnoreTag != NULL && iTagType == 2) {
++			if (caseInsensitiveCompare(pTagName, pzCurIgnoreTag, nTagName) == 0) {
++				pzCurIgnoreTag = NULL;
++			}
++		}
++
++		/* tag ended */
++		STEP(1);
++		pPrev = pCur;
++
++#undef STEP
++
++	}
++
++	return SQLITE_OK;
++}
++
++static void fts5HtmlTokenizerDelete(Fts5Tokenizer *pTokenizer) {
++	Fts5HtmlTokenizer *p = (Fts5HtmlTokenizer*)pTokenizer;
++	p->nextTok.xDelete(p->pNextTokInst);
++	sqlite3_free(p);
++}
++
++static fts5_api *fts5_api_from_db(sqlite3 *db) {
++  fts5_api *pRet = 0;
++  sqlite3_stmt *pStmt = 0;
++
++  int version = sqlite3_libversion_number();
++  if (version >= 3020000) { // current api
++    if (SQLITE_OK == sqlite3_prepare(db, "SELECT fts5(?1)", -1, &pStmt, 0)) {
++      sqlite3_bind_pointer(pStmt, 1, (void *)&pRet, "fts5_api_ptr", NULL);
++      sqlite3_step(pStmt);
++    }
++    sqlite3_finalize(pStmt);
++  } else { // before 3.20
++    int rc = sqlite3_prepare(db, "SELECT fts5()", -1, &pStmt, 0);
++    if (rc == SQLITE_OK) {
++      if (SQLITE_ROW == sqlite3_step(pStmt) &&
++          sizeof(fts5_api *) == sqlite3_column_bytes(pStmt, 0)) {
++        memcpy(&pRet, sqlite3_column_blob(pStmt, 0), sizeof(fts5_api *));
++      }
++      sqlite3_finalize(pStmt);
++    }
++  }
++  return pRet;
++}
++
++static int fts5HtmlInit(sqlite3 *db) {
++    fts5_api *pApi;
++    pApi = fts5_api_from_db(db);
++	if (!pApi) {
++		return SQLITE_ERROR;
++	}
++
++	fts5_tokenizer tok = {
++		.xCreate = fts5HtmlTokenizerCreate,
++		.xTokenize = fts5HtmlTokenizerTokenize,
++		.xDelete = fts5HtmlTokenizerDelete,
++	};
++
++	return pApi->xCreateTokenizer(pApi, "html", (void *)pApi, &tok, NULL);
++}
++
++#ifdef SQLITE_CORE
++SQLITE_PRIVATE int sqlite3Fts5HtmlInit(sqlite3 *db) {
++  return fts5HtmlInit(db);
++}
++#else
++SQLITE_FTS5_HTML_API int
++sqlite3_ftshtml_init(sqlite3 *db, char **error,
++                           const sqlite3_api_routines *api) {
++  SQLITE_EXTENSION_INIT2(api);
++  UNUSED_PARAM(error);
++
++  return fts5HtmlInit(db);
++}
++#endif
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.h b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.h
+new file mode 100755
+index 0000000..ab224e9
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.h
+@@ -0,0 +1,41 @@
++#ifndef SQLITE_FTS5_HTML_H
++#define SQLITE_FTS5_HTML_H
++
++#ifndef SQLITE_CORE
++#include "sqlite3ext.h"
++#else
++#include "sqlite3.h"
++#endif
++
++#ifndef SQLITE_PRIVATE
++#define SQLITE_PRIVATE static
++#endif
++
++#ifdef SQLITE_FTS5_HTML_STATIC
++#define SQLITE_FTS5_HTML_API
++#else
++#ifdef _WIN32
++#define SQLITE_FTS5_HTML_API __declspec(dllexport)
++#else
++#define SQLITE_FTS5_HTML_API
++#endif
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifdef SQLITE_CORE
++SQLITE_PRIVATE int sqlite3Fts5HtmlInit(sqlite3 *db);
++#else
++SQLITE_FTS5_HTML_API int
++sqlite3_ftshtml_init(sqlite3 *db, char **pzErrMsg,
++                           const sqlite3_api_routines *pApi);
++
++#endif
++
++#ifdef __cplusplus
++} /* end of the 'extern "C"' block */
++#endif
++
++#endif /* ifndef SQLITE_FTS5_HTML_H */
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.test.ts b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.test.ts
+new file mode 100755
+index 0000000..afcf64e
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/fts5-html.test.ts
+@@ -0,0 +1,193 @@
++/*
++ ** 2024-10-21
++ **
++ ** The author disclaims copyright to this source code.  In place of
++ ** a legal notice, here is a blessing:
++ **
++ **    May you do good and not evil.
++ **    May you find forgiveness for yourself and forgive others.
++ **    May you share freely, never taking more than you give.
++ **
++ */
++// to run: bun test
++
++import { Database } from "bun:sqlite";
++import { test, describe, expect, afterAll, beforeAll } from "bun:test";
++
++const EXT =
++  process.platform === "win32"
++    ? ".dll"
++    : process.platform === "darwin"
++      ? ".dylib"
++      : ".so";
++
++if (process.platform === "darwin" && process.env.SQLITE_LIB_PATH)
++  Database.setCustomSQLite(process.env.SQLITE_LIB_PATH);
++
++function initDatabase() {
++  const db = new Database(":memory:");
++  db.loadExtension(`./dist/fts5${EXT}`);
++  db.loadExtension(`./dist/fts5-html${EXT}`);
++  return db;
++}
++
++describe("unicode61", () => {
++  const db = initDatabase();
++  afterAll(() => db.close());
++
++  test("1.0", () => {
++    [
++      `CREATE VIRTUAL TABLE test USING fts5(x, y, tokenize = 'html unicode61 remove_diacritics 1');`,
++      `INSERT INTO test VALUES('a', '
++      
++      
++	
++      
++	hello  world  "asdf"
++	abcd
++	中文
++      
++      
++      ');`,
++      `INSERT INTO test VALUES('b', '
++      
++      
++      
++          Example Domain
++
++          
++          
++          
++          
++      
++
++      
++      
    
++          
    Example Domain
    
++          
    This domain is for use in illustrative examples in documents. You may use this
++          domain in literature without prior coordination or asking for permission.
    
++          
    More information...
    
++      
    
++      
++      
++      ');`,
++    ].forEach((stmt) => db.query(stmt).run());
++  });
++
++  const queries = {
++    ignored: 0,
++    hello: 1,
++    "hello world": 1,
++    abcd: 1,
++    中文: 1,
++    example: 1,
++    domain: 1,
++    information: 1,
++    quot: 0,
++    nbsp: 0,
++    meta: 0,
++    margin: 0,
++    viewport: 0,
++    Helvetica: 0,
++  };
++  let i = 1;
++  for (const query in queries) {
++    sqlTest(
++      db,
++      `1.${i++}.${query}`,
++      `SELECT count(*) as res FROM test WHERE test MATCH '${query}'`,
++      [],
++      [queries[query]],
++    );
++  }
++});
++
++describe("trigram", () => {
++  const db = initDatabase();
++  afterAll(() => db.close());
++
++  test("1.0", () => {
++    [
++      `CREATE VIRTUAL TABLE test USING fts5(x, y, tokenize = 'html trigram remove_diacritics 1');`,
++      `INSERT INTO test VALUES('a', '
    This domain is for use in illustrative examples in documents. You may use this
    ');`,
++    ].forEach((stmt) => db.query(stmt).run());
++  });
++
++  const queries = {
++    hello: 0,
++    domain: 1,
++    use: 1,
++  };
++  let i = 1;
++  for (const query in queries) {
++    sqlTest(
++      db,
++      `1.${i++}.${query}`,
++      `SELECT count(*) as res FROM test WHERE test MATCH '${query}'`,
++      [],
++      [queries[query]],
++    );
++  }
++});
++
++function sqlTest(
++  db: Database,
++  version: string,
++  query: string,
++  params: string[],
++  expected: string | number | undefined | (string | number | undefined)[],
++) {
++  test(version, () => {
++    const result = db.query(query).all(...params) as {
++      res: string | number;
++    }[];
++    if (Array.isArray(expected)) {
++      expect(Array.isArray(expected)).toBeTrue();
++      expect(result.length).toBe(expected.length);
++      result.forEach((result, i) => expect(result.res).toBe(expected[i]!));
++    } else {
++      expect(result[0]?.res).toBe(expected!);
++    }
++  });
++}
++
++function explainQueryPlanTest(
++  db: Database,
++  version: string,
++  query: string,
++  params: string[],
++  expected: string,
++) {
++  test(version, () => {
++    const result = db.query(`EXPLAIN QUERY PLAN ${query}`).get(...params) as {
++      detail?: string;
++    };
++    expect(result?.detail).toInclude(expected);
++  });
++}
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/genhtmlentity.ts b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/genhtmlentity.ts
+new file mode 100755
+index 0000000..8878773
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/genhtmlentity.ts
+@@ -0,0 +1,80 @@
++// @ts-ignore
++import * as fs from "node:fs/promises";
++
++interface EntityDefinition {
++  characters: string;
++}
++
++const FILENAME = "fts5-html.c";
++const entities: Record = await fetch(
++  "https://html.spec.whatwg.org/entities.json",
++).then((r) => r.json());
++
++const cleaned = Object.fromEntries(
++  Object.entries(entities).map(([k, v]) => [k.replace(/^&(.*?);?$/g, "$1"), v]),
++);
++
++function strcmp(a: string, b: string): number {
++  if (a < b) {
++    return -1;
++  } else if (a > b) {
++    return 1;
++  } else {
++    return 0;
++  }
++}
++
++const encoder = new TextEncoder();
++
++const parts: string[] = [];
++
++parts.push(
++  `
++struct htmlEntity {
++	const char *pzName;
++	const char *pzUtf8;
++};
++typedef struct htmlEntity htmlEntity;
++
++static const htmlEntity htmlEntities[] = {
++`.trim(),
++);
++
++for (const [name, { characters }] of Object.entries(cleaned).sort((a, b) =>
++  strcmp(a[0], b[0]),
++)) {
++  const hex = encoder.encode(characters);
++  const escaped = Array.from(hex)
++    .map((h) => "\\x" + h.toString(16).padStart(2, "0"))
++    .join("");
++  parts.push(`\t{"${name}", "${escaped}"},`);
++}
++
++parts.push(`
++	{0, 0}
++};
++
++#define MAX_ENTITY_NAME_LENGTH ${Math.max(...Object.keys(cleaned).map((k) => k.length))}
++#define NUM_ENTITIES ${Object.keys(cleaned).length}
++`);
++
++const input = await fs.readFile(FILENAME, "utf-8");
++let emit = true;
++const outputParts: string[] = [];
++
++for (let line of input.split("\n")) {
++  if (line.includes("/* START OF HTML ENTITIES */")) {
++    outputParts.push(line);
++    emit = false;
++  }
++  if (emit) {
++    outputParts.push(line);
++  }
++  if (line.includes("/* END OF HTML ENTITIES */")) {
++    emit = true;
++    outputParts.push(parts.join("\n"));
++    outputParts.push(line);
++  }
++}
++
++await fs.writeFile(FILENAME, outputParts.join("\n"));
+diff --git a/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/sqlite-dist.toml b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/sqlite-dist.toml
+new file mode 100755
+index 0000000..eb5cbd7
+--- /dev/null
++++ b/node_modules/react-native-quick-sqlite/sqlite3-fts5-html/sqlite-dist.toml
+@@ -0,0 +1,14 @@
++[package]
++name = "sqlite3-fts5-html"
++license = "Public Domain"
++homepage = "https://github.com/streetwriters/sqlite3-fts5-html"
++repo = "https://github.com/streetwriters/sqlite3-fts5-html"
++description = "A pseudo tokenizer for SQLite3 FTS5 to strip HTML tags"
++authors = ["Abdullah Atta"]
++git_tag_format = "v$VERSION"
++
++[targets]
++github_releases = {}
++amalgamation = {include=["fts5-html.c", "fts5-html.h"]}
++
++npm = {}