Merge pull request #70 from Cenck/master

fixed distinct bug

Author: iamazy

CHANGELOG

@@ -5,4 +5,6 @@
 2019-09-08: add geo polygon support and update geo bounding box syntax
 2019-09-10: add dis max support
 2019-09-23: add geo shape support
-2019-12-14: add insert/update support
+2019-12-14: add insert/update support
+2021-12-21: remove order by default sortMode, fixed in语句不能参与or计算
+2022-01-19: fixed distinct support

elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/QuerySelectFieldsParser.java

@@ -71,7 +71,7 @@ private void parseNotGroupByClause(ElasticDslContext dslContext) {
                                 dslContext.getParseResult().getHighlighter().add(distinctName);
                             }
                         }
-                        if (StringUtils.isNotBlank(dslContext.getParseResult().getDistinctName())) {
+                        if (StringUtils.isBlank(dslContext.getParseResult().getDistinctName())) {
                             dslContext.getParseResult().setDistinctName(distinctName);
                         }
                         includeFields.add(distinctName);

elasticsearch-sql-core/src/test/java/io/github/iamazy/elasticsearch/dsl/sql/FixedHistoryTest.java

@@ -6,6 +6,14 @@ public class FixedHistoryTest {
 
     protected static ElasticSql2DslParser parser = new ElasticSql2DslParser();
 
+    @Test
+    public void fixedAt20220119(){
+        // 1. distinct
+        String distinctSql = "select distinct name from user ";
+        System.out.println(parser.parse(distinctSql).toDsl());
+
+    }
+
     @Test
     public void fixedOn20211221() {
         // 1. 去掉默认sortMode=avg ,默认为null