Skip to content

Backport changes to 1.4.x#2326

Merged
weiznich merged 8 commits intodiesel-rs:1.4.xfrom
tosti007:1.4.x
Mar 23, 2020
Merged

Backport changes to 1.4.x#2326
weiznich merged 8 commits intodiesel-rs:1.4.xfrom
tosti007:1.4.x

Conversation

@tosti007
Copy link

As said in #2205 a PR should be made with all the required changes along with the changes labeled "maybe backport", so here it is.

I back ported all commits I deemed right, but the tests don't seem to pass on locally due to unrelated build failures.

Hopefully this helps (as I would like to use uuid 0.8) with a release prior to the milestone!

paolobarbolini and others added 4 commits March 11, 2020 21:56
It was possible to reach `last_error_message` before we set the client
encoding to utf8. If there is some other default client encoding set,
this could lead to an corrupted string violating rust gurantees about
strings always being utf8.

Additionally I've checked the codebase for other occurrences of
`from_utf8_unchecked` and added comments there why they are
fine. Having a second (or third) look at them would be helpful.
@tosti007 tosti007 changed the title Backport UUID v0.8 changes to 1.4.x Backport changes to 1.4.x Mar 11, 2020
@weiznich
Copy link
Member

weiznich commented Mar 11, 2020

97505e0 needs to be removed. That commit does break the build. It was accidentality merged.

@weiznich weiznich requested a review from a team March 11, 2020 22:01
@mikeyhew
Copy link

Can I suggest you add #2159: Fix formatting error with embedded migrations? It's a bugfix that was merged in September. Commit hash is 78ad40d

@weiznich
Copy link
Member

That seems to be a reasonable addition. 👍

In Display impl for`MigrationName`, use the migration version if `Migration::file_path` returns None.

This is based on the work from @sorccu in #1993.

Fixes #1977.
@tosti007
Copy link
Author

@weiznich Oops you're right.
@mikeyhew Thank you for the suggestion!

@weiznich
Copy link
Member

Possible other candidates:

Seems like I missed tagging those ones while merging PR's

@tosti007
Copy link
Author

If I want to add #2299, then #2230 and #2179 should be added as well I believe. Is this right or am I missing more?

@weiznich
Copy link
Member

As #2179 brings in a new feature I would say we do not backport any of those 3 PR's. Patch releases are entirely bugfix releases, so no new features there.

@tosti007
Copy link
Author

Alright, then I believe no more candidates are left (with the exception of #2299, but that relies on the new features).

@weiznich
Copy link
Member

I will wait a few more days if any other members of @diesel-rs/contributors have some opinion here and then I will try to do a release.

@weiznich weiznich merged commit 3fd7d65 into diesel-rs:1.4.x Mar 23, 2020
@weiznich
Copy link
Member

Merged and released (with minor changes) as 1.4.4 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants