From c7d446a19dc2a69bf7b08672aa42ca8e6ddcb5b1 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 21 Mar 2023 11:27:15 +0100 Subject: [PATCH] fixed upgrade schema update --- application/src/main/data/upgrade/3.4.4/schema_update.sql | 2 -- .../server/service/install/SqlDatabaseUpgradeService.java | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/application/src/main/data/upgrade/3.4.4/schema_update.sql b/application/src/main/data/upgrade/3.4.4/schema_update.sql index d71fc158ef..17e5632a28 100644 --- a/application/src/main/data/upgrade/3.4.4/schema_update.sql +++ b/application/src/main/data/upgrade/3.4.4/schema_update.sql @@ -72,8 +72,6 @@ WHERE cleared = FALSE ORDER BY l.created_time DESC, l.id LIMIT 1); -VACUUM FULL ANALYZE alarm; - -- ALARM STATUS REFACTORING END -- ALARM COMMENTS START diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index b9ff5383b5..f5f212beb2 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java @@ -684,6 +684,11 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.4", SCHEMA_UPDATE_SQL); loadSql(schemaUpdateFile, conn); + try { + conn.createStatement().execute("VACUUM FULL ANALYZE alarm;"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script + } catch (Exception e) { + } + try { conn.createStatement().execute("ALTER TABLE asset_profile ADD COLUMN default_edge_rule_chain_id uuid"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script } catch (Exception e) {