fix(json): adapt internal json update handling (#451)

steebchen · Mar 30, 2021 · a7eef73 · a7eef73
1 parent 964976c
commit a7eef73
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/generator/templates/actions/find.gotpl b/generator/templates/actions/find.gotpl
@@ -208,7 +208,8 @@
 						{{/* TODO consider upcoming non-set methods */}}
 						field := q.field()
 						{{/* if scalar, wrap in 'set' */}}
-						if field.Value != nil {
+						_, isJson := field.Value.(types.JSON)
+						if field.Value != nil && !isJson {
 							v := field.Value
 							field.Fields = []builder.Field{
 								{

diff --git a/generator/templates/actions/upsert.gotpl b/generator/templates/actions/upsert.gotpl
@@ -85,7 +85,8 @@
 			{{/* TODO re-use */}}
 			field := q.field()
 			{{/* if scalar, wrap in 'set' */}}
-			if field.Value != nil {
+			_, isJson := field.Value.(types.JSON)
+			if field.Value != nil && !isJson {
 				v := field.Value
 				field.Fields = []builder.Field{
 					{

diff --git a/test/types/json/default_test.go b/test/types/json/default_test.go
@@ -101,6 +101,50 @@ func TestJSON(t *testing.T) {
 				t.Fatalf("fail %s", err)
 			}
 
+			assert.Equal(t, expected, actual)
+		},
+	}, {
+		name: "json update field",
+		run: func(t *testing.T, client *PrismaClient, ctx cx) {
+			var b JSON = []byte(`"hi"`)
+			created, err := client.User.CreateOne(
+				User.JSON.Set(b),
+				User.JSONOpt.Set(b),
+				User.ID.Set("123"),
+			).Exec(ctx)
+			if err != nil {
+				t.Fatalf("fail %s", err)
+			}
+
+			expected := &UserModel{
+				InnerUser: InnerUser{
+					ID:      "123",
+					JSON:    b,
+					JSONOpt: &b,
+				},
+			}
+
+			assert.Equal(t, expected, created)
+
+			updated, err := client.User.FindUnique(
+				User.ID.Equals("123"),
+			).Update(
+				User.JSON.Set(b),
+				User.JSONOpt.Set(b),
+			).Exec(ctx)
+			if err != nil {
+				t.Fatalf("fail %s", err)
+			}
+
+			assert.Equal(t, expected, updated)
+
+			actual, err := client.User.FindUnique(
+				User.ID.Equals("123"),
+			).Exec(ctx)
+			if err != nil {
+				t.Fatalf("fail %s", err)
+			}
+
 			assert.Equal(t, expected, actual)
 		},
 	}}