For MySQL you can now specify the socket to use using unix_socket k…

…ey in the config array. Closes #1994
cakephp · Sep 16, 2011 · 7c87e9a · 7c87e9a
1 parent 9d1e3cb
commit 7c87e9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/app/Config/database.php.default b/app/Config/database.php.default
@@ -54,6 +54,8 @@
  * For MySQL, Postgres specifies the character encoding to use when connecting to the
  * database. Uses database default not specified.
  *
+ * unix_socket =>
+ * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
  */
 class DATABASE_CONFIG {
 

diff --git a/lib/Cake/Console/Templates/skel/Config/database.php.default b/lib/Cake/Console/Templates/skel/Config/database.php.default
@@ -54,6 +54,8 @@
  * For MySQL, Postgres specifies the character encoding to use when connecting to the
  * database. Uses database default not specified.
  *
+ * unix_socket =>
+ * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
  */
 class DATABASE_CONFIG {
 

diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -147,8 +147,13 @@ public function connect() {
 			if (!empty($config['encoding'])) {
 				$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
 			}
+			if (empty($config['unix_socket'])) {
+				$dsn = "mysql:host={$config['host']};port={$config['port']};dbname={$config['database']}";
+			} else {
+				$dsn = "mysql:unix_socket={$config['unix_socket']};dbname={$config['database']}";
+			}
 			$this->_connection = new PDO(
-				"mysql:host={$config['host']};port={$config['port']};dbname={$config['database']}",
+				$dsn,
 				$config['login'],
 				$config['password'],
 				$flags