Merge pull request diesel-rs#1672 from nickbabcock/bundled

Enable sqlite/bundle for diesel cli redux

Author: sgrif

.travis.yml

@@ -55,6 +55,13 @@ matrix:
     script:
     - cargo install rustfmt-nightly --vers 0.3.7 --force
     - cargo fmt --all -- --write-mode=diff
+  - rust: stable
+    env:
+    - SQLITE_BUNDLED=YESPLEASE
+    - SQLITE_DATABASE_URL=/tmp/test.db
+    script:
+    - (cd diesel_cli && travis-cargo test -- --no-default-features --features "sqlite-bundled")
+
 env:
   matrix:
     - BACKEND=sqlite

CHANGELOG.md

@@ -20,6 +20,9 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   `NonAggregate` for your function. See [the documentation for
   `sql_function!`][sql-function-1-3-0] for more details.
 
+* Added `sqlite-bundled` feature to `diesel_cli` to make installing on
+  some platforms easier.
+
 ### Changed
 
 * `sql_function!` has been redesigned. The syntax is now `sql_function!(fn

diesel_cli/Cargo.toml

@@ -27,6 +27,7 @@ tempfile = "3.0.0"
 toml = "0.4.6"
 url = { version = "1.4.0", optional = true }
 barrel = { version = "<= 0.2.0", optional = true, features = ["diesel-filled"] }
+libsqlite3-sys = { version = ">=0.8.0, <0.10.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
 
 [dev-dependencies]
 difference = "1.0"
@@ -41,6 +42,7 @@ postgres = ["diesel/postgres", "infer_schema_internals/postgres", "url"]
 sqlite = ["diesel/sqlite", "infer_schema_internals/sqlite"]
 mysql = ["diesel/mysql", "infer_schema_internals/mysql", "url"]
 barrel-migrations = ["migrations_internals/barrel", "barrel"]
+sqlite-bundled = ["sqlite", "libsqlite3-sys/bundled"]
 
 [[test]]
 name = "tests"

diesel_cli/README.md

@@ -22,6 +22,13 @@ cargo install diesel_cli --no-default-features --features "postgres sqlite mysql
 [sqlite]: http://www.sqlitetutorial.net/download-install-sqlite/
 [mysql]: https://dev.mysql.com/doc/refman/5.7/en/installing.html
 
+If you are using a system without an easy way to install sqlite (for example Windows),
+you can use a bundled version instead:
+
+```shell
+cargo install diesel_cli --no-default-features --features "sqlite-bundled"
+```
+
 Getting Started
 ---------------