Fix select when raw where is passed, fix #52

uepg · Jun 21, 2019 · 17dc5dc · 17dc5dc
1 parent 7e1c0d9
commit 17dc5dc
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -116,7 +116,7 @@ protected function getDoctrineDriver()
     }
 
     /**
-     * Compile for select.
+     * Compile the bindings for select.
      *
      * @param  \Illuminate\Database\Query\Builder  $builder
      * @param  array  $bindings
@@ -148,15 +148,13 @@ private function compileForSelect(Builder $builder, $bindings) {
                 $tables = $alias['table'];
             }
 
+            // TODO: cache this query
             $queryString = $this->queryStringForSelect($tables);
-
             $queryRes = $this->getPdo()->query($queryString);
-
             $types[$tables] = $queryRes->fetchAll(PDO::FETCH_NAMED);
 
             foreach ($types[$tables] as &$row) {
                 $tipos[strtolower($row['name'])] = $row['type'];
-
                 $tipos[strtolower($tables . '.' . $row['name'])] = $row['type'];
 
                 if (!empty($alias['alias'])) {
@@ -170,7 +168,7 @@ private function compileForSelect(Builder $builder, $bindings) {
 
             foreach ($builder->wheres as $w) {
                 switch ($w['type']) {
-                    case 'Nested':
+                    case "Nested":
                         $wheres += $w['query']->wheres;
                         break;
                     default:
@@ -180,11 +178,13 @@ private function compileForSelect(Builder $builder, $bindings) {
             }
 
             $i = 0;
-
             $wheresCount = count($wheres);
 
             for ($ind = 0; $ind < $wheresCount; $ind++) {
-                if (
+                if ($wheres[$ind]['type'] == 'raw') {
+                    $newBinds[] = $bindings[$i];
+                    $i++;
+                } else if (
                     isset($wheres[$ind]['value']) &&
                     isset($tipos[strtolower($wheres[$ind]['column'])])
                 ) {
@@ -205,7 +205,6 @@ private function compileForSelect(Builder $builder, $bindings) {
                         } else {
                             $newBinds[$i] = (string) $bindings[$i];
                         }
-
                         $i++;
                     }
                 }
@@ -214,14 +213,22 @@ private function compileForSelect(Builder $builder, $bindings) {
             $newFormat[$tables] = [];
         }
 
-        $wheres = (array) $builder->wheres;
 
+        /**
+         * Is this block duplicated? Need more tests will keep it
+         * commented to remember that a possible error could be related to
+         * this
+         */
+        /**
+        $wheres = (array) $builder->wheres;
         $i = 0;
-
         $wheresCount = count($wheres);
 
         for ($ind = 0; $ind < $wheresCount; $ind++) {
-            if (isset($wheres[$ind]['value'])) {
+            if ($wheres[$ind]['type'] == 'raw') {
+                $newBinds[] = $bindings[$i];
+                $i++;
+            } else if (isset($wheres[$ind]['value'])) {
                 if (is_object($wheres[$ind]['value']) === false) {
                     if (
                         in_array(
@@ -239,11 +246,11 @@ private function compileForSelect(Builder $builder, $bindings) {
                     } else {
                         $newBinds[$i] = (string) $bindings[$i];
                     }
-
                     $i++;
                 }
             }
         }
+         */
 
         return $newBinds;
     }