From c78bd55df5c866125b156d1841fc58dd41262f69 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 5 Mar 2021 19:10:44 +0200
Subject: [PATCH] added resource table to hsql schema

---
 .../thingsboard/server/dao/tenant/TenantServiceImpl.java  | 5 +++++
 dao/src/main/resources/sql/schema-entities-hsql.sql       | 8 ++++++++
 dao/src/test/resources/sql/hsql/drop-all-tables.sql       | 1 +
 dao/src/test/resources/sql/psql/drop-all-tables.sql       | 3 ++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 12fdd3a57a..3016474f27 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -35,6 +35,7 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -88,6 +89,9 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     @Autowired
     private RuleChainService ruleChainService;
 
+    @Autowired
+    private ResourceService resourceService;
+
     @Override
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
@@ -140,6 +144,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
         userService.deleteTenantAdmins(tenantId);
         ruleChainService.deleteRuleChainsByTenantId(tenantId);
         apiUsageStateService.deleteApiUsageStateByTenantId(tenantId);
+        resourceService.deleteResourcesByTenantId(tenantId);
         tenantDao.removeById(tenantId, tenantId.getId());
         deleteEntityRelations(tenantId, tenantId);
     }
diff --git a/dao/src/main/resources/sql/schema-entities-hsql.sql b/dao/src/main/resources/sql/schema-entities-hsql.sql
index ee658f8da4..787f457c6a 100644
--- a/dao/src/main/resources/sql/schema-entities-hsql.sql
+++ b/dao/src/main/resources/sql/schema-entities-hsql.sql
@@ -420,3 +420,11 @@ CREATE TABLE IF NOT EXISTS api_usage_state (
     sms_exec varchar(32),
     CONSTRAINT api_usage_state_unq_key UNIQUE (tenant_id, entity_id)
 );
+
+CREATE TABLE IF NOT EXISTS resource (
+    tenant_id uuid NOT NULL,
+    resource_type varchar(32) NOT NULL,
+    resource_id varchar(255) NOT NULL,
+    resource_value varchar,
+    CONSTRAINT resource_unq_key UNIQUE (tenant_id, resource_type, resource_id)
+);
diff --git a/dao/src/test/resources/sql/hsql/drop-all-tables.sql b/dao/src/test/resources/sql/hsql/drop-all-tables.sql
index b5629b0560..a548ceec30 100644
--- a/dao/src/test/resources/sql/hsql/drop-all-tables.sql
+++ b/dao/src/test/resources/sql/hsql/drop-all-tables.sql
@@ -28,4 +28,5 @@ DROP TABLE IF EXISTS oauth2_client_registration;
 DROP TABLE IF EXISTS oauth2_client_registration_info;
 DROP TABLE IF EXISTS oauth2_client_registration_template;
 DROP TABLE IF EXISTS api_usage_state;
+DROP TABLE IF EXISTS resource;
 DROP FUNCTION IF EXISTS to_uuid;
diff --git a/dao/src/test/resources/sql/psql/drop-all-tables.sql b/dao/src/test/resources/sql/psql/drop-all-tables.sql
index 34985883d7..333ce03fba 100644
--- a/dao/src/test/resources/sql/psql/drop-all-tables.sql
+++ b/dao/src/test/resources/sql/psql/drop-all-tables.sql
@@ -28,4 +28,5 @@ DROP TABLE IF EXISTS tb_schema_settings;
 DROP TABLE IF EXISTS oauth2_client_registration;
 DROP TABLE IF EXISTS oauth2_client_registration_info;
 DROP TABLE IF EXISTS oauth2_client_registration_template;
-DROP TABLE IF EXISTS api_usage_state;
\ No newline at end of file
+DROP TABLE IF EXISTS api_usage_state;
+DROP TABLE IF EXISTS resource;