Removing setPrimitive methods, which have been fundamentally broken since the addition of extensions. Replacing them with advanced setObject methods that allow one to pass pre-serialized versions of the object and/or metadata. Also renaming the primitive accessors to use the new serializedObject / serializedMetadata terminology. Fixes issue #23

Author: robbiehanson

Testing/UnitTesting/TestYapDatabase.m

@@ -69,7 +69,7 @@ - (void)test1
 		XCTAssertTrue([transaction numberOfKeysInCollection:nil] == 0, @"Expected zero key count");
 
 		XCTAssertNil([transaction objectForKey:@"non-existant" inCollection:nil], @"Expected nil object");
-		XCTAssertNil([transaction primitiveDataForKey:@"non-existant" inCollection:nil], @"Expected nil data");
+		XCTAssertNil([transaction serializedObjectForKey:@"non-existant" inCollection:nil], @"Expected nil data");
 
 		XCTAssertFalse([transaction hasObjectForKey:@"non-existant" inCollection:nil], @"Expected NO object for key");
 
@@ -125,7 +125,7 @@ - (void)test1
 		XCTAssertTrue([[transaction allKeysInCollection:@""] count] == 1, @"Expected 1 key");
 
 		XCTAssertNotNil([transaction objectForKey:key1 inCollection:nil], @"Expected non-nil object");
-		XCTAssertNotNil([transaction primitiveDataForKey:key1 inCollection:nil], @"Expected non-nil data");
+		XCTAssertNotNil([transaction serializedObjectForKey:key1 inCollection:nil], @"Expected non-nil data");
 
 		XCTAssertTrue([transaction hasObjectForKey:key1 inCollection:nil], @"Expected YES");
 
@@ -166,7 +166,7 @@ - (void)test1
 		XCTAssertTrue([[transaction allKeysInCollection:nil] count] == 0, @"Expected 0 keys");
 
 		XCTAssertNil([transaction objectForKey:key1 inCollection:nil], @"Expected nil object");
-		XCTAssertNil([transaction primitiveDataForKey:key1 inCollection:nil], @"Expected nil data");
+		XCTAssertNil([transaction serializedObjectForKey:key1 inCollection:nil], @"Expected nil data");
 
 		XCTAssertFalse([transaction hasObjectForKey:key1 inCollection:nil], @"Expected NO");
 	}];
@@ -181,7 +181,7 @@ - (void)test1
 		XCTAssertTrue([[transaction allKeysInCollection:nil] count] == 1, @"Expected 1 key");
 
 		XCTAssertNotNil([transaction objectForKey:key1 inCollection:nil], @"Expected non-nil object");
-		XCTAssertNotNil([transaction primitiveDataForKey:key1 inCollection:nil], @"Expected non-nil data");
+		XCTAssertNotNil([transaction serializedObjectForKey:key1 inCollection:nil], @"Expected non-nil data");
 
 		XCTAssertTrue([transaction hasObjectForKey:key1 inCollection:nil], @"Expected YES");
 

YapDatabase/Extensions/Relationships/YapDatabaseRelationshipTransaction.m

@@ -2378,7 +2378,8 @@ - (void)flush
 								[databaseRwTransaction replaceObject:updatedDestinationNode
 								                              forKey:edge->destinationKey
 								                        inCollection:edge->destinationCollection
-								                           withRowid:edge->destinationRowid];
+								                           withRowid:edge->destinationRowid
+								                    serializedObject:nil];
 							}
 						}
 					}
@@ -2437,7 +2438,8 @@ - (void)flush
 								[databaseRwTransaction replaceObject:updatedSourceNode
 								                              forKey:edge->sourceKey
 								                        inCollection:edge->sourceCollection
-								                           withRowid:edge->sourceRowid];
+								                           withRowid:edge->sourceRowid
+								                    serializedObject:nil];
 							}
 						}
 					}
@@ -2753,7 +2755,8 @@ - (void)flush
 								[databaseRwTransaction replaceObject:updatedDstNode
 								                              forKey:edge->destinationKey
 								                        inCollection:edge->destinationCollection
-								                           withRowid:edge->destinationRowid];
+								                           withRowid:edge->destinationRowid
+								                    serializedObject:nil];
 							}
 						}
 					}
@@ -2839,7 +2842,8 @@ - (void)flush
 							[databaseRwTransaction replaceObject:updatedSrcNode
 							                              forKey:edge->sourceKey
 							                        inCollection:edge->sourceCollection
-							                           withRowid:edge->sourceRowid];
+							                           withRowid:edge->sourceRowid
+							                    serializedObject:nil];
 						}
 					}
 				}

YapDatabase/Internal/YapDatabasePrivate.h

@@ -439,11 +439,17 @@ extern NSString *const YapDatabaseNotificationKey;
 	id customObjectForNotification;
 }
 
-- (void)replaceObject:(id)object forKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (void)replaceObject:(id)object
+               forKey:(NSString *)key
+         inCollection:(NSString *)collection
+            withRowid:(int64_t)rowid
+     serializedObject:(NSData *)preSerializedObject;
+
 - (void)replaceMetadata:(id)metadata
                  forKey:(NSString *)key
            inCollection:(NSString *)collection
-              withRowid:(int64_t)rowid;
+              withRowid:(int64_t)rowid
+     serializedMetadata:(NSData *)preSerializedMetadata;
 
 - (void)removeObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;