Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-15374][SQL Task]Remove trailing semicolons from a SQL sentence. #15376

Closed
wants to merge 1 commit into from
Closed

[Fix-15374][SQL Task]Remove trailing semicolons from a SQL sentence. #15376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...sk-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/utils/SqlSplitUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,20 @@
import java.util.List;
import java.util.stream.Collectors;

import com.google.common.base.CharMatcher;

public class SqlSplitUtils {

private static final String UNIX_SQL_SEPARATOR = ";\n";
private static final String WINDOWS_SQL_SEPARATOR = ";\r\n";

/**
* remove trailing ; from a sql sentence
*/
public static String removeTrailingSemicolons(String sql) {
return CharMatcher.is(';').trimTrailingFrom(sql);
}

/**
* split sql to submit sql.
* e.g.
Expand All @@ -41,10 +50,9 @@ public class SqlSplitUtils {
public static List<String> splitSql(String sql) {

return Arrays.stream(sql.replaceAll(WINDOWS_SQL_SEPARATOR, UNIX_SQL_SEPARATOR).split(UNIX_SQL_SEPARATOR))
.filter(subSql -> {
String trim = subSql.trim();
return !trim.isEmpty() && !trim.startsWith("--");
}).collect(Collectors.toList());
.map(subSql -> removeTrailingSemicolons(subSql.trim()))
.filter(subSql -> !subSql.isEmpty() && !subSql.startsWith("--"))
.collect(Collectors.toList());
}

}
8 changes: 8 additions & 0 deletions ...ql/src/test/java/org/apache/dolphinscheduler/plugin/task/sql/utils/SqlSplitUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,12 @@ void splitSql() {
Lists.newArrayList("select * from table1", "select * from table2", "select * from table3"),
SqlSplitUtils.splitSql(sql));
}

@Test
void splitSqlTrailingSemicolons() {
String sql = "select * from table1;";
Assertions.assertEquals(
Lists.newArrayList("select * from table1"),
SqlSplitUtils.splitSql(sql));
}
}
Loading