Merge pull request #51 from skipperbent/v4-development

Version 4.2.0

Author: skipperbent

composer.lock

@@ -3,52 +3,62 @@
 namespace Pecee\Pixie\ConnectionAdapters;
 
 use PDO;
+use Pecee\Pixie\Exception;
 
 /**
  * Class Mysql
  *
  * @package Pecee\Pixie\ConnectionAdapters
  */
-class Mysql extends BaseAdapter {
-	/**
-	 * @param array $config
-	 *
-	 * @return PDO
-	 * @throws Exception
-	 */
-	protected function doConnect(array $config): PDO {
-		if (\extension_loaded('pdo_mysql') === false) {
-			throw new Exception(sprintf('%s library not loaded', 'pdo_mysql'));
-		}
-
-		$connectionString = "mysql:dbname={$config['database']}";
-
-		if (isset($config['host']) === true) {
-			$connectionString .= ";host={$config['host']}";
-		}
-
-		if (isset($config['port']) === true) {
-			$connectionString .= ";port={$config['port']}";
-		}
-
-		if (isset($config['unix_socket']) === true) {
-			$connectionString .= ";unix_socket={$config['unix_socket']}";
-		}
-
-		$connection = new PDO($connectionString, $config['username'], $config['password'], $config['options']);
-
-		if (isset($config['charset'])) {
-			$connection->prepare("SET NAMES '{$config['charset']}'")->execute();
-		}
-
-		return $connection;
-	}
-
-	/**
-	 * Get query adapter class
-	 * @return string
-	 */
-	public function getQueryAdapterClass(): string {
-		return \Pecee\Pixie\QueryBuilder\Adapters\Mysql::class;
-	}
+class Mysql extends BaseAdapter
+{
+    /**
+     * @param array $config
+     *
+     * @return PDO
+     * @throws Exception
+     */
+    protected function doConnect(array $config): PDO
+    {
+        if (\extension_loaded('pdo_mysql') === false) {
+            throw new Exception(sprintf('%s library not loaded', 'pdo_mysql'));
+        }
+
+        $connectionString = "mysql:dbname={$config['database']}";
+
+        if (isset($config['host']) === true) {
+            $connectionString .= ";host={$config['host']}";
+        }
+
+        if (isset($config['port']) === true) {
+            $connectionString .= ";port={$config['port']}";
+        }
+
+        if (isset($config['unix_socket']) === true) {
+            $connectionString .= ";unix_socket={$config['unix_socket']}";
+        }
+
+        try {
+
+            $connection = new PDO($connectionString, $config['username'], $config['password'], $config['options']);
+
+            if (isset($config['charset']) === true) {
+                $connection->prepare("SET NAMES '{$config['charset']}'")->execute();
+            }
+
+        } catch (\PDOException $e) {
+            throw new Exception($e->getMessage(), $e->getCode());
+        }
+
+        return $connection;
+    }
+
+    /**
+     * Get query adapter class
+     * @return string
+     */
+    public function getQueryAdapterClass(): string
+    {
+        return \Pecee\Pixie\QueryBuilder\Adapters\Mysql::class;
+    }
 }

src/Pecee/Pixie/ConnectionAdapters/Exception.php

@@ -3,48 +3,58 @@
 namespace Pecee\Pixie\ConnectionAdapters;
 
 use PDO;
+use Pecee\Pixie\Exception;
 
 /**
  * Class Pgsql
  *
  * @package Pecee\Pixie\ConnectionAdapters
  */
-class Pgsql extends BaseAdapter {
-	/**
-	 * @param array $config
-	 *
-	 * @return PDO
-	 * @throws Exception
-	 */
-	protected function doConnect(array $config): PDO {
-		if (\extension_loaded('pdo_pgsql') === false) {
-			throw new Exception(sprintf('%s library not loaded', 'pdo_pgsql'));
-		}
-
-		$connectionString = "pgsql:host={$config['host']};dbname={$config['database']}";
-
-		if (isset($config['port']) === true) {
-			$connectionString .= ";port={$config['port']}";
-		}
-
-		$connection = new PDO($connectionString, $config['username'], $config['password'], $config['options']);
-
-		if (isset($config['charset']) === true) {
-			$connection->prepare("SET NAMES '{$config['charset']}'")->execute();
-		}
-
-		if (isset($config['schema']) === true) {
-			$connection->prepare("SET search_path TO '{$config['schema']}'")->execute();
-		}
-
-		return $connection;
-	}
-
-	/**
-	 * Get query adapter class
-	 * @return string
-	 */
-	public function getQueryAdapterClass(): string {
-		return \Pecee\Pixie\QueryBuilder\Adapters\Pgsql::class;
-	}
+class Pgsql extends BaseAdapter
+{
+    /**
+     * @param array $config
+     *
+     * @return PDO
+     * @throws Exception
+     */
+    protected function doConnect(array $config): PDO
+    {
+        if (\extension_loaded('pdo_pgsql') === false) {
+            throw new Exception(sprintf('%s library not loaded', 'pdo_pgsql'));
+        }
+
+        $connectionString = "pgsql:host={$config['host']};dbname={$config['database']}";
+
+        if (isset($config['port']) === true) {
+            $connectionString .= ";port={$config['port']}";
+        }
+
+        try {
+
+            $connection = new PDO($connectionString, $config['username'], $config['password'], $config['options']);
+
+            if (isset($config['charset']) === true) {
+                $connection->prepare("SET NAMES '{$config['charset']}'")->execute();
+            }
+
+            if (isset($config['schema']) === true) {
+                $connection->prepare("SET search_path TO '{$config['schema']}'")->execute();
+            }
+
+        } catch (\PDOException $e) {
+            throw new Exception($e->getMessage(), $e->getCode());
+        }
+
+        return $connection;
+    }
+
+    /**
+     * Get query adapter class
+     * @return string
+     */
+    public function getQueryAdapterClass(): string
+    {
+        return \Pecee\Pixie\QueryBuilder\Adapters\Pgsql::class;
+    }
 }