From 1a64e04680364b06f2b6c433608f724bfa56ff5c Mon Sep 17 00:00:00 2001
From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Thu, 29 Mar 2007 12:54:16 +0000
Subject: [PATCH] Restore archive table before we check columns, per report
 from kreegee on #mediawiki

---
 maintenance/updaters.inc | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 602be544ce..af6b192a1e 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1243,6 +1243,22 @@ function do_postgres_updates() {
 		dbsource(archive($nt[1]));
 	}
 
+	## Needed before newcols
+	if ($wgDatabase->tableExists("archive2")) {
+		echo "... convert archive2 back to normal archive table\n";
+		if ($wgDatabase->ruleExists("archive", "archive_insert")) {
+			echo "...   drop rule archive_insert\n";
+			$wgDatabase->query("DROP RULE archive_insert ON archive");
+		}
+		if ($wgDatabase->ruleExists("archive", "archive_delete")) {
+			echo "...   drop rule archive_delete\n";
+			$wgDatabase->query("DROP RULE archive_delete ON archive");
+		}
+
+		dbsource(archive("patch-remove-archive2.sql"));
+	} else
+		echo "... obsolete archive2 not present\n";
+
 	foreach ($newcols as $nc) {
 		$fi = $wgDatabase->fieldInfo($nc[0], $nc[1]);
 		if (!is_null($fi)) {
@@ -1322,21 +1338,6 @@ function do_postgres_updates() {
 		dbsource(archive('patch-revision_rev_user_fkey.sql'));
 	}
 
-	if ($wgDatabase->tableExists("archive2")) {
-		echo "... convert archive2 back to normal archive table\n";
-		if ($wgDatabase->ruleExists("archive", "archive_insert")) {
-			echo "...   drop rule archive_insert\n";
-			$wgDatabase->query("DROP RULE archive_insert ON archive");
-		}
-		if ($wgDatabase->ruleExists("archive", "archive_delete")) {
-			echo "...   drop rule archive_delete\n";
-			$wgDatabase->query("DROP RULE archive_delete ON archive");
-		}
-
-		dbsource(archive("patch-remove-archive2.sql"));
-	} else
-		echo "... obsolete archive2 not present\n";
-
 	if (is_null($wgDatabase->fieldInfo("archive", "ar_deleted"))) {
 		echo "... add archive.ar_deleted\n";
 		dbsource(archive("patch-archive-ar_deleted.sql"));
-- 
2.20.1