blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DB Initialisation: try named parameters

Browse Source 
Should be tested on Windows, as that's where this code will be used most
often. As of now, untested.
This commit is contained in:
Sybren A. Stüvel 2022-02-22 12:06:54 +01:00
parent 77f1e02c75
commit 80df8fa6e4
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/manager/persistence/initialisation.go
View File

@ -22,6 +22,7 @@ package persistence
import (
"bufio"
"database/sql"
"errors"
"fmt"
"os"
@ -56,23 +57,16 @@ func InitialSetup() error {
// Has to be used by the regular Flamenco Manager runs as well, though.
username := "flamenco"
userPass := "flamenco"
// tx := db.Exec("CREATE USER flamenco PASSWORD ? NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN", userPass)
// if tx.Error != nil {
// return fmt.Errorf("unable to create database user '%s': %w", username, tx.Error)
// }
{
sqlDB, err := db.DB()
if err != nil {
panic(err)
}
_, err = sqlDB.Exec("CREATE USER flamenco WITH PASSWORD $1::string NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN", userPass)
if err != nil {
panic(err)
}
tx := db.Exec("CREATE USER @user PASSWORD @pass NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN",
sql.Named("user", username),
sql.Named("pass", userPass))
if tx.Error != nil {
return fmt.Errorf("unable to create database user '%s': %w", username, tx.Error)
}
// Create the databases.
tx := db.Debug().Exec("CREATE DATABASE flamenco OWNER ? ENCODING 'utf8'", username)
tx = db.Debug().Exec("CREATE DATABASE flamenco OWNER ? ENCODING 'utf8'", username)
if tx.Error != nil {
return fmt.Errorf("unable to create database 'flamenco': %w", tx.Error)
}