diff options
Diffstat (limited to 'phpBB/phpbb/db/driver/firebird.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/firebird.php | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php index 787c28b812..a4967c7ffe 100644 --- a/phpBB/phpbb/db/driver/firebird.php +++ b/phpBB/phpbb/db/driver/firebird.php @@ -7,20 +7,14 @@ * */ -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} +namespace phpbb\db\driver; /** * Firebird/Interbase Database Abstraction Layer * Minimum Requirement is Firebird 2.1 * @package dbal */ -class phpbb_db_driver_firebird extends phpbb_db_driver +class firebird extends \phpbb\db\driver\driver { var $last_query_text = ''; var $service_handle = false; @@ -28,7 +22,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver var $connect_error = ''; /** - * Connect to server + * {@inheritDoc} */ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) { @@ -85,10 +79,7 @@ class phpbb_db_driver_firebird extends phpbb_db_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) { @@ -133,13 +124,7 @@ class phpbb_db_driver_firebird extends phpbb_db_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) { @@ -303,7 +288,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * Return number of affected rows + * {@inheritDoc} */ function sql_affectedrows() { @@ -319,7 +304,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * Fetch current row + * {@inheritDoc} */ function sql_fetchrow($query_id = false) { @@ -357,7 +342,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * Get last inserted id after insert statement + * {@inheritDoc} */ function sql_nextid() { @@ -385,7 +370,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * Free sql result + * {@inheritDoc} */ function sql_freeresult($query_id = false) { @@ -396,7 +381,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver $query_id = $this->query_result; } - if ($cache && $cache->sql_exists($query_id)) + if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_freeresult($query_id); } @@ -411,7 +396,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * Escape string used in sql query + * {@inheritDoc} */ function sql_escape($msg) { @@ -447,7 +432,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * @inheritdoc + * {@inheritDoc} */ function cast_expr_to_bigint($expression) { @@ -456,7 +441,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver } /** - * @inheritdoc + * {@inheritDoc} */ function cast_expr_to_string($expression) { |