From 4b08b71f64dff95fd86a2cd2ea9802c482779e3f Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 6 Jun 2017 16:26:21 +0200
Subject: [PATCH] Run controlled database migration only when not generating
 schema automatically Connect set to readonly(false) by default by JDBC pool

---
 pom.xml                                         |  2 +-
 .../spring/config/SpringDataBaseConfig.java     | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d9f4aaf8..34aa431ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 
 		<aspectj.version>1.7.2</aspectj.version>
 
-		<mysql.version>5.1.31</mysql.version>
+		<mysql.version>5.1.38</mysql.version>
 		<hazelcast.version>3.8.1</hazelcast.version>
 
 		<oval.version>1.81</oval.version>
diff --git a/src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java b/src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
index 3252349ce..5b4c93adc 100644
--- a/src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
+++ b/src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
@@ -30,7 +30,6 @@ import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
@@ -88,6 +87,7 @@ public class SpringDataBaseConfig {
 	@Bean
 	public DataSource dataSource() {
 		final DataSource dataSource = new DataSource();
+		dataSource.setDefaultReadOnly(false);
 		dataSource.setUrl(dbUrl);
 		dataSource.setDriverClassName(dbDriverClassName);
 		dataSource.setUsername(dbUsername);
@@ -103,26 +103,19 @@ public class SpringDataBaseConfig {
 
 		return dataSource;
 	}
-	
+
 	@Bean
 	public JdbcTemplate jdbcTemplate(DataSource dataSource) {
 		return new JdbcTemplate(dataSource);
 	}
 
-	private javax.sql.DataSource liquibaseDataSource() {
-		DriverManagerDataSource dataSource=new DriverManagerDataSource();
-		dataSource.setDriverClassName(dbDriverClassName);
-		dataSource.setUrl(dbUrl);
-		dataSource.setUsername(dbUsername);
-		dataSource.setPassword(dbPassword);
-		return dataSource;
-	}
-
 	@Bean(name = "databaseMigration")
 	public SpringLiquibase databaseMigration() {
 		SpringLiquibase liquibase = new SpringLiquibase();
+		// Run controlled database migration only when not generating schema automatically
+		liquibase.setShouldRun(!dbGenerateDdl);
 		liquibase.setChangeLog("classpath:liquibase/liquibase-changeLog.yml");
-		liquibase.setDataSource(liquibaseDataSource());
+		liquibase.setDataSource(dataSource());
 		return liquibase;
 	}
 
-- 
GitLab