From b9a1634a5d95650f62f1f9681510f5ba9d007358 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:46:35 -0600
Subject: [PATCH] Try adding escaped quotes to the db query when testing for a
 database connection.

---
 targets/drupal.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 91ddcaa0..e48ebd8c 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -183,10 +183,25 @@ Or, you can specify the export file directly:
          the permissions, the database will be created.
          -->
     <target name="drupal-has-database-connection" depends="set-site" hidden="true">
+
+        <!-- We have to format the test query differently when using "ddev drush" vs. when using "drush" directly. -->
+        <property name="test_query" value="SELECT 1" />
+        <exec command="which ddev" returnProperty="which_ddev" />
+        <if>
+            <and>
+                <available file="${build.dir}/.ddev/config.yaml" />
+                <equals arg1="${which_ddev}" arg2="0" />
+                <not><isset property="env.IS_DDEV_PROJECT" /></not>
+            </and>
+            <then>
+                <property name="test_query" override="true">\"SELECT 1\"</property>
+            </then>
+        </if>
+
         <trycatch>
             <try>
                 <drush command="sql-query">
-                    <param>SELECT 1</param>
+                    <param>${test_query}</param>
                 </drush>
                 <echo msg="Drupal database connection available." />
             </try>