rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove 'rusted_cypher' integration from 'contrib'.

This commit is contained in:
Jeb Rosen 2020-07-14 11:19:56 -07:00 committed by Sergio Benitez
parent 62113abcd2
commit 3a40d1071c
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/lib/Cargo.toml
View File

@ -35,7 +35,6 @@ diesel_mysql_pool = ["databases", "diesel/mysql", "diesel/r2d2"]
postgres_pool = ["databases", "postgres", "r2d2_postgres"] postgres_pool = ["databases", "postgres", "r2d2_postgres"]
mysql_pool = ["databases", "mysql", "r2d2_mysql"] mysql_pool = ["databases", "mysql", "r2d2_mysql"]
sqlite_pool = ["databases", "rusqlite", "r2d2_sqlite"] sqlite_pool = ["databases", "rusqlite", "r2d2_sqlite"]
cypher_pool = ["databases", "rusted_cypher", "r2d2_cypher"]
redis_pool = ["databases", "redis", "r2d2_redis"] redis_pool = ["databases", "redis", "r2d2_redis"]
mongodb_pool = ["databases", "mongodb", "r2d2-mongodb"] mongodb_pool = ["databases", "mongodb", "r2d2-mongodb"]
memcache_pool = ["databases", "memcache", "r2d2-memcache"] memcache_pool = ["databases", "memcache", "r2d2-memcache"]
@ -70,8 +69,6 @@ mysql = { version = "18.0", optional = true }
r2d2_mysql = { version = "18.0", optional = true } r2d2_mysql = { version = "18.0", optional = true }
rusqlite = { version = "0.23", optional = true } rusqlite = { version = "0.23", optional = true }
r2d2_sqlite = { version = "0.16", optional = true } r2d2_sqlite = { version = "0.16", optional = true }
rusted_cypher = { version = "1", optional = true }
r2d2_cypher = { version = "0.4", optional = true }
redis = { version = "0.15", optional = true } redis = { version = "0.15", optional = true }
r2d2_redis = { version = "0.13", optional = true } r2d2_redis = { version = "0.13", optional = true }
mongodb = { version = "0.3.12", optional = true } mongodb = { version = "0.3.12", optional = true }

18
contrib/lib/src/databases.rs
View File

