Incoviba/models
2
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Aldarien
2020-03-10 19:02:30 -03:00
parent 79f5d4603a 92ea9e4c7f
commit b11d283924
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/Factory/Model.php
View File

@ -52,7 +52,8 @@ class Model {
if (is_string($column)) {
$column = [$column];
}
$alias = $column['alias'] ?? $column[1] ?? $column[0];
$value = $column[0];
$alias = $column['alias'] ?? $column[1] ?? '';
$method = 'select';
if (count($column) > 2 or isset($column['type'])) {
$type = $column['type'] ?? $column[2] ?? '';
@ -62,7 +63,11 @@ class Model {
break;
}
}
$orm = $orm->{$method}($column, $alias);
if ($alias == '') {
$orm = $orm->{$method}($value);
continue;
}
$orm = $orm->{$method}($value, $alias);
}
return $orm;
}
@ -138,14 +143,17 @@ class Model {
if (isset($condition['operator'])) {
$op = strtolower($condition['operator']);
}
$mod = ['=' => '', '>' => 'Gt', '>=' => 'Gte', '<' => 'Lt', '<=', 'Lte'];
$mod = ['=' => '', '>' => 'Gt', '>=' => 'Gte', '<' => 'Lt', '<=' => 'Lte', '!=' => 'NotEqual'];
if (isset($mod[$op])) {
$method .= $mod[$op];
} else {
switch ($op) {
switch (strtolower($op)) {
case 'raw':
$method = 'rawWhere';
break;
case 'like':
$method = 'whereLike';
break;
}
}
$column = $condition[0];