Revert r19843 for now; unreviewed schema changes

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a89925..e6c1468 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -184,7 +184,6 @@ lighter making things easier to read.
   of other tables while they work.
 * Message names changed for AlphabeticPager introduced with r19758
   for better localisations.
-* Tree structure has been added to revision table
 
 == Languages updated ==
 

diff --git a/maintenance/archives/patch-rev_parent_id.sql b/maintenance/archives/patch-rev_parent_id.sql
deleted file mode 100644 (file)
index 971122b..0000000
--- a/maintenance/archives/patch-rev_parent_id.sql
+++ /dev/null
@@ -1,9 +0,0 @@
---
--- Key to revision.rev_id
--- This field is used to add support for a tree structure (The Adjacency List Model)
---
--- 2007-03-04
---
-
-ALTER TABLE /*$wgDBprefix*/revision
-  ADD rev_parent_id int(8) unsigned default NULL;

diff --git a/maintenance/mysql5/tables-binary.sql b/maintenance/mysql5/tables-binary.sql
index 0d98f5f..7f970f9 100644 (file)
--- a/maintenance/mysql5/tables-binary.sql
+++ b/maintenance/mysql5/tables-binary.sql
@@ -292,10 +292,6 @@ CREATE TABLE /*$wgDBprefix*/revision (
   -- Not yet used; reserved for future changes to the deletion system.
   rev_deleted tinyint(1) unsigned NOT NULL default '0',
   
-  --Key to revision.rev_id
-  --This field is used to add support for a tree structure (The Adjacency List Model)
-  rev_parent_id int(8) unsigned default NULL,
-
   PRIMARY KEY rev_page_id (rev_page, rev_id),
   UNIQUE INDEX rev_id (rev_id),
   INDEX rev_timestamp (rev_timestamp),

diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql
index 9afbd7d..11c9b16 100644 (file)
--- a/maintenance/mysql5/tables.sql
+++ b/maintenance/mysql5/tables.sql
@@ -283,10 +283,6 @@ CREATE TABLE /*$wgDBprefix*/revision (
   -- Not yet used; reserved for future changes to the deletion system.
   rev_deleted tinyint(1) unsigned NOT NULL default '0',
   
-  --Key to revision.rev_id
-  --This field is used to add support for a tree structure (The Adjacency List Model)
-  rev_parent_id int(8) unsigned default NULL,
-
   PRIMARY KEY rev_page_id (rev_page, rev_id),
   UNIQUE INDEX rev_id (rev_id),
   INDEX rev_timestamp (rev_timestamp),

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 1f7162b..62e021e 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -92,9 +92,7 @@ CREATE TABLE revision (
   rev_user_text   TEXT         NOT NULL,
   rev_timestamp   TIMESTAMPTZ  NOT NULL,
   rev_minor_edit  CHAR         NOT NULL  DEFAULT '0',
-  rev_deleted     CHAR         NOT NULL  DEFAULT '0',
-  rev_parent_id   INTEGER                      DEFAULT NULL
-
+  rev_deleted     CHAR         NOT NULL  DEFAULT '0'
 );
 CREATE UNIQUE INDEX revision_unique ON revision (rev_page, rev_id);
 CREATE INDEX rev_text_id_idx        ON revision (rev_text_id);

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index d2235f0..28339f6 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -270,10 +270,6 @@ CREATE TABLE /*$wgDBprefix*/revision (
   -- Not yet used; reserved for future changes to the deletion system.
   rev_deleted tinyint(1) unsigned NOT NULL default '0',
   
-  --Key to revision.rev_id
-  --This field is used to add support for a tree structure (The Adjacency List Model)
-  rev_parent_id int(8) unsigned default NULL,
-
   PRIMARY KEY rev_page_id (rev_page, rev_id),
   UNIQUE INDEX rev_id (rev_id),
   INDEX rev_timestamp (rev_timestamp),

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index efd4f51..99cd39c 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -67,7 +67,6 @@ $wgNewFields = array(
        array( 'user',          'user_newpass_time','patch-user_newpass_time.sql' ),
        array( 'user',          'user_editcount',   'patch-user_editcount.sql' ),
        array( 'logging',       'log_id',               'patch-log_id.sql' ),
-       array( 'revision',      'rev_parent_id',    'patch-rev_parent_id.sql' ),
 );
 
 function rename_table( $from, $to, $patch ) {
@@ -413,7 +412,6 @@ function do_schema_restructuring() {
                        rev_timestamp char(14) binary NOT NULL default '',
                        rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
                        rev_deleted tinyint(1) unsigned NOT NULL default '0',
-                       rev_parent_id int(8) unsigned default NULL,
 
                        PRIMARY KEY rev_page_id (rev_page, rev_id),
                        UNIQUE INDEX rev_id (rev_id),