@@ -9,8 +9,12 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | public function getSql($key, $value, $mode) { |
| 12 | - if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) $value = '%' . $value; |
|
| 13 | - if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) $value .= '%'; |
|
| 12 | + if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) { |
|
| 13 | + $value = '%' . $value; |
|
| 14 | + } |
|
| 15 | + if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) { |
|
| 16 | + $value .= '%'; |
|
| 17 | + } |
|
| 14 | 18 | |
| 15 | 19 | return [ |
| 16 | 20 | 'sql' => [$key . ' LIKE :' . $key], |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | 'Maphper\Lib\Sql\GeneralOperator' |
| 14 | 14 | ]; |
| 15 | 15 | |
| 16 | - foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional); |
|
| 16 | + foreach ($defaultConditionals as $conditional) { |
|
| 17 | + $this->addConditional(new $conditional); |
|
| 18 | + } |
|
| 17 | 19 | } |
| 18 | 20 | |
| 19 | 21 | public function addConditional(WhereConditional $conditional) { |
@@ -28,35 +30,45 @@ discard block |
||
| 28 | 30 | foreach ($fields as $key => $value) { |
| 29 | 31 | $value = $this->convertDates($value); |
| 30 | 32 | |
| 31 | - if (is_object($value)) continue; |
|
| 33 | + if (is_object($value)) { |
|
| 34 | + continue; |
|
| 35 | + } |
|
| 32 | 36 | if (is_numeric($key) && is_array($value)) { |
| 33 | 37 | $result = $this->createSql($value, $key); |
| 34 | - } |
|
| 35 | - else { |
|
| 38 | + } else { |
|
| 36 | 39 | $result = $this->getConditional($key, $value, $mode); |
| 37 | 40 | } |
| 38 | 41 | $sql = array_merge($sql, $result['sql']); |
| 39 | 42 | $args = array_merge($args, $result['args']); |
| 40 | 43 | } |
| 41 | 44 | |
| 42 | - if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR ', $sql); |
|
| 43 | - else $query = implode(' AND ', $sql); |
|
| 44 | - if (!empty($query)) $query = '(' . $query . ')'; |
|
| 45 | + if (\Maphper\Maphper::FIND_OR & $mode) { |
|
| 46 | + $query = implode(' OR ', $sql); |
|
| 47 | + } else { |
|
| 48 | + $query = implode(' AND ', $sql); |
|
| 49 | + } |
|
| 50 | + if (!empty($query)) { |
|
| 51 | + $query = '(' . $query . ')'; |
|
| 52 | + } |
|
| 45 | 53 | return ['args' => $args, 'sql' => $query]; |
| 46 | 54 | } |
| 47 | 55 | |
| 48 | 56 | private function getConditional($key, $value, $mode) { |
| 49 | 57 | foreach ($this->conditionals as $conditional) { |
| 50 | - if ($conditional->matches($key, $value, $mode)) |
|
| 51 | - return $conditional->getSql($key, $value, $mode); |
|
| 58 | + if ($conditional->matches($key, $value, $mode)) { |
|
| 59 | + return $conditional->getSql($key, $value, $mode); |
|
| 60 | + } |
|
| 52 | 61 | } |
| 53 | 62 | throw new \Exception("Invalid WHERE query"); |
| 54 | 63 | } |
| 55 | 64 | |
| 56 | 65 | private function convertDates($value) { |
| 57 | 66 | if ($value instanceof \DateTime) { |
| 58 | - if ($value->format('H:i:s') == '00:00:00') $value = $value->format('Y-m-d'); |
|
| 59 | - else $value = $value->format('Y-m-d H:i:s'); |
|
| 67 | + if ($value->format('H:i:s') == '00:00:00') { |
|
| 68 | + $value = $value->format('Y-m-d'); |
|
| 69 | + } else { |
|
| 70 | + $value = $value->format('Y-m-d H:i:s'); |
|
| 71 | + } |
|
| 60 | 72 | } |
| 61 | 73 | return $value; |
| 62 | 74 | } |
@@ -14,8 +14,11 @@ |
||
| 14 | 14 | $args[$key . $i] = $value[$i]; |
| 15 | 15 | $inSql[] = ':' . $key . $i; |
| 16 | 16 | } |
| 17 | - if (count($inSql) == 0) return []; |
|
| 18 | - else $sql = [$key . ' IN ( ' . implode(', ', $inSql) . ')']; |
|
| 17 | + if (count($inSql) == 0) { |
|
| 18 | + return []; |
|
| 19 | + } else { |
|
| 20 | + $sql = [$key . ' IN ( ' . implode(', ', $inSql) . ')']; |
|
| 21 | + } |
|
| 19 | 22 | |
| 20 | 23 | return ['args' => $args, 'sql' => $sql]; |
| 21 | 24 | } |
@@ -18,12 +18,19 @@ |
||
| 18 | 18 | private function getOperator($mode) { |
| 19 | 19 | $operator = ""; |
| 20 | 20 | |
| 21 | - if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&'; |
|
| 22 | - else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>'; |
|
| 23 | - else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<'; |
|
| 24 | - else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!='; |
|
| 21 | + if (\Maphper\Maphper::FIND_BIT & $mode) { |
|
| 22 | + $operator = '&'; |
|
| 23 | + } else if (\Maphper\Maphper::FIND_GREATER & $mode) { |
|
| 24 | + $operator = '>'; |
|
| 25 | + } else if (\Maphper\Maphper::FIND_LESS & $mode) { |
|
| 26 | + $operator = '<'; |
|
| 27 | + } else if (\Maphper\Maphper::FIND_NOT & $mode) { |
|
| 28 | + $operator = '!='; |
|
| 29 | + } |
|
| 25 | 30 | |
| 26 | - if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '='; |
|
| 31 | + if (\Maphper\Maphper::FIND_EXACT & $mode) { |
|
| 32 | + $operator .= '='; |
|
| 33 | + } |
|
| 27 | 34 | |
| 28 | 35 | return $operator; |
| 29 | 36 | } |
@@ -8,7 +8,9 @@ |
||
| 8 | 8 | |
| 9 | 9 | public function getSql($key, $value, $mode) { |
| 10 | 10 | $nullSql = $key . ' IS '; |
| 11 | - if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT '; |
|
| 11 | + if (\Maphper\Maphper::FIND_NOT & $mode) { |
|
| 12 | + $nullSql .= 'NOT '; |
|
| 13 | + } |
|
| 12 | 14 | $sql = [$nullSql . 'NULL']; |
| 13 | 15 | |
| 14 | 16 | return ['args' => [], 'sql' => $sql]; |