Merge pull request #1386 from SCADA-LTS/f_1376/#1377-Remove-migration…

…-2.2._ #1376 Correcting migration 2.2, 2.3
SCADA-LTS · Sep 15, 2020 · a7c20d3 · a7c20d3
2 parents 89eec60 + a74159d
commit a7c20d3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 74 deletions.
diff --git a/src/com/serotonin/mango/db/MySQLAccess.java b/src/com/serotonin/mango/db/MySQLAccess.java
@@ -24,7 +24,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.flywaydb.core.Flyway;
-import org.scada_lts.dao.migration.CorrectMigration2_2;
 import org.springframework.dao.DataAccessException;
 
 import com.serotonin.db.spring.ExtendedJdbcTemplate;
@@ -95,8 +94,7 @@ protected boolean newDatabaseCheck(ExtendedJdbcTemplate ejt) {
          }
          return false;
          */
-
-        //TODO enable flayway
+
 
     	boolean shemaExist = true;
     	boolean baseLineNotExist = false;
@@ -117,11 +115,6 @@ protected boolean newDatabaseCheck(ExtendedJdbcTemplate ejt) {
         	LOG.info("BaseLineNotExist:"+baseLineNotExist);
         }
 
-        if (shemaExist && !baseLineNotExist) {
-            CorrectMigration2_2.correct();
-        }
-
-
         try {
             Flyway flyway = null;
 

diff --git a/src/org/scada_lts/dao/migration/CorrectMigration2_2.java b/src/org/scada_lts/dao/migration/CorrectMigration2_2.java
diff --git a/src/org/scada_lts/dao/migration/mysql/V2_3__FaultsAndAlarms.java b/src/org/scada_lts/dao/migration/mysql/V2_3__FaultsAndAlarms.java
@@ -48,6 +48,53 @@ public void migrate(Context context) throws Exception {
 
         final JdbcTemplate jdbcTmp = DAO.getInstance().getJdbcTemp();
 
+        jdbcTmp.execute("DROP VIEW IF EXISTS apiAlarmsAcknowledge;");
+        //(1)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.1.3';");
+
+        jdbcTmp.execute("DROP VIEW IF EXISTS apiAlarmsHistory;");
+        //(2)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.1.2';");
+
+        jdbcTmp.execute("DROP PROCEDURE IF EXISTS prc_sort_alarms_and_storungs_depend_on_state;");
+        jdbcTmp.execute("DROP TEMPORARY TABLE IF EXISTS tmp_sortedAlarmsStorungs;");
+        //(3)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.1.1.1';");
+
+        jdbcTmp.execute("DROP VIEW IF EXISTS apiAlarmsLive;");
+        //(4)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.1.1';");
+
+        jdbcTmp.execute("DROP VIEW IF EXISTS viewAllStorungs;");
+        jdbcTmp.execute("DROP VIEW IF EXISTS viewAllAlarms;");
+        //(5)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.1';");
+
+        try {
+            jdbcTmp.execute("ALTER TABLE dataPoints DROP COLUMN pointName;");
+        } catch (Exception e) {
+            LOG.warn(e);
+        }
+        //(6)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.0.2';");
+
+        jdbcTmp.execute("DROP TABLE IF EXISTS plcAlarms;");
+        //(7)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.0.1';");
+
+        jdbcTmp.execute( "DROP TRIGGER IF EXISTS onlyForStorungsAndAlarmValues;");
+        //(8)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.0.0.1';");
+
+        try {
+            jdbcTmp.execute("ALTER TABLE dataPoints DROP COLUMN plcAlarmLevel;");
+        } catch (Exception e) {
+            LOG.warn(e);
+        }
+        //(9)
+        jdbcTmp.execute( "DELETE FROM schema_version WHERE version = '2.2.0';");
+
+
         addColumnsToDataPointsTable(jdbcTmp);
         updateDataPointsTable(jdbcTmp);
         createPlcAlarmsTable(jdbcTmp);