Update RelationTrait.php

Author: mootensai

RelationTrait.php

@@ -54,50 +54,53 @@ public function saveAll() {
         try {
             if ($this->save()) {
                 $error = 0;
-                if (!empty($this->relatedRecords)) {
-                    foreach ($this->relatedRecords as $name => $records) {
-                        $AQ = $this->getRelation($name);
-                        $link = $AQ->link;
-                        $notDeletedPK = [];
-                        $relPKAttr = $records[0]->primaryKey();
-                        $isCompositePK = (count($relPKAttr) > 1);
-                        /* @var $relModel ActiveRecord */
-                        foreach($records as $index => $relModel){
-                            foreach ($link as $key => $value){
-                                $relModel->$key = $this->$value;
-                                $notDeletedFK[$key] = "$key = '{$this->$value}'";
-                            }
-                            if(!$relModel->save()){
-                                $relModelWords = Inflector::camel2words(StringHelper::basename($AQ->modelClass));
-                                $index++;
-                                foreach ($relModel->errors as $validation){
-                                    foreach($validation as $errorMsg){
-                                        $this->addError($name,"$relModelWords #$index : $errorMsg");
-                                    }
+                foreach ($this->relatedRecords as $name => $records) {
+                    $AQ = $this->getRelation($name);
+                    $link = $AQ->link;
+                    $notDeletedPK = [];
+                    $relPKAttr = $records[0]->primaryKey();
+                    $isCompositePK = (count($relPKAttr) > 1);
+                    /* @var $relModel ActiveRecord */
+                    foreach($records as $index => $relModel){
+                        foreach ($link as $key => $value){
+                            $relModel->$key = $this->$value;
+                            $notDeletedFK[$key] = "$key = '{$this->$value}'";
+                        }
+                        $relSave = $relModel->save();
+                        if(!$relSave){
+                            $relModelWords = Inflector::camel2words(StringHelper::basename($AQ->modelClass));
+                            $index++;
+                            foreach ($relModel->errors as $validation){
+                                foreach($validation as $errorMsg){
+                                    $this->addError($name,"$relModelWords #$index : $errorMsg");
                                 }
-                                $error = 1;
-                            }else{
-                                //GET PK OF REL MODEL
-                                if($isCompositePK){
-                                    foreach($relModel->primaryKey as $attr => $value){
-                                        $notDeletedPK[$attr][] = "'$value'";
-                                    }
-                                }  else {
-                                    $notDeletedPK[] = "'$relModel->primaryKey'";
+                            }
+                            $error = 1;
+                        }else{
+                            //GET PK OF REL MODEL
+                            if($isCompositePK){
+                                foreach($relModel->primaryKey as $attr => $value){
+                                    $notDeletedPK[$attr][] = "'$value'";
                                 }
+                            }  else {
+                                $notDeletedPK[] = "'$relModel->primaryKey'";
                             }
                         }
-                        if(!empty($notDeletedPK) && !empty($notDeletedFK)){
-                            //DELETE WITH 'NOT IN' PK MODEL & REL MODEL
-                            $notDeletedFK = implode(' AND ', $notDeletedFK);
-                            if($isCompositePK){
-                                $compiledNotDeletedPK = [];
-                                foreach($notDeletedPK as $attr => $pks){
-                                    $compiledNotDeletedPK[$attr] = "$attr NOT IN(".implode(', ', $pks).")";
+                    }
+                    if(!$this->isNewRecord){
+                        //DELETE WITH 'NOT IN' PK MODEL & REL MODEL
+                        $notDeletedFK = implode(' AND ', $notDeletedFK);
+                        if($isCompositePK){
+                            $compiledNotDeletedPK = [];
+                            foreach($notDeletedPK as $attr => $pks){
+                                $compiledNotDeletedPK[$attr] = "$attr NOT IN(".implode(', ', $pks).")";
+                                if(!empty($compiledNotDeletedPK[$attr])){
                                     $relModel->deleteAll("$notDeletedFK AND ".implode(' AND ', $compiledNotDeletedPK));
                                 }
-                            }else{
-                                $compiledNotDeletedPK = implode(',', $notDeletedPK);
+                            }
+                        }else{
+                            $compiledNotDeletedPK = implode(',', $notDeletedPK);
+                            if(!empty($compiledNotDeletedPK)){
                                 $relModel->deleteAll($notDeletedFK.' AND '.$relPKAttr[0]." NOT IN ($compiledNotDeletedPK)");
                             }
                         }