From 7af4efbe0f405648954699dc3e7e5abd335a2685 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Wed, 15 Jan 2025 07:44:27 +0800 Subject: [PATCH] Revert "Add support for missing Postgres connection options (#54101)" This reverts commit 36a4a5335c1fd697188cb8116542ab8498da9cbc. --- .../Database/Connectors/PostgresConnector.php | 61 +------------------ 1 file changed, 2 insertions(+), 59 deletions(-) diff --git a/src/Illuminate/Database/Connectors/PostgresConnector.php b/src/Illuminate/Database/Connectors/PostgresConnector.php index ef700e2a72e..ef806dd9ab2 100755 --- a/src/Illuminate/Database/Connectors/PostgresConnector.php +++ b/src/Illuminate/Database/Connectors/PostgresConnector.php @@ -150,9 +150,7 @@ protected function getDsn(array $config) $dsn .= ";application_name='".str_replace("'", "\'", $application_name)."'"; } - $dsn = $this->addSslOptions($dsn, $config); - - return $this->addPostgresOptions($dsn, $config); + return $this->addSslOptions($dsn, $config); } /** @@ -164,62 +162,7 @@ protected function getDsn(array $config) */ protected function addSslOptions($dsn, array $config) { - foreach ([ - 'sslmode', - 'sslcert', - 'sslkey', - 'sslrootcert', - 'requiressl', - 'sslnegotiation', - 'sslcompression', - 'sslpassword', - 'sslcertmode', - 'sslcrl', - 'sslcrldir', - 'sslsni', - ] as $option) { - if (isset($config[$option])) { - $dsn .= ";{$option}={$config[$option]}"; - } - } - - return $dsn; - } - - /** - * Add Postgres specific options to the DSN. - * - * @param string $dsn - * @param array $config - * @return string - */ - protected function addPostgresOptions($dsn, array $config) - { - foreach ([ - 'channel_binding', - 'connect_timeout', - 'fallback_application_name', - 'gssdelegation', - 'gssencmode', - 'gsslib', - 'hostaddr', - 'keepalives', - 'keepalives_count', - 'keepalives_idle', - 'keepalives_interval', - 'krbsrvname', - 'load_balance_hosts', - 'options', - 'passfile', - 'replication', - 'require_auth', - 'requirepeer', - 'service', - 'ssl_max_protocol_version', - 'ssl_min_protocol_version', - 'target_session_attrs', - 'tcp_user_timeout', - ] as $option) { + foreach (['sslmode', 'sslcert', 'sslkey', 'sslrootcert'] as $option) { if (isset($config[$option])) { $dsn .= ";{$option}={$config[$option]}"; }