src - FreeBSD source tree

diff options


context:
space:
mode:

author	Cy Schubert <cy@FreeBSD.org>	2020-08-21 22:54:38 +0000
committer	Cy Schubert <cy@FreeBSD.org>	2020-08-21 22:54:38 +0000
commit	2793f2eef2be94a38e38babede1b01c3c50196fe (patch)
tree	b62688764e64afe625fbe876e1ff17f7fe6df405 /sqlite3.c
parent	c80e66e8e79185b1e7c999decef3d4adfdb902de (diff)
download	src-vendor/sqlite3/sqlite-3330000.tar.gz src-vendor/sqlite3/sqlite-3330000.zip

Import sqlite 3.32.3 (3330000).vendor/sqlite3/sqlite-3330000

Diffstat (limited to 'sqlite3.c')

-rw-r--r--

sqlite3.c

19228

1 files changed, 9979 insertions, 9249 deletions

diff --git a/sqlite3.c b/sqlite3.c
index 50e256445b64..a82744931c0b 100644
--- a/sqlite3.c
+++ b/sqlite3.c

@@ -1,6 +1,6 @@

/******************************************************************************

** This file is an amalgamation of many separate C source files from SQLite

-** version 3.32.3. By combining all the individual C code files into this

+** version 3.33.0. 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

@@ -62,7 +62,7 @@

#define CTIMEOPT_VAL2(opt) CTIMEOPT_VAL2_(opt)

-** An array of names of all compile-time options. This array should

+** An array of names of all compile-time options. This array should

** be sorted A-Z.

** This array looks large, but in a typical installation actually uses

@@ -71,8 +71,8 @@

static const char * const sqlite3azCompileOpt[] = {

-/*

-** BEGIN CODE GENERATED BY tool/mkctime.tcl

+/*

+** BEGIN CODE GENERATED BY tool/mkctime.tcl

#if SQLITE_32BIT_ROWID

"32BIT_ROWID",

@@ -774,8 +774,8 @@ static const char * const sqlite3azCompileOpt[] = {

#if SQLITE_ZERO_MALLOC

"ZERO_MALLOC",

#endif

-/*

-** END CODE GENERATED BY tool/mkctime.tcl

+/*

+** END CODE GENERATED BY tool/mkctime.tcl

};

@@ -825,10 +825,10 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){

** PREVENTS-HARMLESS-OVERREAD - This branch prevents a buffer overread

** that would be harmless and undetectable

-** if it did occur.

+** if it did occur.

** In all cases, the special comment must be enclosed in the usual

-** slash-asterisk...asterisk-slash comment marks, with no spaces between the

+** slash-asterisk...asterisk-slash comment marks, with no spaces between the

** asterisks and the comment text.

@@ -1000,6 +1000,15 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){

#endif

+** Macro to disable warnings about missing "break" at the end of a "case".

+*/

+#if GCC_VERSION>=7000000

+# define deliberate_fall_through __attribute__((fallthrough));

+#else

+# define deliberate_fall_through

+#endif

+/*

** For MinGW, check to see if we can include the header file containing its

** version information, among other things. Normally, this internal MinGW

** header file would [only] be included automatically by other MinGW header

@@ -1147,7 +1156,7 @@ extern "C" {

** 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]),

+** Since [version 3.6.18] ([dateof:3.6.18]),

** SQLite source code has been stored in the

** <a href="http://www.fossil-scm.org/">Fossil configuration management

** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to

@@ -1162,9 +1171,9 @@ extern "C" {

** [sqlite3_libversion_number()], [sqlite3_sourceid()],

** [sqlite_version()] and [sqlite_source_id()].

-#define SQLITE_VERSION "3.32.3"

-#define SQLITE_VERSION_NUMBER 3032003

-#define SQLITE_SOURCE_ID "2020-06-18 14:00:33 7ebdfa80be8e8e73324b8d66b3460222eb74c7e9dfd655b48d6ca7e1933cc8fd"

+#define SQLITE_VERSION "3.33.0"

+#define SQLITE_VERSION_NUMBER 3033000

+#define SQLITE_SOURCE_ID "2020-08-14 13:23:32 fca8dc8b578f215a969cd899336378966156154710873e68b3d9ac5881b0ff3f"

** CAPI3REF: Run-Time Library Version Numbers

@@ -1190,8 +1199,8 @@ extern "C" {

** 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_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].)^

@@ -1206,20 +1215,20 @@ 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_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() 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

+** 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

@@ -1243,7 +1252,7 @@ SQLITE_API const char *sqlite3_compileoption_get(int N);

** 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,

+** [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.

@@ -1300,14 +1309,14 @@ typedef struct sqlite3 sqlite3;

** ^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

+** 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

+# else

typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;

# endif

#elif defined(_MSC_VER) || defined(__BORLANDC__)

@@ -1339,7 +1348,7 @@ typedef sqlite_uint64 sqlite3_uint64;

** resources are deallocated.

** Ideally, applications should [sqlite3_finalize | finalize] all

-** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and

+** [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

@@ -1383,7 +1392,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);

** 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.

+** 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,

@@ -1423,7 +1432,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);

** 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

+** 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.

@@ -1603,7 +1612,7 @@ SQLITE_API int sqlite3_exec(

#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_MASTER_JOURNAL 0x00004000 /* 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() */

@@ -1612,6 +1621,9 @@ SQLITE_API int sqlite3_exec(

#define SQLITE_OPEN_NOFOLLOW 0x01000000 /* Ok for sqlite3_open_v2() */

/* Reserved: 0x00F00000 */

+/* Legacy compatibility: */

+#define SQLITE_OPEN_MASTER_JOURNAL 0x00004000 /* VFS only */

** CAPI3REF: Device Characteristics

@@ -1708,7 +1720,7 @@ SQLITE_API int sqlite3_exec(

** CAPI3REF: OS Interface Open File Handle

-** An [sqlite3_file] object represents an open file in the

+** 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

@@ -1730,7 +1742,7 @@ struct sqlite3_file {

** 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

+** 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]

@@ -1880,7 +1892,7 @@ struct sqlite3_io_methods {

** <li>[[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

+** 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

@@ -1903,24 +1915,24 @@ struct sqlite3_io_methods {

** <li>[[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

+** 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 master-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.

+** 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.

** <li>[[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.

+** [sqlite3_file_control()] with this opcode as doing so may disrupt the

+** operation of the specialized VFSes that do require it.

** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]

** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic

@@ -1968,13 +1980,13 @@ struct sqlite3_io_methods {

** <li>[[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

+** reason, the entire database file will be overwritten by the current

** transaction. This is used by VACUUM operations.

** <li>[[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

+** 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

@@ -1993,7 +2005,7 @@ struct sqlite3_io_methods {

** upper-most shim only.

** <li>[[SQLITE_FCNTL_PRAGMA]]

-** ^Whenever a [PRAGMA] statement is parsed, an [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

@@ -2004,7 +2016,7 @@ struct sqlite3_io_methods {

** 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

+** [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

@@ -2044,7 +2056,7 @@ struct sqlite3_io_methods {

** 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

+** 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].

@@ -2088,7 +2100,7 @@ struct sqlite3_io_methods {

** <li>[[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.

+** this opcode.

** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]

** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then

@@ -2105,7 +2117,7 @@ struct sqlite3_io_methods {

** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]

** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write

-** operations since the previous successful call to

+** 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.

@@ -2117,7 +2129,7 @@ struct sqlite3_io_methods {

** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]

** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write

-** operations since the previous successful call to

+** 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.

@@ -2126,8 +2138,8 @@ struct sqlite3_io_methods {

** <li>[[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.

+** 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.

@@ -2285,14 +2297,14 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;

** 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

+** 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].

+** [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.

@@ -2306,7 +2318,7 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;

** <li> [SQLITE_OPEN_TEMP_JOURNAL]

** <li> [SQLITE_OPEN_TRANSIENT_DB]

** <li> [SQLITE_OPEN_SUBJOURNAL]

-** <li> [SQLITE_OPEN_MASTER_JOURNAL]

+** <li> [SQLITE_OPEN_SUPER_JOURNAL]

** <li> [SQLITE_OPEN_WAL]

** </ul>)^

@@ -2334,10 +2346,10 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;

** ^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

+** 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 <i>not</i> used to indicate the file should be opened

+** It is <i>not</i> used to indicate the file should be opened

** for exclusive access.

** ^At least szOsFile bytes of memory are allocated by SQLite

@@ -2361,7 +2373,7 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;

** 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.

+** 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

@@ -2381,16 +2393,16 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;

** 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).

+** 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

+** 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

+** 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

@@ -2437,7 +2449,7 @@ struct sqlite3_vfs {

** 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.

+ ** value will increment whenever this happens.

};

@@ -2481,7 +2493,7 @@ struct sqlite3_vfs {

** </ul>

** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as

-** was given on the corresponding lock.

+** 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

@@ -2626,7 +2638,7 @@ SQLITE_API int sqlite3_config(int, ...);

** [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

+** [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.

@@ -2644,7 +2656,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);

** 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].

+** [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

@@ -2674,7 +2686,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);

** 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,

+** 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,

@@ -2684,7 +2696,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);

** by xInit. The pAppData pointer is used as the only parameter to

** xInit and xShutdown.

-** SQLite holds the [SQLITE_MUTEX_STATIC_MASTER] mutex when it invokes

+** 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

@@ -2732,7 +2744,7 @@ struct sqlite3_mem_methods {

** 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

+** value of Single-thread and so [sqlite3_config()] will return

** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD

** configuration option.</dd>

@@ -2767,7 +2779,7 @@ struct sqlite3_mem_methods {

** SQLITE_CONFIG_SERIALIZED configuration option.</dd>

** [[SQLITE_CONFIG_MALLOC]] <dt>SQLITE_CONFIG_MALLOC</dt>

-** <dd> ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is

+** <dd> ^(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

@@ -2818,7 +2830,7 @@ struct sqlite3_mem_methods {

** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>

** <dd> ^The SQLITE_CONFIG_PAGECACHE option specifies a memory pool

** that SQLite can use for the database page cache with the default page

-** cache implementation.

+** 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

@@ -2846,7 +2858,7 @@ struct sqlite3_mem_methods {

** additional cache line. </dd>

** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>

-** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer

+** <dd> ^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

@@ -2901,7 +2913,7 @@ struct sqlite3_mem_methods {

** configuration on individual connections.)^ </dd>

** [[SQLITE_CONFIG_PCACHE2]] <dt>SQLITE_CONFIG_PCACHE2</dt>

-** <dd> ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is

+** <dd> ^(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.</dd>

@@ -2915,7 +2927,7 @@ struct sqlite3_mem_methods {

** <dd> 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*),

+** 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.

@@ -3024,7 +3036,7 @@ struct sqlite3_mem_methods {

** [[SQLITE_CONFIG_STMTJRNL_SPILL]]

** <dt>SQLITE_CONFIG_STMTJRNL_SPILL

** <dd>^The SQLITE_CONFIG_STMTJRNL_SPILL option takes a single parameter which

-** becomes the [statement journal] spill-to-disk threshold.

+** 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

@@ -3046,7 +3058,7 @@ struct sqlite3_mem_methods {

** 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

+** value for this option is to never use this optimization. Specifying a

** negative value for this option restores the default behaviour.

** This option is only available if SQLite is compiled with the

** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.

@@ -3074,7 +3086,7 @@ struct sqlite3_mem_methods {

#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. */

+/* 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 */

@@ -3109,7 +3121,7 @@ struct sqlite3_mem_methods {

** <dl>

** [[SQLITE_DBCONFIG_LOOKASIDE]]

** <dt>SQLITE_DBCONFIG_LOOKASIDE</dt>

-** <dd> ^This option takes three additional arguments that determine the

+** <dd> ^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.

@@ -3127,7 +3139,7 @@ struct sqlite3_mem_methods {

** when the "current value" returned by

** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero.

** Any attempt to change the lookaside memory configuration when lookaside

-** memory is in use leaves the configuration unchanged and returns

+** memory is in use leaves the configuration unchanged and returns

** [SQLITE_BUSY].)^</dd>

** [[SQLITE_DBCONFIG_ENABLE_FKEY]]

@@ -3204,11 +3216,11 @@ struct sqlite3_mem_methods {

** until after the database connection closes.

** </dd>

-** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]

+** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]

** <dt>SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE</dt>

-** <dd> 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

+** <dd> 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 behaviour. The first parameter passed to this operation

** is an integer - positive to disable checkpoints-on-close, or zero (the

@@ -3227,7 +3239,7 @@ struct sqlite3_mem_methods {

** 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 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

@@ -3235,15 +3247,15 @@ struct sqlite3_mem_methods {

** </dd>

** [[SQLITE_DBCONFIG_TRIGGER_EQP]] <dt>SQLITE_DBCONFIG_TRIGGER_EQP</dt>

-** <dd> By default, the output of EXPLAIN QUERY PLAN commands does not

+** <dd> 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.

+** 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.

** </dd>

** [[SQLITE_DBCONFIG_RESET_DATABASE]] <dt>SQLITE_DBCONFIG_RESET_DATABASE</dt>

@@ -3257,7 +3269,7 @@ struct sqlite3_mem_methods {

** 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.

+** the reset.

** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);

** <li> [sqlite3_exec](db, "[VACUUM]", 0, 0, 0);

** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);

@@ -3269,7 +3281,7 @@ struct sqlite3_mem_methods {

** [[SQLITE_DBCONFIG_DEFENSIVE]] <dt>SQLITE_DBCONFIG_DEFENSIVE</dt>

** <dd>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

+** 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:

** <ul>

@@ -3284,7 +3296,7 @@ struct sqlite3_mem_methods {

** <dd>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 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

@@ -3322,14 +3334,13 @@ struct sqlite3_mem_methods {

** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]]

** <dt>SQLITE_DBCONFIG_TRUSTED_SCHEMA</td>

** <dd>The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to

-** assume that database schemas (the contents of the [sqlite_master] tables)

-** are untainted by malicious content.

+** 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:

** <ul>

** <li> Prohibit the use of SQL functions inside triggers, views,

-** CHECK constraints, DEFAULT clauses, expression indexes,

+** CHECK constraints, DEFAULT clauses, expression indexes,

** partial indexes, or generated columns

** unless those functions are tagged with [SQLITE_INNOCUOUS].

** <li> Prohibit the use of virtual tables inside of triggers or views

@@ -3350,7 +3361,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 generated 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

@@ -3408,8 +3419,8 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);

** ^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

+** 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

@@ -3419,15 +3430,15 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);

** 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

+** 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

+** 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

+** ^(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

@@ -3460,7 +3471,7 @@ SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);

** 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

+** 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);

@@ -3476,37 +3487,37 @@ SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);

** returned by this function.

** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are

-** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],

+** 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

+**

+** 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:

-**

+**

** <ul>

** <li> ^(Before entering a trigger program the value returned by

-** sqlite3_changes() function is saved. After the trigger program

+** sqlite3_changes() function is saved. After the trigger program

** has finished, the original value is restored.)^

-**

-** <li> ^(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()

+**

+** <li> ^(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.)^

** </ul>

-**

+**

** ^This means that if the changes() SQL function (or similar) is used

-** by the first INSERT, UPDATE or DELETE statement within a trigger, it

+** 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

+** ^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

@@ -3532,10 +3543,10 @@ SQLITE_API int sqlite3_changes(sqlite3*);

** since the database connection was opened, including those executed as

** part of trigger programs. ^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

+** 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

@@ -3544,7 +3555,7 @@ SQLITE_API int sqlite3_changes(sqlite3*);

** 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.

@@ -3586,7 +3597,7 @@ SQLITE_API int sqlite3_total_changes(sqlite3*);

** ^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

+** 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

@@ -3618,7 +3629,7 @@ SQLITE_API void sqlite3_interrupt(sqlite3*);

** ^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

+** ^(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

@@ -3663,7 +3674,7 @@ SQLITE_API int sqlite3_complete16(const void *sql);

** 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

+** 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

@@ -3688,7 +3699,7 @@ SQLITE_API int sqlite3_complete16(const void *sql);

** 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.

@@ -3806,7 +3817,7 @@ SQLITE_API void sqlite3_free_table(char **result);

** 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()

+** the standard library printf()

** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).

** See the [built-in printf()] documentation for details.

@@ -4002,7 +4013,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P);

** 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.

+** 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

@@ -4055,7 +4066,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P);

** 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

+** 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()].

@@ -4203,7 +4214,7 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,

** 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

+** 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

@@ -4219,7 +4230,7 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,

** [[SQLITE_TRACE_ROW]] <dt>SQLITE_TRACE_ROW</dt>

** <dd>^An SQLITE_TRACE_ROW callback is invoked whenever a prepared

-** statement generates a single row of result.

+** statement generates a single row of result.

** ^The P argument is a pointer to the [prepared statement] and the

** X argument is unused.

@@ -4246,10 +4257,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

+** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides

** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2().

-** ^The X callback is invoked whenever any of the events identified by

+** ^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.

@@ -4281,8 +4292,8 @@ SQLITE_API int sqlite3_trace_v2(

** 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

+** ^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.

@@ -4309,7 +4320,7 @@ 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

+** ^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

@@ -4428,17 +4439,17 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);

** 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

+** 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

+** 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

+** 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]]

@@ -4458,13 +4469,13 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);

** <li> <b>mode</b>: ^(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

+** 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

@@ -4474,7 +4485,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);

** <li> <b>cache</b>: ^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

+** 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

@@ -4500,7 +4511,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);

** 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].

-**

+**

** </ul>

** ^Specifying an unknown parameter in the query component of a URI is not an

@@ -4512,36 +4523,36 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);

** <table border="1" align=center cellpadding=5>

** <tr><th> URI filenames <th> Results

-** <tr><td> file:data.db <td>

+** <tr><td> file:data.db <td>

** Open the file "data.db" in the current directory.

** <tr><td> file:/home/fred/data.db<br>

-** file:///home/fred/data.db <br>

-** file://localhost/home/fred/data.db <br> <td>

+** file:///home/fred/data.db <br>

+** file://localhost/home/fred/data.db <br> <td>

** Open the database file "/home/fred/data.db".

-** <tr><td> file://darkstar/home/fred/data.db <td>

+** <tr><td> file://darkstar/home/fred/data.db <td>

** An error. "darkstar" is not a recognized authority.

-** <tr><td style="white-space:nowrap">

+** <tr><td style="white-space:nowrap">

** file:///C:/Documents%20and%20Settings/fred/Desktop/data.db

** <td> 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

+** C:. Note that the %20 escaping in this example is not strictly

** necessary - space characters can be used literally

** in URI filenames.

-** <tr><td> file:data.db?mode=ro&cache=private <td>

+** <tr><td> file:data.db?mode=ro&cache=private <td>

** 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.

** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>

** Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"

** that uses dot-files in place of posix advisory locking.

-** <tr><td> file:data.db?mode=readonly <td>

+** <tr><td> file:data.db?mode=readonly <td>

** An error. "readonly" is not a valid option for the "mode" parameter.

** </table>

** ^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

+** 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

+** 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.

@@ -4577,7 +4588,7 @@ SQLITE_API int sqlite3_open_v2(

** 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

+** 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

@@ -4595,7 +4606,7 @@ SQLITE_API int sqlite3_open_v2(

** 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

+** 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.

@@ -4604,7 +4615,7 @@ SQLITE_API int sqlite3_open_v2(

** 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

+** 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

@@ -4622,7 +4633,7 @@ SQLITE_API int sqlite3_open_v2(

** 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

@@ -4679,14 +4690,14 @@ SQLITE_API const char *sqlite3_filename_wal(const char*);

** 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

+** 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

+** 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

@@ -4709,7 +4720,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);

** <li> [sqlite3_uri_parameter()],

** <li> [sqlite3_uri_boolean()],

** <li> [sqlite3_uri_int64()],

-** <li> [sqlite3_uri_key()],

+** <li> [sqlite3_uri_key()],

** <li> [sqlite3_filename_database()],

** <li> [sqlite3_filename_journal()], or

** <li> [sqlite3_filename_wal()].

@@ -4733,7 +4744,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);

** 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 be

+** corruption or segfaults may occur. The value Y should 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

@@ -4752,12 +4763,12 @@ SQLITE_API void sqlite3_free_filename(char*);

** CAPI3REF: Error Codes And Messages

** METHOD: sqlite3

-** ^If the most recent sqlite3_* API call associated with

+** ^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

+** interface is the same except that it always returns the

** [extended result code] even when extended result codes are

** disabled.

@@ -4814,7 +4825,7 @@ SQLITE_API const char *sqlite3_errstr(int);

** 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

+** 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.

@@ -4844,7 +4855,7 @@ typedef struct sqlite3_stmt sqlite3_stmt;

** new limit for that construct.)^

** ^If the new limit is a negative number, the limit is unchanged.

-** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a

+** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a

** [limits | hard upper bound]

** set at compile-time by a C preprocessor macro called

** [limits | SQLITE_MAX_<i>NAME</i>].

@@ -4852,7 +4863,7 @@ typedef struct sqlite3_stmt sqlite3_stmt;

** ^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

+** ^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.

@@ -4957,7 +4968,7 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);

** <dd>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

+** 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

@@ -5064,12 +5075,12 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);

** </li>

** <li>

-** ^If the specific value bound to a [parameter | host parameter] in the

+** ^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

+** 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

+** 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.

@@ -5178,8 +5189,8 @@ SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);

** 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

+** [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:

@@ -5193,10 +5204,10 @@ SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);

** ^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

+** 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

+** 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

@@ -5222,18 +5233,18 @@ SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);

** 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

+** [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

+** 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

+** 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

+** for example, in diagnostic routines to search for prepared

** statements that are holding a transaction open.

SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);

@@ -5252,7 +5263,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);

** 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

+** [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

@@ -5260,7 +5271,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);

** 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

+** 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,

@@ -5349,7 +5360,7 @@ typedef struct sqlite3_context sqlite3_context;

** 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().)^

+** 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.

@@ -5366,7 +5377,7 @@ typedef struct sqlite3_context sqlite3_context;

** 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

+** 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.

@@ -5528,7 +5539,7 @@ SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);

** 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]. ^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

@@ -5710,7 +5721,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);

** 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_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

@@ -5801,7 +5812,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);

** <tr><td><b>sqlite3_column_int64</b><td>→<td>64-bit INTEGER result

** <tr><td><b>sqlite3_column_text</b><td>→<td>UTF-8 TEXT result

** <tr><td><b>sqlite3_column_text16</b><td>→<td>UTF-16 TEXT result

-** <tr><td><b>sqlite3_column_value</b><td>→<td>The result as an

+** <tr><td><b>sqlite3_column_value</b><td>→<td>The result as an

** [sqlite3_value|unprotected sqlite3_value] object.

** <tr><td> <td> <td> 

** <tr><td><b>sqlite3_column_bytes</b><td>→<td>Size of a BLOB

@@ -5849,7 +5860,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);

** 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.

+** 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()

@@ -5877,7 +5888,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);

** 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

+** ^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

@@ -5896,7 +5907,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);

** 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

+** is normally only useful within the implementation of

** [application-defined SQL functions] or [virtual tables], not within

** top-level application code.

@@ -6071,8 +6082,8 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** ^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

+** 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

@@ -6086,7 +6097,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** ^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.

+** 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.

@@ -6101,7 +6112,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** ^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

+** [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]

@@ -6128,7 +6139,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** 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

+** 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

@@ -6149,21 +6160,21 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** SQL function or aggregate, pass NULL pointers for all three function

** callbacks.

-** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue

+** ^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

+** 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

+** 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

+** 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().

@@ -6176,7 +6187,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);

** 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.

+** 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.

@@ -6248,7 +6259,7 @@ SQLITE_API int sqlite3_create_window_function(

** CAPI3REF: Function Flags

-** These constants may be ORed together with the

+** 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()].

@@ -6264,10 +6275,10 @@ SQLITE_API int sqlite3_create_window_function(

** SQLite might also optimize deterministic functions by factoring them

** out of inner loops.

** </dd>

-**

+**

** [[SQLITE_DIRECTONLY]] <dt>SQLITE_DIRECTONLY</dt><dd>

** 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

+** 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

@@ -6320,7 +6331,7 @@ SQLITE_API int sqlite3_create_window_function(

** DEPRECATED

** These functions are [deprecated]. In order to maintain

-** backwards compatibility with older code, these functions continue

+** 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.

@@ -6388,11 +6399,11 @@ SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int6

** 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

+** ^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()

+** 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

@@ -6515,7 +6526,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);

** 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

+** ^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

@@ -6528,7 +6539,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);

** 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

+** ^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.

@@ -6537,10 +6548,10 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);

** 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

+** N=0 in calls to sqlite3_aggregate_context(C,N) so that no

** pointless memory allocations occur.

-** ^SQLite automatically frees the memory allocated by

+** ^SQLite automatically frees the memory allocated by

** sqlite3_aggregate_context() when the aggregate query concludes.

** The first parameter must be a copy of the

@@ -6590,7 +6601,7 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);

** 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.

+** metadata 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.

@@ -6616,10 +6627,10 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);

** SQL statement)^, or

** <li> ^(when sqlite3_set_auxdata() is invoked again on the same

** parameter)^, or

-** <li> ^(during the original sqlite3_set_auxdata() call when a memory

+** <li> ^(during the original sqlite3_set_auxdata() call when a memory

** allocation error occurs.)^ </ul>

-** Note the last bullet in particular. The destructor X in

+** Note the last bullet 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

@@ -6792,7 +6803,7 @@ typedef void (*sqlite3_destructor_type)(void*);

** ^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

+** 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

@@ -6834,8 +6845,8 @@ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);

** 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

+** 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

@@ -6882,7 +6893,7 @@ SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);

** 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

+** ^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

@@ -6913,36 +6924,36 @@ SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);

** calls to the collation creation functions or when the

** [database connection] is closed using [sqlite3_close()].

-** ^The xDestroy callback is <u>not</u> called if the

+** ^The xDestroy callback is <u>not</u> called if the

** sqlite3_create_collation_v2() function fails. Applications that invoke

-** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should

+** 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

+** 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,

+ 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,

+ 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*,

+ sqlite3*,

const void *zName,

- int eTextRep,

+ int eTextRep,

void *pArg,

int(*xCompare)(void*,int,const void*,int,const void*)

);

