From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Thu, 26 Apr 2018 18:52:12 +0000 (-0400)
Subject: Fix typo in postgres patch-drop-ar_text.sql
X-Git-Tag: 1.31.2~95
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=590e94d474fdb1ea9daa3d96ace797d6d4108b60

Fix typo in postgres patch-drop-ar_text.sql

I18f1c740 was cherry-picked to REL1_31 but it was broken.
Before that got merged to REL1_31, this was already in master,
but apparently that was missed when cherry-picking.
This should have made 1.31-rc.2.

Bug: T205967
Change-Id: I6d479d123848325b8501275ef4b98fc81cd99505
(cherry picked from commit 7e685a395d4a6e69d904c03f6e847b18795217a9)
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index b6c2a66a21..24e42e9f70 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -5,6 +5,7 @@ THIS IS NOT A RELEASE YET
 === Changes since MediaWiki 1.31.1 ===
 * (T204729) WatchedItemStore::countVisitingWatchersMultiple() shouldn't query all
   titles when asked for none
+* (T205967) Fix syntax error typo in postgres database upgrade file.
 
 == MediaWiki 1.31.1 ==
 
diff --git a/maintenance/postgres/archives/patch-drop-ar_text.sql b/maintenance/postgres/archives/patch-drop-ar_text.sql
index a2e8e416a9..bd0a6b815e 100644
--- a/maintenance/postgres/archives/patch-drop-ar_text.sql
+++ b/maintenance/postgres/archives/patch-drop-ar_text.sql
@@ -4,5 +4,5 @@
 ALTER TABLE archive
   DROP COLUMN ar_text,
   DROP COLUMN ar_flags,
-  ALTER COLUMN ar_text_id SET DEFAULT 0;
+  ALTER COLUMN ar_text_id SET DEFAULT 0,
   ALTER COLUMN ar_text_id SET NOT NULL;