Skip to content

Cannot initialize Quartz with scripts containing custom prefix comment #13041

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

Closed
wants to merge 2 commits into from
Closed

Cannot initialize Quartz with scripts containing custom prefix comment #13041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05d5d79
Update DataSourceInitializer.java
linkqu May 3, 2018
a050c7c
Update DataSourceProperties.java
linkqu May 3, 2018
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
1 change: 1 addition & 0 deletions ...gure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ private void runScripts(List<Resource> resources, String username, String passwo
ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
populator.setContinueOnError(this.properties.isContinueOnError());
populator.setSeparator(this.properties.getSeparator());
populator.setCommentPrefix(this.properties.getCommentPrefix());
if (this.properties.getSqlScriptEncoding() != null) {
populator.setSqlScriptEncoding(this.properties.getSqlScriptEncoding().name());
}
Expand Down
14 changes: 14 additions & 0 deletions ...igure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import javax.sql.DataSource;

import org.springframework.jdbc.datasource.init.ScriptUtils;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.InitializingBean;
Expand Down Expand Up @@ -143,6 +144,11 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
* Statement separator in SQL initialization scripts.
*/
private String separator = ";";

/**
* Prefix that identifies single-line comments within the SQL scripts.
*/
private String commentPrefix = ScriptUtils.DEFAULT_COMMENT_PREFIX;

/**
* SQL scripts encoding.
Expand Down Expand Up @@ -457,6 +463,14 @@ public String getSeparator() {
public void setSeparator(String separator) {
this.separator = separator;
}

public String getCommentPrefix() {
return this.commentPrefix;
}

public void setCommentPrefix(String commentPrefix) {
this.commentPrefix = commentPrefix;
}

public Charset getSqlScriptEncoding() {
return this.sqlScriptEncoding;
Expand Down