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

delete assets with a non-existent tenant and set default asset profile to the assets with xss

Browse Source
This commit is contained in:
YevhenBondarenko 2022-11-08 17:34:44 +01:00
parent 2d2d78ae6b
commit 0849aa722f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,6 +622,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.1", "schema_update_before.sql"); schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.1", "schema_update_before.sql");
loadSql(schemaUpdateFile, conn); loadSql(schemaUpdateFile, conn);
conn.createStatement().execute("DELETE FROM asset a WHERE NOT exists(SELECT id FROM tenant WHERE id = a.tenant_id);");
log.info("Creating default asset profiles..."); log.info("Creating default asset profiles...");
PageLink pageLink = new PageLink(1000); PageLink pageLink = new PageLink(1000);
PageData<TbPair<UUID, String>> pageData; PageData<TbPair<UUID, String>> pageData;
@ -654,6 +656,9 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
log.info("Updating asset profiles..."); log.info("Updating asset profiles...");
conn.createStatement().execute("call update_asset_profiles()"); conn.createStatement().execute("call update_asset_profiles()");
conn.createStatement().execute("UPDATE asset a SET asset_profile_id = " +
"(SELECT id FROM asset_profile ap WHERE ap.tenant_id = a.tenant_id AND name='default') WHERE a.asset_profile_id IS NULL;");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.1", "schema_update_after.sql"); schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.1", "schema_update_after.sql");
loadSql(schemaUpdateFile, conn); loadSql(schemaUpdateFile, conn);