* #154: Removed toSimpleSql() method and its implementation because i… (#155)

*  #154: Removed toSimpleSql() method and its implementation because it was not used.

Co-authored-by: Sebastian Bär <sebastian.baer@exasol.com>

Author: AnastasiiaSergienko

doc/changes/changelog.md

@@ -1,5 +1,5 @@
 # Changes
 
-* [11.1.0](changes-11.1.0.md)
+* [12.0.0](changes-12.0.0.md)
 * [11.0.0](changes-11.0.0.md)
 * [10.1.0](changes-10.1.0.md)

doc/changes/changes-11.1.0.md

@@ -0,0 +1,32 @@
+# Virtual Schema Common Java 12.0.0, released 2020-09-29
+
+Code name: New capabilities, refactored API
+
+## Summary
+
+In this release we added the following capabilities: 
+`FN_BIT_LROTATE`, `FN_BIT_RROTATE`, `FN_BIT_LSHIFT`, `FN_BIT_RSHIFT,` `FN_FROM_POSIX_TIME`, `FN_HOUR`, `FN_INITCAP`, `FN_AGG_EVERY`, `FN_AGG_SOME`, `FN_AGG_MUL_DISTINCT`.
+
+We have removed the capabilities that are not used in the API: `FN_HASH_SHA`
+                                                     
+## Features / Enhancements
+
+* #147: Added new capabilities.
+
+## Documentation
+
+* #149: Moved the API documentation to this repository.
+
+## Refactoring
+
+* #152: Refactored the module according to the changes in the API: 
+ - removed usage of `numArgs` field in scalar function definitions;
+ - removed usage of `variableInputArgs` field in scalar function definitions;
+ - removed usage of prefix and infix fields in scalar function definitions;
+* #154: Removed `toSimpleSql()` method and its implementation because it was not used.
+
+## Dependency updates
+
+* Updated org.junit.jupiter:junit-jupiter:jar:5.6.2 to version 5.7.0
+* Updated org.mockito:mockito-junit-jupiter:jar:3.4.4 to version 3.5.13
+* Updated nl.jqno.equalsverifier:equalsverifier:jar:3.4.1 to version 3.4.3

doc/changes/changes-12.0.0.md

@@ -115,7 +115,6 @@ Here you can find a list of available Virtual Schema capabilities.
 - FN_FROM_POSIX_TIME
 - FN_GREATEST
 - FN_HASH_MD5
-- FN_HASH_SHA
 - FN_HASH_SHA1
 - FN_HASH_SHA256
 - FN_HASH_SHA512

doc/development/api/capabilities_list.md

@@ -88,13 +88,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>3.4.4</version>
+            <version>3.5.13</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

pom.xml

@@ -23,8 +23,4 @@ public SqlNode getLeft() {
     public SqlNode getRight() {
         return this.right;
     }
-
-    public String toSimpleSql(final String equalityExpression) {
-        return this.left.toSimpleSql() + equalityExpression + this.right.toSimpleSql();
-    }
-}
+}

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

@@ -48,11 +48,6 @@ public String getTableAlias() {
         return this.tableAlias;
     }
 
-    @Override
-    public String toSimpleSql() {
-        return "\"" + this.metadata.getName().replace("\"", "\"\"") + "\"";
-    }
-
     @Override
     public SqlNodeType getType() {
         return SqlNodeType.COLUMN;
@@ -68,4 +63,4 @@ public String toString() {
         return "SqlColumn{" + "id=" + this.id + ", metadata=" + this.metadata + ", tableName='" + this.tableName + '\''
                 + ", tableAlias='" + this.tableAlias + '\'' + '}';
     }
-}
+}

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

@@ -2,7 +2,6 @@
 
 import com.exasol.adapter.AdapterException;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -50,23 +49,6 @@ public boolean hasDistinct() {
         return distinct;
     }
 
-    @Override
-    public String toSimpleSql() {
-        final List<String> argumentsSql = new ArrayList<>();
-        for (final SqlNode node : arguments) {
-            argumentsSql.add(node.toSimpleSql());
-        }
-        if (argumentsSql.isEmpty()) {
-            assert getFunctionName().equalsIgnoreCase("count");
-            argumentsSql.add("*");
-        }
-        String distinctSql = "";
-        if (distinct) {
-            distinctSql = "DISTINCT ";
-        }
-        return getFunctionName() + "(" + distinctSql + String.join(", ", argumentsSql) + ")";
-    }
-
     @Override
     public SqlNodeType getType() {
         return SqlNodeType.FUNCTION_AGGREGATE;
@@ -76,4 +58,4 @@ public SqlNodeType getType() {
     public <R> R accept(final SqlNodeVisitor<R> visitor) throws AdapterException {
         return visitor.visit(this);
     }
-}
+}

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

@@ -62,33 +62,6 @@ public boolean hasDistinct() {
         return this.distinct;
     }
 
-    @Override
-    public String toSimpleSql() {
-        String distinctSql = "";
-        if (this.distinct) {
-            distinctSql = "DISTINCT ";
-        }
-        final StringBuilder builder = new StringBuilder();
-        builder.append(getFunctionName());
-        builder.append("(");
-        builder.append(distinctSql);
-        assert this.arguments != null;
-        assert this.arguments.size() == 1 && this.arguments.get(0) != null;
-        builder.append(this.arguments.get(0).toSimpleSql());
-        if (this.orderBy != null) {
-            builder.append(" ");
-            builder.append(this.orderBy.toSimpleSql());
-        }
-        if (this.separator != null) {
-            builder.append(" SEPARATOR ");
-            builder.append("'");
-            builder.append(this.separator);
-            builder.append("'");
-        }
-        builder.append(")");
-        return builder.toString();
-    }
-
     @Override
     public SqlNodeType getType() {
         return SqlNodeType.FUNCTION_AGGREGATE_GROUP_CONCAT;

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

@@ -42,11 +42,6 @@ public String getFunctionName() {
         return this.function.name();
     }
 
-    @Override
-    public String toSimpleSql() {
-        return getFunctionName();
-    }
-
     @Override
     public SqlNodeType getType() {
         return SqlNodeType.FUNCTION_SCALAR;
@@ -56,4 +51,4 @@ public SqlNodeType getType() {
     public <R> R accept(final SqlNodeVisitor<R> visitor) throws AdapterException {
         return visitor.visit(this);
     }
-}
+}