diff options
author | Lalit Maganti <lalitm@google.com> | 2020-06-15 19:47:59 +0100 |
---|---|---|
committer | Danny Lin <danny@kdrag0n.dev> | 2021-03-24 01:44:36 -0700 |
commit | cf188905eba2defd493f0cf5e51b497c78bd0406 (patch) | |
tree | 25bf27c7bfdd46462a124406074ffc4045b774eb /dist/sqlite3ext.h | |
parent | 1a3f0b9b4c09b67f6e9a2c2db940cfd490928c44 (diff) |
sqlite: Upgrade to SQLite 3.32.2
This change is a cherry-pick of aosp/1337179 which is being merged here
because of merge conflicts due to changes [1] and [2] which were made
in internal master and rvc-dev but not in AOSP.
Downloaded from
https://www.sqlite.org/2020/sqlite-autoconf-3320200.tar.gz
$ sha1sum sqlite-autoconf-3320200.tar.gz
429e3f2d0b16a95ad1025a97b2a328d0b4037575 sqlite-autoconf-3320200.tar.gz
dist/orig contains the stock sqlite3 code, as packaged in the tar.gz file above.
dist contains a copy of dist/orig, but with the Android.patch file applied.
More details about the release are available here:
https://www.sqlite.org/releaselog/3_32_2.html
[1] ag/0f62c1a0e8b463b5b27035e11478e66d7daec69a
[2] ag/88147c430cc041a27d07e593ffea12b7aa586f7a
Test: code compiles and device boots with no problems.
Test: select sqlite_version() - returns 3.32.2
Test: atest cts/SQLiteDatabaseTest all passed.
Test: atest cts/SQLiteSecurityTest
Bug: 159105124
Change-Id: I5c5fa2fd90292483bf20d8ae58adad41c48aa4e6
Diffstat (limited to 'dist/sqlite3ext.h')
-rw-r--r-- | dist/sqlite3ext.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/dist/sqlite3ext.h b/dist/sqlite3ext.h index 088148b..78c19a0 100644 --- a/dist/sqlite3ext.h +++ b/dist/sqlite3ext.h @@ -322,6 +322,19 @@ struct sqlite3_api_routines { /* Version 3.28.0 and later */ int (*stmt_isexplain)(sqlite3_stmt*); int (*value_frombind)(sqlite3_value*); + /* Version 3.30.0 and later */ + int (*drop_modules)(sqlite3*,const char**); + /* Version 3.31.0 and later */ + sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64); + const char *(*uri_key)(const char*,int); + const char *(*filename_database)(const char*); + const char *(*filename_journal)(const char*); + const char *(*filename_wal)(const char*); + /* Version 3.32.0 and later */ + char *(*create_filename)(const char*,const char*,const char*, + int,const char**); + void (*free_filename)(char*); + sqlite3_file *(*database_file_object)(const char*); }; /* @@ -612,8 +625,20 @@ typedef int (*sqlite3_loadext_entry)( /* Version 3.26.0 and later */ #define sqlite3_normalized_sql sqlite3_api->normalized_sql /* Version 3.28.0 and later */ -#define sqlite3_stmt_isexplain sqlite3_api->isexplain -#define sqlite3_value_frombind sqlite3_api->frombind +#define sqlite3_stmt_isexplain sqlite3_api->stmt_isexplain +#define sqlite3_value_frombind sqlite3_api->value_frombind +/* Version 3.30.0 and later */ +#define sqlite3_drop_modules sqlite3_api->drop_modules +/* Version 3.31.0 and later */ +#define sqlite3_hard_heap_limit64 sqlite3_api->hard_heap_limit64 +#define sqlite3_uri_key sqlite3_api->uri_key +#define sqlite3_filename_database sqlite3_api->filename_database +#define sqlite3_filename_journal sqlite3_api->filename_journal +#define sqlite3_filename_wal sqlite3_api->filename_wal +/* Version 3.32.0 and later */ +#define sqlite3_create_filename sqlite3_api->create_filename +#define sqlite3_free_filename sqlite3_api->free_filename +#define sqlite3_database_file_object sqlite3_api->database_file_object #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */ #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) |