Merge branch 'master' of github.com:thingsboard/thingsboard

application/src/main/data/upgrade/2.2.0/schema_update.sql

@@ -15,3 +15,5 @@
 --
 
 ALTER TABLE component_descriptor ADD UNIQUE (clazz);
+
+ALTER TABLE entity_view ALTER COLUMN keys SET DATA TYPE varchar(10000000);

dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java

@@ -60,10 +60,6 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
     @Column(name = ID_PROPERTY)
     private UUID id;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = ENTITY_TYPE_PROPERTY)
-    private EntityType entityType;
-
     @PartitionKey(value = 1)
     @Column(name = ModelConstants.ENTITY_VIEW_TENANT_ID_PROPERTY)
     private UUID tenantId;
@@ -76,6 +72,10 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
     @Column(name = DEVICE_TYPE_PROPERTY)
     private String type;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = ENTITY_TYPE_PROPERTY)
+    private EntityType entityType;
+
     @Column(name = ModelConstants.ENTITY_VIEW_ENTITY_ID_PROPERTY)
     private UUID entityId;
 

dao/src/main/resources/sql/schema-entities.sql

@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS entity_view (
     customer_id varchar(31),
     type varchar(255),
     name varchar(255),
-    keys varchar(255),
+    keys varchar(10000000),
     start_ts bigint,
     end_ts bigint,
     search_text varchar(255),