From 5cee3ba91d916aa18457b4c6e762c5e8a2e0320b Mon Sep 17 00:00:00 2001 From: zbeacon Date: Fri, 24 Jul 2020 15:53:33 +0300 Subject: [PATCH] Ignore case filter fix for entityType --- .../thingsboard/server/dao/sql/query/EntityKeyMapping.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java index 27b45ab668..5ab6f8443f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java @@ -427,9 +427,12 @@ public class EntityKeyMapping { } else if (predicate.getType().equals(FilterPredicateType.STRING)) { if (key.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)){ field = ctx.getEntityType().toString(); + return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate) + .replace("lower(" + field, "lower('" + field + "'") + .replace(field + " ","'" + field + "' "); + } else { + return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate); } - return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate) - .replace(field + " ","'" + field + "' "); } else { return this.buildBooleanPredicateQuery(ctx, field, (BooleanFilterPredicate) predicate); }