#139: added name aliases for aggregate ST_ functions (#140)

* #139: added name aliases for aggregate ST_ functions

Author: AnastasiiaSergienko

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.exasol</groupId>
   <artifactId>virtual-schema-common-java</artifactId>
-  <version>10.0.0</version>
+  <version>10.0.1</version>
   <name>Common module of Exasol Virtual Schemas Adapters</name>
   <description>This is one of the modules of Virtual Schemas Adapters. The libraries provided by this project are the foundation of the adapter development, i.e. adapters must be implemented on top of them.</description>
   <url>https://github.com/exasol/virtual-schema-common-java</url>

src/main/java/com/exasol/adapter/sql/AggregateFunction.java

@@ -1,13 +1,15 @@
 package com.exasol.adapter.sql;
 
 /**
- * List of all aggregation functions supported by EXASOL
+ * List of all aggregation functions supported by EXASOL.
  */
 public enum AggregateFunction {
     COUNT, SUM, MIN, MAX, AVG, MEDIAN, FIRST_VALUE, LAST_VALUE, STDDEV, STDDEV_POP, STDDEV_SAMP, VARIANCE, VAR_POP,
-    VAR_SAMP, GROUP_CONCAT(false), APPROXIMATE_COUNT_DISTINCT, GEO_INTERSECTION_AGGREGATE, GEO_UNION_AGGREGATE, MUL;
+    VAR_SAMP, GROUP_CONCAT(false, "GROUP_CONCAT"), APPROXIMATE_COUNT_DISTINCT,
+    GEO_INTERSECTION_AGGREGATE(true, "ST_INTERSECTION"), GEO_UNION_AGGREGATE(true, "ST_UNION"), MUL;
 
-    private final boolean isSimple;
+    private final boolean simple;
+    private String realFunctionName;
 
     /**
      * True if the function is simple, i.e. is handled by {@link SqlFunctionAggregate}, and false if it has it's own
@@ -16,14 +18,24 @@ public enum AggregateFunction {
      * @return <code>true</code> if the function is simple
      */
     public boolean isSimple() {
-        return this.isSimple;
+        return this.simple;
     }
 
     AggregateFunction() {
-        this.isSimple = true;
+        this.simple = true;
     }
 
-    AggregateFunction(final boolean isSimple) {
-        this.isSimple = isSimple;
+    AggregateFunction(final boolean simple, final String realFunctionName) {
+        this.simple = simple;
+        this.realFunctionName = realFunctionName;
     }
-}
+
+    @Override
+    public String toString() {
+        if (realFunctionName != null && !realFunctionName.isBlank()) {
+            return realFunctionName;
+        } else {
+            return name();
+        }
+    }
+}

src/main/java/com/exasol/adapter/sql/SqlFunctionAggregate.java

@@ -43,7 +43,7 @@ public AggregateFunction getFunction() {
     }
 
     public String getFunctionName() {
-        return function.name();
+        return function.toString();
     }
 
     public boolean hasDistinct() {

src/test/java/com/exasol/adapter/sql/AggregateFunctionTest.java

@@ -1,10 +1,12 @@
 package com.exasol.adapter.sql;
 
-import org.junit.jupiter.api.Test;
-
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class AggregateFunctionTest {
     @Test
     void testIsSimpleFalse() {
@@ -15,4 +17,14 @@ void testIsSimpleFalse() {
     void testIsSimpleTrue() {
         assertTrue(AggregateFunction.COUNT.isSimple());
     }
+
+    @Test
+    void testToStringWithSpecialName() {
+        assertThat(AggregateFunction.GEO_INTERSECTION_AGGREGATE.toString(), equalTo("ST_INTERSECTION"));
+    }
+
+    @Test
+    void testToString() {
+        assertThat(AggregateFunction.AVG.toString(), equalTo("AVG"));
+    }
 }