fix error

goravel · Sep 24, 2024 · e7d183b · e7d183b
1 parent 1ba0171
commit e7d183b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/database/gorm/query.go b/database/gorm/query.go
@@ -362,7 +362,7 @@ func (r *QueryImpl) ForceDelete(dest ...any) (*ormcontract.Result, error) {
 
 	if len(dest) > 0 {
 		realDest = dest[0]
-		query, err = r.refreshConnection(realDest)
+		query, err = query.refreshConnection(realDest)
 		if err != nil {
 			return nil, err
 		}

diff --git a/database/gorm/query_test.go b/database/gorm/query_test.go
@@ -41,19 +41,19 @@ func TestQueryTestSuite(t *testing.T) {
 	testContext = context.Background()
 	testContext = context.WithValue(testContext, testContextKey, "goravel")
 
-	//mysqls := supportdocker.Mysqls(2)
-	//
-	//mysqlDocker := NewMysqlDocker(mysqls[0])
-	//mysqlQuery, err := mysqlDocker.New()
-	//if err != nil {
-	//	log.Fatalf("Init mysql error: %s", err)
-	//}
-	//
-	//mysql1Docker := NewMysqlDocker(mysqls[1])
-	//_, err = mysql1Docker.New()
-	//if err != nil {
-	//	log.Fatalf("Init mysql error: %s", err)
-	//}
+	mysqls := supportdocker.Mysqls(2)
+
+	mysqlDocker := NewMysqlDocker(mysqls[0])
+	mysqlQuery, err := mysqlDocker.New()
+	if err != nil {
+		log.Fatalf("Init mysql error: %s", err)
+	}
+
+	mysql1Docker := NewMysqlDocker(mysqls[1])
+	_, err = mysql1Docker.New()
+	if err != nil {
+		log.Fatalf("Init mysql error: %s", err)
+	}
 
 	postgres := supportdocker.Postgres()
 	postgresDocker := NewPostgresDocker(postgres)
@@ -62,31 +62,31 @@ func TestQueryTestSuite(t *testing.T) {
 		log.Fatalf("Init postgres error: %s", err)
 	}
 
-	//sqliteDocker := NewSqliteDocker(supportdocker.Sqlite())
-	//sqliteQuery, err := sqliteDocker.New()
-	//if err != nil {
-	//	log.Fatalf("Init sqlite error: %s", err)
-	//}
-	//
-	//sqlserverDocker := NewSqlserverDocker(supportdocker.Sqlserver())
-	//sqlserverQuery, err := sqlserverDocker.New()
-	//if err != nil {
-	//	log.Fatalf("Init sqlserver error: %s", err)
-	//}
+	sqliteDocker := NewSqliteDocker(supportdocker.Sqlite())
+	sqliteQuery, err := sqliteDocker.New()
+	if err != nil {
+		log.Fatalf("Init sqlite error: %s", err)
+	}
+
+	sqlserverDocker := NewSqlserverDocker(supportdocker.Sqlserver())
+	sqlserverQuery, err := sqlserverDocker.New()
+	if err != nil {
+		log.Fatalf("Init sqlserver error: %s", err)
+	}
 
 	suite.Run(t, &QueryTestSuite{
 		queries: map[contractsorm.Driver]contractsorm.Query{
-			//contractsorm.DriverMysql:     mysqlQuery,
-			contractsorm.DriverPostgres: postgresQuery,
-			//contractsorm.DriverSqlite:    sqliteQuery,
-			//contractsorm.DriverSqlserver: sqlserverQuery,
+			contractsorm.DriverMysql:     mysqlQuery,
+			contractsorm.DriverPostgres:  postgresQuery,
+			contractsorm.DriverSqlite:    sqliteQuery,
+			contractsorm.DriverSqlserver: sqlserverQuery,
 		},
-		//mysqlDocker:     mysqlDocker,
-		//mysql1:          mysqls[1],
-		postgres:       postgres,
-		postgresDocker: postgresDocker,
-		//sqliteDocker:    sqliteDocker,
-		//sqlserverDocker: sqlserverDocker,
+		mysqlDocker:     mysqlDocker,
+		mysql1:          mysqls[1],
+		postgres:        postgres,
+		postgresDocker:  postgresDocker,
+		sqliteDocker:    sqliteDocker,
+		sqlserverDocker: sqlserverDocker,
 	})
 }
 
@@ -563,7 +563,7 @@ func (s *QueryTestSuite) TestDBRaw() {
 }
 
 func (s *QueryTestSuite) TestDelete() {
-	for _, query := range s.queries {
+	for driver, query := range s.queries {
 		tests := []struct {
 			name  string
 			setup func()
@@ -1640,7 +1640,7 @@ func (s *QueryTestSuite) TestForceDelete() {
 					s.True(user.ID > 0)
 					s.Equal("force_delete_name", user.Name)
 
-					res, err := query.Where("name = ?", "force_delete_name").ForceDelete(&User{})
+					res, err := query.Where("name", "force_delete_name").ForceDelete(&User{})
 					s.Equal(int64(1), res.RowsAffected)
 					s.Nil(err)
 					s.Equal("force_delete_name", user.Name)
@@ -1658,7 +1658,7 @@ func (s *QueryTestSuite) TestForceDelete() {
 					s.True(user.ID > 0)
 					s.Equal("force_delete_name_by_table", user.Name)
 
-					res, err := query.Table("users").Where("name = ?", "force_delete_name_by_table").ForceDelete()
+					res, err := query.Table("users").Where("name", "force_delete_name_by_table").ForceDelete()
 					s.Equal(int64(1), res.RowsAffected)
 					s.Nil(err)
 					s.Equal("force_delete_name_by_table", user.Name)
@@ -1676,7 +1676,7 @@ func (s *QueryTestSuite) TestForceDelete() {
 					s.True(user.ID > 0)
 					s.Equal("force_delete_name_by_model", user.Name)
 
-					res, err := query.Model(&User{}).Where("name = ?", "force_delete_name_by_model").ForceDelete()
+					res, err := query.Model(&User{}).Where("name", "force_delete_name_by_model").ForceDelete()
 					s.Equal(int64(1), res.RowsAffected)
 					s.Nil(err)
 					s.Equal("force_delete_name_by_model", user.Name)