From 39afd67130a7ac967428d3d6e45526905ddab4ee Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Wed, 19 Feb 2020 22:04:38 +0100
Subject: [PATCH] Show all root albums instead of the single path

Improve sql connection error messages
---
 api/database/mysql.go          | 4 ++++
 api/example.env                | 2 +-
 api/graphql/resolvers/album.go | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/api/database/mysql.go b/api/database/mysql.go
index 9a8e2888..4154717b 100644
--- a/api/database/mysql.go
+++ b/api/database/mysql.go
@@ -25,6 +25,10 @@ func SetupDatabase() *sql.DB {
 		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.Add("multiStatements", "true")
 	queryValues.Add("parseTime", "true")
diff --git a/api/example.env b/api/example.env
index 66ece317..ff629f62 100644
--- a/api/example.env
+++ b/api/example.env
@@ -1,6 +1,6 @@
 # Copy this file to .env
 
-MYSQL_URL=user:password@/dbname
+MYSQL_URL=user:password@tcp(localhost)/dbname
 
 API_ENDPOINT=http://localhost:4001/
 API_LISTEN_PORT=4001
\ No newline at end of file
diff --git a/api/graphql/resolvers/album.go b/api/graphql/resolvers/album.go
index 5b6c0a83..9cf77529 100644
--- a/api/graphql/resolvers/album.go
+++ b/api/graphql/resolvers/album.go
@@ -20,7 +20,11 @@ func (r *queryResolver) MyAlbums(ctx context.Context, filter *models.Filter) ([]
 		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 {
 		return nil, err
 	}