From 446fd503d0b3abd1434e2b21042c1346f9641f48 Mon Sep 17 00:00:00 2001
From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Wed, 28 Oct 2009 19:15:19 +0000
Subject: [PATCH] * Replaced LIMIT with limitResult call in
 rebuildrecentchanges.php * Added a wrapper-function for sequence number
 generation and modified insertSelect in DatabaseOracle to fill missing
 ID-field references

---
 includes/db/DatabaseOracle.php       | 46 ++++++++++++++++++++++++----
 maintenance/ora/tables.sql           |  8 +++++
 maintenance/rebuildrecentchanges.php |  3 +-
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 8e37a26dea..6ccf82d9f4 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -33,7 +33,21 @@ class ORAResult {
 	private $nrows;
 
 	private $unique;
-
+	private function array_unique_md($array_in) {  
+		$array_out = array();
+		$array_hashes = array();
+
+		foreach($array_in as $key => $item) {  
+			$hash = md5(serialize($item));  
+			if (!isset($array_hashes[$hash])) {  
+				$array_hashes[$hash] = $hash;  
+				$array_out[] = $item;
+			}  
+		}  
+		
+		return $array_out;  
+	}
+	
 	function __construct(&$db, $stmt, $unique = false) {
 		$this->db =& $db;
 
@@ -44,7 +58,7 @@ class ORAResult {
 		}
 
 		if ($unique) {
-			$this->rows = array_unique($this->rows);
+			$this->rows = $this->array_unique_md($this->rows);
 			$this->nrows = count($this->rows);
 		}
 
@@ -162,6 +176,7 @@ class DatabaseOracle extends DatabaseBase {
 	var $mAffectedRows;
 
 	var $ignore_DUP_VAL_ON_INDEX = false;
+	var $sequenceData = null;
 
 	function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false,
 		$failFunction = false, $flags = 0, $tablePrefix = 'get from global' )
@@ -513,11 +528,15 @@ class DatabaseOracle extends DatabaseBase {
 			$srcTable = $this->tableName( $srcTable );
 		}
 		
+		if (($sequenceData = $this->getSequenceData($destTable)) !== false &&
+				!isset($varMap[$sequenceData['column']]))
+			$varMap[$sequenceData['column']] = 'GET_SEQUENCE_VALUE(\''.$sequenceData['sequence'].'\')';
+		
 		// count-alias subselect fields to avoid abigious definition errors
 		$i=0;
 		foreach($varMap as $key=>&$val)
 			$val=$val.' field'.($i++);
-				
+		
 		$sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
 			" SELECT $startOpts " . implode( ',', $varMap ) .
 			" FROM $srcTable $useIndex ";
@@ -525,12 +544,12 @@ class DatabaseOracle extends DatabaseBase {
 			$sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
 		}
 		$sql .= " $tailOpts";
-
+		
 		if (in_array('IGNORE', $insertOptions)) 
 			$this->ignore_DUP_VAL_ON_INDEX = true;
-
+		
 		$retval = $this->query( $sql, $fname );
-
+		
 		if (in_array('IGNORE', $insertOptions))
 			$this->ignore_DUP_VAL_ON_INDEX = false;
 		
@@ -595,6 +614,21 @@ class DatabaseOracle extends DatabaseBase {
 		return $this->mInsertId;
 	}
 
+	/**
+	 * Return sequence_name if table has a sequence
+	 */
+	function getSequenceData($table) {
+		if ($this->sequenceData == NULL) {
+			$result = $this->query("SELECT lower(us.sequence_name), lower(utc.table_name), lower(utc.column_name) from user_sequences us, user_tab_columns utc where us.sequence_name = utc.table_name||'_'||utc.column_name||'_SEQ'");
+			
+			while(($row = $result->fetchRow()) !== false)
+				$this->sequenceData[$this->tableName($row[1])] = array('sequence' => $row[0], 'column' => $row[2]);
+		}
+		
+		return (isset($this->sequenceData[$table])) ? $this->sequenceData[$table] : false;
+	}
+	
+
 	# REPLACE query wrapper
 	# Oracle simulates this with a DELETE followed by INSERT
 	# $row is the row to insert, an associative array
diff --git a/maintenance/ora/tables.sql b/maintenance/ora/tables.sql
index 2ddadfe7f3..9b08d00bfe 100644
--- a/maintenance/ora/tables.sql
+++ b/maintenance/ora/tables.sql
@@ -680,3 +680,11 @@ EXCEPTION
 END;
 /*$mw$*/
 
+/*$mw$*/
+CREATE OR REPLACE FUNCTION GET_SEQUENCE_VALUE(seq IN VARCHAR2) RETURN NUMBER AS
+	v_value NUMBER;
+BEGIN
+	EXECUTE IMMEDIATE 'SELECT '||seq||'.NEXTVAL INTO :outVar FROM DUAL' INTO v_value;
+	RETURN v_value;
+END;
+/*$mw$*/
diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 6fb55ff8d9..6c76dc5996 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -115,7 +115,8 @@ class RebuildRecentchanges extends Maintenance {
 				$emit = $obj->rc_timestamp;
 				$sql2 = "SELECT rev_id,rev_len FROM $revision " .
 					"WHERE rev_page={$lastCurId} ".
-					"AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC LIMIT 1";
+					"AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC";
+				$sql2 = $dbw->limitResult($sql2, 1, false);
 				$res2 = $dbw->query( $sql2 );
 				if( $row = $dbw->fetchObject( $res2 ) ) {
 					$lastOldId = intval($row->rev_id);
-- 
2.20.1