From: Max Semenik <maxsem@users.mediawiki.org>
Date: Thu, 10 Dec 2009 17:42:12 +0000 (+0000)
Subject: Fixed updater borkage on SQLite from r59925 and r59926, tweaked explanation for this... 
X-Git-Tag: 1.31.0-rc.0~38578
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=5445d274c10c12068333297b365fd25de2a9104d;p=lhc%2Fweb%2Fwiklou.git

Fixed updater borkage on SQLite from r59925 and r59926, tweaked explanation for this change in updaters.inc for portability. See my comments for these revisions in CodeReview for motivation.
---

diff --git a/maintenance/sqlite/archives/initial-indexes.sql b/maintenance/sqlite/archives/initial-indexes.sql
index 9c038a1a53..25f90977e6 100644
--- a/maintenance/sqlite/archives/initial-indexes.sql
+++ b/maintenance/sqlite/archives/initial-indexes.sql
@@ -352,7 +352,7 @@ DROP TABLE IF EXISTS /*_*/transcache;
 CREATE TABLE /*_*/transcache (
   tc_url varbinary(255) NOT NULL,
   tc_contents text,
-  tc_time binary(14) NOT NULL
+  tc_time int NOT NULL
 ) /*$wgDBTableOptions*/;
 CREATE UNIQUE INDEX /*i*/tc_url_idx ON /*_*/transcache (tc_url);
 
diff --git a/maintenance/sqlite/archives/patch-tc-timestamp.sql b/maintenance/sqlite/archives/patch-tc-timestamp.sql
index 4d90cf34cf..8e54da2e5a 100644
--- a/maintenance/sqlite/archives/patch-tc-timestamp.sql
+++ b/maintenance/sqlite/archives/patch-tc-timestamp.sql
@@ -1,4 +1,3 @@
-ALTER TABLE /*_*/transcache MODIFY tc_time binary(14);
-UPDATE /*_*/transcache SET tc_time = DATE_FORMAT(FROM_UNIXTIME(tc_time), "%Y%c%d%H%i%s");
+UPDATE /*_*/transcache SET tc_time = strftime('%Y%m%d%H%M%S', datetime(1260465428, 'unixepoch'));
 
 INSERT INTO /*_*/updatelog VALUES ('convert transcache field');
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 4d926c215c..478775c870 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1350,7 +1350,7 @@ function do_update_transcache_field() {
 		wfOut( "...transcache tc_time already converted.\n" );
 		return;
 	} else {
-		wfOut( "Converting tc_time from int(11) to binary(14)... " );
+		wfOut( "Converting tc_time from UNIX epoch to MediaWiki timestamp... " );
 		$wgDatabase->sourceFile( archive( 'patch-tc-timestamp.sql' ) );
 		wfOut( "ok\n" );
 	}