summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-08 01:14:26 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-08 01:14:26 +0100
commit89191e702cad9dae78151addd19185695fb19d39 (patch)
tree7343e1891d61068dddeb3558abc08179fdc323ec
parent5b225c751d60d79916da4a7db761f823e12148de (diff)
run-tests.sh: Clean up old database before running tests
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/tools.php4
-rwxr-xr-xrun-tests.sh1
2 files changed, 5 insertions, 0 deletions
diff --git a/application/controllers/tools.php b/application/controllers/tools.php
index f04f86224..e36b09b79 100644
--- a/application/controllers/tools.php
+++ b/application/controllers/tools.php
@@ -55,6 +55,10 @@ class Tools extends MY_Controller {
}
}
+ if (empty($tables_to_drop)) {
+ return;
+ }
+
$this->db->query('SET FOREIGN_KEY_CHECKS = 0');
$this->db->query('DROP TABLE '.implode(", ", $tables_to_drop));
$this->db->query('SET FOREIGN_KEY_CHECKS = 1');
diff --git a/run-tests.sh b/run-tests.sh
index 0b6cea761..6c4ed2701 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -48,6 +48,7 @@ tests=(${tests[@]#$testpath\/})
tests=(${tests[@]%.php})
# run tests
+php index.php tools drop_all_tables_using_prefix
php index.php tools update_database
prove -ve "php index.php tools test $url" "${tests[@]}"
php index.php tools drop_all_tables_using_prefix