Merge d990ea1 into 535d847

zendframework · Oct 28, 2015 · d706931 · d706931
2 parents 535d847 + d990ea1
commit d706931
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Adapter/Driver/Pdo/Connection.php b/src/Adapter/Driver/Pdo/Connection.php
@@ -199,6 +199,9 @@ public function connect()
                 case 'charset':
                     $charset    = (string) $value;
                     break;
+                case 'unix_socket':
+                    $unix_socket = (string) $value;
+                    break;
                 case 'driver_options':
                 case 'options':
                     $value = (array) $value;
@@ -237,6 +240,9 @@ public function connect()
                     if (isset($charset) && $pdoDriver != 'pgsql') {
                         $dsn[] = "charset={$charset}";
                     }
+                    if (isset($unix_socket)) {
+                        $dsn[] = "unix_socket={$unix_socket}";
+                    }
                     break;
             }
             $dsn = $pdoDriver . ':' . implode(';', $dsn);

diff --git a/test/Adapter/Driver/Pdo/ConnectionTest.php b/test/Adapter/Driver/Pdo/ConnectionTest.php
@@ -67,6 +67,7 @@ public function testArrayOfConnectionParametersCreatesCorrectDsn()
             'charset' => 'utf8',
             'dbname'  => 'foo',
             'port'    => '3306',
+            'unix_socket' => '/var/run/mysqld/mysqld.sock',
         ]);
         try {
             $this->connection->connect();
@@ -79,5 +80,6 @@ public function testArrayOfConnectionParametersCreatesCorrectDsn()
         $this->assertContains('charset=utf8', $responseString);
         $this->assertContains('dbname=foo', $responseString);
         $this->assertContains('port=3306', $responseString);
+        $this->assertContains('unix_socket=/var/run/mysqld/mysqld.sock', $responseString);
     }
 }