From 1700cf15913c1f3949bebc3e0fb9f61b5d6f07c0 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Mon, 1 May 2023 15:53:03 -0700 Subject: [PATCH 1/5] Fixed a bug where custom fields would not import on Postgres --- CHANGELOG.md | 4 ++++ src/services/Process.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbfea9b1..f20a39af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Release Notes for Feed Me 4.x +## Unreleased + +- Fixed a bug where custom fields would not import on Postgres. + ## 4.6.3 - 2023-04-28 > **Warning** diff --git a/src/services/Process.php b/src/services/Process.php index 1e69e7e0..909548d8 100644 --- a/src/services/Process.php +++ b/src/services/Process.php @@ -395,7 +395,7 @@ public function processFeed($step, $feed, &$processedElementIds, $feedData = nul $fieldValue = Plugin::$plugin->fields->parseField($feed, $element, $feedData, $fieldHandle, $fieldInfo); if ($fieldValue !== null) { - if ($feed['setEmptyValues'] === 1 || ($feed['setEmptyValues'] === 0 && !empty($fieldValue))) { + if ($feed['setEmptyValues'] || !empty($fieldValue)) { $fieldData[$fieldHandle] = $fieldValue; } } From 82aeb6898cdaa2d9854c8275a36eb0c14282aa54 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Tue, 2 May 2023 14:45:52 -0700 Subject: [PATCH 2/5] s => SQL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f20a39af..362d8478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -- Fixed a bug where custom fields would not import on Postgres. +- Fixed a bug where custom fields would not import on PostgreSQL. ## 4.6.3 - 2023-04-28 From 18b1562d035c94f65f38f5edb76959d954fd76e9 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Tue, 2 May 2023 15:33:14 -0700 Subject: [PATCH 3/5] 4.3.6.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 362d8478..be0b22ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Feed Me 4.x -## Unreleased +## 4.6.3.1 - 2023-05-02 - Fixed a bug where custom fields would not import on PostgreSQL. From 2e94c48e37d03d24bc31f690a1b3c8b3817d43ab Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Tue, 2 May 2023 15:36:55 -0700 Subject: [PATCH 4/5] 4.6.3.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 362d8478..be0b22ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Feed Me 4.x -## Unreleased +## 4.6.3.1 - 2023-05-02 - Fixed a bug where custom fields would not import on PostgreSQL. From 8f15bc1ab9eddb99bc119e661e3c747abd9a3f10 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Tue, 2 May 2023 15:40:05 -0700 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34283880..8f1a63e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Feed Me -## 4.6.3.1 - 2023-05-02 +## 5.1.3.1 - 2023-05-02 - Fixed a bug where custom fields would not import on PostgreSQL.