Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #2659 Fix SQL in Mappers #2661

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Closes #2659 Fix SQL in Mappers #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public interface ClassificationMapper {
"<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 "
+ "FROM CLASSIFICATION "
+ "WHERE KEY = #{key}"
+ "AND DOMAIN = #{domain}"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ " AND DOMAIN = #{domain}"
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "key", column = "KEY")
Expand Down Expand Up @@ -48,7 +48,7 @@ public interface ClassificationMapper {
"<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 "
+ "FROM CLASSIFICATION "
+ "WHERE ID = #{id}"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "key", column = "KEY")
Expand Down
10 changes: 5 additions & 5 deletions lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public interface ObjectReferenceMapper {
+ "FROM OBJECT_REFERENCE "
+ "WHERE ID = #{id}"
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "company", column = "COMPANY")
Expand All @@ -34,8 +34,8 @@ public interface ObjectReferenceMapper {
"<script>SELECT ID, TASK_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE "
+ "FROM OBJECT_REFERENCE "
+ "WHERE TASK_ID = #{taskId}"
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ " ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "taskId", column = "TASK_ID")
Expand All @@ -60,7 +60,7 @@ public interface ObjectReferenceMapper {
+ "</choose>"
+ "</where>"
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "taskId", column = "TASK_ID")
Expand All @@ -81,7 +81,7 @@ List<ObjectReferenceImpl> findObjectReferencesByTaskIds(
+ "AND TYPE = #{objectReference.type} "
+ "AND VALUE = #{objectReference.value} "
+ "ORDER BY VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC"
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "<if test=\"_databaseId == 'db2'\"> with UR </if> "
+ "</script>")
@Result(property = "id", column = "ID")
@Result(property = "company", column = "COMPANY")
Expand Down