Fix bug in SQL baseline rewriting #36396
Merged
Conversation
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
Disregard \r when counting newlines Fixes dotnet#35823
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in the SQL baseline rewriting functionality where changing the number of lines caused the rewriter to fail due to incorrect newline counting. The issue was caused by counting both \r and \n characters separately, which led to Windows-style \r\n line endings being counted as two newlines instead of one.
- Fixed newline counting to only count
\ncharacters, ignoring\rentirely - Added logic to prevent duplicate processing of the same line number (e.g., when theory tests execute multiple times)
- Enhanced the
QueryBaselineRewritingFileInfoclass with aProcessedLinestracking mechanism
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs | Fixed newline counting logic and added duplicate line processing prevention |
| test/EFCore.Cosmos.FunctionalTests/TestUtilities/TestSqlLoggerFactory.cs | Applied the same newline counting fix and duplicate prevention as the relational tests |
Comments suppressed due to low confidence (1)
test/EFCore.Cosmos.FunctionalTests/TestUtilities/TestSqlLoggerFactory.cs
Show resolved
Hide resolved
ajcvickers
approved these changes
Jul 20, 2025
AndriySvyryd
approved these changes
Jul 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
While work on some tests I managed to reproduce the problem where changing the number of lines caused the rewriter to fail. The rewriter has logic to count the number of newlines in the old and new baselines, and apply the diff to any additional rewrites that need to occur later in the same file. The newline counting looked at either \r or \n, which I think was the source of the problem: there seems to have been a \r\n (Windows - though I think we're supposed to normalize newlines on commit), so this was counted as two newlines, skewing the count.
I'm fixing this by simply not looking at \r at all, and just counting \n. The only problem this could cause is with very old MacOS versions, where \r alone was used as the newline - but that really should no longer be relevant any more.
Fixes #35823