devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

refac,wip: GeneralQueryMode 분리

Browse Source 
- GeneralQueryMode - General 생성용
- GeneralLiteQueryMode - GeneralLite 생성용
- 이를 통해 확실한 에러 메시지를 내줄 것으로..
This commit is contained in:
Hide_D
2023-08-01 16:28:29 +00:00
parent 6b91a800fa
commit 29273d7a8b
6 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/GeneralBase.php
+8 -7
View File
@@ -4,6 +4,7 @@ namespace sammo;
use Ds\Map;
use sammo\Enums\GeneralAccessLogColumn;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\Enums\GeneralQueryMode;
use sammo\Enums\RankColumn;
@@ -145,7 +146,7 @@ abstract class GeneralBase
abstract function applyDB($db): bool;
static public function mergeQueryColumn(?array $reqColumns = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array
static public function mergeQueryColumn(?array $reqColumns = null, GeneralQueryMode|GeneralLiteQueryMode $queryMode = GeneralQueryMode::Full): array
{
$minimumColumn = ['no', 'name', 'owner', 'npc', 'city', 'nation', 'officer_level', 'officer_city'];
$defaultEventColumn = [
@@ -170,11 +171,11 @@ abstract class GeneralBase
if ($reqColumns === null) {
switch ($queryMode) {
case GeneralQueryMode::Core:
case GeneralLiteQueryMode::Core:
return [$minimumColumn, [], []];
case GeneralQueryMode::Lite:
case GeneralLiteQueryMode::Lite:
return [$defaultEventColumn, [], []];
case GeneralQueryMode::FullWithoutIAction:
case GeneralLiteQueryMode::Full:
case GeneralQueryMode::Full:
return [$fullColumn, RankColumn::cases(), []];
case GeneralQueryMode::FullWithAccessLog:
@@ -211,11 +212,11 @@ abstract class GeneralBase
}
switch ($queryMode) {
case GeneralQueryMode::Core:
case GeneralLiteQueryMode::Core:
return [array_unique(array_merge($minimumColumn, $subColumn)), $rankColumn, $accessLogColumn];
case GeneralQueryMode::Lite:
case GeneralLiteQueryMode::Lite:
return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn, $accessLogColumn];
case GeneralQueryMode::FullWithoutIAction:
case GeneralLiteQueryMode::Full:
case GeneralQueryMode::Full:
return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, $accessLogColumn];
case GeneralQueryMode::FullWithAccessLog: