Cluster: Use creds.Driver instead of provisioner.DatabaseDriver

Signed-off-by: Michael Mayer <michael@photoprism.app>

Author: lastzero

internal/api/cluster_nodes_register.go

@@ -245,7 +245,7 @@ func ClusterNodesRegister(router *gin.RouterGroup) {
 
 				n.Database.Name = creds.Name
 				n.Database.User = creds.User
-				n.Database.Driver = provisioner.DatabaseDriver
+				n.Database.Driver = creds.Driver
 				if creds.RotatedAt != "" {
 					n.Database.RotatedAt = creds.RotatedAt
 				}
@@ -281,7 +281,11 @@ func ClusterNodesRegister(router *gin.RouterGroup) {
 			}
 
 			if n.Database != nil {
-				resp.Database = cluster.RegisterDatabase{Host: conf.DatabaseHost(), Port: conf.DatabasePort(), Name: n.Database.Name, User: n.Database.User, Driver: provisioner.DatabaseDriver, RotatedAt: n.Database.RotatedAt}
+				driver := n.Database.Driver
+				if driver == "" {
+					driver = provisioner.DatabaseDriver
+				}
+				resp.Database = cluster.RegisterDatabase{Host: conf.DatabaseHost(), Port: conf.DatabasePort(), Name: n.Database.Name, User: n.Database.User, Driver: driver, RotatedAt: n.Database.RotatedAt}
 			}
 
 			// Include password/dsn only if rotated now.
@@ -343,7 +347,7 @@ func ClusterNodesRegister(router *gin.RouterGroup) {
 			}
 
 			n.Database.Name, n.Database.User, n.Database.RotatedAt = creds.Name, creds.User, creds.RotatedAt
-			n.Database.Driver = provisioner.DatabaseDriver
+			n.Database.Driver = creds.Driver
 		}
 
 		if err = regy.Put(n); err != nil {
@@ -368,7 +372,7 @@ func ClusterNodesRegister(router *gin.RouterGroup) {
 
 		// If DB provisioning is skipped, leave Database fields zero-value.
 		if shouldProvisionDB {
-			resp.Database = cluster.RegisterDatabase{Host: conf.DatabaseHost(), Port: conf.DatabasePort(), Name: creds.Name, User: creds.User, Driver: provisioner.DatabaseDriver, Password: creds.Password, DSN: creds.DSN, RotatedAt: creds.RotatedAt}
+			resp.Database = cluster.RegisterDatabase{Host: conf.DatabaseHost(), Port: conf.DatabasePort(), Name: creds.Name, User: creds.User, Driver: creds.Driver, Password: creds.Password, DSN: creds.DSN, RotatedAt: creds.RotatedAt}
 		}
 
 		event.AuditInfo([]string{clientIp, string(acl.ResourceCluster), "node", "%s", status.Joined}, clean.Log(name))

internal/service/cluster/provisioner/credentials.go

@@ -62,7 +62,7 @@ func EnsureCredentials(ctx context.Context, conf *config.Config, nodeUUID, nodeN
 	{
 		c, cancel := context.WithTimeout(ctx, 10*time.Second)
 		defer cancel()
-		if err := db.QueryRowContext(
+		if err = db.QueryRowContext(
 			c,
 			"SELECT COUNT(*) FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ?",
 			dbName,
@@ -78,7 +78,7 @@ func EnsureCredentials(ctx context.Context, conf *config.Config, nodeUUID, nodeN
 		return out, created, err
 	}
 	createDB := "CREATE DATABASE IF NOT EXISTS " + qDB + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
-	if err := execTimeout(ctx, db, 15*time.Second, createDB); err != nil {
+	if err = execTimeout(ctx, db, 15*time.Second, createDB); err != nil {
 		return out, created, err
 	}
 
@@ -93,14 +93,14 @@ func EnsureCredentials(ctx context.Context, conf *config.Config, nodeUUID, nodeN
 	}
 
 	createUser := "CREATE USER IF NOT EXISTS " + acc + " IDENTIFIED BY " + pass
-	if err := execTimeout(ctx, db, 10*time.Second, createUser); err != nil {
+	if err = execTimeout(ctx, db, 10*time.Second, createUser); err != nil {
 		return out, created, err
 	}
 
 	// 4) Rotate or set password explicitly on first creation.
 	if rotate || created {
 		alterUser := "ALTER USER " + acc + " IDENTIFIED BY " + pass
-		if err := execTimeout(ctx, db, 10*time.Second, alterUser); err != nil {
+		if err = execTimeout(ctx, db, 10*time.Second, alterUser); err != nil {
 			return out, created, err
 		}
 		out.Password = dbPass
@@ -109,12 +109,12 @@ func EnsureCredentials(ctx context.Context, conf *config.Config, nodeUUID, nodeN
 
 	// 5) Grant privileges on schema.
 	grant := "GRANT ALL PRIVILEGES ON " + qDB + ".* TO " + acc
-	if err := execTimeout(ctx, db, 10*time.Second, grant); err != nil {
+	if err = execTimeout(ctx, db, 10*time.Second, grant); err != nil {
 		return out, created, err
 	}
 
 	// 6) Optional on modern MariaDB/MySQL; harmless if included.
-	if err := execTimeout(ctx, db, 5*time.Second, "FLUSH PRIVILEGES"); err != nil {
+	if err = execTimeout(ctx, db, 5*time.Second, "FLUSH PRIVILEGES"); err != nil {
 		return out, created, err
 	}