root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add missing tests for multiple comment prefixes in R2DBC ScriptUtils 

See gh-23289
This commit is contained in:
Sam Brannen 2021-05-12 12:23:54 +02:00
parent cda72e4a70
commit 6f5e66f00c
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsUnitTests.java
View File

@ -29,7 +29,12 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.core.io.support.EncodedResource; import org.springframework.core.io.support.EncodedResource;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.r2dbc.connection.init.ScriptUtils.DEFAULT_BLOCK_COMMENT_END_DELIMITER;
import static org.springframework.r2dbc.connection.init.ScriptUtils.DEFAULT_BLOCK_COMMENT_START_DELIMITER;
import static org.springframework.r2dbc.connection.init.ScriptUtils.DEFAULT_COMMENT_PREFIXES;
import static org.springframework.r2dbc.connection.init.ScriptUtils.DEFAULT_STATEMENT_SEPARATOR;
import static org.springframework.r2dbc.connection.init.ScriptUtils.containsSqlScriptDelimiters; import static org.springframework.r2dbc.connection.init.ScriptUtils.containsSqlScriptDelimiters;
import static org.springframework.r2dbc.connection.init.ScriptUtils.splitSqlScript;
/** /**
* Unit tests for {@link ScriptUtils}. * Unit tests for {@link ScriptUtils}.
@ -56,7 +61,7 @@ public class ScriptUtilsUnitTests {
";"); ";");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ";", statements); splitSqlScript(script, ";", statements);
assertThat(statements).hasSize(3).containsSequence(cleanedStatement1, assertThat(statements).hasSize(3).containsSequence(cleanedStatement1,
cleanedStatement2, cleanedStatement3); cleanedStatement2, cleanedStatement3);
@ -71,7 +76,7 @@ public class ScriptUtilsUnitTests {
String script = Strings.join(statement1, statement2, statement3).with("\n"); String script = Strings.join(statement1, statement2, statement3).with("\n");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, "\n", statements); splitSqlScript(script, "\n", statements);
assertThat(statements).hasSize(3).containsSequence(statement1, statement2, assertThat(statements).hasSize(3).containsSequence(statement1, statement2,
statement3); statement3);
@ -87,7 +92,7 @@ public class ScriptUtilsUnitTests {
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR, splitSqlScript(script, DEFAULT_STATEMENT_SEPARATOR,
statements); statements);
assertThat(statements).hasSize(1).contains(script.replace('\n', ' ')); assertThat(statements).hasSize(1).contains(script.replace('\n', ' '));
@ -102,7 +107,7 @@ public class ScriptUtilsUnitTests {
String script = statement1 + delim + statement2 + delim; String script = statement1 + delim + statement2 + delim;
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ';', statements); splitSqlScript(script, ';', statements);
assertThat(statements).hasSize(2).containsSequence(statement1, statement2); assertThat(statements).hasSize(2).containsSequence(statement1, statement2);
} }
@ -111,7 +116,7 @@ public class ScriptUtilsUnitTests {
public void readAndSplitScriptWithMultipleNewlinesAsSeparator() { public void readAndSplitScriptWithMultipleNewlinesAsSeparator() {
String script = readScript("db-test-data-multi-newline.sql"); String script = readScript("db-test-data-multi-newline.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, "\n\n", statements); splitSqlScript(script, "\n\n", statements);
String statement1 = "insert into users (last_name) values ('Walter')"; String statement1 = "insert into users (last_name) values ('Walter')";
String statement2 = "insert into users (last_name) values ('Jesse')"; String statement2 = "insert into users (last_name) values ('Jesse')";
@ -126,19 +131,26 @@ public class ScriptUtilsUnitTests {
@Test @Test
public void readAndSplitScriptContainingComments() { public void readAndSplitScriptContainingComments() {
String script = readScript("test-data-with-comments.sql"); String script = readScript("test-data-with-comments.sql");
splitScriptContainingComments(script); splitScriptContainingComments(script, DEFAULT_COMMENT_PREFIXES);
} }
@Test @Test
public void readAndSplitScriptContainingCommentsWithWindowsLineEnding() { public void readAndSplitScriptContainingCommentsWithWindowsLineEnding() {
String script = readScript("test-data-with-comments.sql").replaceAll("\n", String script = readScript("test-data-with-comments.sql").replaceAll("\n",
"\r\n"); "\r\n");
splitScriptContainingComments(script); splitScriptContainingComments(script, DEFAULT_COMMENT_PREFIXES);
} }
private void splitScriptContainingComments(String script) { @Test
public void readAndSplitScriptContainingCommentsWithMultiplePrefixes() throws Exception {
String script = readScript("test-data-with-multi-prefix-comments.sql");
splitScriptContainingComments(script, "--", "#", "^");
}
private void splitScriptContainingComments(String script, String... commentPrefixes) {
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ';', statements); splitSqlScript(null, script, ";", commentPrefixes, DEFAULT_BLOCK_COMMENT_START_DELIMITER,
DEFAULT_BLOCK_COMMENT_END_DELIMITER, statements);
String statement1 = "insert into customer (id, name) values (1, 'Rod; Johnson'), (2, 'Adrian Collier')"; String statement1 = "insert into customer (id, name) values (1, 'Rod; Johnson'), (2, 'Adrian Collier')";
String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2008-01-02', 2)"; String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2008-01-02', 2)";
@ -153,7 +165,7 @@ public class ScriptUtilsUnitTests {
public void readAndSplitScriptContainingCommentsWithLeadingTabs() { public void readAndSplitScriptContainingCommentsWithLeadingTabs() {
String script = readScript("test-data-with-comments-and-leading-tabs.sql"); String script = readScript("test-data-with-comments-and-leading-tabs.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ';', statements); splitSqlScript(script, ';', statements);
String statement1 = "insert into customer (id, name) values (1, 'Walter White')"; String statement1 = "insert into customer (id, name) values (1, 'Walter White')";
String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2013-06-08', 1)"; String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2013-06-08', 1)";
@ -167,7 +179,7 @@ public class ScriptUtilsUnitTests {
public void readAndSplitScriptContainingMultiLineComments() { public void readAndSplitScriptContainingMultiLineComments() {
String script = readScript("test-data-with-multi-line-comments.sql"); String script = readScript("test-data-with-multi-line-comments.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ';', statements); splitSqlScript(script, ';', statements);
String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Walter', 'White')"; String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Walter', 'White')";
String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Jesse' , 'Pinkman' )"; String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Jesse' , 'Pinkman' )";
@ -179,7 +191,7 @@ public class ScriptUtilsUnitTests {
public void readAndSplitScriptContainingMultiLineNestedComments() { public void readAndSplitScriptContainingMultiLineNestedComments() {
String script = readScript("test-data-with-multi-line-nested-comments.sql"); String script = readScript("test-data-with-multi-line-nested-comments.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
ScriptUtils.splitSqlScript(script, ';', statements); splitSqlScript(script, ';', statements);
String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Walter', 'White')"; String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Walter', 'White')";
String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Jesse' , 'Pinkman' )"; String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Jesse' , 'Pinkman' )";

18
spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/test-data-with-multi-prefix-comments.sql Normal file
View File

@ -0,0 +1,18 @@
-- The next comment line has no text after the '--' prefix.
--
-- The next comment line starts with a space.
-- x, y, z...
insert into customer (id, name)
values (1, 'Rod; Johnson'), (2, 'Adrian Collier');
-- This is also a comment.
insert into orders(id, order_date, customer_id)
values (1, '2008-01-02', 2);
# A comment with a different prefix
insert into orders(id, order_date, customer_id) values (1, '2008-01-02', 2);
INSERT INTO persons( person_id--
, name)
^ A comment with yet another different prefix
VALUES( 1 -- person_id
, 'Name' --name
);--