Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgrade flywaydb to fix cleaning schema issue

Rich Turner6af47a70a944
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 656e248df..a1f75cee6 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -212,15 +212,18 @@ public class PersistenceService implements ContainerService {
protected void prepareSchemas(String connectionUrl, String databaseUsername, String databasePassword) {
LOG.fine("Preparing database schema");
- flyway = new Flyway();
- flyway.setDataSource(connectionUrl, databaseUsername, databasePassword);
List<String> locations = new ArrayList<>();
List<String> schemas = new ArrayList<>();
schemas.add(DEFAULT_SCHEMA_NAME);
appendSchemas(schemas);
appendSchemaLocations(locations);
- flyway.setSchemas(schemas.toArray(new String[0]));
- flyway.setLocations(locations.toArray(new String[0]));
+
+ flyway = Flyway.configure()
+ .dataSource(connectionUrl, databaseUsername, databasePassword)
+ .schemas(schemas.toArray(new String[0]))
+ .locations(locations.toArray(new String[0]))
+ .baselineOnMigrate(true)
+ .load();
if (forceClean) {
LOG.warning("!!! Cleaning database !!!");
diff --git a/container/src/main/java/org/openremote/container/persistence/migrations/V0_1_2__ExampleMigration.java b/container/src/main/java/org/openremote/container/persistence/migrations/V0_1_2__ExampleMigration.java
index 0cec579ab..37f9df304 100644
--- a/container/src/main/java/org/openremote/container/persistence/migrations/V0_1_2__ExampleMigration.java
+++ b/container/src/main/java/org/openremote/container/persistence/migrations/V0_1_2__ExampleMigration.java
@@ -19,16 +19,17 @@
*/
package org.openremote.container.persistence.migrations;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
-import java.sql.Connection;
import java.sql.PreparedStatement;
-public class V0_1_2__ExampleMigration implements JdbcMigration {
+public class V0_1_2__ExampleMigration extends BaseJavaMigration {
+
@Override
- public void migrate(Connection connection) throws Exception {
+ public void migrate(Context context) throws Exception {
PreparedStatement statement =
- connection.prepareStatement("ALTER TABLE public.asset ADD COLUMN test_column varchar(50)");
+ context.getConnection().prepareStatement("ALTER TABLE public.asset ADD COLUMN test_column varchar(50)");
try {
statement.execute();
diff --git a/gradle.properties b/gradle.properties
index 07116ee2d..979c2f06e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,7 +42,7 @@ nrjavaserialVersion = 3.15.0
saxonHEVersion = 9.8.0-3
jmxtermVersion = 1.0.0
nettyVersion = 4.1.37.Final
-flywaydbVersion = 4.2.0
+flywaydbVersion = 6.4.3
ical4jVersion = 2.1.5
jafamaVersion = 2.3.1
friendlyIdVersion = 1.0.1
diff --git a/manager/src/main/java/org/openremote/manager/setup/database/Disabled_V20171031_03__Migration.java b/manager/src/main/java/org/openremote/manager/setup/database/Disabled_V20171031_03__Migration.java
index 7806af4f6..cd49c6f2e 100644
--- a/manager/src/main/java/org/openremote/manager/setup/database/Disabled_V20171031_03__Migration.java
+++ b/manager/src/main/java/org/openremote/manager/setup/database/Disabled_V20171031_03__Migration.java
@@ -19,7 +19,8 @@
*/
package org.openremote.manager.setup.database;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -27,12 +28,12 @@ import java.sql.PreparedStatement;
/**
* TODO An example in the right place
*/
-public class Disabled_V20171031_03__Migration { // implements JdbcMigration {
+public class Disabled_V20171031_03__Migration { //extends BaseJavaMigration {
// @Override
- public void migrate(Connection connection) throws Exception {
+ public void migrate(Context context) throws Exception {
/* TODO: Enable to migrate beyond 3.0.0 when SQL files are not good enough
- try (PreparedStatement statement = connection.prepareStatement(
+ try (PreparedStatement statement = context.getConnection().prepareStatement(
"alter table openremote.ASSET add column TEST_COLUMN varchar(50)"
)) {
statement.execute();