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/mssql.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/mssql.php')
| -rw-r--r-- | phpBB/includes/db/mssql.php | 66 |
1 files changed, 42 insertions, 24 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index 1ec8517308..235c48d3f0 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -24,11 +24,19 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); */ class dbal_mssql extends dbal { + var $connect_error = ''; + /** * Connect to server */ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) { + if (!function_exists('mssql_connect')) + { + $this->connect_error = 'mssql_connect function does not exist, is mssql extension installed?'; + return $this->sql_error(''); + } + $this->persistency = $persistency; $this->user = $sqluser; $this->dbname = $database; @@ -355,34 +363,44 @@ class dbal_mssql extends dbal */ function _sql_error() { - $error = array( - 'message' => @mssql_get_last_message(), - 'code' => '' - ); - - // Get error code number - $result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id); - if ($result_id) + if (function_exists('mssql_get_last_message')) { - $row = @mssql_fetch_assoc($result_id); - $error['code'] = $row['code']; - @mssql_free_result($result_id); - } + $error = array( + 'message' => @mssql_get_last_message(), + 'code' => '', + ); - // Get full error message if possible - $sql = 'SELECT CAST(description as varchar(255)) as message - FROM master.dbo.sysmessages - WHERE error = ' . $error['code']; - $result_id = @mssql_query($sql); - - if ($result_id) - { - $row = @mssql_fetch_assoc($result_id); - if (!empty($row['message'])) + // Get error code number + $result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id); + if ($result_id) + { + $row = @mssql_fetch_assoc($result_id); + $error['code'] = $row['code']; + @mssql_free_result($result_id); + } + + // Get full error message if possible + $sql = 'SELECT CAST(description as varchar(255)) as message + FROM master.dbo.sysmessages + WHERE error = ' . $error['code']; + $result_id = @mssql_query($sql); + + if ($result_id) { - $error['message'] .= '<br />' . $row['message']; + $row = @mssql_fetch_assoc($result_id); + if (!empty($row['message'])) + { + $error['message'] .= '<br />' . $row['message']; + } + @mssql_free_result($result_id); } - @mssql_free_result($result_id); + } + else + { + $error = array( + 'message' => $this->connect_error, + 'code' => '', + ); } return $error; |