@@ -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) |
@@ -67,7 +67,7 @@ |
||
67 | 67 | public static function otm($k = null) |
68 | 68 | { |
69 | 69 | $type = static::model_type(); |
70 | - $d = ['t' => $type . 's_models', 'k' => $type . '_id', 'a' => $type . 's_otm']; |
|
70 | + $d = ['t' => $type.'s_models', 'k' => $type.'_id', 'a' => $type.'s_otm']; |
|
71 | 71 | return is_null($k) ? $d : $d[$k]; |
72 | 72 | } |
73 | 73 | } |
@@ -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 |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | public function import($assoc_data) |
43 | 43 | { |
44 | 44 | if (!is_array($assoc_data)) { |
45 | - throw new \Exception(__FUNCTION__ . '(assoc_data) parm is not an array'); |
|
45 | + throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array'); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | // shove it all up in model, god will sort them out |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | if ($table_name === false) { |
71 | 71 | $calling_class = $reflect->getShortName(); |
72 | - if (defined($const_name = 'TABLE_' . strtoupper($calling_class))) { |
|
72 | + if (defined($const_name = 'TABLE_'.strtoupper($calling_class))) { |
|
73 | 73 | $table_name = constant($const_name); |
74 | 74 | } else { |
75 | 75 | $table_name = strtolower($calling_class); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $ret = []; |
115 | 115 | $pk_name = implode('_', array_keys($Query->table()->primary_keys())); |
116 | 116 | |
117 | - if (count($pks = $Query->table()->primary_keys()) > 1) { |
|
117 | + if (count($pks = $Query->table()->primary_keys())>1) { |
|
118 | 118 | $concat_pk = sprintf('CONCAT(%s) as %s', implode(',', $pks), $pk_name); |
119 | 119 | $Query->select_also([$concat_pk]); |
120 | 120 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | public function __toString() |
14 | 14 | { |
15 | - return static::class_short_name() . ' #' . $this->get_id(); |
|
15 | + return static::class_short_name().' #'.$this->get_id(); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function immortal(): bool |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | $extraction_table = $extraction_class::table(); |
28 | 28 | foreach ($extraction_table->columns() as $column_name => $column) { |
29 | - $probe_name = $extraction_class::table_alias() . '_' . $column_name; |
|
29 | + $probe_name = $extraction_class::table_alias().'_'.$column_name; |
|
30 | 30 | |
31 | 31 | if (!is_null($probe_res = $this->get($probe_name))) { |
32 | 32 | $extract_model->set($column_name, $probe_res); |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public static function table_alias(): string |
178 | 178 | { |
179 | - if (defined(get_called_class() . '::TABLE_ALIAS')) { |
|
179 | + if (defined(get_called_class().'::TABLE_ALIAS')) { |
|
180 | 180 | return get_called_class()::TABLE_ALIAS; |
181 | 181 | } |
182 | 182 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | public static function model_type(): string |
187 | 187 | { |
188 | - if (defined(get_called_class() . '::MODEL_TYPE')) { |
|
188 | + if (defined(get_called_class().'::MODEL_TYPE')) { |
|
189 | 189 | return get_called_class()::MODEL_TYPE; |
190 | 190 | } |
191 | 191 |