#1759 - Added validation on exists database before created for MySQLi and Postgre

Author: oleg1540

system/Database/MySQLi/Forge.php

@@ -49,7 +49,7 @@ class Forge extends \CodeIgniter\Database\Forge
 	 *
 	 * @var string
 	 */
-	protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+	protected $createDatabaseStr = 'CREATE DATABASE IF NOT EXISTS %s CHARACTER SET %s COLLATE %s';
 
 	/**
 	 * DROP CONSTRAINT statement

system/Database/Postgre/Forge.php

@@ -44,6 +44,13 @@
 class Forge extends \CodeIgniter\Database\Forge
 {
 
+	/**
+     * CHECK DATABASE EXIST statement
+     *
+     * @var string
+     */
+	private $checkDatabaseExist = 'SELECT 1 FROM pg_database WHERE datname = %s';
+	
 	/**
 	 * DROP CONSTRAINT statement
 	 *
@@ -77,6 +84,26 @@ class Forge extends \CodeIgniter\Database\Forge
 
 	//--------------------------------------------------------------------
 
+	/**
+     * Create database
+     *
+     * @param string $db_name
+     *
+     * @return boolean
+     * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+     */
+    public function createDatabase(string $db_name): bool
+    {
+        if ($this->db->query(sprintf($this->checkDatabaseExist, $this->db->escape($db_name)))->getRow() !== null)
+        {
+            return true;
+        }
+
+        return parent::createDatabase($db_name);
+	}
+	
+	//--------------------------------------------------------------------
+
 	/**
 	 * CREATE TABLE attributes
 	 *