Fix DAO after function removal; fix namespace

pkp · Dec 7, 2024 · b8e3419 · b8e3419
1 parent abd0e4e
commit b8e3419
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/classes/announcement/AnnouncementTypeDAO.php b/classes/announcement/AnnouncementTypeDAO.php
@@ -20,7 +20,7 @@
 
 use APP\core\Application;
 use Generator;
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 
 class AnnouncementTypeDAO extends \PKP\db\DAO

diff --git a/classes/db/DAO.php b/classes/db/DAO.php
@@ -454,7 +454,10 @@ public function updateDataObjectSettings(string $tableName, DataObject $dataObje
                             $updateArray['setting_type'] = null;
                             // Convert the data value and implicitly set the setting type.
                             $updateArray['setting_value'] = $this->convertToDB($value, $updateArray['setting_type']);
-                            $this->replace($tableName, $updateArray, $idFields);
+
+                            $matchValues = array_filter($updateArray, fn ($key) => in_array($key, $idFields), ARRAY_FILTER_USE_KEY);
+                            $additionalValues = array_filter($updateArray, fn ($key) => !in_array($key, $idFields), ARRAY_FILTER_USE_KEY);
+                            DB::table($tableName)->updateOrInsert($matchValues, $additionalValues);
                         }
                     } else {
                         // Data is maintained "sparsely". Only set fields will be