Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Diesel 2 feature support #546

Merged
merged 1 commit into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bytecheck = { default-features= false, optional = true, version = "0.6" }
byteorder = { default-features = false, optional = true, version = "1.3" }
bytes = { default-features = false, optional = true, version = "1.0" }
diesel1 = { default-features = false, optional = true, package = "diesel", version = "1.4" }
diesel2 = { default-features = false, optional = true, package = "diesel", version = "2.0.0-rc.1" }
diesel2 = { default-features = false, optional = true, package = "diesel", version = "2.0" }
num-traits = { default-features = false, features = ["i128"], version = "0.2" }
postgres = { default-features = false, optional = true, version = "0.19" }
rand = { default-features = false, optional = true, version = "0.8" }
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ Enables the tokio postgres module allowing for async communication with PostgreS

### `db-diesel-postgres`

Enable `diesel` PostgreSQL support. By default, this enables version `1.4` of `diesel`. If you wish to use the `diesel`
release candidates then you can do so by using `db-diesel2-postgres`. Please note, the `db-diesel2-*` features are considered
unstable and will be upgraded as and when new `diesel 2.x` features are released.
Enable `diesel` PostgreSQL support. By default, this enables version `1.4` of `diesel`. If you wish to use the `2.0`
version of `diesel` then you can do so by using the feature `db-diesel2-postgres`. Please note, if both features are
enabled then version 2 will supersede version 1.

### `db-diesel-mysql`

Enable `diesel` MySQL support. By default, this enables version `1.4` of `diesel`. If you wish to use the `diesel`
release candidates then you can do so by using `db-diesel2-mysql`. Please note, the `db-diesel2-*` features are considered
unstable and will be upgraded as and when new `diesel 2.x` features are released.
Enable `diesel` MySQL support. By default, this enables version `1.4` of `diesel`. If you wish to use the `2.0`
version of `diesel` then you can do so by using the feature `db-diesel2-mysql`. Please note, if both features are
enabled then version 2 will supersede version 1.

### `legacy-ops`

Expand Down