Skip to content

Commit

Permalink
Merge pull request #3637 from weiznich/prepare/2.1
Browse files Browse the repository at this point in the history
Prepare a 2.1 release
  • Loading branch information
weiznich authored May 26, 2023
2 parents d29b7f9 + a0b082b commit cbe9bef
Show file tree
Hide file tree
Showing 24 changed files with 60 additions and 43 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Increasing the minimal supported Rust version will always be coupled at least wi

## Unreleased

## [2.1.0] 2023-05-xx

### Changed

* The minimal officially supported rustc version is now 1.65.0
Expand All @@ -26,6 +28,19 @@ Increasing the minimal supported Rust version will always be coupled at least wi
* Add support for MySQL's `ON DUPLICATE KEY DO UPDATE` syntax through the existing upsert functions.
* Add ability to define multiple columns in a single `distinct_on` for PostgreSQL,
like: `.distinct_on((column_a, column_b))`.
* Added column size restrictions to the generated `schema.rs` file

## [2.0.4] 2023-04-18

## Fixed

* Workaround the missing name resolution in rust-analyzer. This should fix type inference for some diesel queries. (It remains broken for queries containing `.filter()`/`.inner_join()`/`.left_join()`. These require fixes in rust-analyzer itself)
* Fixed a bug that could lead to inserting null values instead of empty values for custom sqlite types
* Fixed a bug that could lead to an unexpected panic while providing an out of bounds bind for `sql_query` in the sqlite backend
* Fixed some mysql backend specific impl being behind the `mysql` instead of the `mysql_backend` feature flag

## Added

* Support for `libsqlite3-sys` 0.26

## [diesel_derives 2.0.2] 2023-03-13
Expand All @@ -34,6 +49,13 @@ Increasing the minimal supported Rust version will always be coupled at least wi

* Fixing the fallout of a breaking change from `quote` by not using their internal API

## [2.0.3] 2023-01-24

## Fixed

* Fixed a bug with our transaction manager implementation that caused by marking transactions as broken which could be recovered.
* Fixed an issue with the combination of `BoxableExpression` and order clauses

## [2.0.2] 2022-10-11

