Spider Monkey Shell: another checkpoint

1 files changed, 5 insertions, 8 deletions

diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
index edc083733b6..8e91911b106 100644
--- a/shell/dbshell.cpp
+++ b/shell/dbshell.cpp
@@ -238,30 +238,27 @@ int main(int argc, char* argv[]) {
 
         break;
     }
+    
+    scope->externalSetup();
 
-    /*
     if ( !nodb ) { // connect to db
-        v8::HandleScope handle_scope;
         cout << "url: " << url << endl;
         string setup = (string)"db = connect( \"" + fixHost( url , dbhost , port ) + "\")";
-        if ( ! ExecuteString( v8::String::New( setup.c_str() ) , v8::String::New( "(connect)" ) , false , true ) ){
+        if ( ! scope->exec( setup , "(connect)" , false , true , false ) )
             return -1;
-        }
-
+        
         if ( username.size() && password.size() ){
             stringstream ss;
             ss << "if ( ! db.auth( \"" << username << "\" , \"" << password << "\" ) ){ throw 'login failed'; }";
 
-            if ( ! ExecuteString( v8::String::New( ss.str().c_str() ) , v8::String::New( "(auth)" ) , true , true ) ){
+            if ( ! scope->exec( ss.str() , "(auth)" , true , true , false ) ){
                 cout << "login failed" << endl;
                 return -1;
             }
-                
 
         }
 
     }    
-    */
     
     int numFiles = 0;