From a67200e4fba21737b973cf60a432f2409d0db553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 26 Mar 2021 14:30:19 +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/SqlBuilder.php | 16 +++++++++++++--- Database/Traits/Builder.php | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Database/SqlBuilder.php b/Database/SqlBuilder.php index 2f675953..49f37a36 100644 --- a/Database/SqlBuilder.php +++ b/Database/SqlBuilder.php @@ -55,7 +55,12 @@ class SqlBuilder extends Component return $this->addError('None data update.'); } - $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $this->conditionToString(); + $condition = $this->conditionToString(); + if (!empty($condition)) { + $condition = ' WHERE ' . $condition; + } + + $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition; $update .= $this->builderLimit($this->query); return [$update, $array]; @@ -80,7 +85,12 @@ class SqlBuilder extends Component return $this->addError('None data update.'); } - $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $this->conditionToString(); + $condition = $this->conditionToString(); + if (!empty($condition)) { + $condition = ' WHERE ' . $condition; + } + + $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition; $update .= $this->builderLimit($this->query); return [$update, []]; @@ -202,7 +212,7 @@ class SqlBuilder extends Component $select .= $this->builderJoin($this->query->join); } if (!empty($condition = $this->conditionToString())) { - $select = sprintf('%s%s', $select, $condition); + $select = sprintf('%s WHERE %s', $select, $condition); } if (!empty($this->query->group)) { $select .= $this->builderGroup($this->query->group); diff --git a/Database/Traits/Builder.php b/Database/Traits/Builder.php index e47e295f..50fdd782 100644 --- a/Database/Traits/Builder.php +++ b/Database/Traits/Builder.php @@ -134,7 +134,7 @@ trait Builder $_tmp[] = $_value; } if (!empty($_tmp)) { - return sprintf(' WHERE %s', implode(' AND ', $_tmp)); + return implode(' AND ', $_tmp); } return ''; }