lando/mysql#53: Fix core test issue. Remove debugging code.

lando · Jun 6, 2024 · cea92a4 · cea92a4
1 parent 4adac52
commit cea92a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/examples/sql-helpers/README.md b/examples/sql-helpers/README.md
@@ -29,7 +29,7 @@ lando ssh -s mariadb -c "mysql -utest -ptest lando_test -e 'select * from lando_
 # Should import test data into mariadb-default
 cd sqlhelpers
 lando ssh -s mariadb-default -c "/helpers/sql-import.sh testdata1.sql"
-lando ssh -s mariadb-default -c "mysql -utest -ptest \`database\` -e 'select * from lando_test'" | grep "lando_original"
+lando ssh -s mariadb-default -c "mysql -utest -ptest database -e 'select * from lando_test'" | grep "lando_original"
 
 # Should import test data into mysql57
 cd sqlhelpers
@@ -39,7 +39,7 @@ lando ssh -s mysql57 -c "mysql -utest -ptest lando_test -e 'select * from lando_
 # Should import test data into mysql57-default
 cd sqlhelpers
 lando ssh -s mysql57-default -c "/helpers/sql-import.sh testdata1.sql"
-lando ssh -s mysql57-default -c "mysql -utest -ptest \`database\` -e 'select * from lando_test'" | grep "lando_original"
+lando ssh -s mysql57-default -c "mysql -utest -ptest database -e 'select * from lando_test'" | grep "lando_original"
 
 # Should import test data into mysql80
 cd sqlhelpers
@@ -49,7 +49,7 @@ lando ssh -s mysql80 -c "mysql -utest -ptest lando_test -e 'select * from lando_
 # Should import test data into mysql80-default
 cd sqlhelpers
 lando ssh -s mysql80-default -c "/helpers/sql-import.sh testdata1.sql"
-lando ssh -s mysql80-default -c "mysql -utest -ptest \`database\` -e 'select * from lando_test'" | grep "lando_original"
+lando ssh -s mysql80-default -c "mysql -utest -ptest database -e 'select * from lando_test'" | grep "lando_original"
 
 # Should import test data into postgres16
 cd sqlhelpers

diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/sql-import.sh b/scripts/sql-import.sh
@@ -108,7 +108,6 @@ if [ "$WIPE" == "true" ]; then
     SQLSTART="mysql -h $HOST -P $PORT -u $USER ${LANDO_EXTRA_DB_IMPORT_ARGS}"
 
     # Drop and recreate database
-    echo ${SQLSTART} ${DATABASE}
     $SQLSTART -e "DROP DATABASE IF EXISTS \`${DATABASE}\`"
     $SQLSTART -e "CREATE DATABASE \`${DATABASE}\`"
   fi