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 '';
 	}