From e2ac04a45ddcaeee78570960acff7f79596a74fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Sun, 17 Aug 2025 12:15:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0comment?=
 =?UTF-8?q?=E6=97=B6,=20=E7=94=9F=E6=88=90=E6=B3=A8=E9=87=8A=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0panic=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql2go/parser.go | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/sql2go/parser.go b/sql2go/parser.go
index 0aa588e..d67f9aa 100644
--- a/sql2go/parser.go
+++ b/sql2go/parser.go
@@ -9,9 +9,10 @@ package sql2go
 
 import (
 	"errors"
-	wrapperType "git.zhangdeman.cn/zhangdeman/wrapper"
 	"strings"
 
+	wrapperType "git.zhangdeman.cn/zhangdeman/wrapper"
+
 	"github.com/xwb1989/sqlparser"
 )
 
@@ -93,11 +94,14 @@ func generateTable(tableName string, modelStructName string, columnList []*sqlpa
 
 	for _, item := range columnList {
 		comment := ""
-		if item.Type.Comment == nil {
+		if item.Type.Comment == nil || item.Type.Comment.Val == nil {
 			comment = item.Name.String()
 		} else {
 			comment = string(item.Type.Comment.Val)
 		}
+		if comment == "" {
+			comment = item.Name.String()
+		}
 		data := map[string]string{
 			"{FIELD}":         wrapperType.String(item.Name.String()).SnakeCaseToCamel(),
 			"{COLUMN}":        item.Name.String(),
@@ -153,14 +157,17 @@ func generateTableColumnDefined(modelStructName string, columnList []*sqlparser.
 	structFieldDescInstanceResult := "&" + columnDefineName + "{ \n"
 	structFieldCommentInstanceResult := "map[string]string{ \n"
 	for _, column := range columnList {
+		comment := column.Name.String()
+		if nil != column.Type.Comment {
+			comment = string(column.Type.Comment.Val)
+		}
+		if comment == "" {
+			comment = column.Name.String()
+		}
 		dataMap := map[string]string{
-			"{FIELD}":    wrapperType.String(column.Name.String()).SnakeCaseToCamel(),
-			"{JSON_TAG}": column.Name.String(),
-			"{FIELD_COMMENT}": wrapperType.TernaryOperator.String(
-				column.Type.Comment == nil,
-				wrapperType.String(column.Name.String()),
-				wrapperType.String(string(column.Type.Comment.Val)),
-			).Value(),
+			"{FIELD}":         wrapperType.String(column.Name.String()).SnakeCaseToCamel(),
+			"{JSON_TAG}":      column.Name.String(),
+			"{FIELD_COMMENT}": comment,
 		}
 
 		structFieldDefine := TableColumnTpl