diff --git a/Cargo.toml b/Cargo.toml index 4442d0e7..1e6101bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,19 @@ authors = [ "Jordan Santell ", "Joe Walker ", "Emily Toop ", + "Grisha Kruglov ", + "Kit Cambridge ", + "Edouard Oger ", + "Thom Chiovoloni ", ] name = "mentat" -version = "0.6.0" +version = "0.6.1" build = "build/version.rs" +[features] +default = ["bundled_sqlite3"] +bundled_sqlite3 = ["rusqlite/bundled"] + [workspace] members = ["tools/cli"] @@ -26,7 +34,7 @@ time = "0.1" [dependencies.rusqlite] version = "0.12" # System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] [dependencies.edn] path = "edn" diff --git a/README.md b/README.md index 4e2592e8..1cbbec1b 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,14 @@ Project Mentat is currently licensed under the Apache License v2.0. See the `LIC Mentat uses partial indices, which are available in SQLite 3.8.0 and higher. It also uses FTS4, which is [a compile time option](http://www.sqlite.org/fts3.html#section_2). + +By default, Mentat specifies the `"bundled"` feature for `rusqlite`, which uses a relatively recent +version of SQLite. If you want to link against the system version of SQLite, omit `"bundled_sqlite3"` +from Mentat's features. + +```toml +[dependencies.mentat] +version = "0.6" +# System sqlite is known to be new. +default-features = false +``` diff --git a/db/Cargo.toml b/db/Cargo.toml index b8512fb7..7ab6b5aa 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -12,8 +12,7 @@ time = "0.1" [dependencies.rusqlite] version = "0.12" -# System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] [dependencies.edn] path = "../edn" diff --git a/query-projector/Cargo.toml b/query-projector/Cargo.toml index 416e33b7..ada8dea0 100644 --- a/query-projector/Cargo.toml +++ b/query-projector/Cargo.toml @@ -8,8 +8,7 @@ error-chain = { git = "https://github.com/rnewman/error-chain", branch = "rnewma [dependencies.rusqlite] version = "0.12" -# System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] [dependencies.mentat_core] path = "../core" diff --git a/sql/Cargo.toml b/sql/Cargo.toml index 05a988c8..082bf49a 100644 --- a/sql/Cargo.toml +++ b/sql/Cargo.toml @@ -9,8 +9,7 @@ ordered-float = "0.5" [dependencies.rusqlite] version = "0.12" -# System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] [dependencies.mentat_core] path = "../core" diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml index 4f8928e5..2d0bbb3f 100644 --- a/tolstoy/Cargo.toml +++ b/tolstoy/Cargo.toml @@ -25,5 +25,4 @@ path = "../db" [dependencies.rusqlite] version = "0.12" -# System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index 7bfe5168..b5512d90 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -24,8 +24,7 @@ error-chain = { git = "https://github.com/rnewman/error-chain", branch = "rnewma [dependencies.rusqlite] version = "0.12" -# System sqlite might be very old. -features = ["bundled", "limits"] +features = ["limits"] [dependencies.mentat] path = "../.."