Commit Graph

134 Commits

Author SHA1 Message Date
gwenn
9bdc18d4c0 Fix typo 2018-03-24 03:48:09 +01:00
gwenn
87d97b143e Fix upgrade script
Avoid cleaning the whole target dir
2018-02-10 11:11:51 +01:00
gwenn
08cda05406 Update to latest version of SQLite3 3.22.0 #326
Upgrade to bindgen 0.32
Add a shell script to upgrade bundled SQLite version
Upgrade bundle SQLite to 3.22.0
Upgrade libsqlite3-sys version to 0.9.2
2018-02-10 11:04:02 +01:00
gwenn
3aaab1e36f Merge remote-tracking branch 'remotes/jgallagher/master' into vtab 2018-01-20 12:29:07 +01:00
John Gallagher
402d5340d5 Patch release of libsqlite3-sys to remove crates.io keyword 2017-12-05 18:05:51 -05:00
Sean Griffin
b553a214c8 Remove the database keyword/category from libsqlite3-sys
Currently `libsqlite3-sys` is the first result for both the "database"
keyword, and the "Database interfaces" category. This makes sense, as it
is a dependency of both Diesel and rusqlite. However, this library is
not intended to be used directly. While it can technically be called a
database interface, FFI is clearly the category that applies more than
anything else. Someone browsing this keyword or category is likely
looking for a Rust library they can use, not a C one.
2017-12-03 14:22:01 -07:00
John Gallagher
a3bec58c96 Bump to v0.13.0. 2017-11-13 15:55:48 -07:00
John Gallagher
00e90eaafe
Merge pull request #308 from jgallagher/lvillani-sqlcipher
Add support for linking to SQLCipher
2017-11-13 15:47:11 -07:00
John Gallagher
cbdbacddd8 Merge branch 'sqlcipher' of https://github.com/lvillani/rusqlite into lvillani-sqlcipher 2017-11-13 13:29:24 -07:00
John Gallagher
dc6268d4c9 Merge branch 'update-bindgen-dep' of https://github.com/fitzgen/rusqlite into fitzgen-update-bindgen-dep 2017-11-13 13:26:50 -07:00
Nick Fitzgerald
ea7207b83d Update bindgen dependency to the latest version
This also required adjusting the fixup inserting `SQLITE_DETERMINISTIC` into the
bindings if it was missing. Now that `bindgen` uses the `quote` crate for code
generation, instead of `syntex`, we can't rely on the output being formatted (it
only is formatted if there is a usable `rustfmt` on the `$PATH`). Even better
than this `contains` tweak would be switching to regexps or something.

