Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-23 15:30:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add schema handling via env var

Browse Source
This commit is contained in:
Zoe Roux 2024-08-21 23:28:06 +02:00
parent b49eb3bffa
commit e7c9eca524
No known key found for this signature in database
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transcoder/.env.example
View File

@ -26,4 +26,7 @@ POSTGRES_PASSWORD=
POSTGRES_DB= POSTGRES_DB=
POSTGRES_SERVER= POSTGRES_SERVER=
POSTGRES_PORT=5432 POSTGRES_PORT=5432
# (the schema "gocoder" will be used) # Default is gocoder, you can specify "disabled" to use the default search_path of the user.
# If this is not "disabled", the schema will be created (if it does not exists) and
# the search_path of the user will be ignored (only the schema specified will be used).
POSTGRES_SCHEMA=gocoder

11
transcoder/src/metadata.go
View File

@ -24,22 +24,29 @@ type MetadataService struct {
func NewMetadataService() (*MetadataService, error) { func NewMetadataService() (*MetadataService, error) {
con := fmt.Sprintf( con := fmt.Sprintf(
"postgresql://%v:%v@%v:%v/%v?application_name=gocoder&search_path=gocoder&sslmode=disable", "postgresql://%v:%v@%v:%v/%v?application_name=gocoder&sslmode=disable",
url.QueryEscape(os.Getenv("POSTGRES_USER")), url.QueryEscape(os.Getenv("POSTGRES_USER")),
url.QueryEscape(os.Getenv("POSTGRES_PASSWORD")), url.QueryEscape(os.Getenv("POSTGRES_PASSWORD")),
url.QueryEscape(os.Getenv("POSTGRES_SERVER")), url.QueryEscape(os.Getenv("POSTGRES_SERVER")),
url.QueryEscape(os.Getenv("POSTGRES_PORT")), url.QueryEscape(os.Getenv("POSTGRES_PORT")),
url.QueryEscape(os.Getenv("POSTGRES_DB")), url.QueryEscape(os.Getenv("POSTGRES_DB")),
) )
schema := GetEnvOr("POSTGRES_SCHEMA", "gocoder")
if schema != "disabled" {
con = fmt.Sprintf("%s&search_path=%s", con, url.QueryEscape(schema))
}
db, err := sql.Open("postgres", con) db, err := sql.Open("postgres", con)
if err != nil { if err != nil {
fmt.Printf("Could not connect to database, check your env variables!")
return nil, err return nil, err
} }
_, err = db.Exec("create schema if not exists gocoder") if schema != "disabled" {
_, err = db.Exec(fmt.Sprintf("create schema if not exists %s", schema))
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
driver, err := postgres.WithInstance(db, &postgres.Config{}) driver, err := postgres.WithInstance(db, &postgres.Config{})
if err != nil { if err != nil {