Merge pull request #409 from jeffgbutler/gh-408

jeffgbutler · web-flow · commit dc3fb76c0e71 · 2021-11-02T18:33:20.000-04:00
Add missing groupBy and orderBy Methods
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -251,10 +251,18 @@ public UnionBuilder unionAll() {
         }
 
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            return orderBy(Arrays.asList(columns));
+        }
+
+        public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
             return QueryExpressionDSL.this.orderBy(columns);
         }
 
         public GroupByFinisher groupBy(BasicColumn...columns) {
+            return groupBy(Arrays.asList(columns));
+        }
+
+        public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
             return QueryExpressionDSL.this.groupBy(columns);
         }
 
@@ -410,6 +418,10 @@ public JoinSpecificationStarter fullJoin(Buildable<SelectModel> joinTable, Strin
         }
 
         public GroupByFinisher groupBy(BasicColumn...columns) {
+            return groupBy(Arrays.asList(columns));
+        }
+
+        public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
             return QueryExpressionDSL.this.groupBy(columns);
         }
 
@@ -422,6 +434,10 @@ public UnionBuilder unionAll() {
         }
 
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            return orderBy(Arrays.asList(columns));
+        }
+
+        public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
             return QueryExpressionDSL.this.orderBy(columns);
         }
 
@@ -440,6 +456,10 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
 
     public class GroupByFinisher implements Buildable<R> {
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            return orderBy(Arrays.asList(columns));
+        }
+
+        public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
             return QueryExpressionDSL.this.orderBy(columns);
         }
 
diff --git a/src/test/java/examples/simple/PersonMapperTest.java b/src/test/java/examples/simple/PersonMapperTest.java
@@ -25,6 +25,7 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
@@ -38,6 +39,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -251,6 +253,25 @@ void testFirstNameIn() {
         }
     }
 
+    @Test
+    void testOrderByCollection() {
+        Collection<SortSpecification> orderByColumns = new ArrayList<>();
+        orderByColumns.add(firstName);
+
+        try (SqlSession session = sqlSessionFactory.openSession()) {
+            PersonMapper mapper = session.getMapper(PersonMapper.class);
+
+            List<PersonRecord> rows = mapper.select(c -> c
+                    .where(firstName, isIn("Fred", "Barney"))
+                    .orderBy(orderByColumns)
+            );
+
+            assertThat(rows).hasSize(2);
+            assertThat(rows.get(0).getLastName().getName()).isEqualTo("Rubble");
+            assertThat(rows.get(1).getLastName().getName()).isEqualTo("Flintstone");
+        }
+    }
+
     @Test
     void testDelete() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
diff --git a/src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java
@@ -21,6 +21,7 @@
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.sql.JDBCType;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -29,6 +30,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.Callback;
+import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
@@ -176,6 +178,25 @@ void testOrderByMultipleColumns() {
         );
     }
 
+    @Test
+    void testOrderByMultipleColumnsWithCollection() {
+        Collection<SortSpecification> orderByColumns = new ArrayList<>();
+        orderByColumns.add(column2.descending());
+        orderByColumns.add(column1);
+
+        SelectStatementProvider selectStatement = select(column1.as("A_COLUMN1"), column2)
+                .from(table, "a")
+                .orderBy(orderByColumns)
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+
+        String expectedFullStatement = "select a.column1 as A_COLUMN1, a.column2 "
+                + "from foo a "
+                + "order by column2 DESC, column1";
+
+        assertThat(selectStatement.getSelectStatement()).isEqualTo(expectedFullStatement);
+    }
+
     @Test
     void testDistinct() {
         Date d = new Date();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2020 the original author or authors.`
	`2`	`+ * Copyright 2016-2021 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -251,10 +251,18 @@ public UnionBuilder unionAll() {`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`public SelectDSL<R> orderBy(SortSpecification...columns) {`
	`254`	`+ return orderBy(Arrays.asList(columns));`
	`255`	`+ }`
	`256`	`+`
	`257`	`+ public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {`
`254`	`258`	`return QueryExpressionDSL.this.orderBy(columns);`
`255`	`259`	`}`
`256`	`260`
`257`	`261`	`public GroupByFinisher groupBy(BasicColumn...columns) {`
	`262`	`+ return groupBy(Arrays.asList(columns));`
	`263`	`+ }`
	`264`	`+`
	`265`	`+ public GroupByFinisher groupBy(Collection<BasicColumn> columns) {`
`258`	`266`	`return QueryExpressionDSL.this.groupBy(columns);`
`259`	`267`	`}`
`260`	`268`
`@@ -410,6 +418,10 @@ public JoinSpecificationStarter fullJoin(Buildable<SelectModel> joinTable, Strin`
`410`	`418`	`}`
`411`	`419`
`412`	`420`	`public GroupByFinisher groupBy(BasicColumn...columns) {`
	`421`	`+ return groupBy(Arrays.asList(columns));`
	`422`	`+ }`
	`423`	`+`
	`424`	`+ public GroupByFinisher groupBy(Collection<BasicColumn> columns) {`
`413`	`425`	`return QueryExpressionDSL.this.groupBy(columns);`
`414`	`426`	`}`
`415`	`427`
`@@ -422,6 +434,10 @@ public UnionBuilder unionAll() {`
`422`	`434`	`}`
`423`	`435`
`424`	`436`	`public SelectDSL<R> orderBy(SortSpecification...columns) {`
	`437`	`+ return orderBy(Arrays.asList(columns));`
	`438`	`+ }`
	`439`	`+`
	`440`	`+ public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {`
`425`	`441`	`return QueryExpressionDSL.this.orderBy(columns);`
`426`	`442`	`}`
`427`	`443`
`@@ -440,6 +456,10 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {`
`440`	`456`
`441`	`457`	`public class GroupByFinisher implements Buildable<R> {`
`442`	`458`	`public SelectDSL<R> orderBy(SortSpecification...columns) {`
	`459`	`+ return orderBy(Arrays.asList(columns));`
	`460`	`+ }`
	`461`	`+`
	`462`	`+ public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {`
`443`	`463`	`return QueryExpressionDSL.this.orderBy(columns);`
`444`	`464`	`}`
`445`	`465`