http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88155
Revision: 88155
Author: jeroendedauw
Date: 2011-05-15 11:29:49 +0000 (Sun, 15 May 2011)
Log Message:
-----------
fixed pg bug when running update, last issue of bug 26202
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLHelpers.php
Modified: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLHelpers.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLHelpers.php
2011-05-15 11:23:38 UTC (rev 88154)
+++ trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLHelpers.php
2011-05-15 11:29:49 UTC (rev 88155)
@@ -260,11 +260,11 @@
$typeold = ( $notnullposold > 0 ) ? substr(
$currentFields[$name], 0, $notnullposold ) : $currentFields[$name];
if ( $typeold != $type ) {
- $db->query( "ALTER TABLE \"" . $tableName . "\"
ALTER COLUMN \"" . $name . "\" ENGINE " . $type, __METHOD__ );
+ $db->query( "ALTER TABLE " . $tableName . "
ALTER COLUMN \"" . $name . "\" ENGINE " . $type, __METHOD__ );
}
if ( $notnullposold != $notnullposnew ) {
- $db->query( "ALTER TABLE \"" . $tableName . "\"
ALTER COLUMN \"" . $name . "\" " . ( $notnullposnew > 0 ? 'SET' : 'DROP' ) . "
NOT NULL", __METHOD__ );
+ $db->query( "ALTER TABLE " . $tableName . "
ALTER COLUMN \"" . $name . "\" " . ( $notnullposnew > 0 ? 'SET' : 'DROP' ) . "
NOT NULL", __METHOD__ );
}
self::reportProgress( "done.\n", $reportTo );
@@ -357,7 +357,9 @@
$column = $index;
}
- $db->query( "CREATE $type
{$rawTableName}_index{$key} ON $tableName USING btree(" . $column . ")",
__METHOD__ );
+ if ( $db->indexInfo( $rawTableName,
"{$rawTableName}_index{$key}" ) === false ) {
+ $db->query( "CREATE $type
{$rawTableName}_index{$key} ON $tableName USING btree(" . $column . ")",
__METHOD__ );
+ }
}
}
} else { // MySQL
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
