https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113154
Revision: 113154
Author: daniel
Date: 2012-03-06 17:35:24 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
installer/updater
Modified Paths:
--------------
branches/Wikidata/phase3/includes/installer/Ibm_db2Updater.php
branches/Wikidata/phase3/includes/installer/MysqlUpdater.php
branches/Wikidata/phase3/includes/installer/OracleUpdater.php
branches/Wikidata/phase3/includes/installer/SqliteUpdater.php
branches/Wikidata/phase3/maintenance/tables.sql
Added Paths:
-----------
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_format.sql
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_model.sql
branches/Wikidata/phase3/maintenance/archives/patch-page-page_content_model.sql
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_format.sql
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_model.sql
Modified: branches/Wikidata/phase3/includes/installer/Ibm_db2Updater.php
===================================================================
--- branches/Wikidata/phase3/includes/installer/Ibm_db2Updater.php
2012-03-06 17:32:30 UTC (rev 113153)
+++ branches/Wikidata/phase3/includes/installer/Ibm_db2Updater.php
2012-03-06 17:35:24 UTC (rev 113154)
@@ -69,7 +69,15 @@
array( 'addIndex', 'logging', 'type_action',
'patch-logging-type-action-index.sql'),
array( 'dropField', 'user', 'user_options',
'patch-drop-user_options.sql' ),
array( 'addField', 'revision', 'rev_sha1',
'patch-rev_sha1.sql' ),
- array( 'addField', 'archive', 'ar_sha1',
'patch-ar_sha1.sql' )
+ array( 'addField', 'archive', 'ar_sha1',
'patch-ar_sha1.sql' ),
+
+ // 1.20
+ // content model stuff for WikiData
+ array( 'addField', 'revision', 'rev_content_format',
'patch-revision-rev_content_format.sql' ),
+ array( 'addField', 'revision', 'rev_content_model',
'patch-revision-rev_content_model.sql' ),
+ array( 'addField', 'archive', 'ar_content_format',
'patch-archive-ar_content_format.sql' ),
+ array( 'addField', 'archive', 'ar_content_model',
'patch-archive-ar_content_model.sql' ),
+ array( 'addField', 'page', 'page_content_model',
'patch-page-page_content_model.sql' ),
);
}
}
Modified: branches/Wikidata/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- branches/Wikidata/phase3/includes/installer/MysqlUpdater.php
2012-03-06 17:32:30 UTC (rev 113153)
+++ branches/Wikidata/phase3/includes/installer/MysqlUpdater.php
2012-03-06 17:35:24 UTC (rev 113154)
@@ -192,6 +192,14 @@
array( 'modifyField', 'user', 'ug_group',
'patch-ug_group-length-increase.sql' ),
array( 'addField', 'uploadstash', 'us_chunk_inx',
'patch-uploadstash_chunk.sql' ),
array( 'addfield', 'job', 'job_timestamp',
'patch-jobs-add-timestamp.sql' ),
+
+ // 1.20
+ // content model stuff for WikiData
+ array( 'addField', 'revision', 'rev_content_format',
'patch-revision-rev_content_format.sql' ),
+ array( 'addField', 'revision', 'rev_content_model',
'patch-revision-rev_content_model.sql' ),
+ array( 'addField', 'archive', 'ar_content_format',
'patch-archive-ar_content_format.sql' ),
+ array( 'addField', 'archive', 'ar_content_model',
'patch-archive-ar_content_model.sql' ),
+ array( 'addField', 'page', 'page_content_model',
'patch-page-page_content_model.sql' ),
);
}
Modified: branches/Wikidata/phase3/includes/installer/OracleUpdater.php
===================================================================
--- branches/Wikidata/phase3/includes/installer/OracleUpdater.php
2012-03-06 17:32:30 UTC (rev 113153)
+++ branches/Wikidata/phase3/includes/installer/OracleUpdater.php
2012-03-06 17:35:24 UTC (rev 113154)
@@ -53,6 +53,14 @@
array( 'addField', 'job', 'job_timestamp',
'patch-job_timestamp_field.sql' ),
array( 'addIndex', 'job', 'i02',
'patch-job_timestamp_index.sql' ),
+ // 1.20
+ // content model stuff for WikiData
+ array( 'addField', 'revision', 'rev_content_format',
'patch-revision-rev_content_format.sql' ),
+ array( 'addField', 'revision', 'rev_content_model',
'patch-revision-rev_content_model.sql' ),
+ array( 'addField', 'archive', 'ar_content_format',
'patch-archive-ar_content_format.sql' ),
+ array( 'addField', 'archive', 'ar_content_model',
'patch-archive-ar_content_model.sql' ),
+ array( 'addField', 'page', 'page_content_model',
'patch-page-page_content_model.sql' ),
+
// KEEP THIS AT THE BOTTOM!!
array( 'doRebuildDuplicateFunction' ),
Modified: branches/Wikidata/phase3/includes/installer/SqliteUpdater.php
===================================================================
--- branches/Wikidata/phase3/includes/installer/SqliteUpdater.php
2012-03-06 17:32:30 UTC (rev 113153)
+++ branches/Wikidata/phase3/includes/installer/SqliteUpdater.php
2012-03-06 17:35:24 UTC (rev 113154)
@@ -71,6 +71,14 @@
array( 'modifyField', 'user', 'ug_group',
'patch-ug_group-length-increase.sql' ),
array( 'addField', 'uploadstash', 'us_chunk_inx',
'patch-uploadstash_chunk.sql' ),
array( 'addfield', 'job', 'job_timestamp',
'patch-jobs-add-timestamp.sql' ),
+
+ // 1.20
+ // content model stuff for WikiData
+ array( 'addField', 'revision', 'rev_content_format',
'patch-revision-rev_content_format.sql' ),
+ array( 'addField', 'revision', 'rev_content_model',
'patch-revision-rev_content_model.sql' ),
+ array( 'addField', 'archive', 'ar_content_format',
'patch-archive-ar_content_format.sql' ),
+ array( 'addField', 'archive', 'ar_content_model',
'patch-archive-ar_content_model.sql' ),
+ array( 'addField', 'page', 'page_content_model',
'patch-page-page_content_model.sql' ),
);
}
Copied:
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_format.sql
(from rev 110472,
branches/Wikidata/phase3/maintenance/archives/patch-ar_sha1.sql)
===================================================================
---
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_format.sql
(rev 0)
+++
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_format.sql
2012-03-06 17:35:24 UTC (rev 113154)
@@ -0,0 +1,2 @@
+ALTER TABLE /*$wgDBprefix*/archive
+ ADD ar_content_format varbinary(64) DEFAULT NULL;
Added:
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_model.sql
===================================================================
---
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_model.sql
(rev 0)
+++
branches/Wikidata/phase3/maintenance/archives/patch-archive-ar_content_model.sql
2012-03-06 17:35:24 UTC (rev 113154)
@@ -0,0 +1,2 @@
+ALTER TABLE /*$wgDBprefix*/archive
+ ADD ar_content_model varbinary(32) DEFAULT NULL;
Added:
branches/Wikidata/phase3/maintenance/archives/patch-page-page_content_model.sql
===================================================================
---
branches/Wikidata/phase3/maintenance/archives/patch-page-page_content_model.sql
(rev 0)
+++
branches/Wikidata/phase3/maintenance/archives/patch-page-page_content_model.sql
2012-03-06 17:35:24 UTC (rev 113154)
@@ -0,0 +1,2 @@
+ALTER TABLE /*$wgDBprefix*/page
+ ADD page_content_model varbinary(32) DEFAULT NULL;
Added:
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_format.sql
===================================================================
---
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_format.sql
(rev 0)
+++
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_format.sql
2012-03-06 17:35:24 UTC (rev 113154)
@@ -0,0 +1,2 @@
+ALTER TABLE /*$wgDBprefix*/revision
+ ADD rev_content_format varbinary(64) DEFAULT NULL;
Added:
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_model.sql
===================================================================
---
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_model.sql
(rev 0)
+++
branches/Wikidata/phase3/maintenance/archives/patch-revision-rev_content_model.sql
2012-03-06 17:35:24 UTC (rev 113154)
@@ -0,0 +1,2 @@
+ALTER TABLE /*$wgDBprefix*/revision
+ ADD rev_content_model varbinary(32) DEFAULT NULL;
Modified: branches/Wikidata/phase3/maintenance/tables.sql
===================================================================
--- branches/Wikidata/phase3/maintenance/tables.sql 2012-03-06 17:32:30 UTC
(rev 113153)
+++ branches/Wikidata/phase3/maintenance/tables.sql 2012-03-06 17:35:24 UTC
(rev 113154)
@@ -259,7 +259,10 @@
page_latest int unsigned NOT NULL,
-- Uncompressed length in bytes of the page's current source text.
- page_len int unsigned NOT NULL
+ page_len int unsigned NOT NULL,
+
+ -- content model
+ page_content_model varbinary(32) default NULL
) /*$wgDBTableOptions*/;
CREATE UNIQUE INDEX /*i*/name_title ON /*_*/page (page_namespace,page_title);
@@ -315,8 +318,14 @@
rev_parent_id int unsigned default NULL,
-- SHA-1 text content hash in base-36
- rev_sha1 varbinary(32) NOT NULL default ''
+ rev_sha1 varbinary(32) NOT NULL default '',
+ -- content model
+ rev_content_model varbinary(32) default NULL,
+
+ -- content format (mime type)
+ rev_content_format varbinary(64) default NULL
+
) /*$wgDBTableOptions*/ MAX_ROWS=10000000 AVG_ROW_LENGTH=1024;
-- In case tables are created as MyISAM, use row hints for MySQL <5.0 to avoid
4GB limit
@@ -425,7 +434,14 @@
ar_parent_id int unsigned default NULL,
-- SHA-1 text content hash in base-36
- ar_sha1 varbinary(32) NOT NULL default ''
+ ar_sha1 varbinary(32) NOT NULL default '',
+
+ -- content model
+ ar_content_model varbinary(32) default NULL,
+
+ -- content format (mime type)
+ ar_content_format varbinary(64) default NULL
+
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/name_title_timestamp ON /*_*/archive
(ar_namespace,ar_title,ar_timestamp);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
