postgres: add index for task_run_file_input(input_file_id)

internal/command/upgrade_db.go

@@ -84,17 +84,17 @@ func (*upgradeDbCmd) run(_ *cobra.Command, args []string) {
 	}
 	exitOnErr(err, "querying database schema version failed")
 
-	if curVer == clt.RequiredSchemaVersion() {
+	if curVer == clt.MaxSchemaVersion() {
 		stdout.Println("database schema is already up to date, nothing to do")
 		return
 	}
 
-	if curVer > clt.RequiredSchemaVersion() {
+	if curVer > clt.MaxSchemaVersion() {
 		fatal("database schema is from a newer baur version, please update baur")
 	}
 
 	err = clt.Upgrade(ctx)
 	exitOnErr(err, "upgrading database schema failed")
 
-	stdout.Printf("database schema successfully upgraded from version %d to %d\n", curVer, clt.RequiredSchemaVersion())
+	stdout.Printf("database schema successfully upgraded from version %d to %d\n", curVer, clt.MaxSchemaVersion())
 }

internal/command/upgrade_db_test.go

@@ -64,5 +64,5 @@ func TestUpgradeDb(t *testing.T) {
 	upgradeDbCmd := newUpgradeDatabaseCmd()
 	upgradeDbCmd.Command.Run(&upgradeDbCmd.Command, nil)
 
-	assert.Contains(t, stdoutBuf.String(), "database schema successfully upgraded from version 1 to 4")
+	assert.Contains(t, stdoutBuf.String(), "database schema successfully upgraded from version 1 to 5")
 }

internal/version/ver

@@ -1 +1 @@
-5.0.0
+5.1.0

pkg/storage/postgres/migrations/5.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_task_run_file_input_input_file_id on task_run_file_input(input_file_id);

pkg/storage/postgres/schema.go

@@ -16,8 +16,12 @@ import (
 	"github.com/simplesurance/baur/v5/pkg/storage"
 )
 
-// schemaVer is the database schema version required by this package.
-const schemaVer int32 = 4
+const (
+	// minSchemaVer is the minimum required database schema version
+	minSchemaVer int32 = 4
+	// maxSchemaVer is the highest database schema version that is compatible
+	maxSchemaVer int32 = 5
+)
 
 // migration represents a database schema migration.
 type migration struct {
@@ -220,8 +224,12 @@ func (c *Client) ensureSchemaIsCompatible(ctx context.Context) error {
 		return nil
 	}
 
-	if ver != schemaVer {
-		return fmt.Errorf("database schema version is not compatible with baur version, schema version: %d, expected version: %d", ver, schemaVer)
+	if ver < minSchemaVer || ver > maxSchemaVer {
+		if minSchemaVer == maxSchemaVer {
+			return fmt.Errorf("database schema version is not compatible with baur version, schema version: %d, expecting version: %d", ver, minSchemaVer)
+		}
+
+		return fmt.Errorf("database schema version is not compatible with baur version, schema version: %d, expecting schema version >=%d and <=%d", ver, minSchemaVer, maxSchemaVer)
 	}
 
 	return nil
@@ -282,6 +290,6 @@ func (c *Client) SchemaVersion(ctx context.Context) (int32, error) {
 	return c.schemaVersion(ctx)
 }
 
-func (c *Client) RequiredSchemaVersion() int32 {
-	return schemaVer
+func (c *Client) MaxSchemaVersion() int32 {
+	return maxSchemaVer
 }

pkg/storage/postgres/schema_test.go

@@ -39,6 +39,30 @@ func TestIsCompatible_OldBaurSchemaExist(t *testing.T) {
 	require.Contains(t, err.Error(), "incompatible database schema")
 }
 
+func TestIsCompatible_MinVer(t *testing.T) {
+	client, cleanupFn := newTestClient(t)
+	t.Cleanup(cleanupFn)
+
+	require.NoError(t, client.Init(ctx))
+
+	_, err := client.db.Exec(ctx, "UPDATE migrations set schema_version = $1", minSchemaVer)
+	require.NoError(t, err)
+
+	require.NoError(t, client.IsCompatible(ctx))
+}
+
+func TestIsCompatible_MaxVer(t *testing.T) {
+	client, cleanupFn := newTestClient(t)
+	t.Cleanup(cleanupFn)
+
+	require.NoError(t, client.Init(ctx))
+
+	_, err := client.db.Exec(ctx, "UPDATE migrations set schema_version = $1", maxSchemaVer)
+	require.NoError(t, err)
+
+	require.NoError(t, client.IsCompatible(ctx))
+}
+
 func TestIsCompatible_SchemaVersionDoesNotMatch(t *testing.T) {
 	client, cleanupFn := newTestClient(t)
 	defer cleanupFn()

pkg/storage/storage.go

@@ -135,9 +135,10 @@ type Storer interface {
 	// SchemaVersion returns the version of the schema that the storage is
 	// using.
 	SchemaVersion(ctx context.Context) (int32, error)
-	// RequiredSchemaVersion returns the schema version that the Storer
-	// implementation requires.
-	RequiredSchemaVersion() int32
+	// MaxSchemaVersion returns the max. supported database schema version.
+	// It is also the version to that [Upgrade] can migrate the current
+	// schema.
+	MaxSchemaVersion() int32
 	// IsCompatible verifies that the storage is compatible with the baur version
 	IsCompatible(context.Context) error
 	// Upgrade upgrades the schema to RequiredSchemaVersion().