http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99665
Revision: 99665
Author: wikinaut
Date: 2011-10-13 00:31:22 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
maintenance patch of the updater hook
Modified Paths:
--------------
trunk/extensions/OpenID/OpenID.hooks.php
trunk/extensions/OpenID/OpenID.php
trunk/extensions/OpenID/README.OpenID-mediawiki-extension
Modified: trunk/extensions/OpenID/OpenID.hooks.php
===================================================================
--- trunk/extensions/OpenID/OpenID.hooks.php 2011-10-13 00:15:25 UTC (rev
99664)
+++ trunk/extensions/OpenID/OpenID.hooks.php 2011-10-13 00:31:22 UTC (rev
99665)
@@ -331,10 +331,11 @@
dirname( __FILE__ ) .
'/patches/openid_table.sql'
);
- # if index of older OpenID version is unique then
upgrade and make index non unique
+ # when updating an older OpenID version
+ # make the index non unique (remove unique index
uoi_user, add new index user_openid_user)
$db = wfGetDB( DB_MASTER );
$info = $db->fieldInfo( 'user_openid', 'uoi_user' );
- if ( !$info->isMultipleKey() ) {
+ if ( $info && !$info->isMultipleKey() ) {
echo( "Making uoi_user field non UNIQUE...\n" );
$db->sourceFile( dirname( __FILE__ ) .
'/patches/patch-uoi_user-not-unique.sql' );
echo( " done.\n" );
@@ -350,19 +351,20 @@
);
} else {
// >= 1.17 support
- $updater->addExtensionUpdate( array( 'addTable',
'user_openid',
- dirname( __FILE__ ) .
'/patches/openid_table.sql', true ) );
+ $updater->addExtensionTable( 'user_openid',
+ dirname( __FILE__ ) .
'/patches/openid_table.sql' );
- # if index of older OpenID version is unique then
upgrade and make index non unique
+ # when updating an older OpenID version
+ # make the index non unique (remove unique index
uoi_user, add new index user_openid_user)
$db = $updater->getDB();
$info = $db->fieldInfo( 'user_openid', 'uoi_user' );
- if ( !$info->isMultipleKey() ) {
+ if ( $info && !$info->isMultipleKey() ) {
$updater->addExtensionUpdate( array(
'dropIndex', 'user_openid', 'uoi_user',
dirname( __FILE__ ) .
'/patches/patch-drop_non_multiple_key_index_uoi_user.sql', true ) );
$updater->addExtensionIndex( 'user_openid',
'user_openid_user',
dirname( __FILE__ ) .
'/patches/patch-add_multiple_key_index_user_openid_user.sql' );
}
-
+
# uoi_user_registration field was added in OpenID
version 0.937
$updater->addExtensionField( 'user_openid',
'uoi_user_registration',
dirname( __FILE__ ) .
'/patches/patch-add_uoi_user_registration.sql' );
Modified: trunk/extensions/OpenID/OpenID.php
===================================================================
--- trunk/extensions/OpenID/OpenID.php 2011-10-13 00:15:25 UTC (rev 99664)
+++ trunk/extensions/OpenID/OpenID.php 2011-10-13 00:31:22 UTC (rev 99665)
@@ -27,7 +27,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '0.941-beta 20111011' );
+define( 'MEDIAWIKI_OPENID_VERSION', '0.942-beta 20111012' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
Modified: trunk/extensions/OpenID/README.OpenID-mediawiki-extension
===================================================================
--- trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2011-10-13
00:15:25 UTC (rev 99664)
+++ trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2011-10-13
00:31:22 UTC (rev 99665)
@@ -467,6 +467,7 @@
into that account now
== CHANGES ==
+* 0.942 code cosmetic db schema updater
* 0.940 changed database schema updater; tested for MySQL
* 0.939 function name changes
* 0.938 list uoi_user_registration timestamp if present in openid-preference
tab
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
