dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- new import for static "region"/"constellation" universe data #515

Browse Source 
- refactored DB connection handling
- removed build.js (RequireJs is now handled by Gulp task)
This commit is contained in:
Exodus4D
2017-07-30 15:34:32 +02:00
parent ab35a916a0
commit d00e550972
10 changed files with 245 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/main/controller/setup.php
View File

@@ -95,6 +95,15 @@ class Setup extends Controller {
],
'tables' => []
],
/* WIP ...
'UNIVERSE' => [
'info' => [],
'models' => [
'Model\Universe\RegionModel',
'Model\Universe\ConstellationModel'
],
'tables' => []
], */
'CCP' => [
'info' => [],
'models' => [],
@@ -596,8 +605,6 @@ class Setup extends Controller {
foreach($this->databases as $dbKey => $dbData){
$dbLabel = '';
$dbName = '';
$dbUser = '';
$dbConfig = [];
// DB connection status
@@ -612,26 +619,25 @@ class Setup extends Controller {
$dbColumnQueries = [];
// tables that should exist in this DB
$requiredTables = [];
// get DB config
$dbConfigValues = Config::getDatabaseConfig($dbKey);
// check DB for valid connection
$db = DB\Database::instance()->getDB($dbKey);
// check config that does NOT require a valid DB connection
switch($dbKey){
case 'PF':
$dbLabel = 'Pathfinder';
$dbName = Controller::getEnvironmentData('DB_NAME');
$dbUser = Controller::getEnvironmentData('DB_USER');
break;
case 'CCP':
$dbLabel = 'EVE-Online [SDE]';
$dbName = Controller::getEnvironmentData('DB_CCP_NAME');
$dbUser = Controller::getEnvironmentData('DB_CCP_USER');
break;
case 'PF': $dbLabel = 'Pathfinder'; break;
case 'UNIVERSE': $dbLabel = 'EVE-Online universe'; break;
case 'CCP': $dbLabel = 'EVE-Online [SDE]'; break;
}
$dbName = $dbConfigValues['NAME'];
$dbUser = $dbConfigValues['USER'];
if($db){
switch($dbKey){
case 'PF':
case 'UNIVERSE':
// enable (table) setup for this DB
$dbSetupEnable = true;
@@ -854,10 +860,6 @@ class Setup extends Controller {
$dbStatusCheckCount++;
}
if($exec){
$f3->reroute('@setup');
}
if($dbStatusCheckCount !== 0){
$this->databaseCheck = false;
}
@@ -880,6 +882,10 @@ class Setup extends Controller {
];
}
if($exec){
$f3->reroute('@setup');
}
return $this->databases;
}
@@ -956,7 +962,7 @@ class Setup extends Controller {
// setup tables
foreach($this->databases[$dbKey]['models'] as $modelClass){
$checkTables[] = call_user_func($modelClass . '::setup');
$checkTables[] = call_user_func($modelClass . '::setup', $db);
}
}
return $checkTables;