revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 12:52:42 +01:00
Code Issues Releases Wiki Activity

Fix an issue with corpus columns in Quickstart

Browse source 
Summary: Fixes T7050. I got the regexp slightly wrong and didn't catch it because it works fine on modern MySQL.

Test Plan: `arc unit --everything` still passes.

Reviewers: btrahan, chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T7050

Differential Revision: https://secure.phabricator.com/D11522
This commit is contained in:
epriestley 2015-01-27 06:30:36 -08:00
parent 1028afd89e
commit 95fab5ee4f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/sql/quickstart.sql
View file

File diff suppressed because one or more lines are too long

4
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php
View file

@ -87,9 +87,9 @@ final class PhabricatorStorageManagementQuickstartWorkflow
// possible NOT NULL at the end of the line. // possible NOT NULL at the end of the line.
$old = $dump; $old = $dump;
$dump = preg_replace( $dump = preg_replace(
'/`corpus` longtext CHARACTER SET .*? COLLATE \S+,/mi', '/`corpus` longtext CHARACTER SET .*? COLLATE [^\s,]+/mi',
'`corpus` longtext CHARACTER SET {$CHARSET_FULLTEXT} '. '`corpus` longtext CHARACTER SET {$CHARSET_FULLTEXT} '.
'COLLATE {$COLLATE_FULLTEXT},', 'COLLATE {$COLLATE_FULLTEXT}',
$dump); $dump);
if ($dump == $old) { if ($dump == $old) {
// If we didn't make any changes, yell about it. We'll produce an invalid // If we didn't make any changes, yell about it. We'll produce an invalid