Changeset 3138

Timestamp:

04/29/08 08:55:49 (2 months ago)

Author:

pmjones

Message:

Solar_Sql_Adapter(_Mysql): [ADD] Per talk w/James Kilbride, adding 'sock' config key to specify the Unix socket. The Mysql adapter now honors it as well.

Files:

• trunk/Solar/Sql/Adapter.php (modified) (2 diffs)
• trunk/Solar/Sql/Adapter/Mysql.php (modified) (1 diff)

trunk/Solar/Sql/Adapter.php

@@ -50 +50 @@
-     * : (string) Port number for the host name.
-     * 
+     * `sock`
+     * : (string) The Unix socket for the connection. Should not be used with
+     *   host and port.
+     * 
-     * `user`
-     * : (string) Connect to the database as this username.
@@ -68 +72 @@
-        'host'      => null,
-        'port'      => null,
+        'sock'      => null,
-        'user'      => null,
-        'pass'      => null,

trunk/Solar/Sql/Adapter/Mysql.php

@@ -95 +95 @@
-    protected $_pdo_type = 'mysql';
-    
+    /**
+     * 
+     * Creates a PDO-style DSN.
+     * 
+     * For example, "mysql:host=127.0.0.1;dbname=test"
+     * 
+     * @return string A PDO-style DSN.
+     * 
+     */
+    protected function _dsn()
+    {
+        $dsn = array();
+        
+        // socket, or host-and-port? (can't use both.)
+        if (! empty($this->_config['sock'])) {
+            
+            // use a socket
+            $dsn[] = 'unix_socket=' . $this->_config['sock'];
+            
+        } else {
+            
+            // use host and port
+            if (! empty($this->_config['host'])) {
+                $dsn[] = 'host=' . $this->_config['host'];
+            }
+        
+            if (! empty($this->_config['port'])) {
+                $dsn[] = 'port=' . $this->_config['port'];
+            }
+            
+        }
+        
+        // database name
+        if (! empty($this->_config['name'])) {
+            $dsn[] = 'dbname=' . $this->_config['name'];
+        }
+        
+        return $this->_pdo_type . ':' . implode(';', $dsn);
+    }
+    
+    
+
-    /**
-     *