From ccddddaf2de98c70a0e8b887bdc5832e81acc15e Mon Sep 17 00:00:00 2001 From: Antonin Date: Thu, 4 Aug 2016 16:57:20 +0200 Subject: [PATCH] Merge branch 'Issue187' into 'develop' Install framadate in non empty database Modifications pour l'issue #187. See merge request !139 --- app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php index 01ea838..5591155 100644 --- a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php +++ b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php @@ -48,7 +48,7 @@ class From_0_0_to_0_8_Migration implements Migration { * @return bool true is the Migration should be executed. */ function preCondition(\PDO $pdo) { - $stmt = $pdo->query('SHOW TABLES'); + $stmt = $pdo->query('SHOW TABLES like \'' . TABLENAME_PREFIX . '%\''); //issue187 : pouvoir installer framadate dans une base contenant d'autres tables. $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); // Check if there is no tables but the MIGRATION_TABLE one