Skip to content

GEM: 定型検索でカラム以外の式をOrder Byに設定した場合、実行時エラー #2039

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

Merged
xtakahashi-hiroyuki merged 5 commits into from
Apr 22, 2026
Merged

GEM: 定型検索でカラム以外の式をOrder Byに設定した場合、実行時エラー #2039

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6759498
OrderByで式を指定した場合のエラー解消
Apr 21, 2026
e200b84
[refactor] 不要なoverride削除
Apr 21, 2026
b3af350
Revert "[refactor] 不要なoverride削除"
Apr 22, 2026
7c9a16e
レビュー対応：distinct時のSELECT列決定ロジックを改善
Apr 22, 2026
1e8d345
Merge remote-tracking branch 'origin/master' into feature/1960-gem-so…
Apr 22, 2026
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
28 changes: 15 additions & 13 deletions iplass-gem/src/main/java/org/iplass/gem/command/generic/search/SearchContextBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import org.iplass.mtp.entity.query.SortSpec.NullOrderingSpec;
import org.iplass.mtp.entity.query.SortSpec.SortType;
import org.iplass.mtp.entity.query.condition.Condition;
import org.iplass.mtp.entity.query.value.ValueExpression;
import org.iplass.mtp.entity.query.value.primary.EntityField;
import org.iplass.mtp.entity.query.value.primary.Literal;
import org.iplass.mtp.impl.parser.ParseContext;
Expand Down Expand Up @@ -190,20 +191,21 @@ public Select getSelect() {
}
}
}
List<ValueExpression> fieldSelection = select.stream()
.<ValueExpression> map(EntityField::new)
.toList();
List<ValueExpression> orderBySelection = Optional.ofNullable(getOrderBy())
.stream()
.flatMap(orderBy -> orderBy.getSortSpecList()
.stream()
.map(SortSpec::getSortKey))
.toList();

// ソート条件のデータを取得カラムにしておかないと、DistinctでSQLエラーになる。
Comment thread
xtakahashi-hiroyuki marked this conversation as resolved.
OrderBy orderBy = getOrderBy();
if (orderBy != null) {
for (SortSpec sortSpec : orderBy.getSortSpecList()) {
String sortKey = sortSpec.getSortKey()
.toString();
if (!select.contains(sortKey))
addSearchProperty(select, sortKey);
}
}
boolean distinct = getConditionSection().isDistinct();
Select s = new Select().add(select.toArray());
s.setDistinct(distinct);
return s;
boolean isDistinct = getConditionSection().isDistinct();
return new Select(isDistinct, (isDistinct ? Stream.concat(fieldSelection.stream(), orderBySelection.stream()) : fieldSelection.stream())
.distinct()
.toList());
}

@Override
Expand Down
Loading