Merge pull request #12 from lefinal/350-fix-sql-generation-for-json-r…

…aw-message fix: fix sql generation for json.RawMessage
XIELongDragon · Oct 6, 2024 · 1dba8da · 1dba8da
2 parents c20bc99 + 1d09d8e
commit 1dba8da
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"
@@ -148,6 +149,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"
@@ -231,6 +232,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'")}},
 	)
 }