mirror of
https://github.com/isar/rusqlite.git
synced 2024-11-22 16:29:20 +08:00
Merge pull request #619 from KamranMackey/master
Upgraded the bundled SQLite version to 3.31.0.
This commit is contained in:
gwenn
GitHub
commit
055352f07b
@ -81,7 +81,7 @@ unicase = "2.4.0"
|
||||
|
||||
[dependencies.libsqlite3-sys]
|
||||
path = "libsqlite3-sys"
|
||||
version = "0.17"
|
||||
version = "0.18"
|
||||
|
||||
[[test]]
|
||||
name = "config_log"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "libsqlite3-sys"
|
||||
version = "0.17.1"
|
||||
version = "0.18.0"
|
||||
authors = ["John Gallagher <jgallagher@bignerdranch.com>"]
|
||||
edition = "2018"
|
||||
repository = "https://github.com/jgallagher/rusqlite"
|
||||
|
||||
111
libsqlite3-sys/sqlite3/bindgen_bundled_version.rs
vendored
111
libsqlite3-sys/sqlite3/bindgen_bundled_version.rs
vendored
@ -1,10 +1,10 @@
|
||||
/* automatically generated by rust-bindgen */
|
||||
|
||||
pub const __GNUC_VA_LIST: i32 = 1;
|
||||
pub const SQLITE_VERSION: &'static [u8; 7usize] = b"3.30.1\0";
|
||||
pub const SQLITE_VERSION_NUMBER: i32 = 3030001;
|
||||
pub const SQLITE_VERSION: &'static [u8; 7usize] = b"3.31.0\0";
|
||||
pub const SQLITE_VERSION_NUMBER: i32 = 3031000;
|
||||
pub const SQLITE_SOURCE_ID: &'static [u8; 85usize] =
|
||||
b"2019-10-10 20:19:45 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3df1b0b\0";
|
||||
b"2020-01-22 18:38:59 f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824\0";
|
||||
pub const SQLITE_OK: i32 = 0;
|
||||
pub const SQLITE_ERROR: i32 = 1;
|
||||
pub const SQLITE_INTERNAL: i32 = 2;
|
||||
@ -79,6 +79,7 @@ pub const SQLITE_CANTOPEN_ISDIR: i32 = 526;
|
||||
pub const SQLITE_CANTOPEN_FULLPATH: i32 = 782;
|
||||
pub const SQLITE_CANTOPEN_CONVPATH: i32 = 1038;
|
||||
pub const SQLITE_CANTOPEN_DIRTYWAL: i32 = 1294;
|
||||
pub const SQLITE_CANTOPEN_SYMLINK: i32 = 1550;
|
||||
pub const SQLITE_CORRUPT_VTAB: i32 = 267;
|
||||
pub const SQLITE_CORRUPT_SEQUENCE: i32 = 523;
|
||||
pub const SQLITE_READONLY_RECOVERY: i32 = 264;
|
||||
@ -98,11 +99,13 @@ pub const SQLITE_CONSTRAINT_TRIGGER: i32 = 1811;
|
||||
pub const SQLITE_CONSTRAINT_UNIQUE: i32 = 2067;
|
||||
pub const SQLITE_CONSTRAINT_VTAB: i32 = 2323;
|
||||
pub const SQLITE_CONSTRAINT_ROWID: i32 = 2579;
|
||||
pub const SQLITE_CONSTRAINT_PINNED: i32 = 2835;
|
||||
pub const SQLITE_NOTICE_RECOVER_WAL: i32 = 283;
|
||||
pub const SQLITE_NOTICE_RECOVER_ROLLBACK: i32 = 539;
|
||||
pub const SQLITE_WARNING_AUTOINDEX: i32 = 284;
|
||||
pub const SQLITE_AUTH_USER: i32 = 279;
|
||||
pub const SQLITE_OK_LOAD_PERMANENTLY: i32 = 256;
|
||||
pub const SQLITE_OK_SYMLINK: i32 = 512;
|
||||
pub const SQLITE_OPEN_READONLY: i32 = 1;
|
||||
pub const SQLITE_OPEN_READWRITE: i32 = 2;
|
||||
pub const SQLITE_OPEN_CREATE: i32 = 4;
|
||||
@ -123,6 +126,7 @@ pub const SQLITE_OPEN_FULLMUTEX: i32 = 65536;
|
||||
pub const SQLITE_OPEN_SHAREDCACHE: i32 = 131072;
|
||||
pub const SQLITE_OPEN_PRIVATECACHE: i32 = 262144;
|
||||
pub const SQLITE_OPEN_WAL: i32 = 524288;
|
||||
pub const SQLITE_OPEN_NOFOLLOW: i32 = 16777216;
|
||||
pub const SQLITE_IOCAP_ATOMIC: i32 = 1;
|
||||
pub const SQLITE_IOCAP_ATOMIC512: i32 = 2;
|
||||
pub const SQLITE_IOCAP_ATOMIC1K: i32 = 4;
|
||||
@ -181,6 +185,7 @@ pub const SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE: i32 = 33;
|
||||
pub const SQLITE_FCNTL_LOCK_TIMEOUT: i32 = 34;
|
||||
pub const SQLITE_FCNTL_DATA_VERSION: i32 = 35;
|
||||
pub const SQLITE_FCNTL_SIZE_LIMIT: i32 = 36;
|
||||
pub const SQLITE_FCNTL_CKPT_DONE: i32 = 37;
|
||||
pub const SQLITE_GET_LOCKPROXYFILE: i32 = 2;
|
||||
pub const SQLITE_SET_LOCKPROXYFILE: i32 = 3;
|
||||
pub const SQLITE_LAST_ERRNO: i32 = 4;
|
||||
@ -236,7 +241,9 @@ pub const SQLITE_DBCONFIG_LEGACY_ALTER_TABLE: i32 = 1012;
|
||||
pub const SQLITE_DBCONFIG_DQS_DML: i32 = 1013;
|
||||
pub const SQLITE_DBCONFIG_DQS_DDL: i32 = 1014;
|
||||
pub const SQLITE_DBCONFIG_ENABLE_VIEW: i32 = 1015;
|
||||
pub const SQLITE_DBCONFIG_MAX: i32 = 1015;
|
||||
pub const SQLITE_DBCONFIG_LEGACY_FILE_FORMAT: i32 = 1016;
|
||||
pub const SQLITE_DBCONFIG_TRUSTED_SCHEMA: i32 = 1017;
|
||||
pub const SQLITE_DBCONFIG_MAX: i32 = 1017;
|
||||
pub const SQLITE_DENY: i32 = 1;
|
||||
pub const SQLITE_IGNORE: i32 = 2;
|
||||
pub const SQLITE_CREATE_INDEX: i32 = 1;
|
||||
@ -307,6 +314,7 @@ pub const SQLITE_UTF16_ALIGNED: i32 = 8;
|
||||
pub const SQLITE_DETERMINISTIC: i32 = 2048;
|
||||
pub const SQLITE_DIRECTONLY: i32 = 524288;
|
||||
pub const SQLITE_SUBTYPE: i32 = 1048576;
|
||||
pub const SQLITE_INNOCUOUS: i32 = 2097152;
|
||||
pub const SQLITE_WIN32_DATA_DIRECTORY_TYPE: i32 = 1;
|
||||
pub const SQLITE_WIN32_TEMP_DIRECTORY_TYPE: i32 = 2;
|
||||
pub const SQLITE_INDEX_SCAN_UNIQUE: i32 = 1;
|
||||
@ -406,6 +414,8 @@ pub const SQLITE_CHECKPOINT_FULL: i32 = 1;
|
||||
pub const SQLITE_CHECKPOINT_RESTART: i32 = 2;
|
||||
pub const SQLITE_CHECKPOINT_TRUNCATE: i32 = 3;
|
||||
pub const SQLITE_VTAB_CONSTRAINT_SUPPORT: i32 = 1;
|
||||
pub const SQLITE_VTAB_INNOCUOUS: i32 = 2;
|
||||
pub const SQLITE_VTAB_DIRECTONLY: i32 = 3;
|
||||
pub const SQLITE_ROLLBACK: i32 = 1;
|
||||
pub const SQLITE_FAIL: i32 = 3;
|
||||
pub const SQLITE_REPLACE: i32 = 5;
|
||||
@ -1404,7 +1414,7 @@ extern "C" {
|
||||
extern "C" {
|
||||
pub fn sqlite3_vmprintf(
|
||||
arg1: *const ::std::os::raw::c_char,
|
||||
arg2: *mut __va_list_tag,
|
||||
arg2: va_list,
|
||||
) -> *mut ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
@ -1420,7 +1430,7 @@ extern "C" {
|
||||
arg1: ::std::os::raw::c_int,
|
||||
arg2: *mut ::std::os::raw::c_char,
|
||||
arg3: *const ::std::os::raw::c_char,
|
||||
arg4: *mut __va_list_tag,
|
||||
arg4: va_list,
|
||||
) -> *mut ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
@ -1562,6 +1572,27 @@ extern "C" {
|
||||
arg3: sqlite3_int64,
|
||||
) -> sqlite3_int64;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_uri_key(
|
||||
zFilename: *const ::std::os::raw::c_char,
|
||||
N: ::std::os::raw::c_int,
|
||||
) -> *const ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_filename_database(
|
||||
arg1: *const ::std::os::raw::c_char,
|
||||
) -> *const ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_filename_journal(
|
||||
arg1: *const ::std::os::raw::c_char,
|
||||
) -> *const ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_filename_wal(
|
||||
arg1: *const ::std::os::raw::c_char,
|
||||
) -> *const ::std::os::raw::c_char;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_errcode(db: *mut sqlite3) -> ::std::os::raw::c_int;
|
||||
}
|
||||
@ -2427,6 +2458,9 @@ extern "C" {
|
||||
extern "C" {
|
||||
pub fn sqlite3_soft_heap_limit64(N: sqlite3_int64) -> sqlite3_int64;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_hard_heap_limit64(N: sqlite3_int64) -> sqlite3_int64;
|
||||
}
|
||||
extern "C" {
|
||||
pub fn sqlite3_soft_heap_limit(N: ::std::os::raw::c_int);
|
||||
}
|
||||
@ -3587,7 +3621,7 @@ extern "C" {
|
||||
pub fn sqlite3_str_vappendf(
|
||||
arg1: *mut sqlite3_str,
|
||||
zFormat: *const ::std::os::raw::c_char,
|
||||
arg2: *mut __va_list_tag,
|
||||
arg2: va_list,
|
||||
);
|
||||
}
|
||||
extern "C" {
|
||||
@ -5183,65 +5217,4 @@ fn bindgen_test_layout_fts5_api() {
|
||||
)
|
||||
);
|
||||
}
|
||||
pub type __builtin_va_list = [__va_list_tag; 1usize];
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct __va_list_tag {
|
||||
pub gp_offset: ::std::os::raw::c_uint,
|
||||
pub fp_offset: ::std::os::raw::c_uint,
|
||||
pub overflow_arg_area: *mut ::std::os::raw::c_void,
|
||||
pub reg_save_area: *mut ::std::os::raw::c_void,
|
||||
}
|
||||
#[test]
|
||||
fn bindgen_test_layout___va_list_tag() {
|
||||
assert_eq!(
|
||||
::std::mem::size_of::<__va_list_tag>(),
|
||||
24usize,
|
||||
concat!("Size of: ", stringify!(__va_list_tag))
|
||||
);
|
||||
assert_eq!(
|
||||
::std::mem::align_of::<__va_list_tag>(),
|
||||
8usize,
|
||||
concat!("Alignment of ", stringify!(__va_list_tag))
|
||||
);
|
||||
assert_eq!(
|
||||
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).gp_offset as *const _ as usize },
|
||||
0usize,
|
||||
concat!(
|
||||
"Offset of field: ",
|
||||
stringify!(__va_list_tag),
|
||||
"::",
|
||||
stringify!(gp_offset)
|
||||
)
|
||||
);
|
||||
assert_eq!(
|
||||
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).fp_offset as *const _ as usize },
|
||||
4usize,
|
||||
concat!(
|
||||
"Offset of field: ",
|
||||
stringify!(__va_list_tag),
|
||||
"::",
|
||||
stringify!(fp_offset)
|
||||
)
|
||||
);
|
||||
assert_eq!(
|
||||
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).overflow_arg_area as *const _ as usize },
|
||||
8usize,
|
||||
concat!(
|
||||
"Offset of field: ",
|
||||
stringify!(__va_list_tag),
|
||||
"::",
|
||||
stringify!(overflow_arg_area)
|
||||
)
|
||||
);
|
||||
assert_eq!(
|
||||
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).reg_save_area as *const _ as usize },
|
||||
16usize,
|
||||
concat!(
|
||||
"Offset of field: ",
|
||||
stringify!(__va_list_tag),
|
||||
"::",
|
||||
stringify!(reg_save_area)
|
||||
)
|
||||
);
|
||||
}
|
||||
pub type __builtin_va_list = *mut ::std::os::raw::c_char;
|
||||
|
||||
13903
libsqlite3-sys/sqlite3/sqlite3.c
vendored
13903
libsqlite3-sys/sqlite3/sqlite3.c
vendored
File diff suppressed because it is too large
Load Diff
541
libsqlite3-sys/sqlite3/sqlite3.h
vendored
541
libsqlite3-sys/sqlite3/sqlite3.h
vendored
File diff suppressed because it is too large
Load Diff
12
libsqlite3-sys/sqlite3/sqlite3ext.h
vendored
12
libsqlite3-sys/sqlite3/sqlite3ext.h
vendored
@ -324,6 +324,12 @@ struct sqlite3_api_routines {
|
||||
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*);
|
||||
};
|
||||
|
||||
/*
|
||||
@ -618,6 +624,12 @@ typedef int (*sqlite3_loadext_entry)(
|
||||
#define sqlite3_value_frombind sqlite3_api->frombind
|
||||
/* Version 3.30.0 and later */
|
||||
#define sqlite3_drop_modules sqlite3_api->drop_modules
|
||||
/* Version 3.31.0 andn 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
|
||||
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||
|
||||
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||
|
||||
@ -4,8 +4,8 @@ cd $SCRIPT_DIR
|
||||
export SQLITE3_LIB_DIR=$SCRIPT_DIR/sqlite3
|
||||
|
||||
# Download and extract amalgamation
|
||||
SQLITE=sqlite-amalgamation-3300100
|
||||
curl -O https://sqlite.org/2019/$SQLITE.zip
|
||||
SQLITE=sqlite-amalgamation-3310000
|
||||
curl -O https://sqlite.org/2020/$SQLITE.zip
|
||||
unzip -p $SQLITE.zip $SQLITE/sqlite3.c > $SQLITE3_LIB_DIR/sqlite3.c
|
||||
unzip -p $SQLITE.zip $SQLITE/sqlite3.h > $SQLITE3_LIB_DIR/sqlite3.h
|
||||
unzip -p $SQLITE.zip $SQLITE/sqlite3ext.h > $SQLITE3_LIB_DIR/sqlite3ext.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user