Skip to content

dolt 1.53.2#223261

Merged
BrewTestBot merged 2 commits intomasterfrom
bump-dolt-1.53.2
May 13, 2025
Merged

dolt 1.53.2#223261
BrewTestBot merged 2 commits intomasterfrom
bump-dolt-1.53.2

Conversation

@BrewTestBot
Copy link
Contributor

Created by brew bump


Created with brew bump-formula-pr.

Details

release notes
# Merged PRs

dolt

  • 9208: When a table is deleted on one branch and has its data modified on the other, record this as a schema conflict.
    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 resolve to resolve them because of Schema conflict resolution needs to account for data merging dolthub/dolt#6616, but the user can query dolt_schema_conflicts to see the cause of the conflict.

go-mysql-server

vitess

  • 402: add variable to colval
  • 388: syntax for FLUSH TABLE
    MyDumper expects this syntax to at least parse.

Closed Issues

  • 7841: Add support for ALTER USER ... WITH <resource option>
  • 9201: Selecting from view using AS OF errors if the view doesn't exist on the current branch
  • 9202: Querying longtext with WHERE IN results in panic: interface conversion: interface {} is *val.TextStorage, not string
  • 9194: Round Trip tables with bit(...) type and DEFAULT value

@github-actions github-actions bot added go Go use is a significant feature of the PR or issue bump-formula-pr PR was created using `brew bump-formula-pr` labels May 13, 2025
@github-actions
Copy link
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.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label May 13, 2025
@BrewTestBot BrewTestBot enabled auto-merge May 13, 2025 02:57
@BrewTestBot BrewTestBot added this pull request to the merge queue May 13, 2025
Merged via the queue into master with commit f13d25f May 13, 2025
17 checks passed
@BrewTestBot BrewTestBot deleted the bump-dolt-1.53.2 branch May 13, 2025 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bump-formula-pr PR was created using `brew bump-formula-pr` CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. go Go use is a significant feature of the PR or issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants