| Index: trunk/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -249,7 +249,7 @@ |
| 250 | 250 | * Returns estimated count, based on EXPLAIN output |
| 251 | 251 | * Takes same arguments as Database::select() |
| 252 | 252 | */ |
| 253 | | - public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) { |
| | 253 | + public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'DatabaseMysql::estimateRowCount', $options = array() ) { |
| 254 | 254 | $options['EXPLAIN'] = true; |
| 255 | 255 | $res = $this->select( $table, $vars, $conds, $fname, $options ); |
| 256 | 256 | if ( $res === false ) { |
| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -973,7 +973,7 @@ |
| 974 | 974 | |
| 975 | 975 | function fieldInfo( $table, $field ) { |
| 976 | 976 | if ( is_array( $table ) ) { |
| 977 | | - throw new DBUnexpectedError( $this, 'Database::fieldInfo called with table array!' ); |
| | 977 | + throw new DBUnexpectedError( $this, 'DatabaseOracle::fieldInfo called with table array!' ); |
| 978 | 978 | } |
| 979 | 979 | return $this->fieldInfoMulti ($table, $field); |
| 980 | 980 | } |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -1037,7 +1037,7 @@ |
| 1038 | 1038 | * more of IGNORE, LOW_PRIORITY |
| 1039 | 1039 | * @return Boolean |
| 1040 | 1040 | */ |
| 1041 | | - public function update( $table, $values, $conds, $fname = 'Database::update', |
| | 1041 | + public function update( $table, $values, $conds, $fname = 'DatabaseIbm_db2::update', |
| 1042 | 1042 | $options = array() ) |
| 1043 | 1043 | { |
| 1044 | 1044 | $table = $this->tableName( $table ); |
| — | — | @@ -1062,10 +1062,10 @@ |
| 1063 | 1063 | * |
| 1064 | 1064 | * Use $conds == "*" to delete all rows |
| 1065 | 1065 | */ |
| 1066 | | - public function delete( $table, $conds, $fname = 'Database::delete' ) { |
| | 1066 | + public function delete( $table, $conds, $fname = 'DatabaseIbm_db2::delete' ) { |
| 1067 | 1067 | if ( !$conds ) { |
| 1068 | 1068 | throw new DBUnexpectedError( $this, |
| 1069 | | - 'Database::delete() called with no conditions' ); |
| | 1069 | + 'DatabaseIbm_db2::delete() called with no conditions' ); |
| 1070 | 1070 | } |
| 1071 | 1071 | $table = $this->tableName( $table ); |
| 1072 | 1072 | $sql = "DELETE FROM $table"; |
| — | — | @@ -1463,7 +1463,7 @@ |
| 1464 | 1464 | * @return Bool |
| 1465 | 1465 | */ |
| 1466 | 1466 | public function indexUnique ( $table, $index, |
| 1467 | | - $fname = 'Database::indexUnique' ) |
| | 1467 | + $fname = 'DatabaseIbm_db2::indexUnique' ) |
| 1468 | 1468 | { |
| 1469 | 1469 | $table = $this->tableName( $table ); |
| 1470 | 1470 | $sql = <<<SQL |
| — | — | @@ -1518,7 +1518,7 @@ |
| 1519 | 1519 | { |
| 1520 | 1520 | if ( !$conds ) { |
| 1521 | 1521 | throw new DBUnexpectedError( $this, |
| 1522 | | - 'Database::deleteJoin() called with empty $conds' ); |
| | 1522 | + 'DatabaseIbm_db2::deleteJoin() called with empty $conds' ); |
| 1523 | 1523 | } |
| 1524 | 1524 | |
| 1525 | 1525 | $delTable = $this->tableName( $delTable ); |