Support all the array types

Author: sakthivelmanii

src/main/java/com/google/cloud/spanner/jdbc/JdbcArray.java

@@ -60,9 +60,9 @@ class JdbcArray implements Array {
    *     the elements array is not compatible with the base type of the array.
    */
   static JdbcArray createArray(String typeName, Object[] elements) throws SQLException {
-    if(typeName != null) {
+    if (typeName != null) {
       for (JdbcDataType type : JdbcDataType.values()) {
-        if (type.getTypeName().equalsIgnoreCase(typeName) || type.getAliases().contains(typeName.toLowerCase())) {
+        if (type.matches(typeName)) {
           return new JdbcArray(type, elements);
         }
       }
@@ -94,7 +94,8 @@ private JdbcArray(JdbcDataType type, Object[] elements) throws SQLException {
                 elements.getClass().getComponentType(), elements.length);
       } else {
         Class<?> clazz = type.getJavaClass();
-        if(elements.length > 0 && type.getSupportedJavaClasses().contains(elements[0].getClass())) {
+        if (elements.length > 0
+            && type.getSupportedJavaClasses().contains(elements[0].getClass())) {
           clazz = elements[0].getClass();
         }
         this.data = java.lang.reflect.Array.newInstance(clazz, elements.length);

src/main/java/com/google/cloud/spanner/jdbc/JdbcDataType.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.jdbc;
 
+import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.ResultSet;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.Type;
@@ -25,14 +26,12 @@
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 /** Enum for mapping Cloud Spanner data types to Java classes and JDBC SQL {@link Types}. */
 enum JdbcDataType {
@@ -61,11 +60,6 @@ public List<Boolean> getArrayElements(ResultSet rs, int columnIndex) {
     public Type getSpannerType() {
       return Type.bool();
     }
-
-    @Override
-    public List<String> getAliases() {
-      return Collections.singletonList("boolean");
-    }
   },
   BYTES {
     @Override
@@ -233,13 +227,11 @@ public List<Long> getArrayElements(ResultSet rs, int columnIndex) {
     public Type getSpannerType() {
       return Type.int64();
     }
-
-    @Override
-    public List<String> getAliases() {
-      return Arrays.asList("bigint", "integer");
-    }
   },
   NUMERIC {
+
+    private final Set<String> aliases = new HashSet<>(Collections.singletonList("decimal"));
+
     @Override
     public int getSqlType() {
       return Types.NUMERIC;
@@ -266,8 +258,8 @@ public Type getSpannerType() {
     }
 
     @Override
-    public List<String> getAliases() {
-      return Collections.singletonList("decimal");
+    public Set<String> getAliases() {
+      return aliases;
     }
   },
   PG_NUMERIC {
@@ -297,6 +289,8 @@ public Type getSpannerType() {
     }
   },
   STRING {
+    private final Set<String> aliases = new HashSet<>(Arrays.asList("varchar", "text"));
+
     @Override
     public int getSqlType() {
       return Types.NVARCHAR;
@@ -323,8 +317,8 @@ public Type getSpannerType() {
     }
 
     @Override
-    public List<String> getAliases() {
-      return Arrays.asList("text");
+    public Set<String> getAliases() {
+      return aliases;
     }
   },
   JSON {
@@ -528,8 +522,19 @@ public Type getSpannerType() {
 
   public abstract Type getSpannerType();
 
-  public List<String> getAliases() {
-    return new ArrayList<>();
+  public Set<String> getAliases() {
+    return Collections.emptySet();
+  }
+
+  /***
+   * @param typeName type of the column
+   * @return true if type name matches current type name or matches with one of postgres aliases
+   * or if it matches equivalent postgres type.
+   */
+  public boolean matches(String typeName) {
+    return getTypeName().equalsIgnoreCase(typeName)
+        || getAliases().contains(typeName.toLowerCase())
+        || getSpannerType().getSpannerTypeName(Dialect.POSTGRESQL).equalsIgnoreCase(typeName);
   }
 
   // TODO: Implement and use this method for all types.