googleapis
diff --git a/‎.gitignore
+2 b/‎.gitignore
+2
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
+11-6 b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
+11-6
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
+12 b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
+12
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
+2 b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
+2
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java
+12 b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java
+12
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
+148 b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
+148
@@ -31,3 +31,5 @@ docs/
 *.pyc
 
 .flattened-pom.xml
+.java-version
+.vscode/
@@ -165,14 +165,15 @@ public boolean getBoolean(String columnName) {
 
   @Override
   public long getLong(int columnIndex) {
-    checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
+    checkNonNullOfCodes(
+        columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
     return getLongInternal(columnIndex);
   }
 
   @Override
   public long getLong(String columnName) {
     int columnIndex = getColumnIndex(columnName);
-    checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
+    checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
     return getLongInternal(columnIndex);
   }
 
@@ -366,30 +367,34 @@ public List<Boolean> getBooleanList(String columnName) {
   @Override
   public long[] getLongArray(int columnIndex) {
     checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnIndex);
-    checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
+    checkArrayElementType(
+        columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
     return getLongArrayInternal(columnIndex);
   }
 
   @Override
   public long[] getLongArray(String columnName) {
     int columnIndex = getColumnIndex(columnName);
     checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnName);
-    checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
+    checkArrayElementType(
+        columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
     return getLongArrayInternal(columnIndex);
   }
 
   @Override
   public List<Long> getLongList(int columnIndex) {
     checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnIndex);
-    checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
+    checkArrayElementType(
+        columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
     return getLongListInternal(columnIndex);
   }
 
   @Override
   public List<Long> getLongList(String columnName) {
     int columnIndex = getColumnIndex(columnName);
     checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnName);
-    checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
+    checkArrayElementType(
+        columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
     return getLongListInternal(columnIndex);
   }
 
 
@@ -114,6 +114,9 @@ private Object writeReplace() {
         case PG_JSONB:
           builder.set(fieldName).to(Value.pgJsonb((String) value));
           break;
+        case PG_OID:
+          builder.set(fieldName).to(Value.pgOid((Long) value));
+          break;
         case BYTES:
           builder
               .set(fieldName)
@@ -158,6 +161,9 @@ private Object writeReplace() {
             case PG_JSONB:
               builder.set(fieldName).toPgJsonbArray((Iterable<String>) value);
               break;
+            case PG_OID:
+              builder.set(fieldName).toPgOidArray((Iterable<Long>) value);
+              break;
             case BYTES:
             case PROTO:
               builder
@@ -262,6 +268,7 @@ private static Object decodeValue(Type fieldType, com.google.protobuf.Value prot
         checkType(fieldType, proto, KindCase.BOOL_VALUE);
         return proto.getBoolValue();
       case INT64:
+      case PG_OID:
       case ENUM:
         checkType(fieldType, proto, KindCase.STRING_VALUE);
         return Long.parseLong(proto.getStringValue());
@@ -319,6 +326,7 @@ private static Struct decodeStructValue(Type structType, ListValue structValue)
   static Object decodeArrayValue(Type elementType, ListValue listValue) {
     switch (elementType.getCode()) {
       case INT64:
+      case PG_OID:
       case ENUM:
         // For int64/float64/float32/enum types, use custom containers.
         // These avoid wrapper object creation for non-null arrays.
@@ -563,6 +571,8 @@ protected Value getValueInternal(int columnIndex) {
         return Value.json(isNull ? null : getJsonInternal(columnIndex));
       case PG_JSONB:
         return Value.pgJsonb(isNull ? null : getPgJsonbInternal(columnIndex));
+      case PG_OID:
+        return Value.pgOid(isNull ? null : getLongInternal(columnIndex));
       case BYTES:
         return Value.internalBytes(isNull ? null : getLazyBytesInternal(columnIndex));
       case PROTO:
@@ -598,6 +608,8 @@ protected Value getValueInternal(int columnIndex) {
             return Value.jsonArray(isNull ? null : getJsonListInternal(columnIndex));
           case PG_JSONB:
             return Value.pgJsonbArray(isNull ? null : getPgJsonbListInternal(columnIndex));
+          case PG_OID:
+            return Value.pgOidArray(isNull ? null : getLongListInternal(columnIndex));
           case BYTES:
             return Value.bytesArray(isNull ? null : getBytesListInternal(columnIndex));
           case PROTO:
 
@@ -396,6 +396,7 @@ private Object getAsObject(int columnIndex) {
       case BOOL:
         return getBooleanInternal(columnIndex);
       case INT64:
+      case PG_OID:
       case ENUM:
         return getLongInternal(columnIndex);
       case FLOAT32:
@@ -426,6 +427,7 @@ private Object getAsObject(int columnIndex) {
           case BOOL:
             return getBooleanListInternal(columnIndex);
           case INT64:
+          case PG_OID:
           case ENUM:
             return getLongListInternal(columnIndex);
           case FLOAT32:
 
@@ -55,6 +55,7 @@ public final class Type implements Serializable {
   private static final Type TYPE_STRING = new Type(Code.STRING, null, null);
   private static final Type TYPE_JSON = new Type(Code.JSON, null, null);
   private static final Type TYPE_PG_JSONB = new Type(Code.PG_JSONB, null, null);
+  private static final Type TYPE_PG_OID = new Type(Code.PG_OID, null, null);
   private static final Type TYPE_BYTES = new Type(Code.BYTES, null, null);
   private static final Type TYPE_TIMESTAMP = new Type(Code.TIMESTAMP, null, null);
   private static final Type TYPE_DATE = new Type(Code.DATE, null, null);
@@ -67,6 +68,7 @@ public final class Type implements Serializable {
   private static final Type TYPE_ARRAY_STRING = new Type(Code.ARRAY, TYPE_STRING, null);
   private static final Type TYPE_ARRAY_JSON = new Type(Code.ARRAY, TYPE_JSON, null);
   private static final Type TYPE_ARRAY_PG_JSONB = new Type(Code.ARRAY, TYPE_PG_JSONB, null);
+  private static final Type TYPE_ARRAY_PG_OID = new Type(Code.ARRAY, TYPE_PG_OID, null);
   private static final Type TYPE_ARRAY_BYTES = new Type(Code.ARRAY, TYPE_BYTES, null);
   private static final Type TYPE_ARRAY_TIMESTAMP = new Type(Code.ARRAY, TYPE_TIMESTAMP, null);
   private static final Type TYPE_ARRAY_DATE = new Type(Code.ARRAY, TYPE_DATE, null);
@@ -137,6 +139,11 @@ public static Type pgJsonb() {
     return TYPE_PG_JSONB;
   }
 
+  /** Returns the descriptor for the {@code PG_OID} type. */
+  public static Type pgOid() {
+    return TYPE_PG_OID;
+  }
+
   /**
    * To get the descriptor for the {@code PROTO} type.
    *
@@ -198,6 +205,8 @@ public static Type array(Type elementType) {
         return TYPE_ARRAY_JSON;
       case PG_JSONB:
         return TYPE_ARRAY_PG_JSONB;
+      case PG_OID:
+        return TYPE_ARRAY_PG_OID;
       case BYTES:
         return TYPE_ARRAY_BYTES;
       case TIMESTAMP:
@@ -280,6 +289,7 @@ public enum Code {
     STRING(TypeCode.STRING, "character varying"),
     JSON(TypeCode.JSON, "unknown"),
     PG_JSONB(TypeCode.JSON, "jsonb", TypeAnnotationCode.PG_JSONB),
+    PG_OID(TypeCode.INT64, "oid", TypeAnnotationCode.PG_OID),
     PROTO(TypeCode.PROTO, "proto"),
     ENUM(TypeCode.ENUM, "enum"),
     BYTES(TypeCode.BYTES, "bytea"),
@@ -592,6 +602,8 @@ static Type fromProto(com.google.spanner.v1.Type proto) {
         return json();
       case PG_JSONB:
         return pgJsonb();
+      case PG_OID:
+        return pgOid();
       case BYTES:
         return bytes();
       case TIMESTAMP:
 
@@ -254,6 +254,20 @@ public static Value pgJsonb(@Nullable String v) {
     return new PgJsonbImpl(v == null, v);
   }
 
+  /**
+   * Returns an {@code PG_OID} value.
+   *
+   * @param v the value, which may be null
+   */
+  public static Value pgOid(@Nullable Long v) {
+    return new PgOidImpl(v == null, v == null ? 0 : v);
+  }
+
+  /** Returns an {@code PG_OID} value. */
+  public static Value pgOid(long v) {
+    return new PgOidImpl(false, v);
+  }
+
   /**
    * Return a {@code PROTO} value for not null proto messages.
    *
@@ -587,6 +601,40 @@ public static Value pgJsonbArray(@Nullable Iterable<String> v) {
     return new PgJsonbArrayImpl(v == null, v == null ? null : immutableCopyOf(v));
   }
 
+  /**
+   * Returns an {@code ARRAY<PG_OID>} value.
+   *
+   * @param v the source of element values, which may be null to produce a value for which {@code
+   *     isNull()} is {@code true}
+   */
+  public static Value pgOidArray(@Nullable long[] v) {
+    return pgOidArray(v, 0, v == null ? 0 : v.length);
+  }
+
+  /**
+   * Returns an {@code ARRAY<PG_OID>} value that takes its elements from a region of an array.
+   *
+   * @param v the source of element values, which may be null to produce a value for which {@code
+   *     isNull()} is {@code true}
+   * @param pos the start position of {@code v} to copy values from. Ignored if {@code v} is {@code
+   *     null}.
+   * @param length the number of values to copy from {@code v}. Ignored if {@code v} is {@code
+   *     null}.
+   */
+  public static Value pgOidArray(@Nullable long[] v, int pos, int length) {
+    return pgOidArrayFactory.create(v, pos, length);
+  }
+
+  /**
+   * Returns an {@code ARRAY<PG_OID>} value.
+   *
+   * @param v the source of element values. This may be {@code null} to produce a value for which
+   *     {@code isNull()} is {@code true}. Individual elements may also be {@code null}.
+   */
+  public static Value pgOidArray(@Nullable Iterable<Long> v) {
+    return pgOidArrayFactory.create(v);
+  }
+
   /**
    * Returns an {@code ARRAY<PROTO>} value.
    *
@@ -1115,6 +1163,25 @@ Value newValue(boolean isNull, BitSet nulls, long[] values) {
           return new Int64ArrayImpl(isNull, nulls, values);
         }
       };
+
+  private static final PrimitiveArrayValueFactory<long[], Long> pgOidArrayFactory =
+      new PrimitiveArrayValueFactory<long[], Long>() {
+        @Override
+        long[] newArray(int size) {
+          return new long[size];
+        }
+
+        @Override
+        void set(long[] arr, int i, Long value) {
+          arr[i] = value;
+        }
+
+        @Override
+        Value newValue(boolean isNull, BitSet nulls, long[] values) {
+          return new PgOidArrayImpl(isNull, nulls, values);
+        }
+      };
+
   private static final PrimitiveArrayValueFactory<float[], Float> float32ArrayFactory =
       new PrimitiveArrayValueFactory<float[], Float>() {
         @Override
@@ -1822,6 +1889,41 @@ void valueToString(StringBuilder b) {
     }
   }
 
+  private static class PgOidImpl extends AbstractValue {
+    private final long value;
+
+    private PgOidImpl(boolean isNull, long value) {
+      super(isNull, Type.pgOid());
+      this.value = value;
+    }
+
+    @Override
+    public long getInt64() {
+      checkNotNull();
+      return value;
+    }
+
+    @Override
+    com.google.protobuf.Value valueToProto() {
+      return com.google.protobuf.Value.newBuilder().setStringValue(Long.toString(value)).build();
+    }
+
+    @Override
+    void valueToString(StringBuilder b) {
+      b.append(value);
+    }
+
+    @Override
+    boolean valueEquals(Value v) {
+      return ((PgOidImpl) v).value == value;
+    }
+
+    @Override
+    int valueHash() {
+      return Long.valueOf(value).hashCode();
+    }
+  }
+
   private static class LazyBytesImpl extends AbstractObjectValue<LazyByteArray> {
 
     private LazyBytesImpl(boolean isNull, LazyByteArray value) {
@@ -2457,6 +2559,48 @@ void appendElement(StringBuilder b, String element) {
     }
   }
 
+  private static class PgOidArrayImpl extends PrimitiveArrayImpl<Long> {
+    private final long[] values;
+
+    private PgOidArrayImpl(boolean isNull, BitSet nulls, long[] values) {
+      super(isNull, Type.pgOid(), nulls);
+      this.values = values;
+    }
+
+    @Override
+    public List<Long> getInt64Array() {
+      return getArray();
+    }
+
+    @Override
+    boolean valueEquals(Value v) {
+      PgOidArrayImpl that = (PgOidArrayImpl) v;
+      return Arrays.equals(values, that.values);
+    }
+
+    @Override
+    int size() {
+      return values.length;
+    }
+
+    @Override
+    Long getValue(int i) {
+      return values[i];
+    }
+
+    @Override
+    com.google.protobuf.Value getValueAsProto(int i) {
+      return com.google.protobuf.Value.newBuilder()
+          .setStringValue(Long.toString(values[i]))
+          .build();
+    }
+
+    @Override
+    int arrayHash() {
+      return Arrays.hashCode(values);
+    }
+  }
+
   private static class LazyBytesArrayImpl extends AbstractArrayValue<LazyByteArray> {
     private transient AbstractLazyInitializer<List<ByteArray>> bytesArray = defaultInitializer();
 
@@ -2790,6 +2934,8 @@ private Value getValue(int fieldIndex) {
           return Value.numeric(value.getBigDecimal(fieldIndex));
         case PG_NUMERIC:
           return Value.pgNumeric(value.getString(fieldIndex));
+        case PG_OID:
+          return Value.pgOid(value.getLong(fieldIndex));
         case DATE:
           return Value.date(value.getDate(fieldIndex));
         case TIMESTAMP:
@@ -2815,6 +2961,8 @@ private Value getValue(int fieldIndex) {
                 return Value.jsonArray(value.getJsonList(fieldIndex));
               case PG_JSONB:
                 return Value.pgJsonbArray(value.getPgJsonbList(fieldIndex));
+              case PG_OID:
+                return Value.pgOidArray(value.getLongList(fieldIndex));
               case BYTES:
               case PROTO:
                 return Value.bytesArray(value.getBytesList(fieldIndex));