Merge pull request #12 from hiqsol/master

Still fixing running non batch queries from Collection
hiqdev · Nov 16, 2017 · c9b9571 · c9b9571
2 parents 028c161 + d5c996d
commit c9b9571
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
@@ -207,13 +207,41 @@ protected function updateInternal($attributes = null, $options = [])
         return $result === false ? false : true;
     }
 
+    /**
+     * Perform batch query.
+     * Attention: takes bulk data and returns bulk result.
+     * @param string $defaultScenario
+     * @param array $data bulk data
+     * @param array $options
+     * @return array bulk results
+     */
     public function batchQuery($defaultScenario, $data = [], array $options = [])
     {
-        $options['batch'] = true;
+        $batch = isset($options['batch']) ? (bool)$options['batch'] : true;
+        $options['batch'] = $batch;
+
+        if (!$batch) {
+            $val = reset($data);
+            $key = key($data);
+            $data = $val;
+        }
 
-        return $this->query($defaultScenario, $data, $options);
+        $result = $this->query($defaultScenario, $data, $options);
+
+        if (!$batch) {
+            $result = [$key = $result];
+        }
+
+        return $result;
     }
 
+    /**
+     * Perform query.
+     * @param string $defaultScenario
+     * @param array $data data
+     * @param array $options
+     * @return array result
+     */
     public function query($defaultScenario, $data = [], array $options = [])
     {
         $action = $this->getScenarioAction($defaultScenario);

diff --git a/src/Collection.php b/src/Collection.php
@@ -346,8 +346,8 @@ public function insert($runValidation = true, $attributes = null, array $queryOp
             return false;
         }
 
-        $data    = $this->collectData($attributes, $queryOptions);
-        $results = $this->first->query('create', $data, $queryOptions);
+        $data    = $this->collectData($attributes);
+        $results = $this->first->batchQuery('create', $data, $queryOptions);
         $pk      = $this->first->primaryKey()[0];
         foreach ($this->models as $key => $model) {
             $values = &$data[$key];
@@ -379,8 +379,8 @@ public function update($runValidation = true, $attributes = null, array $queryOp
             return false;
         }
 
-        $data    = $this->collectData($attributes, $queryOptions);
-        $results = $this->first->query('update', $data, $queryOptions);
+        $data    = $this->collectData($attributes);
+        $results = $this->first->batchQuery('update', $data, $queryOptions);
 
         foreach ($this->models as $key => $model) {
             $changedAttributes = [];
@@ -414,10 +414,9 @@ public function delete()
     /**
      * Collects data from the stored models.
      * @param string|array $attributes list of attributes names
-     * @param array $queryOptions options that are going to be
      * @return array
      */
-    public function collectData($attributes = null, $queryOptions = [])
+    public function collectData($attributes = null)
     {
         $data = [];
         foreach ($this->models as $model) {
@@ -435,11 +434,7 @@ public function collectData($attributes = null, $queryOptions = [])
             }
         }
 
-        if (isset($queryOptions['batch']) && (bool)$queryOptions['batch'] === true) {
-            return $data;
-        }
-
-        return reset($data);
+        return $data;
     }
 
     /**