From 9febd4a4cb6133cd3694c0bbf3ce94e8e5e8c27d Mon Sep 17 00:00:00 2001
From: Toshiaki Maki <makingx@gmail.com>
Date: Wed, 25 Jun 2014 20:55:35 +0900
Subject: [PATCH] Support sqlScriptEncoding in schema.sql

Fixes gh-1165, fixes gh-1164
---
 .../jdbc/DataSourceInitializer.java           |  1 +
 .../jdbc/DataSourceProperties.java            | 10 +++++++
 .../jdbc/DataSourceInitializerTests.java      | 27 +++++++++++++++++++
 .../boot/autoconfigure/jdbc/encoding-data.sql |  2 ++
 .../autoconfigure/jdbc/encoding-schema.sql    |  4 +++
 .../appendix-application-properties.adoc      |  1 +
 6 files changed, 45 insertions(+)
 create mode 100644 spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
 create mode 100644 spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-schema.sql

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
index d53dfb718c..31f1210105 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -135,6 +135,7 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
 		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
 		populator.setContinueOnError(this.properties.isContinueOnError());
 		populator.setSeparator(this.properties.getSeparator());
+		populator.setSqlScriptEncoding(this.properties.getSqlScriptEncoding());
 		for (Resource resource : resources) {
 			populator.addScript(resource);
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
index 1e888798b8..acfd7a9e15 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -56,6 +56,8 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 
 	private String separator = ";";
 
+	private String sqlScriptEncoding;
+
 	private EmbeddedDatabaseConnection embeddedDatabaseConnection = EmbeddedDatabaseConnection.NONE;
 
 	private DriverClassNameProvider driverClassNameProvider = new DriverClassNameProvider();
@@ -196,6 +198,14 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 		this.separator = separator;
 	}
 
+	public String getSqlScriptEncoding() {
+		return sqlScriptEncoding;
+	}
+
+	public void setSqlScriptEncoding(String sqlScriptEncoding) {
+		this.sqlScriptEncoding = sqlScriptEncoding;
+	}
+
 	public ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java
index f68325b0a1..744ccdd43d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java
@@ -143,6 +143,33 @@ public class DataSourceInitializerTests {
 				template.queryForObject("SELECT COUNT(*) from SPAM", Integer.class));
 	}
 
+	@Test
+	public void testDataSourceInitializedWithExplicitSqlScriptEncoding() throws Exception {
+		this.context.register(DataSourceAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(
+				this.context,
+				"spring.datasource.initialize:true",
+				"spring.datasource.sqlScriptEncoding:UTF-8",
+				"spring.datasource.schema:"
+						+ ClassUtils.addResourcePathToPackagePath(getClass(),
+								"encoding-schema.sql"),
+				"spring.datasource.data:"
+						+ ClassUtils.addResourcePathToPackagePath(getClass(),
+								"encoding-data.sql"));
+		this.context.refresh();
+		DataSource dataSource = this.context.getBean(DataSource.class);
+		assertTrue(dataSource instanceof org.apache.tomcat.jdbc.pool.DataSource);
+		assertNotNull(dataSource);
+		JdbcOperations template = new JdbcTemplate(dataSource);
+		assertEquals(new Integer(2),
+				template.queryForObject("SELECT COUNT(*) from BAR", Integer.class));
+		assertEquals("bar",
+				template.queryForObject("SELECT name from BAR WHERE id=1", String.class));
+		assertEquals("ばー",
+				template.queryForObject("SELECT name from BAR WHERE id=2", String.class));
+	}
+
 	@Configuration
 	@EnableConfigurationProperties
 	protected static class TwoDataSources {
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
new file mode 100644
index 0000000000..bf46c11048
--- /dev/null
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
@@ -0,0 +1,2 @@
+INSERT INTO BAR(id, name) VALUES (1, 'bar');
+INSERT INTO BAR(id, name) VALUES (2, 'ばー');
\ No newline at end of file
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-schema.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-schema.sql
new file mode 100644
index 0000000000..1f1275a0c5
--- /dev/null
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-schema.sql
@@ -0,0 +1,4 @@
+CREATE TABLE BAR (
+  id         INTEGER PRIMARY KEY,
+  name VARCHAR(30),
+);
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 216cb702b1..5be479bfb7 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -158,6 +158,7 @@ content into your application; rather pick only the properties that you need.
 	spring.datasource.initialize=true # populate using data.sql
 	spring.datasource.schema= # a schema (DDL) script resource reference
 	spring.datasource.data= # a data (DML) script resource reference
+	spring.datasource.sqlScriptEncoding= # a charset for reading SQL scripts
 	spring.datasource.platform= # the platform to use in the schema resource (schema-${platform}.sql)
 	spring.datasource.continueOnError=false # continue even if can't be initialized
 	spring.datasource.separator=; # statement separator in SQL initialization scripts