[*] IN : the installer can now attempt to create the database for you

classes/db/DbMySQLi.php

@@ -53,6 +53,18 @@ class DbMySQLiCore extends Db
 		return $this->link;
 	}
 	
+	public static function createDatabase($host, $user, $password, $dbname)
+	{
+		if (strpos($host, ':') !== false)
+		{
+			list($host, $port) = explode(':', $host);
+			$link = @new mysqli($host, $this->user, $this->password, null, $port);
+		}
+		else
+			$link = @new mysqli($host, $user, $password);
+		return $link->query('CREATE DATABASE `'.bqSQL($dbname).'`');
+	}
+
 	/**
 	 * @see DbCore::disconnect()
 	 */
@@ -169,7 +181,8 @@ class DbMySQLiCore extends Db
 		if (!$link->options(MYSQLI_OPT_CONNECT_TIMEOUT, $timeout))
 			return 1;
 
-		if (!$link->real_connect($server, $user, $pwd, $db))
+		// There is an @ because mysqli throw a warning when the database does not exists
+		if (!@$link->real_connect($server, $user, $pwd, $db))
 			return (mysqli_connect_errno() == 1049) ? 2 : 1;
 
 		$link->close();

classes/db/DbPDO.php

@@ -46,6 +46,16 @@ class DbPDOCore extends Db
 		return new PDO($dsn, $user, $password, array(PDO::ATTR_TIMEOUT => $timeout, PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true));
 	}
 	
+	public static function createDatabase($host, $user, $password, $dbname)
+	{
+		try {
+			$link = DbPDO::_getPDO($host, $user, $password, false);
+			return $link->exec('CREATE DATABASE `'.bqSQL($dbname).'`');
+		} catch (PDOException $e) {
+			return false;
+		}
+	}
+	
 	/**
 	 * @see DbCore::connect()
 	 */

classes/db/MySQL.php

@@ -47,6 +47,12 @@ class MySQLCore extends Db
 		return $this->link;
 	}
 	
+	public static function createDatabase($host, $user, $password, $dbname)
+	{
+		$link = mysql_connect($host, $user, $password);
+		return mysql_query('CREATE DATABASE `'.bqSQL($dbname).'`');
+	}
+
 	/**
 	 * @see DbCore::disconnect()
 	 */

install-dev/controllers/http/database.php

@@ -95,8 +95,8 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 	{
 		if (Tools::getValue('checkDb'))
 			$this->processCheckDb();
-		else if (Tools::getValue('sendMail'))
+		elseif (Tools::getValue('createDb'))
-			$this->processSendMail();
+			$this->processCreateDb();
 	}
 
 	/**
@@ -120,28 +120,20 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 	}
 
 	/**
-	 * Send a test email
+	 * Attempt to create the database
 	 */
-	public function processSendMail()
+	public function processCreateDb()
 	{
-		$smtp_checked = (Tools::getValue('smtpChecked') == 'true');
+		$server = Tools::getValue('dbServer');
-		$server = Tools::getValue('smtpSrv');
+		$database = Tools::getValue('dbName');
-		$encryption = Tools::getValue('smtpEnc');
+		$login = Tools::getValue('dbLogin');
-		$port = Tools::getValue('smtpPort');
+		$password = Tools::getValue('dbPassword');
-		$login = Tools::getValue('smtpLogin');
-		$password = Tools::getValue('smtpPassword');
-		$email = Tools::getValue('testEmail');
 
-		require_once _PS_INSTALL_MODELS_PATH_.'mail.php';
+		$success = $this->model_database->createDatabase($server, $database, $login, $password);
-		$this->model_mail = new InstallModelMail($smtp_checked, $server, $login, $password, $port, $encryption, $email);
-		$result = $this->model_mail->send(
-			$this->l('Test message from PrestaShop'),
-			$this->l('This is a test message, your server is now available to send email')
-		);
 
 		$this->ajaxJsonAnswer(
-			$result === false,
+			$success,
-			($result === false) ? $this->l('A test e-mail has been sent to %s', $email) : $this->l('An error occurred while sending email, please verify your parameters')
+			$success ? $this->l('Database is created') : $this->l('Cannot create the database automatically')
 		);
 	}
 

install-dev/models/database.php

@@ -81,7 +81,10 @@ class InstallModelDatabase extends InstallAbstractModel
 					break;
 
 				case 2:
-					$errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database).$dbtype;
+					$errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database).$dbtype.'<br /><br />
+					'.sprintf('<input type="button" value="%s" class="button" id="btCreateDB">
+					<script type="text/javascript">bindCreateDB();</script>',
+					$this->language->l('Attempt to create the database automatically'));
 					break;
 			}
 		}
@@ -89,6 +92,12 @@ class InstallModelDatabase extends InstallAbstractModel
 		return $errors;
 	}
 	
+	public function createDatabase($server, $database, $login, $password)
+	{
+		$class = Db::getClass();
+		return $class::createDatabase($server, $login, $password, $database);
+	}
+	
 	public function getBestEngine($server, $database, $login, $password)
 	{
 		$class = Db::getClass();

install-dev/theme/js/database.js

@@ -31,9 +31,46 @@ $(document).ready(function()
                 $("#dbResultCheck")
                     .addClass('errorBlock')
                     .removeClass('okBlock')
-                    .html('An error occurred:<br /><br />'+xhr.responseText)
+                    .html('An error occurred:<br /><br />' + xhr.responseText)
                     .slideDown('slow');
             }
 		});
 	});
 });
+
+function bindCreateDB()
+{
+	// Attempt to create the database
+	$('#btCreateDB').click(function()
+	{
+		$("#dbResultCheck").slideUp('fast');
+		$.ajax({
+			url: 'index.php',
+			data: {
+                'createDb': 'true',
+                'dbServer': $('#dbServer').val(),
+                'dbName': $('#dbName').val(),
+                'dbLogin': $('#dbLogin').val(),
+                'dbPassword': $('#dbPassword').val()
+            },
+			dataType: 'json',
+			cache: false,
+			success: function(json)
+			{
+				$("#dbResultCheck")
+					.addClass((json.success) ? 'okBlock' : 'errorBlock')
+					.removeClass((json.success) ? 'errorBlock' : 'okBlock')
+					.html(json.message)
+					.slideDown('slow');
+			},
+            error: function(xhr)
+            {
+                $("#dbResultCheck")
+                    .addClass('errorBlock')
+                    .removeClass('okBlock')
+                    .html('An error occurred:<br /><br />' + xhr.responseText)
+                    .slideDown('slow');
+            }
+		});
+	});
+}