@@ -6975,19 +6986,19 @@ SQLITE_API int sqlite3_create_collation16(

** [sqlite3_create_collation_v2()].

SQLITE_API int sqlite3_collation_needed(

- sqlite3*,

- void*,

+ sqlite3*,

+ void*,

void(*)(void*,sqlite3*,int eTextRep,const char*)

);

SQLITE_API int sqlite3_collation_needed16(

- sqlite3*,

+ sqlite3*,

void*,

void(*)(void*,sqlite3*,int eTextRep,const void*)

);

#ifdef SQLITE_ENABLE_CEROD

-** Specify the activation key for a CEROD database. Unless

+** Specify the activation key for a CEROD database. Unless

** activated, none of the CEROD routines will work.

SQLITE_API void sqlite3_activate_cerod(

@@ -7043,7 +7054,7 @@ SQLITE_API int sqlite3_sleep(int);

** ^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

+** 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

@@ -7100,7 +7111,7 @@ SQLITE_API char *sqlite3_temp_directory;

** ^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

+** 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

@@ -7313,7 +7324,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);

** ^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_master and sqlite_sequence).)^

+** modified (i.e. sqlite_sequence).)^

** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.

** ^In the current implementation, the update hook

@@ -7339,7 +7350,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);

** and [sqlite3_preupdate_hook()] interfaces.

SQLITE_API void *sqlite3_update_hook(

- sqlite3*,

+ sqlite3*,

void(*)(void *,int ,char const *,char const *,sqlite3_int64),

void*

);

@@ -7353,7 +7364,7 @@ SQLITE_API void *sqlite3_update_hook(

** and disabled if the argument is false.)^

** ^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]).

+** 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.

@@ -7374,8 +7385,8 @@ SQLITE_API void *sqlite3_update_hook(

** 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

+** 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

@@ -7428,7 +7439,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*);

** 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

+** 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

@@ -7544,7 +7555,7 @@ SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);

** ^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

+** ^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

@@ -7610,7 +7621,7 @@ SQLITE_API int sqlite3_table_column_metadata(

** prior to calling this API,

** otherwise an error will be returned.

-** <b>Security warning:</b> It is recommended that the

+** <b>Security warning:</b> 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()]

@@ -7697,7 +7708,7 @@ SQLITE_API int sqlite3_auto_extension(void(*xEntryPoint)(void));

** ^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

+** routine returns 1 if initialization routine X was successfully

** unregistered and it returns 0 if X was not on the list of initialization

** routines.

@@ -7732,8 +7743,8 @@ 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, 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

@@ -7772,7 +7783,7 @@ struct sqlite3_module {

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

+ /* 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);

@@ -7822,7 +7833,7 @@ struct sqlite3_module {

** 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

+** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to

** non-zero.

** The [xBestIndex] method must fill aConstraintUsage[] with information

@@ -7849,17 +7860,17 @@ struct sqlite3_module {

** ^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)

+** 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

+** 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.

+** 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

@@ -7872,14 +7883,14 @@ struct sqlite3_module {

** 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]).

+** 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

+** 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]).

+** 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.

@@ -7919,7 +7930,7 @@ struct sqlite3_index_info {

** CAPI3REF: Virtual Table Scan Flags

-** Virtual table implementations are allowed to set the

+** Virtual table implementations are allowed to set the

** [sqlite3_index_info].idxFlags field to some combination of

** these bits.

@@ -7959,7 +7970,7 @@ struct sqlite3_index_info {

** 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

+** 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

@@ -8074,7 +8085,7 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);

** METHOD: sqlite3

** ^(Virtual tables can provide alternative implementations of functions

-** using the [xFindFunction] method of the [virtual table module].

+** using the [xFindFunction] method of the [virtual table module].

** But global versions of those functions

** must exist in order to be overloaded.)^

@@ -8125,7 +8136,7 @@ typedef struct sqlite3_blob sqlite3_blob;

** SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;

** </pre>)^

-** ^(Parameter zDb is not the filename that contains the database, but

+** ^(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

@@ -8138,28 +8149,28 @@ typedef struct sqlite3_blob sqlite3_blob;

** ^(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()]

+** 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:

** <ul>

-** <li> ^(Database zDb does not exist)^,

-** <li> ^(Table zTable does not exist within database zDb)^,

-** <li> ^(Table zTable is a WITHOUT ROWID table)^,

+** <li> ^(Database zDb does not exist)^,

+** <li> ^(Table zTable does not exist within database zDb)^,

+** <li> ^(Table zTable is a WITHOUT ROWID table)^,

** <li> ^(Column zColumn does not exist)^,

** <li> ^(Row iRow is not present in the table)^,

** <li> ^(The specified column of row iRow contains a value that is not

** a TEXT or BLOB value)^,

-** <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE

+** <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE

** constraint and the blob is being opened for read/write access)^,

-** <li> ^([foreign key constraints | Foreign key constraints] are enabled,

+** <li> ^([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)^.

** </ul>

-** ^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.

+** ^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

@@ -8185,7 +8196,7 @@ typedef struct sqlite3_blob sqlite3_blob;

** blob.

** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces

-** and the built-in [zeroblob] SQL function may be used to create a

+** 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

@@ -8235,7 +8246,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);

** 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

+** 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

@@ -8245,10 +8256,10 @@ 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

-** with a null pointer (such as would be returned by a failed call to

+** open blob handle results in undefined behaviour. ^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

+** 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 *);

@@ -8257,7 +8268,7 @@ 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

+** ^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.

@@ -8308,9 +8319,9 @@ SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int 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.

+** ^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),

@@ -8319,9 +8330,9 @@ SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);

** 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

+** [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

@@ -8415,7 +8426,7 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);

** <ul>

** <li> SQLITE_MUTEX_FAST

** <li> SQLITE_MUTEX_RECURSIVE

-** <li> SQLITE_MUTEX_STATIC_MASTER

+** <li> SQLITE_MUTEX_STATIC_MAIN

** <li> SQLITE_MUTEX_STATIC_MEM

** <li> SQLITE_MUTEX_STATIC_OPEN

** <li> SQLITE_MUTEX_STATIC_PRNG

@@ -8473,7 +8484,7 @@ 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

+** sqlite3_mutex_try() as an optimization so this is acceptable

** behavior.)^

** ^The sqlite3_mutex_leave() routine exits a mutex that was

@@ -8617,7 +8628,7 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);

#define SQLITE_MUTEX_FAST 0

#define SQLITE_MUTEX_RECURSIVE 1

-#define SQLITE_MUTEX_STATIC_MASTER 2

+#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() */

@@ -8632,11 +8643,15 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);

#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

+** ^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

@@ -8663,7 +8678,7 @@ SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);

** 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

+** 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

@@ -8750,7 +8765,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);

** CAPI3REF: SQL Keyword Checking

-** These routines provide access to the set of SQL language keywords

+** 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.

@@ -8822,14 +8837,14 @@ typedef struct sqlite3_str 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_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

+** 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

@@ -8865,9 +8880,9 @@ SQLITE_API char *sqlite3_str_finish(sqlite3_str*);

** These interfaces add content to an sqlite3_str object previously obtained

** from [sqlite3_str_new()].

-** ^The [sqlite3_str_appendf(X,F,...)] and

+** ^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

+** 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

@@ -8884,7 +8899,7 @@ SQLITE_API char *sqlite3_str_finish(sqlite3_str*);

** ^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.

+** 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

@@ -8986,7 +9001,7 @@ SQLITE_API int sqlite3_status64(

** <dd>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.

+** *pHighwater parameter to [sqlite3_status()] is of interest.

** The value written into the *pCurrent parameter is undefined.</dd>)^

** [[SQLITE_STATUS_MALLOC_COUNT]] ^(<dt>SQLITE_STATUS_MALLOC_COUNT</dt>

@@ -8995,11 +9010,11 @@ SQLITE_API int sqlite3_status64(

** [[SQLITE_STATUS_PAGECACHE_USED]] ^(<dt>SQLITE_STATUS_PAGECACHE_USED</dt>

** <dd>This parameter returns the number of pages used out of the

-** [pagecache memory allocator] that was configured using

+** [pagecache memory allocator] that was configured using

** [SQLITE_CONFIG_PAGECACHE]. The

** value returned is in pages, not in bytes.</dd>)^

-** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]

+** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]

** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>

** <dd>This parameter returns the number of bytes of page cache

** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]

@@ -9012,7 +9027,7 @@ SQLITE_API int sqlite3_status64(

** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>

** <dd>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.

+** *pHighwater parameter to [sqlite3_status()] is of interest.

** The value written into the *pCurrent parameter is undefined.</dd>)^

** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>

@@ -9025,7 +9040,7 @@ SQLITE_API int sqlite3_status64(

** <dd>No longer used.</dd>

** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>

-** <dd>The *pHighwater parameter records the deepest parser stack.

+** <dd>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].</dd>)^

** </dl>

@@ -9047,12 +9062,12 @@ SQLITE_API int sqlite3_status64(

** CAPI3REF: Database Connection Status

** METHOD: sqlite3

-** ^This interface is used to retrieve runtime status information

+** ^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

+** determines the parameter to interrogate. The set of

** [SQLITE_DBSTATUS options] is likely

** to grow in future releases of SQLite.

@@ -9087,7 +9102,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r

** checked out.</dd>)^

** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>

-** <dd>This parameter returns the number of malloc attempts that were

+** <dd>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.)^

@@ -9112,7 +9127,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r

** 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]]

** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>

** <dd>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

@@ -9127,7 +9142,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r

** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>

** <dd>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.)^

+** 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.

@@ -9142,13 +9157,13 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r

** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(<dt>SQLITE_DBSTATUS_CACHE_HIT</dt>

** <dd>This parameter returns the number of pager cache hits that have

-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT

+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT

** is always 0.

** </dd>

** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(<dt>SQLITE_DBSTATUS_CACHE_MISS</dt>

** <dd>This parameter returns the number of pager cache misses that have

-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS

+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS

** is always 0.

** </dd>

@@ -9206,7 +9221,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r

** 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.

+** an index.

** ^(This interface is used to retrieve and reset counter values from

** a [prepared statement]. The first argument is the prepared statement

@@ -9233,7 +9248,7 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);

** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]] <dt>SQLITE_STMTSTATUS_FULLSCAN_STEP</dt>

** <dd>^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

+** may indicate opportunities for performance improvement through

** careful use of indices.</dd>

** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>

@@ -9251,14 +9266,14 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);

** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>

** <dd>^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

+** 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]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>

** <dd>^This is the number of times that the prepare statement has been

-** automatically regenerated due to schema changes or changes to

+** automatically regenerated due to schema changes or changes to

** [bound parameters] that might affect the query plan.

** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>

@@ -9318,15 +9333,15 @@ struct sqlite3_pcache_page {

** KEYWORDS: {page cache}

** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can

-** register an alternative page cache implementation by passing in an

+** 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

+** In many applications, most of the heap memory allocated by

** SQLite is used for the page cache.

-** By implementing a

+** 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

+** 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

@@ -9339,19 +9354,19 @@ struct sqlite3_pcache_page {

** [sqlite3_config()] returns.)^

** [[the xInit() page cache method]]

-** ^(The xInit() method is called once for each effective

+** ^(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

+** 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

+** It can be used to clean up

** any outstanding resources before process shutdown, if required.

** ^The xShutdown() method may be NULL.

@@ -9370,7 +9385,7 @@ struct sqlite3_pcache_page {

** 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

+** 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

@@ -9383,7 +9398,7 @@ struct sqlite3_pcache_page {

** 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.

+** false will always have the "discard" flag set to true.

** ^Hence, a cache created with bPurgeable false will

** never contain any unpinned pages.

@@ -9398,12 +9413,12 @@ struct sqlite3_pcache_page {

** [[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

+** 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

+** 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.

@@ -9442,8 +9457,8 @@ struct sqlite3_pcache_page {

** 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

+** 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]]

@@ -9483,7 +9498,7 @@ struct sqlite3_pcache_methods2 {

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*,

+ void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,

unsigned oldKey, unsigned newKey);

void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);

void (*xDestroy)(sqlite3_pcache*);

@@ -9528,7 +9543,7 @@ typedef struct sqlite3_backup sqlite3_backup;

** 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.

+** for copying in-memory databases to or from persistent files.

** See Also: [Using the SQLite Online Backup API]

@@ -9539,36 +9554,36 @@ typedef struct sqlite3_backup sqlite3_backup;

** ^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:

+**

+** ^(To perform a backup operation:

** <ol>

** <li><b>sqlite3_backup_init()</b> is called once to initialize the

-** backup,

-** <li><b>sqlite3_backup_step()</b> is called one or more times to transfer

+** backup,

+** <li><b>sqlite3_backup_step()</b> is called one or more times to transfer

** the data between the two databases, and finally

-** <li><b>sqlite3_backup_finish()</b> is called to release all resources

-** associated with the backup operation.

+** <li><b>sqlite3_backup_finish()</b> is called to release all resources

+** associated with the backup operation.

** </ol>)^

** There should be exactly one call to sqlite3_backup_finish() for each

** successful call to sqlite3_backup_init().

** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>

-** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the

-** [database connection] associated with the destination database

+** ^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

+** ^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

+** ^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

@@ -9580,14 +9595,14 @@ typedef struct sqlite3_backup sqlite3_backup;

** ^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

+** sqlite3_backup_finish() functions to perform the specified backup

** operation.

** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>

-** ^Function sqlite3_backup_step(B,N) will copy up to N pages between

+** ^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 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

@@ -9609,8 +9624,8 @@ typedef struct sqlite3_backup sqlite3_backup;

** ^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

+** 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]

@@ -9618,15 +9633,15 @@ typedef struct sqlite3_backup sqlite3_backup;

** 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

+** [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

+** 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.

@@ -9635,18 +9650,18 @@ typedef struct sqlite3_backup sqlite3_backup;

** 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

+** 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()]] <b>sqlite3_backup_finish()</b>

-** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the

+** 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.

+** 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

@@ -9686,8 +9701,8 @@ typedef struct sqlite3_backup sqlite3_backup;

** 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

+** 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]

@@ -9698,11 +9713,11 @@ typedef struct sqlite3_backup sqlite3_backup;

** 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

+** 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

+** 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

@@ -9727,8 +9742,8 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** ^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

+** [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.

@@ -9736,14 +9751,14 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** 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.

+** 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

+** 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

+** 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]

@@ -9757,15 +9772,15 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** ^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

+** 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

+** ^(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 is canceled. ^The blocked connections

** unlock-notify callback may also be canceled by closing the blocked

** connection using [sqlite3_close()].

@@ -9778,7 +9793,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** <b>Callback Invocation Details</b>

-** When an unlock-notify callback is registered, the application provides a

+** 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

@@ -9791,12 +9806,12 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** 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

+** This gives the application an opportunity to prioritize any actions

** related to the set of unblocked database connections.

** <b>Deadlock Detection</b>

-** Assuming that after registering for an unlock-notify callback a

+** 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

@@ -9819,7 +9834,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** <b>The "DROP TABLE" Exception</b>

-** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost

+** 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

@@ -9832,7 +9847,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);

** 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

+** the special "DROP TABLE/INDEX" case, the extended error code is just

** SQLITE_LOCKED.)^

SQLITE_API int sqlite3_unlock_notify(

@@ -9923,8 +9938,8 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);

** ^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

+** ^(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

@@ -9943,7 +9958,7 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);

** 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

+** 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. ^Note that the

** [sqlite3_wal_autocheckpoint()] interface and the

@@ -9951,7 +9966,7 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);

** overwrite any prior [sqlite3_wal_hook()] settings.

SQLITE_API void *sqlite3_wal_hook(

- sqlite3*,

+ sqlite3*,

int(*)(void *,sqlite3*,const char*,int),

void*

);

@@ -9964,7 +9979,7 @@ SQLITE_API void *sqlite3_wal_hook(

** [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

+** more frames in the [write-ahead log] file. ^Passing zero or

** a negative value as the nFrame parameter disables automatic

** checkpoints entirely.

@@ -9994,7 +10009,7 @@ SQLITE_API int sqlite3_wal_autocheckpoint(sqlite3 *db, int N);

** ^(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

+** 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

@@ -10020,10 +10035,10 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);

** <dl>

** <dt>SQLITE_CHECKPOINT_PASSIVE<dd>

-** ^Checkpoint as many frames as possible without waiting for any database

-** readers or writers to finish, then sync the database file if all frames

+** ^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.

+** 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.

@@ -10037,9 +10052,9 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);

** <dt>SQLITE_CHECKPOINT_RESTART<dd>

** ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition

-** that after checkpointing the log file it blocks (calls the

+** 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

+** 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.

@@ -10061,31 +10076,31 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);

** 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

+** 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

+** ^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

+** 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

+** 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

+** 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

@@ -10145,7 +10160,7 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);

** CAPI3REF: Virtual Table Configuration Options

-** KEYWORDS: {virtual table configuration options}

+** KEYWORDS: {virtual table configuration options}

** KEYWORDS: {virtual table configuration option}

** These macros define the various options to the

@@ -10168,20 +10183,20 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);

