Commit Graph

509 Commits

Author SHA1 Message Date
gwenn
6cbeb6ef59 Introduce context module
To make `set_result` and `report_error` in functions module
visible to vtab module.
2018-05-13 11:44:31 +02:00
gwenn
6855b5052d
Ensure connection can be safely returned to a pool (#353)
* Add binding to sqlite3_get_autocommit.
* Add binding to sqlite3_stmt_busy.
* Disable test_is_busy by default
2018-05-12 18:35:08 +02:00
gwenn
1e3dc542a4 Merge remote-tracking branch 'jgallagher/master' into vtab 2018-05-06 08:00:12 +02:00
gwenn
88f2f3e4bd
Merge pull request #350 from jgallagher/clippy
Fix clippy warnings
2018-05-04 20:44:34 +02:00
gwenn
994d40da26 Fix clippy warnings 2018-05-04 19:55:55 +02:00
gwenn
fee4bfcc86 Merge remote-tracking branch 'jgallagher/master' into unlock-notify 2018-05-04 18:06:41 +02:00
gwenn
30e23cf0a0 Fix features dependencies 2018-04-30 22:09:41 +02:00
gwenn
9c5c9e3c7e Merge remote-tracking branch 'jgallagher/master' into vtab 2018-04-30 22:02:14 +02:00
gwenn
83775ee62d Remove second field from RawStatement
Use sqlite3_db_handle instead
2018-04-03 20:18:51 +02:00
gwenn
a0151f9073 Introduce is_locked 2018-03-31 10:22:19 +02:00
gwenn
cccdf9735f Factorize check on code returned by prepare/step. 2018-03-27 21:49:09 +02:00
gwenn
83c8db2d21 Fix Connection::open documentation (#332) 2018-03-24 10:58:42 +01:00
gwenn
c612a44207 Fix errors relative to OpenFlags
Also handle extended error codes.
2018-03-24 10:15:10 +01:00
gwenn
455e7d4060 WIP: Unlock Notification
To do: unlock_notify_cb
2018-03-24 08:06:30 +01:00
gwenn
5d91fb088f Unlock notification 2018-03-24 08:03:21 +01:00
gwenn
d2a71a1352 Improve error message when we can't open a database
Ensure the error message contains the database path
2018-03-10 19:17:22 +01:00
gwenn
3aaab1e36f Merge remote-tracking branch 'remotes/jgallagher/master' into vtab 2018-01-20 12:29:07 +01:00
gwenn
96103b0662 Merge remote-tracking branch 'jgallagher/master' into hooks 2018-01-20 10:08:40 +01:00
John Gallagher
ccf9e6fe6c Merge branch 'master' of https://github.com/twistedfall/rusqlite into twistedfall-master 2017-11-13 08:30:29 -07:00
John Gallagher
217e12fcee
Merge pull request #304 from jgallagher/gwenn-clippy
Fix some clippy warnings
2017-11-13 08:23:52 -07:00
John Gallagher
498faac4db Merge branch 'clippy' of https://github.com/gwenn/rusqlite into gwenn-clippy 2017-11-12 16:27:42 -07:00
John Gallagher
d000aa52d7 Merge branch 'flush_prepared_cached' of https://github.com/edelangh/rusqlite into edelangh-flush_prepared_cached 2017-11-12 16:23:59 -07:00
John Gallagher
4852d826c8 Merge branch 'update-deps' of https://github.com/oherrala/rusqlite into oherrala-update-deps 2017-11-12 15:07:31 -07: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
Pro
c08ee8be82 Export RowIndex trait to allow external code to be generic over what can index be 2017-09-20 15:34:06 +02:00
gwenn
c842e789bd Merge remote-tracking branch 'jgallagher/master' into vtab 2017-09-11 19:45:22 +02:00
edelangh
ab643c90ce review panic in InnerConnection.drop 2017-09-06 16:50:21 +02:00
gwenn
148dc0baf0 Fix more clippy warnings 2017-08-18 21:26:44 +02:00
edelangh
0d1907887e add cfg for test 2017-07-20 16:40:24 +02:00
gwenn
f7c1a8e7b8 Fix some clippy warnings 2017-07-19 21:26:39 +02:00
edelangh
bdd4f9a1a9 Added drop for Connection to prevent fd leak
Added call to flush_prepared_statement_cache
otherwise InnerConnection receives DatabaseBusy on sqlite3_close
2017-07-19 12:22:31 +02:00
king6cong
13a32e4004 code indent 2017-06-02 17:19:39 +08:00
John Gallagher
4623064f4d Update to bitflags 0.9. 2017-05-29 10:52:19 -04:00
gwenn
dfdd42fd09 Bind sqlite3_commit_hook and sqlite3_rollback_hook 2017-05-12 19:14:34 +02:00
gwenn
3e6fffaf94 Due to rust monophormisation, there is no need for double indirection 2017-04-27 18:05:12 +02:00
gwenn
63a444a95f Fix memory leak and add test 2017-04-26 20:12:48 +02:00
gwenn
3b575c3b4a Implementation of sqlite3_update_hook #260
First draft (no tested and a memory leak)
2017-04-25 20:58:22 +02:00
gwenn
1d684ae653 Merge remote-tracking branch 'jgallagher/master' into vtab 2017-04-21 20:01:04 +02:00
gwenn
9ea48db46f Some open flags are not available in 3.6.8 2017-04-20 20:59:07 +02:00
gwenn
08f96a678e Rustfmt 2017-04-07 19:43:24 +02:00
gwenn
4e5b64fbca Use constants generated by bindgen where possible 2017-04-07 19:36:31 +02:00
John Gallagher
401d1f81e1 Merge pull request #255 from jgallagher/fix-duplicated-constants
Avoid publicly exporting constants from libsqlite3-sys multiple times.
2017-04-05 14:31:31 -04:00
John Gallagher
549373f764 Fix incorrect ffi constant accesses. 2017-04-05 13:58:33 -04:00
John Gallagher
4b2a6d2207 Fix unused macro warning when compiling tests without trace feature. 2017-04-05 12:54:58 -04:00
gwenn
3889c8d3e0 Merge remote-tracking branch 'jgallagher/master' into vtab 2017-03-09 19:24:43 +01:00
John Gallagher
ec78a2b5fa Reorganize: Extract Row/Rows and helper types into their own mod files. 2017-03-08 17:03:31 -05:00
gwenn
7f0082e44e Merge remote-tracking branch 'jgallagher/master' into vtab 2017-03-08 20:35:07 +01:00
John Gallagher
6bd8516511 Roll convenient.rs into statement.rs. 2017-03-08 11:26:25 -05:00
John Gallagher
5bd7cb37c7 Move named_params.rs into statement.rs, greatly reducing the StatementCrateImpl trait size. 2017-03-08 11:20:43 -05:00
John Gallagher
723fc91a09 Minor refactor to avoid needing to expose Statement::decode_result(). 2017-03-08 11:04:22 -05:00
John Gallagher
38c9a4a159 Reorganize: Extract Statement and its impl into its own module. 2017-03-08 10:48:14 -05:00
gwenn
faa94d1246 Fix clippy warnings
And fix bench.
2017-02-24 20:10:51 +01:00
John Gallagher
39d71810ce Merge branch 'master' into semver-check 2017-02-23 15:36:54 -05: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
Dominik Miedziński
1b1573c5b2 Fix URL Markdown syntax in Connection docs 2017-02-11 10:50:13 +01:00
John Gallagher
56eee2c13c Perform a runtime check that the SQLite version isn't older than the one we found at build time. 2017-02-09 20:56:51 -05:00
John Gallagher
358cca1638 Clarify support of older SQLite versions. 2017-02-09 20:23:17 -05:00
John Gallagher
4216671fe6 Update for new bindgen output. 2017-02-08 20:40:30 -05:00
John Gallagher
e2d2a689f8 Minor cleanup from rustfmt pass 2017-02-08 19:38:50 -05:00
gwenn
80f822db28 rustfmt v0.7.1 2017-02-08 21:11:15 +01:00
John Gallagher
509257dfa8 Merge branch 'limits' of https://github.com/gwenn/rusqlite into gwenn-limits 2017-02-07 19:41:30 -05:00
John Gallagher
eb099952ac Expose version(), version_number(), and source_id() functions. 2017-02-06 20:23:16 -05:00
John Gallagher
98da52ce8f Merge branch 'err-code' of https://github.com/gwenn/rusqlite into gwenn-err-code 2017-02-06 19:53:31 -05:00
John Gallagher
60e1f3c02f Add more explicit types in unit tests. 2017-02-05 17:30:53 -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
06583aadf2 fix clippy warnings 2017-01-23 19:46:49 -05:00
John Gallagher
68ae7de1d5 Update docs on Row::get 2017-01-22 19:42:51 -05:00
John Gallagher
1974ee573c Add range checks for i32's FromSql impl. 2017-01-22 19:26:19 -05:00
gwenn
8b9437ff35 Merge remote-tracking branch 'jgallagher/master' into vtab 2017-01-13 21:43:10 +01:00
John Gallagher
b49e1d1a1c Merge pull request #205 from jgallagher/fix-retry-close-failure
Fix close() returning a useful connection on failure.
2017-01-07 12:25:47 -05:00
John Gallagher
6709207453 Fix close() returning a useful connection on failure. 2017-01-06 14:32:27 -05:00
John Gallagher
f30edaf563 Silence another deprecation reexport warning. 2017-01-06 14:25:55 -05:00
gwenn
685694255b Merge remote-tracking branch 'jgallagher/master' into vtab 2017-01-06 18:34:54 +01:00
John Gallagher
0b5d8339e1 Silence warnings about deprecations when exporting deprecated types. 2017-01-06 01:23:51 -05:00
John Gallagher
3af91b36bf Make Connection::close() return the connection on failure. 2017-01-03 20:00:29 -05:00
gwenn
46df930881 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-12-31 09:15:26 +01:00
John Gallagher
4c8b0ab6dd Merge pull request #181 from gwenn/clippy
Fix clippy warnings
2016-12-31 01:23:40 -05:00
John Gallagher
4181441d63 Merge branch 'master' into gwenn-invalid-column-type 2016-12-31 00:35:47 -05:00
gwenn
bc71c58387 Add Statement.query_row convenient method (#179) 2016-12-31 00:03:55 -05:00
John Gallagher
08d88177e7 Merge branch 'flush-cache' of https://github.com/gwenn/rusqlite into gwenn-flush-cache 2016-12-30 23:55:19 -05:00
John Gallagher
3815b6beef Merge branch 'query_row' of https://github.com/pfernie/rusqlite into pfernie-query_row 2016-12-30 23:42:38 -05:00
John Gallagher
d1ad61dc41 Merge pull request #178 from gwenn/varparam-usage
Fix issue #177
2016-12-30 23:38:50 -05:00
John Gallagher
4f5abc705a Remove workaround for issue fixed in Rust 1.9. 2016-12-30 23:25:21 -05:00
John Gallagher
0d685af2d5 Merge branch 'master' into safe-tosql 2016-12-30 23:18:32 -05:00
gwenn
ffe605150a Ensure cache is flushed when closing the connection
Fix #186
2016-11-04 20:47:28 +01:00
Patrick Fernie
ece7c041e8 change query_row* fns to take Row by reference instead of moving 2016-10-07 12:42:27 -04:00
gwenn
8f28ff17b8 Fix rustdoc warnings 2016-08-15 12:41:15 +02:00
gwenn
8f079819f7 Change VTabCursor::filter signature 2016-08-13 13:55:30 +02:00
gwenn
b10c52f32f Fix clippy warnings 2016-08-08 15:23:55 +02:00
gwenn
3f55a4583c Merge remote-tracking branch 'jgallagher/master' into vtab 2016-07-02 11:51:42 +02:00
gwenn
038ef2de42 Revert all InvalidColumnType stuff 2016-07-02 11:50:39 +02:00
gwenn
3eb3b22ad5 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-07-02 11:28:59 +02:00
gwenn
a7d27098b7 Fix issue #177 2016-07-02 10:22:47 +02:00
gwenn
9f05147660 Fix issue jgallagher/rusqlite#174 2016-06-13 20:32:39 +02:00
gwenn
e2cf171192 Introduce FromSqlError as specified by John Gallagher 2016-06-02 21:03:25 +02:00
gwenn
91dc30b04d Simplify InvalidType 2016-05-30 21:20:07 +02:00
gwenn
fb19e718cf Introduce an intermediary InvalidType error.
InvalidType is used where the column/parameter index is not known.
2016-05-30 20:35:56 +02:00
John Gallagher
d43a1abc78 Merge branch 'master' into rust-1.9-reexported-trait-bugfix 2016-05-29 23:54:47 -04:00
John Gallagher
326d8999e8 Merge pull request #169 from jgallagher/deprecated
Use new Rust 1.9 attribute: #[deprecated(since = "...", note = "...")]
2016-05-29 23:42:22 -04:00
John Gallagher
b1b438158d Remove workaround for Rust compiler bug that was fixed in 1.9. 2016-05-29 20:38:46 -04:00
John Gallagher
7c0eba0475 Add since and note for all deprecation tags. 2016-05-29 20:36:20 -04:00
gwenn
6a4eacc927 Simply use cargo clippy 2016-05-28 11:16:55 +02:00
gwenn
f817ec86bc Use new Rust 1.9 attribute: #[deprecated]. 2016-05-26 21:16:09 +02:00
gwenn
cabcaf3dcb Better error reporting on invalid column type. 2016-05-26 21:03:05 +02:00
John Gallagher
f3693a993e rustfmt 2016-05-26 00:28:18 -04:00
John Gallagher
e4926ac0d7 Rework ToSql to be implementable without unsafe. 2016-05-26 00:14:45 -04:00
John Gallagher
2f4990dafd Rename BorrowedValue -> ValueRef. 2016-05-24 21:34:18 -04:00
John Gallagher
5b0cdbaa56 Redo FromSql to make implementing it not unsafe.
Pass implementers a BorrowedValue instead of relying on them to use
the FFI interface. We take the responsibility of converting the raw
statement and column index into a BorrowedValue.
2016-05-23 21:49:54 -04:00
John Gallagher
dccfd7e801 Refactor: Extract ToSql into its own module. 2016-05-22 20:16:54 -04:00
gwenn
0740620ffe Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-20 18:31:30 +02:00
John Gallagher
dc1b0e39ed Re-export DropBehavior and SqliteTransactionBehavior. 2016-05-19 20:35:27 -05:00
John Gallagher
d27ed0de63 Re-export Savepoint. 2016-05-19 20:32:17 -05:00
John Gallagher
c4417bee0e Manual fixes for rustfmt overly long lines. 2016-05-19 20:09:40 -05:00
John Gallagher
71aa41c27a rustfmt 2016-05-19 20:04:33 -05:00
gwenn
ef6fcc8976 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-19 22:10:58 +02:00
gwenn
1bb177047e Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-19 21:24:17 +02:00
John Gallagher
d608956bd0 Merge branch 'master' into remove-rows-iterator-impl 2016-05-19 14:06:56 -05:00
John Gallagher
0e6e78e81a Merge branch 'master' into savepoint-improvements 2016-05-19 13:49:02 -05:00
John Gallagher
74b57ee47a Add test and fix for invalid cached column_count.
Issue raised in
https://github.com/jgallagher/rusqlite/pull/113#issuecomment-220122048.
2016-05-18 22:19:04 -05:00
John Gallagher
d5bbbbd763 Add query_map_named and query_and_then_named to Statement. 2016-05-18 22:01:08 -05:00
John Gallagher
703cf22b52 Separate Savepoint out from Transaction.
Replaces `set_commit` and `set_rollback` with `set_drop_behavior`.

Allows specification of savepoint names.

Savepoint::rollback() does not consume the savepoint;
Transaction::rollback() does consume the transaction.
2016-05-18 16:38:09 -05:00
gwenn
42d95f042f Fix tests and improve InvalidColumnType error message. 2016-05-18 21:25:13 +02:00
John Gallagher
30733a3688 Modify Rows::next to tie its lifetime to the returned Row.
This means Rows no longer implements Iterator, but it is no longer
possible to misuse it by accessing a stale Row handle.
2016-05-18 11:41:22 -05:00
John Gallagher
437a06fca3 Merge branch 'master' into gwenn-stmt-cache 2016-05-17 20:52:52 -05:00
John Gallagher
92834951e3 Make the creation of transactions and savepoints take &mut self.
Transactions in SQLite are nested, but the previous API allowed rusqlite
transaction wrappers to be created as "siblings". This resulted in
unexpected (and usually wrong) behavior.
2016-05-17 19:53:53 -05:00
John Gallagher
d923d8c670 Use a real LruCache instead of a VecDeque. 2016-05-17 13:35:23 -05:00
John Gallagher
3c15eb0218 Add Connection::prepare_cached. 2016-05-17 13:34:54 -05:00
John Gallagher
ed72da92ef Remove cache feature 2016-05-17 12:01:55 -05:00
John Gallagher
0ab9421e6a Detach StatementCache from Connection so we can embed it (coming later) 2016-05-17 11:59:54 -05:00
John Gallagher
1978568d01 Make StatementCache hold RawStatements instead of Statements. 2016-05-17 11:55:10 -05:00
John Gallagher
f6aba80f4b Extract RawStatement wrapper around *mut sqlite3_stmt. 2016-05-17 11:27:29 -05:00
John Gallagher
b76196ae1a Merge branch 'master' into gwenn-stmt-cache 2016-05-17 08:54:47 -05:00
gwenn
29373e7d0d Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-16 22:30:58 +02:00
John Gallagher
63e5570ca9 Merge pull request #149 from jgallagher/gwenn-reset
Reset statements ASAP.
2016-05-16 15:19:03 -05:00
John Gallagher
1262d3bb17 Call sqlite3_reset on a statement ASAP inside Rows's Iterator impl. 2016-05-16 14:39:14 -05:00
John Gallagher
8e1ce5cf9c Fuse a Rows iterator once it fetches the final row. 2016-05-16 14:11:44 -05:00
John Gallagher
4a6c7b5329 Reset in Rows's drop impl instead of waiting for the next query 2016-05-16 14:02:39 -05:00
gwenn
3a52dd65f0 Rustfmt 2016-05-16 19:52:17 +02:00
John Gallagher
ba7b1ea45e Merge pull request #147 from jgallagher/update-to-latest-bitflags
Update to latest bitflags crate.
2016-05-16 12:20:26 -05:00
gwenn
94b4b7595c Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-16 18:58:56 +02:00
gwenn
f1e0e10138 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-05-16 18:38:15 +02:00
John Gallagher
f77ae8816d Update to latest bitflags crate.
Closes #139.
2016-05-16 11:36:48 -05:00
John Gallagher
504b16dc98 Merge branch 'master' into gwenn-convenient 2016-05-16 11:02:56 -05:00
gwenn
b20168fe9c Use String::from_utf8_lossy for error/trace.
Try to use the original message even if there are invalid
characters.
2016-05-07 12:08:57 +02:00
gwenn
6fb549420b Rustfmt 2016-05-03 21:00:59 +02:00
gwenn
5541cb06fe Merge remote-tracking branch 'jgallagher/master' into vtab 2016-03-30 18:26:26 +02:00
John Gallagher
41fe698cec Address additional clippy warnings 2016-03-29 14:18:56 -04:00
John Gallagher
2bd54578f5 Update clippy version and address new warnings 2016-03-29 11:54:02 -04:00
gwenn
aea2f876d5 Try to fix regression with Rust stable. 2016-02-14 16:24:35 +01:00
gwenn
0fe1990d34 Fix clippy warnings 2016-02-14 16:11:59 +01:00
gwenn
effbf1e395 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-02-03 18:10:58 +01:00
gwenn
f261e8f7eb Introduce init_module! macro to create sqlite_module 2016-02-02 21:16:10 +01:00
gwenn
f749d24ac1 Merge remote-tracking branch 'jgallagher/master' into vtab 2016-02-02 19:18:19 +01:00
gwenn
24d5093ab8 Merge remote-tracking branch 'jgallagher/master' into rustfmt 2016-02-02 19:15:35 +01:00
gwenn
f529d130b9 Rustfmt 2016-02-02 19:12:00 +01:00
gwenn
82f1467a9f Add declaration for convenient module 2016-02-02 18:57:25 +01:00
John Gallagher
9a4095365f Merge branch 'master' into gwenn-stmt-cache 2016-02-02 10:39:22 -05:00
John Gallagher
350fd11fed Add a handle() method to unsafely get the underlying SQLite connection.
Doc comments suggest opening issues on rusqlite for any uses of
`handle()`, as uses indicate areas where rusqlite insufficiently wraps
SQLite.
2016-02-01 15:21:03 -05:00
John Gallagher
a793f8c8c5 Remove scary lifetime-of-rows-may-panic from README.
Closes #119.
2016-02-01 14:30:51 -05:00
gwenn
e17678b173 IntArray virtual table. 2016-01-24 12:18:21 +01:00
gwenn
5b62e2dd5f Virtual Table: WIP 2016-01-10 20:56:04 +01:00
John Gallagher
a9a953e6b7 Merge branch 'stmt-cache' of https://github.com/gwenn/rusqlite into gwenn-stmt-cache 2016-01-07 11:19:59 -05:00
John Gallagher
f290c15d0d Merge branch 'dynamic' of https://github.com/gwenn/rusqlite into gwenn-dynamic 2016-01-07 11:12:05 -05:00
gwenn
12f26e78b3 Introduce RowIndex trait (like in rust-postgres) 2016-01-02 12:13:37 +01:00
gwenn
9db82e74db Make possible to execute dynamic queries.
Queries with dynamic column count/type.
2016-01-02 10:28:00 +01:00
Gwenael Treguier
86ffc24bb9 Merge branch 'master' of https://github.com/jgallagher/rusqlite into stmt-cache 2015-12-18 20:25:52 +01:00
Gwenael Treguier
109c26fea4 Replace LruCache by VecDeque. 2015-12-17 20:02:49 +01:00
John Gallagher
b241f98920 Add test and check for SQLite being in single-threaded mode 2015-12-16 23:56:21 -05:00
John Gallagher
7920dbc5ff Only check for SQLITE_CONSTRAINT_NOTNULL on new enough versions of SQLite. 2015-12-16 20:30:27 -05:00
John Gallagher
047861b928 Move Error into its own module (internal organization only - public API remains). 2015-12-16 20:30:27 -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
bf859a8008 Attempt to enable extended result codes for all connections 2015-12-16 20:30:27 -05:00
Gwenael Treguier
880a78ae83 Partial fix following John suggestions. 2015-12-15 21:49:59 +01:00
Gwenael Treguier
108b6b6fcd Merge branch 'master' of https://github.com/jgallagher/rusqlite into stmt-cache 2015-12-15 21:03:31 +01:00
John Gallagher
5ac5f3e9b5 Make blob_open take a DatabaseName instead of a str. 2015-12-14 13:38:36 -05:00
John Gallagher
73611d45d5 Merge branch 'blob' of https://github.com/gwenn/rusqlite into gwenn-blob 2015-12-14 13:35:05 -05:00
John Gallagher
4b512212d2 Inline decode_result_with_errmsg to fix dead code warning 2015-12-13 14:59:47 -05:00
Gwenael Treguier
1c4ca000cf Simplify execute_batch implementation. 2015-12-13 14:15:56 +01:00
Gwenael Treguier
d5faf2fab3 Merge branch 'master' of https://github.com/jgallagher/rusqlite into stmt-cache 2015-12-13 11:23:54 +01:00
Gwenael Treguier
6f0f121d61 Merge remote-tracking branch 'remotes/jgallagher/master' into blob 2015-12-13 10:53:29 +01:00
John Gallagher
6bcc3edccd BREAKING CHANGE: Remove common prefix on TransactionBehavior case names. 2015-12-12 14:22:50 -05:00
John Gallagher
b1cde705be Rename SqliteLoadExtensionGuard -> LoadExtensionGuard. 2015-12-12 14:20:11 -05:00
John Gallagher
3d15a8a15c Rename SqliteTransaction* -> Transaction*. 2015-12-12 14:17:43 -05:00
John Gallagher
9cac56d6a2 Rename SqliteOpenFlags -> OpenFlags. 2015-12-12 14:13:29 -05:00
John Gallagher
ea5cb41bbf Rename SqliteRow -> Row. 2015-12-12 14:11:24 -05:00
John Gallagher
b932640181 Rename SqliteRows -> Rows. 2015-12-12 14:09:37 -05:00
John Gallagher
ec654352d9 Rename SqliteStatement -> Statement. 2015-12-12 14:08:04 -05:00
John Gallagher
eb60bb3111 Rename SqliteResult -> Result. 2015-12-12 14:06:03 -05:00
John Gallagher
f0b6bf9152 Rename SqliteError -> Error. 2015-12-12 13:53:58 -05:00
John Gallagher
4327a84edb Rename SqliteConnection -> Connection.
Leave old name in as a (deprecated) typealias.
2015-12-12 13:53:34 -05:00
John Gallagher
5039e57637 Merge branch 'master' into gwenn-functions
Conflicts:
	Changelog.md
2015-12-11 19:21:39 -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
0051ff47a6 Refactor: Extract match to get an expected row into its own method. 2015-12-10 20:48:38 -05:00
John Gallagher
53979407c5 Merge branch 'named-param' of https://github.com/gwenn/rusqlite into gwenn-named-param
Conflicts:
	Cargo.toml
	src/lib.rs
2015-12-10 16:53:43 -05:00
John Gallagher
a1f1480b18 Run rustfmt on all crate files 2015-12-10 16:48:09 -05:00
John Gallagher
8c2e0a0da7 Rename BackupName -> DatabaseName 2015-12-10 16:20:45 -05:00
John Gallagher
e2f8e73635 Initial implementation of the online backup API. 2015-12-09 00:19:59 -05:00
John Gallagher
51a542c0f7 Fix broken load_extension feature 2015-12-08 21:15:23 -05:00
Gwenael Treguier
fe6afe2a94 Merge branch 'master' of https://github.com/jgallagher/rusqlite into functions 2015-12-06 21:33:21 +01:00
Gwenael Treguier
5b86871d76 Merge branch 'master' of https://github.com/jgallagher/rusqlite into named-param 2015-12-05 12:32:16 +01:00
Gwenael Treguier
18ff9cf4ca Merge branch 'master' of https://github.com/jgallagher/rusqlite into stmt-cache 2015-12-05 11:58:06 +01:00
Gwenael Treguier
cef1d3285e Merge branch 'master' of https://github.com/jgallagher/rusqlite into blob 2015-12-05 11:11:23 +01:00
John Gallagher
ac08a18c43 Merge pull request #86 from jgallagher/gwenn-trace_extension
Add Rust interface to SQLite's logging, tracing, and profiling hooks
2015-12-01 13:19:43 -05:00
John Gallagher
3d654aeed1 Add more documentation for failure modes of functions that return s 2015-12-01 12:05:29 -05:00
John Gallagher
1af3fcd053 Fix error messages when failing to convert paths and strings to C-compatible versions 2015-12-01 11:47:55 -05:00
John Gallagher
49cb1efe62 Merge branch 'master' into gwenn-trace_extension 2015-12-01 11:13:23 -05:00
John Gallagher
635616842c Remove 'static requirement on output of closure given to query_map and query_and_then.
The 'static bound was there to prevent callers from being able to save
off the `SqliteRow` handles passed into the closure. This PR changes the
closure to take `&SqliteRow`s instead, which provides the same feature
without restricting the output of the closure.
2015-12-01 10:58:32 -05:00
John Gallagher
ace5b1ebdc Change trace() to take a Rust fn instead of an extern "C" fn. 2015-11-30 21:08:39 -05:00
John Gallagher
eaf080261b Merge branch 'trace_extension' of https://github.com/gwenn/rusqlite into gwenn-trace_extension 2015-11-30 13:13:43 -05:00
Gwenael Treguier
0729e195c3 Use debug_struct for formatting. 2015-11-30 12:16:09 -05:00
Gwenael Treguier
20c1213482 Remove feature duration. 2015-11-11 15:03:07 +01:00
Gwenael Treguier
a2327fb048 Revert "Remove usage of unstable library feature 'duration'"
This reverts commit 9c415f9c9e.
2015-11-11 15:00:39 +01:00
Gwenael Treguier
e052053a79 Merge remote-tracking branch 'jgallagher/master' into stmt-cache 2015-11-11 14:42:08 +01:00
Gwenael Treguier
db7345624f Merge remote-tracking branch 'jgallagher/master' into named-param 2015-11-11 14:39:15 +01:00
Gwenael Treguier
8bff40b6d6 Merge remote-tracking branch 'jgallagher/master' into trace_extension 2015-11-11 14:28:21 +01:00
John Gallagher
b1350c4c14 Merge branch 'master' into gwenn-reset_asap 2015-09-22 10:16:52 -07:00
John Gallagher
d23667870e Merge pull request #70 from jgallagher/pfernie-master
Replace get_opt with get_checked. Add query_and_then and query_row_and_then.
2015-09-21 10:38:07 -04:00
John Gallagher
7ee69fe103 Remove get_opt (superceded by get_checked). 2015-09-21 10:31:11 -04:00
John Gallagher
1918dc14d0 Add tests for query_row_and_then(). 2015-09-20 21:30:40 -04:00
John Gallagher
072a336b33 Refactor: Reduce duplication across query_and_then tests. 2015-09-20 21:28:50 -04:00
John Gallagher
0cbb2743e3 Merge branch 'master' of https://github.com/pfernie/rusqlite into pfernie-master 2015-09-20 21:07:39 -04:00
John Gallagher
59a3b0ddb5 Merge pull request #62 from gwenn/too-big
Check Rust str length before binding.
2015-09-20 20:57:28 -04:00
John Gallagher
d07c7ec8a6 Add basic unit test of statement debug including SQL 2015-09-20 20:44:51 -04:00
gwenn
05669082a3 Debug db path and stmt sql. 2015-09-20 20:41:13 -04:00
John Gallagher
43b0c1c98a Merge branch 'reset_asap' of https://github.com/gwenn/rusqlite into gwenn-reset_asap 2015-09-20 20:30:59 -04:00
John Gallagher
36f577aea6 Merge pull request #53 from gwenn/exec_check
Extra check in SqliteStatement.execute
2015-09-20 20:29:12 -04:00
Huon Wilson
b7efb37b35 Relax uses of P: AsRef<...> from &P to P.
This means that one can pass `AsRef` types directly, without having to
insert a `&`, e.g. `SqliteConnection::open("foo.db")` (new)
vs. `SqliteConnection::open(&"foo.db")` (old).

This should be backwards compatible, since there is an impl in the
standard library:

    impl<'a, T, U> AsRef<U> for &'a T where U: ?Sized, T: AsRef<U> + ?Sized

I.e. the old `&P` satisfies the new bound still. (Taking `P` directly is
what the standard library does with similar functions, like
`File::open`.)
2015-09-08 18:11:50 +10:00
Patrick Fernie
e4eda2041e Implement SqliteConnection::query_row_and_then() 2015-08-27 14:47:48 -04:00
Patrick Fernie
29072e585b Implement SqliteStatement::query_and_then()
Allows for more ergonomic unification of error types
2015-08-27 13:43:43 -04:00
Patrick Fernie
e1532f5edf Correct idx-checking behavior for SqliteRow::get_checked() 2015-08-27 10:44:24 -04:00
Gwenael Treguier
b9ab3350ea Add regexp() function implementation 2015-08-09 13:06:23 +02:00
Gwenael Treguier
0a454eed79 Add support to user defined scalar functions 2015-08-09 09:52:53 +02:00
Gwenael Treguier
eb7f670ce1 Make named_params module private 2015-08-08 16:19:05 +02:00
Gwenael Treguier
6bc1a8bb59 Check when statement is too long. 2015-08-08 09:30:50 +02:00
Gwenael Treguier
e81757e86d Add Stmt::named_execute and Stmt::parameter_index. 2015-08-04 21:48:54 +02:00
Gwenael Treguier
8bb624cccc Factorize code 2015-08-04 18:52:57 +02:00
Gwenael Treguier
9c415f9c9e Remove usage of unstable library feature 'duration' 2015-08-02 12:16:01 +02:00
Gwenael Treguier
25de884720 LRU statement cache 2015-08-02 12:07:49 +02:00
gwenn
ef254fdca0 Rename feature to 'trace' 2015-08-01 18:58:04 +02:00
gwenn
1bf12f8150 Feature blob IO. 2015-08-01 18:51:02 +02:00
gwenn
4a7e83f0af Feature sqlite3_{log,trace,profile}. 2015-08-01 17:21:41 +02:00
gwenn
4fa6d3c020 Reset as soon as possible. 2015-08-01 10:18:06 +02:00
gwenn
f91db1b350 Cache column_count (I am not sure it's worth it) 2015-08-01 10:08:28 +02:00
gwenn
c31c68d5e3 Only check column count when DONE. 2015-08-01 09:11:31 +02:00
gwenn
1dc144c8c1 Add test_execute_select. 2015-08-01 08:09:59 +02:00
John Gallagher
e7eb6454d9 Merge pull request #51 from Yuhta/colnames
Add column_names to SqliteStatement
2015-07-26 13:55:15 -04:00
Jimmy Lu
22968be4fc Add column_names to SqliteStatement 2015-07-24 22:16:20 -04:00
gwenn
fd36d98c85 Make SqliteOpenFlags implement Default.
Activate URI and NO_MUTEX by default.
2015-07-06 20:24:27 +02:00
John Gallagher
ad3e805357 Merge pull request #39 from jgallagher/add-get-checked
Add get_checked to SqliteRow.
2015-05-11 20:17:18 -04:00