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

Merge branch 'feature/edge' into develop/3.0-edge

Browse Source
This commit is contained in:
Volodymyr Babak 2020-04-20 15:54:18 +03:00
commit 7d10134f77
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,10 +233,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
conn.createStatement().execute("ALTER TABLE entity_view ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script conn.createStatement().execute("ALTER TABLE entity_view ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {} } catch (Exception e) {}
try { try {
conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {} } catch (Exception e) {}
try { try {
conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
} catch (Exception e) {} } catch (Exception e) {}
try { try {
conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'SYSTEM'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'SYSTEM'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script

6
dao/src/main/resources/sql/schema-entities-hsql.sql
View File

@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard (
id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
configuration varchar(10000000), configuration varchar(10000000),
assigned_customers varchar(1000000), assigned_customers varchar(1000000),
assigned_edges varchar(1000000), assigned_edges varchar(10000000),
search_text varchar(255), search_text varchar(255),
tenant_id varchar(31), tenant_id varchar(31),
title varchar(255) title varchar(255)
@ -226,7 +226,7 @@ CREATE TABLE IF NOT EXISTS rule_chain (
debug_mode boolean, debug_mode boolean,
search_text varchar(255), search_text varchar(255),
tenant_id varchar(31), tenant_id varchar(31),
assigned_edges varchar(1000000) assigned_edges varchar(10000000)
); );
CREATE TABLE IF NOT EXISTS rule_node ( CREATE TABLE IF NOT EXISTS rule_node (
@ -269,4 +269,4 @@ CREATE TABLE IF NOT EXISTS edge (
secret varchar(255), secret varchar(255),
search_text varchar(255), search_text varchar(255),
tenant_id varchar(31) tenant_id varchar(31)
); );

4
dao/src/main/resources/sql/schema-entities.sql
View File

@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard (
id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
configuration varchar(10000000), configuration varchar(10000000),
assigned_customers varchar(1000000), assigned_customers varchar(1000000),
assigned_edges varchar(1000000), assigned_edges varchar(10000000),
search_text varchar(255), search_text varchar(255),
tenant_id varchar(31), tenant_id varchar(31),
title varchar(255) title varchar(255)
@ -226,7 +226,7 @@ CREATE TABLE IF NOT EXISTS rule_chain (
debug_mode boolean, debug_mode boolean,
search_text varchar(255), search_text varchar(255),
tenant_id varchar(31), tenant_id varchar(31),
assigned_edges varchar(1000000) assigned_edges varchar(10000000)
); );
CREATE TABLE IF NOT EXISTS rule_node ( CREATE TABLE IF NOT EXISTS rule_node (

5
dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
View File

@ -124,7 +124,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
dashboard.setTenantId(tenantId); dashboard.setTenantId(tenantId);
dashboard = dashboardService.saveDashboard(dashboard); dashboard = dashboardService.saveDashboard(dashboard);
Tenant tenant = new Tenant(); Tenant tenant = new Tenant();
tenant.setTitle("Test different tenant"); tenant.setTitle("Test different tenant [dashboard]");
tenant = tenantService.saveTenant(tenant); tenant = tenantService.saveTenant(tenant);
Customer customer = new Customer(); Customer customer = new Customer();
customer.setTenantId(tenant.getId()); customer.setTenantId(tenant.getId());
@ -349,12 +349,13 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
dashboard.setTenantId(tenantId); dashboard.setTenantId(tenantId);
dashboard = dashboardService.saveDashboard(dashboard); dashboard = dashboardService.saveDashboard(dashboard);
Tenant tenant = new Tenant(); Tenant tenant = new Tenant();
tenant.setTitle("Test different tenant"); tenant.setTitle("Test different tenant [edge]");
tenant = tenantService.saveTenant(tenant); tenant = tenantService.saveTenant(tenant);
Edge edge = new Edge(); Edge edge = new Edge();
edge.setTenantId(tenant.getId()); edge.setTenantId(tenant.getId());
edge.setType("default"); edge.setType("default");
edge.setName("Test different edge"); edge.setName("Test different edge");
edge.setType("default");
edge = edgeService.saveEdge(edge); edge = edgeService.saveEdge(edge);
try { try {
dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), edge.getId()); dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), edge.getId());