From 0f664ab6c7d6635426c5b1a286a8610ae4c67f5d Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Tue, 3 Nov 2009 14:32:34 +0000 Subject: [PATCH] DatabaseOracle removed makeList overload and added delete overload for CLOB handling in delete parameters. --- includes/db/DatabaseOracle.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 99dbe0585e..e90d6fc503 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -1012,21 +1012,18 @@ class DatabaseOracle extends DatabaseBase { return array( $startOpts, $useIndex, $preLimitTail, $postLimitTail ); } - public function makeList( $a, $mode = LIST_COMMA ) { - if ( !is_array( $a ) ) { - throw new DBUnexpectedError( $this, 'DatabaseOracle::makeList called with incorrect parameters' ); - } + public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) { - $a2 = array(); - foreach($a as $col=>$val) { + $conds2 = array(); + foreach($conds as $col=>$val) { $col_type=$this->fieldInfo($this->tableName($table), $col)->type(); if ($col_type == 'CLOB') - $a2['TO_CHAR('.$col.')'] = $val; + $conds2['TO_CHAR('.$col.')'] = $val; else - $a2[$col] = $val; + $conds2[$col] = $val; } - - return parent::makeList($a2, $mode); + + return parent::delete( $table, $conds2, $fname ); } function bitNot($field) { -- 2.20.1