Ticket #550: databaseconfig.php.diff

database.php

@@ -12 +12 @@
  * Group Options:
  *  benchmark     - Enable or disable database benchmarking
  *  persistent    - Enable or disable a persistent connection
- *  connection    - DSN identifier: driver://user:password@server/database
+ *  connection    - Array of connection specific parameters; alternatively,
+ *                  you can use a DSN though it is not as fast and certain
+ *                  characters could create problems (like an '@' character
+ *                  in a password):
+ *                  'connection'    => 'mysql://dbuser:secret@localhost/kohana'
  *  character_set - Database character set
  *  table_prefix  - Database table prefix
  *  object        - Enable or disable object results
@@ -23 +27 @@
 (
         'benchmark'     => TRUE,
         'persistent'    => FALSE,
-        'connection'    => 'mysql://dbuser:secret@localhost/kohana',
+        'connection'    => array
+        (
+                'type'     => 'mysql',
+                'user'     => 'dbuser',
+                'pass'     => 'p@ssw0rd',
+                'host'     => 'localhost',
+                'port'     => FALSE,
+                'socket'   => FALSE,
+                'database' => 'kohana'
+        ),
         'character_set' => 'utf8',
         'table_prefix'  => '',
         'object'        => TRUE,