Merge branch 'release-1.2.7'

Author: Lebugg

lib/Database.php

@@ -17,62 +17,9 @@ class Database
 {
     private $_connection;
 
-    public function __construct(Connection $conn)
+    public function __construct(Connection $conn = null)
     {
-        $this->setConnection($conn);
-        $this->chooseCompiler();
-    }
-
-    /**
-     * Set the compiler according to database driver.
-     *
-     * If no adequate compiler is found for the driver, default compiler is 
-     * used.
-     *
-     * @see setCompiler()
-     * @see setDefaultCompiler()
-     */
-    public function chooseCompiler()
-    {
-        $specificCompiler = ucfirst($this->_connection->getDriver()) . 'Compiler';
-        $specificCompiler = 'SimpleAR\Database\Compiler\\' . $specificCompiler;
-
-        if (class_exists($specificCompiler)) {
-            $this->setCompiler(new $specificCompiler);
-        } else {
-            $this->setDefaultCompiler();
-        }
-    }
-
-    /**
-     * Set the connecton.
-     *
-     * @param Connection $conn
-     */
-    public function setConnection(Connection $conn)
-    {
-        $this->_connection = $conn;
-    }
-
-    /**
-     * Set the compiler.
-     *
-     * @param Compiler $compiler
-     */
-    public function setCompiler(Compiler $compiler)
-    {
-        $this->_compiler = $compiler;
-    }
-
-    /**
-     * Set default compiler.
-     *
-     * @see setCompiler()
-     * @see Database\Compiler\BaseCompiler
-     */
-    public function setDefaultCompiler()
-    {
-        $this->setCompiler(new BaseCompiler);
+        $conn && $this->setConnection($conn);
     }
 
     /**
@@ -91,19 +38,29 @@ public function expr($expression)
      *
      * @var Connection
      */
-    public function connection()
+    public function getConnection()
     {
         return $this->_connection;
     }
 
+    /**
+     * Set the connecton.
+     *
+     * @param Connection $conn
+     */
+    public function setConnection(Connection $conn)
+    {
+        $this->_connection = $conn;
+    }
+
     /**
      * Return the Compiler instance.
      *
      * @var Compiler
      */
-    public function compiler()
+    public function getCompiler()
     {
-        return $this->_compiler;
+        return $this->getConnection()->getCompiler();
     }
 
     /**

lib/Database/Builder.php

@@ -208,14 +208,29 @@ public function convertAttributesToColumns($attributes, Table $table)
     /**
      * Add query value to value list.
      *
+     * If $component is not given, it expects $value to be an array of 
+     * components' values.
+     *
      * @param mixed $value The value to add to the value list.
+     * @param string $component The component type ('set', 'where'...).
+     *
      * @return void
      */
-    public function addValueToQuery($value)
+    public function addValueToQuery($value, $component = '')
     {
-        if (! $value instanceof Expression)
+        if ($component)
         {
-            $this->_values[] = $value;
+            if (! $value instanceof Expression)
+            {
+                $this->_values[$component][] = $value;
+            }
+        }
+        else
+        {
+            foreach ($value as $component => $values)
+            {
+                $this->addValueToQuery($values, $component);
+            }
         }
     }
 

lib/Database/Builder/InsertBuilder.php

@@ -12,19 +12,6 @@ class InsertBuilder extends Builder
         'values',
     );
 
-    public function getValues()
-    {
-        $values = $this->_components['values'];
-
-        if (is_array($values[0]))
-        {
-            // We also need to flatten value array.
-            return call_user_func_array('array_merge', $values);
-        }
-
-        return $values;
-    }
-
     public function useRootModel($class)
     {
         parent::useRootModel($class);
@@ -52,5 +39,6 @@ protected function _buildFields(array $fields)
     protected function _buildValues(array $values)
     {
         $this->_components['values'] = $values;
+        $this->addValueToQuery($values, 'values');
     }
 }

lib/Database/Builder/UpdateBuilder.php

@@ -75,7 +75,7 @@ protected function _buildSet(array $sets)
             $this->_components['set'][] = compact('tableAlias', 'column', 'value');
 
             // One other task to do: move value over one place.
-            $this->addValueToQuery($value);
+            $this->addValueToQuery($value, 'set');
         }
     }
 }