** 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

+** 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.

+** 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

+** 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

+** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT

** constraint handling.

** </dd>

@@ -10244,12 +10259,12 @@ SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);

** CAPI3REF: Determine The Collation For a Virtual Table Constraint

** This function may only be called from within a call to the [xBestIndex]

-** method of a [virtual table].

+** method of a [virtual table].

** The first argument must be 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. This function returns a pointer to a buffer

+** structure passed to xBestIndex. This function returns a pointer to a buffer

** containing the name of the collation sequence for the corresponding

** constraint.

@@ -10363,7 +10378,7 @@ SQLITE_API int sqlite3_stmt_scanstatus(

int idx, /* Index of loop to report on */

int iScanStatusOp, /* Information desired. SQLITE_SCANSTAT_* */

void *pOut /* Result written here */

-);

+);

** CAPI3REF: Zero Scan-Status Counters

@@ -10381,15 +10396,15 @@ SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);

** ^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

+** 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

+** ^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

@@ -10427,7 +10442,7 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);

** ^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_master or sqlite_stat1.

+** 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.

@@ -10436,16 +10451,16 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);

** 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

+** 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

+** 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

+** 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

@@ -10484,7 +10499,7 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);

** ^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

+** 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.

@@ -10518,7 +10533,7 @@ SQLITE_API int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);

** 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.

+** as ENOSPC, EAUTH, EISDIR, and so forth.

SQLITE_API int sqlite3_system_errno(sqlite3*);

@@ -10556,12 +10571,12 @@ typedef struct sqlite3_snapshot {

** [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.

+** 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.

+** in this case.

** <ul>

** <li> The database handle must not be in [autocommit mode].

@@ -10573,13 +10588,13 @@ typedef struct sqlite3_snapshot {

** <li> 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

+** 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.

** </ul>

** This function may also return SQLITE_NOMEM. If it is called with the

-** database handle in autocommit mode but fails for some other reason,

+** 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

@@ -10599,38 +10614,38 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(

** 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

+** ^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

+** ^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()).

+** 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

+** 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

+** 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 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]

+** 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.)

@@ -10662,17 +10677,17 @@ SQLITE_API SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);

** METHOD: sqlite3_snapshot

** The sqlite3_snapshot_cmp(P1, P2) interface is used to compare the ages

-** of two valid snapshot handles.

+** 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.

+** 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

+** 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

@@ -10737,7 +10752,7 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const c

** 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

+** 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.

@@ -10774,7 +10789,7 @@ SQLITE_API unsigned char *sqlite3_serialize(

** CAPI3REF: Deserialize a database

-** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the

+** 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

@@ -10793,7 +10808,7 @@ SQLITE_API unsigned char *sqlite3_serialize(

** database is currently in a read transaction or is involved in a backup

** operation.

-** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the

+** 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.

@@ -10908,7 +10923,7 @@ struct sqlite3_rtree_geometry {

};

-** Register a 2nd-generation geometry callback named zScore that can be

+** Register a 2nd-generation geometry callback named zScore that can be

** used as part of an R-Tree geometry query as follows:

** SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)

@@ -10923,7 +10938,7 @@ SQLITE_API int sqlite3_rtree_query_callback(

-** A pointer to a structure of the following type is passed as the

+** A pointer to a structure of the following type is passed as the

** argument to scored geometry callback registered using

** sqlite3_rtree_query_callback().

@@ -11018,7 +11033,7 @@ typedef struct sqlite3_changeset_iter sqlite3_changeset_iter;

** 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

+** 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

@@ -11036,13 +11051,13 @@ SQLITE_API int sqlite3session_create(

** CAPI3REF: Delete A Session Object

** DESTRUCTOR: sqlite3_session

-** Delete a session object previously allocated using

+** 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

+** are attached is closed. Refer to the documentation for

** [sqlite3session_create()] for details.

SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);

@@ -11060,10 +11075,10 @@ SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);

** 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

+** 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 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);

@@ -11078,7 +11093,7 @@ SQLITE_API int sqlite3session_enable(sqlite3_session *pSession, int bEnable);

** <ul>

** <li> The session object "indirect" flag is set when the change is

** made, or

-** <li> The change is made by an SQL trigger or foreign key action

+** <li> The change is made by an SQL trigger or foreign key action

** instead of directly as a result of a users SQL statement.

** </ul>

@@ -11090,10 +11105,10 @@ SQLITE_API int sqlite3session_enable(sqlite3_session *pSession, int bEnable);

** 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

+** 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

+** 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);

@@ -11103,20 +11118,20 @@ SQLITE_API int sqlite3session_indirect(sqlite3_session *pSession, int bIndirect)

** 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

+** 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

+** 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

+** 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.

@@ -11124,29 +11139,29 @@ SQLITE_API int sqlite3session_indirect(sqlite3_session *pSession, int bIndirect)

** 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

+** 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.

** <h3>Special sqlite_stat1 Handling</h3>

-** As of SQLite version 3.22.0, the "sqlite_stat1" table is an exception to

+** 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:

** <pre>

-**   CREATE TABLE sqlite_stat1(tbl,idx,stat)

+**   CREATE TABLE sqlite_stat1(tbl,idx,stat)

** </pre>

-** 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

+** 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

+** 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

+** 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.

