stellar#4909: fixed json column tests on fast batch builder

sreuland · Oct 17, 2023 · 30ed273 · 30ed273
1 parent c1d5ce7
commit 30ed273
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/support/db/fast_batch_insert_builder_test.go b/support/db/fast_batch_insert_builder_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/guregu/null"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/stellar/go/support/db/dbtest"
@@ -21,7 +22,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.Row(map[string]interface{}{
 			"name":         "bubba",
 			"hunger_level": "1",
-			"json_value":   []byte(`{\"bump_to\":\"98\"}`),
+			"json_value":   []byte(`{"bump_to": "97"}`),
 		}),
 	)
 
@@ -36,7 +37,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.Row(map[string]interface{}{
 			"name":       "bubba",
 			"city":       "London",
-			"json_value": []byte(`{\"bump_to\":\"98\"}`),
+			"json_value": []byte(`{"bump_to": "98"}`),
 		}),
 		"column \"hunger_level\" does not exist",
 	)
@@ -45,7 +46,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.RowStruct(hungerRow{
 			Name:        "bubba2",
 			HungerLevel: "9",
-			JsonValue:   []byte(`{\"bump_to\":\"98\"}`),
+			JsonValue:   []byte(`{"bump_to": "98"}`),
 		}),
 	)
 
@@ -77,8 +78,8 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		t,
 		found,
 		[]person{
-			{Name: "bubba", HungerLevel: "1"},
-			{Name: "bubba2", HungerLevel: "9"},
+			{Name: "bubba", HungerLevel: "1", JsonValue: null.NewString(`{"bump_to": "97"}`, true)},
+			{Name: "bubba2", HungerLevel: "9", JsonValue: null.NewString(`{"bump_to": "98"}`, true)},
 		},
 	)
 
@@ -119,8 +120,8 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		t,
 		found,
 		[]person{
-			{Name: "bubba", HungerLevel: "1"},
-			{Name: "bubba2", HungerLevel: "9"},
+			{Name: "bubba", HungerLevel: "1", JsonValue: null.NewString(`{"bump_to": "97"}`, true)},
+			{Name: "bubba2", HungerLevel: "9", JsonValue: null.NewString(`{"bump_to": "98"}`, true)},
 		},
 	)
 	assert.NoError(t, sess.Rollback())

diff --git a/support/db/main_test.go b/support/db/main_test.go
@@ -4,15 +4,16 @@ import (
 	"testing"
 	"time"
 
+	"github.com/guregu/null"
 	"github.com/stellar/go/support/db/dbtest"
 	"github.com/stretchr/testify/assert"
 )
 
 type person struct {
-	Name        string `db:"name"`
-	HungerLevel string `db:"hunger_level"`
-
-	SomethingIgnored int `db:"-"`
+	Name             string      `db:"name"`
+	HungerLevel      string      `db:"hunger_level"`
+	JsonValue        null.String `db:"json_value"`
+	SomethingIgnored int         `db:"-"`
 }
 
 func TestGetTable(t *testing.T) {