Merge pull request #14 from mgcostaParedes/ISSUE-12

fix: fixed some inconsistencies on builder & grammar contracts

Author: mgcostaParedes

src/Spanner/Builder/Builder.php

@@ -141,7 +141,7 @@ public function getBindings(): array
         return Arr::collapse($this->bindings);
     }
 
-    public function getRawBindings()
+    public function getRawBindings(): array
     {
         return $this->bindings;
     }
@@ -506,7 +506,7 @@ public function orderByDesc($column): self
     public function groupBy(...$groups): self
     {
         foreach ($groups as $group) {
-            $this->groups = array_merge((array) $this->groups, Arr::wrap($group));
+            $this->groups = array_merge((array)$this->groups, Arr::wrap($group));
         }
 
         return $this;
@@ -556,6 +556,7 @@ public function cloneWithout(array $properties)
             }
         });
     }
+
     public function cloneWithoutBindings(array $except)
     {
         return $this->tap($this->clone(), function ($clone) use ($except) {

src/Spanner/Builder/Grammar/Grammatical.php

@@ -9,4 +9,5 @@ interface Grammatical
     public function compile(Builder $query): string;
     public function compileUpdate(Builder $query, array $values): string;
     public function compileDelete(Builder $query): string;
+    public function wrapTable($table);
 }

src/Spanner/Builder/Grammar/SpannerGrammar.php

@@ -68,6 +68,15 @@ public function compileDelete(Builder $query): string
         );
     }
 
+    public function wrapTable($table)
+    {
+        if (!$this->isExpression($table)) {
+            return $this->wrap($this->tablePrefix . $table, true);
+        }
+
+        return $table->getValue($table);
+    }
+
     protected function compileComponents(Builder $query): array
     {
         $sql = [];
@@ -239,7 +248,7 @@ protected function concatenateWhereClauses($query, $sql): string
         return $conjunction . ' ' . $this->removeLeadingBoolean(implode(' ', $sql));
     }
 
-    private function whereBasic(Builder $query, array $where): string
+    protected function whereBasic(Builder $query, array $where): string
     {
         $value = $this->parameter($where);
 
@@ -316,22 +325,12 @@ protected function concatenate($segments): string
         }));
     }
 
-    public function wrapTable($table)
-    {
-        if (! $this->isExpression($table)) {
-            return $this->wrap($this->tablePrefix . $table, true);
-        }
-
-        return $table->getValue($table);
-    }
-
     protected function wrap($value, $prefixAlias = false)
     {
         if ($this->isExpression($value)) {
             return $value->getValue($value);
         }
 
-
         if (stripos($value, ' as ') !== false) {
             return $this->wrapAliasedValue($value, $prefixAlias);
         }

src/Spanner/Builder/Interfaces/Operator.php

@@ -20,6 +20,7 @@ public function join($table, $first, $operator = null, $second = null, $type = '
 
     public function where($column, $operator = null, $value = null, $boolean = 'and'): Builder;
     public function whereColumn($first, $operator = null, $second = null, $boolean = 'and'): Builder;
+    public function whereBetween($column, iterable $values, $boolean = 'and', $not = false): Builder;
     public function whereNested(Closure $callback, $boolean = 'and'): Builder;
     public function addNestedWhereQuery($query, $boolean = 'and'): Builder;
     public function orWhere($column, $operator = null, $value = null): Builder;
@@ -46,4 +47,6 @@ public function crossJoin($table, $first = null, $operator = null, $second = nul
 
     public function orderBy($column, $direction = 'asc'): Builder;
     public function orderByDesc($column): Builder;
+
+    public function groupBy(array ...$groups): Builder;
 }