From 618be4ce3cc2ac0cd08af29a8b254651aa45c421 Mon Sep 17 00:00:00 2001 From: liyang <“liyang@easycorp.ltd”> Date: Wed, 29 Jun 2022 13:36:30 +0800 Subject: [PATCH] *Fix Bug for copyDB --- test/lib/utils.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/utils.php b/test/lib/utils.php index 60c4054c81..4584937ebe 100755 --- a/test/lib/utils.php +++ b/test/lib/utils.php @@ -222,7 +222,7 @@ function copyDB() $dumpCommand = "mysqldump -u%s -p%s %s > %s"; $sqlFile = TEST_BASEHPATH . DS . 'tmp/raw.sql'; - $currentDBNum = $dao->query("select count(*) from information_schema.SCHEMATA where SCHEMA_NAME like '" . $config->test->dbPrefix . "%'"); + $currentDBNum = $dao->query("select count(*) as num from information_schema.SCHEMATA where SCHEMA_NAME like '" . $config->test->dbPrefix . "%'")->fetch(); $dumpCommand = sprintf($dumpCommand, $config->db->user, $config->db->password, $config->test->rawDB, $sqlFile); shell_exec($dumpCommand); @@ -236,7 +236,7 @@ function copyDB() foreach($dbUsed as $db) { - if (!empty($currentDBNum)) $dao->query('drop database ' . $db); + if ($currentDBNum->num > 0) $dao->query('drop database ' . $db); $dao->query('CREATE DATABASE ' . $db); shell_exec("mysql -u" . $config->db->user . ' -p' . $config->db->password . ' ' . $db . ' < ' . $sqlFile); echo '数据库<' . $db . '>复制成功!';