Commit Graph

1636 Commits

Author SHA1 Message Date
gwenn
59a44cfae5 Merge remote-tracking branch 'jgallagher/master' into fallible-iterator 2019-03-10 11:12:14 +01:00
gwenn
ec0cc432fa
Merge pull request #491 from thomcc/url-support
Add optional support for rust-url
2019-03-10 08:58:59 +01:00
Thom Chiovoloni
5ba6909921 Add optional support for rust-url 2019-03-09 19:16:37 -08:00
gwenn
d94acdc3f4
Merge pull request #476 from gwenn/pragma
Ease PRAGMA usage (#273 and #265)
2019-02-27 18:03:35 +01:00
gwenn
ec80e460b6
Merge pull request #487 from thomcc/avoid-unnecessary-copies
Avoid unnecessary copies/allocations when passing strings to sqlite
2019-02-27 17:40:59 +01:00
Thom Chiovoloni
04f900059d Avoid unnecessary copies/allocations when passing strings to sqlite 2019-02-26 19:47:17 -08:00
gwenn
32881d7a76 Unify callback parameter signature 2019-02-21 21:14:55 +01:00
gwenn
7be87e950d Merge remote-tracking branch 'jgallagher/master' into pragma 2019-02-21 21:07:18 +01:00
gwenn
a0bd73221d
Merge pull request #485 from gwenn/fix-query-row
Do not panic by default
2019-02-21 21:05:02 +01:00
gwenn
6d9ae896b5 Do not panic by default
Replace `Row::get` by `Row::get_checked`,
And rename original `Row::get` to `Row::get_unwrap`.
`Stmt::query_map`, `Stmt::query_map_named`, `Stmt::query_row`,
`Conn::query_row` and `Conn::query_row_named` callback parameter must return a `Result`.
2019-02-21 20:48:09 +01:00
gwenn
fcaf5b9dd8 Fix typos 2019-02-21 18:55:51 +01:00
technic93
6e8276d1d0
Clarify instruction for building with vcpkg
Mention VCPKGRS_DYNAMIC environment variable.
2019-02-17 12:03:19 +01:00
gwenn
1775688ac2
Merge branch 'master' into pragma 2019-02-16 18:52:03 +01:00
gwenn
915c10c5bf
Merge pull request #482 from gwenn/changes
Revert change related to #460
2019-02-16 18:43:45 +01:00
gwenn
aa2179d306 Try to fix AppVeyor build 2019-02-16 17:51:21 +01:00
gwenn
c1f12c7380 Revert change related to #460 2019-02-16 17:24:56 +01:00
gwenn
37027a6087 Try to fix AppVeyor build 2019-02-16 11:06:21 +01:00
gwenn
b6470f371f Try to fix AppVeyor build 2019-02-16 10:07:55 +01:00
gwenn
1d1ee97ab9 Try to fix AppVeyor build 2019-02-14 20:53:26 +01:00
gwenn
364e885b89 Fix warning 2019-02-14 20:53:00 +01:00
gwenn
6ce5c9ddcc Suggest users to use PRAGMA function instead 2019-02-14 20:24:16 +01:00
gwenn
333cc49523
Merge pull request #481 from gwenn/rm-unwrap
Remove unwrap from examples
2019-02-10 09:05:35 +01:00
gwenn
a8b9142d47 Fix Blob example 2019-02-09 08:54:53 +01:00
gwenn
d70286e98a Remove unwrap from examples 2019-02-09 07:16:05 +01:00
gwenn
3799509ee0
Merge pull request #480 from gwenn/fix-warning
Fix nightly warning
2019-02-09 07:06:39 +01:00
gwenn
2c1483f2e7 Merge remote-tracking branch 'jgallagher/master' into fallible-iterator 2019-02-09 06:47:57 +01:00
gwenn
1b3a917ac8 Fix nightly warning 2019-02-09 06:42:33 +01:00
gwenn
8abaf6eefe Fix rustdoc examples 2019-02-09 06:38:24 +01:00
gwenn
7c5bfb7cc3
Merge pull request #475 from gwenn/db-config
Support for sqlite3_db_config #468
2019-02-08 21:38:01 +01:00
gwenn
82a78cc8cf
Merge pull request #479 from wilada/fix-libsqlite3-sys-link-dependencies
Use pkg-config to generate sqlite link dependencies
2019-02-05 19:06:29 +01:00
Will Davis
9f009fe1e0 Use pkg-config to generate sqlite link dependencies
When built as a static library, sqlite (or sqlcipher) doesn't carry
additional link dependencies with it, and the libsqlite3-sys rlib
doesn't pick them up either. A dependent crate attempting to link
against rusqlite then has to specify these additional link commands,
and even then they need to be specified before the libsqlite3-sys
rlib is specified on the command line.

Fix this by attempting to use pkg-config when the
(SQLITE3|SQLCIPHER)_LIB_DIR is specified, since these builds produce
the pkg-config link dependency information, and the pkg_config crate
can automatically generate the correct link commands using that.

(Additionally, since (SQLITE3|SQLCIPHER)_STATIC is already defined,
or not, the --static flag will be correctly configured for pkg_config)
2019-02-04 22:53:57 -06:00
gwenn
d93dec52c0 Make Rows implement FallibleStreamingIterator 2019-02-03 14:01:42 +01:00
gwenn
df493bb217
Merge pull request #477 from gwenn/lifetime-elision
Lifetime elision in impl
2019-02-03 11:26:31 +01:00
gwenn
e9896a7734 Lifetime elision in impl 2019-02-03 11:02:38 +01:00
gwenn
9c00dd01a2 Draft to ease PRAGMA usage (#273 and #265) 2019-02-03 09:17:37 +01:00
gwenn
519ef9dc84 Fix rustdoc warnings 2019-02-02 15:18:11 +01:00
gwenn
176e4c232b Support for sqlite3_db_config #468 2019-02-02 15:17:20 +01:00
gwenn
e8e76852bd Merge remote-tracking branch 'jgallagher/master' into tail 2019-02-02 13:22:40 +01:00
gwenn
2f965fec5a
Merge pull request #474 from gwenn/move-inner
Move InnerConnection in its own module
2019-02-02 13:10:19 +01:00
gwenn
c2614b54df Move InnerConnection in its own module 2019-02-02 12:46:52 +01:00
gwenn
08e51e69cf
Merge pull request #473 from gwenn/misc
Misc
2019-02-02 12:44:50 +01:00
gwenn
8862b17340 Fix clippy warnings 2019-02-02 11:37:26 +01:00
gwenn
f695f185c2 Fix/suppress warning 'deprecated' 2019-02-02 11:10:58 +01:00
gwenn
20fed1956e Rename some static variables 2019-02-02 11:10:08 +01:00
gwenn
be98290bbd Replace assert! by assert_eq! 2019-02-02 11:09:00 +01:00
gwenn
4c4578851b Remove needless lifetimes 2019-02-02 11:08:04 +01:00
gwenn
62d5ffe678 Fix some enum representation 2019-02-02 11:04:46 +01:00
gwenn
f9099ba02b Add workspace declaration 2019-02-02 11:00:12 +01:00
gwenn
28d57b81f3
Merge pull request #472 from gwenn/clean-examples
Clean examples
2019-01-30 20:37:34 +01:00
gwenn
0a46a34e3d Clean examples
Remove `extern crate` usages.
Rustfmt.
2019-01-30 20:14:46 +01:00