mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +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

74
phpBB/phpbb/db/driver/postgres.php
View File

@@ -20,7 +20,6 @@ namespace phpbb\db\driver;
class postgres extends \phpbb\db\driver\driver
{
var $multi_insert = true;
var $last_query_text = '';
var $connect_error = '';
/**
@@ -137,28 +136,24 @@ class postgres extends \phpbb\db\driver\driver
}
}
return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
return ($raw) ? (string) $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
}
/**
* SQL Transaction
* @access private
* {@inheritDoc}
*/
function _sql_transaction($status = 'begin')
protected function _sql_transaction(string $status = 'begin'): bool
{
switch ($status)
{
case 'begin':
return @pg_query($this->db_connect_id, 'BEGIN');
break;
return @pg_query($this->db_connect_id, 'BEGIN') !== false;
case 'commit':
return @pg_query($this->db_connect_id, 'COMMIT');
break;
return @pg_query($this->db_connect_id, 'COMMIT') !== false;
case 'rollback':
return @pg_query($this->db_connect_id, 'ROLLBACK');
break;
return @pg_query($this->db_connect_id, 'ROLLBACK') !== false;
}
return true;
@@ -233,18 +228,9 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Build db-specific query data
* @access private
* {@inheritDoc}
*/
function _sql_custom_build($stage, $data)
{
return $data;
}
/**
* Build LIMIT query
*/
function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
protected function _sql_query_limit(string $query, int $total, int $offset = 0, int $cache_ttl = 0)
{
$this->query_result = false;
@@ -385,16 +371,13 @@ class postgres extends \phpbb\db\driver\driver
$safe_query_id = $this->clean_query_id($query_id);
if ($cache && !is_object($query_id) && $cache->sql_exists($safe_query_id))
{
return $cache->sql_freeresult($safe_query_id);
$cache->sql_freeresult($safe_query_id);
}
if (isset($this->open_queries[$safe_query_id]))
else if (isset($this->open_queries[$safe_query_id]))
{
unset($this->open_queries[$safe_query_id]);
return pg_free_result($query_id);
pg_free_result($query_id);
}
return false;
}
/**
@@ -405,24 +388,6 @@ class postgres extends \phpbb\db\driver\driver
return @pg_escape_string($msg);
}
/**
* Build LIKE expression
* @access private
*/
function _sql_like_expression($expression)
{
return $expression;
}
/**
* Build NOT LIKE expression
* @access private
*/
function _sql_not_like_expression($expression)
{
return $expression;
}
/**
* {@inheritDoc}
*/
@@ -440,10 +405,9 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* return sql error array
* @access private
* {@inheritDoc}
*/
function _sql_error()
protected function _sql_error(): array
{
// pg_last_error only works when there is an established connection.
// Connection errors have to be tracked by us manually.
@@ -463,10 +427,9 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Close sql connection
* @access private
*/
function _sql_close()
* {@inheritDoc}
*/
protected function _sql_close(): bool
{
// Released resources are already closed, return true in this case
if (!is_resource($this->db_connect_id))
@@ -477,10 +440,9 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Build db-specific report
* @access private
* {@inheritDoc}
*/
function _sql_report($mode, $query = '')
protected function _sql_report(string $mode, string $query = ''): void
{
switch ($mode)
{