From 6f3d15bb82775a964fab027042f93476fc60c025 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 13 Aug 2012 17:10:51 -0700 Subject: [PATCH] Remove hard-coded tests against 'phabricator' namespace in setup 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 --- src/infrastructure/PhabricatorSetup.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/PhabricatorSetup.php b/src/infrastructure/PhabricatorSetup.php index 43e7a1366d..3139615437 100644 --- a/src/infrastructure/PhabricatorSetup.php +++ b/src/infrastructure/PhabricatorSetup.php @@ -512,9 +512,11 @@ final class PhabricatorSetup { self::write(" okay InnoDB is available.\n"); } + $namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace'); + $databases = queryfx_all($conn_raw, 'SHOW DATABASES'); $databases = ipull($databases, 'Database', 'Database'); - if (empty($databases['phabricator_meta_data'])) { + if (empty($databases[$namespace.'_meta_data'])) { self::writeFailure(); self::write( "Setup failure! You haven't run 'bin/storage upgrade'. See this ". @@ -541,7 +543,7 @@ final class PhabricatorSetup { "\n". "Then optionally run:\n". "\n". - " REPAIR TABLE phabricator_search.search_documentfield QUICK;\n". + " REPAIR TABLE {$namespace}_search.search_documentfield QUICK;\n". "\n". "...to reindex existing documents."); }