From 5b624512f975284833d25c10f3054c558412c765 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 22 Aug 2019 15:17:01 +0200
Subject: [PATCH] FEAT #11270 TIME 0:10 Clean table before migration
---
migration/19.12/migrateCustomFields.php | 5 +++++
src/app/customField/models/CustomFieldModel.php | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/migration/19.12/migrateCustomFields.php b/migration/19.12/migrateCustomFields.php
index de57ab6cdc3..c510c062f5b 100644
--- a/migration/19.12/migrateCustomFields.php
+++ b/migration/19.12/migrateCustomFields.php
@@ -12,6 +12,11 @@ foreach ($customs as $custom) {
continue;
}
+ \SrcCore\models\DatabasePDO::reset();
+ new \SrcCore\models\DatabasePDO(['customId' => $custom]);
+
+ \CustomField\models\CustomFieldModel::delete(['where' => ['1=1']]);
+
$natures = [];
$migrated = 0;
$path = "custom/{$custom}/apps/maarch_entreprise/xml/index_letterbox.xml";
diff --git a/src/app/customField/models/CustomFieldModel.php b/src/app/customField/models/CustomFieldModel.php
index 66b31c5ac2e..81d7e6d8b4c 100644
--- a/src/app/customField/models/CustomFieldModel.php
+++ b/src/app/customField/models/CustomFieldModel.php
@@ -93,13 +93,13 @@ class CustomFieldModel
public static function delete(array $args)
{
- ValidatorModel::notEmpty($args, ['where', 'data']);
+ ValidatorModel::notEmpty($args, ['where']);
ValidatorModel::arrayType($args, ['where', 'data']);
DatabaseModel::delete([
'table' => 'custom_fields',
'where' => $args['where'],
- 'data' => $args['data']
+ 'data' => $args['data'] ?? []
]);
return true;
--
GitLab