Skip to content

Commit a95fb32

Browse files
committed
Add missing orderBy and groupBy methods
1 parent fb8381b commit a95fb32

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

+20
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,18 @@ public UnionBuilder unionAll() {
251251
}
252252

253253
public SelectDSL<R> orderBy(SortSpecification...columns) {
254+
return orderBy(Arrays.asList(columns));
255+
}
256+
257+
public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
254258
return QueryExpressionDSL.this.orderBy(columns);
255259
}
256260

257261
public GroupByFinisher groupBy(BasicColumn...columns) {
262+
return groupBy(Arrays.asList(columns));
263+
}
264+
265+
public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
258266
return QueryExpressionDSL.this.groupBy(columns);
259267
}
260268

@@ -410,6 +418,10 @@ public JoinSpecificationStarter fullJoin(Buildable<SelectModel> joinTable, Strin
410418
}
411419

412420
public GroupByFinisher groupBy(BasicColumn...columns) {
421+
return groupBy(Arrays.asList(columns));
422+
}
423+
424+
public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
413425
return QueryExpressionDSL.this.groupBy(columns);
414426
}
415427

@@ -422,6 +434,10 @@ public UnionBuilder unionAll() {
422434
}
423435

424436
public SelectDSL<R> orderBy(SortSpecification...columns) {
437+
return orderBy(Arrays.asList(columns));
438+
}
439+
440+
public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
425441
return QueryExpressionDSL.this.orderBy(columns);
426442
}
427443

@@ -440,6 +456,10 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
440456

441457
public class GroupByFinisher implements Buildable<R> {
442458
public SelectDSL<R> orderBy(SortSpecification...columns) {
459+
return orderBy(Arrays.asList(columns));
460+
}
461+
462+
public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
443463
return QueryExpressionDSL.this.orderBy(columns);
444464
}
445465

src/test/java/examples/simple/PersonMapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ void testOrderByCollection() {
267267
);
268268

269269
assertThat(rows).hasSize(2);
270-
assertThat(rows.get(0).getLastName().getName()).isEqualTo("Flintstone");
271-
assertThat(rows.get(1).getLastName().getName()).isEqualTo("Rubble");
270+
assertThat(rows.get(0).getLastName().getName()).isEqualTo("Rubble");
271+
assertThat(rows.get(1).getLastName().getName()).isEqualTo("Flintstone");
272272
}
273273
}
274274

0 commit comments

Comments
 (0)