refactor(database): 优化数据库模型中的变量声明和错误处理

Author: LanceAdd

database/gdb/gdb_model_select.go

@@ -372,9 +372,7 @@ func (m *Model) ScanAndCount(pointer any, totalCount *int, useFieldForCount bool
 // ScanList converts `r` to struct slice which contains other complex struct attributes.
 // Also see Result.ScanList.
 func (m *Model) ScanList(structSlicePointer any, bindToAttrName string, relationAttrNameAndFields ...string) (err error) {
-	var (
-		result Result
-	)
+	var result Result
 	out, err := checkGetSliceElementInfoForScanList(structSlicePointer, bindToAttrName)
 	if err != nil {
 		return err

database/gdb/gdb_model_with.go

@@ -8,6 +8,7 @@ package gdb
 
 import (
 	"database/sql"
+	"errors"
 	"reflect"
 
 	"github.com/gogf/gf/v2/errors/gcode"
@@ -186,7 +187,7 @@ func (m *Model) doWithScanStruct(pointer any) error {
 			Where(relatedSourceName, relatedTargetValue).
 			Scan(bindToReflectValue)
 		// It ignores sql.ErrNoRows in with feature.
-		if err != nil && err != sql.ErrNoRows {
+		if err != nil && !errors.Is(err, sql.ErrNoRows) {
 			return err
 		}
 	}
@@ -208,7 +209,7 @@ func (m *Model) doWithScanStructs(pointer any) error {
 		reflectValue        = reflect.ValueOf(pointer)
 		reflectKind         = reflectValue.Kind()
 	)
-	if reflectKind == reflect.Pointer {
+	if reflectKind == reflect.Ptr {
 		reflectValue = reflectValue.Elem()
 		reflectKind = reflectValue.Kind()
 	}
@@ -344,7 +345,7 @@ func (m *Model) doWithScanStructs(pointer any) error {
 			results, err = model.Clone().Fields(field.Value).
 				Where(relatedSourceName, relatedTargetValue).
 				All()
-			if err != nil && err != sql.ErrNoRows {
+			if err != nil && !errors.Is(err, sql.ErrNoRows) {
 				return err
 			}
 		}