mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-29 16:47:28 +01:00
Code Issues Releases Activity

fix v8 _id

Browse Source
This commit is contained in:
Eliot Horowitz 2010-03-13 13:41:31 -05:00
parent c42ae951e7
commit 8b8bd9a34c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripting/v8_wrapper.cpp
View File

@ -392,7 +392,7 @@ namespace mongo {
return v8::Undefined();
}
void v8ToMongoElement( BSONObjBuilder & b , v8::Handle<v8::String> name , const string sname , v8::Handle<v8::Value> value ){
void v8ToMongoElement( BSONObjBuilder & b , v8::Handle<v8::String> name , const string sname , v8::Handle<v8::Value> value , int depth ){
if ( value->IsString() ){
b.append( sname.c_str() , toSTLString( value ).c_str() );
@ -413,7 +413,7 @@ namespace mongo {
}
if ( value->IsArray() ){
BSONObj sub = v8ToMongo( value->ToObject() );
BSONObj sub = v8ToMongo( value->ToObject() , depth );
b.appendArray( sname.c_str() , sub );
return;
}
@ -493,7 +493,7 @@ namespace mongo {
mongo::BinDataType( obj->Get( v8::String::New( "type" ) )->ToInt32()->Value() ),
dataArray );
} else {
BSONObj sub = v8ToMongo( value->ToObject() );
BSONObj sub = v8ToMongo( value->ToObject() , depth );
b.append( sname.c_str() , sub );
}
return;
@ -517,12 +517,14 @@ namespace mongo {
cout << "don't know how to convert to mongo field [" << name << "]\t" << value << endl;
}
BSONObj v8ToMongo( v8::Handle<v8::Object> o ){
BSONObj v8ToMongo( v8::Handle<v8::Object> o , int depth ){
BSONObjBuilder b;
v8::Handle<v8::String> idName = v8::String::New( "_id" );
if ( o->HasRealNamedProperty( idName ) ){
v8ToMongoElement( b , idName , "_id" , o->Get( idName ) );
if ( depth == 0 ){
v8::Handle<v8::String> idName = v8::String::New( "_id" );
if ( o->HasRealNamedProperty( idName ) ){
v8ToMongoElement( b , idName , "_id" , o->Get( idName ) );
}
}
Local<v8::Array> names = o->GetPropertyNames();
@ -536,10 +538,10 @@ namespace mongo {
v8::Local<v8::Value> value = o->Get( name );
const string sname = toSTLString( name );
if ( sname == "_id" )
if ( depth == 0 && sname == "_id" )
continue;
v8ToMongoElement( b , name , sname , value );
v8ToMongoElement( b , name , sname , value , depth + 1 );
}
return b.obj();
}

4
scripting/v8_wrapper.h
View File

@ -26,10 +26,10 @@
namespace mongo {
v8::Local<v8::Object> mongoToV8( const mongo::BSONObj & m , bool array = 0 , bool readOnly = false );
mongo::BSONObj v8ToMongo( v8::Handle<v8::Object> o );
mongo::BSONObj v8ToMongo( v8::Handle<v8::Object> o , int depth = 0 );
void v8ToMongoElement( BSONObjBuilder & b , v8::Handle<v8::String> name ,
const string sname , v8::Handle<v8::Value> value );
const string sname , v8::Handle<v8::Value> value , int depth = 0 );
v8::Handle<v8::Value> mongoToV8Element( const BSONElement &f );
v8::Function * getNamedCons( const char * name );