Imported Upstream version 2.0.0

1 files changed, 23 insertions, 3 deletions

diff --git a/s/strategy.cpp b/s/strategy.cpp
index 7c1fb0b..4230b7f 100644
--- a/s/strategy.cpp
+++ b/s/strategy.cpp
@@ -38,7 +38,7 @@ namespace mongo {
             conn.donotCheckVersion();
         else if ( conn.setVersion() ) {
             conn.done();
-            throw StaleConfigException( r.getns() , "doWRite" , true );
+            throw StaleConfigException( r.getns() , "doWrite" , true );
         }
         conn->say( r.m() );
         conn.done();
@@ -46,6 +46,8 @@ namespace mongo {
 
     void Strategy::doQuery( Request& r , const Shard& shard ) {
 
+        r.checkAuth();
+
         ShardConnection dbcon( shard , r.getns() );
         DBClientBase &c = dbcon.conn();
 
@@ -67,13 +69,31 @@ namespace mongo {
         dbcon.done();
     }
 
-    void Strategy::insert( const Shard& shard , const char * ns , const BSONObj& obj ) {
+    void Strategy::insert( const Shard& shard , const char * ns , const BSONObj& obj , int flags, bool safe ) {
         ShardConnection dbcon( shard , ns );
         if ( dbcon.setVersion() ) {
             dbcon.done();
             throw StaleConfigException( ns , "for insert" );
         }
-        dbcon->insert( ns , obj );
+        dbcon->insert( ns , obj , flags);
+        if (safe)
+            dbcon->getLastError();
         dbcon.done();
     }
+
+    void Strategy::update( const Shard& shard , const char * ns , const BSONObj& query , const BSONObj& toupdate , int flags, bool safe ) {
+        bool upsert = flags & UpdateOption_Upsert;
+        bool multi = flags & UpdateOption_Multi;
+
+        ShardConnection dbcon( shard , ns );
+        if ( dbcon.setVersion() ) {
+            dbcon.done();
+            throw StaleConfigException( ns , "for insert" );
+        }
+        dbcon->update( ns , query , toupdate, upsert, multi);
+        if (safe)
+            dbcon->getLastError();
+        dbcon.done();
+    }
+
 }