Merge pull request #14 from tnicolas29200/groupByWithouOrderBy

Adding the groupBy function to the whereExpression

Author: jeffgbutler

.gitignore

@@ -11,3 +11,4 @@ buildNumber.properties
 /.classpath
 /.project
 /.vscode/
+/bin/

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -216,6 +216,13 @@ public SelectDSL<R> orderBy(SortSpecification...columns) {
             return selectDSL;
         }
 
+        public GroupByFinisher groupBy(BasicColumn...columns) {
+            groupByModel = GroupByModel.of(columns);
+            whereModel = buildWhereModel();
+            selectDSL.addQueryExpression(buildModel());
+            return new GroupByFinisher();
+        }
+        
         @Override
         public R build() {
             whereModel = buildWhereModel();

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.

src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.

src/main/java/org/mybatis/dynamic/sql/select/render/SelectStatementProvider.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.

src/test/java/examples/generated/always/spring/SpringTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -91,6 +91,7 @@ public void testSelect() {
                 .render(RenderingStrategy.SPRING_NAMED_PARAMETER);
 
         SqlParameterSource namedParameters = new MapSqlParameterSource(selectStatement.getParameters());
+        
         List<GeneratedAlwaysRecord> records = template.query(selectStatement.getSelectStatement(), namedParameters,
                 new RowMapper<GeneratedAlwaysRecord>(){
                     @Override
@@ -112,6 +113,7 @@ public GeneratedAlwaysRecord mapRow(ResultSet rs, int rowNum) throws SQLExceptio
 
         assertThat(records.get(1).getId()).isEqualTo(5);
         assertThat(records.get(2).getId()).isEqualTo(4);
+        
     }
 
     @Test
@@ -151,6 +153,7 @@ public void testInsert() {
 
         assertThat(rows).isEqualTo(1);
         assertThat(generatedKey).isEqualTo("Bob Jones");
+        
     }
 
     @Test
@@ -198,6 +201,7 @@ public void testUpdate() {
         int rows = template.update(updateStatement.getUpdateStatement(), parameterSource);
 
         assertThat(rows).isEqualTo(2);
+        
     }
 
     @AfterEach

src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -236,4 +236,28 @@ public void testNoWhere() {
             softly.assertThat(parameters.size()).isEqualTo(0);
         });
     }
+    
+    @Test
+    public void testGroupBySingleColumn() {
+        Date d = new Date();
+
+        SelectStatementProvider selectStatement = select(column1.as("A_COLUMN1"), column2)
+                .from(table, "a")
+                .where(column1, isEqualTo(d))
+                .groupBy(column2)
+                .build()
+                .render(RenderingStrategy.MYBATIS3);
+
+        SoftAssertions.assertSoftly(softly -> {
+            String expectedFullStatement = "select a.column1 as A_COLUMN1, a.column2 "
+                    + "from foo a "
+                    + "where a.column1 = #{parameters.p1,jdbcType=DATE} "
+                    + "group by a.column2";
+
+            softly.assertThat(selectStatement.getSelectStatement()).isEqualTo(expectedFullStatement);
+        
+            Map<String, Object> parameters = selectStatement.getParameters();
+            softly.assertThat(parameters.get("p1")).isEqualTo(d);
+        });
+    }
 }