Show all root albums instead of the single path
Improve sql connection error messages
This commit is contained in:
parent
b8f960f058
commit
39afd67130
|
@ -25,6 +25,10 @@ func SetupDatabase() *sql.DB {
|
||||||
log.Fatalf("Could not parse mysql url: %s\n", err)
|
log.Fatalf("Could not parse mysql url: %s\n", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if address.String() == "" {
|
||||||
|
log.Fatalln("ERROR: Environment variable MYSQL_URL missing, exiting")
|
||||||
|
}
|
||||||
|
|
||||||
queryValues := address.Query()
|
queryValues := address.Query()
|
||||||
queryValues.Add("multiStatements", "true")
|
queryValues.Add("multiStatements", "true")
|
||||||
queryValues.Add("parseTime", "true")
|
queryValues.Add("parseTime", "true")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Copy this file to .env
|
# Copy this file to .env
|
||||||
|
|
||||||
MYSQL_URL=user:password@/dbname
|
MYSQL_URL=user:password@tcp(localhost)/dbname
|
||||||
|
|
||||||
API_ENDPOINT=http://localhost:4001/
|
API_ENDPOINT=http://localhost:4001/
|
||||||
API_LISTEN_PORT=4001
|
API_LISTEN_PORT=4001
|
|
@ -20,7 +20,11 @@ func (r *queryResolver) MyAlbums(ctx context.Context, filter *models.Filter) ([]
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
rows, err := r.Database.Query("SELECT * FROM album WHERE owner_id = ? AND parent_album IS NULL"+filterSQL, user.UserID)
|
rows, err := r.Database.Query(`
|
||||||
|
SELECT * FROM album WHERE owner_id = ? AND parent_album = (
|
||||||
|
SELECT album_id FROM album WHERE parent_album IS NULL
|
||||||
|
)
|
||||||
|
`+filterSQL, user.UserID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue