Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238007
Change subject: Update sql to support mysql
......................................................................
Update sql to support mysql
It had a mix of postgresql and mysql which would cause none of it to work
in mysql.
Change-Id: I0ac5442f3f32d90d043230f28f81e809376a0cd5
---
M interwikiintegration-iwlinks.sql
M interwikiintegration-namespace.sql
M interwikiintegration-prefix.sql
M interwikiintegration-recentchanges.sql
M interwikiintegration-watchlist.sql
5 files changed, 21 insertions(+), 39 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiIntegration
refs/changes/07/238007/1
diff --git a/interwikiintegration-iwlinks.sql b/interwikiintegration-iwlinks.sql
index 690ff9d..c4fab58 100644
--- a/interwikiintegration-iwlinks.sql
+++ b/interwikiintegration-iwlinks.sql
@@ -1,7 +1,6 @@
-BEGIN;
-- Track all interwiki links on all wikis in this farm
-CREATE TABLE integration_iwlinks (
+CREATE TABLE /*_*/integration_iwlinks (
-- integration_dbname of the referring wiki
integration_iwl_from_db varchar(255) binary NOT NULL,
@@ -9,16 +8,13 @@
integration_iwl_from int unsigned NOT NULL default 0,
-- URL of the referring page
- integration_iwl_from_url varchar(511) binary NOT NULL default '',
+ integration_iwl_from_url varchar(255) binary NOT NULL default '',
-- Interwiki prefix code of the target
integration_iwl_prefix varbinary(20) NOT NULL default '',
-- Title of the target, including namespace
integration_iwl_title varchar(255) binary NOT NULL default ''
-)
-CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
+) /*$wgDBTableOptions*/;
+
-- Index to be created when it becomes evident what searches are most common
-
-COMMIT;
\ No newline at end of file
diff --git a/interwikiintegration-namespace.sql
b/interwikiintegration-namespace.sql
index c4d288f..b8969b0 100644
--- a/interwikiintegration-namespace.sql
+++ b/interwikiintegration-namespace.sql
@@ -1,17 +1,13 @@
-BEGIN;
-CREATE TABLE integration_namespace (
+CREATE TABLE /*_*/integration_namespace (
-- Just a meaningless primary key
integration_namespace_id int UNSIGNED NOT NULL PRIMARY KEY
AUTO_INCREMENT,
-- Database of namespace's wiki
- integration_dbname varchar(256) binary NOT NULL,
+ integration_dbname varchar(255) binary NOT NULL,
-- Same as page_namespace
integration_namespace_index int NOT NULL,
-- E.g., "File" for namespace_index 6
- integration_namespace_title varchar(256) binary NOT NULL
-)
-CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+ integration_namespace_title varchar(255) binary NOT NULL
+) /*$wgDBTableOptions*/;
-- Index to be created when it becomes evident what searches are most common
-
-COMMIT;
\ No newline at end of file
diff --git a/interwikiintegration-prefix.sql b/interwikiintegration-prefix.sql
index fd6dfa5..c99fae8 100644
--- a/interwikiintegration-prefix.sql
+++ b/interwikiintegration-prefix.sql
@@ -1,16 +1,12 @@
-BEGIN;
-- Track prefixes of local wikis, for foreign wikis' benefit; probably soon to
be deprecated
-CREATE TABLE integration_prefix (
+CREATE TABLE /*_*/integration_prefix (
-- Wiki prefix
integration_prefix varchar(255) binary NOT NULL PRIMARY
KEY,
-- Wiki database name
integration_dbname varchar(255) binary NOT NULL,
-- Does this wiki use pure wiki deletion?
integration_pwd tinyint unsigned NOT NULL default 0
-)
-CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+) /*$wgDBTableOptions*/;
-- Index to be created when it becomes evident what searches are most common
-
-COMMIT;
\ No newline at end of file
diff --git a/interwikiintegration-recentchanges.sql
b/interwikiintegration-recentchanges.sql
index 236230a..a124be1 100644
--- a/interwikiintegration-recentchanges.sql
+++ b/interwikiintegration-recentchanges.sql
@@ -1,4 +1,3 @@
-BEGIN;
--
-- Primarily a summary table for Special:InterwikiRecentchanges,
@@ -80,12 +79,10 @@
integration_rc_params blob NULL
) /*$wgDBTableOptions*/;
-CREATE INDEX /*i*/integration_rc_timestamp ON integration_recentchanges
(integration_rc_timestamp);
-CREATE INDEX /*i*/integration_rc_namespace_title ON integration_recentchanges
(integration_rc_namespace, integration_rc_title);
-CREATE INDEX /*i*/integration_rc_cur_id ON integration_recentchanges
(integration_rc_cur_id);
-CREATE INDEX /*i*/integration_new_name_timestamp ON integration_recentchanges
(integration_rc_new,integration_rc_namespace,integration_rc_timestamp);
-CREATE INDEX /*i*/integration_rc_ip ON integration_recentchanges
(integration_rc_ip);
-CREATE INDEX /*i*/integration_rc_ns_usertext ON integration_recentchanges
(integration_rc_namespace, integration_rc_user_text);
-CREATE INDEX /*i*/integration_rc_user_text ON integration_recentchanges
(integration_rc_user_text, integration_rc_timestamp);
-
-COMMIT;
\ No newline at end of file
+CREATE INDEX /*i*/integration_rc_timestamp ON /*_*/integration_recentchanges
(integration_rc_timestamp);
+CREATE INDEX /*i*/integration_rc_namespace_title ON
/*_*/integration_recentchanges (integration_rc_namespace, integration_rc_title);
+CREATE INDEX /*i*/integration_rc_cur_id ON /*_*/integration_recentchanges
(integration_rc_cur_id);
+CREATE INDEX /*i*/integration_new_name_timestamp ON
/*_*/integration_recentchanges
(integration_rc_new,integration_rc_namespace,integration_rc_timestamp);
+CREATE INDEX /*i*/integration_rc_ip ON /*_*/integration_recentchanges
(integration_rc_ip);
+CREATE INDEX /*i*/integration_rc_ns_usertext ON /*_*/integration_recentchanges
(integration_rc_namespace, integration_rc_user_text);
+CREATE INDEX /*i*/integration_rc_user_text ON /*_*/integration_recentchanges
(integration_rc_user_text, integration_rc_timestamp);
diff --git a/interwikiintegration-watchlist.sql
b/interwikiintegration-watchlist.sql
index b1857f4..008b6ae 100644
--- a/interwikiintegration-watchlist.sql
+++ b/interwikiintegration-watchlist.sql
@@ -1,6 +1,5 @@
-BEGIN;
-CREATE TABLE integration_watchlist (
+CREATE TABLE /*_*/integration_watchlist (
-- Key to user.user_id
integration_wl_user int unsigned NOT NULL,
-- Database name of the wiki
@@ -12,9 +11,7 @@
-- Timestamp when user was last sent a notification e-mail;
-- cleared when the user visits the page.
integration_wl_notificationtimestamp varbinary(14)
-);
+) /*$wgDBTableOptions*/;
-CREATE UNIQUE INDEX integration_wl_user ON integration_watchlist
(integration_wl_user, integration_wl_namespace, integration_wl_title,
integration_wl_db );
-CREATE INDEX integration_namespace_title ON integration_watchlist
(integration_wl_namespace, integration_wl_title );
-
-COMMIT;
+CREATE UNIQUE INDEX /*i*/integration_wl_user ON /*_*/integration_watchlist
(integration_wl_user, integration_wl_namespace, integration_wl_title,
integration_wl_db );
+CREATE INDEX /*i*/integration_namespace_title ON /*_*/integration_watchlist
(integration_wl_namespace, integration_wl_title );
--
To view, visit https://gerrit.wikimedia.org/r/238007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ac5442f3f32d90d043230f28f81e809376a0cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
