fix(dolt): reset AUTO_INCREMENT after DOLT_PULL#2135
Merged
steveyegge merged 2 commits intosteveyegge:mainfrom Feb 26, 2026
Merged
fix(dolt): reset AUTO_INCREMENT after DOLT_PULL#2135steveyegge merged 2 commits intosteveyegge:mainfrom
steveyegge merged 2 commits intosteveyegge:mainfrom
Conversation
59ceba0 to
2ee27c5
Compare
2ee27c5 to
b584e74
Compare
b584e74 to
b5c5e49
Compare
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.
Fixes #2133.
This PR adds a
resetAutoIncrementsfunction that setsAUTO_INCREMENT = MAX(id) + 1on all six AUTO_INCREMENT tables after a successfulDOLT_PULL. It is applied in both the authenticated and unauthenticated code paths ofPull(), which backsbd dolt pull.The issue also considered applying the fix after
DOLT_MERGE, but testing showed dolt correctly tracks AUTO_INCREMENT for intra-server branch merges. The bug only manifests when rows arrive from a remote viaDOLT_PULL, where the server's local counter is not reconciled with the merged data. The previously applied merge fix was dropped since it could not be reproduced.TestAutoIncrementAfterPull(integration): source pushes, CLI clone adds AUTO_INCREMENT rows and pushes back, source pulls, verifies post-pullCreateIssuesucceedsFailure without fix