Merge pull request #102 from gcpug/support-json-type-code

add support for JSON type

server/value.go

@@ -527,7 +527,7 @@ func (it *rows) next() ([]interface{}, bool) {
 			values[i] = reflect.New(reflect.TypeOf(sql.NullInt64{}))
 		case TCFloat64:
 			values[i] = reflect.New(reflect.TypeOf(sql.NullFloat64{}))
-		case TCTimestamp, TCDate, TCString:
+		case TCTimestamp, TCDate, TCString, TCJson:
 			values[i] = reflect.New(reflect.TypeOf(sql.NullString{}))
 		case TCBytes:
 			values[i] = reflect.New(reflect.TypeOf(&[]byte{}))
@@ -676,6 +676,8 @@ func makeSpannerTypeFromValueType(typ ValueType) *spannerpb.Type {
 		code = spannerpb.TypeCode_ARRAY
 	case TCStruct:
 		code = spannerpb.TypeCode_STRUCT
+	case TCJson:
+		code = spannerpb.TypeCode_JSON
 	}
 
 	st := &spannerpb.Type{Code: code}
@@ -767,6 +769,10 @@ func makeValueTypeFromSpannerType(typ *spannerpb.Type) (ValueType, error) {
 				FieldTypes: types,
 			},
 		}, nil
+	case spannerpb.TypeCode_JSON:
+		return ValueType{
+			Code: TCJson,
+		}, nil
 	}
 
 	return ValueType{}, fmt.Errorf("unknown code for spanner.Type: %v", typ.Code)
@@ -1034,7 +1040,7 @@ func makeDataFromSpannerValue(key string, v *structpb.Value, typ ValueType) (int
 			return s, nil
 		}
 
-	case TCString:
+	case TCString, TCJson:
 		switch vv := v.Kind.(type) {
 		case *structpb.Value_StringValue:
 			return vv.StringValue, nil

server/value_test.go

@@ -299,6 +299,13 @@ func TestDatabaseEncDec(t *testing.T) {
 			},
 			expected: makeTestArray(TCBytes, []byte("xyz"), []byte("xxx")),
 		},
+		"JSON": {
+			value: makeStringValue(`{"a": 1, "b": 2}`),
+			typ: ValueType{
+				Code: TCJson,
+			},
+			expected: `{"a": 1, "b": 2}`,
+		},
 	}
 
 	uuid := uuidpkg.New().String()
@@ -723,6 +730,18 @@ func TestMakeValueFromSpannerValue(t *testing.T) {
 				},
 			},
 		},
+		"JSON": {
+			value: makeStringValue(`{"a": 1, "b": 2}`),
+			typ: &spannerpb.Type{
+				Code: spannerpb.TypeCode_JSON,
+			},
+			expected: Value{
+				Data: `{"a": 1, "b": 2}`,
+				Type: ValueType{
+					Code: TCJson,
+				},
+			},
+		},
 	}
 
 	for name, tc := range table {