@@ -96,9 +96,9 @@ |
||
96 | 96 | if (!empty($date_stop)) { |
97 | 97 | $this->statement()->aw_lte($this->model()->event_field(), $date_stop, $this->statement()->table_label(), ':filter_date_stop'); |
98 | 98 | } |
99 | - // |
|
100 | - // if(empty($options['order_by'])) |
|
101 | - // $this->statement()->order_by([$this->model()->event_field(), 'DESC']); |
|
99 | + // |
|
100 | + // if(empty($options['order_by'])) |
|
101 | + // $this->statement()->order_by([$this->model()->event_field(), 'DESC']); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | public function filter_with_ids($ids) |
@@ -266,7 +266,7 @@ |
||
266 | 266 | |
267 | 267 | if ($Query->is_success()) { |
268 | 268 | foreach ($Query->ret_obj(get_called_class()) as $rec) { |
269 | - $ret[$rec->get($pk_name)] = $rec; |
|
269 | + $ret[$rec->get($pk_name)] = $rec; |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 |
@@ -7,15 +7,15 @@ discard block |
||
7 | 7 | |
8 | 8 | class TableModelSelector |
9 | 9 | { |
10 | - private $model; |
|
10 | + private $model; |
|
11 | 11 | |
12 | - public function __construct(ModelInterface $m) |
|
13 | - { |
|
14 | - $this->model = $m; |
|
15 | - } |
|
12 | + public function __construct(ModelInterface $m) |
|
13 | + { |
|
14 | + $this->model = $m; |
|
15 | + } |
|
16 | 16 | |
17 | - public function select($filters = [], $options = []): SelectInterface |
|
18 | - { |
|
17 | + public function select($filters = [], $options = []): SelectInterface |
|
18 | + { |
|
19 | 19 | $class = get_class($this->model); |
20 | 20 | $table = $class::table(); |
21 | 21 | |
@@ -24,25 +24,25 @@ discard block |
||
24 | 24 | |
25 | 25 | if(!isset($options['eager']) || $options['eager'] !== false) |
26 | 26 | { |
27 | - $Query->eager(); |
|
27 | + $Query->eager(); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | 31 | foreach($table->columns() as $column_name => $column) |
32 | 32 | { |
33 | - if(isset($filters[$column_name]) && is_string($filters[$column_name])) |
|
33 | + if(isset($filters[$column_name]) && is_string($filters[$column_name])) |
|
34 | 34 | $Query->aw_eq($column_name, $filters[$column_name]); |
35 | 35 | } |
36 | 36 | |
37 | 37 | if(is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface')) |
38 | 38 | { |
39 | - if(!empty($filters['date_start'])) |
|
39 | + if(!empty($filters['date_start'])) |
|
40 | 40 | $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start'); |
41 | 41 | |
42 | - if(!empty($filters['date_stop'])) |
|
42 | + if(!empty($filters['date_stop'])) |
|
43 | 43 | $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop'); |
44 | 44 | |
45 | - if(empty($options['order_by'])) |
|
45 | + if(empty($options['order_by'])) |
|
46 | 46 | $Query->order_by([$event->event_field(), 'DESC']); |
47 | 47 | } |
48 | 48 | |
@@ -50,32 +50,32 @@ discard block |
||
50 | 50 | |
51 | 51 | if(isset($filters['ids'])) |
52 | 52 | { |
53 | - if(empty($filters['ids'])) |
|
53 | + if(empty($filters['ids'])) |
|
54 | 54 | $Query->and_where('1=0'); // TODO: this is a new low.. find another way to cancel query |
55 | - else $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label()); |
|
55 | + else $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label()); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | if(isset($options['order_by'])) // TODO commenting required about the array situation |
59 | 59 | { |
60 | - $order_by = $options['order_by']; |
|
60 | + $order_by = $options['order_by']; |
|
61 | 61 | |
62 | - if(is_string($order_by)) |
|
62 | + if(is_string($order_by)) |
|
63 | 63 | $Query->order_by($order_by); |
64 | 64 | |
65 | - elseif(is_array($order_by)) |
|
65 | + elseif(is_array($order_by)) |
|
66 | 66 | foreach($options['order_by'] as $order_by) |
67 | 67 | { |
68 | - if(!isset($order_by[2])) |
|
68 | + if(!isset($order_by[2])) |
|
69 | 69 | array_unshift($order_by, ''); |
70 | 70 | |
71 | - list($order_table, $order_field, $order_direction) = $order_by; |
|
72 | - $Query->order_by([$order_table ?? '', $order_field, $order_direction]); |
|
71 | + list($order_table, $order_field, $order_direction) = $order_by; |
|
72 | + $Query->order_by([$order_table ?? '', $order_field, $order_direction]); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
76 | 76 | if(isset($options['limit']) && is_array($options['limit'])) |
77 | - $Query->limit($options['limit'][1], $options['limit'][0]); |
|
77 | + $Query->limit($options['limit'][1], $options['limit'][0]); |
|
78 | 78 | |
79 | 79 | return $Query; |
80 | - } |
|
80 | + } |
|
81 | 81 | } |