♻️ use Count(&count)

traPtitech · Jun 3, 2023 · f47d40f · f47d40f
1 parent 1ffb11a
commit f47d40f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/migration/v13.go b/migration/v13.go
@@ -1,7 +1,6 @@
 package migration
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -65,6 +64,7 @@ ORDER BY
 				for _, e := range duplicatedEvents {
 					i := 1
 					for {
+						var count int64
 						if err := tx.
 							Table("events").
 							Where(
@@ -73,13 +73,15 @@ ORDER BY
 								e.TimeStart,
 								e.TimeEnd,
 							).
-							Take(&map[string]any{}).
+							Count(&count).
 							Error; err != nil {
-							if errors.Is(err, gorm.ErrRecordNotFound) {
-								break
-							}
 							return err
 						}
+
+						if count == 0 {
+							break
+						}
+
 						i++
 					}
 

diff --git a/migration/v14.go b/migration/v14.go
@@ -1,7 +1,6 @@
 package migration
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -65,6 +64,7 @@ ORDER BY
 				for _, r := range duplicatedRooms {
 					i := 1
 					for {
+						var count int64
 						if err := tx.
 							Table("rooms").
 							Where(
@@ -73,13 +73,15 @@ ORDER BY
 								r.TimeStart,
 								r.TimeEnd,
 							).
-							Take(&map[string]any{}).
+							Count(&count).
 							Error; err != nil {
-							if errors.Is(err, gorm.ErrRecordNotFound) {
-								break
-							}
 							return err
 						}
+
+						if count == 0 {
+							break
+						}
+
 						i++
 					}