From e247c6a627ca56edf0b8839759a6549c23216634 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 20 Dec 2015 22:28:40 +0100
Subject: [PATCH] Fixing minor bugs for insert, such as accessibility and query
 building in loops.

---
 DataStorage/Database/DataMapperAbstract.php   | 32 +++++++++++--------
 DataStorage/Database/Query/Builder.php        | 26 +++++++++++++--
 .../Database/Query/Grammar/Grammar.php        |  4 +--
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index b96f2ea30..d1c9f36cc 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -249,7 +249,9 @@ abstract class DataMapperAbstract implements DataMapperInterface
 
         foreach ($properties as $property) {
             foreach (static::$columns as $key => $column) {
-                if ($column['internal'] === $property) {
+                if ($column['internal'] === $property->getName()) {
+                    $property->setAccessible(true);
+
                     $value = $property->getValue($obj);
 
                     if ($column['type'] === 'DateTime') {
@@ -257,7 +259,9 @@ abstract class DataMapperAbstract implements DataMapperInterface
                     }
 
                     $query->insert($column['name'])
-                        ->values($value);
+                          ->value($value);
+
+                    // todo: do i have to reverse the accessibility or is there no risk involved here?
 
                     break;
                 }
@@ -381,11 +385,11 @@ abstract class DataMapperAbstract implements DataMapperInterface
 
         $query = new Builder($this->db);
         $query->prefix($this->db->getPrefix())
-            ->select('*')
-            ->from(static::$table)
-            ->limit(1);
+              ->select('*')
+              ->from(static::$table)
+              ->limit(1);
 
-        if(isset(static::$createdAt)) {
+        if (isset(static::$createdAt)) {
             $query->orderBy(static::$table . '.' . static::$columns[static::$createdAt]['name'], 'DESC');
         } else {
             $query->orderBy(static::$table . '.' . static::$columns[static::$primaryField]['name'], 'DESC');
@@ -481,9 +485,9 @@ abstract class DataMapperAbstract implements DataMapperInterface
     {
         $query = new Builder($this->db);
         $query->prefix($this->db->getPrefix())
-            ->select('*')
-            ->from(static::$table)
-            ->where(static::$table . '.' . static::$primaryField, '=', $primaryKey);
+              ->select('*')
+              ->from(static::$table)
+              ->where(static::$table . '.' . static::$primaryField, '=', $primaryKey);
 
         $sth = $this->db->con->prepare($query->toSql());
         $sth->execute();
@@ -522,9 +526,9 @@ abstract class DataMapperAbstract implements DataMapperInterface
             if (!isset($value['mapper'])) {
                 $query = new Builder($this->db);
                 $query->prefix($this->db->getPrefix())
-                    ->select($value['table'] . '.' . $value['src'])
-                    ->from($value['table'])
-                    ->where($value['table'] . '.' . $value['dst'], '=', $primaryKey);
+                      ->select($value['table'] . '.' . $value['src'])
+                      ->from($value['table'])
+                      ->where($value['table'] . '.' . $value['dst'], '=', $primaryKey);
 
                 $sth = $this->db->con->prepare($query->toSql());
                 $sth->execute();
@@ -560,8 +564,8 @@ abstract class DataMapperAbstract implements DataMapperInterface
     {
         $query = new Builder($this->db);
         $query->prefix($this->db->getPrefix())
-            ->select('*')
-            ->from(static::$table);
+              ->select('*')
+              ->from(static::$table);
 
         $sth = $this->db->con->prepare($query->toSql());
         $sth->execute();
diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php
index ebe184ac0..c0db411cf 100644
--- a/DataStorage/Database/Query/Builder.php
+++ b/DataStorage/Database/Query/Builder.php
@@ -17,6 +17,7 @@
 namespace phpOMS\DataStorage\Database\Query;
 
 use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
+use phpOMS\DataStorage\Database\Query;
 
 /**
  * Database query builder.
@@ -174,7 +175,7 @@ class Builder
      * @var QueryType
      * @since 1.0.0
      */
-    protected $type = null;
+    protected $type = QueryType::INSERT;
 
     protected $unionLimit = null;
 
@@ -792,6 +793,26 @@ class Builder
         return $this;
     }
 
+    /**
+     * Values to insert.
+     *
+     * @param mixed $value Values
+     *
+     * @return Builder
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    public function value($value) : Builder
+    {
+        end($this->values);
+        $key                  = key($this->values);
+        $this->values[$key][] = $value;
+        reset($this->values);
+
+        return $this;
+    }
+
     public function update() : Builder
     {
         $this->type = QueryType::UPDATE;
@@ -877,7 +898,8 @@ class Builder
         return $this->type;
     }
 
-    public function merge($query) : Builder {
+    public function merge($query) : Builder
+    {
         return clone($this);
     }
 }
diff --git a/DataStorage/Database/Query/Grammar/Grammar.php b/DataStorage/Database/Query/Grammar/Grammar.php
index e8ebde746..e2b5638dd 100644
--- a/DataStorage/Database/Query/Grammar/Grammar.php
+++ b/DataStorage/Database/Query/Grammar/Grammar.php
@@ -169,10 +169,10 @@ class Grammar extends \phpOMS\DataStorage\Database\Grammar
                 $components = $this->insertComponents;
                 break;
             case QueryType::UPDATE:
-                $components = null;
+                $components = [];
                 break;
             case QueryType::DELETE:
-                $components = null;
+                $components = [];
                 break;
             default:
                 throw new \InvalidArgumentException('Unknown query type.');