### Fixed
Expand Down Expand Up @@ -2000,3 +2022,6 @@ queries or set `PIPES_AS_CONCAT` manually.
[2.0.1]: https://github.com/diesel-rs/diesel/compare/v.2.0.0...v2.0.1
[2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.1...v2.0.2
[diesel_derives 2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.2...diesel_derives_v2.0.2
[2.0.3]: https://github.com/diesel-rs/diesel/compare/v.2.0.2...v2.0.3
[2.0.4]: https://github.com/diesel-rs/diesel/compare/v.2.0.3...v2.0.4
[2.1.0]: https://github.com/diesel-rs/diesel/compare/v.2.0.0...v2.1.0
4 changes: 2 additions & 2 deletions diesel/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel"
version = "2.0.2"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL"
readme = "README.md"
Expand Down Expand Up @@ -36,7 +36,7 @@ itoa = { version = "1.0.0", optional = true }
time = { version = "0.3.9", optional = true, features = ["macros"] }

[dependencies.diesel_derives]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel_derives"

[dev-dependencies]
Expand Down
9 changes: 0 additions & 9 deletions diesel/README.md

This file was deleted.

1 change: 1 addition & 0 deletions diesel/README.md
6 changes: 3 additions & 3 deletions diesel_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel_cli"
version = "2.0.1"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "Provides the CLI for the Diesel crate"
readme = "README.md"
Expand Down Expand Up @@ -35,12 +35,12 @@ diesel_table_macro_syntax = {version = "0.1", path = "../diesel_table_macro_synt
syn = { version = "2", features = ["visit"] }

[dependencies.diesel]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel"
default-features = false

[dependencies.diesel_migrations]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel_migrations/"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions diesel_derives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel_derives"
version = "2.0.2"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "You should not use this crate directly, it is internal to Diesel."
documentation = "https://diesel.rs/guides/"
Expand All @@ -22,7 +22,7 @@ cfg-if = "1"
dotenvy = "0.15"

[dev-dependencies.diesel]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel"

[lib]
Expand Down
4 changes: 2 additions & 2 deletions diesel_dynamic_schema/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel-dynamic-schema"
version = "0.2.0"
version = "0.2.1"
license = "MIT OR Apache-2.0"
edition = "2018"
autotests = false
Expand All @@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE-*", "README.md"]
rust-version = "1.65.0"

[dependencies.diesel]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel/"
default-features = false

Expand Down
8 changes: 4 additions & 4 deletions diesel_migrations/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel_migrations"
version = "2.0.0"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "Migration management for diesel"
documentation = "https://docs.rs/crate/diesel_migrations"
Expand All @@ -9,11 +9,11 @@ edition = "2021"
rust-version = "1.65.0"

[dependencies.migrations_internals]
version = "~2.0.0"
version = "~2.1.0"
path = "migrations_internals"

[dependencies.migrations_macros]
version = "~2.0.0"
version = "~2.1.0"
path = "migrations_macros"

[dev-dependencies]
Expand All @@ -22,7 +22,7 @@ cfg-if = "1.0.0"
tempfile = "3.2"

[dependencies.diesel]
version = "~2.0.0"
version = "~2.1.0"
path = "../diesel"
default-features = false

Expand Down
2 changes: 1 addition & 1 deletion diesel_migrations/migrations_internals/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "migrations_internals"
version = "2.0.0"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "Internal implementation of diesels migration mechanism"
homepage = "https://diesel.rs"
Expand Down
8 changes: 4 additions & 4 deletions diesel_migrations/migrations_macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "migrations_macros"
version = "2.0.0"
version = "2.1.0"
license = "MIT OR Apache-2.0"
description = "Codegeneration macros for diesels embedded migrations"
homepage = "https://diesel.rs"
Expand All @@ -12,7 +12,7 @@ quote = "1"
proc-macro2 = "1"

[dependencies.migrations_internals]
version = "~2.0.0"
version = "~2.1.0"
path = "../migrations_internals"

[dev-dependencies]
Expand All @@ -21,12 +21,12 @@ dotenvy = "0.15"
cfg-if = "1.0.0"

[dev-dependencies.diesel]
version = "~2.0.0"
version = "~2.1.0"
path = "../../diesel"
default-features = false

[dev-dependencies.diesel_migrations]
version = "~2.0.0"
version = "~2.1.0"
path = "../"
default-features = false

Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/all_about_inserts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql", "chrono"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["mysql", "chrono"] }
serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68"
chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/getting_started_step_1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["mysql"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/getting_started_step_2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["mysql"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/getting_started_step_3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["mysql"] }
dotenvy = "0.15"

[[bin]]
Expand Down
4 changes: 2 additions & 2 deletions examples/postgres/advanced-blog-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ publish = false
[dependencies]
argon2 = "0.5.0"
chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres", "chrono"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres", "chrono"] }
dotenvy = "0.15"
clap = { version = "4.2.7", features = ["derive"] }
tempfile = "3.1.0"

[dev-dependencies]
assert_matches = "1.1"
diesel_migrations = { version = "2.0.0", features = ["postgres"], path = "../../../diesel_migrations" }
diesel_migrations = { version = "2.1.0", features = ["postgres"], path = "../../../diesel_migrations" }
lazy_static = "1.0"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/all_about_inserts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres"] }
serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68"

Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/all_about_updates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres"] }

[lib]
doc = false
2 changes: 1 addition & 1 deletion examples/postgres/getting_started_step_1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/getting_started_step_2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/getting_started_step_3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["postgres"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/relations/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
diesel = { version = "2.0.2", features = ["postgres"], path = "../../../diesel" }
diesel = { version = "2.1.0", features = ["postgres"], path = "../../../diesel" }
dotenvy = "0.15.6"
2 changes: 1 addition & 1 deletion examples/sqlite/all_about_inserts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite", "chrono"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "chrono"] }
serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68"
chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/sqlite/getting_started_step_1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/sqlite/getting_started_step_2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
dotenvy = "0.15"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/sqlite/getting_started_step_3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"
publish = false

[dependencies]
diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
dotenvy = "0.15"

[[bin]]
Expand Down

0 comments on commit cbe9bef

Please sign in to comment.