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

Merge pull request #1240 from thingsboard/fix-entity-view-keys-field

Browse Source 
Fix entity view keys field
This commit is contained in:
VoBa 2018-11-09 18:08:33 +02:00 committed by GitHub
commit b62d581c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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