Make migrations transparent to the user (#530)

* refactor: remove migrate command

* reafactor: avoid migration errors on no changes

docs/Usage.md

@@ -4,8 +4,7 @@ Before using `shiori`, make sure it has been installed on your system. By defaul
 
 - [Running Docker Container](#running-docker-container)
 - [Using Command Line Interface](#using-command-line-interface)
-    - [Search syntax](#search-syntax)
-- [Running migrations](#running-migrations)
+  - [Search syntax](#search-syntax)
 - [Using Web Interface](#using-web-interface)
 - [Improved import from Pocket](#improved-import-from-pocket)
 - [Import from Wallabag](#import-from-wallabag)
@@ -43,14 +42,6 @@ Now you can use `shiori` like normal. If you've finished, you can stop and remov
 docker stop shiori
 ```
 
-## Running migrations
-
-If this is a fresh install or you're upgrading versions, you'll need to migrate the database to apply any required
-changes for Shiori to work properly:
-
-- If you're using the binary version: `shiori migrate`
-- If you're running the containerized version: `docker run --rm -v $(pwd):/shiori ghcr.io/go-shiori/shiori migrate` (you can also start a shell on the running container and perform the migration there).
-
 ## Using Command Line Interface
 
 Shiori is composed by several subcommands. To see the documentation, run `shiori -h` :

internal/cmd/migrate.go

@@ -1,21 +0,0 @@
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-)
-
-func migrateCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "migrate",
-		Short: "Migrates the database to the latest version",
-		Run:   migrateHandler,
-	}
-
-	return cmd
-}
-
-func migrateHandler(cmd *cobra.Command, args []string) {
-	if err := db.Migrate(); err != nil {
-		cError.Printf("Error during migration: %s", err)
-	}
-}

internal/cmd/root.go

@@ -38,7 +38,6 @@ func ShioriCmd() *cobra.Command {
 		pocketCmd(),
 		serveCmd(),
 		checkCmd(),
-		migrateCmd(),
 	)
 
 	return rootCmd
@@ -68,6 +67,12 @@ func preRunRootHandler(cmd *cobra.Command, args []string) {
 		cError.Printf("Failed to open database: %v\n", err)
 		os.Exit(1)
 	}
+
+	// Migrate
+	if err := db.Migrate(); err != nil {
+		cError.Printf("Error running migration: %s\n", err)
+		os.Exit(1)
+	}
 }
 
 func getDataDir(portableMode bool) (string, error) {

internal/database/mysql.go

@@ -58,7 +58,11 @@ func (db *MySQLDatabase) Migrate() error {
 		return errors.WithStack(err)
 	}
 
-	return migration.Up()
+	if err := migration.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
+		return err
+	}
+
+	return nil
 }
 
 // SaveBookmarks saves new or updated bookmarks to database.

internal/database/pg.go

@@ -59,7 +59,11 @@ func (db *PGDatabase) Migrate() error {
 		return errors.WithStack(err)
 	}
 
-	return migration.Up()
+	if err := migration.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
+		return err
+	}
+
+	return nil
 }
 
 // SaveBookmarks saves new or updated bookmarks to database.

internal/database/sqlite.go

@@ -67,7 +67,11 @@ func (db *SQLiteDatabase) Migrate() error {
 		return errors.WithStack(err)
 	}
 
-	return migration.Up()
+	if err := migration.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
+		return err
+	}
+
+	return nil
 }
 
 // SaveBookmarks saves new or updated bookmarks to database.