@ -345,14 +345,12 @@
//! | Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` | //! | Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` |
//! | Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` | //! | Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` |
//! | Sqlite | [`Rusqlite`] | `0.23` | [`rusqlite::Connection`] | `sqlite_pool` | //! | Sqlite | [`Rusqlite`] | `0.23` | [`rusqlite::Connection`] | `sqlite_pool` |
//! | Neo4j | [`rusted_cypher`] | `1` | [`rusted_cypher::GraphClient`] | `cypher_pool` |
//! | Redis | [`redis-rs`] | `0.15` | [`redis::Connection`] | `redis_pool` | //! | Redis | [`redis-rs`] | `0.15` | [`redis::Connection`] | `redis_pool` |
//! | MongoDB | [`mongodb`] | `0.3.12` | [`mongodb::db::Database`] | `mongodb_pool` | //! | MongoDB | [`mongodb`] | `0.3.12` | [`mongodb::db::Database`] | `mongodb_pool` |
//! | Memcache | [`memcache`] | `0.14` | [`memcache::Client`] | `memcache_pool` | //! | Memcache | [`memcache`] | `0.14` | [`memcache::Client`] | `memcache_pool` |
//! //!
//! [Diesel]: https://diesel.rs //! [Diesel]: https://diesel.rs
//! [`redis::Connection`]: https://docs.rs/redis/0.15.0/redis/struct.Connection.html //! [`redis::Connection`]: https://docs.rs/redis/0.15.0/redis/struct.Connection.html
//! [`rusted_cypher::GraphClient`]: https://docs.rs/rusted_cypher/1.1.0/rusted_cypher/graph/struct.GraphClient.html
//! [`rusqlite::Connection`]: https://docs.rs/rusqlite/0.23.0/rusqlite/struct.Connection.html //! [`rusqlite::Connection`]: https://docs.rs/rusqlite/0.23.0/rusqlite/struct.Connection.html
//! [`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html //! [`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html
//! [`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html //! [`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html
@ -360,7 +358,6 @@
//! [`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html //! [`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html
//! [`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html //! [`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html
//! [`redis-rs`]: https://github.com/mitsuhiko/redis-rs //! [`redis-rs`]: https://github.com/mitsuhiko/redis-rs
//! [`rusted_cypher`]: https://github.com/livioribeiro/rusted-cypher
//! [`Rusqlite`]: https://github.com/jgallagher/rusqlite //! [`Rusqlite`]: https://github.com/jgallagher/rusqlite
//! [Rust-Postgres]: https://github.com/sfackler/rust-postgres //! [Rust-Postgres]: https://github.com/sfackler/rust-postgres
//! [`rust-mysql-simple`]: https://github.com/blackbeam/rust-mysql-simple //! [`rust-mysql-simple`]: https://github.com/blackbeam/rust-mysql-simple
@ -416,9 +413,6 @@ use self::r2d2::ManageConnection;
#[cfg(feature = "sqlite_pool")] pub extern crate rusqlite; #[cfg(feature = "sqlite_pool")] pub extern crate rusqlite;
#[cfg(feature = "sqlite_pool")] pub extern crate r2d2_sqlite; #[cfg(feature = "sqlite_pool")] pub extern crate r2d2_sqlite;
#[cfg(feature = "cypher_pool")] pub extern crate rusted_cypher;
#[cfg(feature = "cypher_pool")] pub extern crate r2d2_cypher;
#[cfg(feature = "redis_pool")] pub extern crate redis; #[cfg(feature = "redis_pool")] pub extern crate redis;
#[cfg(feature = "redis_pool")] pub extern crate r2d2_redis; #[cfg(feature = "redis_pool")] pub extern crate r2d2_redis;
@ -626,7 +620,6 @@ impl<'a> Display for ConfigError {
/// * `postgres::Connection` /// * `postgres::Connection`
/// * `mysql::Conn` /// * `mysql::Conn`
/// * `rusqlite::Connection` /// * `rusqlite::Connection`
/// * `rusted_cypher::GraphClient`
/// * `redis::Connection` /// * `redis::Connection`
/// ///
/// # Implementation Guide /// # Implementation Guide
@ -790,17 +783,6 @@ impl Poolable for rusqlite::Connection {
} }
} }
#[cfg(feature = "cypher_pool")]
impl Poolable for rusted_cypher::GraphClient {
type Manager = r2d2_cypher::CypherConnectionManager;
type Error = r2d2::Error;
fn pool(config: DatabaseConfig<'_>) -> Result<r2d2::Pool<Self::Manager>, Self::Error> {
let manager = r2d2_cypher::CypherConnectionManager { url: config.url.to_string() };
r2d2::Pool::builder().max_size(config.pool_size).build(manager)
}
}
#[cfg(feature = "redis_pool")] #[cfg(feature = "redis_pool")]
impl Poolable for redis::Connection { impl Poolable for redis::Connection {
type Manager = r2d2_redis::RedisConnectionManager; type Manager = r2d2_redis::RedisConnectionManager;

1
scripts/test.sh
View File

@ -75,7 +75,6 @@ if [ "$1" = "--contrib" ]; then
postgres_pool postgres_pool
mysql_pool mysql_pool
sqlite_pool sqlite_pool
cypher_pool
redis_pool redis_pool
mongodb_pool mongodb_pool
memcache_pool memcache_pool

3
site/guide/6-state.md
View File

@ -235,7 +235,6 @@ Presently, Rocket provides built-in support for the following databases:
| Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` | | Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` |
| Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` | | Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` |
| Sqlite | [`Rusqlite`] | `0.23` | [`rusqlite::Connection`] | `sqlite_pool` | | Sqlite | [`Rusqlite`] | `0.23` | [`rusqlite::Connection`] | `sqlite_pool` |
| Neo4j | [`rusted_cypher`] | `1` | [`rusted_cypher::GraphClient`] | `cypher_pool` |
| Redis | [`redis-rs`] | `0.15` | [`redis::Connection`] | `redis_pool` | | Redis | [`redis-rs`] | `0.15` | [`redis::Connection`] | `redis_pool` |
| MongoDB | [`mongodb`] | `0.3.12` | [`mongodb::db::Database`] | `mongodb_pool` | | MongoDB | [`mongodb`] | `0.3.12` | [`mongodb::db::Database`] | `mongodb_pool` |
| Memcache | [`memcache`] | `0.14` | [`memcache::Client`] | `memcache_pool` | | Memcache | [`memcache`] | `0.14` | [`memcache::Client`] | `memcache_pool` |
@ -243,7 +242,6 @@ Presently, Rocket provides built-in support for the following databases:
[`r2d2`]: https://crates.io/crates/r2d2 [`r2d2`]: https://crates.io/crates/r2d2
[Diesel]: https://diesel.rs [Diesel]: https://diesel.rs
[`redis::Connection`]: https://docs.rs/redis/0.15.0/redis/struct.Connection.html [`redis::Connection`]: https://docs.rs/redis/0.15.0/redis/struct.Connection.html
[`rusted_cypher::GraphClient`]: https://docs.rs/rusted_cypher/1.1.0/rusted_cypher/graph/struct.GraphClient.html
[`rusqlite::Connection`]: https://docs.rs/rusqlite/0.23.0/rusqlite/struct.Connection.html [`rusqlite::Connection`]: https://docs.rs/rusqlite/0.23.0/rusqlite/struct.Connection.html
[`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html [`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html
[`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html [`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html
@ -251,7 +249,6 @@ Presently, Rocket provides built-in support for the following databases:
[`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html [`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html
[`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html [`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html
[`redis-rs`]: https://github.com/mitsuhiko/redis-rs [`redis-rs`]: https://github.com/mitsuhiko/redis-rs
[`rusted_cypher`]: https://github.com/livioribeiro/rusted-cypher
[`Rusqlite`]: https://github.com/jgallagher/rusqlite [`Rusqlite`]: https://github.com/jgallagher/rusqlite
[Rust-Postgres]: https://github.com/sfackler/rust-postgres [Rust-Postgres]: https://github.com/sfackler/rust-postgres
[`rust-mysql-simple`]: https://github.com/blackbeam/rust-mysql-simple [`rust-mysql-simple`]: https://github.com/blackbeam/rust-mysql-simple