From d2e409eed1b3923a29fe972e3daa50af27f88edf Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 18 Feb 2011 22:58:02 +0000 Subject: [PATCH] Mark a fixme comment in Oracle DB file for undefined variable Add documentation --- includes/db/Database.php | 7 +++++-- includes/db/DatabaseMysql.php | 1 - includes/db/DatabaseOracle.php | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 6ea67709d4..8317664665 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -1364,12 +1364,15 @@ abstract class DatabaseBase implements DatabaseType { /** * Makes an encoded list of strings from an array - * $mode: + * @param $a Array + * @param $mode * LIST_COMMA - comma separated, no field names * LIST_AND - ANDed WHERE clause (without the WHERE) * LIST_OR - ORed WHERE clause (without the WHERE) * LIST_SET - comma separated with field names, like a SET clause * LIST_NAMES - comma separated field names + * + * @return string */ function makeList( $a, $mode = LIST_COMMA ) { if ( !is_array( $a ) ) { @@ -2838,7 +2841,7 @@ class DBError extends MWException { /** * Construct a database error * @param $db Database object which threw the error - * @param $error A simple error message to be used for debugging + * @param $error String A simple error message to be used for debugging */ function __construct( DatabaseBase &$db, $error ) { $this->db =& $db; diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php index a8af0510b5..5e9c27f48b 100644 --- a/includes/db/DatabaseMysql.php +++ b/includes/db/DatabaseMysql.php @@ -478,7 +478,6 @@ class DatabaseMysql extends DatabaseBase { $this->query( "SET sql_big_selects=$encValue", __METHOD__ ); } - /** * Determines if the last failure was due to a deadlock */ diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index ed8a0684b8..5aeb7737f0 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -788,9 +788,9 @@ class DatabaseOracle extends DatabaseBase { # Returns the size of a text field, or -1 for "unlimited" function textFieldSize( $table, $field ) { - $fieldInfoData = $this->fieldInfo( $table, $field); + $fieldInfoData = $this->fieldInfo( $table, $field ); if ( $fieldInfoData->type() == 'varchar' ) { - $size = $row->size - 4; + $size = $row->size - 4; // FIXME: $row is undefined } else { $size = $row->size; } -- 2.20.1