[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Drop index oi_name_archive_name on table oldimage in MSSQL

2017-03-31 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345339 )

Change subject: Drop index oi_name_archive_name on table oldimage in MSSQL
..


Drop index oi_name_archive_name on table oldimage in MSSQL

The index is too long, causes install to fail on MSSQL

Bug: T145635
Change-Id: I7d1c534ec69bfac7d63514993d3f8429a6121592
---
M RELEASE-NOTES-1.27
M includes/installer/MssqlUpdater.php
A maintenance/mssql/archives/patch-alter-table-oldimage.sql
M maintenance/mssql/tables.sql
4 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 1887d86..5193e51 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -20,6 +20,7 @@
   in the query string is now deprecated and outputs a warning. They should be
   submitted in the POST body instead.
 * (T158766) Avoid SQL error on MSSQL when using selectRowCount()
+* (T145635) Fix too long index error when installing with MSSQL.
 
 == MediaWiki 1.27.1 ==
 
diff --git a/includes/installer/MssqlUpdater.php 
b/includes/installer/MssqlUpdater.php
index accc42f..6d4f607 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -87,7 +87,10 @@
[ 'updateSchema', 'recentchanges', 
'recentchanges-drop-fks',
'patch-recentchanges-drop-fks.sql' ],
[ 'updateSchema', 'logging', 'logging-drop-fks', 
'patch-logging-drop-fks.sql' ],
-   [ 'updateSchema', 'archive', 'archive-drop-fks', 
'patch-archive-drop-fks.sql' ]
+   [ 'updateSchema', 'archive', 'archive-drop-fks', 
'patch-archive-drop-fks.sql' ],
+   // 1.29.0, 1.28.1, 1.27.2
+   [ 'dropIndex', 'oldimage', 'oi_name_archive_name',
+   'patch-alter-table-oldimage.sql' ],
];
}
 
diff --git a/maintenance/mssql/archives/patch-alter-table-oldimage.sql 
b/maintenance/mssql/archives/patch-alter-table-oldimage.sql
new file mode 100644
index 000..fb31d6a
--- /dev/null
+++ b/maintenance/mssql/archives/patch-alter-table-oldimage.sql
@@ -0,0 +1 @@
+DROP INDEX /*i*/oi_name_archive_name ON /*_*/oldimage;
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 12cfed8..c05dbbe 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -652,7 +652,6 @@
 
 CREATE INDEX /*i*/oi_usertext_timestamp ON /*_*/oldimage 
(oi_user_text,oi_timestamp);
 CREATE INDEX /*i*/oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp);
-CREATE INDEX /*i*/oi_name_archive_name ON /*_*/oldimage 
(oi_name,oi_archive_name);
 CREATE INDEX /*i*/oi_sha1 ON /*_*/oldimage (oi_sha1);
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/345339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d1c534ec69bfac7d63514993d3f8429a6121592
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Skizzerz 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Drop index oi_name_archive_name on table oldimage in MSSQL

2017-03-29 Thread Brian Wolff (Code Review)
Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345339 )

Change subject: Drop index oi_name_archive_name on table oldimage in MSSQL
..

Drop index oi_name_archive_name on table oldimage in MSSQL

The index is too long, causes install to fail on MSSQL

Bug: T145635
Change-Id: I7d1c534ec69bfac7d63514993d3f8429a6121592
---
M RELEASE-NOTES-1.27
M includes/installer/MssqlUpdater.php
A maintenance/mssql/archives/patch-alter-table-oldimage.sql
M maintenance/mssql/tables.sql
4 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/345339/1

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 1887d86..5193e51 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -20,6 +20,7 @@
   in the query string is now deprecated and outputs a warning. They should be
   submitted in the POST body instead.
 * (T158766) Avoid SQL error on MSSQL when using selectRowCount()
+* (T145635) Fix too long index error when installing with MSSQL.
 
 == MediaWiki 1.27.1 ==
 
diff --git a/includes/installer/MssqlUpdater.php 
b/includes/installer/MssqlUpdater.php
index accc42f..373ac58 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -88,6 +88,9 @@
'patch-recentchanges-drop-fks.sql' ],
[ 'updateSchema', 'logging', 'logging-drop-fks', 
'patch-logging-drop-fks.sql' ],
[ 'updateSchema', 'archive', 'archive-drop-fks', 
'patch-archive-drop-fks.sql' ]
+   // 1.29.0, 1.28.1, 1.27.2
+   [ 'dropIndex', 'oldimage', 'oi_name_archive_name',
+   'patch-alter-table-oldimage.sql' ],
];
}
 
diff --git a/maintenance/mssql/archives/patch-alter-table-oldimage.sql 
b/maintenance/mssql/archives/patch-alter-table-oldimage.sql
new file mode 100644
index 000..fb31d6a
--- /dev/null
+++ b/maintenance/mssql/archives/patch-alter-table-oldimage.sql
@@ -0,0 +1 @@
+DROP INDEX /*i*/oi_name_archive_name ON /*_*/oldimage;
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 12cfed8..c05dbbe 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -652,7 +652,6 @@
 
 CREATE INDEX /*i*/oi_usertext_timestamp ON /*_*/oldimage 
(oi_user_text,oi_timestamp);
 CREATE INDEX /*i*/oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp);
-CREATE INDEX /*i*/oi_name_archive_name ON /*_*/oldimage 
(oi_name,oi_archive_name);
 CREATE INDEX /*i*/oi_sha1 ON /*_*/oldimage (oi_sha1);
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/345339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d1c534ec69bfac7d63514993d3f8429a6121592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits