Skip to content
Snippets Groups Projects
Verified Commit 1084ba09 authored by Damien's avatar Damien
Browse files

FEAT Add offset function to database model

parent 8a2b573f
No related branches found
No related tags found
No related merge requests found
...@@ -21,13 +21,16 @@ abstract class PriorityModelAbstract ...@@ -21,13 +21,16 @@ abstract class PriorityModelAbstract
public static function get(array $aArgs = []) public static function get(array $aArgs = [])
{ {
ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']); ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
ValidatorModel::intType($aArgs, ['limit', 'offset']);
$aReturn = DatabaseModel::select([ $aReturn = DatabaseModel::select([
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'], 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
'table' => ['priorities'], 'table' => ['priorities'],
'where' => $aArgs['where'], 'where' => empty($aArgs['where']) ? [] : $aArgs['where'],
'data' => $aArgs['data'], 'data' => empty($aArgs['data']) ? [] : $aArgs['data'],
'order_by' => $aArgs['orderBy'] 'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
'offset' => empty($aArgs['offset']) ? 0 : $aArgs['offset'],
'limit' => empty($aArgs['limit']) ? 0 : $aArgs['limit']
]); ]);
return $aReturn; return $aReturn;
......
...@@ -50,14 +50,11 @@ class CoreController ...@@ -50,14 +50,11 @@ class CoreController
foreach ($scriptsToInject as $value) { foreach ($scriptsToInject as $value) {
if ($i == 0 && strstr($value, 'scripts.') !== false) { if ($i == 0 && strstr($value, 'scripts.') !== false) {
$aInit['scriptsToinject'][] = $value; $aInit['scriptsToinject'][] = $value;
} } elseif ($i == 1 && strstr($value, 'main.') !== false) {
if ($i == 1 && strstr($value, 'main.') !== false) {
$aInit['scriptsToinject'][] = $value; $aInit['scriptsToinject'][] = $value;
} } elseif ($i == 2 && strstr($value, 'runtime.') !== false) {
if ($i == 2 && strstr($value, 'runtime.') !== false) {
$aInit['scriptsToinject'][] = $value; $aInit['scriptsToinject'][] = $value;
} } elseif ($i == 3 && strstr($value, 'vendor.') !== false) {
if ($i == 3 && strstr($value, 'vendor.') !== false) {
$aInit['scriptsToinject'][] = $value; $aInit['scriptsToinject'][] = $value;
} }
} }
......
...@@ -110,6 +110,13 @@ class DatabaseModel ...@@ -110,6 +110,13 @@ class DatabaseModel
$orderBy = ' ORDER BY ' . implode(', ', $args['order_by']); $orderBy = ' ORDER BY ' . implode(', ', $args['order_by']);
} }
if (empty($args['offset'])) {
$offset = '';
} else {
ValidatorModel::intType($args, ['offset']);
$offset = " OFFSET {$args['offset']}";
}
if (empty($args['limit'])) { if (empty($args['limit'])) {
$limit = ''; $limit = '';
} else { } else {
...@@ -131,7 +138,7 @@ class DatabaseModel ...@@ -131,7 +138,7 @@ class DatabaseModel
$limit = $limitData['limit']; $limit = $limitData['limit'];
} }
$query = "SELECT {$select} FROM {$args['table']}{$where}{$groupBy}{$orderBy}{$limit}"; $query = "SELECT {$select} FROM {$args['table']}{$where}{$groupBy}{$orderBy}{$offset}{$limit}";
$stmt = $db->query($query, $args['data']); $stmt = $db->query($query, $args['data']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment