Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/190651
Change subject: Missing support here for sqlite ...................................................................... Missing support here for sqlite * Some .sql were missing sqlite support. * Converts spaces to tabs in .sql file. Change-Id: I968b0b88233763e80ab9e1aa439518ceb253cc5d --- M backend/schema/mysql/ConfirmAccount.sql M backend/schema/mysql/patch-account_credentials.sql M backend/schema/mysql/patch-acr_agent.sql M backend/schema/mysql/patch-acr_areas.sql M backend/schema/mysql/patch-acr_filename.sql M backend/schema/mysql/patch-email-index.sql 6 files changed, 141 insertions(+), 142 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount refs/changes/51/190651/1 diff --git a/backend/schema/mysql/ConfirmAccount.sql b/backend/schema/mysql/ConfirmAccount.sql index 792e740..486b65e 100644 --- a/backend/schema/mysql/ConfirmAccount.sql +++ b/backend/schema/mysql/ConfirmAccount.sql @@ -6,59 +6,59 @@ -- This stores all of our reviews, -- the corresponding tags are stored in the tag table CREATE TABLE IF NOT EXISTS /*_*/account_requests ( - acr_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, - -- Usernames must be unique, must not be in the form of - -- an IP address. _Shouldn't_ allow slashes or case - -- conflicts. Spaces are allowed, and are _not_ converted - -- to underscores like titles. See the User::newFromName() for - -- the specific tests that usernames have to pass. - acr_name varchar(255) binary NOT NULL default '', - -- Optional 'real name' to be displayed in credit listings - acr_real_name varchar(255) binary NOT NULL default '', - -- Note: email should be restricted, not public info. - -- Same with passwords. - acr_email tinytext NOT NULL, - -- Initially NULL; when a user's e-mail address has been - -- validated by returning with a mailed token, this is - -- set to the current timestamp. - acr_email_authenticated varbinary(14) default NULL, - -- Randomly generated token created when the e-mail address - -- is set and a confirmation test mail sent. - acr_email_token binary(32), - -- Expiration date for the user_email_token - acr_email_token_expires varbinary(14), - -- A little about this user - acr_bio mediumblob NOT NULL, - -- Private info for reviewers to look at when considering request - acr_notes mediumblob NOT NULL, - -- Links to recognize/identify this user, CSV, may not be public - acr_urls mediumblob NOT NULL, - -- IP address - acr_ip VARCHAR(255) NULL default '', - acr_xff VARCHAR(255) NULL default '', - -- User-Agent header - acr_agent VARCHAR(255) NULL default '', - -- Name of attached file (.pdf,.doc,.txt etc...) - acr_filename VARCHAR(255) NULL, - acr_storage_key VARCHAR(64) NULL, - -- Prospective account access level - acr_type tinyint(255) unsigned NOT NULL default 0, - -- Areas of interest - acr_areas mediumblob NOT NULL, + acr_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, + -- Usernames must be unique, must not be in the form of + -- an IP address. _Shouldn't_ allow slashes or case + -- conflicts. Spaces are allowed, and are _not_ converted + -- to underscores like titles. See the User::newFromName() for + -- the specific tests that usernames have to pass. + acr_name varchar(255) binary NOT NULL default '', + -- Optional 'real name' to be displayed in credit listings + acr_real_name varchar(255) binary NOT NULL default '', + -- Note: email should be restricted, not public info. + -- Same with passwords. + acr_email tinytext NOT NULL, + -- Initially NULL; when a user's e-mail address has been + -- validated by returning with a mailed token, this is + -- set to the current timestamp. + acr_email_authenticated varbinary(14) default NULL, + -- Randomly generated token created when the e-mail address + -- is set and a confirmation test mail sent. + acr_email_token binary(32), + -- Expiration date for the user_email_token + acr_email_token_expires varbinary(14), + -- A little about this user + acr_bio mediumblob NOT NULL, + -- Private info for reviewers to look at when considering request + acr_notes mediumblob NOT NULL, + -- Links to recognize/identify this user, CSV, may not be public + acr_urls mediumblob NOT NULL, + -- IP address + acr_ip VARCHAR(255) NULL default '', + acr_xff VARCHAR(255) NULL default '', + -- User-Agent header + acr_agent VARCHAR(255) NULL default '', + -- Name of attached file (.pdf,.doc,.txt etc...) + acr_filename VARCHAR(255) NULL, + acr_storage_key VARCHAR(64) NULL, + -- Prospective account access level + acr_type tinyint(255) unsigned NOT NULL default 0, + -- Areas of interest + acr_areas mediumblob NOT NULL, - -- Timestamp of account registration. - acr_registration varbinary(14) NOT NULL, + -- Timestamp of account registration. + acr_registration varbinary(14) NOT NULL, - -- Flag for rejected accounts - acr_deleted bool NOT NULL, - -- Time of rejection (if rejected) - acr_rejected varbinary(14), - -- Time request was put on hold (if held) - acr_held varbinary(14), - -- The user who rejected/held it - acr_user int unsigned NOT NULL default 0, - -- Reason - acr_comment varchar(255) NOT NULL default '' + -- Flag for rejected accounts + acr_deleted bool NOT NULL, + -- Time of rejection (if rejected) + acr_rejected varbinary(14), + -- Time request was put on hold (if held) + acr_held varbinary(14), + -- The user who rejected/held it + acr_user int unsigned NOT NULL default 0, + -- Reason + acr_comment varchar(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/acr_name ON /*_*/account_requests (acr_name); @@ -69,45 +69,45 @@ -- This stores all of credential information -- When accounts are confirmed, the identity info goes here CREATE TABLE IF NOT EXISTS /*_*/account_credentials ( - -- Revision ID # - acd_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, - -- Foreign key to user.user_id - acd_user_id int unsigned NOT NULL, - -- Optional 'real name' to be displayed in credit listings - acd_real_name varchar(255) binary NOT NULL default '', - -- Note: email should be restricted, not public info. - -- Same with passwords. - acd_email tinytext NOT NULL, - -- Initially NULL; when a user's e-mail address has been - -- validated by returning with a mailed token, this is - -- set to the current timestamp. - acd_email_authenticated varbinary(14) default NULL, - -- A little about this user - acd_bio mediumblob NOT NULL, - -- Private info for reviewers to look at when considering request - acd_notes mediumblob NOT NULL, - -- Links to recognize/identify this user, CSV, may not be public - acd_urls mediumblob NOT NULL, - -- IP address - acd_ip VARCHAR(255) NULL default '', - acd_xff VARCHAR(255) NULL default '', - -- User-Agent header - acd_agent VARCHAR(255) NULL default '', - -- Name of attached file (.pdf,.doc,.txt etc...) - acd_filename VARCHAR(255) NULL, - acd_storage_key VARCHAR(64) NULL, - -- Areas of interest - acd_areas mediumblob NOT NULL, + -- Revision ID # + acd_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, + -- Foreign key to user.user_id + acd_user_id int unsigned NOT NULL, + -- Optional 'real name' to be displayed in credit listings + acd_real_name varchar(255) binary NOT NULL default '', + -- Note: email should be restricted, not public info. + -- Same with passwords. + acd_email tinytext NOT NULL, + -- Initially NULL; when a user's e-mail address has been + -- validated by returning with a mailed token, this is + -- set to the current timestamp. + acd_email_authenticated varbinary(14) default NULL, + -- A little about this user + acd_bio mediumblob NOT NULL, + -- Private info for reviewers to look at when considering request + acd_notes mediumblob NOT NULL, + -- Links to recognize/identify this user, CSV, may not be public + acd_urls mediumblob NOT NULL, + -- IP address + acd_ip VARCHAR(255) NULL default '', + acd_xff VARCHAR(255) NULL default '', + -- User-Agent header + acd_agent VARCHAR(255) NULL default '', + -- Name of attached file (.pdf,.doc,.txt etc...) + acd_filename VARCHAR(255) NULL, + acd_storage_key VARCHAR(64) NULL, + -- Areas of interest + acd_areas mediumblob NOT NULL, - -- Timestamp of account registration. - acd_registration varbinary(14) NOT NULL, + -- Timestamp of account registration. + acd_registration varbinary(14) NOT NULL, - -- Timestamp of acceptance - acd_accepted varbinary(14), - -- The user who accepted it - acd_user int unsigned NOT NULL default 0, - -- Reason given in email - acd_comment varchar(255) NOT NULL default '' + -- Timestamp of acceptance + acd_accepted varbinary(14), + -- The user who accepted it + acd_user int unsigned NOT NULL default 0, + -- Reason given in email + acd_comment varchar(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/acd_user_id ON /*_*/account_credentials (acd_user_id,acd_id); diff --git a/backend/schema/mysql/patch-account_credentials.sql b/backend/schema/mysql/patch-account_credentials.sql index efcf286..c4f0eb1 100644 --- a/backend/schema/mysql/patch-account_credentials.sql +++ b/backend/schema/mysql/patch-account_credentials.sql @@ -1,48 +1,48 @@ -- (c) Aaron Schulz, 2007 -ALTER TABLE /*$wgDBprefix*/account_requests - ADD acr_type tinyint(255) unsigned NOT NULL default 0, - ADD INDEX acr_type_del_reg (acr_type,acr_deleted,acr_registration); +ALTER TABLE /*_*/account_requests ADD acr_type tinyint(255) unsigned NOT NULL default 0; + +ALTER TABLE /*_*/account_requests ADD INDEX acr_type_del_reg (acr_type,acr_deleted,acr_registration); -- This stores all of credential information -- When accounts are confirmed, the identity info goes here CREATE TABLE IF NOT EXISTS /*_*/account_credentials ( - -- Revision ID # - acd_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, - -- Foreign key to user.user_id - acd_user_id int unsigned NOT NULL, - -- Optional 'real name' to be displayed in credit listings - acd_real_name varchar(255) binary NOT NULL default '', - -- Note: email should be restricted, not public info. - -- Same with passwords. - acd_email tinytext NOT NULL, - -- Initially NULL; when a user's e-mail address has been - -- validated by returning with a mailed token, this is - -- set to the current timestamp. - acd_email_authenticated varbinary(14) default NULL, - -- A little about this user - acd_bio mediumblob NOT NULL, - -- Private info for reviewers to look at when considering request - acd_notes mediumblob NOT NULL, - -- Links to recognize/identify this user, CSV, may not be public - acd_urls mediumblob NOT NULL, - -- IP address - acd_ip VARCHAR(255) NULL default '', - -- Name of attached file (.pdf,.doc,.txt etc...) - acd_filename VARCHAR(255) NULL, - acd_storage_key VARCHAR(64) NULL, - -- Areas of interest - acd_areas mediumblob NOT NULL, + -- Revision ID # + acd_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, + -- Foreign key to user.user_id + acd_user_id int unsigned NOT NULL, + -- Optional 'real name' to be displayed in credit listings + acd_real_name varchar(255) binary NOT NULL default '', + -- Note: email should be restricted, not public info. + -- Same with passwords. + acd_email tinytext NOT NULL, + -- Initially NULL; when a user's e-mail address has been + -- validated by returning with a mailed token, this is + -- set to the current timestamp. + acd_email_authenticated varbinary(14) default NULL, + -- A little about this user + acd_bio mediumblob NOT NULL, + -- Private info for reviewers to look at when considering request + acd_notes mediumblob NOT NULL, + -- Links to recognize/identify this user, CSV, may not be public + acd_urls mediumblob NOT NULL, + -- IP address + acd_ip VARCHAR(255) NULL default '', + -- Name of attached file (.pdf,.doc,.txt etc...) + acd_filename VARCHAR(255) NULL, + acd_storage_key VARCHAR(64) NULL, + -- Areas of interest + acd_areas mediumblob NOT NULL, - -- Timestamp of account registration. - acd_registration varbinary(14) NOT NULL, + -- Timestamp of account registration. + acd_registration varbinary(14) NOT NULL, - -- Timestamp of acceptance - acd_accepted varbinary(14), - -- The user who accepted it - acd_user int unsigned NOT NULL default 0, - -- Reason given in email - acd_comment varchar(255) NOT NULL default '' + -- Timestamp of acceptance + acd_accepted varbinary(14), + -- The user who accepted it + acd_user int unsigned NOT NULL default 0, + -- Reason given in email + acd_comment varchar(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/acd_user_id ON /*_*/account_credentials (acd_user_id,acd_id); diff --git a/backend/schema/mysql/patch-acr_agent.sql b/backend/schema/mysql/patch-acr_agent.sql index 4131be9..f466ac8 100644 --- a/backend/schema/mysql/patch-acr_agent.sql +++ b/backend/schema/mysql/patch-acr_agent.sql @@ -1,9 +1,9 @@ -- (c) Aaron Schulz, 2007 -ALTER TABLE /*$wgDBprefix*/account_requests - ADD acr_xff VARCHAR(255) NULL default '', - ADD acr_agent VARCHAR(255) NULL default ''; +ALTER TABLE /*_*/account_requests ADD acr_xff VARCHAR(255) NULL default ''; -ALTER TABLE /*$wgDBprefix*/account_credentials - ADD acd_xff VARCHAR(255) NULL default '', - ADD acd_agent VARCHAR(255) NULL default ''; +ALTER TABLE /*_*/account_requests ADD acr_agent VARCHAR(255) NULL default ''; + +ALTER TABLE /*_*/account_credentials ADD acd_xff VARCHAR(255) NULL default ''; + +ALTER TABLE /*_*/account_credentials ADD acd_agent VARCHAR(255) NULL default ''; diff --git a/backend/schema/mysql/patch-acr_areas.sql b/backend/schema/mysql/patch-acr_areas.sql index f9de594..03c9e7c 100644 --- a/backend/schema/mysql/patch-acr_areas.sql +++ b/backend/schema/mysql/patch-acr_areas.sql @@ -1,7 +1,5 @@ -- (c) Aaron Schulz, 2007 -ALTER TABLE /*$wgDBprefix*/account_requests - ADD acr_areas mediumblob NOT NULL; +ALTER TABLE /*_*/account_requests ADD acr_areas mediumblob NOT NULL default ''; -ALTER TABLE /*$wgDBprefix*/account_credentials - ADD acd_areas mediumblob NOT NULL; +ALTER TABLE /*_*/account_credentials ADD acd_areas mediumblob NOT NULL default ''; diff --git a/backend/schema/mysql/patch-acr_filename.sql b/backend/schema/mysql/patch-acr_filename.sql index 3ab88b8..00e9afb 100644 --- a/backend/schema/mysql/patch-acr_filename.sql +++ b/backend/schema/mysql/patch-acr_filename.sql @@ -1,7 +1,9 @@ -- (c) Aaron Schulz, 2007 -ALTER TABLE /*$wgDBprefix*/account_requests - ADD acr_filename VARCHAR(255) NULL, - ADD acr_storage_key VARCHAR(64) NULL, - ADD acr_held binary(14), - ADD acr_comment VARCHAR(255) NULL; +ALTER TABLE /*_*/account_requests ADD acr_filename VARCHAR(255) NULL default ''; + +ALTER TABLE /*_*/account_requests ADD acr_storage_key VARCHAR(64) NULL default ''; + +ALTER TABLE /*_*/account_requests ADD acr_held binary(14) default ''; + +ALTER TABLE /*_*/account_requests ADD acr_comment VARCHAR(255) NULL default ''; diff --git a/backend/schema/mysql/patch-email-index.sql b/backend/schema/mysql/patch-email-index.sql index 74fd8f5..ff08db9 100644 --- a/backend/schema/mysql/patch-email-index.sql +++ b/backend/schema/mysql/patch-email-index.sql @@ -1,4 +1,3 @@ -- (c) Aaron Schulz, 2007 -ALTER TABLE /*$wgDBprefix*/account_requests - ADD UNIQUE INDEX acr_email(acr_email(255)); +ALTER TABLE /*_*/account_requests ADD UNIQUE INDEX acr_email(acr_email(255)); -- To view, visit https://gerrit.wikimedia.org/r/190651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I968b0b88233763e80ab9e1aa439518ceb253cc5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmAccount Gerrit-Branch: master Gerrit-Owner: Paladox <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
