Merge pull request #828 from rocksfrow/master

rehashed charset option implementation to support old and new versions of postgresql, and pgbouncer

lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php

@@ -53,6 +53,14 @@ class Driver extends AbstractPostgreSQLDriver
                 $pdo->setAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES, true);
             }
 
+            /* defining client_encoding via SET NAMES to avoid inconsistent DSN support
+             * - the 'client_encoding' connection param only works with postgres >= 9.1
+             * - passing client_encoding via the 'options' param breaks pgbouncer support
+             */
+            if (isset($params['charset'])) {
+              $pdo->query('SET NAMES \''.$params['charset'].'\'');
+            }
+
             return $pdo;
         } catch (PDOException $e) {
             throw DBALException::driverException($this, $e);
@@ -82,10 +90,6 @@ class Driver extends AbstractPostgreSQLDriver
             $dsn .= 'dbname=' . $params['dbname'] . ' ';
         }
 
-        if (isset($params['charset'])) {
-            $dsn .= 'client_encoding=' . $params['charset'] . ' ';
-        }
-
         if (isset($params['sslmode'])) {
             $dsn .= 'sslmode=' . $params['sslmode'] . ' ';
         }