dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix update for alarms of removed tenants

Browse Source
This commit is contained in:
Andrii Shvaika 2023-09-11 15:39:14 +03:00
parent 3117af791c
commit f0d9ba914d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/upgrade/3.5.1/schema_update.sql
View File

@ -127,6 +127,8 @@ UPDATE resource
ALTER TABLE notification_request ALTER COLUMN info SET DATA TYPE varchar(1000000); ALTER TABLE notification_request ALTER COLUMN info SET DATA TYPE varchar(1000000);
DELETE FROM alarm WHERE tenant_id NOT IN (SELECT id FROM tenant);
CREATE TABLE IF NOT EXISTS alarm_types ( CREATE TABLE IF NOT EXISTS alarm_types (
tenant_id uuid NOT NULL, tenant_id uuid NOT NULL,
type varchar(255) NOT NULL, type varchar(255) NOT NULL,

6
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
View File

@ -731,8 +731,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
break; break;
case "3.5.1": case "3.5.1":
try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
log.info("Updating schema ...");
if (isOldSchema(conn, 3005001)) { if (isOldSchema(conn, 3005001)) {
log.info("Updating schema ...");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.5.1", SCHEMA_UPDATE_SQL); schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.5.1", SCHEMA_UPDATE_SQL);
loadSql(schemaUpdateFile, conn); loadSql(schemaUpdateFile, conn);
@ -762,8 +762,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
} }
conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3005002;"); conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3005002;");
log.info("Schema updated to version 3.5.2.");
} else {
log.info("Skip schema re-update to version 3.5.2. Use env flag 'SKIP_SCHEMA_VERSION_CHECK' to force the re-update.");
} }
log.info("Schema updated.");
} catch (Exception e) { } catch (Exception e) {
log.error("Failed updating schema!!!", e); log.error("Failed updating schema!!!", e);
} }