add possibility to override json library for jsonb fields

Author: pymq

conv_test.go

@@ -10,10 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/segmentio/encoding/json"
-
 	"github.com/go-pg/pg/v9"
 	"github.com/go-pg/pg/v9/orm"
+	"github.com/go-pg/pg/v9/pgjson"
 	"github.com/go-pg/pg/v9/types"
 )
 
@@ -24,11 +23,11 @@ func (m *JSONMap) Scan(b interface{}) error {
 		*m = nil
 		return nil
 	}
-	return json.Unmarshal(b.([]byte), m)
+	return pgjson.Unmarshal(b.([]byte), m)
 }
 
 func (m JSONMap) Value() (driver.Value, error) {
-	b, err := json.Marshal(m)
+	b, err := pgjson.Marshal(m)
 	if err != nil {
 		return nil, err
 	}

db_test.go

@@ -148,8 +148,7 @@ func TestAnynomousStructField(t *testing.T) {
 
 	var st MyStruct
 	_, err := db.Query(&st, "SELECT ARRAY[1,2,3,4] AS ints")
-	wanted := `json: cannot unmarshal "1" into Go value of type pg_test.MyInt`
-	if err.Error() != wanted {
+	if !strings.Contains(err.Error(), "json: cannot unmarshal") {
 		t.Fatal(err)
 	}
 }

orm/table.go

@@ -16,6 +16,7 @@ import (
 	"github.com/vmihailenco/tagparser"
 
 	"github.com/go-pg/pg/v9/internal"
+	"github.com/go-pg/pg/v9/pgjson"
 	"github.com/go-pg/pg/v9/types"
 	"github.com/go-pg/zerochecker"
 )
@@ -1005,7 +1006,7 @@ func scanJSONValue(v reflect.Value, rd types.Reader, n int) error {
 		return nil
 	}
 
-	dec := json.NewDecoder(rd)
+	dec := pgjson.NewDecoder(rd)
 	dec.UseNumber()
 	return dec.Decode(v.Addr().Interface())
 }

pgjson/json.go

@@ -0,0 +1,48 @@
+package pgjson
+
+import (
+	"encoding/json"
+	"io"
+
+	json2 "github.com/segmentio/encoding/json"
+)
+
+var _ Provider = (*StdProvider)(nil)
+
+type StdProvider struct{}
+
+func (StdProvider) Marshal(v interface{}) ([]byte, error) {
+	return json.Marshal(v)
+}
+
+func (StdProvider) Unmarshal(data []byte, v interface{}) error {
+	return json.Unmarshal(data, v)
+}
+
+func (StdProvider) NewEncoder(w io.Writer) Encoder {
+	return json.NewEncoder(w)
+}
+
+func (StdProvider) NewDecoder(r io.Reader) Decoder {
+	return json.NewDecoder(r)
+}
+
+var _ Provider = (*SegmentioProvider)(nil)
+
+type SegmentioProvider struct{}
+
+func (SegmentioProvider) Marshal(v interface{}) ([]byte, error) {
+	return json2.Marshal(v)
+}
+
+func (SegmentioProvider) Unmarshal(data []byte, v interface{}) error {
+	return json2.Unmarshal(data, v)
+}
+
+func (SegmentioProvider) NewEncoder(w io.Writer) Encoder {
+	return json2.NewEncoder(w)
+}
+
+func (SegmentioProvider) NewDecoder(r io.Reader) Decoder {
+	return json2.NewDecoder(r)
+}

pgjson/provider.go

@@ -0,0 +1,43 @@
+package pgjson
+
+import (
+	"io"
+)
+
+var provider Provider = StdProvider{}
+
+func SetProvider(p Provider) {
+	provider = p
+}
+
+type Provider interface {
+	Marshal(v interface{}) ([]byte, error)
+	Unmarshal(data []byte, v interface{}) error
+	NewEncoder(w io.Writer) Encoder
+	NewDecoder(r io.Reader) Decoder
+}
+
+type Decoder interface {
+	Decode(v interface{}) error
+	UseNumber()
+}
+
+type Encoder interface {
+	Encode(v interface{}) error
+}
+
+func Marshal(v interface{}) ([]byte, error) {
+	return provider.Marshal(v)
+}
+
+func Unmarshal(data []byte, v interface{}) error {
+	return provider.Unmarshal(data, v)
+}
+
+func NewEncoder(w io.Writer) Encoder {
+	return provider.NewEncoder(w)
+}
+
+func NewDecoder(r io.Reader) Decoder {
+	return provider.NewDecoder(r)
+}

types/append_jsonb_test.go

@@ -4,8 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/segmentio/encoding/json"
-
+	"github.com/go-pg/pg/v9/pgjson"
 	"github.com/go-pg/pg/v9/types"
 )
 
@@ -30,7 +29,7 @@ func TestAppendJSONB(t *testing.T) {
 }
 
 func BenchmarkAppendJSONB(b *testing.B) {
-	bytes, err := json.Marshal(jsonbTests)
+	bytes, err := pgjson.Marshal(jsonbTests)
 	if err != nil {
 		b.Fatal(err)
 	}

types/append_value.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/segmentio/encoding/json"
 	"github.com/vmihailenco/bufpool"
 
 	"github.com/go-pg/pg/v9/internal"
+	"github.com/go-pg/pg/v9/pgjson"
 )
 
 var driverValuerType = reflect.TypeOf((*driver.Valuer)(nil)).Elem()
@@ -196,7 +196,7 @@ func appendJSONValue(b []byte, v reflect.Value, flags int) []byte {
 	buf := internal.GetBuffer()
 	defer internal.PutBuffer(buf)
 
-	if err := json.NewEncoder(buf).Encode(v.Interface()); err != nil {
+	if err := pgjson.NewEncoder(buf).Encode(v.Interface()); err != nil {
 		return AppendError(b, err)
 	}
 

types/scan_value.go

@@ -12,6 +12,7 @@ import (
 	"github.com/segmentio/encoding/json"
 
 	"github.com/go-pg/pg/v9/internal"
+	"github.com/go-pg/pg/v9/pgjson"
 )
 
 var valueScannerType = reflect.TypeOf((*ValueScanner)(nil)).Elem()
@@ -283,7 +284,7 @@ func scanJSONValue(v reflect.Value, rd Reader, n int) error {
 		return nil
 	}
 
-	dec := json.NewDecoder(rd)
+	dec := pgjson.NewDecoder(rd)
 	return dec.Decode(v.Addr().Interface())
 }