mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 08:05:25 +02:00
Code Issues Releases Wiki Activity

[ticket/12282] Use {@inheritDoc} for inherited methods

Browse Source 
PHPBB3-12282
This commit is contained in:
Joas Schilling 2014-03-17 13:18:05 +01:00
parent 7b131119e6
commit 1f28451d58
12 changed files with 115 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
phpBB/phpbb/db/driver/driver.php
View File

@ -84,7 +84,7 @@ abstract class driver implements driver_interface
}
/**
* return on error or display error message
* {@inheritDoc}
*/
function sql_return_on_error($fail = false)
{
@ -95,7 +95,7 @@ abstract class driver implements driver_interface
}
/**
* Return number of sql queries and cached sql queries used
* {@inheritDoc}
*/
function sql_num_queries($cached = false)
{
@ -103,7 +103,7 @@ abstract class driver implements driver_interface
}
/**
* Add to query count
* {@inheritDoc}
*/
function sql_add_num_queries($cached = false)
{
@ -113,7 +113,7 @@ abstract class driver implements driver_interface
}
/**
* DBAL garbage collection, close sql connection
* {@inheritDoc}
*/
function sql_close()
{
@ -146,8 +146,7 @@ abstract class driver implements driver_interface
}
/**
* Build LIMIT query
* Doing some validation here.
* {@inheritDoc}
*/
function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
{
@ -164,7 +163,7 @@ abstract class driver implements driver_interface
}
/**
* Fetch all rows
* {@inheritDoc}
*/
function sql_fetchrowset($query_id = false)
{
@ -188,8 +187,7 @@ abstract class driver implements driver_interface
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -231,8 +229,7 @@ abstract class driver implements driver_interface
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
* {@inheritDoc}
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
@ -263,11 +260,7 @@ abstract class driver implements driver_interface
}
/**
* Correctly adjust LIKE expression for special characters
* Some DBMS are handling them in a different way
*
* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
* @return string LIKE expression including the keyword!
* {@inheritDoc}
*/
function sql_like_expression($expression)
{
@ -278,14 +271,7 @@ abstract class driver implements driver_interface
}
/**
* Build a case expression
*
* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
*
* @param string $condition The condition which must be true, to use action_true rather then action_else
* @param string $action_true SQL expression that is used, if the condition is true
* @param string $action_else SQL expression that is used, if the condition is false, optional
* @return string CASE expression including the condition and statements
* {@inheritDoc}
*/
public function sql_case($condition, $action_true, $action_false = false)
{
@ -297,11 +283,7 @@ abstract class driver implements driver_interface
}
/**
* Build a concatenated expression
*
* @param string $expr1 Base SQL expression where we append the second one
* @param string $expr2 SQL expression that is appended to the first expression
* @return string Concatenated string
* {@inheritDoc}
*/
public function sql_concatenate($expr1, $expr2)
{
@ -309,9 +291,7 @@ abstract class driver implements driver_interface
}
/**
* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
*
* @return bool Whether buffering is required.
* {@inheritDoc}
*/
function sql_buffer_nested_transactions()
{
@ -319,8 +299,7 @@ abstract class driver implements driver_interface
}
/**
* SQL Transaction
* @access private
* {@inheritDoc}
*/
function sql_transaction($status = 'begin')
{
@ -345,14 +324,16 @@ abstract class driver implements driver_interface
break;
case 'commit':
// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
// If there was a previously opened transaction we do not commit yet...
// but count back the number of inner transactions
if ($this->transaction && $this->transactions)
{
$this->transactions--;
return true;
}
// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
// Check if there is a transaction (no transaction can happen if
// there was an error, with a combined rollback and error returning enabled)
// This implies we have transaction always set for autocommit db's
if (!$this->transaction)
{
@ -385,11 +366,7 @@ abstract class driver implements driver_interface
}
/**
* Build sql statement from array for insert/update/select statements
*
* Idea for this from Ikonboard
* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT, DELETE
*
* {@inheritDoc}
*/
function sql_build_array($query, $assoc_ary = false)
{
@ -437,14 +414,7 @@ abstract class driver implements driver_interface
}
/**
* Build IN or NOT IN sql comparison string, uses <> or = on single element
* arrays to improve comparison speed
*
* @access public
* @param string $field name of the sql column that shall be compared
* @param array $array array of values that are allowed (IN) or not allowed (NOT IN)
* @param bool $negate true for NOT IN (), false for IN () (default)
* @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
* {@inheritDoc}
*/
function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
{
@ -489,12 +459,7 @@ abstract class driver implements driver_interface
}
/**
* Run binary AND operator on DB column.
* Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
*
* @param string $column_name The column name to use
* @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
* @param string $compare Any custom SQL code after the check (for example "= 0")
* {@inheritDoc}
*/
function sql_bit_and($column_name, $bit, $compare = '')
{
@ -507,12 +472,7 @@ abstract class driver implements driver_interface
}
/**
* Run binary OR operator on DB column.
* Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
*
* @param string $column_name The column name to use
* @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
* @param string $compare Any custom SQL code after the check (for example "= 0")
* {@inheritDoc}
*/
function sql_bit_or($column_name, $bit, $compare = '')
{
@ -525,10 +485,7 @@ abstract class driver implements driver_interface
}
/**
* Returns SQL string to cast a string expression to an int.
*
* @param string $expression An expression evaluating to string
* @return string Expression returning an int
* {@inheritDoc}
*/
function cast_expr_to_bigint($expression)
{
@ -536,10 +493,7 @@ abstract class driver implements driver_interface
}
/**
* Returns SQL string to cast an integer expression to a string.
*
* @param string $expression An expression evaluating to int
* @return string Expression returning a string
* {@inheritDoc}
*/
function cast_expr_to_string($expression)
{
@ -547,11 +501,7 @@ abstract class driver implements driver_interface
}
/**
* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
*
* @param string $column_name The column name to use
*
* @return string A SQL statement like "LOWER($column_name)"
* {@inheritDoc}
*/
function sql_lower_text($column_name)
{
@ -559,13 +509,7 @@ abstract class driver implements driver_interface
}
/**
* Run more than one insert statement.
*
* @param string $table table name to run the statements on
* @param array $sql_ary multi-dimensional array holding the statement data.
*
* @return bool false if no statements were executed.
* @access public
* {@inheritDoc}
*/
function sql_multi_insert($table, $sql_ary)
{
@ -637,9 +581,7 @@ abstract class driver implements driver_interface
}
/**
* Build sql statement from array for select and select distinct statements
*
* Possible query values: SELECT, SELECT_DISTINCT
* {@inheritDoc}
*/
function sql_build_query($query, $array)
{
@ -742,7 +684,7 @@ abstract class driver implements driver_interface
}
/**
* display sql error page
* {@inheritDoc}
*/
function sql_error($sql = '')
{
@ -812,7 +754,7 @@ abstract class driver implements driver_interface
}
/**
* Explain queries
* {@inheritDoc}
*/
function sql_report($mode, $query = '')
{
@ -1002,14 +944,7 @@ abstract class driver implements driver_interface
}
/**
* Gets the estimated number of rows in a specified table.
*
* @param string $table_name Table name
*
* @return string Number of rows in $table_name.
* Prefixed with ~ if estimated (otherwise exact).
*
* @access public
* {@inheritDoc}
*/
function get_estimated_row_count($table_name)
{
@ -1017,13 +952,7 @@ abstract class driver implements driver_interface
}
/**
* Gets the exact number of rows in a specified table.
*
* @param string $table_name Table name
*
* @return string Exact number of rows in $table_name.
*
* @access public
* {@inheritDoc}
*/
function get_row_count($table_name)
{

29
phpBB/phpbb/db/driver/firebird.php
View File

@ -22,7 +22,7 @@ class firebird extends \phpbb\db\driver\driver
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -79,10 +79,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache forced to false for Interbase
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -127,13 +124,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -297,7 +288,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -313,7 +304,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -351,7 +342,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -379,7 +370,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -405,7 +396,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{
@ -441,7 +432,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* @inheritdoc
* {@inheritDoc}
*/
function cast_expr_to_bigint($expression)
{
@ -450,7 +441,7 @@ class firebird extends \phpbb\db\driver\driver
}
/**
* @inheritdoc
* {@inheritDoc}
*/
function cast_expr_to_string($expression)
{

28
phpBB/phpbb/db/driver/mssql.php
View File

@ -19,7 +19,7 @@ class mssql extends \phpbb\db\driver\driver
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -55,10 +55,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -124,13 +121,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -215,7 +206,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -223,7 +214,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -259,8 +250,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -280,7 +270,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -299,7 +289,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -325,7 +315,7 @@ class mssql extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{

2
phpBB/phpbb/db/driver/mssql_base.php
View File

@ -24,7 +24,7 @@ abstract class mssql_base extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{

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

@ -26,7 +26,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -83,10 +83,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -144,13 +141,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -236,7 +227,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -244,8 +235,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Fetch current row
* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -265,7 +255,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -286,7 +276,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{

23
phpBB/phpbb/db/driver/mssqlnative.php
View File

@ -24,7 +24,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -53,10 +53,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -113,13 +110,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -215,7 +206,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -223,7 +214,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -263,7 +254,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -283,7 +274,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{

29
phpBB/phpbb/db/driver/mysql.php
View File

@ -24,8 +24,7 @@ class mysql extends \phpbb\db\driver\mysql_base
var $connect_error = '';
/**
* Connect to server
* @access public
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -103,10 +102,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -154,13 +150,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -213,7 +203,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -221,7 +211,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -241,8 +231,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -262,7 +251,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -270,7 +259,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -296,7 +285,7 @@ class mysql extends \phpbb\db\driver\mysql_base
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{

17
phpBB/phpbb/db/driver/mysql_base.php
View File

@ -43,14 +43,7 @@ abstract class mysql_base extends \phpbb\db\driver\driver
}
/**
* Gets the estimated number of rows in a specified table.
*
* @param string $table_name Table name
*
* @return string Number of rows in $table_name.
* Prefixed with ~ if estimated (otherwise exact).
*
* @access public
* {@inheritDoc}
*/
function get_estimated_row_count($table_name)
{
@ -72,13 +65,7 @@ abstract class mysql_base extends \phpbb\db\driver\driver
}
/**
* Gets the exact number of rows in a specified table.
*
* @param string $table_name Table name
*
* @return string Exact number of rows in $table_name.
*
* @access public
* {@inheritDoc}
*/
function get_row_count($table_name)
{

28
phpBB/phpbb/db/driver/mysqli.php
View File

@ -21,7 +21,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -96,10 +96,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -151,13 +148,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -205,7 +196,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -213,7 +204,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -239,8 +230,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -260,7 +250,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -268,7 +258,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -288,7 +278,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{

28
phpBB/phpbb/db/driver/oracle.php
View File

@ -19,7 +19,7 @@ class oracle extends \phpbb\db\driver\driver
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -72,10 +72,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache forced to false for Oracle
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -240,13 +237,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -473,7 +464,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -481,7 +472,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -532,8 +523,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -570,7 +560,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -602,7 +592,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -628,7 +618,7 @@ class oracle extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{

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

@ -20,7 +20,7 @@ class postgres extends \phpbb\db\driver\driver
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -115,10 +115,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache If true, it is safe to retrieve the value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -166,13 +163,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -253,7 +244,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -261,7 +252,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -281,8 +272,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -302,7 +292,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -331,7 +321,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -357,8 +347,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* Note: Do not use for bytea values if we may use them at a later stage
* {@inheritDoc}
*/
function sql_escape($msg)
{
@ -375,7 +364,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* @inheritdoc
* {@inheritDoc}
*/
function cast_expr_to_bigint($expression)
{
@ -383,7 +372,7 @@ class postgres extends \phpbb\db\driver\driver
}
/**
* @inheritdoc
* {@inheritDoc}
*/
function cast_expr_to_string($expression)
{

31
phpBB/phpbb/db/driver/sqlite.php
View File

@ -19,7 +19,7 @@ class sqlite extends \phpbb\db\driver\driver
var $connect_error = '';
/**
* Connect to server
* {@inheritDoc}
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
{
@ -58,10 +58,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
* @param bool $use_cache if true, it is safe to retrieve the stored value from the cache
* @return string sql server version
* {@inheritDoc}
*/
function sql_server_info($raw = false, $use_cache = true)
{
@ -108,13 +105,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Base query method
*
* @param string $query Contains the SQL query which shall be executed
* @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
* @return mixed When casted to bool the returned value returns true on success and false on failure
*
* @access public
* {@inheritDoc}
*/
function sql_query($query = '', $cache_ttl = 0)
{
@ -185,7 +176,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Return number of affected rows
* {@inheritDoc}
*/
function sql_affectedrows()
{
@ -193,7 +184,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Fetch current row
* {@inheritDoc}
*/
function sql_fetchrow($query_id = false)
{
@ -213,8 +204,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Seek to given row number
* rownum is zero-based
* {@inheritDoc}
*/
function sql_rowseek($rownum, &$query_id)
{
@ -234,7 +224,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Get last inserted id after insert statement
* {@inheritDoc}
*/
function sql_nextid()
{
@ -242,7 +232,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Free sql result
* {@inheritDoc}
*/
function sql_freeresult($query_id = false)
{
@ -262,7 +252,7 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Escape string used in sql query
* {@inheritDoc}
*/
function sql_escape($msg)
{
@ -270,7 +260,8 @@ class sqlite extends \phpbb\db\driver\driver
}
/**
* Correctly adjust LIKE expression for special characters
* {@inheritDoc}
*
* For SQLite an underscore is a not-known character... this may change with SQLite3
*/
function sql_like_expression($expression)