Refactor database upgrade services

application/src/main/java/org/thingsboard/server/service/install/AbstractSqlTsDatabaseUpgradeService.java

@@ -50,7 +50,7 @@ public abstract class AbstractSqlTsDatabaseUpgradeService {
     @Autowired
     protected InstallScripts installScripts;
 
-    protected abstract void loadSql(Connection conn, String fileName);
+    protected abstract void loadSql(Connection conn, String fileName, String version);
 
     protected void loadFunctions(Path sqlFile, Connection conn) throws Exception {
         String sql = new String(Files.readAllBytes(sqlFile), StandardCharsets.UTF_8);

application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java

@@ -94,7 +94,7 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
                         log.info("PostgreSQL version is valid!");
                         if (isOldSchema(conn, 2004003)) {
                             log.info("Load upgrade functions ...");
-                            loadSql(conn, LOAD_FUNCTIONS_SQL);
+                            loadSql(conn, LOAD_FUNCTIONS_SQL, "2.4.3");
                             log.info("Updating timeseries schema ...");
                             executeQuery(conn, CALL_CREATE_PARTITION_TS_KV_TABLE);
                             if (!partitionType.equals("INDEFINITE")) {
@@ -179,9 +179,9 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
                         }
 
                         log.info("Load TTL functions ...");
-                        loadSql(conn, LOAD_TTL_FUNCTIONS_SQL);
+                        loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "2.4.3");
                         log.info("Load Drop Partitions functions ...");
-                        loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL);
+                        loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL, "2.4.3");
 
                         executeQuery(conn, "UPDATE tb_schema_settings SET schema_version = 2005000");
 
@@ -199,9 +199,9 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
             case "3.2.1":
                 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
                     log.info("Load TTL functions ...");
-                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL);
+                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "2.4.3");
                     log.info("Load Drop Partitions functions ...");
-                    loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL);
+                    loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL, "2.4.3");
 
                     executeQuery(conn, "DROP PROCEDURE IF EXISTS cleanup_timeseries_by_ttl(character varying, bigint, bigint);");
                     executeQuery(conn, "DROP FUNCTION IF EXISTS delete_asset_records_from_ts_kv(character varying, character varying, bigint);");
@@ -244,8 +244,8 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
     }
 
     @Override
-    protected void loadSql(Connection conn, String fileName) {
+    protected void loadSql(Connection conn, String fileName, String version) {
-        Path schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.4.3", fileName);
+        Path schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", version, fileName);
         try {
             loadFunctions(schemaUpdateFile, conn);
             log.info("Functions successfully loaded!");

application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java

@@ -89,7 +89,7 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
                         log.info("PostgreSQL version is valid!");
                         if (isOldSchema(conn, 2004003)) {
                             log.info("Load upgrade functions ...");
-                            loadSql(conn, LOAD_FUNCTIONS_SQL);
+                            loadSql(conn, LOAD_FUNCTIONS_SQL, "2.4.3");
                             log.info("Updating timescale schema ...");
                             executeQuery(conn, CALL_CREATE_TS_KV_LATEST_TABLE);
                             executeQuery(conn, CALL_CREATE_NEW_TENANT_TS_KV_TABLE);
@@ -165,7 +165,7 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
                         }
 
                         log.info("Load TTL functions ...");
-                        loadSql(conn, LOAD_TTL_FUNCTIONS_SQL);
+                        loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "2.4.3");
 
                         executeQuery(conn, "UPDATE tb_schema_settings SET schema_version = 2005000");
                         log.info("schema timescale updated!");
@@ -181,7 +181,7 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
                 break;
             case "3.2.1":
                 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
-                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL);
+                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "3.2.1");
                 }
                 break;
             default:
@@ -205,8 +205,8 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
     }
 
     @Override
-    protected void loadSql(Connection conn, String fileName) {
+    protected void loadSql(Connection conn, String fileName, String version) {
-        Path schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.4.3", fileName);
+        Path schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", version, fileName);
         try {
             loadFunctions(schemaUpdateFile, conn);
             log.info("Functions successfully loaded!");