migrations: fix migrations not being cancelable

R-a-dio · Feb 22, 2024 · 89bb288 · 89bb288
1 parent f9b93de
commit 89bb288
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmd/hanyuu/migrations.go b/cmd/hanyuu/migrations.go
@@ -103,6 +103,17 @@ func (m migrateCmd) up(ctx context.Context, cfg config.Config) error {
 		return err
 	}
 
+	done := make(chan struct{})
+	defer close(done)
+
+	go func() {
+		select {
+		case <-ctx.Done():
+			m.migrate.GracefulStop <- true
+		case <-done:
+		}
+	}()
+
 	return m.migrate.Up()
 }
 

diff --git a/migrations/mysql/0007_eplay_dj.up.sql b/migrations/mysql/0007_eplay_dj.up.sql
@@ -1,3 +1,3 @@
 ALTER TABLE eplay ADD COLUMN IF NOT EXISTS (djs_id INT DEFAULT NULL);
 
-UPDATE eplay SET djs_id = (SELECT dj FROM listenlog WHERE eplay.dt <= listenlog.time ORDER BY listenlog.time ASC LIMIT 1);
+UPDATE eplay SET djs_id = (SELECT dj FROM listenlog WHERE eplay.dt >= listenlog.time ORDER BY listenlog.time ASC LIMIT 1);