| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -700,35 +700,9 @@ |
| 701 | 701 | $condsDelete = array(); |
| 702 | 702 | foreach ( $uniqueIndexes as $index ) |
| 703 | 703 | $condsDelete[$index] = $row[$index]; |
| 704 | | - $this->delete( $table, $condsDelete, $fname ); |
| 705 | | -/* |
| 706 | | - $sql = "DELETE FROM $table WHERE "; |
| 707 | | - $first = true; |
| 708 | | - foreach ( $uniqueIndexes as $index ) { |
| 709 | | - if ( $first ) { |
| 710 | | - $first = false; |
| 711 | | - $sql .= "("; |
| 712 | | - } else { |
| 713 | | - $sql .= ') OR ('; |
| 714 | | - } |
| 715 | | - if ( is_array( $index ) ) { |
| 716 | | - $first2 = true; |
| 717 | | - foreach ( $index as $col ) { |
| 718 | | - if ( $first2 ) { |
| 719 | | - $first2 = false; |
| 720 | | - } else { |
| 721 | | - $sql .= ' AND '; |
| 722 | | - } |
| 723 | | - $sql .= $col.'=' . $this->addQuotes( $row[$col] ); |
| 724 | | - } |
| 725 | | - } else { |
| 726 | | - $sql .= $index.'=' . $this->addQuotes( $row[$index] ); |
| 727 | | - } |
| | 704 | + if (count($condsDelete) > 0) { |
| | 705 | + $this->delete( $table, $condsDelete, $fname ); |
| 728 | 706 | } |
| 729 | | - $sql .= ')'; |
| 730 | | - |
| 731 | | - $this->doQuery( $sql);//, $fname ); |
| 732 | | -*/ |
| 733 | 707 | } |
| 734 | 708 | |
| 735 | 709 | if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) ) { |