SERVER-8799: handle symbol BSON type as string in v8

2 files changed, 18 insertions, 0 deletions

diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index 5e5bd597ee2..568d21a57c5 100644
--- a/src/mongo/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
@@ -453,6 +453,22 @@ namespace JSTests {
                 ASSERT_EQUALS( Array, out.firstElement().type() );
             }
 
+            // symbol
+            {
+                // test mutable object with symbol type
+                BSONObjBuilder builder;
+                builder.appendSymbol("sym", "value");
+                BSONObj in = builder.done();
+                s->setObject( "x", in, false );
+                BSONObj out = s->getObject( "x" );
+                ASSERT_EQUALS( Symbol, out.firstElement().type() );
+
+                // readonly
+                s->setObject( "x", in, true );
+                out = s->getObject( "x" );
+                ASSERT_EQUALS( Symbol, out.firstElement().type() );
+            }
+
             delete s;
         }
     };
diff --git a/src/mongo/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index f5adc04fd67..b37416778d8 100644
--- a/src/mongo/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
@@ -1318,6 +1318,7 @@ namespace mongo {
                     log() << "warning: CodeWScope doesn't transfer to db.eval" << endl;
                 o->ForceSet(name, newFunction(f.codeWScopeCode()));
                 break;
+            case mongo::Symbol:
             case mongo::String:
                 o->ForceSet(name, v8::String::New(f.valuestr()));
                 break;
@@ -1519,6 +1520,7 @@ namespace mongo {
             if (!elem.codeWScopeObject().isEmpty())
                 log() << "warning: CodeWScope doesn't transfer to db.eval" << endl;
             return newFunction(elem.codeWScopeCode());
+        case mongo::Symbol:
         case mongo::String:
             return v8::String::New(elem.valuestr());
         case mongo::jstOID: