*Create unique index pr_pagetype for PostgreSQL to fix protection breakage (bug 9097...

diff --git a/maintenance/archives/patch-page_restrictions.sql b/maintenance/archives/patch-page_restrictions.sql
index eb80527..b4ef34b 100644 (file)
--- a/maintenance/archives/patch-page_restrictions.sql
+++ b/maintenance/archives/patch-page_restrictions.sql
@@ -13,7 +13,7 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
        -- Field for time-limited protection.
        pr_expiry char(14) binary NULL,
 
-       PRIMARY KEY  (pr_page,pr_type),
+       PRIMARY KEY pr_pagetype (pr_page,pr_type),
 
        KEY pr_page (pr_page),
        KEY pr_typelevel (pr_type,pr_level),

diff --git a/maintenance/mysql5/tables-binary.sql b/maintenance/mysql5/tables-binary.sql
index 7f970f9..d7d3b2c 100644 (file)
--- a/maintenance/mysql5/tables-binary.sql
+++ b/maintenance/mysql5/tables-binary.sql
@@ -1112,7 +1112,7 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
   -- Field for time-limited protection.
   pr_expiry char(14) binary NULL,
 
-  PRIMARY KEY (pr_page,pr_type),
+  PRIMARY KEY pr_pagetype (pr_page,pr_type),
 
   KEY pr_page (pr_page),
   KEY pr_typelevel (pr_type,pr_level),

diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql
index 11c9b16..6ea6243 100644 (file)
--- a/maintenance/mysql5/tables.sql
+++ b/maintenance/mysql5/tables.sql
@@ -1103,7 +1103,7 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
   -- Field for time-limited protection.
   pr_expiry char(14) binary NULL,
 
-  PRIMARY KEY (pr_page,pr_type),
+  PRIMARY KEY pr_pagetype (pr_page,pr_type),
 
   KEY pr_page (pr_page),
   KEY pr_typelevel (pr_type,pr_level),

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index a934d93..868bc5c 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -111,7 +111,7 @@ CREATE TABLE pagecontent ( -- replaces reserved word 'text'
 
 CREATE SEQUENCE pr_id_val;
 CREATE TABLE page_restrictions (
-  pr_id      INTEGER      NOT NULL  UNIQUE DEFAULT nextval('pr_id_val'),
+  pr_id      INTEGER      NOT NULL  PRIMARY KEY DEFAULT nextval('pr_id_val'),
   pr_page    INTEGER          NULL  REFERENCES page (page_id) ON DELETE CASCADE,
   pr_type    TEXT         NOT NULL,
   pr_level   TEXT         NOT NULL,
@@ -119,7 +119,7 @@ CREATE TABLE page_restrictions (
   pr_user    INTEGER          NULL,
   pr_expiry  TIMESTAMPTZ      NULL
 );
-ALTER TABLE page_restrictions ADD CONSTRAINT page_restrictions_pk PRIMARY KEY (pr_page,pr_type);
+CREATE UNIQUE INDEX pr_pagetype ON page_restrictions (pr_page,pr_type);
 
 
 CREATE TABLE archive2 (

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 28339f6..8dc09d2 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1097,7 +1097,7 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
   -- Field for an ID for this restrictions row (sort-key for Special:ProtectedPages)
   pr_id int unsigned not null auto_increment,
 
-  PRIMARY KEY (pr_page,pr_type),
+  PRIMARY KEY pr_pagetype (pr_page,pr_type),
 
   UNIQUE KEY  pr_id (pr_id),
   KEY pr_page (pr_page),