Skip to content

Commit 3785866

Browse files
Jörg Heffnergitgoodjhe
Jörg Heffner
authored andcommitted
Closes #2659 Fix SQL in Mappers
1 parent 0c08a00 commit 3785866

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public interface ClassificationMapper {
1616
"<script> SELECT ID, KEY, PARENT_ID, PARENT_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, MODIFIED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8 "
1717
+ "FROM CLASSIFICATION "
1818
+ "WHERE KEY = #{key}"
19-
+ "AND DOMAIN = #{domain}"
20-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
19+
+ " AND DOMAIN = #{domain}"
20+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
2121
+ "</script>")
2222
@Result(property = "id", column = "ID")
2323
@Result(property = "key", column = "KEY")
@@ -48,7 +48,7 @@ public interface ClassificationMapper {
4848
"<script>SELECT ID, KEY, PARENT_ID, PARENT_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, MODIFIED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8 "
4949
+ "FROM CLASSIFICATION "
5050
+ "WHERE ID = #{id}"
51-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
51+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
5252
+ "</script>")
5353
@Result(property = "id", column = "ID")
5454
@Result(property = "key", column = "KEY")

lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ObjectReferenceMapper {
2020
+ "FROM OBJECT_REFERENCE "
2121
+ "WHERE ID = #{id}"
2222
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
23-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
23+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
2424
+ "</script>")
2525
@Result(property = "id", column = "ID")
2626
@Result(property = "company", column = "COMPANY")
@@ -34,8 +34,8 @@ public interface ObjectReferenceMapper {
3434
"<script>SELECT ID, TASK_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE "
3535
+ "FROM OBJECT_REFERENCE "
3636
+ "WHERE TASK_ID = #{taskId}"
37-
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
38-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
37+
+ " ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
38+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
3939
+ "</script>")
4040
@Result(property = "id", column = "ID")
4141
@Result(property = "taskId", column = "TASK_ID")
@@ -60,7 +60,7 @@ public interface ObjectReferenceMapper {
6060
+ "</choose>"
6161
+ "</where>"
6262
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
63-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
63+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
6464
+ "</script>")
6565
@Result(property = "id", column = "ID")
6666
@Result(property = "taskId", column = "TASK_ID")
@@ -81,7 +81,7 @@ List<ObjectReferenceImpl> findObjectReferencesByTaskIds(
8181
+ "AND TYPE = #{objectReference.type} "
8282
+ "AND VALUE = #{objectReference.value} "
8383
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
84-
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
84+
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
8585
+ "</script>")
8686
@Result(property = "id", column = "ID")
8787
@Result(property = "company", column = "COMPANY")

0 commit comments

Comments
 (0)