From b3e7735d0d76363ef0b25590bbd4c6b165409cc2 Mon Sep 17 00:00:00 2001
From: Dheeraj Panyam <dpanyam@gmail.com>
Date: Sat, 17 Feb 2018 23:42:50 +0530
Subject: [PATCH 1/4] service_import()

service_import() {
  local SERVICE="$1"
  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  SERVICE_NAME="$(get_service_name "$SERVICE")"
  ROOTPASSWORD="$(cat "$SERVICE_ROOT/ROOTPASSWORD")"

  if [[ -t 0 ]]; then
    dokku_log_fail "No data provided on stdin."
  fi
  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$ROOTPASSWORD" "$SERVICE"
}
---
 functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index 082a723..421b5c9 100755
--- a/functions
+++ b/functions
@@ -98,12 +98,12 @@ service_import() {
   local SERVICE="$1"
   SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
-  PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
+  ROOTPASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
 
   if [[ -t 0 ]]; then
     dokku_log_fail "No data provided on stdin."
   fi
-  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE"
+  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$ROOTPASSWORD" "$SERVICE"
 }
 
 service_start() {

From 397a349b23a84836ec95f5bb2b29277f4d330788 Mon Sep 17 00:00:00 2001
From: Dheeraj Panyam <dpanyam@gmail.com>
Date: Sun, 18 Feb 2018 10:26:50 +0530
Subject: [PATCH 2/4] service_import ( change user from mysql to root)

change user from mysql to root
---
 functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions b/functions
index 421b5c9..29d9222 100755
--- a/functions
+++ b/functions
@@ -103,7 +103,7 @@ service_import() {
   if [[ -t 0 ]]; then
     dokku_log_fail "No data provided on stdin."
   fi
-  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$ROOTPASSWORD" "$SERVICE"
+  docker exec -i "$SERVICE_NAME" mysql --user=root --password="$ROOTPASSWORD" "$SERVICE"
 }
 
 service_start() {

From f92d6c2120319088d4688608abea5c773f74f82c Mon Sep 17 00:00:00 2001
From: Dheeraj Panyam <dpanyam@gmail.com>
Date: Sun, 18 Feb 2018 12:28:04 +0530
Subject: [PATCH 3/4] Update functions

---
 functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions b/functions
index 29d9222..4b2d62a 100755
--- a/functions
+++ b/functions
@@ -98,7 +98,7 @@ service_import() {
   local SERVICE="$1"
   SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
-  ROOTPASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
+  ROOTPASSWORD="$(cat "$SERVICE_ROOT/ROOTPASSWORD")"
 
   if [[ -t 0 ]]; then
     dokku_log_fail "No data provided on stdin."

From f1f5aaaaf7a788bd63971b8e1897f76fd0dbb9dc Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 26 Feb 2018 00:07:13 -0500
Subject: [PATCH 4/4] fix: correct test check

---
 tests/service_import.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/service_import.bats b/tests/service_import.bats
index a65da5d..fceef41 100755
--- a/tests/service_import.bats
+++ b/tests/service_import.bats
@@ -31,7 +31,7 @@ teardown() {
 @test "($PLUGIN_COMMAND_PREFIX:import) success" {
   export ECHO_DOCKER_COMMAND="true"
   run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.sql"
-  password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
-  assert_output "docker exec -i dokku.mysql.l mysql --user=mysql --password=$password l"
+  password="$(cat "$PLUGIN_DATA_ROOT/l/ROOTPASSWORD")"
+  assert_output "docker exec -i dokku.mysql.l mysql --user=root --password=$password l"
 }