fix: fix sql generation for json.RawMessage

Fixes an issue where SQL for json.RawMessage-expressions is not generated correctly (as it is with byte slices). Closes doug-martin#350
lefinal · Aug 30, 2022 · 1d09d8e · 1d09d8e
1 parent 31d438d
commit 1d09d8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/sqlgen/expression_sql_generator.go b/sqlgen/expression_sql_generator.go
@@ -2,6 +2,7 @@ package sqlgen
 
 import (
 	"database/sql/driver"
+	"encoding/json"
 	"reflect"
 	"strconv"
 	"time"
@@ -137,6 +138,8 @@ func (esg *expressionSQLGenerator) reflectSQL(b sb.SQLBuilder, val interface{})
 		switch t := val.(type) {
 		case []byte:
 			esg.literalBytes(b, t)
+		case json.RawMessage:
+			esg.literalBytes(b, t)
 		case []exp.CommonTableExpression:
 			esg.commonTablesSliceSQL(b, t)
 		default:

diff --git a/sqlgen/expression_sql_generator_test.go b/sqlgen/expression_sql_generator_test.go
@@ -2,6 +2,7 @@ package sqlgen_test
 
 import (
 	"database/sql/driver"
+	"encoding/json"
 	"fmt"
 	"regexp"
 	"testing"
@@ -221,6 +222,12 @@ func (esgs *expressionSQLGeneratorSuite) TestGenerate_BytesTypes() {
 
 		expressionTestCase{val: []byte("Hello'"), sql: "'Hello'''"},
 		expressionTestCase{val: []byte("Hello'"), sql: "?", isPrepared: true, args: []interface{}{[]byte("Hello'")}},
+
+		expressionTestCase{val: json.RawMessage("Hello"), sql: "'Hello'"},
+		expressionTestCase{val: json.RawMessage("Hello"), sql: "?", isPrepared: true, args: []interface{}{[]byte("Hello")}},
+
+		expressionTestCase{val: json.RawMessage("Hello'"), sql: "'Hello'''"},
+		expressionTestCase{val: json.RawMessage("Hello'"), sql: "?", isPrepared: true, args: []interface{}{[]byte("Hello'")}},
 	)
 }