diff: Fix name to index conversion
#2457
Merged
Conversation
This file contains 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
added 2 commits
January 19, 2025 22:41
This fixes the conversion from column name -> index for `diff` options `--key` and `--sort-columns`, which is part of dathere#2443. The issue was that `enumeration idx` and `1` had been added to the already correct result (obtained via `.position` iterator method). So now, only `.position` is used to get the correct idx of a column name. Before this change, one test has tried to validate the logic of providing column names instead of indices, but the test itself was wrong, as the diff result that was validated did not have the correct sort order. This test is now also fixed. Additionally, this provides some more tests for error conditions regarding name -> index conversion.
Logic was duplicated over four places, so we refactor it into it's own trait extension on `String`.
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.
This fixes the conversion from column name -> index for
diffoptions--keyand--sort-columns, which is part of #2443.The issue was that
enumeration idxand1had been added to the alreadycorrect result (obtained via
.positioniterator method).So now, only
.positionis used to get the correct idx of a column name.Before this change, one test has tried to validate the logic of providing
column names instead of indices, but the test itself was wrong, as the
diff result that was validated did not have the correct sort order.
This test is now also fixed.
Additionally, this provides some more tests for error conditions
regarding name -> index conversion.