[Bug Fix]: ScriptUtils converts adjacent string literals to invalid syntax #11206 #11209
+82
−26
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
…yntax testcontainers#11206 I've implemented the whitespace handling fix in ScriptSplitter to preserve a newline only when whitespace with an EOL appears between two quoted strings, and added a unit test to cover the reported case. I identified the whitespace-collapsing logic in ScriptSplitter that turned EOLs into spaces, which broke PostgreSQL’s adjacent string literal concatenation when a newline is required between literals. I updated ScriptSplitter to defer whitespace emission and only preserve a newline when the whitespace contains an EOL and it separates two quoted strings; otherwise it still collapses to a single space. This keeps current behavior broadly intact while fixing the bug.
I added a unit test to assert the specific case you reported. Added test in modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java: testAdjacentStringLiteralsSeparatedByNewlineArePreserved checks that: - CREATE TABLE collapses newlines to spaces. - COMMENT ON COLUMN ... IS 'First sentence. '\n'Second sentence' preserves the required newline between quoted strings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary of impact:
I identified the whitespace-collapsing logic in ScriptSplitter that turned EOLs into spaces, which broke PostgreSQL’s adjacent string literal concatenation when a newline is required between literals.
I updated ScriptSplitter to defer whitespace emission and only preserve a newline when the whitespace contains an EOL and it separates two quoted strings; otherwise it still collapses to a single space. This keeps current behavior broadly intact while fixing the bug.
I added a unit test to assert the specific case you reported.