From aa3a7d66f840ed8d3b24233f5cbbd3568e2f4679 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Sun, 28 Aug 2016 18:29:49 +0900 Subject: [PATCH] =?UTF-8?q?NetCommonsMigration::updateRecords()=E3=81=AEMo?= =?UTF-8?q?del=E5=85=A8=E5=89=8A=E9=99=A4=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE=E6=AD=A3=20?= =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E5=80=A4=E3=82=92?= =?UTF-8?q?$clear=20=3D=20false=E3=81=AB=E4=BF=AE=E6=AD=A3=20-=20NetCommon?= =?UTF-8?q?sMigration=20https://github.com/NetCommons3/NetCommons3/issues/?= =?UTF-8?q?586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/Migration/NetCommonsMigration.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Config/Migration/NetCommonsMigration.php b/Config/Migration/NetCommonsMigration.php index f84ca623..4cde0e19 100644 --- a/Config/Migration/NetCommonsMigration.php +++ b/Config/Migration/NetCommonsMigration.php @@ -29,10 +29,12 @@ class NetCommonsMigration extends CakeMigration { * @return bool Should process continue * @SuppressWarnings(PHPMD.BooleanArgumentFlag) */ - public function updateRecords($model, $records, $clear = true) { + public function updateRecords($model, $records, $clear = false) { $Model = $this->generateModel($model); if ($clear) { - $Model->deleteAll(array(), false, false); + if (!$Model->deleteAll(array('1 = 1'), false, false)) { + return false; + } } foreach ($records as $record) { $Model->create();