correct handling of unsetting relations and setting new not yet saved…

… relations
Recras · Oct 1, 2024 · 5213205 · 5213205
1 parent 2b8ebf7
commit 5213205
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
@@ -1494,9 +1494,17 @@ protected function _set($fieldName, $value, $load = true)
 
             $cd = $this->_table->getColumnDefinition($fieldName);
 
+            $isRelation = false;
+            foreach($this->_table->getRelations() as $name => $relation) {
+                if ($relation->getLocalFieldName() === $fieldName) {
+                    $isRelation = true;
+                    break;
+                }
+            }
+
             $nullable = !array_key_exists('notnull', $cd) || $cd['notnull'] === false;
 
-            if (!$nullable || !is_null($value)) {
+            if ($value !== self::$_null && !$isRelation && (!$nullable || !is_null($value))) {
                 switch ($type) {
                     case 'json':
                         if (!json_validate($value)) {