EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199680
Change subject: Increase length of *_wiki fields to 64
......................................................................
Increase length of *_wiki fields to 64
This fixes a Jenkins failure.
Also, until this is deployed to WMF production, we can't deploy to any
wikis with a DB name longer than 16 characters.
Bug: T93463
Change-Id: I5e30d72dcade9e13703bab06e3756944c5314b56
(cherry picked from commit 10bd5b111d423f8ac8479241d40009c7c384ab88)
---
M Hooks.php
A db_patches/patch-increase_width_wiki_fields.sql
M flow.sql
3 files changed, 20 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/80/199680/1
diff --git a/Hooks.php b/Hooks.php
index 43080da..de4af73 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -134,6 +134,9 @@
$updater->modifyExtensionField( 'flow_workflow',
'workflow_id', "$dir/db_patches/patch-88bit_uuids.sql" );
$updater->addExtensionField( 'flow_workflow',
'workflow_type', "$dir/db_patches/patch-add_workflow_type.sql" );
$updater->modifyExtensionField( 'flow_workflow',
'workflow_user_id', "$dir/db_patches/patch-default_null_workflow_user.sql" );
+
+ // Doesn't need SQLite support, since SQLite doesn't
care about text widths.
+ $updater->modifyExtensionField( 'flow_workflow',
'workflow_wiki', "$dir/db_patches/patch-increase_width_wiki_fields.sql" );
}
$updater->addExtensionIndex( 'flow_workflow',
'flow_workflow_lookup', "$dir/db_patches/patch-workflow_lookup_idx.sql" );
diff --git a/db_patches/patch-increase_width_wiki_fields.sql
b/db_patches/patch-increase_width_wiki_fields.sql
new file mode 100644
index 0000000..9b0d499
--- /dev/null
+++ b/db_patches/patch-increase_width_wiki_fields.sql
@@ -0,0 +1,11 @@
+-- This patch doesn't need to be SQLite compatible (or re-implemented
+-- for SQLite) since SQLite doesn't care about column widths anyway.
+ALTER TABLE /*_*/flow_workflow MODIFY workflow_wiki varchar(64) binary not
null;
+
+ALTER TABLE /*_*/flow_subscription MODIFY subscription_user_wiki varchar(64)
binary not null;
+
+ALTER TABLE /*_*/flow_tree_revision MODIFY tree_orig_user_wiki varchar(64)
binary not null;
+
+ALTER TABLE /*_*/flow_revision MODIFY rev_user_wiki varchar(64) binary not
null,
+ MODIFY rev_mod_user_wiki varchar(64) binary
default null,
+ MODIFY rev_edit_user_wiki varchar(64) binary
default null;
diff --git a/flow.sql b/flow.sql
index a4ff522..d6ea56a 100644
--- a/flow.sql
+++ b/flow.sql
@@ -3,7 +3,7 @@
CREATE TABLE /*_*/flow_workflow (
workflow_id binary(11) not null,
- workflow_wiki varchar(16) binary not null,
+ workflow_wiki varchar(64) binary not null,
workflow_namespace int not null,
workflow_page_id int unsigned not null,
workflow_title_text varchar(255) binary not null,
@@ -21,7 +21,7 @@
CREATE TABLE /*_*/flow_subscription (
subscription_workflow_id int unsigned not null,
subscription_user_id bigint unsigned not null,
- subscription_user_wiki varchar(32) binary not null,
+ subscription_user_wiki varchar(64) binary not null,
subscription_create_timestamp varchar(14) binary not null,
subscription_last_updated varchar(14) binary not null
) /*$wgDBTableOptions*/;
@@ -48,7 +48,7 @@
-- denormalized so we don't need to keep finding the first revision of
a post
tree_orig_user_id bigint unsigned not null,
tree_orig_user_ip varbinary(39) default null,
- tree_orig_user_wiki varchar(32) binary not null,
+ tree_orig_user_wiki varchar(64) binary not null,
-- denormalize post parent as well? Prevents an extra query when
building
-- tree from closure table. unnecessary?
tree_parent_id binary(11),
@@ -82,7 +82,7 @@
-- user id creating the revision
rev_user_id bigint unsigned not null,
rev_user_ip varbinary(39) default null,
- rev_user_wiki varchar(32) binary not null,
+ rev_user_wiki varchar(64) binary not null,
-- rev_id of parent or null if no previous revision
rev_parent_id binary(11) null,
-- comma separated set of ascii flags.
@@ -97,7 +97,7 @@
-- moderated by who?
rev_mod_user_id bigint unsigned,
rev_mod_user_ip varbinary(39) default null,
- rev_mod_user_wiki varchar(32) binary default null,
+ rev_mod_user_wiki varchar(64) binary default null,
rev_mod_timestamp varchar(14) binary,
-- moderated why? (coming soon: how?, where? and what?)
rev_mod_reason varchar(255) binary,
@@ -106,7 +106,7 @@
rev_last_edit_id binary(11) null,
rev_edit_user_id bigint unsigned,
rev_edit_user_ip varbinary(39) default null,
- rev_edit_user_wiki varchar(32) binary default null,
+ rev_edit_user_wiki varchar(64) binary default null,
rev_content_length int not null default 0,
rev_previous_content_length int not null default 0,
--
To view, visit https://gerrit.wikimedia.org/r/199680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e30d72dcade9e13703bab06e3756944c5314b56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.25wmf22
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
