tests for default db name

Author: zachmu

testing/bats/doltgres.bats

@@ -354,25 +354,44 @@ EOF
 
     [ ! -d "auth.db" ]
 
-    start_sql_server postgres log.txt myuser mypass
+    start_sql_server "" log.txt myuser mypass
     cat log.txt
 
-    query_server_for_user_and_pass myuser mypass -c "create table myTable (a int);"
+    # db matches user name since DOLTGRES_DB was not set
+    query_server_for_user_and_pass myuser mypass myuser -c "create table myTable (a int);"
 
-    run query_server_for_user_and_pass myuser mypass -c "insert into mytable values (1), (2)"
+    run query_server_for_user_and_pass myuser mypass myuser -c "insert into mytable values (1), (2)"
     [ "$status" -eq 0 ]
     [[ "$output" =~ "INSERT" ]] || false
 
-    run query_server_for_user_and_pass postgres password -c "insert into mytable values (1), (2)"
+    run query_server_for_user_and_pass postgres password myuser -c "insert into mytable values (1), (2)"
+    [ "$status" -ne 0 ]
+}
+
+@test 'doltgres: default db via env' {
+    [ ! -d "auth.db" ]
+    
+    start_sql_server mydb log.txt myuser
+    cat log.txt
+
+    query_server_for_user_and_pass myuser password mydb -c "create table myTable (a int);"
+
+    run query_server_for_user_and_pass myuser password mydb -c "insert into mytable values (1), (2)"
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "INSERT" ]] || false
+
+    run query_server_for_user_and_pass postgres password mydb -c "insert into mytable values (1), (2)"
     [ "$status" -ne 0 ]
 }
 
 query_server_for_user_and_pass() {
     user=$1
     pass=$2
+    db=$3
+    shift
     shift
     shift
 
     nativevar PGPASSWORD "$pass" /w
-    psql -U "$user" -h localhost -p $PORT "$@" postgres
+    psql -U "$user" -h localhost -p $PORT "$@" $db
 }

testing/bats/setup/query-server-common.bash

@@ -19,10 +19,12 @@ wait_for_connection() {
   nativevar PGPASSWORD "$PASSWORD" /w
 
   while [ $SECONDS -lt $end_time ]; do
-    run psql -U $USERNAME -h localhost -p $port -c "SELECT 1;" postgres
+    run psql -U $USERNAME -h localhost -p $port -c "SELECT 1;" $DEFAULT_DB
     if [ $status -eq 0 ]; then
       echo "Connected successfully!"
       return 0
+    else
+      echo "$output"
     fi
     sleep 1
   done
@@ -33,17 +35,32 @@ wait_for_connection() {
 
 start_sql_server() {
     DEFAULT_DB="$1"
-    DEFAULT_DB="${DEFAULT_DB:=postgres}"
     logFile=$2
     USERNAME=$3
-    USERNAME="${USERNAME:=postgres}"
     PASSWORD=$4
-    PASSWORD="${PASSWORD:=password}"
 
-    nativevar DEFAULT_DB "$DEFAULT_DB" /w
-    nativevar PGPASSWORD "$PASSWORD" /w
-    nativevar DOLTGRES_PASSWORD "$PASSWORD" /w
-    nativevar DOLTGRES_USER "$USERNAME" /w
+    if [ -n "$DEFAULT_DB" ]; then
+        nativevar DOLTGRES_DB "$DEFAULT_DB" /w
+    fi
+
+    if [ -n "$PASSWORD" ]; then
+        nativevar PGPASSWORD "password" /w
+        nativevar DOLTGRES_PASSWORD "$PASSWORD" /w
+    else
+        nativevar PGPASSWORD "$PASSWORD" /w
+        PASSWORD="password"
+    fi
+
+    if [ -n "$USERNAME" ]; then
+        nativevar DOLTGRES_USER "$USERNAME" /w
+        if [ -z "$DEFAULT_DB" ]; then
+            DEFAULT_DB="$USERNAME"
+        fi
+    else
+        USERNAME="postgres"
+    fi
+
+    DEFAULT_DB="${DEFAULT_DB:=postgres}"
 
     PORT=$( definePORT )
     CONFIG=$( defineCONFIG $PORT )