@@ -11165,10 +11180,10 @@ SQLITE_API int sqlite3session_attach(

** CAPI3REF: Set a table filter on a Session Object.

** METHOD: sqlite3_session

-** The second argument (xFilter) is the "filter callback". For changes to rows

+** 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

+** 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(

@@ -11184,9 +11199,9 @@ SQLITE_API void sqlite3session_table_filter(

** 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

+** 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.

@@ -11201,7 +11216,7 @@ SQLITE_API void sqlite3session_table_filter(

** 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

+** 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

@@ -11254,14 +11269,14 @@ SQLITE_API void sqlite3session_table_filter(

** <ul>

** <li> 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

+** change is added to the changeset. If no such row is found, no change

** is added to the changeset.

-** <li> For each record generated by an update or delete, the database is

+** <li> 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

+** 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.

@@ -11269,7 +11284,7 @@ SQLITE_API void sqlite3session_table_filter(

** 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

+** 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.

@@ -11278,10 +11293,10 @@ SQLITE_API void sqlite3session_table_filter(

** 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

+** 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

+** 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.

@@ -11302,7 +11317,7 @@ SQLITE_API int sqlite3session_changeset(

** 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

+** 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:

@@ -11318,25 +11333,25 @@ SQLITE_API int sqlite3session_changeset(

** 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

+** 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:

** <ul>

-** <li> For each row (primary key) that exists in the to-table but not in

+** <li> 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.

-** <li> For each row (primary key) that exists in the to-table but not in

+** <li> 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.

-** <li> For each row (primary key) that exists in both tables, but features

+** <li> 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.

+** session.

** </ul>

** 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

+** 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

@@ -11344,7 +11359,7 @@ SQLITE_API int sqlite3session_changeset(

** 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

+** 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().

@@ -11363,19 +11378,19 @@ SQLITE_API int sqlite3session_diff(

** The differences between a patchset and a changeset are that:

** <ul>

-** <li> DELETE records consist of the primary key fields only. The

+** <li> DELETE records consist of the primary key fields only. The

** original values of other fields are omitted.

-** <li> The original values of any modified fields are omitted from

+** <li> The original values of any modified fields are omitted from

** UPDATE records.

** </ul>

-** A patchset blob may be used with up to date versions of all

-** sqlite3changeset_xxx API functions except for sqlite3changeset_invert(),

+** 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.

+** sqlite3changeset_xxx APIs also provokes an SQLITE_CORRUPT error.

-** Because the non-primary key "old.*" fields are omitted, no

+** 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.

@@ -11394,22 +11409,22 @@ SQLITE_API int sqlite3session_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

+** 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

+** 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

+** guaranteed that a call to sqlite3session_changeset() will return a

** changeset containing zero changes.

SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);

-** CAPI3REF: Create An Iterator To Traverse A Changeset

+** CAPI3REF: Create An Iterator To Traverse A Changeset

** CONSTRUCTOR: sqlite3_changeset_iter

** Create an iterator used to iterate through the contents of a changeset.

@@ -11417,7 +11432,7 @@ SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);

** 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

+** The following functions can be used to advance and query a changeset

** iterator created by this function:

** <ul>

@@ -11434,12 +11449,12 @@ SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);

** 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

+** [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

@@ -11490,12 +11505,12 @@ SQLITE_API int sqlite3changeset_start_v2(

** 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.

+** 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

+** 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);

@@ -11513,14 +11528,14 @@ SQLITE_API int sqlite3changeset_next(sqlite3_changeset_iter *pIter);

** If argument pzTab is not NULL, then *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 pnCol is not NULL, then *pnCol is

+** sqlite3changeset_next() is called on the iterator or until the

+** conflict-handler function returns. If pnCol is not NULL, then *pnCol is

** set to the number of columns in the table affected by the change. 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. Finally, if pOp is not NULL, then *pOp is set to one of

-** [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE], depending on the

+** changes. Finally, if pOp is not NULL, then *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.

** If no error occurs, SQLITE_OK is returned. If an error does occur, an

@@ -11574,7 +11589,7 @@ SQLITE_API int sqlite3changeset_pk(

** 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.

+** 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.

@@ -11584,9 +11599,9 @@ SQLITE_API int sqlite3changeset_pk(

** [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

+** 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

+** 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

@@ -11605,7 +11620,7 @@ SQLITE_API int sqlite3changeset_old(

** 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.

+** 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.

@@ -11615,12 +11630,12 @@ SQLITE_API int sqlite3changeset_old(

** [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

+** 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

+** 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

@@ -11647,7 +11662,7 @@ SQLITE_API int sqlite3changeset_new(

** [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

+** sqlite3_value object containing the iVal'th value from the

** "conflicting row" associated with the current conflict-handler callback

** and returns SQLITE_OK.

@@ -11691,7 +11706,7 @@ SQLITE_API int sqlite3changeset_fk_conflicts(

** 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

+** 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):

@@ -11703,7 +11718,7 @@ SQLITE_API int sqlite3changeset_fk_conflicts(

** }

** rc = sqlite3changeset_finalize();

** if( rc!=SQLITE_OK ){

-** // An error has occurred

+** // An error has occurred

** }

** </pre>

@@ -11731,7 +11746,7 @@ SQLITE_API int sqlite3changeset_finalize(sqlite3_changeset_iter *pIter);

** 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

+** 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

@@ -11745,11 +11760,11 @@ SQLITE_API int sqlite3changeset_invert(

** CAPI3REF: Concatenate Two Changeset Objects

-** This function is used to concatenate two changesets, A and B, into a

+** 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.

+** changeset A followed by changeset B.

-** This function combines the two input changesets using an

+** This function combines the two input changesets using an

** sqlite3_changegroup object. Calling it produces similar results as the

** following code fragment:

@@ -11781,7 +11796,7 @@ SQLITE_API int sqlite3changeset_concat(

** CAPI3REF: Changegroup Handle

-** A changegroup is an object used to combine two or more

+** A changegroup is an object used to combine two or more

** [changesets] or [patchsets]

typedef struct sqlite3_changegroup sqlite3_changegroup;

@@ -11797,7 +11812,7 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;

** 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

+** 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.

@@ -11809,7 +11824,7 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;

** <li> Zero or more changesets (or patchsets) are added to the object

** by calling sqlite3changegroup_add().

-** <li> The result of combining all input changesets together is obtained

+** <li> The result of combining all input changesets together is obtained

** by the application via a call to sqlite3changegroup_output().

** <li> The object is deleted using a call to sqlite3changegroup_delete().

@@ -11818,7 +11833,7 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;

** 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

+** As well as the regular sqlite3changegroup_add() and

** sqlite3changegroup_output() functions, also available are the streaming

** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().

@@ -11829,7 +11844,7 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);

** METHOD: sqlite3_changegroup

** Add all changes within the changeset (or patchset) in buffer pData (size

-** nData bytes) to the changegroup.

+** 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

@@ -11856,7 +11871,7 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);

** changeset was recorded immediately after the changesets already

** added to the changegroup.

** <tr><td>INSERT <td>UPDATE <td>

-** The INSERT change remains in the changegroup. The values in the

+** 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.

** <tr><td>INSERT <td>DELETE <td>

@@ -11867,17 +11882,17 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);

** changeset was recorded immediately after the changesets already

** added to the changegroup.

** <tr><td>UPDATE <td>UPDATE <td>

-** The existing UPDATE remains within the changegroup. It is amended

-** so that the accompanying values are as if the row was updated once

+** 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.

** <tr><td>UPDATE <td>DELETE <td>

** The existing UPDATE is replaced by the new DELETE within the

** changegroup.

** <tr><td>DELETE <td>INSERT <td>

** 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

+** 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

+** changegroup. Otherwise, if the inserted row is exactly the same

** as the deleted row, the existing DELETE is simply discarded.

** <tr><td>DELETE <td>UPDATE <td>

** The new change is ignored. This case does not occur if the new

@@ -11922,7 +11937,7 @@ SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pDa

** 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

+** 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().

@@ -11944,7 +11959,7 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** 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 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

@@ -11955,16 +11970,16 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** 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

+** 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:

** <ul>

-** <li> The table has the same name as the name recorded in the

+** <li> The table has the same name as the name recorded in the

** changeset, and

-** <li> The table has at least as many columns as recorded in the

+** <li> The table has at least as many columns as recorded in the

** changeset, and

-** <li> The table has primary key columns in the same position as

+** <li> The table has primary key columns in the same position as

** recorded in the changeset.

** </ul>

@@ -11973,11 +11988,11 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** 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

+** 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

@@ -11985,23 +12000,23 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** argument are undefined.

** Each time the conflict handler function is invoked, it must return one

-** of [SQLITE_CHANGESET_OMIT], [SQLITE_CHANGESET_ABORT] or

+** 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

+** 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

+** the documentation for the three

** [SQLITE_CHANGESET_OMIT|available return values] for details.

** <dl>

** <dt>DELETE Changes<dd>

-** 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

+** 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

@@ -12030,22 +12045,22 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** database table, the trailing fields are populated with their default

** values.

-** If the attempt to insert the row fails because the database already

+** 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

+** 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

+** 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

+** This includes the case where the INSERT operation is re-attempted because

+** an earlier call to the conflict handler function returned

** [SQLITE_CHANGESET_REPLACE].

** <dt>UPDATE Changes<dd>

-** 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

+** 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.

@@ -12061,12 +12076,12 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** 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

+** 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

+** This includes the case where the UPDATE operation is attempted after

** an earlier call to the conflict handler function returned

-** [SQLITE_CHANGESET_REPLACE].

+** [SQLITE_CHANGESET_REPLACE].

** </dl>

** It is safe to execute SQL statements, including those that write to the

@@ -12077,12 +12092,12 @@ SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);

** 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

+** 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

+** 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

@@ -12143,7 +12158,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

** 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,

+** caller has an open transaction or savepoint when apply_v2() is called,

** it may revert the partially applied changeset by rolling it back.

** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>

@@ -12154,7 +12169,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT 0x0001

#define SQLITE_CHANGESETAPPLY_INVERT 0x0002

-/*

+/*

** CAPI3REF: Constants Passed To The Conflict Handler

** Values that may be passed as the second argument to a conflict-handler.

@@ -12163,32 +12178,32 @@ SQLITE_API int sqlite3changeset_apply_v2(

** <dt>SQLITE_CHANGESET_DATA<dd>

** 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

+** 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.

-**

+**

** <dt>SQLITE_CHANGESET_NOTFOUND<dd>

** 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.

-**

+**

** <dt>SQLITE_CHANGESET_CONFLICT<dd>

** CHANGESET_CONFLICT is passed as the second argument to the conflict

-** handler while processing an INSERT change if the operation would result

+** 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.

** <dt>SQLITE_CHANGESET_FOREIGN_KEY<dd>

** If foreign key handling is enabled, and applying a changeset leaves the

-** database in a state containing foreign key violations, the conflict

+** 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

@@ -12198,12 +12213,12 @@ SQLITE_API int sqlite3changeset_apply_v2(

** 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().

-**

+**

** <dt>SQLITE_CHANGESET_CONSTRAINT<dd>

-** If any other constraint violation occurs while applying a change (i.e.

-** a UNIQUE, CHECK or NOT NULL constraint), the conflict handler is

+** 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.

@@ -12215,7 +12230,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

#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.

@@ -12223,13 +12238,13 @@ SQLITE_API int sqlite3changeset_apply_v2(

** <dl>

** <dt>SQLITE_CHANGESET_OMIT<dd>

** If a conflict handler returns this value no special action is taken. The

-** change that caused the conflict is not applied. The session module

+** change that caused the conflict is not applied. The session module

** continues to the next change in the changeset.

** <dt>SQLITE_CHANGESET_REPLACE<dd>

** 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

+** 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

@@ -12242,7 +12257,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

** the original row is restored to the database before continuing.

** <dt>SQLITE_CHANGESET_ABORT<dd>

-** If this value is returned, any changes applied so far are rolled back

+** If this value is returned, any changes applied so far are rolled back

** and the call to sqlite3changeset_apply() returns SQLITE_ABORT.

** </dl>

@@ -12250,20 +12265,20 @@ SQLITE_API int sqlite3changeset_apply_v2(

#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

+** 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

+** 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.

+** 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)":

@@ -12282,7 +12297,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

** <dl>

** <dt>Local INSERT<dd>

-** This may only conflict with a remote INSERT. If the conflict

+** 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.

@@ -12306,12 +12321,12 @@ SQLITE_API int sqlite3changeset_apply_v2(

** 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

+** the conflicting remote UPDATE removed. If this means no columns would

** be updated, the change is omitted.

** </dl>

-** A local change may be rebased against multiple remote changes

-** simultaneously. If a single key is modified by multiple remote

+** 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:

@@ -12324,10 +12339,10 @@ SQLITE_API int sqlite3changeset_apply_v2(

** of the OMIT resolutions.

** </ul>

-** 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

+** 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

@@ -12335,7 +12350,7 @@ SQLITE_API int sqlite3changeset_apply_v2(

** the buffer of rebase information captured. Then:

** <ol>

-** <li> An sqlite3_rebaser object is created by calling

+** <li> An sqlite3_rebaser object is created by calling

** sqlite3rebaser_create().

** <li> The new object is configured with the rebase buffer obtained from

** sqlite3changeset_apply_v2() by calling sqlite3rebaser_configure().

@@ -12356,8 +12371,8 @@ typedef struct sqlite3_rebaser sqlite3_rebaser;

** 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.

+** occurs, return an SQLite error code (e.g. SQLITE_NOMEM) and set (*ppNew)

+** to NULL.

SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser **ppNew);

@@ -12371,9 +12386,9 @@ SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser **ppNew);

** sqlite3changeset_apply_v2().

SQLITE_API int sqlite3rebaser_configure(

- sqlite3_rebaser*,

+ sqlite3_rebaser*,

int nRebase, const void *pRebase

-);

+);

** CAPI3REF: Rebase a changeset

@@ -12383,7 +12398,7 @@ SQLITE_API int sqlite3rebaser_configure(

** 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

+** 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)

@@ -12391,8 +12406,8 @@ SQLITE_API int sqlite3rebaser_configure(

SQLITE_API int sqlite3rebaser_rebase(

sqlite3_rebaser*,

- int nIn, const void *pIn,

- int *pnOut, void **ppOut

+ int nIn, const void *pIn,

+ int *pnOut, void **ppOut

);

@@ -12403,30 +12418,30 @@ SQLITE_API int sqlite3rebaser_rebase(

** should be one call to this function for each successful invocation

** of sqlite3rebaser_create().

-SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);

+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

+** The six streaming API xxx_strm() functions serve similar purposes to the

** corresponding non-streaming API functions:

** <table border=1 style="margin-left:8ex;margin-right:8ex">

** <tr><th>Streaming function<th>Non-streaming equivalent</th>

-** <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]

-** <tr><td>sqlite3changeset_apply_strm_v2<td>[sqlite3changeset_apply_v2]

-** <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]

-** <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]

-** <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]

-** <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]

-** <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]

+** <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]

+** <tr><td>sqlite3changeset_apply_strm_v2<td>[sqlite3changeset_apply_v2]

+** <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]

+** <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]

+** <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]

+** <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]

+** <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]

** </table>

** 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

+** 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.

@@ -12448,12 +12463,12 @@ SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);

** </pre>

** 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

+** 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.

@@ -12461,7 +12476,7 @@ SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);

** 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

+** 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)

@@ -12491,7 +12506,7 @@ SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);

** 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

+** 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.

@@ -12562,12 +12577,12 @@ SQLITE_API int sqlite3session_patchset_strm(

int (*xOutput)(void *pOut, const void *pData, int nData),

void *pOut

);

-SQLITE_API int sqlite3changegroup_add_strm(sqlite3_changegroup*,

+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),

+ int (*xOutput)(void *pOut, const void *pData, int nData),

void *pOut

);

SQLITE_API int sqlite3rebaser_rebase_strm(

@@ -12582,16 +12597,16 @@ SQLITE_API int sqlite3rebaser_rebase_strm(

** 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

+** 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.

+** 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

+** 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.

@@ -12641,7 +12656,7 @@ SQLITE_API int sqlite3session_config(int op, void *pArg);

******************************************************************************

-** Interfaces to extend FTS5. Using the interfaces defined in this file,

+** Interfaces to extend FTS5. Using the interfaces defined in this file,

** FTS5 may be extended with:

** * custom tokenizers, and

@@ -12685,19 +12700,19 @@ struct Fts5PhraseIter {

** EXTENSION API FUNCTIONS

** xUserData(pFts):

-** Return a copy of the context pointer the extension function was

+** 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 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

+** an OOM condition or IO error), an appropriate SQLite error code is

** returned.

** xColumnCount(pFts):

@@ -12711,7 +12726,7 @@ struct Fts5PhraseIter {

** 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

+** 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

@@ -12738,8 +12753,8 @@ struct Fts5PhraseIter {

** 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

+** "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:

@@ -12754,7 +12769,7 @@ struct Fts5PhraseIter {

** 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.

+** "detail=none" or "detail=column" option.

** xRowid:

** Returns the rowid of the current row.

@@ -12770,11 +12785,11 @@ struct Fts5PhraseIter {

** 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

+** 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

+** Invoking Api.xUserData() returns a copy of the pointer passed as

** the third argument to pUserData.

** If the callback function returns any value other than SQLITE_OK, the

@@ -12789,14 +12804,14 @@ struct Fts5PhraseIter {

** xSetAuxdata(pFts5, pAux, xDelete)

-** Save the pointer passed as the second argument as the extension function's

+** 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

+** 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

@@ -12815,7 +12830,7 @@ struct Fts5PhraseIter {

** xGetAuxdata(pFts5, bClear)

-** Returns the current auxiliary data pointer for the fts5 extension

+** 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

@@ -12835,7 +12850,7 @@ struct Fts5PhraseIter {

** 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

+** to use, this API may be faster under some circumstances. To iterate

** through instances of phrase iPhrase, use the following code:

** Fts5PhraseIter iter;

@@ -12853,8 +12868,8 @@ struct Fts5PhraseIter {

** 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

+** "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).

@@ -12878,16 +12893,16 @@ struct Fts5PhraseIter {

** }

** 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

+** "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.

+** "detail=column" tables.

** xPhraseNextColumn()

** See xPhraseFirstColumn above.

@@ -12901,7 +12916,7 @@ struct Fts5ExtensionApi {

int (*xRowCount)(Fts5Context*, sqlite3_int64 *pnRow);

int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64 *pnToken);

- int (*xTokenize)(Fts5Context*,

+ 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 */

@@ -12930,15 +12945,15 @@ struct Fts5ExtensionApi {

void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);

};

-/*

+/*

** 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

+** 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:

@@ -12949,16 +12964,16 @@ struct Fts5ExtensionApi {

** 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()).

+** 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)

+** 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

+** be returned. In this case, fts5 assumes that the final value of *ppOut

** is undefined.

** xDelete:

@@ -12967,7 +12982,7 @@ struct Fts5ExtensionApi {

** be invoked exactly once for each successful call to xCreate().

** xTokenize:

-** This function is expected to tokenize the nText byte string indicated

+** 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().

@@ -12981,8 +12996,8 @@ struct Fts5ExtensionApi {

** determine the set of tokens to add to (or delete from) the

** FTS index.

-** <li> <b>FTS5_TOKENIZE_QUERY</b> - A MATCH query is being executed

-** against the FTS index. The tokenizer is being called to tokenize

+** <li> <b>FTS5_TOKENIZE_QUERY</b> - 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.

** <li> <b>(FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX)</b> - Same as

@@ -12990,10 +13005,10 @@ struct Fts5ExtensionApi {

** followed by a "*" character, indicating that the last token

** returned by the tokenizer will be treated as a token prefix.

-** <li> <b>FTS5_TOKENIZE_AUX</b> - The tokenizer is being invoked to

+** <li> <b>FTS5_TOKENIZE_AUX</b> - 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.

+** on a columnsize=0 database.

** </ul>

** For each token in the input string, the supplied callback xToken() must

@@ -13005,10 +13020,10 @@ struct Fts5ExtensionApi {

** 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

+** 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

+** 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

@@ -13022,7 +13037,7 @@ struct Fts5ExtensionApi {

** 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

+** 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

@@ -13042,34 +13057,34 @@ struct Fts5ExtensionApi {

** <li> 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

+** 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:

** <codeblock>

** ... MATCH 'first place'</codeblock>

** the tokenizer offers both "1st" and "first" as synonyms for the

-** first token in the MATCH query and FTS5 effectively runs a query

+** first token in the MATCH query and FTS5 effectively runs a query

** similar to:

** <codeblock>

** ... MATCH '(first OR 1st) place'</codeblock>

** except that, for the purposes of auxiliary functions, the query

-** still appears to contain just two phrases - "(first OR 1st)"

+** still appears to contain just two phrases - "(first OR 1st)"

** being treated as a single phrase.

** <li> 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

+** 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

+** 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.

** </ol>

@@ -13090,11 +13105,11 @@ struct Fts5ExtensionApi {

** 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.

+** 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

+** 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

@@ -13106,18 +13121,18 @@ struct Fts5ExtensionApi {

** 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,

+** 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

+** 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.

+** 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.

@@ -13131,10 +13146,10 @@ 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*,

+ int (*xTokenize)(Fts5Tokenizer*,

void *pCtx,

int flags, /* Mask of FTS5_TOKENIZE_* flags */

- const char *pText, int nText,

+ const char *pText, int nText,

int (*xToken)(

void *pCtx, /* Copy of 2nd argument to xTokenize() */

int tflags, /* Mask of FTS5_TOKEN_* flags */

@@ -13231,7 +13246,7 @@ struct fts5_api {

** May you share freely, never taking more than you give.

*************************************************************************

-**

+**

** This file defines various limits of what SQLite can process.

@@ -13279,9 +13294,9 @@ struct fts5_api {

#endif

-** The maximum depth of an expression tree. This is limited to

-** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might

-** want to place more severe limits on the complexity of an

+** The maximum depth of an expression tree. This is limited to

+** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might

+** want to place more severe limits on the complexity of an

** expression.

** A value of 0 used to mean that the limit was not enforced.

@@ -13366,10 +13381,10 @@ struct fts5_api {

** Earlier versions of SQLite allowed the user to change this value at

** compile time. This is no longer permitted, on the grounds that it creates

-** a library that is technically incompatible with an SQLite library

-** compiled with a different limit. If a process operating on a database

-** with a page-size of 65536 bytes crashes, then an instance of SQLite

-** compiled with the default page-size limit will not be able to rollback

+** a library that is technically incompatible with an SQLite library

+** compiled with a different limit. If a process operating on a database

+** with a page-size of 65536 bytes crashes, then an instance of SQLite

+** compiled with the default page-size limit will not be able to rollback

** the aborted transaction. This could lead to database corruption.

#ifdef SQLITE_MAX_PAGE_SIZE

@@ -13428,7 +13443,7 @@ struct fts5_api {

** Maximum depth of recursion for triggers.

** A value of 1 means that a trigger program will not be able to itself

-** fire any triggers. A value of 0 means that no trigger programs at all

+** fire any triggers. A value of 0 means that no trigger programs at all

** may be executed.

#ifndef SQLITE_MAX_TRIGGER_DEPTH

@@ -13451,10 +13466,10 @@ struct fts5_api {

** WAL mode depends on atomic aligned 32-bit loads and stores in a few

** places. The following macros try to make this explicit.

-#ifndef __has_feature

-# define __has_feature(x) 0 /* compatibility with non-clang compilers */

+#ifndef __has_extension

+# define __has_extension(x) 0 /* compatibility with non-clang compilers */

#endif

-#if GCC_VERSION>=4007000 || __has_feature(c_atomic)

+#if GCC_VERSION>=4007000 || __has_extension(c_atomic)

# define AtomicLoad(PTR) __atomic_load_n((PTR),__ATOMIC_RELAXED)

# define AtomicStore(PTR,VAL) __atomic_store_n((PTR),(VAL),__ATOMIC_RELAXED)

#else

@@ -13861,7 +13876,7 @@ typedef struct HashElem HashElem;

** element pointed to plus the next _ht.count-1 elements in the list.

** Hash.htsize and Hash.ht may be zero. In that case lookup is done

-** by a linear search of the global list. For small tables, the

+** by a linear search of the global list. For small tables, the

** Hash.ht table is never allocated because if there are few elements

** in the table, it is faster to do a linear search than to manage

** the hash table.

@@ -13876,7 +13891,7 @@ struct Hash {

} *ht;

};

-/* Each element in the hash table is an instance of the following

+/* Each element in the hash table is an instance of the following

** structure. All elements are stored on a single doubly-linked list.

** Again, this structure is intended to be opaque, but it can't really

@@ -14225,7 +14240,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);

#endif

-** The compile-time options SQLITE_MMAP_READWRITE and

+** The compile-time options SQLITE_MMAP_READWRITE and

** SQLITE_ENABLE_BATCH_ATOMIC_WRITE are not compatible with one another.

** You must choose one or the other (or neither) but not both.

@@ -14447,6 +14462,7 @@ typedef INT16_TYPE LogEst;

** compilers.

#define LARGEST_INT64 (0xffffffff|(((i64)0x7fffffff)<<32))

+#define LARGEST_UINT64 (0xffffffff|(((u64)0xffffffff)<<32))

#define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)

@@ -14524,6 +14540,16 @@ typedef INT16_TYPE LogEst;

#else

# define SELECTTRACE_ENABLED 0

#endif

+#if defined(SQLITE_ENABLE_SELECTTRACE)

+# define SELECTTRACE_ENABLED 1

+# define SELECTTRACE(K,P,S,X) \

+ if(sqlite3_unsupported_selecttrace&(K)) \

+ sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\

+ sqlite3DebugPrintf X

+#else

+# define SELECTTRACE(K,P,S,X)

+# define SELECTTRACE_ENABLED 0

+#endif

** An instance of the following structure is used to store the busy-handler

@@ -14542,22 +14568,24 @@ struct BusyHandler {

};

-** Name of the master database table. The master database table

-** is a special table that holds the names and attributes of all

-** user tables and indices.

+** Name of table that holds the database schema.

-#define MASTER_NAME "sqlite_master"

-#define TEMP_MASTER_NAME "sqlite_temp_master"

+#define DFLT_SCHEMA_TABLE "sqlite_master"

+#define DFLT_TEMP_SCHEMA_TABLE "sqlite_temp_master"

+#define ALT_SCHEMA_TABLE "sqlite_schema"

+#define ALT_TEMP_SCHEMA_TABLE "sqlite_temp_schema"

-** The root-page of the master database table.

+** The root-page of the schema table.

-#define MASTER_ROOT 1

+#define SCHEMA_ROOT 1

-** The name of the schema table.

+** The name of the schema table. The name is different for TEMP.

-#define SCHEMA_TABLE(x) ((!OMIT_TEMPDB)&&(x==1)?TEMP_MASTER_NAME:MASTER_NAME)

+#define SCHEMA_TABLE(x) \

+ ((!OMIT_TEMPDB)&&(x==1)?DFLT_TEMP_SCHEMA_TABLE:DFLT_SCHEMA_TABLE)

** A convenience macro that returns the number of elements in

@@ -14578,7 +14606,7 @@ struct BusyHandler {

** pointer will work here as long as it is distinct from SQLITE_STATIC

** and SQLITE_TRANSIENT.

-#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3MallocSize)

+#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3OomFault)

** When SQLITE_OMIT_WSD is defined, it means that the target platform does

@@ -14718,6 +14746,253 @@ typedef int VList;

** "BusyHandler" typedefs. vdbe.h also requires a few of the opaque

** pointer types (i.e. FuncDef) defined above.

+/************** Include pager.h in the middle of sqliteInt.h *****************/

+/************** Begin file pager.h *******************************************/

+/*

+** 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.

+**

+*************************************************************************

+** This header file defines the interface that the sqlite page cache

+** subsystem. The page cache subsystem reads and writes a file a page

+** at a time and provides a journal for rollback.

+*/

+#ifndef SQLITE_PAGER_H

+#define SQLITE_PAGER_H

+/*

+** Default maximum size for persistent journal files. A negative

+** value means no limit. This value may be overridden using the

+** sqlite3PagerJournalSizeLimit() API. See also "PRAGMA journal_size_limit".

+*/

+#ifndef SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT

+ #define SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT -1

+#endif

+/*

+** The type used to represent a page number. The first page in a file

+** is called page 1. 0 is used to represent "not a page".

+*/

+typedef u32 Pgno;

+/*

+** Each open file is managed by a separate instance of the "Pager" structure.

+*/

+typedef struct Pager Pager;

+/*

+** Handle type for pages.

+*/

+typedef struct PgHdr DbPage;

+/*

+** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is

+** reserved for working around a windows/posix incompatibility). It is

+** used in the journal to signify that the remainder of the journal file

+** is devoted to storing a super-journal name - there are no more pages to

+** roll back. See comments for function writeSuperJournal() in pager.c

+** for details.

+*/

+#define PAGER_MJ_PGNO(x) ((Pgno)((PENDING_BYTE/((x)->pageSize))+1))

+/*

+** Allowed values for the flags parameter to sqlite3PagerOpen().

+**

+** NOTE: These values must match the corresponding BTREE_ values in btree.h.

+*/

+#define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */

+#define PAGER_MEMORY 0x0002 /* In-memory database */

+/*

+** Valid values for the second argument to sqlite3PagerLockingMode().

+*/

+#define PAGER_LOCKINGMODE_QUERY -1

+#define PAGER_LOCKINGMODE_NORMAL 0

+#define PAGER_LOCKINGMODE_EXCLUSIVE 1

+/*

+** Numeric constants that encode the journalmode.

+**

+** The numeric values encoded here (other than PAGER_JOURNALMODE_QUERY)

+** are exposed in the API via the "PRAGMA journal_mode" command and

+** therefore cannot be changed without a compatibility break.

+*/

+#define PAGER_JOURNALMODE_QUERY (-1) /* Query the value of journalmode */

+#define PAGER_JOURNALMODE_DELETE 0 /* Commit by deleting journal file */

+#define PAGER_JOURNALMODE_PERSIST 1 /* Commit by zeroing journal header */

+#define PAGER_JOURNALMODE_OFF 2 /* Journal omitted. */

+#define PAGER_JOURNALMODE_TRUNCATE 3 /* Commit by truncating journal */

+#define PAGER_JOURNALMODE_MEMORY 4 /* In-memory journal file */

+#define PAGER_JOURNALMODE_WAL 5 /* Use write-ahead logging */

+/*

+** Flags that make up the mask passed to sqlite3PagerGet().

+*/

+#define PAGER_GET_NOCONTENT 0x01 /* Do not load data from disk */

+#define PAGER_GET_READONLY 0x02 /* Read-only page is acceptable */

+/*

+** Flags for sqlite3PagerSetFlags()

+**

+** Value constraints (enforced via assert()):

+** PAGER_FULLFSYNC == SQLITE_FullFSync

+** PAGER_CKPT_FULLFSYNC == SQLITE_CkptFullFSync

+** PAGER_CACHE_SPILL == SQLITE_CacheSpill

+*/

+#define PAGER_SYNCHRONOUS_OFF 0x01 /* PRAGMA synchronous=OFF */

+#define PAGER_SYNCHRONOUS_NORMAL 0x02 /* PRAGMA synchronous=NORMAL */

+#define PAGER_SYNCHRONOUS_FULL 0x03 /* PRAGMA synchronous=FULL */

+#define PAGER_SYNCHRONOUS_EXTRA 0x04 /* PRAGMA synchronous=EXTRA */

+#define PAGER_SYNCHRONOUS_MASK 0x07 /* Mask for four values above */

+#define PAGER_FULLFSYNC 0x08 /* PRAGMA fullfsync=ON */

+#define PAGER_CKPT_FULLFSYNC 0x10 /* PRAGMA checkpoint_fullfsync=ON */

+#define PAGER_CACHESPILL 0x20 /* PRAGMA cache_spill=ON */

+#define PAGER_FLAGS_MASK 0x38 /* All above except SYNCHRONOUS */

+/*

+** The remainder of this file contains the declarations of the functions

+** that make up the Pager sub-system API. See source code comments for

+** a detailed description of each routine.

+*/

+/* Open and close a Pager connection. */

+SQLITE_PRIVATE int sqlite3PagerOpen(

+ sqlite3_vfs*,

+ Pager **ppPager,

+ const char*,

+ int,

+ void(*)(DbPage*)

+);

+SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager, sqlite3*);

+SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager*, int, unsigned char*);

+/* Functions used to configure a Pager object. */

+SQLITE_PRIVATE void sqlite3PagerSetBusyHandler(Pager*, int(*)(void *), void *);

+SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager*, u32*, int);

+SQLITE_PRIVATE Pgno sqlite3PagerMaxPageCount(Pager*, Pgno);

+SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);

+SQLITE_PRIVATE int sqlite3PagerSetSpillsize(Pager*, int);

+SQLITE_PRIVATE void sqlite3PagerSetMmapLimit(Pager *, sqlite3_int64);

+SQLITE_PRIVATE void sqlite3PagerShrink(Pager*);

+SQLITE_PRIVATE void sqlite3PagerSetFlags(Pager*,unsigned);

+SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);

+SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);

+SQLITE_PRIVATE int sqlite3PagerGetJournalMode(Pager*);

+SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager*);

+SQLITE_PRIVATE i64 sqlite3PagerJournalSizeLimit(Pager *, i64);

+SQLITE_PRIVATE sqlite3_backup **sqlite3PagerBackupPtr(Pager*);

+SQLITE_PRIVATE int sqlite3PagerFlush(Pager*);

+/* Functions used to obtain and release page references. */

+SQLITE_PRIVATE int sqlite3PagerGet(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag);

+SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);

+SQLITE_PRIVATE void sqlite3PagerRef(DbPage*);

+SQLITE_PRIVATE void sqlite3PagerUnref(DbPage*);

+SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage*);

+SQLITE_PRIVATE void sqlite3PagerUnrefPageOne(DbPage*);

+/* Operations on page references. */

+SQLITE_PRIVATE int sqlite3PagerWrite(DbPage*);

+SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage*);

+SQLITE_PRIVATE int sqlite3PagerMovepage(Pager*,DbPage*,Pgno,int);

+SQLITE_PRIVATE int sqlite3PagerPageRefcount(DbPage*);

+SQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *);

+SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *);

+/* Functions used to manage pager transactions and savepoints. */

+SQLITE_PRIVATE void sqlite3PagerPagecount(Pager*, int*);

+SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);

+SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager*,const char *zSuper, int);

+SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);

+SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zSuper);

+SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);

+SQLITE_PRIVATE int sqlite3PagerRollback(Pager*);

+SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int n);

+SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint);

+SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager);

+#ifndef SQLITE_OMIT_WAL

+SQLITE_PRIVATE int sqlite3PagerCheckpoint(Pager *pPager, sqlite3*, int, int*, int*);

+SQLITE_PRIVATE int sqlite3PagerWalSupported(Pager *pPager);

+SQLITE_PRIVATE int sqlite3PagerWalCallback(Pager *pPager);

+SQLITE_PRIVATE int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen);

+SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager, sqlite3*);

+# ifdef SQLITE_ENABLE_SNAPSHOT

+SQLITE_PRIVATE int sqlite3PagerSnapshotGet(Pager*, sqlite3_snapshot **ppSnapshot);

+SQLITE_PRIVATE int sqlite3PagerSnapshotOpen(Pager*, sqlite3_snapshot *pSnapshot);

+SQLITE_PRIVATE int sqlite3PagerSnapshotRecover(Pager *pPager);

+SQLITE_PRIVATE int sqlite3PagerSnapshotCheck(Pager *pPager, sqlite3_snapshot *pSnapshot);

+SQLITE_PRIVATE void sqlite3PagerSnapshotUnlock(Pager *pPager);

+# endif

+#endif

+#if !defined(SQLITE_OMIT_WAL) && defined(SQLITE_ENABLE_SETLK_TIMEOUT)

+SQLITE_PRIVATE int sqlite3PagerWalWriteLock(Pager*, int);

+SQLITE_PRIVATE void sqlite3PagerWalDb(Pager*, sqlite3*);

+#else

+# define sqlite3PagerWalWriteLock(y,z) SQLITE_OK

+# define sqlite3PagerWalDb(x,y)

+#endif

+#ifdef SQLITE_DIRECT_OVERFLOW_READ

+SQLITE_PRIVATE int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno);

+#endif

+#ifdef SQLITE_ENABLE_ZIPVFS

+SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager);

+#endif

+/* Functions used to query pager state and configuration. */

+SQLITE_PRIVATE u8 sqlite3PagerIsreadonly(Pager*);

+SQLITE_PRIVATE u32 sqlite3PagerDataVersion(Pager*);

+#ifdef SQLITE_DEBUG

+SQLITE_PRIVATE int sqlite3PagerRefcount(Pager*);

+#endif

+SQLITE_PRIVATE int sqlite3PagerMemUsed(Pager*);

+SQLITE_PRIVATE const char *sqlite3PagerFilename(const Pager*, int);

+SQLITE_PRIVATE sqlite3_vfs *sqlite3PagerVfs(Pager*);

+SQLITE_PRIVATE sqlite3_file *sqlite3PagerFile(Pager*);

+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 sqlite3PagerClearCache(Pager*);