Despite that formatting hiccup, newer `bindgen` releases are more reliable due
to many bug fixes, and also build in approximately half the time that older
`bindgen` versions do.
2017-11-11 17:09:19 -08:00
Lorenzo Villani
8cbfc00ec6 Add support for linking to SQLCipher 2017-10-24 19:52:19 +02:00
Ossi Herrala
28d58529b7 Update dependencies
* Gcc crate has been renamed to cc.
* Chrono::UTC has been renamed to Chrono::Utc.
* bitflags 1.0 uses associated constants. So prefix OpenFlags.
2017-10-09 23:25:40 +03:00
gwenn
c842e789bd Merge remote-tracking branch 'jgallagher/master' into vtab 2017-09-11 19:45:22 +02:00
John Gallagher
d5bd7d9601 Bump libsqlite3-sys to 0.8.1.
This minor version includes some internal rearranging of constants that
should not affect the public interface, and additions to the build
system that allow the use of vcpkg on Windows.
2017-05-29 16:56:47 -04:00
John Gallagher
6b360a11c2 Merge pull request #258 from gwenn/constants
Constants
2017-05-29 10:37:26 -04:00
John Gallagher
b1927b31bf Merge pull request #278 from mcgoo/vcpkg
for msvc abi builds, add support for using sqlite from a vcpkg installation if available
2017-05-29 10:23:08 -04:00
John Gallagher
b7ce75b463 Merge pull request #264 from gwenn/outdated
Upgrade outdated dependencies
2017-05-29 10:11:09 -04:00
Jim McGrath
b3faed0f75 only depend on vcpkg for cfg(target_env = "msvc") 2017-05-28 06:15:47 -05:00
Jim McGrath
0dd10f85ba for msvc abi builds, add support for using sqlite from a vcpkg installation if available 2017-05-27 22:35:46 -05:00
gwenn
e8bc9fcc21 TypeChooser has been renamed to ParseCallbacks 2017-04-27 18:42:10 +02:00
gwenn
6371c0c6ec Fix bindgen 3.7.7 2017-04-21 21:38:29 +02:00
gwenn
1d684ae653 Merge remote-tracking branch 'jgallagher/master' into vtab 2017-04-21 20:01:04 +02:00
gwenn
30bba4618b Upgrade outdated dependencies
serde 0.9 -> 1.0
bitflags 0.7 -> 0.8
bindgen 0.21 -> 0.23
2017-04-21 19:47:47 +02:00
gwenn
fba280ff64 Some limits are not available in 3.6.8 2017-04-20 20:33:18 +02:00
Steven Fackler
d4177c5217 Set HAVE_USLEEP
SQLite otherwise has to sleep for a second at a time when waiting for a
lock (!)
2017-04-18 12:37:04 +02:00
gwenn
4e5b64fbca Use constants generated by bindgen where possible 2017-04-07 19:36:31 +02:00
John Gallagher
5a5d28ec69 Add bindgen bindings for SQLite 3.7.16 to libsqlite3-sys.
Bump to version 0.10.3 to use libsqlite3-sys 0.8.0.
2017-04-06 13:42:01 -04:00
John Gallagher
a13df1e3cd Avoid publicly exporting constants from libsqlite3-sys multiple times. 2017-04-05 13:05:28 -04:00
gwenn
c40b395410 Min SQLite version for vtab is 3.7.7 2017-03-09 19:24:02 +01:00
gwenn
7f0082e44e Merge remote-tracking branch 'jgallagher/master' into vtab 2017-03-08 20:35:07 +01:00
John Gallagher
f0dfab0349 Only check for and require SQLITE3_INCLUDE_DIR if we're running bindgen at buildtime. 2017-03-03 15:37:45 -05:00
John Gallagher
06383c65cb Update build process to use prebuilt bindings.
Adds buildtime_bindgen feature to run bindgen dynamically.
2017-03-03 15:37:45 -05:00
John Gallagher
9510e25ef3 Add prebuilt bindings for all relevant SQLite versions. 2017-03-03 15:37:45 -05:00
John Gallagher
0a35f4bb1e Version bumps to use new bundled SQLite. 2017-03-03 13:07:27 -05:00
John Gallagher
62eef1c8a0 Update bundled SQLite source to 3.17.0 2017-03-03 13:07:15 -05:00
gwenn
aedb681f54 Add categories and keywords to libsqlite3-sys 2017-02-23 21:07:10 +01:00
Sean Griffin
2c58b3f804 Remove the dependency on libc
Recent versions of bindgen use `std::os::raw` over `libc`, but currently
`libsqlite3-sys` is overriding that. `std::os::raw` is a subset of
`libc` that exports only the relevant type definitions, but not any
functions which require additional linking. This enables
`libsqlite3-sys` to be more easily used on targets that may not have a
libc available (presumably sqlite itself would have been compiled with
musl in that case)
2017-02-16 11:17:24 -05:00
John Gallagher
5dbfa2850e Manually insert SQLITE_DETERMINISTIC flag in bindgen output if needed.
See comment in libsqlite3-sys/build.rs for details - adding this flag is
harmless if it's not present in the header, and not having it can break
builds against older SQLite versions.
2017-02-08 21:41:34 -05:00
John Gallagher
161ac2bf0a Update libsqlite3-sys to run bindgen at build time 2017-02-08 20:40:30 -05:00
John Gallagher
509257dfa8 Merge branch 'limits' of https://github.com/gwenn/rusqlite into gwenn-limits 2017-02-07 19:41:30 -05:00
gwenn
307431911c Exporting libsqlite3_sys::error::ErrorCode (#218) 2017-02-04 11:33:23 +01:00
gwenn
359ec914d2 Expose limits (#220) 2017-02-04 11:01:38 +01:00
John Gallagher
36c5ed2ceb Upgrade dependencies.
In libsqlite3-sys, skip printing system libraries. See
https://github.com/sfackler/rust-openssl/issues/554#issuecomment-274878088.
2017-01-25 18:01:03 -05:00
John Gallagher
9d50a456c4 Bump libsqlite3-sys to 0.6.1 2017-01-23 20:18:08 -05:00
John Gallagher
f130f62b1a Don't ask to link to /usr/lib directly if pkg-config fails to find SQLite. 2017-01-23 20:17:14 -05:00
John Gallagher
51f6a24d60 Set build flags for bundled libsqlite.
Build flags from @chamakits; see https://github.com/jgallagher/rusqlite/pull/176.
2016-12-31 01:02:29 -05:00
Omar Ferrer
4b0d0f0d89 Deleted unneeded shell.c 2016-10-08 01:59:42 -04:00
Omar Ferrer
70203f9ed6 Changing binding from std::os::raw back to libc 2016-10-08 01:39:57 -04:00
Omar Ferrer
b2da510b04 Reran bindgens to match the bundled sqlite.
Added manually to the bindgens a type entry for 'Struct_sqlite3' pointing to sqlite3 to prevent changing multiple files.

Reran bindgens as:
bindgen --builtins --link=sqlite3 --output=./libsqlite3-sys/src/bindgen.rs ./libsqlite3-sys/sqlite3/sqlite3.h
2016-10-08 01:12:30 -04:00
Chip Collier
dde6e9ee3a Added feature to build a static sqlite from the bundled amalgamation. 2016-06-15 16:34:13 +02:00
Chip Collier
a9421e2047 adding sqlite v3.13.0 amalgamation 2016-06-15 16:33:37 +02:00
John Gallagher
9379002076 Bump to version 0.7.0.
Also bumps libsqlite3-sys to 0.5.0.
2016-05-19 20:26:18 -05:00
Xidorn Quan
d9fffaf797 Remove load_extension feature from the binding 2016-02-13 10:51:24 +08:00
gwenn
2d0175b7dd Fix warning with Rust 1.6
warning: lint raw_pointer_derive has been removed: using derive with raw
pointers is ok
2016-02-01 18:41:52 +01:00
John Gallagher
38cf8d597b Bump to rusqlite 0.6.0 and libsqlite3-sys 0.4.0. 2015-12-17 00:17:44 -05:00
John Gallagher
aac4d59fcc Change Error from a struct to an enum (BREAKING CHANGE).
This allows us to separate out the underlying SQLite error codes from
errors that occur on the Rust side.
2015-12-16 20:30:27 -05:00
John Gallagher
b385ae002b Add ErrorCode enum and Error struct to libsqlite3-sys. 2015-12-16 20:30:27 -05:00
John Gallagher
1f26093fc6 Move error codes into module (internal change only - public API stays the same). 2015-12-16 20:30:27 -05:00
John Gallagher
17e54eb6f6 Add extended result codes to libsqlite3-sys 2015-12-16 20:30:27 -05:00
John Gallagher
e94a5b8411 Add bindgen / sqlite version note to libsqlite3-sys 2015-12-13 08:30:42 -05:00
Gwenael Treguier
6e208fa655 Update bindings with bindgen 0.15.0/sqlite3 3.8.10 2015-12-13 08:30:33 -05:00
John Gallagher
9f5f4ac385 Merge branch 'functions' of https://github.com/gwenn/rusqlite into gwenn-functions
Conflicts:
	Cargo.toml
	src/lib.rs
2015-12-11 11:31:25 -05:00
John Gallagher
e71104e6c3 Bump version to 0.5.0 2015-12-08 21:30:44 -05:00
John Gallagher
e0b3ad7c9b Merge remote-tracking branch 'origin/master' into flexible-build-script 2015-12-07 11:15:21 -05:00
Gwenael Treguier
fe6afe2a94 Merge branch 'master' of https://github.com/jgallagher/rusqlite into functions 2015-12-06 21:33:21 +01:00
John Gallagher
7fbe1172e2 Make libsqlite3-sys's build script slightly more intelligent.
* If SQLITE3_LIB_DIR is present in the environment, we use that.
* If SQLITE3_LIB_DIR is not present, we try to use pkg-config.
* If SQLITE3_LIB_DIR is not present and pkg-config fails, we fall back
  to /usr/lib (if it exists).
2015-12-01 11:36:31 -05:00
John Gallagher
49cb1efe62 Merge branch 'master' into gwenn-trace_extension 2015-12-01 11:13:23 -05:00
Michał Krasnoborski
8e31a64dde Update Cargo.tomls to libc ~0.2 2015-12-01 06:18:44 +00:00
Gwenael Treguier
0a454eed79 Add support to user defined scalar functions 2015-08-09 09:52:53 +02:00
gwenn
4a7e83f0af Feature sqlite3_{log,trace,profile}. 2015-08-01 17:21:41 +02:00
John Gallagher
e8967388e6 Update Changelog for 0.2.0 2015-07-26 14:00:51 -04:00
John Gallagher
4d1063348e Use sqlite3_destructor_type from bindgen'd header 2015-07-26 13:43:43 -04:00
gwenn
b6dda11c3a Fix generated binding
for example sqlite3_exec callback signature is wrong
2015-07-04 20:46:39 +02:00
John Gallagher
84fc82f48c Add remaining datatype constaints to libsqlite3-sys 2015-05-04 21:44:05 -04:00
John Gallagher
5e04b98840 Updates to track rustc nightly 2015-04-03 08:32:11 -05:00
John Gallagher
4b085b9103 Bump version and use libc from crates.io 2015-03-28 23:09:21 -04:00
John Gallagher
134f34362a Use new hyphen-less extern crate name 2015-03-26 15:47:51 -04:00
Marcus Klaas
f30ceffa6c bump version 2015-03-12 21:33:29 +01:00
Marcus Klaas
59f0128bf1 upgrade pkg-config 2015-03-12 21:32:40 +01:00
John Gallagher
9db251e25b Correct Cargo.toml for publishing 2015-02-23 21:54:46 -05:00
John Gallagher
ee89f8db59 Fix warnings from latest rustc 2015-02-23 20:37:55 -05:00
John Gallagher
1097842a85 Put sqlite3 extension functions behind a feature 2015-02-23 20:37:55 -05:00
John Gallagher
03f368c4f4 Build raw sqlite interface as libsqlite3-sys
Use pkg-config to find it.
2015-02-23 20:37:55 -05:00