Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11a939e8a1 | |||
| 1666af9906 | |||
| 78f7faba55 |
+2
-2
@@ -692,7 +692,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
|
|||||||
public function __set(string $name, mixed $value): void
|
public function __set(string $name, mixed $value): void
|
||||||
{
|
{
|
||||||
$prefix = 'set' . ucfirst($name);
|
$prefix = 'set' . ucfirst($name);
|
||||||
if (method_exists($name, $prefix)) {
|
if (method_exists($this, $prefix)) {
|
||||||
$this->{$prefix}($value);
|
$this->{$prefix}($value);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -766,7 +766,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
|
|||||||
*/
|
*/
|
||||||
protected function withRelate(string $name): mixed
|
protected function withRelate(string $name): mixed
|
||||||
{
|
{
|
||||||
$response = $this->$name();
|
$response = $this->{'get' . ucfirst($name)}();
|
||||||
if ($response instanceof \Database\Traits\Relation) {
|
if ($response instanceof \Database\Traits\Relation) {
|
||||||
$response = $response->get();
|
$response = $response->get();
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -793,20 +793,22 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $columns
|
* @param string $columns
|
||||||
* @param array|Closure $value
|
* @param array|Closure|Query $value
|
||||||
*
|
*
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function whereIn(string $columns, array|Closure $value): static
|
public function whereIn(string $columns, array|Closure|Query $value): static
|
||||||
{
|
{
|
||||||
if ($value instanceof Closure) {
|
if (is_array($value)) {
|
||||||
$value = $this->makeClosureFunction($value);
|
if (count($value) < 1) throw new Exception('Value must be an not empty array');
|
||||||
}
|
|
||||||
if (count($value) < 1) {
|
|
||||||
$value = [-1];
|
|
||||||
}
|
|
||||||
$this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
|
$this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
|
||||||
|
} else if ($value instanceof Query) {
|
||||||
|
$this->where[] = $columns . ' IN (' . $value->build() . ')';
|
||||||
|
} else {
|
||||||
|
$this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
|
||||||
|
}
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user