From 1f92d38b80a2f93b45cecbd21a42e70f01eba263 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Fri, 17 Aug 2012 12:53:34 +0000 Subject: [PATCH] // Debug information added #PSCFV-3655 --- install-dev/models/database.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install-dev/models/database.php b/install-dev/models/database.php index e6d1d4012..51c1996d3 100644 --- a/install-dev/models/database.php +++ b/install-dev/models/database.php @@ -39,7 +39,7 @@ class InstallModelDatabase extends InstallAbstractModel * @param bool $clear * @return array List of errors */ - public function testDatabaseSettings($server, $database, $login, $password, $prefix, $engine, $clear) + public function testDatabaseSettings($server, $database, $login, $password, $prefix, $engine, $clear = false) { $errors = array(); @@ -61,12 +61,13 @@ class InstallModelDatabase extends InstallAbstractModel if (!$errors) { + $dbtype = ' ('.Db::getClass()')'; // Try to connect to database switch (Db::checkConnection($server, $login, $password, $database, true, $engine)) { case 0: if (!Db::checkEncoding($server, $login, $password)) - $errors[] = $this->language->l('Cannot convert database data to utf-8'); + $errors[] = $this->language->l('Cannot convert database data to utf-8').$dbtype; // Check if a table with same prefix already exists if (!$clear && Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix)) @@ -74,15 +75,15 @@ class InstallModelDatabase extends InstallAbstractModel break; case 1: - $errors[] = $this->language->l('Database Server is not found. Please verify the login, password and server fields'); + $errors[] = $this->language->l('Database Server is not found. Please verify the login, password and server fields').$dbtype; break; case 2: - $errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database); + $errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database).$dbtype; break; case 4: - $errors[] = $this->language->l('Engine innoDB is not supported by your MySQL server, please use MyISAM'); + $errors[] = $this->language->l('Engine innoDB is not supported by your MySQL server, please use MyISAM').$dbtype; break; } }