minsoochoo/phorge
minsoochoo/phorge
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove hard-coded tests against 'phabricator' namespace in setup

Browse source 
Summary: See https://github.com/facebook/arcanist/issues/49

Test Plan:
  - Turned on setup mode with non-default namespace.
  - Verified that setup tests passed.

Reviewers: btrahan, vrana

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D3274
This commit is contained in:
epriestley 2012-08-13 17:10:51 -07:00
parent 7bb3c39cde
commit 6f3d15bb82
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/infrastructure/PhabricatorSetup.php
View file

@ -512,9 +512,11 @@ final class PhabricatorSetup {
self::write(" okay InnoDB is available.\n"); self::write(" okay InnoDB is available.\n");
} }
$namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace');
$databases = queryfx_all($conn_raw, 'SHOW DATABASES'); $databases = queryfx_all($conn_raw, 'SHOW DATABASES');
$databases = ipull($databases, 'Database', 'Database'); $databases = ipull($databases, 'Database', 'Database');
if (empty($databases['phabricator_meta_data'])) { if (empty($databases[$namespace.'_meta_data'])) {
self::writeFailure(); self::writeFailure();
self::write( self::write(
"Setup failure! You haven't run 'bin/storage upgrade'. See this ". "Setup failure! You haven't run 'bin/storage upgrade'. See this ".
@ -541,7 +543,7 @@ final class PhabricatorSetup {
"\n". "\n".
"Then optionally run:\n". "Then optionally run:\n".
"\n". "\n".
" REPAIR TABLE phabricator_search.search_documentfield QUICK;\n". " REPAIR TABLE {$namespace}_search.search_documentfield QUICK;\n".
"\n". "\n".
"...to reindex existing documents."); "...to reindex existing documents.");
} }