Fixed $fname in some places

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index 0105a23..b259be6 100644 (file)
--- a/includes/db/DatabaseIbm_db2.php
+++ b/includes/db/DatabaseIbm_db2.php
@@ -1037,7 +1037,7 @@ EOF;
         *                 more of IGNORE, LOW_PRIORITY
         * @return Boolean
         */
-       public function update( $table, $values, $conds, $fname = 'Database::update',
+       public function update( $table, $values, $conds, $fname = 'DatabaseIbm_db2::update',
                $options = array() )
        {
                $table = $this->tableName( $table );
@@ -1062,10 +1062,10 @@ EOF;
         *
         * Use $conds == "*" to delete all rows
         */
-       public function delete( $table, $conds, $fname = 'Database::delete' ) {
+       public function delete( $table, $conds, $fname = 'DatabaseIbm_db2::delete' ) {
                if ( !$conds ) {
                        throw new DBUnexpectedError( $this,
-                       'Database::delete() called with no conditions' );
+                               'DatabaseIbm_db2::delete() called with no conditions' );
                }
                $table = $this->tableName( $table );
                $sql = "DELETE FROM $table";
@@ -1463,7 +1463,7 @@ SQL;
         * @return Bool
         */
        public function indexUnique ( $table, $index,
-               $fname = 'Database::indexUnique' )
+               $fname = 'DatabaseIbm_db2::indexUnique' )
        {
                $table = $this->tableName( $table );
                $sql = <<<SQL
@@ -1518,7 +1518,7 @@ SQL;
        {
                if ( !$conds ) {
                        throw new DBUnexpectedError( $this,
-                       'Database::deleteJoin() called with empty $conds' );
+                               'DatabaseIbm_db2::deleteJoin() called with empty $conds' );
                }
 
                $delTable = $this->tableName( $delTable );

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 8a6d352..10c6cf2 100644 (file)
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -249,7 +249,7 @@ class DatabaseMysql extends DatabaseBase {
         * Returns estimated count, based on EXPLAIN output
         * Takes same arguments as Database::select()
         */
-       public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) {
+       public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'DatabaseMysql::estimateRowCount', $options = array() ) {
                $options['EXPLAIN'] = true;
                $res = $this->select( $table, $vars, $conds, $fname, $options );
                if ( $res === false ) {

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b258ca5..33e1104 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -973,7 +973,7 @@ class DatabaseOracle extends DatabaseBase {
 
        function fieldInfo( $table, $field ) {
                if ( is_array( $table ) ) {
-                       throw new DBUnexpectedError( $this, 'Database::fieldInfo called with table array!' );
+                       throw new DBUnexpectedError( $this, 'DatabaseOracle::fieldInfo called with table array!' );
                }
                return $this->fieldInfoMulti ($table, $field);
        }