This commit is contained in:
2023-10-24 17:22:29 +08:00
parent b0e627c4fb
commit dcf4e0a614
12 changed files with 11 additions and 27 deletions
-2
View File
@@ -2,8 +2,6 @@
namespace Database\Affair; namespace Database\Affair;
use Exception;
class Commit class Commit
{ {
-1
View File
@@ -15,7 +15,6 @@ use Kiri\Abstracts\Component;
use Kiri\Di\Container; use Kiri\Di\Container;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use PDO; use PDO;
use PDOStatement;
use Throwable; use Throwable;
/** /**
-1
View File
@@ -3,7 +3,6 @@ declare(strict_types=1);
namespace Database\Condition; namespace Database\Condition;
use Database\ActiveQuery;
use Exception; use Exception;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
-2
View File
@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace Database\Condition; namespace Database\Condition;
use Kiri\Core\Str;
/** /**
* Class LLikeCondition * Class LLikeCondition
* @package Database\Condition * @package Database\Condition
-2
View File
@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace Database\Condition; namespace Database\Condition;
use Kiri\Core\Str;
/** /**
* Class LikeCondition * Class LikeCondition
* @package Database\Condition * @package Database\Condition
-2
View File
@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace Database\Condition; namespace Database\Condition;
use Kiri\Core\Str;
/** /**
* Class NotLikeCondition * Class NotLikeCondition
* @package Database\Condition * @package Database\Condition
-2
View File
@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace Database\Condition; namespace Database\Condition;
use Kiri\Core\Str;
/** /**
* Class RLikeCondition * Class RLikeCondition
* @package Database\Condition * @package Database\Condition
-1
View File
@@ -18,7 +18,6 @@ use Database\Mysql\Schema;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Server\Events\OnWorkerExit; use Kiri\Server\Events\OnWorkerExit;
use Kiri\Waite;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
use Kiri\Di\Context; use Kiri\Di\Context;
use Kiri\Pool\Pool; use Kiri\Pool\Pool;
+3 -2
View File
@@ -107,7 +107,7 @@ class Model extends Base\Model
/** @var static $select */ /** @var static $select */
$select = static::query()->where($condition)->first(); $select = static::query()->where($condition)->first();
if ($select === null) { if ($select === null) {
$select = static::populate(array_merge($condition, $attributes))->create(); $select = static::populate(array_merge($condition, $attributes))->save();
} }
return $select; return $select;
}, $condition, $attributes); }, $condition, $attributes);
@@ -129,7 +129,8 @@ class Model extends Base\Model
if (empty($select)) { if (empty($select)) {
$select = static::populate($condition); $select = static::populate($condition);
} }
return $select->save($attributes); $select->attributes = $attributes;
return $select->save();
}, $condition, $attributes); }, $condition, $attributes);
} }
-5
View File
@@ -198,12 +198,7 @@ class Pagination extends Component
} }
$data = $this->activeQuery->offset($this->_offset)->limit($this->_limit)->get(); $data = $this->activeQuery->offset($this->_offset)->limit($this->_limit)->get();
$this->_offset += $this->_limit; $this->_offset += $this->_limit;
if (is_array($data)) {
$size = count($data);
} else {
$size = $data->size(); $size = $data->size();
}
$this->_length += $size; $this->_length += $size;
return [$size, $data]; return [$size, $data];
} }
-3
View File
@@ -648,9 +648,6 @@ trait QueryTrait
*/ */
public function pushParam(mixed $value): static public function pushParam(mixed $value): static
{ {
// if (is_string($value)) {
// $value = addslashes($value);
// }
$this->attributes[] = $value; $this->attributes[] = $value;
return $this; return $this;
} }
+4
View File
@@ -6,6 +6,10 @@ namespace Database\Traits;
interface Relation interface Relation
{ {
/**
* @return mixed
*/
public function get(): mixed; public function get(): mixed;
} }