From: Reedy <reedy@wikimedia.org>
Date: Sun, 30 Jun 2019 16:47:53 +0000 (+0100)
Subject: Fix SQLite patch-(page|template)links-fix-pk.sql column order
X-Git-Tag: 1.31.3~2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=c99e9beff7d7c1a5a48f8d6f869a42425021c62b

Fix SQLite patch-(page|template)links-fix-pk.sql column order

Bug: T202211
Change-Id: Ife673b88c23acdc1bfc04630715d18243471035f
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 08871c4352..deecada99e 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -3,6 +3,7 @@
 THIS IS NOT A RELEASE YET
 
 === Changes since MediaWiki 1.31.2 ===
+* (T202211) Fix SQLite patch-(image|page|template)links-fix-pk.sql column order.
 
 == MediaWiki 1.31.2 ==
 
diff --git a/maintenance/sqlite/archives/patch-pagelinks-fix-pk.sql b/maintenance/sqlite/archives/patch-pagelinks-fix-pk.sql
index 0e845865dc..40fd51fad5 100644
--- a/maintenance/sqlite/archives/patch-pagelinks-fix-pk.sql
+++ b/maintenance/sqlite/archives/patch-pagelinks-fix-pk.sql
@@ -13,8 +13,8 @@ CREATE TABLE /*_*/pagelinks_tmp (
   PRIMARY KEY (pl_from,pl_namespace,pl_title)
 ) /*$wgDBTableOptions*/;
 
-INSERT INTO /*_*/pagelinks_tmp
-	SELECT * FROM /*_*/pagelinks;
+INSERT INTO /*_*/pagelinks_tmp (pl_from, pl_from_namespace, pl_namespace, pl_title)
+	SELECT pl_from, pl_from_namespace, pl_namespace, pl_title FROM /*_*/pagelinks;
 
 DROP TABLE /*_*/pagelinks;
 
diff --git a/maintenance/sqlite/archives/patch-templatelinks-fix-pk.sql b/maintenance/sqlite/archives/patch-templatelinks-fix-pk.sql
index 5f09f60d3a..e9bbab8e9c 100644
--- a/maintenance/sqlite/archives/patch-templatelinks-fix-pk.sql
+++ b/maintenance/sqlite/archives/patch-templatelinks-fix-pk.sql
@@ -13,8 +13,8 @@ CREATE TABLE /*_*/templatelinks_tmp (
   PRIMARY KEY (tl_from,tl_namespace,tl_title)
 ) /*$wgDBTableOptions*/;
 
-INSERT INTO /*_*/templatelinks_tmp
-	SELECT * FROM /*_*/templatelinks;
+INSERT INTO /*_*/templatelinks_tmp (tl_from, tl_from_namespace, tl_namespace, tl_title)
+	SELECT tl_from, tl_from_namespace, tl_namespace, tl_title FROM /*_*/templatelinks;
 
 DROP TABLE /*_*/templatelinks;