freakolowsky at svn
Nov 4, 2009, 11:27 AM
Post #1 of 1
(14 views)
Permalink
|
|
SVN: [58561] trunk/phase3/includes/db/DatabaseOracle.php
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58561
Revision: 58561
Author: freakolowsky
Date: 2009-11-04 19:27:22 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Fixed replace function behaviour when required ID not specified
Modified Paths:
--------------
trunk/phase3/includes/db/DatabaseOracle.php
Modified: trunk/phase3/includes/db/DatabaseOracle.php
===================================================================
--- trunk/phase3/includes/db/DatabaseOracle.php 2009-11-04 19:24:19 UTC (rev 58560)
+++ trunk/phase3/includes/db/DatabaseOracle.php 2009-11-04 19:27:22 UTC (rev 58561)
@@ -419,7 +419,7 @@
if (!is_array($options))
$options = array($options);
- if (in_array('IGNORE', $options))
+ if (in_array('IGNORE', $options))
$this->ignore_DUP_VAL_ON_INDEX = true;
if (!is_array(reset($a))) {
@@ -648,6 +648,8 @@
$rows = array($rows);
}
+ $sequenceData = $this->getSequenceData($table);
+
foreach( $rows as $row ) {
# Delete rows which collide
if ( $uniqueIndexes ) {
@@ -678,6 +680,9 @@
$this->query( $sql, $fname );
}
+ if ($sequenceData !== false && !isset($row[$sequenceData['column']]))
+ $row[$sequenceData['column']] = $this->nextSequenceValue($sequenceData['sequence']);
+
# Now insert the row
$this->insert( $table, $row, $fname );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
