fix: unrecognized types with array element type should be considered unrecognized

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java

@@ -394,7 +394,13 @@ public int getFieldIndex(String fieldName) {
 
   void toString(StringBuilder b) {
     if (code == Code.ARRAY || (proto != null && proto.hasArrayElementType())) {
-      b.append("ARRAY<");
+      if (code == Code.ARRAY) {
+        b.append("ARRAY<");
+      } else {
+        // This is very unlikely to happen. It would mean that we have introduced a type that
+        // is not an ARRAY, but does have an array element type.
+        b.append("UNRECOGNIZED<");
+      }
       arrayElementType.toString(b);
       b.append('>');
     } else if (code == Code.STRUCT) {

google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

@@ -51,6 +51,7 @@
 import com.google.cloud.spanner.SessionPool.PooledSessionFuture;
 import com.google.cloud.spanner.SpannerException.ResourceNotFoundException;
 import com.google.cloud.spanner.SpannerOptions.SpannerCallContextTimeoutConfigurator;
+import com.google.cloud.spanner.Type.Code;
 import com.google.cloud.spanner.connection.RandomResultSetGenerator;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
@@ -2901,7 +2902,7 @@ public void testMetadataUnknownTypes() {
       // There are no rows, but we need to call resultSet.next() before we can get the metadata.
       assertFalse(resultSet.next());
       assertEquals(
-          "STRUCT<c1 UNRECOGNIZED, c2 STRING<UNRECOGNIZED>, c3 UNRECOGNIZED<PG_NUMERIC>, c4 ARRAY<UNRECOGNIZED>, c5 ARRAY<STRING<UNRECOGNIZED>>, c6 ARRAY<UNRECOGNIZED>, c7 ARRAY<UNRECOGNIZED<PG_NUMERIC>>>",
+          "STRUCT<c1 UNRECOGNIZED, c2 STRING<UNRECOGNIZED>, c3 UNRECOGNIZED<PG_NUMERIC>, c4 ARRAY<UNRECOGNIZED>, c5 ARRAY<STRING<UNRECOGNIZED>>, c6 UNRECOGNIZED<UNRECOGNIZED>, c7 ARRAY<UNRECOGNIZED<PG_NUMERIC>>>",
           resultSet.getType().toString());
       assertEquals(
           "UNRECOGNIZED", resultSet.getType().getStructFields().get(0).getType().toString());
@@ -2913,14 +2914,32 @@ public void testMetadataUnknownTypes() {
           resultSet.getType().getStructFields().get(2).getType().toString());
       assertEquals(
           "ARRAY<UNRECOGNIZED>", resultSet.getType().getStructFields().get(3).getType().toString());
+      assertEquals(Code.ARRAY, resultSet.getType().getStructFields().get(3).getType().getCode());
+      assertEquals(
+          Code.UNRECOGNIZED,
+          resultSet.getType().getStructFields().get(3).getType().getArrayElementType().getCode());
       assertEquals(
           "ARRAY<STRING<UNRECOGNIZED>>",
           resultSet.getType().getStructFields().get(4).getType().toString());
+      assertEquals(Code.ARRAY, resultSet.getType().getStructFields().get(4).getType().getCode());
+      assertEquals(
+          Code.UNRECOGNIZED,
+          resultSet.getType().getStructFields().get(4).getType().getArrayElementType().getCode());
+      assertEquals(
+          "UNRECOGNIZED<UNRECOGNIZED>",
+          resultSet.getType().getStructFields().get(5).getType().toString());
       assertEquals(
-          "ARRAY<UNRECOGNIZED>", resultSet.getType().getStructFields().get(5).getType().toString());
+          Code.UNRECOGNIZED, resultSet.getType().getStructFields().get(5).getType().getCode());
+      assertEquals(
+          Code.UNRECOGNIZED,
+          resultSet.getType().getStructFields().get(5).getType().getArrayElementType().getCode());
       assertEquals(
           "ARRAY<UNRECOGNIZED<PG_NUMERIC>>",
           resultSet.getType().getStructFields().get(6).getType().toString());
+      assertEquals(Code.ARRAY, resultSet.getType().getStructFields().get(6).getType().getCode());
+      assertEquals(
+          Code.UNRECOGNIZED,
+          resultSet.getType().getStructFields().get(6).getType().getArrayElementType().getCode());
     }
   }