hibernate.hbm2ddl.import_files parameter can be set for hibernate

Nikita Sapozhnikov · Nikita Sapozhnikov · commit 49a8c3885342 · 2016-03-15T19:06:08.000Z
diff --git a/micro-hibernate/src/main/java/com/aol/micro/server/spring/datasource/hibernate/HibernateSessionBuilder.java b/micro-hibernate/src/main/java/com/aol/micro/server/spring/datasource/hibernate/HibernateSessionBuilder.java
@@ -42,7 +42,12 @@ public SessionFactory sessionFactory() {
 
 		if (env.getDdlAuto() != null)
 			p.setProperty("hibernate.hbm2ddl.auto", env.getDdlAuto());
-
+		
+		if(env.getInitializationFile() != null) {
+			p.setProperty("hibernate.hbm2ddl.import_files", env.getInitializationFile());
+			
+		}
+		
 		logger.info("Hibernate properties [  hibernate.dialect : {} ; hibernate.hbm2ddl.auto : {} ]", env.getDialect(), env.getDdlAuto());
 
 		sessionFactoryBean.setHibernateProperties(p);
diff --git a/micro-jdbc/src/main/java/com/aol/micro/server/spring/datasource/JdbcConfig.java b/micro-jdbc/src/main/java/com/aol/micro/server/spring/datasource/JdbcConfig.java
@@ -29,12 +29,13 @@ public class JdbcConfig {
 	private final Properties properties;
 	private final String name;
 	private final String generateDdl;
-
+	private final String initializationFile;
+	
 	public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Value("${db.connection.url:}") String url,
 			@Value("${db.connection.username:}") String username, @Value("${db.connection.password:}") String password,
 			@Value("${db.connection.hibernate.showsql:false}") String showSql, @Value("${db.connection.dialect:}") String dialect,
 			@Value("${db.connection.ddl.auto:#{null}}") String ddlAuto) {
-		this(driverClassName, url, username, password, showSql, dialect, ddlAuto, new Properties(), "db", "false");
+		this(driverClassName, url, username, password, showSql, dialect, ddlAuto, new Properties(), "db", "false", null);
 
 	}
 
@@ -43,7 +44,8 @@ public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Va
 			@Value("${db.connection.username:}") String username, @Value("${db.connection.password:}") String password,
 			@Value("${db.connection.hibernate.showsql:false}") String showSql, @Value("${db.connection.dialect:}") String dialect,
 			@Value("${db.connection.ddl.auto:#{null}}") String ddlAuto, @Qualifier("propertyFactory") Properties properties,
-			@Value("${internal.not.use.microserver:#{null}}") String name, @Value("${db.connection.generate.ddl:false}") String generateDdl) {
+			@Value("${internal.not.use.microserver:#{null}}") String name, @Value("${db.connection.generate.ddl:false}") String generateDdl,
+			@Value("${db.connection.ddl.init:#{null}}") String initializationFile) {
 		this.properties = properties;
 		this.name = UsefulStaticMethods.either(name, new ConfigAccessor().get().getDefaultDataSourceName());
 		this.driverClassName = UsefulStaticMethods.either(driverClassName, extract("connection.driver"));
@@ -53,7 +55,8 @@ public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Va
 		this.showSql = UsefulStaticMethods.either(showSql, extract("connection.showsql"));
 		this.dialect = UsefulStaticMethods.either(dialect, extract("connection.dialect"));
 		this.ddlAuto = UsefulStaticMethods.either(ddlAuto, extract("connection.ddl.auto"));
-		this.generateDdl = UsefulStaticMethods.either(generateDdl, extract("connection.generate.ddl"));		
+		this.generateDdl = UsefulStaticMethods.either(generateDdl, extract("connection.generate.ddl"));	
+		this.initializationFile = initializationFile;
 	}
 
 	private String extract(String suffix) {
diff --git a/micro-jdbc/src/test/java/com/aol/micro/server/JdbcConfigTest.java b/micro-jdbc/src/test/java/com/aol/micro/server/JdbcConfigTest.java
@@ -19,7 +19,7 @@ public class JdbcConfigTest {
 	@Before
 	public void setUp() throws Exception {
 		Config.instance();
-		config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false");
+		config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false", "test");
 
 	}
 
@@ -33,5 +33,7 @@ public void test() {
 		assertThat(config.getUsername(), is("username"));
 		assertThat(config.getPassword(), is("password"));
 		assertThat(config.getShowSql(), is("showSql"));		
+		assertThat(config.getInitializationFile(), is("test"));		
+
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class JdbcConfigTest {`
`19`	`19`	`@Before`
`20`	`20`	`public void setUp() throws Exception {`
`21`	`21`	`Config.instance();`
`22`		`- config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false");`
	`22`	`+ config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false", "test");`
`23`	`23`
`24`	`24`	`}`
`25`	`25`
`@@ -33,5 +33,7 @@ public void test() {`
`33`	`33`	`assertThat(config.getUsername(), is("username"));`
`34`	`34`	`assertThat(config.getPassword(), is("password"));`
`35`	`35`	`assertThat(config.getShowSql(), is("showSql"));`
	`36`	`+ assertThat(config.getInitializationFile(), is("test"));`
	`37`	`+`
`36`	`38`	`}`
`37`	`39`	`}`