@@ -34,8 +34,9 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | private function getInstance(): ?PDO |
| 36 | 36 | {
|
| 37 | - if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao") ) |
|
| 38 | - $this->database .= "Homologacao"; |
|
| 37 | + if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao") ) {
|
|
| 38 | + $this->database .= "Homologacao"; |
|
| 39 | + } |
|
| 39 | 40 | |
| 40 | 41 | if (!isset($this->instance)) {
|
| 41 | 42 | $this->instance = Connect::getInstance($this->database); |
@@ -340,18 +341,26 @@ discard block |
||
| 340 | 341 | $indexed = $params == array_values($params); |
| 341 | 342 | foreach($params as $k=>$v) {
|
| 342 | 343 | if (is_object($v)) {
|
| 343 | - if ($v instanceof \DateTime) $v = $v->format('Y-m-d H:i:s');
|
|
| 344 | - else continue; |
|
| 344 | + if ($v instanceof \DateTime) {
|
|
| 345 | + $v = $v->format('Y-m-d H:i:s');
|
|
| 346 | + } else {
|
|
| 347 | + continue; |
|
| 348 | + } |
|
| 349 | + } elseif (is_string($v)) {
|
|
| 350 | + $v="'$v'"; |
|
| 351 | + } elseif ($v === null) {
|
|
| 352 | + $v='NULL'; |
|
| 353 | + } elseif (is_array($v)) {
|
|
| 354 | + $v = implode(',', $v);
|
|
| 345 | 355 | } |
| 346 | - elseif (is_string($v)) $v="'$v'"; |
|
| 347 | - elseif ($v === null) $v='NULL'; |
|
| 348 | - elseif (is_array($v)) $v = implode(',', $v);
|
|
| 349 | 356 | |
| 350 | 357 | if ($indexed) {
|
| 351 | 358 | $sql_string = preg_replace('/\?/', $v, $sql_string, 1);
|
| 352 | - } |
|
| 353 | - else {
|
|
| 354 | - if ($k[0] != ':') $k = ':'.$k; //add leading colon if it was left out |
|
| 359 | + } else {
|
|
| 360 | + if ($k[0] != ':') {
|
|
| 361 | + $k = ':'.$k; |
|
| 362 | + } |
|
| 363 | + //add leading colon if it was left out |
|
| 355 | 364 | $sql_string = str_replace($k,$v,$sql_string); |
| 356 | 365 | } |
| 357 | 366 | } |
@@ -10,8 +10,9 @@ discard block |
||
| 10 | 10 | * @param array|null $params |
| 11 | 11 | */ |
| 12 | 12 | public function __construct(array $params = null){ |
| 13 | - if (!empty($params)) |
|
| 14 | - $this->modelFromMap($params); |
|
| 13 | + if (!empty($params)) {
|
|
| 14 | + $this->modelFromMap($params); |
|
| 15 | + } |
|
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | /** |
@@ -73,7 +74,9 @@ discard block |
||
| 73 | 74 | $data = (object) $this->toMap(); |
| 74 | 75 | $re_2 = new ReflectionObject($data); |
| 75 | 76 | $classname = get_class($this); |
| 76 | - if ($pos = strrpos($classname, '\\')) $classname = substr($classname, $pos + 1); |
|
| 77 | + if ($pos = strrpos($classname, '\\')) {
|
|
| 78 | + $classname = substr($classname, $pos + 1); |
|
| 79 | + } |
|
| 77 | 80 | return $classname .' {' . implode(', ', array_map( |
| 78 | 81 | function($p_0) use ($data) |
| 79 | 82 | { |
@@ -63,8 +63,9 @@ discard block |
||
| 63 | 63 | $query = "INSERT INTO $this->tableName"; |
| 64 | 64 | $values = []; |
| 65 | 65 | $dataColumns = array_keys($params); |
| 66 | - if (isset ($dataColumns[0])) |
|
| 67 | - $query .= ' (`' . implode('`, `', $dataColumns) . '`) ';
|
|
| 66 | + if (isset ($dataColumns[0])) {
|
|
| 67 | + $query .= ' (`' . implode('`, `', $dataColumns) . '`) ';
|
|
| 68 | + } |
|
| 68 | 69 | $query .= ' VALUES (';
|
| 69 | 70 | |
| 70 | 71 | foreach ($dataColumns as $index => $column) {
|
@@ -117,8 +118,9 @@ discard block |
||
| 117 | 118 | } |
| 118 | 119 | $query = rtrim($query, ", "); |
| 119 | 120 | |
| 120 | - if (!empty($where)) |
|
| 121 | - $query .= " WHERE {$where}";
|
|
| 121 | + if (!empty($where)) {
|
|
| 122 | + $query .= " WHERE {$where}";
|
|
| 123 | + } |
|
| 122 | 124 | |
| 123 | 125 | return $this->executeSQL($query, $values); |
| 124 | 126 | } else {
|