Merge branch 'PDOCharset'

fdb0f8b1 · Benjamin Eberlei · 79e04e98 · 03fd0767 · fdb0f8b1
Commit fdb0f8b1 authored May 01, 2011 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Driver.php lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php +3 -0

No files found.
--- a/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
@@ -68,6 +68,9 @@ class Driver implements \Doctrine\DBAL\Driver
        if (isset($params['unix_socket'])) {
            $dsn .= 'unix_socket=' . $params['unix_socket'] . ';';
        }
+        if (isset($params['charset'])) {
+            $dsn .= 'charset=' . $params['charset'] . ';';
+        }
        
        return $dsn;
    }