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

This commit is contained in:
Igor Kulikov 2020-07-22 18:47:05 +03:00
commit 859276df5a

View File

@ -169,7 +169,7 @@ public class EntityKeyMapping {
String alias = getEntityFieldAlias(filterType, entityType); String alias = getEntityFieldAlias(filterType, entityType);
if (existingEntityFields.contains(alias)) { if (existingEntityFields.contains(alias)) {
String column = entityFieldColumnMap.get(alias); String column = entityFieldColumnMap.get(alias);
return String.format("e.%s as %s", column, getValueAlias()); return String.format("cast(e.%s as varchar) as %s", column, getValueAlias());
} else { } else {
return String.format("'' as %s", getValueAlias()); return String.format("'' as %s", getValueAlias());
} }