Merge pull request #823 from rocksfrow/master

fix client_encoding setting to support pgbouncer

Merge pull request #823 from rocksfrow/master
fix client_encoding setting to support pgbouncer
8e65cdc7 · Steve Müller · 3b901cd3 · 670f4669 · 8e65cdc7
Commit 8e65cdc7 authored Mar 27, 2015 by Steve Müller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Driver.php lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php +1 -1

No files found.
--- a/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
@@ -83,7 +83,7 @@ class Driver extends AbstractPostgreSQLDriver
        }

        if (isset($params['charset'])) {
-            $dsn .= "options='--client_encoding=" . $params['charset'] . "'";
+            $dsn .= 'client_encoding=' . $params['charset'] . ' ';
        }

        if (isset($params['sslmode'])) {