From a1373a5dd5c4eaf030ce34a802edd7972ddb46be Mon Sep 17 00:00:00 2001
From: "tan.nguyen" <raucaixanh04@gmail.com>
Date: Mon, 1 Jul 2024 14:26:44 +0700
Subject: [PATCH 1/2] Use sql drop when database is connected.

---
 .devtools/provision.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.devtools/provision.sh b/.devtools/provision.sh
index cc43ce4..9d6e28d 100755
--- a/.devtools/provision.sh
+++ b/.devtools/provision.sh
@@ -54,7 +54,10 @@ fi
 db_file="/tmp/site_${extension}.sqlite"
 
 info "Installing Drupal into SQLite database ${db_file}."
-drush sql:drop -y || true >/dev/null
+db_status=$(drush status --field=db-status)
+if [ "${db_status}" = "Connected" ]; then
+  drush sql:drop -y || true >/dev/null
+fi
 drush site-install "${DRUPAL_PROFILE}" -y --db-url="sqlite://localhost/${db_file}" --account-name=admin install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL
 
 pass "Drupal installed."

From f2887966a65474c3f10d4deb6302b9771bea2e9e Mon Sep 17 00:00:00 2001
From: "tan.nguyen" <raucaixanh04@gmail.com>
Date: Mon, 1 Jul 2024 15:13:29 +0700
Subject: [PATCH 2/2] add tests.

---
 .scaffold/tests/bats/ahoy.bats | 13 +++++++++++++
 .scaffold/tests/bats/make.bats | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.scaffold/tests/bats/ahoy.bats b/.scaffold/tests/bats/ahoy.bats
index 3c2b139..1c7015a 100644
--- a/.scaffold/tests/bats/ahoy.bats
+++ b/.scaffold/tests/bats/ahoy.bats
@@ -62,6 +62,19 @@ export BATS_FIXTURE_EXPORT_CODEBASE_ENABLED=1
   assert_output_contains "ENVIRONMENT STOPPED"
 }
 
+@test "ahoy provision" {
+  run ahoy assemble
+  run ahoy start
+  run ahoy provision
+  assert_success
+  assert_output_contains "PROVISION COMPLETE"
+  assert_output_not_contains "Do you really want to drop all tables in the database"
+  run ahoy provision
+  assert_success
+  assert_output_contains "PROVISION COMPLETE"
+  assert_output_contains "Do you really want to drop all tables in the database"
+}
+
 @test "ahoy build - basic workflow" {
   run ahoy build
   assert_success
diff --git a/.scaffold/tests/bats/make.bats b/.scaffold/tests/bats/make.bats
index e901ef5..d5c3cf5 100644
--- a/.scaffold/tests/bats/make.bats
+++ b/.scaffold/tests/bats/make.bats
@@ -68,6 +68,19 @@ export BATS_FIXTURE_EXPORT_CODEBASE_ENABLED=1
   assert_output_contains "ENVIRONMENT STOPPED"
 }
 
+@test "make provision" {
+  run make assemble
+  run make start
+  run make provision
+  assert_success
+  assert_output_contains "PROVISION COMPLETE"
+  assert_output_not_contains "Do you really want to drop all tables in the database"
+  run make provision
+  assert_success
+  assert_output_contains "PROVISION COMPLETE"
+  assert_output_contains "Do you really want to drop all tables in the database"
+}
+
 @test "make build - basic workflow" {
   run make build
   assert_success