googleapis
diff --git a/‎spanner/integration_test.go
+567 b/‎spanner/integration_test.go
+567
diff --git a/‎spanner/key.go
+5-3 b/‎spanner/key.go
+5-3
diff --git a/‎spanner/key_test.go
+11 b/‎spanner/key_test.go
+11
diff --git a/‎spanner/protoutils.go
+19 b/‎spanner/protoutils.go
+19
diff --git a/‎spanner/testdata/protos/descriptors.pb
251 Bytes b/‎spanner/testdata/protos/descriptors.pb
251 Bytes
diff --git a/‎spanner/testdata/protos/singer.pb.go
+258 b/‎spanner/testdata/protos/singer.pb.go
+258
diff --git a/‎spanner/testdata/protos/singer.proto
+34 b/‎spanner/testdata/protos/singer.proto
+34
@@ -25,6 +25,7 @@ import (
 	"cloud.google.com/go/civil"
 	sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	proto3 "google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -58,6 +59,7 @@ import (
 //   - string and NullString are mapped to Cloud Spanner's STRING type.
 //   - time.Time and NullTime are mapped to Cloud Spanner's TIMESTAMP type.
 //   - civil.Date and NullDate are mapped to Cloud Spanner's DATE type.
+//   - protoreflect.Enum and NullProtoEnum are mapped to Cloud Spanner's ENUM type.
 type Key []interface{}
 
 // errInvdKeyPartType returns error for unsupported key part type.
@@ -83,7 +85,7 @@ func keyPartValue(part interface{}) (pb *proto3.Value, err error) {
 		pb, _, err = encodeValue(int64(v))
 	case uint32:
 		pb, _, err = encodeValue(int64(v))
-	case int64, float64, float32, NullInt64, NullFloat64, NullFloat32, bool, NullBool, []byte, string, NullString, time.Time, civil.Date, NullTime, NullDate, big.Rat, NullNumeric:
+	case int64, float64, float32, NullInt64, NullFloat64, NullFloat32, bool, NullBool, []byte, string, NullString, time.Time, civil.Date, NullTime, NullDate, big.Rat, NullNumeric, protoreflect.Enum, NullProtoEnum:
 		pb, _, err = encodeValue(v)
 	case Encoder:
 		part, err = v.EncodeSpanner()
@@ -138,7 +140,7 @@ func (key Key) String() string {
 
 func (key Key) elemString(b *bytes.Buffer, part interface{}) {
 	switch v := part.(type) {
-	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, float32, float64, bool:
+	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, float32, float64, bool, protoreflect.Enum:
 		// Use %v to print numeric types and bool.
 		fmt.Fprintf(b, "%v", v)
 	case string:
@@ -149,7 +151,7 @@ func (key Key) elemString(b *bytes.Buffer, part interface{}) {
 		} else {
 			fmt.Fprint(b, nullString)
 		}
-	case NullInt64, NullFloat64, NullBool, NullNumeric:
+	case NullInt64, NullFloat64, NullBool, NullNumeric, NullProtoEnum:
 		// The above types implement fmt.Stringer.
 		fmt.Fprintf(b, "%s", v)
 	case NullString, NullDate, NullTime:
 
@@ -24,6 +24,7 @@ import (
 
 	"cloud.google.com/go/civil"
 	sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
+	pb "cloud.google.com/go/spanner/testdata/protos"
 	proto3 "google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -244,6 +245,16 @@ func TestKey(t *testing.T) {
 			wantProto: nil,
 			wantStr:   `(error)`,
 		},
+		{
+			k:         Key{pb.Genre_ROCK},
+			wantProto: listValueProto(stringProto("3")),
+			wantStr:   "(ROCK)",
+		},
+		{
+			k:         Key{NullProtoEnum{pb.Genre_FOLK, true}},
+			wantProto: listValueProto(stringProto("2")),
+			wantStr:   "(FOLK)",
+		},
 	} {
 		if got := test.k.String(); got != test.wantStr {
 			t.Errorf("%v.String() = %v, want %v", test.k, got, test.wantStr)
 
@@ -24,6 +24,8 @@ import (
 
 	"cloud.google.com/go/civil"
 	sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	proto3 "google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -144,3 +146,20 @@ func structType(fields ...*sppb.StructType_Field) *sppb.Type {
 func nullProto() *proto3.Value {
 	return &proto3.Value{Kind: &proto3.Value_NullValue{NullValue: proto3.NullValue_NULL_VALUE}}
 }
+
+func protoMessageType(fqn string) *sppb.Type {
+	return &sppb.Type{Code: sppb.TypeCode_PROTO, ProtoTypeFqn: fqn}
+}
+
+func protoEnumType(fqn string) *sppb.Type {
+	return &sppb.Type{Code: sppb.TypeCode_ENUM, ProtoTypeFqn: fqn}
+}
+
+func protoMessageProto(m proto.Message) *proto3.Value {
+	var b, _ = proto.Marshal(m)
+	return &proto3.Value{Kind: &proto3.Value_StringValue{StringValue: base64.StdEncoding.EncodeToString(b)}}
+}
+
+func protoEnumProto(e protoreflect.Enum) *proto3.Value {
+	return &proto3.Value{Kind: &proto3.Value_StringValue{StringValue: strconv.FormatInt(int64(e.Number()), 10)}}
+}
@@ -0,0 +1,34 @@
+/*
+Copyright 2024 Google LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+syntax = "proto2";
+
+package spanner.examples.music;
+option go_package = "./protos";
+
+message SingerInfo {
+  optional int64 singer_id = 1;
+  optional string birth_date = 2;
+  optional string nationality = 3;
+  optional Genre genre = 4;
+}
+
+enum Genre {
+  POP = 0;
+  JAZZ = 1;
+  FOLK = 2;
+  ROCK = 3;
+}