X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FPostgresUpdater.php;h=9aa1a13c4cb294fc9c29d29d8ab0a3d6f8e182a7;hb=f1926396cf2e28c10d82a5836d19ab4e59c29d2e;hp=1bb3b9bfb02986426c4f1011ff75e4707379a400;hpb=32edcb1f170b6b2cfa9ff4935cd115c686e65eff;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index 1bb3b9bfb0..9aa1a13c4c 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -2,6 +2,21 @@
 /**
  * PostgreSQL-specific updater.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Deployment
  */
@@ -35,10 +50,6 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'renameIndex', 'mwuser', 'user_user_name_key', 'mwuser_user_name_key' ),
 			array( 'renameIndex', 'pagecontent','text_pkey', 'pagecontent_pkey' ),
 
-			# new sequences
-			array( 'addSequence', 'logging_log_id_seq'          ),
-			array( 'addSequence', 'page_restrictions_pr_id_seq' ),
-
 			# renamed sequences
 			array( 'renameSequence', 'ipblocks_ipb_id_val', 'ipblocks_ipb_id_seq'         ),
 			array( 'renameSequence', 'rev_rev_id_val',      'revision_rev_id_seq'         ),
@@ -79,7 +90,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addTable', 'uploadstash',       'patch-uploadstash.sql' ),
 			array( 'addTable', 'user_former_groups','patch-user_former_groups.sql' ),
 			array( 'addTable', 'config',            'patch-config.sql' ),
-			array( 'addTable', 'external_user','patch-external_user.sql' ),
+			array( 'addTable', 'external_user',     'patch-external_user.sql' ),
 
 			# Needed before new field
 			array( 'convertArchive2' ),
@@ -101,6 +112,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addPgField', 'ipblocks',      'ipb_create_account',   'SMALLINT NOT NULL DEFAULT 1' ),
 			array( 'addPgField', 'ipblocks',      'ipb_deleted',          'SMALLINT NOT NULL DEFAULT 0' ),
 			array( 'addPgField', 'ipblocks',      'ipb_enable_autoblock', 'SMALLINT NOT NULL DEFAULT 1' ),
+			array( 'addPgField', 'ipblocks',      'ipb_parent_block_id',            'INTEGER DEFAULT NULL REFERENCES ipblocks(ipb_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED' ),
 			array( 'addPgField', 'filearchive',   'fa_deleted',           'SMALLINT NOT NULL DEFAULT 0' ),
 			array( 'addPgField', 'logging',       'log_deleted',          'SMALLINT NOT NULL DEFAULT 0' ),
 			array( 'addPgField', 'logging',       'log_id',               "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('logging_log_id_seq')" ),
@@ -152,7 +164,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'changeField', 'image',         'img_size',        'integer',  '' ),
 			array( 'changeField', 'image',         'img_width',       'integer',  '' ),
 			array( 'changeField', 'image',         'img_height',      'integer',  '' ),
-			array( 'changeField', 'interwiki',     'iw_local',        'smallint', 'iw_local::smallint DEFAULT 0' ),
+			array( 'changeField', 'interwiki',     'iw_local',        'smallint', 'iw_local::smallint' ),
 			array( 'changeField', 'interwiki',     'iw_trans',        'smallint', 'iw_trans::smallint DEFAULT 0' ),
 			array( 'changeField', 'ipblocks',      'ipb_auto',        'smallint', 'ipb_auto::smallint DEFAULT 0' ),
 			array( 'changeField', 'ipblocks',      'ipb_anon_only',   'smallint', "CASE WHEN ipb_anon_only=' ' THEN 0 ELSE ipb_anon_only::smallint END DEFAULT 0" ),
@@ -189,9 +201,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'changeNullableField', 'oldimage', 'oi_timestamp',  'NULL' ),
 			array( 'changeNullableField', 'oldimage', 'oi_major_mime', 'NULL' ),
 			array( 'changeNullableField', 'oldimage', 'oi_minor_mime', 'NULL' ),
-			array( 'setDefault', 'image', 'img_metadata', '\'\x\'::bytea'),
 			array( 'changeNullableField', 'image', 'img_metadata', 'NOT NULL'),
-			array( 'setDefault', 'filearchive', 'fa_metadata', '\'\x\'::bytea'),
 			array( 'changeNullableField', 'filearchive', 'fa_metadata', 'NOT NULL'),
 			array( 'changeNullableField', 'recentchanges', 'rc_cur_id', 'NULL' ),
 
@@ -200,6 +210,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			# New indexes
 			array( 'addPgIndex', 'archive',       'archive_user_text',      '(ar_user_text)' ),
 			array( 'addPgIndex', 'image',         'img_sha1',               '(img_sha1)' ),
+			array( 'addPgIndex', 'ipblocks',      'ipb_parent_block_id',              '(ipb_parent_block_id)' ),
 			array( 'addPgIndex', 'oldimage',      'oi_sha1',                '(oi_sha1)' ),
 			array( 'addPgIndex', 'page',          'page_mediawiki_title',   '(page_title) WHERE page_namespace = 8' ),
 			array( 'addPgIndex', 'pagelinks',     'pagelinks_title',        '(pl_title)' ),
@@ -296,6 +307,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'changeFkeyDeferrable', 'imagelinks',       'il_from',         'page(page_id) ON DELETE CASCADE' ),
 			array( 'changeFkeyDeferrable', 'ipblocks',         'ipb_by',          'mwuser(user_id) ON DELETE CASCADE' ),
 			array( 'changeFkeyDeferrable', 'ipblocks',         'ipb_user',        'mwuser(user_id) ON DELETE SET NULL' ),
+			array( 'changeFkeyDeferrable', 'ipblocks',         'ipb_parent_block_id',       'ipblocks(ipb_id) ON DELETE SET NULL' ),
 			array( 'changeFkeyDeferrable', 'langlinks',        'll_from',         'page(page_id) ON DELETE CASCADE' ),
 			array( 'changeFkeyDeferrable', 'logging',          'log_user',        'mwuser(user_id) ON DELETE SET NULL' ),
 			array( 'changeFkeyDeferrable', 'oldimage',         'oi_name',         'image(img_name) ON DELETE CASCADE ON UPDATE CASCADE' ),
@@ -686,7 +698,7 @@ END;
 		}
 	}
 
-	protected function dropIndex( $table, $index ) {
+	protected function dropIndex( $table, $index, $patch = '', $fullpath = false ) {
 		if ( $this->db->indexExists( $table, $index ) ) {
 			$this->output( "Dropping obsolete index '$index'\n" );
 			$this->db->query( "DROP INDEX \"". $index ."\"" );