+SQLITE_PRIVATE int sqlite3SectorSize(sqlite3_file *);

+/* Functions used to truncate the database file. */

+SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager*,Pgno);

+SQLITE_PRIVATE void sqlite3PagerRekey(DbPage*, Pgno, u16);

+/* Functions to support testing and debugging. */

+#if !defined(NDEBUG) || defined(SQLITE_TEST)

+SQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage*);

+SQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage*);

+#endif

+#ifdef SQLITE_TEST

+SQLITE_PRIVATE int *sqlite3PagerStats(Pager*);

+SQLITE_PRIVATE void sqlite3PagerRefdump(Pager*);

+ void disable_simulated_io_errors(void);

+ void enable_simulated_io_errors(void);

+#else

+# define disable_simulated_io_errors()

+# define enable_simulated_io_errors()

+#endif

+#endif /* SQLITE_PAGER_H */

+/************** End of pager.h ***********************************************/

+/************** Continuing where we left off in sqliteInt.h ******************/

/************** Include btree.h in the middle of sqliteInt.h *****************/

/************** Begin file btree.h *******************************************/

@@ -14793,20 +15068,20 @@ SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64);

SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(Btree*,unsigned);

SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int nPagesize, int nReserve, int eFix);

SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*);

-SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int);

-SQLITE_PRIVATE u32 sqlite3BtreeLastPage(Btree*);

+SQLITE_PRIVATE Pgno sqlite3BtreeMaxPageCount(Btree*,Pgno);

+SQLITE_PRIVATE Pgno sqlite3BtreeLastPage(Btree*);

SQLITE_PRIVATE int sqlite3BtreeSecureDelete(Btree*,int);

SQLITE_PRIVATE int sqlite3BtreeGetRequestedReserve(Btree*);

SQLITE_PRIVATE int sqlite3BtreeGetReserveNoMutex(Btree *p);

SQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *, int);

SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *);

SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree*,int,int*);

-SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster);

+SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree*, const char*);

SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree*, int);

SQLITE_PRIVATE int sqlite3BtreeCommit(Btree*);

SQLITE_PRIVATE int sqlite3BtreeRollback(Btree*,int,int);

SQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree*,int);

-SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree*, int*, int flags);

+SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree*, Pgno*, int flags);

SQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree*);

SQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree*);

SQLITE_PRIVATE int sqlite3BtreeIsInBackup(Btree*);

@@ -14848,7 +15123,7 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p);

** The second parameter to sqlite3BtreeGetMeta or sqlite3BtreeUpdateMeta

-** should be one of the following values. The integer values are assigned

+** should be one of the following values. The integer values are assigned

** to constants so that the offset of the corresponding field in an

** SQLite database header may be found using the following formula:

@@ -14919,7 +15194,7 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p);

#define BTREE_BULKLOAD 0x00000001 /* Used to full index in sorted order */

#define BTREE_SEEK_EQ 0x00000002 /* EQ seeks only - no range seeks */

-/*

+/*

** Flags passed as the third argument to sqlite3BtreeCursor().

** For read-only cursors the wrFlag argument is always zero. For read-write

@@ -14947,7 +15222,7 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p);

SQLITE_PRIVATE int sqlite3BtreeCursor(

Btree*, /* BTree containing table to open */

- int iTable, /* Index of root page */

+ Pgno iTable, /* Index of root page */

int wrFlag, /* 1 for writing. 0 for read-only */

struct KeyInfo*, /* First argument to compare function */

BtCursor *pCursor /* Space to write cursor structure */

@@ -14987,7 +15262,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*, u8 flags);

** The nMem field might be zero, indicating that no decomposition is available.

** Table btrees (used for rowid tables) contain an integer rowid used as

-** the key and passed in the nKey field. The pKey field is zero.

+** the key and passed in the nKey field. The pKey field is zero.

** pData,nData hold the content of the new entry. nZero extra zero bytes

** are appended to the end of the content when constructing the entry.

** The aMem,nMem fields are uninitialized for table btrees.

@@ -15006,7 +15281,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*, u8 flags);

** This object is used to pass information into sqlite3BtreeInsert(). The

** same information used to be passed as five separate parameters. But placing

-** the information into this object helps to keep the interface more

+** the information into this object helps to keep the interface more

** organized and understandable, and it also helps the resulting code to

** run a little faster by using fewer registers for parameter passing.

@@ -15038,7 +15313,7 @@ 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*,int*aRoot,int nRoot,int,int*);

+SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(sqlite3*,Btree*,Pgno*aRoot,int nRoot,int,int*);

SQLITE_PRIVATE struct Pager *sqlite3BtreePager(Btree*);

SQLITE_PRIVATE i64 sqlite3BtreeRowCountEst(BtCursor*);

@@ -15081,7 +15356,7 @@ SQLITE_PRIVATE int sqlite3BtreeSharable(Btree*);

SQLITE_PRIVATE void sqlite3BtreeEnterCursor(BtCursor*);

SQLITE_PRIVATE int sqlite3BtreeConnectionCount(Btree*);

#else

-# define sqlite3BtreeEnter(X)

+# define sqlite3BtreeEnter(X)

# define sqlite3BtreeEnterAll(X)

# define sqlite3BtreeSharable(X) 0

# define sqlite3BtreeEnterCursor(X)

@@ -15175,7 +15450,7 @@ struct VdbeOp {

Mem *pMem; /* Used when p4type is P4_MEM */

VTable *pVtab; /* Used when p4type is P4_VTAB */

KeyInfo *pKeyInfo; /* Used when p4type is P4_KEYINFO */

- int *ai; /* Used when p4type is P4_INTARRAY */

+ u32 *ai; /* Used when p4type is P4_INTARRAY */

SubProgram *pProgram; /* Used when p4type is P4_SUBPROGRAM */

Table *pTab; /* Used when p4type is P4_TABLE */

#ifdef SQLITE_ENABLE_CURSOR_HINTS

@@ -15255,7 +15530,7 @@ typedef struct VdbeOpList VdbeOpList;

#define P5_ConstraintFK 4

-** The Vdbe.aColName array contains 5n Mem structures, where n is the

+** The Vdbe.aColName array contains 5n Mem structures, where n is the

** number of columns of data returned by the statement.

#define COLNAME_NAME 0

@@ -15740,253 +16015,6 @@ SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, VdbeOp*);

/************** End of vdbe.h ************************************************/

/************** Continuing where we left off in sqliteInt.h ******************/

-/************** Include pager.h in the middle of sqliteInt.h *****************/

-/************** Begin file pager.h *******************************************/

-/*

-** 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.

-**

-*************************************************************************

-** This header file defines the interface that the sqlite page cache

-** subsystem. The page cache subsystem reads and writes a file a page

-** at a time and provides a journal for rollback.

-*/

-#ifndef SQLITE_PAGER_H

-#define SQLITE_PAGER_H

-/*

-** Default maximum size for persistent journal files. A negative

-** value means no limit. This value may be overridden using the

-** sqlite3PagerJournalSizeLimit() API. See also "PRAGMA journal_size_limit".

-*/

-#ifndef SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT

- #define SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT -1

-#endif

-/*

-** The type used to represent a page number. The first page in a file

-** is called page 1. 0 is used to represent "not a page".

-*/

-typedef u32 Pgno;

-/*

-** Each open file is managed by a separate instance of the "Pager" structure.

-*/

-typedef struct Pager Pager;

-/*

-** Handle type for pages.

-*/

-typedef struct PgHdr DbPage;

-/*

-** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is

-** reserved for working around a windows/posix incompatibility). It is

-** used in the journal to signify that the remainder of the journal file

-** is devoted to storing a master journal name - there are no more pages to

-** roll back. See comments for function writeMasterJournal() in pager.c

-** for details.

-*/

-#define PAGER_MJ_PGNO(x) ((Pgno)((PENDING_BYTE/((x)->pageSize))+1))

-/*

-** Allowed values for the flags parameter to sqlite3PagerOpen().

-**

-** NOTE: These values must match the corresponding BTREE_ values in btree.h.

-*/

-#define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */

-#define PAGER_MEMORY 0x0002 /* In-memory database */

-/*

-** Valid values for the second argument to sqlite3PagerLockingMode().

-*/

-#define PAGER_LOCKINGMODE_QUERY -1

-#define PAGER_LOCKINGMODE_NORMAL 0

-#define PAGER_LOCKINGMODE_EXCLUSIVE 1

-/*

-** Numeric constants that encode the journalmode.

-**

-** The numeric values encoded here (other than PAGER_JOURNALMODE_QUERY)

-** are exposed in the API via the "PRAGMA journal_mode" command and

-** therefore cannot be changed without a compatibility break.

-*/

-#define PAGER_JOURNALMODE_QUERY (-1) /* Query the value of journalmode */

-#define PAGER_JOURNALMODE_DELETE 0 /* Commit by deleting journal file */

-#define PAGER_JOURNALMODE_PERSIST 1 /* Commit by zeroing journal header */

-#define PAGER_JOURNALMODE_OFF 2 /* Journal omitted. */

-#define PAGER_JOURNALMODE_TRUNCATE 3 /* Commit by truncating journal */

-#define PAGER_JOURNALMODE_MEMORY 4 /* In-memory journal file */

-#define PAGER_JOURNALMODE_WAL 5 /* Use write-ahead logging */

-/*

-** Flags that make up the mask passed to sqlite3PagerGet().

-*/

-#define PAGER_GET_NOCONTENT 0x01 /* Do not load data from disk */

-#define PAGER_GET_READONLY 0x02 /* Read-only page is acceptable */

-/*

-** Flags for sqlite3PagerSetFlags()

-**

-** Value constraints (enforced via assert()):

-** PAGER_FULLFSYNC == SQLITE_FullFSync

-** PAGER_CKPT_FULLFSYNC == SQLITE_CkptFullFSync

-** PAGER_CACHE_SPILL == SQLITE_CacheSpill

-*/

-#define PAGER_SYNCHRONOUS_OFF 0x01 /* PRAGMA synchronous=OFF */

-#define PAGER_SYNCHRONOUS_NORMAL 0x02 /* PRAGMA synchronous=NORMAL */

-#define PAGER_SYNCHRONOUS_FULL 0x03 /* PRAGMA synchronous=FULL */

-#define PAGER_SYNCHRONOUS_EXTRA 0x04 /* PRAGMA synchronous=EXTRA */

-#define PAGER_SYNCHRONOUS_MASK 0x07 /* Mask for four values above */

-#define PAGER_FULLFSYNC 0x08 /* PRAGMA fullfsync=ON */

-#define PAGER_CKPT_FULLFSYNC 0x10 /* PRAGMA checkpoint_fullfsync=ON */

-#define PAGER_CACHESPILL 0x20 /* PRAGMA cache_spill=ON */

-#define PAGER_FLAGS_MASK 0x38 /* All above except SYNCHRONOUS */

-/*

-** The remainder of this file contains the declarations of the functions

-** that make up the Pager sub-system API. See source code comments for

-** a detailed description of each routine.

-*/

-/* Open and close a Pager connection. */

-SQLITE_PRIVATE int sqlite3PagerOpen(

- sqlite3_vfs*,

- Pager **ppPager,

- const char*,

- int,

- void(*)(DbPage*)

-);

-SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager, sqlite3*);

-SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager*, int, unsigned char*);

-/* Functions used to configure a Pager object. */

-SQLITE_PRIVATE void sqlite3PagerSetBusyHandler(Pager*, int(*)(void *), void *);

-SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager*, u32*, int);

-SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int);

-SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);

-SQLITE_PRIVATE int sqlite3PagerSetSpillsize(Pager*, int);

-SQLITE_PRIVATE void sqlite3PagerSetMmapLimit(Pager *, sqlite3_int64);

-SQLITE_PRIVATE void sqlite3PagerShrink(Pager*);

-SQLITE_PRIVATE void sqlite3PagerSetFlags(Pager*,unsigned);

-SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);

-SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);

-SQLITE_PRIVATE int sqlite3PagerGetJournalMode(Pager*);

-SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager*);

-SQLITE_PRIVATE i64 sqlite3PagerJournalSizeLimit(Pager *, i64);

-SQLITE_PRIVATE sqlite3_backup **sqlite3PagerBackupPtr(Pager*);

-SQLITE_PRIVATE int sqlite3PagerFlush(Pager*);

-/* Functions used to obtain and release page references. */

-SQLITE_PRIVATE int sqlite3PagerGet(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag);

-SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);

-SQLITE_PRIVATE void sqlite3PagerRef(DbPage*);

-SQLITE_PRIVATE void sqlite3PagerUnref(DbPage*);

-SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage*);

-SQLITE_PRIVATE void sqlite3PagerUnrefPageOne(DbPage*);

-/* Operations on page references. */

-SQLITE_PRIVATE int sqlite3PagerWrite(DbPage*);

-SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage*);

-SQLITE_PRIVATE int sqlite3PagerMovepage(Pager*,DbPage*,Pgno,int);

-SQLITE_PRIVATE int sqlite3PagerPageRefcount(DbPage*);

-SQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *);

-SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *);

-/* Functions used to manage pager transactions and savepoints. */

-SQLITE_PRIVATE void sqlite3PagerPagecount(Pager*, int*);

-SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);

-SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, int);

-SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);

-SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster);

-SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);

-SQLITE_PRIVATE int sqlite3PagerRollback(Pager*);

-SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int n);

-SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint);

-SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager);

-#ifndef SQLITE_OMIT_WAL

-SQLITE_PRIVATE int sqlite3PagerCheckpoint(Pager *pPager, sqlite3*, int, int*, int*);

-SQLITE_PRIVATE int sqlite3PagerWalSupported(Pager *pPager);

-SQLITE_PRIVATE int sqlite3PagerWalCallback(Pager *pPager);

-SQLITE_PRIVATE int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen);

-SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager, sqlite3*);

-# ifdef SQLITE_ENABLE_SNAPSHOT

-SQLITE_PRIVATE int sqlite3PagerSnapshotGet(Pager*, sqlite3_snapshot **ppSnapshot);

-SQLITE_PRIVATE int sqlite3PagerSnapshotOpen(Pager*, sqlite3_snapshot *pSnapshot);

-SQLITE_PRIVATE int sqlite3PagerSnapshotRecover(Pager *pPager);

-SQLITE_PRIVATE int sqlite3PagerSnapshotCheck(Pager *pPager, sqlite3_snapshot *pSnapshot);

-SQLITE_PRIVATE void sqlite3PagerSnapshotUnlock(Pager *pPager);

-# endif

-#endif

-#if !defined(SQLITE_OMIT_WAL) && defined(SQLITE_ENABLE_SETLK_TIMEOUT)

-SQLITE_PRIVATE int sqlite3PagerWalWriteLock(Pager*, int);

-SQLITE_PRIVATE void sqlite3PagerWalDb(Pager*, sqlite3*);

-#else

-# define sqlite3PagerWalWriteLock(y,z) SQLITE_OK

-# define sqlite3PagerWalDb(x,y)

-#endif

-#ifdef SQLITE_DIRECT_OVERFLOW_READ

-SQLITE_PRIVATE int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno);

-#endif

-#ifdef SQLITE_ENABLE_ZIPVFS

-SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager);

-#endif

-/* Functions used to query pager state and configuration. */

-SQLITE_PRIVATE u8 sqlite3PagerIsreadonly(Pager*);

-SQLITE_PRIVATE u32 sqlite3PagerDataVersion(Pager*);

-#ifdef SQLITE_DEBUG

-SQLITE_PRIVATE int sqlite3PagerRefcount(Pager*);

-#endif

-SQLITE_PRIVATE int sqlite3PagerMemUsed(Pager*);

-SQLITE_PRIVATE const char *sqlite3PagerFilename(const Pager*, int);

-SQLITE_PRIVATE sqlite3_vfs *sqlite3PagerVfs(Pager*);

-SQLITE_PRIVATE sqlite3_file *sqlite3PagerFile(Pager*);

-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 sqlite3PagerClearCache(Pager*);

-SQLITE_PRIVATE int sqlite3SectorSize(sqlite3_file *);

-/* Functions used to truncate the database file. */

-SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager*,Pgno);

-SQLITE_PRIVATE void sqlite3PagerRekey(DbPage*, Pgno, u16);

-/* Functions to support testing and debugging. */

-#if !defined(NDEBUG) || defined(SQLITE_TEST)

-SQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage*);

-SQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage*);

-#endif

-#ifdef SQLITE_TEST

-SQLITE_PRIVATE int *sqlite3PagerStats(Pager*);

-SQLITE_PRIVATE void sqlite3PagerRefdump(Pager*);

- void disable_simulated_io_errors(void);

- void enable_simulated_io_errors(void);

-#else

-# define disable_simulated_io_errors()

-# define enable_simulated_io_errors()

-#endif

-#endif /* SQLITE_PAGER_H */

-/************** End of pager.h ***********************************************/

-/************** Continuing where we left off in sqliteInt.h ******************/

/************** Include pcache.h in the middle of sqliteInt.h ****************/

/************** Begin file pcache.h ******************************************/

@@ -16001,7 +16029,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager*);

*************************************************************************

** This header file defines the interface that the sqlite page cache

-** subsystem.

+** subsystem.

#ifndef _PCACHE_H_

