diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
| commit | b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (patch) | |
| tree | ea97afaa481306dbb0a111490b9443f80de56a29 /phpBB/includes/db/mysql.php | |
| parent | ebc15a8b6cb62e29371cb02d6421ea46e47a4020 (diff) | |
| parent | b5f94a14f1a5c77366f824780f1120a1b5e9184a (diff) | |
| download | forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.gz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.bz2 forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.xz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10205] Reduce nesting in mysql drivers.
[ticket/10205] Rewrite _sql_error implementations to have a single return.
[ticket/10205] Cosmetic changes.
[ticket/10205] Add some columns to the empty fixture file for mssqlnative.
[ticket/10205] Delete stray return.
[ticket/10205] Test failed connection attempts.
[ticket/10205] Check for function existence in mssql connect method.
[ticket/10205] Convert mssqlnative driver to the same logic.
[ticket/10205] Fix a parse error in oracle driver.
[ticket/10205] Fix remaining db drivers.
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
[ticket/10205] Account for potentially missing extensions in dbal.
Conflicts:
tests/fixtures/empty.xml
Diffstat (limited to 'phpBB/includes/db/mysql.php')
| -rw-r--r-- | phpBB/includes/db/mysql.php | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index f685ab055c..dcdeec0401 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -29,6 +29,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); class dbal_mysql extends dbal { var $multi_insert = true; + var $connect_error = ''; /** * Connect to server @@ -43,7 +44,24 @@ class dbal_mysql extends dbal $this->sql_layer = 'mysql4'; - $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); + if ($this->persistency) + { + if (!function_exists('mysql_pconnect')) + { + $this->connect_error = 'mysql_pconnect function does not exist, is mysql extension installed?'; + return $this->sql_error(''); + } + $this->db_connect_id = @mysql_pconnect($this->server, $this->user, $sqlpassword); + } + else + { + if (!function_exists('mysql_connect')) + { + $this->connect_error = 'mysql_connect function does not exist, is mysql extension installed?'; + return $this->sql_error(''); + } + $this->db_connect_id = @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); + } if ($this->db_connect_id && $this->dbname != '') { @@ -426,18 +444,29 @@ class dbal_mysql extends dbal */ function _sql_error() { - if (!$this->db_connect_id) + if ($this->db_connect_id) + { + $error = array( + 'message' => @mysql_error($this->db_connect_id), + 'code' => @mysql_errno($this->db_connect_id), + ); + } + else if (function_exists('mysql_error')) { - return array( + $error = array( 'message' => @mysql_error(), - 'code' => @mysql_errno() + 'code' => @mysql_errno(), + ); + } + else + { + $error = array( + 'message' => $this->connect_error, + 'code' => '', ); } - return array( - 'message' => @mysql_error($this->db_connect_id), - 'code' => @mysql_errno($this->db_connect_id) - ); + return $error; } /** |