Merge pull request #381 from bowphp/refactor/code-base

Fix data binding

Author: papac

src/Database/QueryBuilder.php

@@ -190,7 +190,7 @@ public function whereRaw(string $where, array $data = []): QueryBuilder
         }
 
         if (!empty($data)) {
-            $this->where_data_binding = array_merge(array_values($data), $this->where_data_binding);
+            $this->where_data_binding = array_merge($this->where_data_binding, array_values($data));
         }
 
         return $this;
@@ -214,7 +214,7 @@ public function orWhereRaw(string $where, array $data = []): QueryBuilder
         }
 
         if (!empty($data)) {
-            $this->where_data_binding = array_merge(array_values($data), $this->where_data_binding);
+            $this->where_data_binding = array_merge($this->where_data_binding, array_values($data));
         }
 
         return $this;
@@ -1477,7 +1477,7 @@ private function execute(string $sql, array $bindings = []): PDOStatement
             $this->triggerQueryEvent($sql, $bindings);
         } catch (\Exception $e) {
             throw new QueryBuilderException(
-                'Error executing query: ' . $e->getMessage(),
+                'Error executing query: ' . $e->getMessage() . ' | Query: ' . $this->last_query,
                 $this->last_query,
                 E_ERROR,
             );