fix: gracefully handle empty hstore in pgdialect

dialect/pgdialect/append_test.go

@@ -0,0 +1,39 @@
+package pgdialect
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/uptrace/bun/schema"
+)
+
+func TestHStoreAppender(t *testing.T) {
+	tests := []struct {
+		input      map[string]string
+		expectedIn []string // maps being unsorted, multiple expected output are valid
+	}{
+		{nil, []string{`NULL`}},
+		{map[string]string{}, []string{`''`}},
+
+		{map[string]string{"": ""}, []string{`'""=>""'`}},
+		{map[string]string{`\`: `\`}, []string{`'"\\"=>"\\"'`}},
+		{map[string]string{"'": "'"}, []string{`'"''"=>"''"'`}},
+		{map[string]string{`'"{}`: `'"{}`}, []string{`'"''\"{}"=>"''\"{}"'`}},
+
+		{map[string]string{"1": "2", "3": "4"}, []string{`'"1"=>"2","3"=>"4"'`, `'"3"=>"4","1"=>"2"'`}},
+		{map[string]string{"1": ""}, []string{`'"1"=>""'`}},
+		{map[string]string{"1": "NULL"}, []string{`'"1"=>"NULL"'`}},
+		{map[string]string{"{1}": "{2}", "{3}": "{4}"}, []string{`'"{1}"=>"{2}","{3}"=>"{4}"'`, `'"{3}"=>"{4}","{1}"=>"{2}"'`}},
+	}
+
+	appendFunc := pgDialect.hstoreAppender(reflect.TypeOf(map[string]string{}))
+
+	for i, test := range tests {
+		t.Run(fmt.Sprint(i), func(t *testing.T) {
+			got := appendFunc(schema.NewFormatter(pgDialect), []byte{}, reflect.ValueOf(test.input))
+			require.Contains(t, test.expectedIn, string(got))
+		})
+	}
+}

dialect/pgdialect/hstore_parser.go

@@ -16,7 +16,7 @@ type hstoreParser struct {
 
 func newHStoreParser(b []byte) *hstoreParser {
 	p := new(hstoreParser)
-	if len(b) < 6 || b[0] != '"' {
+	if len(b) != 0 && (len(b) < 6 || b[0] != '"') {
 		p.err = fmt.Errorf("pgdialect: can't parse hstore: %q", b)
 		return p
 	}
@@ -83,7 +83,7 @@ func (p *hstoreParser) readNext() error {
 	default:
 		value := p.p.ReadLiteral(ch)
 		if bytes.Equal(value, []byte("NULL")) {
-			value = nil
+			p.value = ""
 		}
 		p.skipComma()
 		return nil

dialect/pgdialect/hstore_parser_test.go

@@ -12,6 +12,8 @@ func TestHStoreParser(t *testing.T) {
 		s string
 		m map[string]string
 	}{
+		{``, map[string]string{}},
+
 		{`""=>""`, map[string]string{"": ""}},
 		{`"\\"=>"\\"`, map[string]string{`\`: `\`}},
 		{`"'"=>"'"`, map[string]string{"'": "'"}},

internal/dbtest/pg_test.go

@@ -750,6 +750,22 @@ func TestPostgresHStoreQuote(t *testing.T) {
 	require.Equal(t, wanted, m)
 }
 
+func TestPostgresHStoreEmpty(t *testing.T) {
+	db := pg(t)
+	t.Cleanup(func() { db.Close() })
+
+	_, err := db.Exec(`CREATE EXTENSION IF NOT EXISTS HSTORE;`)
+	require.NoError(t, err)
+
+	wanted := map[string]string{}
+	m := make(map[string]string)
+	err = db.NewSelect().
+		ColumnExpr("?::hstore", pgdialect.HStore(wanted)).
+		Scan(ctx, pgdialect.HStore(&m))
+	require.NoError(t, err)
+	require.Equal(t, wanted, m)
+}
+
 func TestPostgresSkipupdateField(t *testing.T) {
 	type Model struct {
 		ID        int64 `bun:",pk,autoincrement"`