mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 20:40:24 +02:00
Code Issues Releases Wiki Activity

[ticket/10057] Report postgres db connection errors.

Browse Source 
Addresses two issues:

1. When pgsql extension is missing, @pg_connect would silently
abort execution. Check for pg_connect existence before calling it,
same with pg_pconnect.

2. When connection fails, the error reported by php is discarded.
User is shown the failure message without the reason for failure,
making debugging difficult. Collect the error (if any) via a
temporarily installed error handler, and display it if connection
failed.

PHPBB3-10057
This commit is contained in:
Oleg Pudeyev
2011-02-23 20:12:12 -05:00
parent f08cbc73de
commit d69a7c620a
2 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/db/postgres.php
View File

@@ -81,13 +81,25 @@ class dbal_postgres extends dbal
if ($this->persistency)
{
if (!function_exists('pg_pconnect'))
{
return $this->sql_error('pg_pconnect does not exist');
}
phpbb_start_error_collection();
$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}
else
{
if (!function_exists('pg_pconnect'))
{
return $this->sql_error('pg_connect does not exist');
}
phpbb_start_error_collection();
$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}
$errors = phpbb_stop_error_collection();
if ($this->db_connect_id)
{
if (version_compare($this->sql_server_info(true), '8.2', '>='))
@@ -102,7 +114,8 @@ class dbal_postgres extends dbal
return $this->db_connect_id;
}
return $this->sql_error('');
$errors = phpbb_format_collected_errors($errors);
return $this->sql_error($errors);
}
/**