Merge pull request #12 from aasaru/FINCN-180
FINCN-180 cleanup code that creates seshat db. make travis build 'dev…
diff --git a/service/src/main/java/org/apache/fineract/cn/provisioner/internal/repository/ProvisionerInitializer.java b/service/src/main/java/org/apache/fineract/cn/provisioner/internal/repository/ProvisionerInitializer.java
index 8c86dcf..f1d502c 100644
--- a/service/src/main/java/org/apache/fineract/cn/provisioner/internal/repository/ProvisionerInitializer.java
+++ b/service/src/main/java/org/apache/fineract/cn/provisioner/internal/repository/ProvisionerInitializer.java
@@ -85,7 +85,6 @@
this.initializeCassandra();
this.initializeDatabase(PostgreSQLConstants.POSTGRESQL_DATABASE_NAME_DEFAULT);
this.createTableTenants();
- //this.initializeDatabase("playground");
} catch (final Exception ex) {
throw new IllegalStateException("Could not initialize service!", ex);
}
@@ -198,9 +197,9 @@
}
}
- private void initializeDatabase(String postgresDbName) throws Exception {
+ private void initializeDatabase(String metaDatabaseName) throws Exception {
- this.logger.info("Creating meta database {} ", postgresDbName);
+ this.logger.info("Creating meta database {} ", metaDatabaseName);
try (
final Connection connection = DataSourceUtils.createProvisionerConnection(this.environment, "postgres");
final Statement testStatement = connection.createStatement();
@@ -209,12 +208,12 @@
final ResultSet validityQuery = testStatement.executeQuery("SELECT 1");
if (validityQuery.next()){
this.logger.info("Connection to database postgres established");
- final ResultSet findDB = statement.executeQuery("SELECT datname FROM pg_database WHERE datname = '" + postgresDbName + "'");
+ final ResultSet findDB = statement.executeQuery("SELECT datname FROM pg_database WHERE datname = '" + metaDatabaseName + "'");
if (!findDB.next()) {
- this.logger.info("Database {} does not exists, creating the database {} now.", postgresDbName);
- statement.execute("CREATE DATABASE " + postgresDbName);
+ this.logger.info("Database {} does not exists, creating the database {} now.", metaDatabaseName);
+ statement.execute("CREATE DATABASE " + metaDatabaseName);
} else {
- this.logger.info("Database {} already exists.", postgresDbName);
+ this.logger.info("Database {} already exists.", metaDatabaseName);
}
} else {
this.logger.warn("Could not connect to database postgres");
@@ -252,4 +251,4 @@
throw new IllegalStateException("Could not create table tenants");
}
}
-}
\ No newline at end of file
+}
diff --git a/service/src/main/java/org/apache/fineract/cn/provisioner/internal/util/DataSourceUtils.java b/service/src/main/java/org/apache/fineract/cn/provisioner/internal/util/DataSourceUtils.java
index f8c89a6..7d81392 100644
--- a/service/src/main/java/org/apache/fineract/cn/provisioner/internal/util/DataSourceUtils.java
+++ b/service/src/main/java/org/apache/fineract/cn/provisioner/internal/util/DataSourceUtils.java
@@ -64,9 +64,9 @@
public static Connection createProvisionerConnection(final Environment environment, String databaseName) {
final DatabaseConnectionInfo databaseConnectionInfo = new DatabaseConnectionInfo();
databaseConnectionInfo.setDriverClass(environment.getProperty("postgresql.driverClass"));
- databaseName = databaseName.equals(PostgreSQLConstants.POSTGRESQL_DATABASE_NAME_DEFAULT) ? PostgreSQLConstants.POSTGRESQL_DATABASE_NAME_DEFAULT :
- (databaseName.equals("playground") ? "playground" : "postgres");
- databaseConnectionInfo.setDatabaseName(databaseName);
+ if (databaseName != null) {
+ databaseConnectionInfo.setDatabaseName(databaseName);
+ }
databaseConnectionInfo.setHost(environment.getProperty("postgresql.host"));
databaseConnectionInfo.setPort(environment.getProperty("postgresql.port"));
databaseConnectionInfo.setUser(environment.getProperty("postgresql.user"));
diff --git a/shared.gradle b/shared.gradle
index 02a5db0..df19a19 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -88,7 +88,7 @@
}
}
}
-artifactoryPublish.dependsOn('clean','publishToMavenLocal')
+artifactoryPublish.dependsOn('publishToMavenLocal')
license {
header rootProject.file('../HEADER')
