fix(contrib/drivers/pgsql): fix insert error when data struct field h…

…as nil in PgSQL (#3679)

contrib/drivers/pgsql/pgsql_convert.go

@@ -12,16 +12,19 @@ import (
  "strings"
 
  "github.com/gogf/gf/v2/database/gdb"
+ "github.com/gogf/gf/v2/frame/g"
  "github.com/gogf/gf/v2/text/gregex"
  "github.com/gogf/gf/v2/text/gstr"
  "github.com/gogf/gf/v2/util/gconv"
 )
 
 // ConvertValueForField converts value to database acceptable value.
 func (d *Driver) ConvertValueForField(ctx context.Context, fieldType string, fieldValue interface{}) (interface{}, error) {
- var (
- fieldValueKind = reflect.TypeOf(fieldValue).Kind()
- )
+ if g.IsNil(fieldValue) {
+ return d.Core.ConvertValueForField(ctx, fieldType, fieldValue)
+ }
+
+ var fieldValueKind = reflect.TypeOf(fieldValue).Kind()
 
  if fieldValueKind == reflect.Slice {
  // For pgsql, json or jsonb require '[]'

contrib/drivers/pgsql/pgsql_z_unit_issue_test.go

@@ -142,3 +142,33 @@ func Test_Issue3671(t *testing.T) {
  t.AssertNil(err)
  })
 }
+
+// https:/gogf/gf/issues/3668
+func Test_Issue3668(t *testing.T) {
+ type Issue3668 struct {
+ Text interface{}
+ Number interface{}
+ }
+ var (
+ sqlText = gtest.DataContent("issues", "issue3668.sql")
+ table = fmt.Sprintf(`%s_%d`, TablePrefix+"issue3668", gtime.TimestampNano())
+ )
+ if _, err := db.Exec(ctx, fmt.Sprintf(sqlText, table)); err != nil {
+ gtest.Fatal(err)
+ }
+ defer dropTable(table)
+
+ gtest.C(t, func(t *gtest.T) {
+ var (
+ dao = db.Model(table)
+ data = Issue3668{
+ Text: "我们都是自然的婴儿，卧在宇宙的摇篮里",
+ Number: nil,
+ }
+ )
+ _, err := dao.Ctx(ctx).
+ Data(data).
+ Insert()
+ t.AssertNil(err)
+ })
+}

contrib/drivers/pgsql/testdata/issues/issue3668.sql

@@ -0,0 +1,4 @@
+CREATE TABLE "public"."%s" (
+ "text" varchar(255) COLLATE "pg_catalog"."default",
+ "number" int4
+);