github-migration/mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for inserting duplicate _id when using C extension and doc responds to has_key? for both '_id' and :_id (MongoMapper related)

Browse Source
This commit is contained in:
Mike Dirolf 2009-10-22 15:20:27 -05:00
parent 1e8f3176bf
commit 79acba5417
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/cbson/cbson.c
View File

@ -438,15 +438,14 @@ static void write_doc(bson_buffer* buffer, VALUE hash, VALUE check_keys) {
int length_location = buffer_save_bytes(buffer, 4); int length_location = buffer_save_bytes(buffer, 4);
int length; int length;
VALUE key = rb_str_new2("_id"); VALUE id_str = rb_str_new2("_id");
if (rb_funcall(hash, rb_intern("has_key?"), 1, key) == Qtrue) { VALUE id_sym = ID2SYM(rb_intern("_id"));
VALUE id = rb_hash_aref(hash, key); if (rb_funcall(hash, rb_intern("has_key?"), 1, id_str) == Qtrue) {
write_element_allow_id(key, id, pack_extra(buffer, check_keys), 1); VALUE id = rb_hash_aref(hash, id_str);
} write_element_allow_id(id_str, id, pack_extra(buffer, check_keys), 1);
key = ID2SYM(rb_intern("_id")); } else if (rb_funcall(hash, rb_intern("has_key?"), 1, id_sym) == Qtrue) {
if (rb_funcall(hash, rb_intern("has_key?"), 1, key) == Qtrue) { VALUE id = rb_hash_aref(hash, id_sym);
VALUE id = rb_hash_aref(hash, key); write_element_allow_id(id_sym, id, pack_extra(buffer, check_keys), 1);
write_element_allow_id(key, id, pack_extra(buffer, check_keys), 1);
} }
// we have to check for an OrderedHash and handle that specially // we have to check for an OrderedHash and handle that specially