fix: recognize json_valid constraint as json field type for database mariadb #2746

.github/workflows/ci-main.yml

@@ -66,6 +66,15 @@ jobs:
         ports:
           - 3306:3306
 
+      # MariaDb backend server.
+      mariadb:
+        image: loads/mariadb:10.4
+        env:
+          MARIADB_DATABASE: test
+          MARIADB_ROOT_PASSWORD: 12345678
+        ports:
+          - 3307:3307
+
       # PostgreSQL backend server.
       # docker run -d --name postgres \
       # -p 5432:5432 \

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -393,3 +393,79 @@ func Test_Gen_Dao_Issue2616(t *testing.T) {
 		t.Assert(gstr.Contains(daoUser2Content, keyStr), false)
 	})
 }
+
+func Test_Gen_Dao_Issue2746(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         gdb.DB
+			link2746   = "mariadb:root:12345678@tcp(127.0.0.1:3307)/test?loc=Local&parseTime=true"
+			table      = "issue2746"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`issue`, `2746`, `sql.sql`),
+				table,
+			)
+		)
+
+		db, err = gdb.New(gdb.ConfigNode{
+			Link: link2746,
+		})
+		t.AssertNil(err)
+
+		dropTableWithDb(db, table)
+		array := gstr.SplitAndTrim(sqlContent, ";")
+		for _, v := range array {
+			if _, err = db.Exec(ctx, v); err != nil {
+				t.AssertNil(err)
+			}
+		}
+		defer dropTableWithDb(db, table)
+
+		var (
+			path  = gfile.Temp(guid.S())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link2746,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "SnakeScreaming",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       true,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping:        nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		var (
+			file          = filepath.FromSlash(path + "/model/entity/issue_2746.go")
+			expectContent = gtest.DataContent(`issue`, `2746`, `issue_2746.go`)
+		)
+		t.Assert(expectContent, gfile.GetContents(file))
+	})
+}

cmd/gf/internal/cmd/testdata/issue/2746/sql.sql

@@ -0,0 +1,9 @@
+CREATE TABLE %s (
+     `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+     `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
+     `tag`  json NOT NULL,
+     `info` longtext DEFAULT NULL,
+     `tag2` json COMMENT 'Tag2',
+     PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+

contrib/drivers/mysql/mysql_table_fields.go

@@ -10,7 +10,10 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gutil"
 )
 
@@ -28,9 +31,10 @@ import (
 // process restarts.
 func (d *Driver) TableFields(ctx context.Context, table string, schema ...string) (fields map[string]*gdb.TableField, err error) {
 	var (
-		result     gdb.Result
-		link       gdb.Link
-		usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
+		result             gdb.Result
+		link               gdb.Link
+		usedSchema         = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
+		mariaJsonFiledName = gset.New(false)
 	)
 	if link, err = d.SlaveLink(usedSchema); err != nil {
 		return nil, err
@@ -42,8 +46,31 @@ func (d *Driver) TableFields(ctx context.Context, table string, schema ...string
 	if err != nil {
 		return nil, err
 	}
+
+	// Compatible with mariaDB json type
+	dbType := d.GetConfig().Type
+	if dbType == "mariadb" {
+		var checkConstraintResult gdb.Result
+		checkConstraintResult, err = d.DoSelect(
+			ctx, link,
+			fmt.Sprintf(`SELECT CONSTRAINT_NAME as filedName, CHECK_CLAUSE as filedCheck FROM information_schema.CHECK_CONSTRAINTS WHERE TABLE_NAME = '%s'`, table),
+		)
+		if err != nil {
+			return nil, err
+		}
+		for _, m := range checkConstraintResult {
+			if gstr.HasPrefix(m["filedCheck"].String(), "json_valid") {
+				mariaJsonFiledName.Add(m["filedName"].String())
+			}
+		}
+	}
+
 	fields = make(map[string]*gdb.TableField)
 	for i, m := range result {
+		// if filed exists in mariaJsonFiledName, replace its Type with "json"
+		if mariaJsonFiledName.Size() != 0 && mariaJsonFiledName.Contains(m["Field"].String()) {
+			m["Type"] = gvar.New("json")
+		}
 		fields[m["Field"].String()] = &gdb.TableField{
 			Index:   i,
 			Name:    m["Field"].String(),