|
@@ -93,7 +93,7 @@ discard block |
|
|
block discarded – undo |
|
93
|
93
|
public function escapeValue($value) |
|
94
|
94
|
{ |
|
95
|
95
|
$type = is_object($value) ? get_class($value) : gettype($value); |
|
96
|
|
- $method = [ $this, 'escape' . ucfirst($type) ]; |
|
|
96
|
+ $method = [$this, 'escape' . ucfirst($type)]; |
|
97
|
97
|
|
|
98
|
98
|
if (is_callable($method)) { |
|
99
|
99
|
return call_user_func($method, $value); |
|
@@ -298,7 +298,7 @@ discard block |
|
|
block discarded – undo |
|
298
|
298
|
$var = $entity::getPrimaryKeyVars()[0]; |
|
299
|
299
|
$column = $entity::getColumnName($var); |
|
300
|
300
|
|
|
301
|
|
- $entity->setOriginalData(array_merge($entity->getData(), [ $column => $value ])); |
|
|
301
|
+ $entity->setOriginalData(array_merge($entity->getData(), [$column => $value])); |
|
302
|
302
|
$entity->__set($var, $value); |
|
303
|
303
|
} |
|
304
|
304
|
|
|
@@ -315,8 +315,7 @@ discard block |
|
|
block discarded – undo |
|
315
|
315
|
$primary = array_combine($vars, $cols); |
|
316
|
316
|
|
|
317
|
317
|
$query = "SELECT * FROM " . $this->escapeIdentifier($entity::getTableName()) . " WHERE "; |
|
318
|
|
- $query .= count($cols) > 1 ? $this->buildCompositeWhereInStatement($cols, $entities) : |
|
319
|
|
- $this->escapeIdentifier($cols[0]) . ' IN (' . implode(',', array_map(function (Entity $entity) { |
|
|
318
|
+ $query .= count($cols) > 1 ? $this->buildCompositeWhereInStatement($cols, $entities) : $this->escapeIdentifier($cols[0]) . ' IN (' . implode(',', array_map(function (Entity $entity) { |
|
320
|
319
|
return $this->escapeValue(array_values($entity->getPrimaryKey())[0]); |
|
321
|
320
|
}, $entities)) . ')'; |
|
322
|
321
|
|