3lvis · 3lvis · Jan 30, 2018 · Oct 11, 2017 · Oct 16, 2017 · Oct 30, 2017
diff --git a/Project.xcodeproj/project.pbxproj b/Project.xcodeproj/project.pbxproj
diff --git a/Source/Sync/NSManagedObject+Sync.swift b/Source/Sync/NSManagedObject+Sync.swift
@@ -194,6 +194,8 @@ extension NSManagedObject {
      - parameter dataStack: The DataStack instance.
      */
     func sync_toManyRelationship(_ relationship: NSRelationshipDescription, dictionary: [String: Any], parent: NSManagedObject?, parentRelationship: NSRelationshipDescription?, context: NSManagedObjectContext, operations: Sync.OperationOptions, shouldContinueBlock: (() -> Bool)?, objectJSONBlock: ((_ objectJSON: [String: Any]) -> [String: Any])?) throws {
+        let updatedOperations = operations.relationshipOperations()
+
         var children: [[String: Any]]?
         let childrenIsNull = (relationship.customKey as Any?) is NSNull || dictionary[relationship.name.hyp_snakeCase()] is NSNull || dictionary[relationship.name] is NSNull
         if childrenIsNull {
@@ -300,7 +302,7 @@ extension NSManagedObject {
 
             var childPredicate: NSPredicate?
             let manyToMany = inverseIsToMany && relationship.isToMany
-            var childOperations = operations
+            var childOperations = updatedOperations
             if manyToMany {
                 childOperations.remove(.delete)
                 if ((childIDs as Any) as AnyObject).count > 0 {

diff --git a/Source/Sync/Sync.swift b/Source/Sync/Sync.swift
@@ -27,7 +27,28 @@ public protocol SyncDelegate: class {
         public static let insert = OperationOptions(rawValue: 1 << 0)
         public static let update = OperationOptions(rawValue: 1 << 1)
         public static let delete = OperationOptions(rawValue: 1 << 2)
-        public static let all: OperationOptions = [.insert, .update, .delete]
+        public static let insertRelationships = OperationOptions(rawValue: 1 << 3)
+        public static let updateRelationships = OperationOptions(rawValue: 1 << 4)
+        public static let deleteRelationships = OperationOptions(rawValue: 1 << 5)
+        public static let all: OperationOptions = [.insert, .update, .delete, .insertRelationships, .updateRelationships, .deleteRelationships]
+
+        func relationshipOperations() -> OperationOptions {
+            var options = OperationOptions.all
+
+            if !self.contains(.insertRelationships) {
+                options.remove(.insert)
+            }
+
+            if !self.contains(.updateRelationships) {
+                options.remove(.update)
+            }
+
+            if !self.contains(.deleteRelationships) {
+                options.remove(.delete)
+            }
+
+            return options
+        }
     }
 
     var downloadFinished = false

diff --git a/Tests/Sync/JSONs/422-many-to-many-delete-option-initial.json b/Tests/Sync/JSONs/422-many-to-many-delete-option-initial.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      },
+      {
+        "id": 102,
+        "text": "102"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-many-to-many-delete-option-update.json b/Tests/Sync/JSONs/422-many-to-many-delete-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102-updated"
+      },
+      {
+        "id": 103,
+        "text": "103"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-many-to-many-insert-option-initial.json b/Tests/Sync/JSONs/422-many-to-many-insert-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-many-to-many-insert-option-update.json b/Tests/Sync/JSONs/422-many-to-many-insert-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-many-to-many-update-option-initial.json b/Tests/Sync/JSONs/422-many-to-many-update-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-many-to-many-update-option-update.json b/Tests/Sync/JSONs/422-many-to-many-update-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-delete-option-initial.json b/Tests/Sync/JSONs/422-one-to-many-delete-option-initial.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      },
+      {
+        "id": 102,
+        "text": "102"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-delete-option-update.json b/Tests/Sync/JSONs/422-one-to-many-delete-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102-updated"
+      },
+      {
+        "id": 103,
+        "text": "103"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-insert-option-initial.json b/Tests/Sync/JSONs/422-one-to-many-insert-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-insert-option-update.json b/Tests/Sync/JSONs/422-one-to-many-insert-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-update-option-initial.json b/Tests/Sync/JSONs/422-one-to-many-update-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-many-update-option-update.json b/Tests/Sync/JSONs/422-one-to-many-update-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-delete-option-initial.json b/Tests/Sync/JSONs/422-one-to-one-delete-option-initial.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      },
+      {
+        "id": 102,
+        "text": "102"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-delete-option-update.json b/Tests/Sync/JSONs/422-one-to-one-delete-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102-updated"
+      },
+      {
+        "id": 103,
+        "text": "103"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-insert-option-initial.json b/Tests/Sync/JSONs/422-one-to-one-insert-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-insert-option-update.json b/Tests/Sync/JSONs/422-one-to-one-insert-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-update-option-initial.json b/Tests/Sync/JSONs/422-one-to-one-update-option-initial.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 101,
+        "text": "101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/JSONs/422-one-to-one-update-option-update.json b/Tests/Sync/JSONs/422-one-to-one-update-option-update.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "messages": [
+      {
+        "id": 102,
+        "text": "102"
+      },
+      {
+        "id": 101,
+        "text": "updated-101"
+      }
+    ]
+  }
+]
diff --git a/Tests/Sync/Models/422ManyToMany.xcdatamodeld/422ManyToMany.xcdatamodel/contents b/Tests/Sync/Models/422ManyToMany.xcdatamodeld/422ManyToMany.xcdatamodel/contents
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="17D47" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="Message" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="text" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="users" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="messages" inverseEntity="User" syncable="YES"/>
+    </entity>
+    <entity name="User" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="messages" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Message" inverseName="users" inverseEntity="Message" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Message" positionX="-54" positionY="-9" width="128" height="90"/>
+        <element name="User" positionX="-297" positionY="-12" width="128" height="75"/>
+    </elements>
+</model>
diff --git a/Tests/Sync/Models/422OneToMany.xcdatamodeld/422OneToMany.xcdatamodel/contents b/Tests/Sync/Models/422OneToMany.xcdatamodeld/422OneToMany.xcdatamodel/contents
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13241" systemVersion="16G29" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="Message" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="text" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="messages" inverseEntity="User" syncable="YES"/>
+    </entity>
+    <entity name="User" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="messages" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Message" inverseName="user" inverseEntity="Message" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="User" positionX="-297" positionY="-12" width="128" height="75"/>
+        <element name="Message" positionX="-54" positionY="-9" width="128" height="88"/>
+    </elements>
+</model>
diff --git a/Tests/Sync/Models/422OneToOne.xcdatamodeld/422OneToOne.xcdatamodel/contents b/Tests/Sync/Models/422OneToOne.xcdatamodeld/422OneToOne.xcdatamodel/contents
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="17C88" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="Author" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="book" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="Book" inverseName="author" inverseEntity="Book" syncable="YES"/>
+    </entity>
+    <entity name="Book" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="author" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Author" inverseName="book" inverseEntity="Author" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Book" positionX="-54" positionY="-9" width="128" height="73"/>
+        <element name="Author" positionX="-297" positionY="-12" width="128" height="73"/>
+    </elements>
+</model>