MySQL 8: Improve migrate command, ignore errors when dropping indexes

Author: lastzero

docker-compose.ci.yml

@@ -38,6 +38,7 @@ services:
       PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
       PHOTOPRISM_TEST_DRIVER: "sqlite"
       PHOTOPRISM_TEST_DSN: ".test.db"
+      PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
       PHOTOPRISM_ADMIN_PASSWORD: "photoprism" # The initial admin password (min 4 characters)
       PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
       PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
@@ -157,6 +158,21 @@ services:
       MYSQL_PASSWORD: photoprism
       MYSQL_DATABASE: photoprism
 
+  ## MySQL Database Server
+  ## Docs: https://dev.mysql.com/doc/refman/8.0/en/
+  mysql:
+    image: mysql:8
+    command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
+    expose:
+      - "4001" # Database port (internal)
+    volumes:
+      - "./scripts/sql/init-test-databases.sql:/docker-entrypoint-initdb.d/init-test-databases.sql"
+    environment:
+      MYSQL_ROOT_PASSWORD: photoprism
+      MYSQL_USER: photoprism
+      MYSQL_PASSWORD: photoprism
+      MYSQL_DATABASE: photoprism
+
   ## Dummy WebDAV Server
   dummy-webdav:
     image: photoprism/dummy-webdav:20211109

docker-compose.db.yml renamed to docker-compose.mariadb.yml

@@ -57,19 +57,6 @@ services:
       MYSQL_PASSWORD: photoprism
       MYSQL_DATABASE: photoprism
 
-  mysql-8:
-    image: mysql:8
-    command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
-    expose:
-      - "4001" # Database port (internal)
-    volumes:
-      - "./scripts/sql/init-test-databases.sql:/docker-entrypoint-initdb.d/init-test-databases.sql"
-    environment:
-      MYSQL_ROOT_PASSWORD: photoprism
-      MYSQL_USER: photoprism
-      MYSQL_PASSWORD: photoprism
-      MYSQL_DATABASE: photoprism
-
 networks:
   default:
     external:

docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - "2343:2343" # Acceptance Test HTTP port (host:container)
     shm_size: "2gb"
     environment:
+      PHOTOPRISM_ADMIN_PASSWORD: "photoprism"        # The initial admin password (min 4 characters)
       PHOTOPRISM_UID: ${UID:-1000}
       PHOTOPRISM_GID: ${GID:-1000}
       PHOTOPRISM_SITE_URL: "http://localhost:2342/"
@@ -44,7 +45,7 @@ services:
       PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
       PHOTOPRISM_TEST_DRIVER: "sqlite"
       PHOTOPRISM_TEST_DSN: ".test.db"
-      PHOTOPRISM_ADMIN_PASSWORD: "photoprism"        # The initial admin password (min 4 characters)
+      PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
       PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
       PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
       PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals"
@@ -103,6 +104,21 @@ services:
       MYSQL_PASSWORD: photoprism
       MYSQL_DATABASE: photoprism
 
+  ## MySQL Database Server
+  ## Docs: https://dev.mysql.com/doc/refman/8.0/en/
+  mysql:
+    image: mysql:8
+    command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
+    expose:
+      - "4001" # Database port (internal)
+    volumes:
+      - "./scripts/sql/init-test-databases.sql:/docker-entrypoint-initdb.d/init-test-databases.sql"
+    environment:
+      MYSQL_ROOT_PASSWORD: photoprism
+      MYSQL_USER: photoprism
+      MYSQL_PASSWORD: photoprism
+      MYSQL_DATABASE: photoprism
+
   ## Dummy WebDAV Server
   dummy-webdav:
     image: photoprism/dummy-webdav:20211109

internal/commands/migrate.go

@@ -4,15 +4,26 @@ import (
 	"context"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 
 	"github.com/photoprism/photoprism/internal/config"
 )
 
-// MigrateCommand registers the migrate cli command.
+// MigrateCommand registers the "migrate" CLI command.
 var MigrateCommand = cli.Command{
-	Name:   "migrate",
-	Usage:  "Updates the index database schema",
+	Name:  "migrate",
+	Usage: "Updates the index database schema",
+	Flags: []cli.Flag{
+		cli.BoolFlag{
+			Name:  "failed, f",
+			Usage: "run previously failed migrations",
+		},
+		cli.BoolFlag{
+			Name:  "trace, t",
+			Usage: "show trace logs for debugging",
+		},
+	},
 	Action: migrateAction,
 }
 
@@ -29,15 +40,26 @@ func migrateAction(ctx *cli.Context) error {
 		return err
 	}
 
+	defer conf.Shutdown()
+
+	if ctx.Bool("trace") {
+		log.SetLevel(logrus.TraceLevel)
+		log.Infoln("migrate: enabled trace mode")
+	}
+
+	runFailed := ctx.Bool("failed")
+
+	if runFailed {
+		log.Infoln("migrate: running previously failed migrations")
+	}
+
 	log.Infoln("migrating database schema...")
 
-	conf.InitDb()
+	conf.MigrateDb(runFailed)
 
 	elapsed := time.Since(start)
 
 	log.Infof("migration completed in %s", elapsed)
 
-	conf.Shutdown()
-
 	return nil
 }

internal/commands/places.go

@@ -16,11 +16,18 @@ import (
 // PlacesCommand registers the places subcommands.
 var PlacesCommand = cli.Command{
 	Name:  "places",
-	Usage: "Geographic data subcommands",
+	Usage: "Maps and location details subcommands",
 	Subcommands: []cli.Command{
 		{
-			Name:   "update",
-			Usage:  "Retrieves updated location details",
+			Name:  "update",
+			Usage: "Retrieves updated location details",
+			Flags: []cli.Flag{
+				cli.BoolFlag{
+					Name:   "yes, y",
+					Hidden: true,
+					Usage:  "assume \"yes\" as answer to all prompts and run non-interactively",
+				},
+			},
 			Action: placesUpdateAction,
 		},
 	},
@@ -46,14 +53,16 @@ func placesUpdateAction(ctx *cli.Context) error {
 		return nil
 	}
 
-	confirmPrompt := promptui.Prompt{
-		Label:     "Interrupting the update may result in inconsistent location details. Proceed?",
-		IsConfirm: true,
-	}
+	if !ctx.Bool("yes") {
+		confirmPrompt := promptui.Prompt{
+			Label:     "Interrupting the update may result in inconsistent location details. Proceed?",
+			IsConfirm: true,
+		}
 
-	// Abort?
-	if _, err := confirmPrompt.Run(); err != nil {
-		return nil
+		// Abort?
+		if _, err := confirmPrompt.Run(); err != nil {
+			return nil
+		}
 	}
 
 	start := time.Now()