Skip to content

Commit f2dfe47

Browse files
penbergpenberg
authored
Merge upstream SQLite 3.47.0 (#2240)
Depends on #2238
2 parents 7251ec0 + 604cc47 commit f2dfe47

424 files changed

Lines changed: 33740 additions & 13445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c‎

Lines changed: 5573 additions & 2785 deletions
Large diffs are not rendered by default.

‎libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.h‎

Lines changed: 172 additions & 23 deletions
Large diffs are not rendered by default.

‎libsql-ffi/bundled/bindings/bindgen.rs‎

Lines changed: 87 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ extern "C" {
2323
) -> ::std::os::raw::c_int;
2424
}
2525

26-
pub const SQLITE_VERSION: &[u8; 7] = b"3.46.1\0";
27-
pub const SQLITE_VERSION_NUMBER: i32 = 3046001;
26+
pub const SQLITE_VERSION: &[u8; 7] = b"3.47.0\0";
27+
pub const SQLITE_VERSION_NUMBER: i32 = 3047000;
2828
pub const SQLITE_SOURCE_ID: &[u8; 85] =
29-
b"2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69aalt1\0";
29+
b"2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82alt1\0";
3030
pub const LIBSQL_VERSION: &[u8; 6] = b"0.2.3\0";
3131
pub const SQLITE_OK: i32 = 0;
3232
pub const SQLITE_ERROR: i32 = 1;
@@ -357,12 +357,14 @@ pub const SQLITE_DIRECTONLY: i32 = 524288;
357357
pub const SQLITE_SUBTYPE: i32 = 1048576;
358358
pub const SQLITE_INNOCUOUS: i32 = 2097152;
359359
pub const SQLITE_RESULT_SUBTYPE: i32 = 16777216;
360+
pub const SQLITE_SELFORDER1: i32 = 33554432;
360361
pub const SQLITE_WIN32_DATA_DIRECTORY_TYPE: i32 = 1;
361362
pub const SQLITE_WIN32_TEMP_DIRECTORY_TYPE: i32 = 2;
362363
pub const SQLITE_TXN_NONE: i32 = 0;
363364
pub const SQLITE_TXN_READ: i32 = 1;
364365
pub const SQLITE_TXN_WRITE: i32 = 2;
365366
pub const SQLITE_INDEX_SCAN_UNIQUE: i32 = 1;
367+
pub const SQLITE_INDEX_SCAN_HEX: i32 = 2;
366368
pub const SQLITE_INDEX_CONSTRAINT_EQ: i32 = 2;
367369
pub const SQLITE_INDEX_CONSTRAINT_GT: i32 = 4;
368370
pub const SQLITE_INDEX_CONSTRAINT_LE: i32 = 8;
@@ -412,6 +414,7 @@ pub const SQLITE_TESTCTRL_RESERVE: i32 = 14;
412414
pub const SQLITE_TESTCTRL_JSON_SELFCHECK: i32 = 14;
413415
pub const SQLITE_TESTCTRL_OPTIMIZATIONS: i32 = 15;
414416
pub const SQLITE_TESTCTRL_ISKEYWORD: i32 = 16;
417+
pub const SQLITE_TESTCTRL_GETOPT: i32 = 16;
415418
pub const SQLITE_TESTCTRL_SCRATCHMALLOC: i32 = 17;
416419
pub const SQLITE_TESTCTRL_INTERNAL_FUNCTIONS: i32 = 17;
417420
pub const SQLITE_TESTCTRL_LOCALTIME_FAULT: i32 = 18;
@@ -3188,6 +3191,34 @@ pub struct Fts5ExtensionApi {
31883191
arg3: *mut ::std::os::raw::c_int,
31893192
) -> ::std::os::raw::c_int,
31903193
>,
3194+
pub xColumnLocale: ::std::option::Option<
3195+
unsafe extern "C" fn(
3196+
arg1: *mut Fts5Context,
3197+
iCol: ::std::os::raw::c_int,
3198+
pz: *mut *const ::std::os::raw::c_char,
3199+
pn: *mut ::std::os::raw::c_int,
3200+
) -> ::std::os::raw::c_int,
3201+
>,
3202+
pub xTokenize_v2: ::std::option::Option<
3203+
unsafe extern "C" fn(
3204+
arg1: *mut Fts5Context,
3205+
pText: *const ::std::os::raw::c_char,
3206+
nText: ::std::os::raw::c_int,
3207+
pLocale: *const ::std::os::raw::c_char,
3208+
nLocale: ::std::os::raw::c_int,
3209+
pCtx: *mut ::std::os::raw::c_void,
3210+
xToken: ::std::option::Option<
3211+
unsafe extern "C" fn(
3212+
arg1: *mut ::std::os::raw::c_void,
3213+
arg2: ::std::os::raw::c_int,
3214+
arg3: *const ::std::os::raw::c_char,
3215+
arg4: ::std::os::raw::c_int,
3216+
arg5: ::std::os::raw::c_int,
3217+
arg6: ::std::os::raw::c_int,
3218+
) -> ::std::os::raw::c_int,
3219+
>,
3220+
) -> ::std::os::raw::c_int,
3221+
>,
31913222
}
31923223
#[repr(C)]
31933224
#[derive(Debug, Copy, Clone)]
@@ -3196,6 +3227,41 @@ pub struct Fts5Tokenizer {
31963227
}
31973228
#[repr(C)]
31983229
#[derive(Debug, Copy, Clone)]
3230+
pub struct fts5_tokenizer_v2 {
3231+
pub iVersion: ::std::os::raw::c_int,
3232+
pub xCreate: ::std::option::Option<
3233+
unsafe extern "C" fn(
3234+
arg1: *mut ::std::os::raw::c_void,
3235+
azArg: *mut *const ::std::os::raw::c_char,
3236+
nArg: ::std::os::raw::c_int,
3237+
ppOut: *mut *mut Fts5Tokenizer,
3238+
) -> ::std::os::raw::c_int,
3239+
>,
3240+
pub xDelete: ::std::option::Option<unsafe extern "C" fn(arg1: *mut Fts5Tokenizer)>,
3241+
pub xTokenize: ::std::option::Option<
3242+
unsafe extern "C" fn(
3243+
arg1: *mut Fts5Tokenizer,
3244+
pCtx: *mut ::std::os::raw::c_void,
3245+
flags: ::std::os::raw::c_int,
3246+
pText: *const ::std::os::raw::c_char,
3247+
nText: ::std::os::raw::c_int,
3248+
pLocale: *const ::std::os::raw::c_char,
3249+
nLocale: ::std::os::raw::c_int,
3250+
xToken: ::std::option::Option<
3251+
unsafe extern "C" fn(
3252+
pCtx: *mut ::std::os::raw::c_void,
3253+
tflags: ::std::os::raw::c_int,
3254+
pToken: *const ::std::os::raw::c_char,
3255+
nToken: ::std::os::raw::c_int,
3256+
iStart: ::std::os::raw::c_int,
3257+
iEnd: ::std::os::raw::c_int,
3258+
) -> ::std::os::raw::c_int,
3259+
>,
3260+
) -> ::std::os::raw::c_int,
3261+
>,
3262+
}
3263+
#[repr(C)]
3264+
#[derive(Debug, Copy, Clone)]
31993265
pub struct fts5_tokenizer {
32003266
pub xCreate: ::std::option::Option<
32013267
unsafe extern "C" fn(
@@ -3256,6 +3322,23 @@ pub struct fts5_api {
32563322
xDestroy: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
32573323
) -> ::std::os::raw::c_int,
32583324
>,
3325+
pub xCreateTokenizer_v2: ::std::option::Option<
3326+
unsafe extern "C" fn(
3327+
pApi: *mut fts5_api,
3328+
zName: *const ::std::os::raw::c_char,
3329+
pUserData: *mut ::std::os::raw::c_void,
3330+
pTokenizer: *mut fts5_tokenizer_v2,
3331+
xDestroy: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
3332+
) -> ::std::os::raw::c_int,
3333+
>,
3334+
pub xFindTokenizer_v2: ::std::option::Option<
3335+
unsafe extern "C" fn(
3336+
pApi: *mut fts5_api,
3337+
zName: *const ::std::os::raw::c_char,
3338+
ppUserData: *mut *mut ::std::os::raw::c_void,
3339+
ppTokenizer: *mut *mut fts5_tokenizer_v2,
3340+
) -> ::std::os::raw::c_int,
3341+
>,
32593342
}
32603343
#[repr(C)]
32613344
#[derive(Debug, Copy, Clone)]
@@ -3541,6 +3624,7 @@ pub struct sqlite3_wal {
35413624
pub nCkpt: ::std::os::raw::c_uint,
35423625
pub lockError: ::std::os::raw::c_uchar,
35433626
pub pSnapshot: *mut WalIndexHdr,
3627+
pub bGetSnapshot: ::std::os::raw::c_int,
35443628
pub db: *mut sqlite3,
35453629
}
35463630
#[repr(C)]

‎libsql-ffi/bundled/bindings/session_bindgen.rs‎

Lines changed: 87 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ extern "C" {
2323
) -> ::std::os::raw::c_int;
2424
}
2525

