From 43f38242f8a87f9d05a1971ccf50ed1f64882833 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 31 Dec 2023 22:00:44 +0800
Subject: [PATCH] fix vet

---
 migrate/migrate_test.go | 47 +++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/migrate/migrate_test.go b/migrate/migrate_test.go
index 2baae001..e940844d 100644
--- a/migrate/migrate_test.go
+++ b/migrate/migrate_test.go
@@ -26,28 +26,26 @@ const (
 	dbName = "testdb.sqlite3"
 )
 
-var (
-	migrations = []*Migration{
-		{
-			ID: "201608301400",
-			Migrate: func(tx *xorm.Engine) error {
-				return tx.Sync(&Person{})
-			},
-			Rollback: func(tx *xorm.Engine) error {
-				return tx.DropTables(&Person{})
-			},
+var migrations = []*Migration{
+	{
+		ID: "201608301400",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync(&Person{})
 		},
-		{
-			ID: "201608301430",
-			Migrate: func(tx *xorm.Engine) error {
-				return tx.Sync(&Pet{})
-			},
-			Rollback: func(tx *xorm.Engine) error {
-				return tx.DropTables(&Pet{})
-			},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(&Person{})
 		},
-	}
-)
+	},
+	{
+		ID: "201608301430",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync(&Pet{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(&Pet{})
+		},
+	},
+}
 
 func TestMigration(t *testing.T) {
 	_ = os.Remove(dbName)
@@ -58,7 +56,7 @@ func TestMigration(t *testing.T) {
 	}
 	defer db.Close()
 
-	if err = db.DB().Ping(); err != nil {
+	if err = db.Ping(); err != nil {
 		log.Fatal(err)
 	}
 
@@ -97,7 +95,7 @@ func TestInitSchema(t *testing.T) {
 		log.Fatal(err)
 	}
 	defer db.Close()
-	if err = db.DB().Ping(); err != nil {
+	if err = db.Ping(); err != nil {
 		log.Fatal(err)
 	}
 
@@ -126,7 +124,7 @@ func TestMissingID(t *testing.T) {
 	if db != nil {
 		defer db.Close()
 	}
-	assert.NoError(t, db.DB().Ping())
+	assert.NoError(t, db.Ping())
 
 	migrationsMissingID := []*Migration{
 		{
@@ -141,7 +139,6 @@ func TestMissingID(t *testing.T) {
 }
 
 func tableCount(db *xorm.Engine, tableName string) (count int) {
-	row := db.DB().QueryRow(fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName))
-	_ = row.Scan(&count)
+	_, _ = db.SQL(fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName)).Get(&count)
 	return
 }