From 9c43c0105b35906f951aaaba943148eaf81c0bc4 Mon Sep 17 00:00:00 2001
From: Hunk Zhu <hunk@joy999.com>
Date: Sun, 28 Sep 2025 11:26:38 +0800
Subject: [PATCH 1/3] add broad matching to gf gen dao's tableEx attribute.

---
 cmd/gf/internal/cmd/gendao/gendao.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/cmd/gf/internal/cmd/gendao/gendao.go b/cmd/gf/internal/cmd/gendao/gendao.go
index 053f65e3cef..58d584a275c 100644
--- a/cmd/gf/internal/cmd/gendao/gendao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao.go
@@ -190,8 +190,29 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 	// Table excluding.
 	if in.TablesEx != "" {
 		array := garray.NewStrArrayFrom(tableNames)
-		for _, v := range gstr.SplitAndTrim(in.TablesEx, ",") {
-			array.RemoveValue(v)
+		for _, p := range gstr.SplitAndTrim(in.TablesEx, ",") {
+			if gstr.Contains(p, "*") || gstr.Contains(p, "?") {
+				p = gstr.ReplaceByMap(p, map[string]string{
+					"\r": "",
+					"\n": "",
+				})
+				p = gstr.ReplaceByMap(p, map[string]string{
+					"*": "\r",
+					"?": "\n",
+				})
+				p = gregex.Quote(p)
+				p = gstr.ReplaceByMap(p, map[string]string{
+					"\r": ".*",
+					"\n": ".",
+				})
+				for _, v := range array.Slice() {
+					if gregex.IsMatchString(p, v) {
+						array.RemoveValue(v)
+					}
+				}
+			} else {
+				array.RemoveValue(p)
+			}
 		}
 		tableNames = array.Slice()
 	}

From 55ffaa42eef259b0586453b01d6b79afe65c50ff Mon Sep 17 00:00:00 2001
From: Hunk <54zhua@gmail.com>
Date: Wed, 8 Oct 2025 07:13:30 +0800
Subject: [PATCH 2/3] fix bug.

---
 cmd/gf/internal/cmd/gendao/gendao.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/gf/internal/cmd/gendao/gendao.go b/cmd/gf/internal/cmd/gendao/gendao.go
index 58d584a275c..684c10bc30b 100644
--- a/cmd/gf/internal/cmd/gendao/gendao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao.go
@@ -205,7 +205,7 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 					"\r": ".*",
 					"\n": ".",
 				})
-				for _, v := range array.Slice() {
+				for _, v := range array.Clone().Slice() {
 					if gregex.IsMatchString(p, v) {
 						array.RemoveValue(v)
 					}

From ebbaaba071169385d5c74f7c7af3a50029f71171 Mon Sep 17 00:00:00 2001
From: hailaz <739476267@qq.com>
Date: Thu, 9 Oct 2025 10:27:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(contrib/drivers/mysql):=20=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E6=8E=89=20LastInsertId=20=E7=9A=84=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E5=85=B6=E9=A1=BA=E5=BA=8F=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contrib/drivers/mysql/mysql_z_unit_issue_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/drivers/mysql/mysql_z_unit_issue_test.go b/contrib/drivers/mysql/mysql_z_unit_issue_test.go
index e8f663a8e38..52c28b9fe35 100644
--- a/contrib/drivers/mysql/mysql_z_unit_issue_test.go
+++ b/contrib/drivers/mysql/mysql_z_unit_issue_test.go
@@ -853,8 +853,8 @@ func Test_Issue2561(t *testing.T) {
 		}
 		result, err := db.Model(table).Data(data).Insert()
 		t.AssertNil(err)
-		m, _ := result.LastInsertId()
-		t.Assert(m, 3)
+		// m, _ := result.LastInsertId() // TODO: The order of LastInsertId cannot be guaranteed
+		// t.Assert(m, 3)
 
 		n, _ := result.RowsAffected()
 		t.Assert(n, 3)