From b5e79cd1269e19a5142c857558beedb429a1e008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 10 Aug 2021 11:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/Traits/QueryTrait.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Database/Traits/QueryTrait.php b/Database/Traits/QueryTrait.php
index 357b9a6d..b503bc1e 100644
--- a/Database/Traits/QueryTrait.php
+++ b/Database/Traits/QueryTrait.php
@@ -466,7 +466,7 @@ trait QueryTrait
 			if (!is_array($column)) {
 				$column = explode(',', $column);
 			}
-			foreach ($column as $key => $val) {
+			foreach ($column as $val) {
 				$this->select[] = $val;
 			}
 		}
@@ -513,12 +513,11 @@ trait QueryTrait
 	 * @param string $opera
 	 * @return QueryTrait
 	 */
-	public function whereAnd(string $columns, string|int|null|bool $value = NULL, string $opera = '='): static
+	public function whereAnd(string $columns, string $opera = '=', string|int|null|bool $value = NULL): static
 	{
-		if (!is_numeric($value) && !is_bool($value)) {
-			$value = '\'' . $value . '\'';
-		}
-		$this->where[] = $columns . $opera . $value;
+		[$columns, $opera, $value] = $this->opera(...func_get_args());
+
+		$this->where[] = $this->sprintf($columns, $value, $opera);
 		return $this;
 	}