fix(database/gdb): json type field incorrect scanning to slice attribute

Makefile

@@ -34,8 +34,8 @@ version:
 subup:
 	@set -e; \
 	echo "Updating submodules..."; \
-	cd examples && git pull origin main; \
-	cd ..;
+	git submodule init;\
+	git submodule update;
 
 # update and commit submodules
 .PHONY: subsync

cmd/gf/internal/cmd/gendao/gendao.go

@@ -36,7 +36,7 @@ type (
 		Link               string   `name:"link"                short:"l"  brief:"{CGenDaoBriefLink}"`
 		Tables             string   `name:"tables"              short:"t"  brief:"{CGenDaoBriefTables}"`
 		TablesEx           string   `name:"tablesEx"            short:"x"  brief:"{CGenDaoBriefTablesEx}"`
-		ShardingPattern    []string `name:"ShardingPattern"     short:"sp" brief:"{CGenDaoBriefShardingPattern}"`
+		ShardingPattern    []string `name:"shardingPattern"     short:"sp" brief:"{CGenDaoBriefShardingPattern}"`
 		Group              string   `name:"group"               short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
 		Prefix             string   `name:"prefix"              short:"f"  brief:"{CGenDaoBriefPrefix}"`
 		RemovePrefix       string   `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`

container/gvar/gvar.go

@@ -8,14 +8,8 @@
 package gvar
 
 import (
-	"time"
-
 	"github.com/gogf/gf/v2/container/gtype"
-	"github.com/gogf/gf/v2/internal/deepcopy"
 	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
 )
 
 // Var is an universal variable type implementer.
@@ -39,144 +33,8 @@ func New(value interface{}, safe ...bool) *Var {
 	}
 }
 
-// Copy does a deep copy of current Var and returns a pointer to this Var.
-func (v *Var) Copy() *Var {
-	return New(gutil.Copy(v.Val()), v.safe)
-}
-
-// Clone does a shallow copy of current Var and returns a pointer to this Var.
-func (v *Var) Clone() *Var {
-	return New(v.Val(), v.safe)
-}
-
-// Set sets `value` to `v`, and returns the old value.
-func (v *Var) Set(value interface{}) (old interface{}) {
-	if v.safe {
-		if t, ok := v.value.(*gtype.Interface); ok {
-			old = t.Set(value)
-			return
-		}
-	}
-	old = v.value
-	v.value = value
-	return
-}
-
-// Val returns the current value of `v`.
-func (v *Var) Val() interface{} {
-	if v == nil {
-		return nil
-	}
-	if v.safe {
-		if t, ok := v.value.(*gtype.Interface); ok {
-			return t.Val()
-		}
-	}
-	return v.value
-}
-
-// Interface is alias of Val.
-func (v *Var) Interface() interface{} {
-	return v.Val()
-}
-
-// Bytes converts and returns `v` as []byte.
-func (v *Var) Bytes() []byte {
-	return gconv.Bytes(v.Val())
-}
-
-// String converts and returns `v` as string.
-func (v *Var) String() string {
-	return gconv.String(v.Val())
-}
-
-// Bool converts and returns `v` as bool.
-func (v *Var) Bool() bool {
-	return gconv.Bool(v.Val())
-}
-
-// Int converts and returns `v` as int.
-func (v *Var) Int() int {
-	return gconv.Int(v.Val())
-}
-
-// Int8 converts and returns `v` as int8.
-func (v *Var) Int8() int8 {
-	return gconv.Int8(v.Val())
-}
-
-// Int16 converts and returns `v` as int16.
-func (v *Var) Int16() int16 {
-	return gconv.Int16(v.Val())
-}
-
-// Int32 converts and returns `v` as int32.
-func (v *Var) Int32() int32 {
-	return gconv.Int32(v.Val())
-}
-
-// Int64 converts and returns `v` as int64.
-func (v *Var) Int64() int64 {
-	return gconv.Int64(v.Val())
-}
-
-// Uint converts and returns `v` as uint.
-func (v *Var) Uint() uint {
-	return gconv.Uint(v.Val())
-}
-
-// Uint8 converts and returns `v` as uint8.
-func (v *Var) Uint8() uint8 {
-	return gconv.Uint8(v.Val())
-}
-
-// Uint16 converts and returns `v` as uint16.
-func (v *Var) Uint16() uint16 {
-	return gconv.Uint16(v.Val())
-}
-
-// Uint32 converts and returns `v` as uint32.
-func (v *Var) Uint32() uint32 {
-	return gconv.Uint32(v.Val())
-}
-
-// Uint64 converts and returns `v` as uint64.
-func (v *Var) Uint64() uint64 {
-	return gconv.Uint64(v.Val())
-}
-
-// Float32 converts and returns `v` as float32.
-func (v *Var) Float32() float32 {
-	return gconv.Float32(v.Val())
-}
-
-// Float64 converts and returns `v` as float64.
-func (v *Var) Float64() float64 {
-	return gconv.Float64(v.Val())
-}
-
-// Time converts and returns `v` as time.Time.
-// The parameter `format` specifies the format of the time string using gtime,
-// eg: Y-m-d H:i:s.
-func (v *Var) Time(format ...string) time.Time {
-	return gconv.Time(v.Val(), format...)
-}
-
-// Duration converts and returns `v` as time.Duration.
-// If value of `v` is string, then it uses time.ParseDuration for conversion.
-func (v *Var) Duration() time.Duration {
-	return gconv.Duration(v.Val())
-}
-
-// GTime converts and returns `v` as *gtime.Time.
-// The parameter `format` specifies the format of the time string using gtime,
-// eg: Y-m-d H:i:s.
-func (v *Var) GTime(format ...string) *gtime.Time {
-	return gconv.GTime(v.Val(), format...)
-}
-
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-func (v Var) MarshalJSON() ([]byte, error) {
+func (v *Var) MarshalJSON() ([]byte, error) {
 	return json.Marshal(v.Val())
 }
 
@@ -195,11 +53,3 @@ func (v *Var) UnmarshalValue(value interface{}) error {
 	v.Set(value)
 	return nil
 }
-
-// DeepCopy implements interface for deep copy of current type.
-func (v *Var) DeepCopy() interface{} {
-	if v == nil {
-		return nil
-	}
-	return New(deepcopy.Copy(v.Val()), v.safe)
-}

container/gvar/gvar_basic.go

@@ -0,0 +1,105 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gvar
+
+import (
+	"github.com/gogf/gf/v2/container/gtype"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// Val returns the current value of `v`.
+func (v *Var) Val() any {
+	if v == nil {
+		return nil
+	}
+	if v.safe {
+		if t, ok := v.value.(*gtype.Interface); ok {
+			return t.Val()
+		}
+	}
+	return v.value
+}
+
+// Interface is alias of Val.
+func (v *Var) Interface() any {
+	return v.Val()
+}
+
+// Bytes converts and returns `v` as []byte.
+func (v *Var) Bytes() []byte {
+	return gconv.Bytes(v.Val())
+}
+
+// String converts and returns `v` as string.
+func (v *Var) String() string {
+	return gconv.String(v.Val())
+}
+
+// Bool converts and returns `v` as bool.
+func (v *Var) Bool() bool {
+	return gconv.Bool(v.Val())
+}
+
+// Int converts and returns `v` as int.
+func (v *Var) Int() int {
+	return gconv.Int(v.Val())
+}
+
+// Int8 converts and returns `v` as int8.
+func (v *Var) Int8() int8 {
+	return gconv.Int8(v.Val())
+}
+
+// Int16 converts and returns `v` as int16.
+func (v *Var) Int16() int16 {
+	return gconv.Int16(v.Val())
+}
+
+// Int32 converts and returns `v` as int32.
+func (v *Var) Int32() int32 {
+	return gconv.Int32(v.Val())
+}
+
+// Int64 converts and returns `v` as int64.
+func (v *Var) Int64() int64 {
+	return gconv.Int64(v.Val())
+}
+
+// Uint converts and returns `v` as uint.
+func (v *Var) Uint() uint {
+	return gconv.Uint(v.Val())
+}
+
+// Uint8 converts and returns `v` as uint8.
+func (v *Var) Uint8() uint8 {
+	return gconv.Uint8(v.Val())
+}
+
+// Uint16 converts and returns `v` as uint16.
+func (v *Var) Uint16() uint16 {
+	return gconv.Uint16(v.Val())
+}
+
+// Uint32 converts and returns `v` as uint32.
+func (v *Var) Uint32() uint32 {
+	return gconv.Uint32(v.Val())
+}
+
+// Uint64 converts and returns `v` as uint64.
+func (v *Var) Uint64() uint64 {
+	return gconv.Uint64(v.Val())
+}
+
+// Float32 converts and returns `v` as float32.
+func (v *Var) Float32() float32 {
+	return gconv.Float32(v.Val())
+}
+
+// Float64 converts and returns `v` as float64.
+func (v *Var) Float64() float64 {
+	return gconv.Float64(v.Val())
+}

container/gvar/gvar_copy.go

@@ -0,0 +1,30 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gvar
+
+import (
+	"github.com/gogf/gf/v2/internal/deepcopy"
+	"github.com/gogf/gf/v2/util/gutil"
+)
+
+// Copy does a deep copy of current Var and returns a pointer to this Var.
+func (v *Var) Copy() *Var {
+	return New(gutil.Copy(v.Val()), v.safe)
+}
+
+// Clone does a shallow copy of current Var and returns a pointer to this Var.
+func (v *Var) Clone() *Var {
+	return New(v.Val(), v.safe)
+}
+
+// DeepCopy implements interface for deep copy of current type.
+func (v *Var) DeepCopy() interface{} {
+	if v == nil {
+		return nil
+	}
+	return New(deepcopy.Copy(v.Val()), v.safe)
+}

container/gvar/gvar_scan.go

@@ -10,8 +10,7 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// Scan automatically checks the type of `pointer` and converts `params` to `pointer`. It supports `pointer`
-// with type of `*map/*[]map/*[]*map/*struct/**struct/*[]struct/*[]*struct` for converting.
+// Scan automatically checks the type of `pointer` and converts value of Var to `pointer`.
 //
 // See gconv.Scan.
 func (v *Var) Scan(pointer interface{}, mapping ...map[string]string) error {

container/gvar/gvar_set.go

@@ -0,0 +1,24 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gvar
+
+import (
+	"github.com/gogf/gf/v2/container/gtype"
+)
+
+// Set sets `value` to `v`, and returns the old value.
+func (v *Var) Set(value interface{}) (old interface{}) {
+	if v.safe {
+		if t, ok := v.value.(*gtype.Interface); ok {
+			old = t.Set(value)
+			return
+		}
+	}
+	old = v.value
+	v.value = value
+	return
+}

container/gvar/gvar_time.go

@@ -0,0 +1,34 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gvar
+
+import (
+	"time"
+
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// Time converts and returns `v` as time.Time.
+// The parameter `format` specifies the format of the time string using gtime,
+// eg: Y-m-d H:i:s.
+func (v *Var) Time(format ...string) time.Time {
+	return gconv.Time(v.Val(), format...)
+}
+
+// Duration converts and returns `v` as time.Duration.
+// If value of `v` is string, then it uses time.ParseDuration for conversion.
+func (v *Var) Duration() time.Duration {
+	return gconv.Duration(v.Val())
+}
+
+// GTime converts and returns `v` as *gtime.Time.
+// The parameter `format` specifies the format of the time string using gtime,
+// eg: Y-m-d H:i:s.
+func (v *Var) GTime(format ...string) *gtime.Time {
+	return gconv.GTime(v.Val(), format...)
+}