Skip to content

Commit 1a5d573

Browse files
authored
Release 5.14.2
1 parent 66f07d7 commit 1a5d573

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
SCRIPTS_VERSION: 5.14.0
1515
BOM_VERSION: 5.14.1
1616
MIGRATIONS_VERSION: 5.14.0
17-
RELEASE_VERSION: 5.14.1
17+
RELEASE_VERSION: 5.14.2
1818

1919
jobs:
2020
release:

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=5.14.1
1+
version=5.14.2
22
springBootVersion=3.4.2
33
lombokVersion=1.18.36
44
jooqVersion=3.19.18

src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -828,15 +828,12 @@ private List<Field<?>> getSelectAggregatedFields() {
828828
DSL.coalesce(LAUNCH_ATTRIBUTE.VALUE, "")
829829
))
830830
.filterWhere(DSL.coalesce(LAUNCH_ATTRIBUTE.SYSTEM, true).eq(true)),
831-
DSL.arrayAggDistinct(DSL.concat(ITEM_ATTRIBUTE.KEY, ":"))
832-
.filterWhere(ITEM_ATTRIBUTE.SYSTEM.eq(true)),
833-
DSL.arrayAggDistinct(DSL.concat(ITEM_ATTRIBUTE.VALUE))
834-
.filterWhere(ITEM_ATTRIBUTE.SYSTEM.eq(true)),
831+
DSL.arrayAggDistinct(DSL.concat((DSL.coalesce(ITEM_ATTRIBUTE.KEY, "")), ":")),
832+
DSL.arrayAggDistinct(DSL.concat(DSL.coalesce(ITEM_ATTRIBUTE.VALUE, ""))),
835833
DSL.arrayAgg(DSL.concat(DSL.coalesce(ITEM_ATTRIBUTE.KEY, ""),
836834
DSL.val(KEY_VALUE_SEPARATOR),
837-
ITEM_ATTRIBUTE.VALUE
835+
DSL.coalesce(ITEM_ATTRIBUTE.VALUE, "")
838836
))
839-
.filterWhere(ITEM_ATTRIBUTE.SYSTEM.eq(true))
840837
).toString()).get(),
841838

842839
new CriteriaHolderBuilder().newBuilder(CRITERIA_PATTERN_TEMPLATE_NAME,

0 commit comments

Comments
 (0)