dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Debug information added #PSCFV-3655

Browse Source
This commit is contained in:
dMetzger
2012-08-17 12:53:34 +00:00
parent d8aa7324d6
commit 1f92d38b80
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/models/database.php
+6 -5
View File
@@ -39,7 +39,7 @@ class InstallModelDatabase extends InstallAbstractModel
* @param bool $clear * @param bool $clear
* @return array List of errors * @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(); $errors = array();
@@ -61,12 +61,13 @@ class InstallModelDatabase extends InstallAbstractModel
if (!$errors) if (!$errors)
{ {
$dbtype = ' ('.Db::getClass()')';
// Try to connect to database // Try to connect to database
switch (Db::checkConnection($server, $login, $password, $database, true, $engine)) switch (Db::checkConnection($server, $login, $password, $database, true, $engine))
{ {
case 0: case 0:
if (!Db::checkEncoding($server, $login, $password)) 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 // Check if a table with same prefix already exists
if (!$clear && Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix)) if (!$clear && Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix))
@@ -74,15 +75,15 @@ class InstallModelDatabase extends InstallAbstractModel
break; break;
case 1: 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; break;
case 2: 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; break;
case 4: 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; break;
} }
} }