Selaa lähdekoodia

修改测试和demo

yjp 11 kuukautta sitten
vanhempi
commit
b72725753e
4 muutettua tiedostoa jossa 22 lisäystä ja 22 poistoa
  1. 2 2
      demo/entity.go
  2. 1 1
      demo/sql_result.go
  3. 15 15
      sql/sql_result.go
  4. 4 4
      test/sdk_test.go

+ 2 - 2
demo/entity.go

@@ -12,7 +12,7 @@ type TimeFields struct {
 }
 
 type IgnoreStruct struct {
-	IgnoreField *string `sqlmapping:"-" sqlresult:"-"` // 这里如果结构字段上忽略了,结构中的字段可以不加忽略
+	Field *string `sqlmapping:"-" sqlresult:"-"` // 这里如果结构字段上忽略了,结构中的字段可以不加忽略
 }
 
 type Class struct {
@@ -27,7 +27,7 @@ type Class struct {
 }
 
 type GraduatedTimeInfoStruct struct {
-	GraduatedTime *string `sqlresult:"column:graduated_time;parseTime:2006-01-02 15:04:05"`
+	Time *string `sqlresult:"column:graduated_time;parseTime:2006-01-02 15:04:05"`
 }
 
 type ClassInfo struct {

+ 1 - 1
demo/sql_result.go

@@ -28,7 +28,7 @@ func printSqlResult(sqlResult *sql.Result) {
 		case *sql.ResultColumn:
 			fmt.Println("Type: Field")
 			fmt.Printf("Name: \"%s\"\n", element.Name)
-			fmt.Printf("ParseTime: %v\n", element.ParseTime)
+			fmt.Printf("ParseTime: \"%s\"\n", element.ParseTime)
 			fmt.Printf("AESKey: \"%s\"\n", element.AESKey)
 			fmt.Printf("SplitWith: \"%s\"\n", element.SplitWith)
 		default:

+ 15 - 15
sql/sql_result.go

@@ -28,6 +28,21 @@ type Result struct {
 	ResultElement map[string]any
 }
 
+type ResultColumn struct {
+	Name      string
+	ParseTime string
+	AESKey    string
+	SplitWith string
+
+	// 原字段的反射结构
+	OriginFieldType  reflect.Type
+	OriginFieldValue reflect.Value
+
+	// 值类型的反射结构
+	FieldTypeElem  reflect.Type
+	FieldValueElem reflect.Value
+}
+
 func ParseSqlResultTag(e any) (*Result, error) {
 	if e == nil {
 		return nil, errors.New("没有传递实体")
@@ -70,21 +85,6 @@ func ParseSqlResultTag(e any) (*Result, error) {
 	return sqlResult, nil
 }
 
-type ResultColumn struct {
-	Name      string
-	ParseTime string
-	AESKey    string
-	SplitWith string
-
-	// 原字段的反射结构
-	OriginFieldType  reflect.Type
-	OriginFieldValue reflect.Value
-
-	// 值类型的反射结构
-	FieldTypeElem  reflect.Type
-	FieldValueElem reflect.Value
-}
-
 func parseSqlResultElement(field reflect.StructField, fieldValue reflect.Value) (any, error) {
 	sqlResultTag := field.Tag.Get(sqlResultTagKey)
 	if sqlResultTag == sqlResultIgnore {

+ 4 - 4
test/sdk_test.go

@@ -23,8 +23,8 @@ type TimeFields struct {
 	LastUpdatedTime time.Time
 }
 
-type GraduatedTimeTestField struct {
-	GraduatedTimeTest *string `sqlmapping:"-" sqlresult:"column:graduated_time;parseTime:2006-01-02 15:04:05"`
+type GraduatedTimeTestStruct struct {
+	Field *string `sqlmapping:"-" sqlresult:"column:graduated_time;parseTime:2006-01-02 15:04:05"`
 }
 
 type Class struct {
@@ -35,7 +35,7 @@ type Class struct {
 	StudentIDs    []string `sqlmapping:"column:student_ids;joinWith:'\n'" sqlresult:"column:student_ids;splitWith:'\n'"`
 	TimeFields
 	Ignored string `sqlmapping:"-" sqlresult:"-"`
-	*GraduatedTimeTestField
+	*GraduatedTimeTestStruct
 }
 
 const (
@@ -441,7 +441,7 @@ func checkSqlResult(t *testing.T, sqlResult *sql.Result) {
 			if fieldName != "ID" && fieldName != "Name" &&
 				fieldName != "StudentNum" && fieldName != "StudentIDs" &&
 				fieldName != "GraduatedTime" && fieldName != "CreatedTime" &&
-				fieldName != "LastUpdatedTime" && fieldName != "GraduatedTimeTest" {
+				fieldName != "LastUpdatedTime" && fieldName != "Field" {
 				t.Fatal("字段名不正确")
 			}