From 21d2893292ad9e8332d61943666abac94d01c2fb Mon Sep 17 00:00:00 2001
From: Dan Sosedoff <dan.sosedoff@gmail.com>
Date: Tue, 27 Nov 2018 17:23:55 -0600
Subject: [PATCH] Fix startup behavior when user did not provide a database
 name

---
 pkg/cli/cli.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index 6a72bbb..5c58a74 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -77,7 +77,18 @@ func initClient() {
 	fmt.Println("Connecting to server...")
 	err = cl.Test()
 	if err != nil {
-		exitWithMessage(err.Error())
+		msg := err.Error()
+
+		// Check if we're trying to connect to the default database.
+		// If database does not exist, allow user to connect from the UI.
+		if command.Opts.DbName == "" {
+			if strings.Contains(msg, "database") && strings.Contains(msg, "does not exist") {
+				fmt.Println("Error:", msg)
+				return
+			}
+		}
+
+		exitWithMessage(msg)
 	}
 
 	if !command.Opts.Sessions {