@@ -16027,7 +16055,7 @@ struct PgHdr {

u16 flags; /* PGHDR flags defined below */

/**********************************************************************

- ** Elements above, except pCache, are public. All that follow are

+ ** Elements above, except pCache, are public. All that follow are

** private to pcache.c and should not be accessed by other modules.

** pCache is grouped with the public elements for efficiency.

@@ -16080,7 +16108,7 @@ SQLITE_PRIVATE int sqlite3PcacheSetPageSize(PCache *, int);

SQLITE_PRIVATE int sqlite3PcacheSize(void);

/* One release per successful fetch. Page is pinned until released.

-** Reference counted.

+** Reference counted.

SQLITE_PRIVATE sqlite3_pcache_page *sqlite3PcacheFetch(PCache*, Pgno, int createFlag);

SQLITE_PRIVATE int sqlite3PcacheFetchStress(PCache*, Pgno, sqlite3_pcache_page**);

@@ -16124,7 +16152,7 @@ SQLITE_PRIVATE int sqlite3PcachePagecount(PCache*);

#if defined(SQLITE_CHECK_PAGES) || defined(SQLITE_DEBUG)

/* Iterate through all dirty pages currently stored in the cache. This

-** interface is only available if SQLITE_CHECK_PAGES is defined when the

+** interface is only available if SQLITE_CHECK_PAGES is defined when the

** library is built.

SQLITE_PRIVATE void sqlite3PcacheIterateDirty(PCache *pCache, void (*xIter)(PgHdr *));

@@ -16299,10 +16327,10 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);

** 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

+** 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"

+** 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

@@ -16343,9 +16371,9 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);

** 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

+** 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

@@ -16364,7 +16392,7 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);

** 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.

+** shared locks begins at SHARED_FIRST.

** The same locking strategy and

** byte ranges are used for Unix. This leaves open the possibility of having

@@ -16380,7 +16408,7 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);

** 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

+** 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

@@ -16404,8 +16432,8 @@ SQLITE_PRIVATE int sqlite3PCacheIsDirty(PCache *pCache);

SQLITE_PRIVATE int sqlite3OsInit(void);

-/*

-** Functions for accessing sqlite3_file methods

+/*

+** Functions for accessing sqlite3_file methods

SQLITE_PRIVATE void sqlite3OsClose(sqlite3_file*);

SQLITE_PRIVATE int sqlite3OsRead(sqlite3_file*, void*, int amt, i64 offset);

@@ -16431,8 +16459,8 @@ SQLITE_PRIVATE int sqlite3OsFetch(sqlite3_file *id, i64, int, void **);

SQLITE_PRIVATE int sqlite3OsUnfetch(sqlite3_file *, i64, void *);

-/*

-** Functions for accessing sqlite3_vfs methods

+/*

+** 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);

@@ -16450,7 +16478,7 @@ SQLITE_PRIVATE int sqlite3OsGetLastError(sqlite3_vfs*);

SQLITE_PRIVATE int sqlite3OsCurrentTimeInt64(sqlite3_vfs *, sqlite3_int64*);

-** Convenience functions for opening and closing files using

+** 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*);

@@ -16520,9 +16548,9 @@ SQLITE_PRIVATE void sqlite3OsCloseFree(sqlite3_file *);

#define sqlite3_mutex_alloc(X) ((sqlite3_mutex*)8)

#define sqlite3_mutex_free(X)

-#define sqlite3_mutex_enter(X)

+#define sqlite3_mutex_enter(X)

#define sqlite3_mutex_try(X) SQLITE_OK

-#define sqlite3_mutex_leave(X)

+#define sqlite3_mutex_leave(X)

#define sqlite3_mutex_held(X) ((void)(X),1)

#define sqlite3_mutex_notheld(X) ((void)(X),1)

#define sqlite3MutexAlloc(X) ((sqlite3_mutex*)8)

@@ -16826,7 +16854,7 @@ struct sqlite3 {

int aLimit[SQLITE_N_LIMIT]; /* Limits */

int nMaxSorterMmap; /* Maximum size of regions mapped by sorter */

struct sqlite3InitInfo { /* Information used during initialization */

- int newTnum; /* Rootpage of table being initialized */

+ Pgno newTnum; /* Rootpage of table being initialized */

u8 iDb; /* Which db file is being initialized */

u8 busy; /* TRUE if currently initializing */

unsigned orphanTrigger : 1; /* Last statement is orphaned TEMP trigger */

@@ -16841,7 +16869,10 @@ struct sqlite3 {

int nVDestroy; /* Number of active OP_VDestroy operations */

int nExtension; /* Number of loaded extensions */

void **aExtension; /* Array of shared library handles */

- int (*xTrace)(u32,void*,void*,void*); /* Trace function */

+ union {

+ void (*xLegacy)(void*,const char*); /* Legacy trace function */

+ int (*xV2)(u32,void*,void*,void*); /* V2 Trace function */

+ } trace;

void *pTraceArg; /* Argument to the trace function */

#ifndef SQLITE_OMIT_DEPRECATED

void (*xProfile)(void*,const char*,u64); /* Profiling function */

@@ -16903,7 +16934,7 @@ struct sqlite3 {

i64 nDeferredImmCons; /* Net deferred immediate constraints */

int *pnBytesFreed; /* If not NULL, increment this in DbFree() */

#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY

- /* The following variables are all protected by the STATIC_MASTER

+ /* The following variables are all protected by the STATIC_MAIN

** mutex, not by sqlite3.mutex. They are used by code in notify.c.

** When X.pUnlockConnection==Y, that means that X is waiting for Y to

@@ -16945,7 +16976,7 @@ struct sqlite3 {

** SQLITE_CkptFullFSync == PAGER_CKPT_FULLFSYNC

** SQLITE_CacheSpill == PAGER_CACHE_SPILL

-#define SQLITE_WriteSchema 0x00000001 /* OK to update SQLITE_MASTER */

+#define SQLITE_WriteSchema 0x00000001 /* OK to update SQLITE_SCHEMA */

#define SQLITE_LegacyFileFmt 0x00000002 /* Create new databases in format 1 */

#define SQLITE_FullColNames 0x00000004 /* Show full column names on SELECT */

#define SQLITE_FullFSync 0x00000008 /* Use full fsync on the backend */

@@ -17140,7 +17171,7 @@ struct FuncDestructor {

#define INLINEFUNC_coalesce 0

#define INLINEFUNC_implies_nonnull_row 1

#define INLINEFUNC_expr_implies_expr 2

-#define INLINEFUNC_expr_compare 3

+#define INLINEFUNC_expr_compare 3

#define INLINEFUNC_affinity 4

#define INLINEFUNC_iif 5

#define INLINEFUNC_unlikely 99 /* Default case */

@@ -17185,7 +17216,7 @@ struct FuncDestructor {

** PURE_DATE(zName, nArg, iArg, bNC, xFunc)

** Used for "pure" date/time functions, this macro is like DFUNCTION

** except that it does set the SQLITE_FUNC_CONSTANT flags. iArg is

-** ignored and the user-data for these functions is set to an

+** ignored and the user-data for these functions is set to an

** arbitrary non-NULL pointer. The bNC parameter is not used.

** AGGREGATE(zName, nArg, iArg, bNC, xStep, xFinal)

@@ -17465,7 +17496,7 @@ struct Table {

char *zColAff; /* String defining the affinity of each column */

ExprList *pCheck; /* All CHECK constraints */

/* ... also used as column name list in a VIEW */

- int tnum; /* Root BTree page for this table */

+ Pgno tnum; /* Root BTree page for this table */

u32 nTabRef; /* Number of pointers to this Table */

u32 tabFlags; /* Mask of TF_* values */

i16 iPKey; /* If not negative, use aCol[iPKey] as the rowid */

@@ -17739,7 +17770,7 @@ struct UnpackedRecord {

** element.

** While parsing a CREATE TABLE or CREATE INDEX statement in order to

-** generate VDBE code (as opposed to parsing one read from an sqlite_master

+** generate VDBE code (as opposed to parsing one read from an sqlite_schema

** table as part of parsing an existing database schema), transient instances

** of this structure may be created. In this case the Index.tnum variable is

** used to store the address of a VDBE instruction, not a database page

@@ -17758,7 +17789,7 @@ struct Index {

const char **azColl; /* Array of collation sequence names for index */

Expr *pPartIdxWhere; /* WHERE clause for partial indices */

ExprList *aColExpr; /* Column expressions */

- int tnum; /* DB Page containing root of this index */

+ Pgno tnum; /* DB Page containing root of this index */

LogEst szIdxRow; /* Estimated average row size in bytes */

u16 nKeyCol; /* Number of columns forming the key */

u16 nColumn; /* Number of columns stored in the index */

@@ -17863,7 +17894,7 @@ struct AggInfo {

ExprList *pGroupBy; /* The group by clause */

struct AggInfo_col { /* For each column used in source tables */

Table *pTab; /* Source table */

- Expr *pExpr; /* The original expression */

+ 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 */

@@ -17874,24 +17905,17 @@ struct AggInfo {

** Additional columns are used only as parameters to

** aggregate functions */

struct AggInfo_func { /* For each aggregate function */

- Expr *pExpr; /* Expression encoding the 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 */

} *aFunc;

int nFunc; /* Number of entries in aFunc[] */

-#ifdef SQLITE_DEBUG

- int iAggMagic; /* Magic number when valid */

-#endif

+ u32 selId; /* Select to which this AggInfo belongs */

AggInfo *pNext; /* Next in list of them all */

};

-** Value for AggInfo.iAggMagic when the structure is valid

-*/

-#define AggInfoMagic 0x2059e99e

-/*

** 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

** than 32767 we have to make it 32-bit. 16-bit is preferred because

@@ -18067,7 +18091,7 @@ struct Expr {

#define EP_Static 0x8000000 /* Held in memory not obtained from malloc() */

#define EP_IsTrue 0x10000000 /* Always has boolean value of TRUE */

#define EP_IsFalse 0x20000000 /* Always has boolean value of FALSE */

-#define EP_FromDDL 0x40000000 /* Originates from sqlite_master */

+#define EP_FromDDL 0x40000000 /* Originates from sqlite_schema */

/* 0x80000000 // Available */

@@ -18247,7 +18271,7 @@ struct SrcList {

unsigned isCorrelated :1; /* True if sub-query is correlated */

unsigned viaCoroutine :1; /* Implemented as a co-routine */

unsigned isRecursive :1; /* True for recursive reference in WITH */

- unsigned fromDDL :1; /* Comes from sqlite_master */

+ unsigned fromDDL :1; /* Comes from sqlite_schema */

} fg;

int iCursor; /* The VDBE cursor number used to access this table */

Expr *pOn; /* The ON clause of a join */

@@ -18368,7 +18392,7 @@ struct NameContext {

#define NC_HasWin 0x08000 /* One or more window functions seen */

#define NC_IsDDL 0x10000 /* Resolving names in a CREATE statement */

#define NC_InAggFunc 0x20000 /* True if analyzing arguments to an agg func */

-#define NC_FromDDL 0x40000 /* SQL text comes from sqlite_master */

+#define NC_FromDDL 0x40000 /* SQL text comes from sqlite_schema */

** An instance of the following object describes a single ON CONFLICT

@@ -18379,7 +18403,7 @@ struct NameContext {

** conflict-target clause.) The pUpsertTargetWhere is the optional

** WHERE clause used to identify partial unique indexes.

-** pUpsertSet is the list of column=expr terms of the UPDATE statement.

+** pUpsertSet is the list of column=expr terms of the UPDATE statement.

** The pUpsertSet field is NULL for a ON CONFLICT DO NOTHING. The

** pUpsertWhere is the WHERE clause for the UPDATE and is NULL if the

** WHERE clause is omitted.

@@ -18472,6 +18496,7 @@ struct Select {

#define SF_WinRewrite 0x0100000 /* Window function rewrite accomplished */

#define SF_View 0x0200000 /* SELECT statement is a view */

#define SF_NoopOrderBy 0x0400000 /* ORDER BY is ignored for this query */

+#define SF_UpdateFrom 0x0800000 /* Statement is an UPDATE...FROM */

** The results of a SELECT can be distributed in several ways, as defined

@@ -18536,6 +18561,14 @@ struct Select {

** SRT_DistQueue Store results in priority queue pDest->iSDParm only if

** the same record has never been stored before. The

** index at pDest->iSDParm+1 hold all prior stores.

+**

+** SRT_Upfrom Store results in the temporary table already opened by

+** pDest->iSDParm. If (pDest->iSDParm<0), then the temp

+** table is an intkey table - in this case the first

+** column returned by the SELECT is used as the integer

+** key. If (pDest->iSDParm>0), then the table is an index

+** table. (pDest->iSDParm) is the number of key columns in

+** each index record in this case.

#define SRT_Union 1 /* Store result as keys in an index */

#define SRT_Except 2 /* Remove result from a UNION index */

@@ -18555,14 +18588,16 @@ struct Select {

#define SRT_EphemTab 12 /* Create transient tab and store like SRT_Table */

#define SRT_Coroutine 13 /* Generate a single row of result */

#define SRT_Table 14 /* Store result as data with an automatic rowid */

+#define SRT_Upfrom 15 /* Store result as data with rowid */

** An instance of this object describes where to put of the results of

** a SELECT statement.

struct SelectDest {

- u8 eDest; /* How to dispose of the results. On of SRT_* above. */

+ u8 eDest; /* How to dispose of the results. One of SRT_* above. */

int iSDParm; /* A parameter used by the eDest disposal method */

+ 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 */

@@ -18718,9 +18753,7 @@ struct Parse {

ynVar nVar; /* Number of '?' variables seen in the SQL so far */

u8 iPkSortOrder; /* ASC or DESC for INTEGER PRIMARY KEY */

u8 explain; /* True if the EXPLAIN flag is found on the query */

-#if !(defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_OMIT_ALTERTABLE))

u8 eParseMode; /* PARSE_MODE_XXX constant */

-#endif

#ifndef SQLITE_OMIT_VIRTUALTABLE

int nVtabLock; /* Number of virtual tables to lock */

#endif

@@ -18908,6 +18941,7 @@ struct TriggerStep {

Trigger *pTrig; /* The trigger that this step is a part of */

Select *pSelect; /* SELECT statement or RHS of INSERT INTO SELECT ... */

char *zTarget; /* Target table for DELETE, UPDATE, INSERT */

+ SrcList *pFrom; /* FROM clause for UPDATE statement (if any) */

Expr *pWhere; /* The WHERE clause for DELETE or UPDATE steps */

ExprList *pExprList; /* SET clause for UPDATE */

IdList *pIdList; /* Column names for INSERT */

@@ -18963,6 +18997,7 @@ typedef struct {

int rc; /* Result code stored here */

u32 mInitFlags; /* Flags controlling error messages */

u32 nInitRow; /* Number of rows processed */

+ Pgno mxPage; /* Maximum page number. 0 for no limit. */

} InitData;

@@ -19493,7 +19528,7 @@ SQLITE_PRIVATE void sqlite3DeleteColumnNames(sqlite3*,Table*);

SQLITE_PRIVATE int sqlite3ColumnsFromExprList(Parse*,ExprList*,i16*,Column**);

SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(Parse*,Table*,Select*,char);

SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse*,Select*,char);

-SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *, int);

+SQLITE_PRIVATE void sqlite3OpenSchemaTable(Parse *, int);

SQLITE_PRIVATE Index *sqlite3PrimaryKeyIndex(Table*);

SQLITE_PRIVATE i16 sqlite3TableColumnToIndex(Index*, i16);

#ifdef SQLITE_OMIT_GENERATED_COLUMNS

@@ -19576,6 +19611,7 @@ SQLITE_PRIVATE void *sqlite3ArrayAllocate(sqlite3*,void*,int,int*,int*);

SQLITE_PRIVATE IdList *sqlite3IdListAppend(Parse*, IdList*, Token*);

SQLITE_PRIVATE int sqlite3IdListIndex(IdList*,const char*);

SQLITE_PRIVATE SrcList *sqlite3SrcListEnlarge(Parse*, SrcList*, int, int);

+SQLITE_PRIVATE SrcList *sqlite3SrcListAppendList(Parse *pParse, SrcList *p1, SrcList *p2);

SQLITE_PRIVATE SrcList *sqlite3SrcListAppend(Parse*, SrcList*, Token*, Token*);

SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm(Parse*, SrcList*, Token*, Token*,

Token*, Select*, Expr*, IdList*);

@@ -19594,7 +19630,6 @@ 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 sqlite3SelectReset(Parse*, Select*);

SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*);

SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int);

SQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);

@@ -19746,13 +19781,14 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(sqlite3*,Select*,

SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep(Parse*,Token*, IdList*,

Select*,u8,Upsert*,

const char*,const char*);

-SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep(Parse*,Token*,ExprList*, Expr*, u8,

- const char*,const char*);

+SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep(Parse*,Token*,SrcList*,ExprList*,

+ Expr*, u8, const char*,const char*);

SQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Parse*,Token*, Expr*,

const char*,const char*);

SQLITE_PRIVATE void sqlite3DeleteTrigger(sqlite3*, Trigger*);

SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*);

SQLITE_PRIVATE u32 sqlite3TriggerColmask(Parse*,Trigger*,ExprList*,int,int,Table*,int);

+SQLITE_PRIVATE SrcList *sqlite3TriggerStepSrc(Parse*, TriggerStep*);

# define sqlite3ParseToplevel(p) ((p)->pToplevel ? (p)->pToplevel : (p))

# define sqlite3IsToplevel(p) ((p)->pToplevel==0)

#else

@@ -19766,6 +19802,7 @@ SQLITE_PRIVATE u32 sqlite3TriggerColmask(Parse*,Trigger*,ExprList*,int,int,Tab

# define sqlite3ParseToplevel(p) p

# define sqlite3IsToplevel(p) 1

# define sqlite3TriggerColmask(A,B,C,D,E,F,G) 0

+# define sqlite3TriggerStepSrc(A,B) 0

#endif

SQLITE_PRIVATE int sqlite3JoinType(Parse*, Token*, Token*, Token*);

@@ -19794,8 +19831,10 @@ SQLITE_PRIVATE int sqlite3FixExpr(DbFixer*, Expr*);

SQLITE_PRIVATE int sqlite3FixExprList(DbFixer*, ExprList*);

SQLITE_PRIVATE int sqlite3FixTriggerStep(DbFixer*, TriggerStep*);

SQLITE_PRIVATE int sqlite3RealSameAsInt(double,sqlite3_int64);

+SQLITE_PRIVATE void 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*);

SQLITE_PRIVATE int sqlite3Atoi(const char*);

#ifndef SQLITE_OMIT_UTF16

SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *pData, int nChar);

@@ -19915,14 +19954,15 @@ SQLITE_PRIVATE const unsigned char sqlite3UpperToLower[];

SQLITE_PRIVATE const unsigned char sqlite3CtypeMap[];

SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config;

SQLITE_PRIVATE FuncDefHash sqlite3BuiltinFunctions;

+SQLITE_API extern u32 sqlite3_unsupported_selecttrace;

#ifndef SQLITE_OMIT_WSD

SQLITE_PRIVATE int sqlite3PendingByte;

#endif

-#endif

+#endif /* SQLITE_AMALGAMATION */

#ifdef VDBE_PROFILE

SQLITE_PRIVATE sqlite3_uint64 sqlite3NProfileCnt;

#endif

-SQLITE_PRIVATE void sqlite3RootPageMoved(sqlite3*, int, int, int);

+SQLITE_PRIVATE void sqlite3RootPageMoved(sqlite3*, int, Pgno, Pgno);

SQLITE_PRIVATE void sqlite3Reindex(Parse*, Token*, Token*);

SQLITE_PRIVATE void sqlite3AlterFunctions(void);

SQLITE_PRIVATE void sqlite3AlterRenameTable(Parse*, SrcList*, Token*);

@@ -19980,10 +20020,10 @@ SQLITE_PRIVATE int sqlite3KeyInfoIsWriteable(KeyInfo*);

#endif

SQLITE_PRIVATE int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *,

void (*)(sqlite3_context*,int,sqlite3_value **),

- void (*)(sqlite3_context*,int,sqlite3_value **),

+ void (*)(sqlite3_context*,int,sqlite3_value **),

void (*)(sqlite3_context*),

- void (*)(sqlite3_context*,int,sqlite3_value **),

+ void (*)(sqlite3_context*,int,sqlite3_value **),

FuncDestructor *pDestructor

);

SQLITE_PRIVATE void sqlite3NoopDestructor(void*);

@@ -20036,7 +20076,7 @@ SQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3*);

#endif

#ifndef SQLITE_OMIT_SHARED_CACHE

-SQLITE_PRIVATE void sqlite3TableLock(Parse *, int, int, u8, const char *);

+SQLITE_PRIVATE void sqlite3TableLock(Parse *, int, Pgno, u8, const char *);

#else

#define sqlite3TableLock(v,w,x,y,z)

#endif

@@ -20343,7 +20383,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt);

/* #include "sqliteInt.h" */

/* An array to map all upper-case characters into their corresponding

-** lower-case character.

+** lower-case character.

** SQLite only considers US-ASCII (or EBCDIC) characters. We do not

** handle case conversions for the UTF character set since the tables

@@ -20410,7 +20450,7 @@ SQLITE_PRIVATE const unsigned char sqlite3UpperToLower[] = {

** The equivalent of tolower() is implemented using the sqlite3UpperToLower[]

** array. tolower() is used more often than toupper() by SQLite.

-** Bit 0x40 is set if the character is non-alphanumeric and can be used in an

+** Bit 0x40 is set if the character is non-alphanumeric and can be used in an

** SQLite identifier. Identifiers are alphanumerics, "_", "$", and any

** non-ASCII UTF character. Hence the test for whether or not a character is

** part of an identifier is 0x46.

@@ -20475,7 +20515,7 @@ SQLITE_PRIVATE const unsigned char sqlite3CtypeMap[256] = {

#if !defined(SQLITE_ALLOW_COVERING_INDEX_SCAN)

# define SQLITE_ALLOW_COVERING_INDEX_SCAN 1

#else

-# if !SQLITE_ALLOW_COVERING_INDEX_SCAN

+# if !SQLITE_ALLOW_COVERING_INDEX_SCAN

# error "Compile-time disabling of covering index scan using the\

-DSQLITE_ALLOW_COVERING_INDEX_SCAN=0 option is deprecated.\

Contact SQLite developers if this is a problem for you, and\

@@ -20498,7 +20538,7 @@ SQLITE_PRIVATE const unsigned char sqlite3CtypeMap[256] = {

** if journal_mode=MEMORY or if temp_store=MEMORY, regardless of this

** setting.)

-#ifndef SQLITE_STMTJRNL_SPILL

+#ifndef SQLITE_STMTJRNL_SPILL

# define SQLITE_STMTJRNL_SPILL (64*1024)

#endif

@@ -20628,12 +20668,17 @@ SQLITE_PRIVATE sqlite3_uint64 sqlite3NProfileCnt = 0;

SQLITE_PRIVATE int sqlite3PendingByte = 0x40000000;

#endif

+/*

+** Flags for select tracing and the ".selecttrace" macro of the CLI

+*/

+SQLITE_API u32 sqlite3_unsupported_selecttrace = 0;

/* #include "opcodes.h" */

** Properties of opcodes. The OPFLG_INITIALIZER macro is

** created by mkopcodeh.awk during compilation. Data is obtained

** from the comments following the "case OP_xxxx:" statements in

-** the vdbe.c file.

+** the vdbe.c file.

SQLITE_PRIVATE const unsigned char sqlite3OpcodeProperty[] = OPFLG_INITIALIZER;

@@ -20753,7 +20798,7 @@ struct VdbeCursor {

Bool seekHit:1; /* See the OP_SeekHit and OP_IfNoHope opcodes */

Btree *pBtx; /* Separate file holding temporary table */

i64 seqCount; /* Sequence counter */

- int *aAltMap; /* Mapping from table to index column numbers */

+ u32 *aAltMap; /* Mapping from table to index column numbers */

/* Cached OP_Column parse information is only valid if cacheStatus matches

** Vdbe.cacheCtr. Vdbe.cacheCtr will never take on the value of

@@ -20805,7 +20850,7 @@ struct VdbeCursor {

** 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

** well as the current memory cell array and various other frame specific

-** values stored in the Vdbe struct. When the sub-program is finished,

+** values stored in the Vdbe struct. When the sub-program is finished,

** these values are copied back to the Vdbe from the VdbeFrame structure,

** restoring the state of the VM to as it was before the sub-program

** began executing.

@@ -20902,7 +20947,7 @@ struct sqlite3_value {

** If the MEM_Str flag is set then Mem.z points at a string representation.

** Usually this is encoded in the same unicode encoding as the main

** database (see below for exceptions). If the MEM_Term flag is also

-** set, then the string is nul terminated. The MEM_Int and MEM_Real

+** set, then the string is nul terminated. The MEM_Int and MEM_Real

** flags may coexist with the MEM_Str flag.

#define MEM_Null 0x0001 /* Value is NULL (or a pointer) */

@@ -20963,7 +21008,7 @@ struct sqlite3_value {

#endif

-** Each auxiliary data pointer stored by a user defined function

+** Each auxiliary data pointer stored by a user defined function

** implementation calling sqlite3_set_auxdata() is stored in an instance

** of this structure. All such structures associated with a single VM

** are stored in a linked list headed at Vdbe.pAuxData. All are destroyed

@@ -21123,7 +21168,7 @@ struct Vdbe {

#define VDBE_MAGIC_DEAD 0x5606c3c8 /* The VDBE has been deallocated */

-** Structure used to store the context required by the

+** Structure used to store the context required by the

** sqlite3_preupdate_*() API functions.

struct PreUpdate {

@@ -21138,7 +21183,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 upated */

Index *pPk; /* PK index if pTab is WITHOUT ROWID */

};

@@ -21149,7 +21194,7 @@ SQLITE_PRIVATE void sqlite3VdbeError(Vdbe*, const char *, ...);

SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *, VdbeCursor*);

void sqliteVdbePopStack(Vdbe*,int);

SQLITE_PRIVATE int SQLITE_NOINLINE sqlite3VdbeFinishMoveto(VdbeCursor*);

-SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor**, int*);

+SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor**, u32*);

SQLITE_PRIVATE int sqlite3VdbeCursorRestore(VdbeCursor*);

SQLITE_PRIVATE u32 sqlite3VdbeSerialTypeLen(u32);

SQLITE_PRIVATE u8 sqlite3VdbeOneByteSerialTypeLen(u8);

@@ -21244,7 +21289,7 @@ SQLITE_PRIVATE void sqlite3VdbeAssertAbortable(Vdbe*);

# define sqlite3VdbeAssertAbortable(V)

#endif

-#if !defined(SQLITE_OMIT_SHARED_CACHE)

+#if !defined(SQLITE_OMIT_SHARED_CACHE)

SQLITE_PRIVATE void sqlite3VdbeEnter(Vdbe*);

#else

# define sqlite3VdbeEnter(X)

@@ -21526,7 +21571,7 @@ SQLITE_API int sqlite3_db_status(

break;

}

- /*

+ /*

** Return an approximation for the amount of memory currently used

** by all pagers associated with the given database connection. The

** highwater mark is meaningless and is returned as zero.

@@ -21570,7 +21615,7 @@ SQLITE_API int sqlite3_db_status(

HashElem *p;

nByte += sqlite3GlobalConfig.m.xRoundup(sizeof(HashElem)) * (

- pSchema->tblHash.count

+ pSchema->tblHash.count

+ pSchema->trigHash.count

+ pSchema->idxHash.count

+ pSchema->fkeyHash.count

@@ -21620,12 +21665,12 @@ SQLITE_API int sqlite3_db_status(

** Set *pCurrent to the total cache hits or misses encountered by all

- ** pagers the database handle is connected to. *pHighwater is always set

+ ** pagers the database handle is connected to. *pHighwater is always set

** to zero.

case SQLITE_DBSTATUS_CACHE_SPILL:

op = SQLITE_DBSTATUS_CACHE_WRITE+1;

- /* Fall through into the next case */

+ /* no break */ deliberate_fall_through

case SQLITE_DBSTATUS_CACHE_HIT:

case SQLITE_DBSTATUS_CACHE_MISS:

case SQLITE_DBSTATUS_CACHE_WRITE:{

@@ -21679,7 +21724,7 @@ SQLITE_API int sqlite3_db_status(

*************************************************************************

** This file contains the C functions that implement date and time

-** functions for SQLite.

+** functions for SQLite.

** There is only one exported symbol in this file - the function

** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.

@@ -21688,7 +21733,7 @@ SQLITE_API int sqlite3_db_status(

** SQLite processes all times and dates as julian day numbers. The

** dates and times are stored as the number of days since noon

** in Greenwich on November 24, 4714 B.C. according to the Gregorian

-** calendar system.

+** calendar system.

** 1970-01-01 00:00:00 is JD 2440587.5

** 2000-01-01 00:00:00 is JD 2451544.5

@@ -22036,7 +22081,7 @@ static void setRawDateNumber(DateTime *p, double r){

** The following are acceptable forms for the input string:

** YYYY-MM-DD HH:MM:SS.FFF +/-HH:MM

-** DDDD.DD

+** DDDD.DD

** now

** In the first form, the +/-HH:MM is always optional. The fractional

@@ -22046,8 +22091,8 @@ static void setRawDateNumber(DateTime *p, double r){

** as there is a year and date.

static int parseDateOrTime(

- sqlite3_context *context,

- const char *zDate,

+ sqlite3_context *context,

+ const char *zDate,

DateTime *p

){

double r;

@@ -22068,7 +22113,7 @@ static int parseDateOrTime(

** Multiplying this by 86400000 gives 464269060799999 as the maximum value

** for DateTime.iJD.

-** But some older compilers (ex: gcc 4.2.1 on older Macs) cannot deal with

+** But some older compilers (ex: gcc 4.2.1 on older Macs) cannot deal with

** such a large integer literal, so we have to encode it.

#define INT_464269060799999 ((((i64)0x1a640)<<32)|0x1072fdff)

@@ -22150,14 +22195,14 @@ static void clearYMD_HMS_TZ(DateTime *p){

#ifndef SQLITE_OMIT_LOCALTIME

** On recent Windows platforms, the localtime_s() function is available

-** as part of the "Secure CRT". It is essentially equivalent to

-** localtime_r() available under most POSIX platforms, except that the

+** as part of the "Secure CRT". It is essentially equivalent to

+** localtime_r() available under most POSIX platforms, except that the

** order of the parameters is reversed.

** See http://msdn.microsoft.com/en-us/library/a442x3ye(VS.80).aspx.

** If the user has not indicated to use localtime_r() or localtime_s()

-** already, check for an MSVC build environment that provides

+** already, check for an MSVC build environment that provides

** localtime_s().

#if !HAVE_LOCALTIME_R && !HAVE_LOCALTIME_S \

@@ -22184,7 +22229,7 @@ static int osLocaltime(time_t *t, struct tm *pTm){

#if !HAVE_LOCALTIME_R && !HAVE_LOCALTIME_S

struct tm *pX;

#if SQLITE_THREADSAFE>0

- sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);

+ sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN);

#endif

sqlite3_mutex_enter(mutex);

pX = localtime(t);

@@ -22213,7 +22258,7 @@ static int osLocaltime(time_t *t, struct tm *pTm){

** Compute the difference (in milliseconds) between localtime and UTC

** (a.k.a. GMT) for the time value p where p is in UTC. If no error occurs,

-** return this value and set *pRc to SQLITE_OK.

+** return this value and set *pRc to SQLITE_OK.

** Or, if an error does occur, set *pRc to SQLITE_ERROR. The returned value

** is undefined in this case.

@@ -22540,9 +22585,9 @@ static int parseModifier(

** then assume a default value of "now" for argv[0].

static int isDate(

- sqlite3_context *context,

- int argc,

- sqlite3_value **argv,

+ sqlite3_context *context,

+ int argc,

+ sqlite3_value **argv,

DateTime *p

){

int i, n;

@@ -22781,8 +22826,8 @@ static void strftimeFunc(

case 'm': sqlite3_snprintf(3, &z[j],"%02d",x.M); j+=2; break;

case 'M': sqlite3_snprintf(3, &z[j],"%02d",x.m); j+=2; break;

case 's': {

- sqlite3_snprintf(30,&z[j],"%lld",

- (i64)(x.iJD/1000 - 21086676*(i64)10000));

+ i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);

+ sqlite3Int64ToText(iS, &z[j]);

j += sqlite3Strlen30(&z[j]);

break;

}

@@ -22880,10 +22925,10 @@ static void currentTimeFunc(

#if HAVE_GMTIME_R

pTm = gmtime_r(&t, &sNow);

#else

- sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));

+ sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN));

pTm = gmtime(&t);

if( pTm ) memcpy(&sNow, pTm, sizeof(sNow));

- sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));

+ sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN));

#endif

if( pTm ){

strftime(zBuf, 20, zFormat, &sNow);

@@ -23187,7 +23232,7 @@ SQLITE_PRIVATE int sqlite3OsRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufO

}else{

return pVfs->xRandomness(pVfs, nByte, zBufOut);

}

SQLITE_PRIVATE int sqlite3OsSleep(sqlite3_vfs *pVfs, int nMicro){

return pVfs->xSleep(pVfs, nMicro);

@@ -23274,7 +23319,7 @@ SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfs){

if( rc ) return 0;

#endif

#if SQLITE_THREADSAFE

- mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);

+ mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN);

#endif

sqlite3_mutex_enter(mutex);

for(pVfs = vfsList; pVfs; pVfs=pVfs->pNext){

@@ -23289,7 +23334,7 @@ SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfs){

** Unlink a VFS from the linked list

static void vfsUnlink(sqlite3_vfs *pVfs){

- assert( sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)) );

+ assert( sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN)) );

if( pVfs==0 ){

/* No-op */

}else if( vfsList==pVfs ){

@@ -23320,7 +23365,7 @@ SQLITE_API int sqlite3_vfs_register(sqlite3_vfs *pVfs, int makeDflt){

if( pVfs==0 ) return SQLITE_MISUSE_BKPT;

#endif

- MUTEX_LOGIC( mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); )

+ MUTEX_LOGIC( mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN); )

sqlite3_mutex_enter(mutex);

vfsUnlink(pVfs);

if( makeDflt || vfsList==0 ){

@@ -23344,7 +23389,7 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs *pVfs){

int rc = sqlite3_initialize();

if( rc ) return rc;

#endif

- MUTEX_LOGIC( mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); )

+ MUTEX_LOGIC( mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN); )

sqlite3_mutex_enter(mutex);

vfsUnlink(pVfs);

sqlite3_mutex_leave(mutex);

@@ -23365,17 +23410,17 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs *pVfs){

*************************************************************************

-** This file contains code to support the concept of "benign"

+** This file contains code to support the concept of "benign"

** malloc failures (when the xMalloc() or xRealloc() method of the

** sqlite3_mem_methods structure fails to allocate a block of memory

-** and returns 0).

+** and returns 0).

** Most malloc failures are non-benign. After they occur, SQLite

** abandons the current operation and returns an error code (usually

** SQLITE_NOMEM) to the user. However, sometimes a fault is not necessarily

-** fatal. For example, if a malloc fails while resizing a hash table, this

-** is completely recoverable simply by not carrying out the resize. The

-** hash table will continue to function normally. So a malloc failure

+** fatal. For example, if a malloc fails while resizing a hash table, this

+** is completely recoverable simply by not carrying out the resize. The

+** hash table will continue to function normally. So a malloc failure

** during a hash table resize is a benign fault.

@@ -23577,7 +23622,7 @@ static malloc_zone_t* _sqliteZone_;

#else /* if not __APPLE__ */

-** Use standard C library malloc and free on non-Apple systems.

+** Use standard C library malloc and free on non-Apple systems.

** Also used by Apple systems if SQLITE_WITHOUT_ZONEMALLOC is defined.

#define SQLITE_MALLOC(x) malloc(x)

@@ -23757,7 +23802,7 @@ static int sqlite3MemInit(void *NotUsed){

/* defer MT decisions to system malloc */

_sqliteZone_ = malloc_default_zone();

}else{

- /* only 1 core, use our own zone to contention over global locks,

+ /* only 1 core, use our own zone to contention over global locks,

** e.g. we have our own dedicated locks */

_sqliteZone_ = malloc_create_zone(4096, 0);

malloc_set_zone_name(_sqliteZone_, "Sqlite_Heap");

@@ -23881,7 +23926,7 @@ struct MemBlockHdr {

** when this module is combined with other in the amalgamation.

static struct {

** Mutex to control access to the memory allocation subsystem.

@@ -23892,7 +23937,7 @@ static struct {

struct MemBlockHdr *pFirst;

struct MemBlockHdr *pLast;

** The number of levels of backtrace to save in new allocations.

@@ -23905,7 +23950,7 @@ static struct {

int nTitle; /* Bytes of zTitle to save. Includes '\0' and padding */

char zTitle[100]; /* The title text */

- /*

+ /*

** sqlite3MallocDisallow() increments the following counter.

** sqlite3MallocAllow() decrements it.

@@ -23964,7 +24009,7 @@ static struct MemBlockHdr *sqlite3MemsysGetHeader(void *pAllocation){

pU8 = (u8*)pAllocation;

assert( pInt[nReserve/sizeof(int)]==(int)REARGUARD );

/* This checks any of the "extra" bytes allocated due

- ** to rounding up to an 8 byte boundary to ensure

+ ** to rounding up to an 8 byte boundary to ensure

** they haven't been overwritten.

while( nReserve-- > p->iSize ) assert( pU8[nReserve]==0x65 );

@@ -24093,7 +24138,7 @@ static void *sqlite3MemMalloc(int nByte){

p = (void*)pInt;

}

sqlite3_mutex_leave(mem.mutex);

- return p;

+ return p;

}

@@ -24103,7 +24148,7 @@ static void sqlite3MemFree(void *pPrior){

struct MemBlockHdr *pHdr;

void **pBt;

char *z;

- assert( sqlite3GlobalConfig.bMemstat || sqlite3GlobalConfig.bCoreMutex==0

+ assert( sqlite3GlobalConfig.bMemstat || sqlite3GlobalConfig.bCoreMutex==0

|| mem.mutex!=0 );

pHdr = sqlite3MemsysGetHeader(pPrior);

pBt = (void**)pHdr;

@@ -24129,15 +24174,15 @@ static void sqlite3MemFree(void *pPrior){

randomFill(z, sizeof(void*)*pHdr->nBacktraceSlots + sizeof(*pHdr) +

(int)pHdr->iSize + sizeof(int) + pHdr->nTitle);

free(z);

- sqlite3_mutex_leave(mem.mutex);

+ sqlite3_mutex_leave(mem.mutex);

}

** Change the size of an existing memory allocation.

** For this debugging implementation, we *always* make a copy of the

-** allocation into a new place in memory. In this way, if the

-** higher level code is using pointer to the old allocation, it is

+** allocation into a new place in memory. In this way, if the

+** higher level code is using pointer to the old allocation, it is

** much more likely to break and we are much more liking to find

** the error.

@@ -24180,7 +24225,7 @@ SQLITE_PRIVATE void sqlite3MemSetDefault(void){

** Set the "type" of an allocation.

SQLITE_PRIVATE void sqlite3MemdebugSetType(void *p, u8 eType){

- if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){

+ if( p && sqlite3GlobalConfig.m.xFree==sqlite3MemFree ){

struct MemBlockHdr *pHdr;

pHdr = sqlite3MemsysGetHeader(p);

assert( pHdr->iForeGuard==FOREGUARD );

@@ -24199,7 +24244,7 @@ SQLITE_PRIVATE void sqlite3MemdebugSetType(void *p, u8 eType){

SQLITE_PRIVATE int sqlite3MemdebugHasType(void *p, u8 eType){

int rc = 1;

- if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){

+ if( p && sqlite3GlobalConfig.m.xFree==sqlite3MemFree ){

struct MemBlockHdr *pHdr;

pHdr = sqlite3MemsysGetHeader(p);

assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */

@@ -24221,7 +24266,7 @@ SQLITE_PRIVATE int sqlite3MemdebugHasType(void *p, u8 eType){

SQLITE_PRIVATE int sqlite3MemdebugNoType(void *p, u8 eType){

int rc = 1;

- if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){

+ if( p && sqlite3GlobalConfig.m.xFree==sqlite3MemFree ){

struct MemBlockHdr *pHdr;

pHdr = sqlite3MemsysGetHeader(p);

assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */

@@ -24271,7 +24316,7 @@ SQLITE_PRIVATE void sqlite3MemdebugSync(){

}

-** Open the file indicated and write a log of all unfreed memory

+** Open the file indicated and write a log of all unfreed memory

** allocations into that log.

SQLITE_PRIVATE void sqlite3MemdebugDump(const char *zFilename){

@@ -24288,7 +24333,7 @@ SQLITE_PRIVATE void sqlite3MemdebugDump(const char *zFilename){

for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){

char *z = (char*)pHdr;

z -= pHdr->nBacktraceSlots*sizeof(void*) + pHdr->nTitle;

- fprintf(out, "**** %lld bytes at %p from %s ****\n",

+ fprintf(out, "**** %lld bytes at %p from %s ****\n",

pHdr->iSize, &pHdr[1], pHdr->nTitle ? z : "???");

if( pHdr->nBacktrace ){

fflush(out);

@@ -24301,7 +24346,7 @@ SQLITE_PRIVATE void sqlite3MemdebugDump(const char *zFilename){

fprintf(out, "COUNTS:\n");

for(i=0; i<NCSIZE-1; i++){

if( mem.nAlloc[i] ){

- fprintf(out, " %5d: %10d %10d %10d\n",

+ fprintf(out, " %5d: %10d %10d %10d\n",

i*8, mem.nAlloc[i], mem.nCurrent[i], mem.mxCurrent[i]);

}

@@ -24342,12 +24387,12 @@ SQLITE_PRIVATE int sqlite3MemdebugMallocCount(){

*************************************************************************

** This file contains the C functions that implement a memory

-** allocation subsystem for use by SQLite.

+** allocation subsystem for use by SQLite.

** This version of the memory allocation subsystem omits all

** use of malloc(). The SQLite user supplies a block of memory

** before calling sqlite3_initialize() from which allocations

-** are made and returned by the xMalloc() and xRealloc()

+** are made and returned by the xMalloc() and xRealloc()

** implementations. Once sqlite3_initialize() has been called,

** the amount of memory available to SQLite is fixed and cannot

** be changed.

@@ -24378,8 +24423,8 @@ SQLITE_PRIVATE int sqlite3MemdebugMallocCount(){

#define N_HASH 61

-** A memory allocation (also called a "chunk") consists of two or

-** more blocks where each block is 8 bytes. The first 8 bytes are

+** A memory allocation (also called a "chunk") consists of two or

+** more blocks where each block is 8 bytes. The first 8 bytes are

** a header that is not returned to the user.

** A chunk is two or more blocks that is either checked out or

@@ -24402,10 +24447,10 @@ SQLITE_PRIVATE int sqlite3MemdebugMallocCount(){

** The second block of free chunks is of the form u.list. The

** two fields form a double-linked list of chunks of related sizes.

-** Pointers to the head of the list are stored in mem3.aiSmall[]

+** Pointers to the head of the list are stored in mem3.aiSmall[]

** for smaller chunks and mem3.aiHash[] for larger chunks.

-** The second block of a chunk is user data if the chunk is checked

+** The second block of a chunk is user data if the chunk is checked

** out. If a chunk is checked out, the user data may extend into

** the u.hdr.prevSize value of the following chunk.

@@ -24441,28 +24486,28 @@ static SQLITE_WSD struct Mem3Global {

** True if we are evaluating an out-of-memory callback.

int alarmBusy;

** Mutex to control access to the memory allocation subsystem.

sqlite3_mutex *mutex;

** The minimum amount of free space that we have seen.

- u32 mnMaster;

+ u32 mnKeyBlk;

- ** iMaster is the index of the master chunk. Most new allocations

- ** occur off of this chunk. szMaster is the size (in Mem3Blocks)

- ** of the current master. iMaster is 0 if there is not master chunk.

- ** The master chunk is not in either the aiHash[] or aiSmall[].

+ ** iKeyBlk is the index of the key chunk. Most new allocations

+ ** occur off of this chunk. szKeyBlk is the size (in Mem3Blocks)

+ ** of the current key chunk. iKeyBlk is 0 if there is no key chunk.

+ ** The key chunk is not in either the aiHash[] or aiSmall[].

- u32 iMaster;

- u32 szMaster;

+ u32 iKeyBlk;

+ u32 szKeyBlk;

- ** Array of lists of free blocks according to the block size

+ ** Array of lists of free blocks according to the block size

** for smaller chunks, or a hash on the block size for larger

** chunks.

@@ -24493,7 +24538,7 @@ static void memsys3UnlinkFromList(u32 i, u32 *pRoot){

}

-** Unlink the chunk at index i from

+** Unlink the chunk at index i from

** whatever list is currently a member of.

static void memsys3Unlink(u32 i){

@@ -24577,8 +24622,8 @@ static void memsys3OutOfMemory(int nByte){

-** Chunk i is a free chunk that has been unlinked. Adjust its

-** size parameters for check-out and return a pointer to the

+** Chunk i is a free chunk that has been unlinked. Adjust its

+** size parameters for check-out and return a pointer to the

** user portion of the chunk.

static void *memsys3Checkout(u32 i, u32 nBlock){

@@ -24595,34 +24640,34 @@ static void *memsys3Checkout(u32 i, u32 nBlock){

}

-** Carve a piece off of the end of the mem3.iMaster free chunk.

-** Return a pointer to the new allocation. Or, if the master chunk

+** Carve a piece off of the end of the mem3.iKeyBlk free chunk.

+** Return a pointer to the new allocation. Or, if the key chunk

** is not large enough, return 0.

-static void *memsys3FromMaster(u32 nBlock){

+static void *memsys3FromKeyBlk(u32 nBlock){

assert( sqlite3_mutex_held(mem3.mutex) );

- assert( mem3.szMaster>=nBlock );

- if( nBlock>=mem3.szMaster-1 ){

- /* Use the entire master */

- void *p = memsys3Checkout(mem3.iMaster, mem3.szMaster);

- mem3.iMaster = 0;

- mem3.szMaster = 0;

- mem3.mnMaster = 0;

+ assert( mem3.szKeyBlk>=nBlock );

+ if( nBlock>=mem3.szKeyBlk-1 ){

+ /* Use the entire key chunk */

+ void *p = memsys3Checkout(mem3.iKeyBlk, mem3.szKeyBlk);

+ mem3.iKeyBlk = 0;

+ mem3.szKeyBlk = 0;

+ mem3.mnKeyBlk = 0;

return p;

}else{

- /* Split the master block. Return the tail. */

+ /* Split the key block. Return the tail. */

u32 newi, x;

- newi = mem3.iMaster + mem3.szMaster - nBlock;

- assert( newi > mem3.iMaster+1 );

- mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.prevSize = nBlock;

- mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.size4x |= 2;

+ newi = mem3.iKeyBlk + mem3.szKeyBlk - nBlock;

+ assert( newi > mem3.iKeyBlk+1 );

+ mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.prevSize = nBlock;

+ mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.size4x |= 2;

mem3.aPool[newi-1].u.hdr.size4x = nBlock*4 + 1;

- mem3.szMaster -= nBlock;

- mem3.aPool[newi-1].u.hdr.prevSize = mem3.szMaster;

- x = mem3.aPool[mem3.iMaster-1].u.hdr.size4x & 2;

- mem3.aPool[mem3.iMaster-1].u.hdr.size4x = mem3.szMaster*4 | x;

- if( mem3.szMaster < mem3.mnMaster ){

- mem3.mnMaster = mem3.szMaster;

+ mem3.szKeyBlk -= nBlock;

+ mem3.aPool[newi-1].u.hdr.prevSize = mem3.szKeyBlk;

+ x = mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x & 2;

+ mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x = mem3.szKeyBlk*4 | x;

+ if( mem3.szKeyBlk < mem3.mnKeyBlk ){

+ mem3.mnKeyBlk = mem3.szKeyBlk;

}

return (void*)&mem3.aPool[newi];

}

@@ -24631,18 +24676,18 @@ static void *memsys3FromMaster(u32 nBlock){

** *pRoot is the head of a list of free chunks of the same size

** or same size hash. In other words, *pRoot is an entry in either

-** mem3.aiSmall[] or mem3.aiHash[].

+** mem3.aiSmall[] or mem3.aiHash[].

** This routine examines all entries on the given list and tries

-** to coalesce each entries with adjacent free chunks.

+** to coalesce each entries with adjacent free chunks.

-** If it sees a chunk that is larger than mem3.iMaster, it replaces

-** the current mem3.iMaster with the new larger chunk. In order for

-** this mem3.iMaster replacement to work, the master chunk must be

+** If it sees a chunk that is larger than mem3.iKeyBlk, it replaces

+** the current mem3.iKeyBlk with the new larger chunk. In order for

+** this mem3.iKeyBlk replacement to work, the key chunk must be

** linked into the hash tables. That is not the normal state of

-** affairs, of course. The calling routine must link the master

+** affairs, of course. The calling routine must link the key

** chunk before invoking this routine, then must unlink the (possibly

-** changed) master chunk once this routine has finished.

+** changed) key chunk once this routine has finished.

static void memsys3Merge(u32 *pRoot){

u32 iNext, prev, size, i, x;

@@ -24669,9 +24714,9 @@ static void memsys3Merge(u32 *pRoot){

}else{

size /= 4;

}

- if( size>mem3.szMaster ){

- mem3.iMaster = i;

- mem3.szMaster = size;

+ if( size>mem3.szKeyBlk ){

+ mem3.iKeyBlk = i;

+ mem3.szKeyBlk = size;

}

@@ -24720,26 +24765,26 @@ static void *memsys3MallocUnsafe(int nByte){

/* STEP 2:

** Try to satisfy the allocation by carving a piece off of the end

- ** of the master chunk. This step usually works if step 1 fails.

+ ** of the key chunk. This step usually works if step 1 fails.

- if( mem3.szMaster>=nBlock ){

- return memsys3FromMaster(nBlock);

+ if( mem3.szKeyBlk>=nBlock ){

+ return memsys3FromKeyBlk(nBlock);

}

- /* STEP 3:

+ /* STEP 3:

** Loop through the entire memory pool. Coalesce adjacent free

- ** chunks. Recompute the master chunk as the largest free chunk.

+ ** chunks. Recompute the key chunk as the largest free chunk.

** Then try again to satisfy the allocation by carving a piece off

- ** of the end of the master chunk. This step happens very

+ ** of the end of the key chunk. This step happens very

** rarely (we hope!)

for(toFree=nBlock*16; toFree<(mem3.nPool*16); toFree *= 2){

memsys3OutOfMemory(toFree);

- if( mem3.iMaster ){

- memsys3Link(mem3.iMaster);

- mem3.iMaster = 0;

- mem3.szMaster = 0;

+ if( mem3.iKeyBlk ){

+ memsys3Link(mem3.iKeyBlk);

+ mem3.iKeyBlk = 0;

+ mem3.szKeyBlk = 0;

}

for(i=0; i<N_HASH; i++){

memsys3Merge(&mem3.aiHash[i]);

@@ -24747,10 +24792,10 @@ static void *memsys3MallocUnsafe(int nByte){

for(i=0; i<MX_SMALL-1; i++){

memsys3Merge(&mem3.aiSmall[i]);

}

- if( mem3.szMaster ){

- memsys3Unlink(mem3.iMaster);

- if( mem3.szMaster>=nBlock ){

- return memsys3FromMaster(nBlock);

+ if( mem3.szKeyBlk ){

+ memsys3Unlink(mem3.iKeyBlk);

+ if( mem3.szKeyBlk>=nBlock ){

+ return memsys3FromKeyBlk(nBlock);

}

@@ -24780,23 +24825,23 @@ static void memsys3FreeUnsafe(void *pOld){

mem3.aPool[i+size-1].u.hdr.size4x &= ~2;

memsys3Link(i);

- /* Try to expand the master using the newly freed chunk */

- if( mem3.iMaster ){

- while( (mem3.aPool[mem3.iMaster-1].u.hdr.size4x&2)==0 ){

- size = mem3.aPool[mem3.iMaster-1].u.hdr.prevSize;

- mem3.iMaster -= size;

- mem3.szMaster += size;

- memsys3Unlink(mem3.iMaster);

- x = mem3.aPool[mem3.iMaster-1].u.hdr.size4x & 2;

- mem3.aPool[mem3.iMaster-1].u.hdr.size4x = mem3.szMaster*4 | x;

- mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.prevSize = mem3.szMaster;

+ /* Try to expand the key using the newly freed chunk */

+ if( mem3.iKeyBlk ){

+ while( (mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x&2)==0 ){

+ size = mem3.aPool[mem3.iKeyBlk-1].u.hdr.prevSize;

+ mem3.iKeyBlk -= size;

+ mem3.szKeyBlk += size;

+ memsys3Unlink(mem3.iKeyBlk);

+ x = mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x & 2;

+ mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x = mem3.szKeyBlk*4 | x;

+ mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.prevSize = mem3.szKeyBlk;

}

- x = mem3.aPool[mem3.iMaster-1].u.hdr.size4x & 2;

- while( (mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.size4x&1)==0 ){

- memsys3Unlink(mem3.iMaster+mem3.szMaster);

- mem3.szMaster += mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.size4x/4;

- mem3.aPool[mem3.iMaster-1].u.hdr.size4x = mem3.szMaster*4 | x;

- mem3.aPool[mem3.iMaster+mem3.szMaster-1].u.hdr.prevSize = mem3.szMaster;

+ x = mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x & 2;

+ while( (mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.size4x&1)==0 ){

+ memsys3Unlink(mem3.iKeyBlk+mem3.szKeyBlk);

+ mem3.szKeyBlk += mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.size4x/4;

+ mem3.aPool[mem3.iKeyBlk-1].u.hdr.size4x = mem3.szKeyBlk*4 | x;

+ mem3.aPool[mem3.iKeyBlk+mem3.szKeyBlk-1].u.hdr.prevSize = mem3.szKeyBlk;

}

@@ -24834,7 +24879,7 @@ static void *memsys3Malloc(int nBytes){

memsys3Enter();

p = memsys3MallocUnsafe(nBytes);

memsys3Leave();

- return (void*)p;

+ return (void*)p;

}

@@ -24892,11 +24937,11 @@ static int memsys3Init(void *NotUsed){

mem3.aPool = (Mem3Block *)sqlite3GlobalConfig.pHeap;

mem3.nPool = (sqlite3GlobalConfig.nHeap / sizeof(Mem3Block)) - 2;

- /* Initialize the master block. */

- mem3.szMaster = mem3.nPool;

- mem3.mnMaster = mem3.szMaster;

- mem3.iMaster = 1;

- mem3.aPool[0].u.hdr.size4x = (mem3.szMaster<<2) + 2;

+ /* Initialize the key block. */

+ mem3.szKeyBlk = mem3.nPool;

+ mem3.mnKeyBlk = mem3.szKeyBlk;

+ mem3.iKeyBlk = 1;

+ mem3.aPool[0].u.hdr.size4x = (mem3.szKeyBlk<<2) + 2;

mem3.aPool[mem3.nPool].u.hdr.prevSize = mem3.nPool;

mem3.aPool[mem3.nPool].u.hdr.size4x = 1;

@@ -24915,7 +24960,7 @@ static void memsys3Shutdown(void *NotUsed){

-** Open the file indicated and write a log of all unfreed memory

+** Open the file indicated and write a log of all unfreed memory

** allocations into that log.

SQLITE_PRIVATE void sqlite3Memsys3Dump(const char *zFilename){

@@ -24956,7 +25001,7 @@ SQLITE_PRIVATE void sqlite3Memsys3Dump(const char *zFilename){

fprintf(out, "%p %6d bytes checked out\n", &mem3.aPool[i], (size/4)*8-8);

}else{

fprintf(out, "%p %6d bytes free%s\n", &mem3.aPool[i], (size/4)*8-8,

- i==mem3.iMaster ? " **master**" : "");

+ i==mem3.iKeyBlk ? " **key**" : "");

}

for(i=0; i<MX_SMALL-1; i++){

@@ -24966,7 +25011,7 @@ SQLITE_PRIVATE void sqlite3Memsys3Dump(const char *zFilename){

fprintf(out, " %p(%d)", &mem3.aPool[j],

(mem3.aPool[j-1].u.hdr.size4x/4)*8-8);

}

- fprintf(out, "\n");

+ fprintf(out, "\n");

}

for(i=0; i<N_HASH; i++){

if( mem3.aiHash[i]==0 ) continue;

@@ -24975,11 +25020,11 @@ SQLITE_PRIVATE void sqlite3Memsys3Dump(const char *zFilename){

fprintf(out, " %p(%d)", &mem3.aPool[j],

(mem3.aPool[j-1].u.hdr.size4x/4)*8-8);

}

- fprintf(out, "\n");

+ fprintf(out, "\n");

}

- fprintf(out, "master=%d\n", mem3.iMaster);

- fprintf(out, "nowUsed=%d\n", mem3.nPool*8 - mem3.szMaster*8);

- fprintf(out, "mxUsed=%d\n", mem3.nPool*8 - mem3.mnMaster*8);

+ fprintf(out, "key=%d\n", mem3.iKeyBlk);

+ fprintf(out, "nowUsed=%d\n", mem3.nPool*8 - mem3.szKeyBlk*8);

+ fprintf(out, "mxUsed=%d\n", mem3.nPool*8 - mem3.mnKeyBlk*8);

sqlite3_mutex_leave(mem3.mutex);

if( out==stdout ){

fflush(stdout);

@@ -24992,7 +25037,7 @@ SQLITE_PRIVATE void sqlite3Memsys3Dump(const char *zFilename){

}

-** This routine is the only routine in this file with external

+** This routine is the only routine in this file with external

** linkage.

** Populate the low-level memory allocation function pointers in

@@ -25032,12 +25077,12 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){

*************************************************************************

** This file contains the C functions that implement a memory

-** allocation subsystem for use by SQLite.

+** allocation subsystem for use by SQLite.

** This version of the memory allocation subsystem omits all

** use of malloc(). The application gives SQLite a block of memory

** before calling sqlite3_initialize() from which allocations

-** are made and returned by the xMalloc() and xRealloc()

+** are made and returned by the xMalloc() and xRealloc()

** implementations. Once sqlite3_initialize() has been called,

** the amount of memory available to SQLite is fixed and cannot

** be changed.

@@ -25057,12 +25102,12 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){

** This algorithm is described in: J. M. Robson. "Bounds for Some Functions

** Concerning Dynamic Storage Allocation". Journal of the Association for

** Computing Machinery, Volume 21, Number 8, July 1974, pages 491-499.

-**

+**

** Let n be the size of the largest allocation divided by the minimum

** allocation size (after rounding all sizes up to a power of 2.) Let M

** be the maximum amount of memory ever outstanding at one time. Let

** N be the total amount of memory available for allocation. Robson

-** proved that this memory allocator will never breakdown due to

+** proved that this memory allocator will never breakdown due to

** fragmentation as long as the following constraint holds:

** N >= M*(1 + log2(n)/2) - n + 1

@@ -25073,7 +25118,7 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){

/* #include "sqliteInt.h" */

-** This version of the memory allocator is used only when

+** This version of the memory allocator is used only when

** SQLITE_ENABLE_MEMSYS5 is defined.

#ifdef SQLITE_ENABLE_MEMSYS5

@@ -25118,7 +25163,7 @@ static SQLITE_WSD struct Mem5Global {

int szAtom; /* Smallest possible allocation in bytes */

int nBlock; /* Number of szAtom sized blocks in zPool */

u8 *zPool; /* Memory available to be allocated */

** Mutex to control access to the memory allocation subsystem.

@@ -25137,7 +25182,7 @@ static SQLITE_WSD struct Mem5Global {

u32 maxCount; /* Maximum instantaneous currentCount */

u32 maxRequest; /* Largest allocation (exclusive of internal frag) */

#endif

** Lists of free blocks. aiFreelist[0] is a list of free blocks of

** size mem5.szAtom. aiFreelist[1] holds blocks of size szAtom*2.

@@ -25313,7 +25358,7 @@ static void memsys5FreeUnsafe(void *pOld){

u32 size, iLogsize;

int iBlock;

- /* Set iBlock to the index of the block pointed to by pOld in

+ /* Set iBlock to the index of the block pointed to by pOld in

** the array of mem5.szAtom byte blocks pointed to by mem5.zPool.

iBlock = (int)(((u8 *)pOld-mem5.zPool)/mem5.szAtom);

@@ -25382,7 +25427,7 @@ static void *memsys5Malloc(int nBytes){

p = memsys5MallocUnsafe(nBytes);

memsys5Leave();

}

- return (void*)p;

+ return (void*)p;

}

@@ -25395,14 +25440,14 @@ static void memsys5Free(void *pPrior){

assert( pPrior!=0 );

memsys5Enter();

memsys5FreeUnsafe(pPrior);

- memsys5Leave();

+ memsys5Leave();

}

** Change the size of an existing memory allocation.

** The outer layer memory allocator prevents this routine from

-** being called with pPrior==0.

+** being called with pPrior==0.

** nBytes is always a value obtained from a prior call to

** memsys5Round(). Hence nBytes is always a non-negative power

@@ -25535,7 +25580,7 @@ static void memsys5Shutdown(void *NotUsed){

#ifdef SQLITE_TEST

-** Open the file indicated and write a log of all unfreed memory

+** Open the file indicated and write a log of all unfreed memory

** allocations into that log.

SQLITE_PRIVATE void sqlite3Memsys5Dump(const char *zFilename){

@@ -25577,7 +25622,7 @@ SQLITE_PRIVATE void sqlite3Memsys5Dump(const char *zFilename){

#endif

-** This routine is the only routine in this file with external

+** This routine is the only routine in this file with external

** linkage. It returns a pointer to a static sqlite3_mem_methods

** struct populated with the memsys5 methods.

@@ -25632,7 +25677,7 @@ static SQLITE_WSD int mutexIsInit = 0;

** This block (enclosed by SQLITE_ENABLE_MULTITHREADED_CHECKS) contains

** the implementation of a wrapper around the system default mutex

-** implementation (sqlite3DefaultMutex()).

+** implementation (sqlite3DefaultMutex()).

** Most calls are passed directly through to the underlying default

** mutex implementation. Except, if a mutex is configured by calling

@@ -25643,7 +25688,7 @@ static SQLITE_WSD int mutexIsInit = 0;

** apps that usually use SQLITE_CONFIG_MULTITHREAD mode.

-/*

+/*

** Type for all mutexes used when SQLITE_ENABLE_MULTITHREADED_CHECKS

** is defined. Variable CheckMutex.mutex is a pointer to the real mutex

** allocated by the system mutex implementation. Variable iType is usually set

@@ -25660,9 +25705,9 @@ struct CheckMutex {

#define SQLITE_MUTEX_WARNONCONTENTION (-1)

-/*

+/*

** Pointer to real mutex methods object used by the CheckMutex

-** implementation. Set by checkMutexInit().

+** implementation. Set by checkMutexInit().

static SQLITE_WSD const sqlite3_mutex_methods *pGlobalMutexMethods;

@@ -25678,13 +25723,13 @@ static int checkMutexNotheld(sqlite3_mutex *p){

** Initialize and deinitialize the mutex subsystem.

-static int checkMutexInit(void){

+static int checkMutexInit(void){

pGlobalMutexMethods = sqlite3DefaultMutex();

- return SQLITE_OK;

+ return SQLITE_OK;

}

-static int checkMutexEnd(void){

+static int checkMutexEnd(void){

pGlobalMutexMethods = 0;

- return SQLITE_OK;

+ return SQLITE_OK;

}

@@ -25758,7 +25803,7 @@ static void checkMutexEnter(sqlite3_mutex *p){

if( SQLITE_OK==pGlobalMutexMethods->xMutexTry(pCheck->mutex) ){

return;

}

- sqlite3_log(SQLITE_MISUSE,

+ sqlite3_log(SQLITE_MISUSE,

"illegal multi-threaded access to database connection"

);

}

@@ -25817,11 +25862,11 @@ SQLITE_PRIVATE void sqlite3MutexWarnOnContention(sqlite3_mutex *p){

** Initialize the mutex system.

-SQLITE_PRIVATE int sqlite3MutexInit(void){

+SQLITE_PRIVATE int sqlite3MutexInit(void){

int rc = SQLITE_OK;

if( !sqlite3GlobalConfig.mutex.xMutexAlloc ){

/* If the xMutexAlloc method has not been set, then the user did not

- ** install a mutex implementation via sqlite3_config() prior to

+ ** install a mutex implementation via sqlite3_config() prior to

** sqlite3_initialize() being called. This block copies pointers to

** the default implementation into the sqlite3GlobalConfig structure.

@@ -25933,7 +25978,7 @@ SQLITE_API int sqlite3_mutex_try(sqlite3_mutex *p){

** The sqlite3_mutex_leave() routine exits a mutex that was previously

-** entered by the same thread. The behavior is undefined if the mutex

+** entered by the same thread. The behavior is undefined if the mutex

** is not currently entered. If a NULL pointer is passed as an argument

** this function is a no-op.

@@ -26002,9 +26047,9 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex *p){

static int noopMutexInit(void){ return SQLITE_OK; }

static int noopMutexEnd(void){ return SQLITE_OK; }

-static sqlite3_mutex *noopMutexAlloc(int id){

+static sqlite3_mutex *noopMutexAlloc(int id){

UNUSED_PARAMETER(id);

- return (sqlite3_mutex*)8;

+ return (sqlite3_mutex*)8;

}

static void noopMutexFree(sqlite3_mutex *p){ UNUSED_PARAMETER(p); return; }

static void noopMutexEnter(sqlite3_mutex *p){ UNUSED_PARAMETER(p); return; }

@@ -26069,7 +26114,7 @@ static int debugMutexEnd(void){ return SQLITE_OK; }

** The sqlite3_mutex_alloc() routine allocates a new

** mutex and returns a pointer to it. If it returns NULL

-** that means that a mutex could not be allocated.

+** that means that a mutex could not be allocated.

static sqlite3_mutex *debugMutexAlloc(int id){

static sqlite3_debug_mutex aStatic[SQLITE_MUTEX_STATIC_VFS3 - 1];

@@ -26247,7 +26292,7 @@ struct sqlite3_mutex {

** there might be race conditions that can cause these routines to

** deliver incorrect results. In particular, if pthread_equal() is

** not an atomic operation, then these routines might delivery

-** incorrect results. On most platforms, pthread_equal() is a

+** incorrect results. On most platforms, pthread_equal() is a

** comparison of two integers and is therefore atomic. But we are

** told that HPUX is not such a platform. If so, then these routines

** will not always work correctly on HPUX.

@@ -26295,7 +26340,7 @@ static int pthreadMutexEnd(void){ return SQLITE_OK; }

** <ul>

** <li> SQLITE_MUTEX_FAST

** <li> SQLITE_MUTEX_RECURSIVE

-** <li> SQLITE_MUTEX_STATIC_MASTER

+** <li> SQLITE_MUTEX_STATIC_MAIN

** <li> SQLITE_MUTEX_STATIC_MEM

** <li> SQLITE_MUTEX_STATIC_OPEN

** <li> SQLITE_MUTEX_STATIC_PRNG

@@ -26329,7 +26374,7 @@ static int pthreadMutexEnd(void){ return SQLITE_OK; }

** 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. But for the static

+** returns a different mutex on every call. But for the static

** mutex types, the same mutex is returned on every call that has

** the same type number.

@@ -26440,7 +26485,7 @@ static void pthreadMutexEnter(sqlite3_mutex *p){

** is atomic - that it cannot be deceived into thinking self

** and p->owner are equal if p->owner changes between two values

** that are not equal to self while the comparison is taking place.

- ** This implementation also assumes a coherent cache - that

+ ** This implementation also assumes a coherent cache - that

** separate processes cannot read different values from the same

** address at the same time. If either of these two conditions

** are not met, then the mutexes will fail and problems will result.

@@ -26483,7 +26528,7 @@ static int pthreadMutexTry(sqlite3_mutex *p){