From b91c713e07017c17cb110a9dee9e3370b2a4cbcf Mon Sep 17 00:00:00 2001
From: Jonas Raoni Soares da Silva <github@raoni.org>
Date: Fri, 26 Jul 2024 16:33:09 +0300
Subject: [PATCH] pkp/pkp-lib#10249 Fixed regression on migration

---
 .../upgrade/OJSv3_3_0UpgradeMigration.inc.php | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php b/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
index 734c72b913d..8a32b636413 100644
--- a/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
+++ b/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
@@ -162,17 +162,20 @@ private function _toJSON($row, $tableName, $searchBy, $valueToConvert)
 		if (is_array($oldValue) && $this->_isNumerical($oldValue)) $oldValue = array_values($oldValue);
 		$newValue = json_encode($oldValue, JSON_UNESCAPED_UNICODE); // don't convert utf-8 characters to unicode escaped code
 
-		$id = array_key_first((array)$row); // get first/primary key column
-
-		// Remove empty filters
-		$searchBy = array_filter($searchBy, function ($item) use ($row) {
-			if (empty($row->{$item})) return false;
-			return true;
-		});
+		// Ensure ID fields are included on the filter to avoid updating similar rows
+		foreach (array_keys($row) as $column) {
+			if (substr($column, -3, '_id')) {
+				$searchBy[] = $column;
+			}
+		}
 
-		$queryBuilder = Capsule::table($tableName)->where($id, $row->{$id});
-		foreach ($searchBy as $key => $column) {
-			$queryBuilder = $queryBuilder->where($column, $row->{$column});
+		$queryBuilder = Capsule::table($tableName);
+		foreach (array_unique($searchBy) as $column) {
+			if ($row->{$column} !== null) {
+				$queryBuilder->where($column, $row->{$column});
+			} else {
+				$queryBuilder->whereNull($column);
+			}
 		}
 		$queryBuilder->update([$valueToConvert => $newValue]);
 	}