mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 15:01:33 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Clean up code in db classes

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-27 14:13:23 +01:00
parent 3bc100c9a0
commit 948023078b
26 changed files with 277 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
phpBB/phpbb/db/driver/mssql_odbc.php
View File

@@ -24,7 +24,6 @@ namespace phpbb\db\driver;
*/
class mssql_odbc extends \phpbb\db\driver\mssql_base
{
var $last_query_text = '';
var $connect_error = '';
/**
@@ -112,31 +111,27 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
if ($raw)
{
return $this->sql_server_version;
return (string) $this->sql_server_version;
}
return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
}
/**
* SQL Transaction
* @access private
* {@inheritDoc}
*/
function _sql_transaction($status = 'begin')
protected function _sql_transaction(string $status = 'begin'): bool
{
switch ($status)
{
case 'begin':
return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
break;
return (bool) @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
case 'commit':
return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
break;
return (bool) @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
case 'rollback':
return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
break;
return (bool) @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
}
return true;
@@ -209,9 +204,9 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Build LIMIT query
*/
function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
* {@inheritDoc}
*/
protected function _sql_query_limit(string $query, int $total, int $offset = 0, int $cache_ttl = 0)
{
$this->query_result = false;
@@ -303,23 +298,19 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
$cache->sql_freeresult($query_id);
}
if (isset($this->open_queries[(int) $query_id]))
else if (isset($this->open_queries[(int) $query_id]))
{
unset($this->open_queries[(int) $query_id]);
return odbc_free_result($query_id);
odbc_free_result($query_id);
}
return false;
}
/**
* return sql error array
* @access private
* {@inheritDoc}
*/
function _sql_error()
protected function _sql_error(): array
{
if (function_exists('odbc_errormsg'))
{
@@ -340,19 +331,18 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Close sql connection
* @access private
*/
function _sql_close()
* {@inheritDoc}
*/
protected function _sql_close(): bool
{
return @odbc_close($this->db_connect_id);
@odbc_close($this->db_connect_id);
return true;
}
/**
* Build db-specific report
* @access private
* {@inheritDoc}
*/
function _sql_report($mode, $query = '')
protected function _sql_report(string $mode, string $query = ''): void
{
switch ($mode)
{