mirror of https://github.com/mattn/go-sqlite3.git
upgrade amalgamation code (#821)
This commit is contained in:
parent
0cec2d7524
commit
baaf8a9784
4711
sqlite3-binding.c
4711
sqlite3-binding.c
File diff suppressed because it is too large
Load Diff
|
@ -124,9 +124,9 @@ extern "C" {
|
||||||
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
|
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
|
||||||
** [sqlite_version()] and [sqlite_source_id()].
|
** [sqlite_version()] and [sqlite_source_id()].
|
||||||
*/
|
*/
|
||||||
#define SQLITE_VERSION "3.31.1"
|
#define SQLITE_VERSION "3.32.2"
|
||||||
#define SQLITE_VERSION_NUMBER 3031001
|
#define SQLITE_VERSION_NUMBER 3032002
|
||||||
#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6"
|
#define SQLITE_SOURCE_ID "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e86861e8c"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** CAPI3REF: Run-Time Library Version Numbers
|
** CAPI3REF: Run-Time Library Version Numbers
|
||||||
|
@ -300,26 +300,22 @@ typedef sqlite_uint64 sqlite3_uint64;
|
||||||
** the [sqlite3] object is successfully destroyed and all associated
|
** the [sqlite3] object is successfully destroyed and all associated
|
||||||
** resources are deallocated.
|
** resources are deallocated.
|
||||||
**
|
**
|
||||||
** ^If the database connection is associated with unfinalized prepared
|
** Ideally, applications should [sqlite3_finalize | finalize] all
|
||||||
** statements or unfinished sqlite3_backup objects then sqlite3_close()
|
** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
|
||||||
** will leave the database connection open and return [SQLITE_BUSY].
|
|
||||||
** ^If sqlite3_close_v2() is called with unfinalized prepared statements
|
|
||||||
** and/or unfinished sqlite3_backups, then the database connection becomes
|
|
||||||
** an unusable "zombie" which will automatically be deallocated when the
|
|
||||||
** last prepared statement is finalized or the last sqlite3_backup is
|
|
||||||
** finished. The sqlite3_close_v2() interface is intended for use with
|
|
||||||
** host languages that are garbage collected, and where the order in which
|
|
||||||
** destructors are called is arbitrary.
|
|
||||||
**
|
|
||||||
** Applications should [sqlite3_finalize | finalize] all [prepared statements],
|
|
||||||
** [sqlite3_blob_close | close] all [BLOB handles], and
|
|
||||||
** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
|
** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
|
||||||
** with the [sqlite3] object prior to attempting to close the object. ^If
|
** with the [sqlite3] object prior to attempting to close the object.
|
||||||
** sqlite3_close_v2() is called on a [database connection] that still has
|
** ^If the database connection is associated with unfinalized prepared
|
||||||
** outstanding [prepared statements], [BLOB handles], and/or
|
** statements, BLOB handlers, and/or unfinished sqlite3_backup objects then
|
||||||
** [sqlite3_backup] objects then it returns [SQLITE_OK] and the deallocation
|
** sqlite3_close() will leave the database connection open and return
|
||||||
** of resources is deferred until all [prepared statements], [BLOB handles],
|
** [SQLITE_BUSY]. ^If sqlite3_close_v2() is called with unfinalized prepared
|
||||||
** and [sqlite3_backup] objects are also destroyed.
|
** statements, unclosed BLOB handlers, and/or unfinished sqlite3_backups,
|
||||||
|
** it returns [SQLITE_OK] regardless, but instead of deallocating the database
|
||||||
|
** connection immediately, it marks the database connection as an unusable
|
||||||
|
** "zombie" and makes arrangements to automatically deallocate the database
|
||||||
|
** connection after all prepared statements are finalized, all BLOB handles
|
||||||
|
** are closed, and all backups have finished. The sqlite3_close_v2() interface
|
||||||
|
** is intended for use with host languages that are garbage collected, and
|
||||||
|
** where the order in which destructors are called is arbitrary.
|
||||||
**
|
**
|
||||||
** ^If an [sqlite3] object is destroyed while a transaction is open,
|
** ^If an [sqlite3] object is destroyed while a transaction is open,
|
||||||
** the transaction is automatically rolled back.
|
** the transaction is automatically rolled back.
|
||||||
|
@ -508,10 +504,12 @@ SQLITE_API int sqlite3_exec(
|
||||||
#define SQLITE_IOERR_BEGIN_ATOMIC (SQLITE_IOERR | (29<<8))
|
#define SQLITE_IOERR_BEGIN_ATOMIC (SQLITE_IOERR | (29<<8))
|
||||||
#define SQLITE_IOERR_COMMIT_ATOMIC (SQLITE_IOERR | (30<<8))
|
#define SQLITE_IOERR_COMMIT_ATOMIC (SQLITE_IOERR | (30<<8))
|
||||||
#define SQLITE_IOERR_ROLLBACK_ATOMIC (SQLITE_IOERR | (31<<8))
|
#define SQLITE_IOERR_ROLLBACK_ATOMIC (SQLITE_IOERR | (31<<8))
|
||||||
|
#define SQLITE_IOERR_DATA (SQLITE_IOERR | (32<<8))
|
||||||
#define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8))
|
#define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8))
|
||||||
#define SQLITE_LOCKED_VTAB (SQLITE_LOCKED | (2<<8))
|
#define SQLITE_LOCKED_VTAB (SQLITE_LOCKED | (2<<8))
|
||||||
#define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8))
|
#define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8))
|
||||||
#define SQLITE_BUSY_SNAPSHOT (SQLITE_BUSY | (2<<8))
|
#define SQLITE_BUSY_SNAPSHOT (SQLITE_BUSY | (2<<8))
|
||||||
|
#define SQLITE_BUSY_TIMEOUT (SQLITE_BUSY | (3<<8))
|
||||||
#define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1<<8))
|
#define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1<<8))
|
||||||
#define SQLITE_CANTOPEN_ISDIR (SQLITE_CANTOPEN | (2<<8))
|
#define SQLITE_CANTOPEN_ISDIR (SQLITE_CANTOPEN | (2<<8))
|
||||||
#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3<<8))
|
#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3<<8))
|
||||||
|
@ -520,6 +518,7 @@ SQLITE_API int sqlite3_exec(
|
||||||
#define SQLITE_CANTOPEN_SYMLINK (SQLITE_CANTOPEN | (6<<8))
|
#define SQLITE_CANTOPEN_SYMLINK (SQLITE_CANTOPEN | (6<<8))
|
||||||
#define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8))
|
#define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8))
|
||||||
#define SQLITE_CORRUPT_SEQUENCE (SQLITE_CORRUPT | (2<<8))
|
#define SQLITE_CORRUPT_SEQUENCE (SQLITE_CORRUPT | (2<<8))
|
||||||
|
#define SQLITE_CORRUPT_INDEX (SQLITE_CORRUPT | (3<<8))
|
||||||
#define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8))
|
#define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8))
|
||||||
#define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8))
|
#define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8))
|
||||||
#define SQLITE_READONLY_ROLLBACK (SQLITE_READONLY | (3<<8))
|
#define SQLITE_READONLY_ROLLBACK (SQLITE_READONLY | (3<<8))
|
||||||
|
@ -1088,10 +1087,12 @@ struct sqlite3_io_methods {
|
||||||
** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
|
** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
|
||||||
**
|
**
|
||||||
** <li>[[SQLITE_FCNTL_LOCK_TIMEOUT]]
|
** <li>[[SQLITE_FCNTL_LOCK_TIMEOUT]]
|
||||||
** The [SQLITE_FCNTL_LOCK_TIMEOUT] opcode causes attempts to obtain
|
** The [SQLITE_FCNTL_LOCK_TIMEOUT] opcode is used to configure a VFS
|
||||||
** a file lock using the xLock or xShmLock methods of the VFS to wait
|
** to block for up to M milliseconds before failing when attempting to
|
||||||
** for up to M milliseconds before failing, where M is the single
|
** obtain a file lock using the xLock or xShmLock methods of the VFS.
|
||||||
** unsigned integer parameter.
|
** 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.
|
||||||
**
|
**
|
||||||
** <li>[[SQLITE_FCNTL_DATA_VERSION]]
|
** <li>[[SQLITE_FCNTL_DATA_VERSION]]
|
||||||
** The [SQLITE_FCNTL_DATA_VERSION] opcode is used to detect changes to
|
** The [SQLITE_FCNTL_DATA_VERSION] opcode is used to detect changes to
|
||||||
|
@ -1113,6 +1114,11 @@ struct sqlite3_io_methods {
|
||||||
** happen either internally or externally and that are associated with
|
** happen either internally or externally and that are associated with
|
||||||
** a particular attached database.
|
** a particular attached database.
|
||||||
**
|
**
|
||||||
|
** <li>[[SQLITE_FCNTL_CKPT_START]]
|
||||||
|
** The [SQLITE_FCNTL_CKPT_START] opcode is invoked from within a checkpoint
|
||||||
|
** in wal mode before the client starts to copy pages from the wal
|
||||||
|
** file to the database file.
|
||||||
|
**
|
||||||
** <li>[[SQLITE_FCNTL_CKPT_DONE]]
|
** <li>[[SQLITE_FCNTL_CKPT_DONE]]
|
||||||
** The [SQLITE_FCNTL_CKPT_DONE] opcode is invoked from within a checkpoint
|
** The [SQLITE_FCNTL_CKPT_DONE] opcode is invoked from within a checkpoint
|
||||||
** in wal mode after the client has finished copying pages from the wal
|
** in wal mode after the client has finished copying pages from the wal
|
||||||
|
@ -1156,6 +1162,8 @@ struct sqlite3_io_methods {
|
||||||
#define SQLITE_FCNTL_DATA_VERSION 35
|
#define SQLITE_FCNTL_DATA_VERSION 35
|
||||||
#define SQLITE_FCNTL_SIZE_LIMIT 36
|
#define SQLITE_FCNTL_SIZE_LIMIT 36
|
||||||
#define SQLITE_FCNTL_CKPT_DONE 37
|
#define SQLITE_FCNTL_CKPT_DONE 37
|
||||||
|
#define SQLITE_FCNTL_RESERVE_BYTES 38
|
||||||
|
#define SQLITE_FCNTL_CKPT_START 39
|
||||||
|
|
||||||
/* deprecated names */
|
/* deprecated names */
|
||||||
#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
|
#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
|
||||||
|
@ -3534,8 +3542,19 @@ SQLITE_API int sqlite3_open_v2(
|
||||||
** 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.
|
** parameter, and if so obtains the value of that query parameter.
|
||||||
**
|
**
|
||||||
** If F is the database filename pointer passed into the xOpen() method of
|
** The first parameter to these interfaces (hereafter referred to
|
||||||
** a VFS implementation or it is the return value of [sqlite3_db_filename()]
|
** as F) must be one of:
|
||||||
|
** <ul>
|
||||||
|
** <li> A database filename pointer created by the SQLite core and
|
||||||
|
** passed into the xOpen() method of a VFS implemention, or
|
||||||
|
** <li> A filename obtained from [sqlite3_db_filename()], or
|
||||||
|
** <li> A new filename constructed using [sqlite3_create_filename()].
|
||||||
|
** </ul>
|
||||||
|
** If the F parameter is not one of the above, then the behavior is
|
||||||
|
** undefined and probably undesirable. Older versions of SQLite were
|
||||||
|
** more tolerant of invalid F parameters than newer versions.
|
||||||
|
**
|
||||||
|
** If F is a suitable filename (as described in the previous paragraph)
|
||||||
** and if P is the name of the query parameter, then
|
** and if P is the name of the query parameter, then
|
||||||
** sqlite3_uri_parameter(F,P) returns the value of the P
|
** 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
|
||||||
|
@ -3618,6 +3637,78 @@ SQLITE_API const char *sqlite3_filename_database(const char*);
|
||||||
SQLITE_API const char *sqlite3_filename_journal(const char*);
|
SQLITE_API const char *sqlite3_filename_journal(const char*);
|
||||||
SQLITE_API const char *sqlite3_filename_wal(const char*);
|
SQLITE_API const char *sqlite3_filename_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
|
||||||
|
** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
|
||||||
|
** object that represents the main database file.
|
||||||
|
**
|
||||||
|
** This routine is intended for use in custom [VFS] implementations
|
||||||
|
** only. It is not a general-purpose interface.
|
||||||
|
** The argument sqlite3_file_object(X) must be a filename pointer that
|
||||||
|
** has been passed into [sqlite3_vfs].xOpen method where the
|
||||||
|
** flags parameter to xOpen contains one of the bits
|
||||||
|
** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL]. Any other use
|
||||||
|
** of this routine results in undefined and probably undesirable
|
||||||
|
** behavior.
|
||||||
|
*/
|
||||||
|
SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
|
||||||
|
|
||||||
|
/*
|
||||||
|
** CAPI3REF: Create and Destroy VFS Filenames
|
||||||
|
**
|
||||||
|
** These interfces are provided for use by [VFS shim] implementations and
|
||||||
|
** are not useful outside of that context.
|
||||||
|
**
|
||||||
|
** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
|
||||||
|
** database filename D with corresponding journal file J and WAL file W and
|
||||||
|
** with N URI parameters key/values pairs in the array P. The result from
|
||||||
|
** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
|
||||||
|
** is safe to pass to routines like:
|
||||||
|
** <ul>
|
||||||
|
** <li> [sqlite3_uri_parameter()],
|
||||||
|
** <li> [sqlite3_uri_boolean()],
|
||||||
|
** <li> [sqlite3_uri_int64()],
|
||||||
|
** <li> [sqlite3_uri_key()],
|
||||||
|
** <li> [sqlite3_filename_database()],
|
||||||
|
** <li> [sqlite3_filename_journal()], or
|
||||||
|
** <li> [sqlite3_filename_wal()].
|
||||||
|
** </ul>
|
||||||
|
** If a memory allocation error occurs, sqlite3_create_filename() might
|
||||||
|
** return a NULL pointer. The memory obtained from sqlite3_create_filename(X)
|
||||||
|
** must be released by a corresponding call to sqlite3_free_filename(Y).
|
||||||
|
**
|
||||||
|
** The P parameter in sqlite3_create_filename(D,J,W,N,P) should be an array
|
||||||
|
** of 2*N pointers to strings. Each pair of pointers in this array corresponds
|
||||||
|
** to a key and value for a query parameter. The P parameter may be a NULL
|
||||||
|
** pointer if N is zero. None of the 2*N pointers in the P array may be
|
||||||
|
** NULL pointers and key pointers should not be empty strings.
|
||||||
|
** None of the D, J, or W parameters to sqlite3_create_filename(D,J,W,N,P) may
|
||||||
|
** be NULL pointers, though they can be empty strings.
|
||||||
|
**
|
||||||
|
** The sqlite3_free_filename(Y) routine releases a memory allocation
|
||||||
|
** previously obtained from sqlite3_create_filename(). Invoking
|
||||||
|
** sqlite3_free_filename(Y) where Y is a NULL pointer is a harmless no-op.
|
||||||
|
**
|
||||||
|
** If the Y parameter to sqlite3_free_filename(Y) is anything other
|
||||||
|
** than a NULL pointer or a pointer previously acquired from
|
||||||
|
** sqlite3_create_filename(), then bad things such as heap
|
||||||
|
** corruption or segfaults may occur. The value Y should be
|
||||||
|
** used again after sqlite3_free_filename(Y) has been called. This means
|
||||||
|
** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
|
||||||
|
** then the corresponding [sqlite3_module.xClose() method should also be
|
||||||
|
** invoked prior to calling sqlite3_free_filename(Y).
|
||||||
|
*/
|
||||||
|
SQLITE_API char *sqlite3_create_filename(
|
||||||
|
const char *zDatabase,
|
||||||
|
const char *zJournal,
|
||||||
|
const char *zWal,
|
||||||
|
int nParam,
|
||||||
|
const char **azParam
|
||||||
|
);
|
||||||
|
SQLITE_API void sqlite3_free_filename(char*);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** CAPI3REF: Error Codes And Messages
|
** CAPI3REF: Error Codes And Messages
|
||||||
|
@ -4200,12 +4291,30 @@ typedef struct sqlite3_context sqlite3_context;
|
||||||
** [sqlite3_bind_parameter_index()] API if desired. ^The index
|
** [sqlite3_bind_parameter_index()] API if desired. ^The index
|
||||||
** for "?NNN" parameters is the value of NNN.
|
** for "?NNN" parameters is the value of NNN.
|
||||||
** ^The NNN value must be between 1 and the [sqlite3_limit()]
|
** ^The NNN value must be between 1 and the [sqlite3_limit()]
|
||||||
** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 999).
|
** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 32766).
|
||||||
**
|
**
|
||||||
** ^The third argument is the value to bind to the parameter.
|
** ^The third argument is the value to bind to the parameter.
|
||||||
** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
|
** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
|
||||||
** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
|
** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
|
||||||
** is ignored and the end result is the same as sqlite3_bind_null().
|
** is ignored and the end result is the same as sqlite3_bind_null().
|
||||||
|
** ^If the third parameter to sqlite3_bind_text() is not NULL, then
|
||||||
|
** it should be a pointer to well-formed UTF8 text.
|
||||||
|
** ^If the third parameter to sqlite3_bind_text16() is not NULL, then
|
||||||
|
** it should be a pointer to well-formed UTF16 text.
|
||||||
|
** ^If the third parameter to sqlite3_bind_text64() is not NULL, then
|
||||||
|
** it should be a pointer to a well-formed unicode string that is
|
||||||
|
** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
|
||||||
|
** otherwise.
|
||||||
|
**
|
||||||
|
** [[byte-order determination rules]] ^The byte-order of
|
||||||
|
** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
|
||||||
|
** found in first character, which is removed, or in the absence of a BOM
|
||||||
|
** the byte order is the native byte order of the host
|
||||||
|
** machine for sqlite3_bind_text16() or the byte order specified in
|
||||||
|
** the 6th parameter for sqlite3_bind_text64().)^
|
||||||
|
** ^If UTF16 input text contains invalid unicode
|
||||||
|
** characters, then SQLite might change those invalid characters
|
||||||
|
** into the unicode replacement character: U+FFFD.
|
||||||
**
|
**
|
||||||
** ^(In those routines that have a fourth argument, its value is the
|
** ^(In those routines that have a fourth argument, its value is the
|
||||||
** number of bytes in the parameter. To be clear: the value is the
|
** number of bytes in the parameter. To be clear: the value is the
|
||||||
|
@ -4219,7 +4328,7 @@ typedef struct sqlite3_context sqlite3_context;
|
||||||
** or sqlite3_bind_text16() or sqlite3_bind_text64() then
|
** or sqlite3_bind_text16() or sqlite3_bind_text64() then
|
||||||
** that parameter must be the byte offset
|
** that parameter must be the byte offset
|
||||||
** where the NUL terminator would occur assuming the string were NUL
|
** where the NUL terminator would occur assuming the string were NUL
|
||||||
** terminated. If any NUL characters occur 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
|
** the value of the fourth parameter then the resulting string value will
|
||||||
** contain embedded NULs. The result of expressions involving strings
|
** contain embedded NULs. The result of expressions involving strings
|
||||||
** with embedded NULs is undefined.
|
** with embedded NULs is undefined.
|
||||||
|
@ -5387,7 +5496,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);
|
||||||
**
|
**
|
||||||
** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
|
** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
|
||||||
** determined by the N parameter on first successful call. Changing the
|
** determined by the N parameter on first successful call. Changing the
|
||||||
** value of N in any subsequents call to sqlite3_aggregate_context() within
|
** value of N in any subsequent call to sqlite3_aggregate_context() within
|
||||||
** the same aggregate function instance will not resize the memory
|
** the same aggregate function instance will not resize the memory
|
||||||
** allocation.)^ Within the xFinal callback, it is customary to set
|
** 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
|
||||||
|
@ -5544,8 +5653,9 @@ typedef void (*sqlite3_destructor_type)(void*);
|
||||||
** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
|
** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
|
||||||
** as the text of an error message. ^SQLite interprets the error
|
** as the text of an error message. ^SQLite interprets the error
|
||||||
** message string from sqlite3_result_error() as UTF-8. ^SQLite
|
** message string from sqlite3_result_error() as UTF-8. ^SQLite
|
||||||
** interprets the string from sqlite3_result_error16() as UTF-16 in native
|
** interprets the string from sqlite3_result_error16() as UTF-16 using
|
||||||
** byte order. ^If the third parameter to sqlite3_result_error()
|
** the same [byte-order determination rules] as [sqlite3_bind_text16()].
|
||||||
|
** ^If the third parameter to sqlite3_result_error()
|
||||||
** or sqlite3_result_error16() is negative then SQLite takes as the error
|
** or sqlite3_result_error16() is negative then SQLite takes as the error
|
||||||
** message all text up through the first zero character.
|
** message all text up through the first zero character.
|
||||||
** ^If the third parameter to sqlite3_result_error() or
|
** ^If the third parameter to sqlite3_result_error() or
|
||||||
|
@ -5613,6 +5723,25 @@ typedef void (*sqlite3_destructor_type)(void*);
|
||||||
** then SQLite makes a copy of the result into space obtained
|
** then SQLite makes a copy of the result into space obtained
|
||||||
** from [sqlite3_malloc()] before it returns.
|
** from [sqlite3_malloc()] before it returns.
|
||||||
**
|
**
|
||||||
|
** ^For the sqlite3_result_text16(), sqlite3_result_text16le(), and
|
||||||
|
** sqlite3_result_text16be() routines, and for sqlite3_result_text64()
|
||||||
|
** when the encoding is not UTF8, if the input UTF16 begins with a
|
||||||
|
** byte-order mark (BOM, U+FEFF) then the BOM is removed from the
|
||||||
|
** string and the rest of the string is interpreted according to the
|
||||||
|
** byte-order specified by the BOM. ^The byte-order specified by
|
||||||
|
** the BOM at the beginning of the text overrides the byte-order
|
||||||
|
** specified by the interface procedure. ^So, for example, if
|
||||||
|
** sqlite3_result_text16le() is invoked with text that begins
|
||||||
|
** with bytes 0xfe, 0xff (a big-endian byte-order mark) then the
|
||||||
|
** first two bytes of input are skipped and the remaining input
|
||||||
|
** is interpreted as UTF16BE text.
|
||||||
|
**
|
||||||
|
** ^For UTF16 input text to the sqlite3_result_text16(),
|
||||||
|
** sqlite3_result_text16be(), sqlite3_result_text16le(), and
|
||||||
|
** sqlite3_result_text64() routines, if the text contains invalid
|
||||||
|
** UTF16 characters, the invalid characters might be converted
|
||||||
|
** into the unicode replacement character, U+FFFD.
|
||||||
|
**
|
||||||
** ^The sqlite3_result_value() interface sets the result of
|
** ^The sqlite3_result_value() interface sets the result of
|
||||||
** the application-defined function to be a copy of the
|
** the application-defined function to be a copy of the
|
||||||
** [unprotected sqlite3_value] object specified by the 2nd parameter. ^The
|
** [unprotected sqlite3_value] object specified by the 2nd parameter. ^The
|
||||||
|
@ -5818,51 +5947,6 @@ SQLITE_API int sqlite3_collation_needed16(
|
||||||
void(*)(void*,sqlite3*,int eTextRep,const void*)
|
void(*)(void*,sqlite3*,int eTextRep,const void*)
|
||||||
);
|
);
|
||||||
|
|
||||||
#ifdef SQLITE_HAS_CODEC
|
|
||||||
/*
|
|
||||||
** Specify the key for an encrypted database. This routine should be
|
|
||||||
** called right after sqlite3_open().
|
|
||||||
**
|
|
||||||
** The code to implement this API is not available in the public release
|
|
||||||
** of SQLite.
|
|
||||||
*/
|
|
||||||
SQLITE_API int sqlite3_key(
|
|
||||||
sqlite3 *db, /* Database to be rekeyed */
|
|
||||||
const void *pKey, int nKey /* The key */
|
|
||||||
);
|
|
||||||
SQLITE_API int sqlite3_key_v2(
|
|
||||||
sqlite3 *db, /* Database to be rekeyed */
|
|
||||||
const char *zDbName, /* Name of the database */
|
|
||||||
const void *pKey, int nKey /* The key */
|
|
||||||
);
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Change the key on an open database. If the current database is not
|
|
||||||
** encrypted, this routine will encrypt it. If pNew==0 or nNew==0, the
|
|
||||||
** database is decrypted.
|
|
||||||
**
|
|
||||||
** The code to implement this API is not available in the public release
|
|
||||||
** of SQLite.
|
|
||||||
*/
|
|
||||||
SQLITE_API int sqlite3_rekey(
|
|
||||||
sqlite3 *db, /* Database to be rekeyed */
|
|
||||||
const void *pKey, int nKey /* The new key */
|
|
||||||
);
|
|
||||||
SQLITE_API int sqlite3_rekey_v2(
|
|
||||||
sqlite3 *db, /* Database to be rekeyed */
|
|
||||||
const char *zDbName, /* Name of the database */
|
|
||||||
const void *pKey, int nKey /* The new key */
|
|
||||||
);
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Specify the activation key for a SEE database. Unless
|
|
||||||
** activated, none of the SEE routines will work.
|
|
||||||
*/
|
|
||||||
SQLITE_API void sqlite3_activate_see(
|
|
||||||
const char *zPassPhrase /* Activation phrase */
|
|
||||||
);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SQLITE_ENABLE_CEROD
|
#ifdef SQLITE_ENABLE_CEROD
|
||||||
/*
|
/*
|
||||||
** Specify the activation key for a CEROD database. Unless
|
** Specify the activation key for a CEROD database. Unless
|
||||||
|
@ -7605,7 +7689,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
|
||||||
#define SQLITE_TESTCTRL_PENDING_BYTE 11
|
#define SQLITE_TESTCTRL_PENDING_BYTE 11
|
||||||
#define SQLITE_TESTCTRL_ASSERT 12
|
#define SQLITE_TESTCTRL_ASSERT 12
|
||||||
#define SQLITE_TESTCTRL_ALWAYS 13
|
#define SQLITE_TESTCTRL_ALWAYS 13
|
||||||
#define SQLITE_TESTCTRL_RESERVE 14
|
#define SQLITE_TESTCTRL_RESERVE 14 /* NOT USED */
|
||||||
#define SQLITE_TESTCTRL_OPTIMIZATIONS 15
|
#define SQLITE_TESTCTRL_OPTIMIZATIONS 15
|
||||||
#define SQLITE_TESTCTRL_ISKEYWORD 16 /* NOT USED */
|
#define SQLITE_TESTCTRL_ISKEYWORD 16 /* NOT USED */
|
||||||
#define SQLITE_TESTCTRL_SCRATCHMALLOC 17 /* NOT USED */
|
#define SQLITE_TESTCTRL_SCRATCHMALLOC 17 /* NOT USED */
|
||||||
|
|
|
@ -331,6 +331,11 @@ struct sqlite3_api_routines {
|
||||||
const char *(*filename_database)(const char*);
|
const char *(*filename_database)(const char*);
|
||||||
const char *(*filename_journal)(const char*);
|
const char *(*filename_journal)(const char*);
|
||||||
const char *(*filename_wal)(const char*);
|
const char *(*filename_wal)(const char*);
|
||||||
|
/* Version 3.32.0 and later */
|
||||||
|
char *(*create_filename)(const char*,const char*,const char*,
|
||||||
|
int,const char**);
|
||||||
|
void (*free_filename)(char*);
|
||||||
|
sqlite3_file *(*database_file_object)(const char*);
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -631,6 +636,10 @@ typedef int (*sqlite3_loadext_entry)(
|
||||||
#define sqlite3_filename_database sqlite3_api->filename_database
|
#define sqlite3_filename_database sqlite3_api->filename_database
|
||||||
#define sqlite3_filename_journal sqlite3_api->filename_journal
|
#define sqlite3_filename_journal sqlite3_api->filename_journal
|
||||||
#define sqlite3_filename_wal sqlite3_api->filename_wal
|
#define sqlite3_filename_wal sqlite3_api->filename_wal
|
||||||
|
/* Version 3.32.0 and later */
|
||||||
|
#define sqlite3_create_filename sqlite3_api->create_filename
|
||||||
|
#define sqlite3_free_filename sqlite3_api->free_filename
|
||||||
|
#define sqlite3_database_file_object sqlite3_api->database_file_object
|
||||||
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||||
|
|
||||||
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||||
|
|
Loading…
Reference in New Issue