Merge pull request #520 from sakuraovq/master

remove batchUpdateOrInsert

Author: sakuraovq

src/db/src/Eloquent/Builder.php

@@ -1251,66 +1251,6 @@ public function batchUpdateByIds(array $values): int
         return $this->toBase()->batchUpdateByIds($values, $primary);
     }
 
-    /**
-     * Batch Update Or Insert, UpdateOrInsert operating suggest add unique index
-     *
-     * @param array $items      origin item
-     * @param array $baseWhere  only support [key=>value] where
-     * @param array $whereKeys  exists data where item
-     * @param array $updateKeys update item key
-     * @param array $incrKeys   increment item key
-     *
-     * @return bool
-     * @throws ContainerException
-     * @throws DbException
-     * @throws ReflectionException
-     */
-    public function batchUpdateOrInsert(
-        array $items,
-        array $baseWhere,
-        array $whereKeys = [],
-        array $updateKeys = [],
-        array $incrKeys = []
-    ): bool {
-        $primary = $this->model->getKeyName();
-
-        $count      = 0;
-        $timeColumn = $this->model->updateTimestamps();
-
-        foreach ($items as $k => &$item) {
-            $item = $this->model->getSafeAttributes($item);
-
-            if ($count === 0) {
-                $count = count($item);
-            } elseif ($count !== count($item)) {
-                throw new DbException('batchUpdateOrInsert The parameter length must be consistent.');
-            }
-
-            if (empty($item)) {
-                continue;
-            }
-
-            if ($timeColumn) {
-                $items[$k] = array_merge($timeColumn, $item);
-            }
-        }
-        unset($item);
-        // Filter empty values
-        $items = array_filter($items);
-        if (empty($items)) {
-            return false;
-        }
-
-        // Auto update "updateAt" column
-        $updateAtColumn = $this->model->getUpdatedAtColumn();
-        if (isset($timeColumn[$updateAtColumn])) {
-            $updateKeys[] = $updateAtColumn;
-        }
-
-        return $this->toBase()->batchUpdateOrInsert($items, $baseWhere, $whereKeys, $updateKeys, $incrKeys, $primary);
-    }
-
-
     /**
      * Dynamically handle calls into the query instance.
      *

src/db/src/Eloquent/Model.php

@@ -52,7 +52,6 @@
  * @method static static firstOrCreate(array $attributes, array $values = [])
  * @method static static updateOrCreate(array $attributes, array $values = [], array $counters = [])
  * @method static bool updateOrInsert(array $attributes, array $values = [], array $counters = [])
- * @method static bool batchUpdateOrInsert(array $items, array $baseWhere, array $whereKeys = [], array $updateKeys = [], array $incrKeys = []);
  * @method static int batchUpdateByIds(array $values)
  * @method static int updateAllCounters(array $attributes, array $counters, array $extra = [])
  * @method static int updateAllCountersAdoptPrimary(array $attributes, array $counters, array $extra = [])

src/db/src/Query/Builder.php

@@ -2894,92 +2894,6 @@ public function batchUpdateByIds(array $values, string $primary = 'id')
         return $affectedRows;
     }
 
-    /**
-     * Batch Update Or Insert, UpdateOrInsert operating suggest add unique index
-     *
-     * @param array  $items      origin item
-     * @param array  $baseWhere  only support [key=>value] where
-     * @param array  $whereKeys  exists data where item
-     * @param array  $updateKeys update item key
-     * @param array  $incrKeys   increment item key
-     * @param string $primary    table primary
-     *
-     * @return bool
-     * @throws ContainerException
-     * @throws DbException
-     * @throws ReflectionException
-     */
-    public function batchUpdateOrInsert(
-        array $items,
-        array $baseWhere,
-        array $whereKeys = [],
-        array $updateKeys = [],
-        array $incrKeys = [],
-        string $primary = 'id'
-    ): bool {
-        $wheres = [];
-        foreach ($items as $k => $v) {
-            foreach ($whereKeys as $whereKey) {
-                $value                     = $v[$whereKey];
-                $wheres[$whereKey][$value] = $value;
-            }
-
-            if ($baseWhere) {
-                $items[$k] = array_merge($baseWhere, $v);
-            }
-        }
-
-        $existMaps = [];
-
-        $searchWhere = $wheres;
-        if ($baseWhere) {
-            $searchWhere = array_merge($baseWhere, $wheres);
-        }
-
-        $exitsList  = $this->select($primary, ...$whereKeys)->where($searchWhere)->get();
-        $uniqueKeys = array_keys($searchWhere);
-        foreach ($exitsList as $record) {
-            $mergeData = $record;
-            if ($baseWhere) {
-                $mergeData = array_merge($baseWhere, $record);
-            }
-
-            $uniqueId             = ArrayHelper::toString(
-                ArrayHelper::only($mergeData, $uniqueKeys)
-            );
-            $existMaps[$uniqueId] = $record[$primary];
-        }
-
-        $addItems = $updateItems = [];
-        foreach ($items as $item) {
-            $uniqueId = ArrayHelper::toString(ArrayHelper::only($item, $uniqueKeys));
-
-            if (isset($existMaps[$uniqueId])) {
-                $updateItem    = array_merge(
-                    ArrayHelper::only($item, $updateKeys),
-                    $this->warpCounters(ArrayHelper::only($item, $incrKeys))
-                );
-                $updateItems[] = $updateItem;
-
-                continue;
-            }
-
-            $addItems[] = $item;
-        }
-
-        $updateRes = $addRes = true;
-
-        if ($updateItems) {
-            $updateRes = $this->batchUpdateByIds($updateItems);
-        }
-
-        if ($addItems) {
-            $addRes = $this->insert($addItems);
-        }
-
-        return $updateRes && $addRes;
-    }
-
     /**
      * Insert a new record and get the value of the primary key.
      *

src/db/test/unit/Eloquent/ModelTest.php

@@ -867,44 +867,4 @@ public function testWhereCall()
         $this->assertEquals($sql, $toSql);
     }
 
-    public function testModelBatchUpdateOrInsert()
-    {
-        $updateOrInsertItems = [
-            [
-                'age'       => 2,
-                'user_desc' => 'desc2',
-                'hahh'      => 2,
-            ],
-            [
-                'age'       => 3,
-                'user_desc' => 'desc2',
-                'hahh'      => 3,
-            ],
-            [
-                'age'       => 3,
-                'user_desc' => 'desc1',
-                'hahh'      => 3,
-            ],
-            [
-                'age'       => 3,
-                'user_desc' => 'desc41',
-                'hahh'      => 3,
-            ]
-        ];
-
-        $baseWhere = [
-            'name' => 'swoft'
-        ];
-
-        $result = User::batchUpdateOrInsert(
-            $updateOrInsertItems,
-            $baseWhere,
-            ['user_desc'],
-            ['age', 'user_desc'],
-            ['hahh']
-        );
-
-        $this->assertTrue($result);
-    }
-
 }

src/db/test/unit/Query/BuilderTest.php

@@ -778,39 +778,4 @@ public function testWhereArray()
 
         $this->assertEquals($expectSql, $res);
     }
-
-    public function testBatchUpdateOrInsert()
-    {
-        $updateOrInsertItems = [
-            [
-                'age'       => 2,
-                'user_desc' => 'desc',
-                'hahh'      => 2,
-            ],
-            [
-                'age'       => 3,
-                'user_desc' => 'desc',
-                'hahh'      => 3,
-            ],
-            [
-                'age'       => 3,
-                'user_desc' => 'desc1',
-                'hahh'      => 3,
-            ]
-        ];
-
-        $baseWhere = [
-            'name' => 'swoft'
-        ];
-
-        $result = DB::table('user')->batchUpdateOrInsert(
-            $updateOrInsertItems,
-            $baseWhere,
-            ['user_desc'],
-            ['age', 'user_desc'],
-            ['hahh']
-        );
-
-        $this->assertTrue($result);
-    }
 }