Mwalker has submitted this change and it was merged. Change subject: Add fix for longstanding bug in contribution_tracking DB ......................................................................
Add fix for longstanding bug in contribution_tracking DB See http://www.mediawiki.org/wiki/User:MarkTraceur/FR-tech_setup_notes for the messed-up manual query I had to run while installing CT for the first time. I don't want that to be part of the setup. So let's fix this in a normal...ish way. Change-Id: Ie85278fb22a8b857ba086a69383c48f0789f9542 --- M ContributionTracking.php M ContributionTracking.sql 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Mwalker: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/ContributionTracking.php b/ContributionTracking.php index 40e5470..4d57109 100644 --- a/ContributionTracking.php +++ b/ContributionTracking.php @@ -140,7 +140,12 @@ $updater->addExtensionUpdate( array( 'addField', 'contribution_tracking', 'owa_session', $dir . 'patches/patch-owa.sql', true ) ); $updater->addExtensionUpdate( array( 'addField', 'contribution_tracking', 'utm_key', - $dir . 'patches/patch-owa.sql', true ) ); + $dir . 'patches/patch-owa.sql', true ) ); + + // Not sure how to do this in the other configurations, but I guess + // "manually" might be the answer. + $updater->addExtensionUpdate( array( 'modifyField', 'contribution_tracking', 'anonymous', + $dir . 'patches/make-null.patch.sql' ) ); } else { //We are configured not to use the main mediawiki db. //Unless the updater is modified not to run //'LoadExtensionSchemaUpdates' hooks in its constructor (or do so diff --git a/ContributionTracking.sql b/ContributionTracking.sql index dc7a1da..7b79c9a 100644 --- a/ContributionTracking.sql +++ b/ContributionTracking.sql @@ -5,13 +5,13 @@ usd_amount decimal(20,2) default NULL, note text, referrer varchar(4096) default NULL, - anonymous tinyint(1) unsigned NOT NULL, + anonymous tinyint(1) unsigned default NULL, utm_source varchar(128) default NULL, utm_medium varchar(128) default NULL, utm_campaign varchar(128) default NULL, utm_key varchar(128) default NULL, payments_form varchar(50) default NULL, - optout tinyint(1) unsigned NOT NULL, + optout tinyint(1) unsigned default NULL, language varchar(8) default NULL, country varchar(2) default NULL, ts char(14) default NULL, -- To view, visit https://gerrit.wikimedia.org/r/69154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie85278fb22a8b857ba086a69383c48f0789f9542 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContributionTracking Gerrit-Branch: master Gerrit-Owner: MarkTraceur <[email protected]> Gerrit-Reviewer: Mwalker <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