26-
pub const SQLITE_VERSION: &[u8; 7] = b"3.46.1\0";
27-
pub const SQLITE_VERSION_NUMBER: i32 = 3046001;
26+
pub const SQLITE_VERSION: &[u8; 7] = b"3.47.0\0";
27+
pub const SQLITE_VERSION_NUMBER: i32 = 3047000;
2828
pub const SQLITE_SOURCE_ID: &[u8; 85] =
29-
b"2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69aalt1\0";
29+
b"2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82alt1\0";
3030
pub const LIBSQL_VERSION: &[u8; 6] = b"0.2.3\0";
3131
pub const SQLITE_OK: i32 = 0;
3232
pub const SQLITE_ERROR: i32 = 1;
@@ -357,12 +357,14 @@ pub const SQLITE_DIRECTONLY: i32 = 524288;
357357
pub const SQLITE_SUBTYPE: i32 = 1048576;
358358
pub const SQLITE_INNOCUOUS: i32 = 2097152;
359359
pub const SQLITE_RESULT_SUBTYPE: i32 = 16777216;
360+
pub const SQLITE_SELFORDER1: i32 = 33554432;
360361
pub const SQLITE_WIN32_DATA_DIRECTORY_TYPE: i32 = 1;
361362
pub const SQLITE_WIN32_TEMP_DIRECTORY_TYPE: i32 = 2;
362363
pub const SQLITE_TXN_NONE: i32 = 0;
363364
pub const SQLITE_TXN_READ: i32 = 1;
364365
pub const SQLITE_TXN_WRITE: i32 = 2;
365366
pub const SQLITE_INDEX_SCAN_UNIQUE: i32 = 1;
367+
pub const SQLITE_INDEX_SCAN_HEX: i32 = 2;
366368
pub const SQLITE_INDEX_CONSTRAINT_EQ: i32 = 2;
367369
pub const SQLITE_INDEX_CONSTRAINT_GT: i32 = 4;
368370
pub const SQLITE_INDEX_CONSTRAINT_LE: i32 = 8;
@@ -412,6 +414,7 @@ pub const SQLITE_TESTCTRL_RESERVE: i32 = 14;
412414
pub const SQLITE_TESTCTRL_JSON_SELFCHECK: i32 = 14;
413415
pub const SQLITE_TESTCTRL_OPTIMIZATIONS: i32 = 15;
414416
pub const SQLITE_TESTCTRL_ISKEYWORD: i32 = 16;
417+
pub const SQLITE_TESTCTRL_GETOPT: i32 = 16;
415418
pub const SQLITE_TESTCTRL_SCRATCHMALLOC: i32 = 17;
416419
pub const SQLITE_TESTCTRL_INTERNAL_FUNCTIONS: i32 = 17;
417420
pub const SQLITE_TESTCTRL_LOCALTIME_FAULT: i32 = 18;
@@ -3706,6 +3709,34 @@ pub struct Fts5ExtensionApi {
37063709
arg3: *mut ::std::os::raw::c_int,
37073710
) -> ::std::os::raw::c_int,
37083711
>,
3712+
pub xColumnLocale: ::std::option::Option<
3713+
unsafe extern "C" fn(
3714+
arg1: *mut Fts5Context,
3715+
iCol: ::std::os::raw::c_int,
3716+
pz: *mut *const ::std::os::raw::c_char,
3717+
pn: *mut ::std::os::raw::c_int,
3718+
) -> ::std::os::raw::c_int,
3719+
>,
3720+
pub xTokenize_v2: ::std::option::Option<
3721+
unsafe extern "C" fn(
3722+
arg1: *mut Fts5Context,
3723+
pText: *const ::std::os::raw::c_char,
3724+
nText: ::std::os::raw::c_int,
3725+
pLocale: *const ::std::os::raw::c_char,
3726+
nLocale: ::std::os::raw::c_int,
3727+
pCtx: *mut ::std::os::raw::c_void,
3728+
xToken: ::std::option::Option<
3729+
unsafe extern "C" fn(
3730+
arg1: *mut ::std::os::raw::c_void,
3731+
arg2: ::std::os::raw::c_int,
3732+
arg3: *const ::std::os::raw::c_char,
3733+
arg4: ::std::os::raw::c_int,
3734+
arg5: ::std::os::raw::c_int,
3735+
arg6: ::std::os::raw::c_int,
3736+
) -> ::std::os::raw::c_int,
3737+
>,
3738+
) -> ::std::os::raw::c_int,
3739+
>,
37093740
}
37103741
#[repr(C)]
37113742
#[derive(Debug, Copy, Clone)]
@@ -3714,6 +3745,41 @@ pub struct Fts5Tokenizer {
37143745
}
37153746
#[repr(C)]
37163747
#[derive(Debug, Copy, Clone)]
3748+
pub struct fts5_tokenizer_v2 {
3749+
pub iVersion: ::std::os::raw::c_int,
3750+
pub xCreate: ::std::option::Option<
3751+
unsafe extern "C" fn(
3752+
arg1: *mut ::std::os::raw::c_void,
3753+
azArg: *mut *const ::std::os::raw::c_char,
3754+
nArg: ::std::os::raw::c_int,
3755+
ppOut: *mut *mut Fts5Tokenizer,
3756+
) -> ::std::os::raw::c_int,
3757+
>,
3758+
pub xDelete: ::std::option::Option<unsafe extern "C" fn(arg1: *mut Fts5Tokenizer)>,
3759+
pub xTokenize: ::std::option::Option<
3760+
unsafe extern "C" fn(
3761+
arg1: *mut Fts5Tokenizer,
3762+
pCtx: *mut ::std::os::raw::c_void,
3763+
flags: ::std::os::raw::c_int,
3764+
pText: *const ::std::os::raw::c_char,
3765+
nText: ::std::os::raw::c_int,
3766+
pLocale: *const ::std::os::raw::c_char,
3767+
nLocale: ::std::os::raw::c_int,
3768+
xToken: ::std::option::Option<
3769+
unsafe extern "C" fn(
3770+
pCtx: *mut ::std::os::raw::c_void,
3771+
tflags: ::std::os::raw::c_int,
3772+
pToken: *const ::std::os::raw::c_char,
3773+
nToken: ::std::os::raw::c_int,
3774+
iStart: ::std::os::raw::c_int,
3775+
iEnd: ::std::os::raw::c_int,
3776+
) -> ::std::os::raw::c_int,
3777+
>,
3778+
) -> ::std::os::raw::c_int,
3779+
>,
3780+
}
3781+
#[repr(C)]
3782+
#[derive(Debug, Copy, Clone)]
37173783
pub struct fts5_tokenizer {
37183784
pub xCreate: ::std::option::Option<
37193785
unsafe extern "C" fn(
@@ -3774,6 +3840,23 @@ pub struct fts5_api {
37743840
xDestroy: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
37753841
) -> ::std::os::raw::c_int,
37763842
>,
3843+
pub xCreateTokenizer_v2: ::std::option::Option<
3844+
unsafe extern "C" fn(
3845+
pApi: *mut fts5_api,
3846+
zName: *const ::std::os::raw::c_char,
3847+
pUserData: *mut ::std::os::raw::c_void,
3848+
pTokenizer: *mut fts5_tokenizer_v2,
3849+
xDestroy: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
3850+
) -> ::std::os::raw::c_int,
3851+
>,
3852+
pub xFindTokenizer_v2: ::std::option::Option<
3853+
unsafe extern "C" fn(
3854+
pApi: *mut fts5_api,
3855+
zName: *const ::std::os::raw::c_char,
3856+
ppUserData: *mut *mut ::std::os::raw::c_void,
3857+
ppTokenizer: *mut *mut fts5_tokenizer_v2,
3858+
) -> ::std::os::raw::c_int,
3859+
>,
37773860
}
37783861
#[repr(C)]
37793862
#[derive(Debug, Copy, Clone)]
@@ -4059,6 +4142,7 @@ pub struct sqlite3_wal {
40594142
pub nCkpt: ::std::os::raw::c_uint,
40604143
pub lockError: ::std::os::raw::c_uchar,
40614144
pub pSnapshot: *mut WalIndexHdr,
4145+
pub bGetSnapshot: ::std::os::raw::c_int,
40624146
pub db: *mut sqlite3,
40634147
}
40644148
#[repr(C)]

0 commit comments

Comments
 (0)