reset

Author: midorikocak

CHANGELOG.md

@@ -153,3 +153,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 - Nothing
+
+## [1.4.1] - 2020-02-04
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Reset
+
+### Removed
+- Nothing
+
+### Security
+- Nothing

src/QueryMaker.php

@@ -4,7 +4,6 @@
 
 namespace midorikocak\querymaker;
 
-use Exception;
 use InvalidArgumentException;
 
 use function array_keys;
@@ -24,6 +23,11 @@ class QueryMaker implements QueryInterface
     private string $orderBy;
 
     public function __construct()
+    {
+        $this->reset();
+    }
+
+    private function reset(): void
     {
         $this->query = '';
         $this->statement = '';
@@ -35,8 +39,7 @@ public function __construct()
 
     public function select($table, array $columns = ['*']): QueryInterface
     {
-        $this->checkInitialized();
-
+        $this->reset();
         $columnsText = implode(', ', $columns);
         $this->statement = 'SELECT ' . $columnsText . ' FROM ' . $table;
         $this->query = 'SELECT ' . $columnsText . ' FROM ' . $table;
@@ -45,8 +48,7 @@ public function select($table, array $columns = ['*']): QueryInterface
 
     public function update($table, array $values): QueryInterface
     {
-        $this->checkInitialized();
-
+        $this->reset();
         $this->statement = 'UPDATE ' . $table . ' SET ';
         $this->query = 'UPDATE ' . $table . ' SET ';
         $this->prepareParams($values, ', ');
@@ -55,7 +57,7 @@ public function update($table, array $values): QueryInterface
 
     public function insert($table, array $values): QueryInterface
     {
-        $this->checkInitialized();
+        $this->reset();
         $fields = implode(', ', array_keys($values));
         $params = implode(', ', array_map(fn($key) => ':' . $key, array_keys($values)));
         $queryValues = implode(', ', array_map(fn($value) => "'$value'", array_values($values)));
@@ -69,7 +71,7 @@ public function insert($table, array $values): QueryInterface
 
     public function delete($table): QueryInterface
     {
-        $this->checkInitialized();
+        $this->reset();
         $this->statement = 'DELETE FROM ' . $table;
         $this->query = 'DELETE FROM ' . $table;
         return $this;
@@ -189,11 +191,4 @@ private function checkOperator(string $operator): void
             throw new InvalidArgumentException('Invalid Operator');
         }
     }
-
-    private function checkInitialized()
-    {
-        if ($this->statement !== '' && $this->query !== '') {
-            throw new Exception('Invalid Query Order');
-        }
-    }
 }