Merged
Conversation
chenrui333
approved these changes
May 13, 2025
Contributor
|
🤖 An automated task has requested bottles to be published to this PR. Please do not push to this PR branch before the bottle commits have been pushed, as this results in a state that is difficult to recover from. If you need to resolve a merge conflict, please use a merge commit. Do not force-push to this PR branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Created by
brew bumpCreated with
brew bump-formula-pr.Details
release notes
Currently, attempting to merge when a table has been drop on one branch and had its data modified on the other produces an immediate error that aborts the merge. This error does not necessarily have enough context to determine the affected table, which makes resolving the merge difficult.
Given that we already handle a simultaneous drop + schema modification (by treating it as a schema conflict), we should be able to handle the simpler case of data modifications as well.
Since dropping a table is technically a schema change, this should now get reported as a schema conflict, and pause the merge, allowing the user to query dolt_schema_conflicts for more information.
After this PR, conflicts involving a dropped table will present the same as other schema conflicts: the user still won't be able to use
dolt conflicts resolveto resolve them because of Schema conflict resolution needs to account for data merging dolthub/dolt#6616, but the user can querydolt_schema_conflictsto see the cause of the conflict.go-mysql-server
val.TextStoragepanicfixes: Querying longtext with WHERE IN results in panic: interface conversion: interface {} is *val.TextStorage, not string dolthub/dolt#9202
quoteMySQL Docs: https://dev.mysql.com/doc/refman/8.4/en/string-functions.html#function_quote
fixes: Round Trip tables with
bit(...)type andDEFAULTvalue dolthub/dolt#9194vitess
FLUSH TABLEMyDumper expects this syntax to at least parse.
Closed Issues
ALTER USER ... WITH <resource option>AS OFerrors if the view doesn't exist on the current branchbit(...)type andDEFAULTvalue