Moved condition parameter of Add to end so that name and value will c…

…onsistently be the first two arguments.
mongodb · Oct 15, 2010 · a45bce5 · a45bce5
1 parent c645758
commit a45bce5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/BsonLibrary/ObjectModel/BsonDocument.cs b/BsonLibrary/ObjectModel/BsonDocument.cs
@@ -243,17 +243,6 @@ string filename
         #endregion
 
         #region public methods
-        public BsonDocument Add(
-            bool condition,
-            string name,
-            BsonValue value
-        ) {
-            if (condition) {
-                Add(name, value);
-            }
-            return this;
-        }
-
         public BsonDocument Add(
             BsonElement element
         ) {
@@ -314,6 +303,17 @@ BsonValue value
             return this;
         }
 
+        public BsonDocument Add(
+            string name,
+            BsonValue value,
+            bool condition
+        ) {
+            if (condition) {
+                Add(name, value);
+            }
+            return this;
+        }
+
         public void Clear() {
             elements.Clear();
             indexes.Clear();

diff --git a/CSharpDriver/Core/MongoCollection.cs b/CSharpDriver/Core/MongoCollection.cs
@@ -244,7 +244,7 @@ bool returnNew
                 { "sort", BsonDocumentWrapper.Create(sortBy) },
                 { "update", BsonDocumentWrapper.Create(update) },
                 { "fields", BsonDocumentWrapper.Create(fields) },
-                { returnNew, "new", true }
+                { "new", true, returnNew }
             };
             var result = database.RunCommand(command);
             return result["value"].AsBsonDocument;

diff --git a/CSharpDriver/Core/MongoCursor.cs b/CSharpDriver/Core/MongoCursor.cs
@@ -288,8 +288,8 @@ public int Size() {
             var command = new BsonDocument {
                 { "count", collection.Name },
                 { "query", BsonDocumentWrapper.Create(query) }, // query is optional
-                { limit != 0, "limit", limit },
-                { skip != 0, "skip", skip }
+                { "limit", limit, limit != 0 },
+                { "skip", skip, skip != 0 }
             };
             var result = collection.Database.RunCommand(command);
             return result["n"].ToInt32();

diff --git a/CSharpDriver/Internal/MongoConnection.cs b/CSharpDriver/Internal/MongoConnection.cs
@@ -303,8 +303,8 @@ SafeMode safeMode
                 if (safeMode.Enabled) {
                     var command = new BsonDocument {
                         { "getlasterror", 1 }, // use all lowercase for backward compatibility
-                        { safeMode.Replications > 1, "w", safeMode.Replications },
-                        { safeMode.Replications > 1 && safeMode.Timeout != TimeSpan.Zero, "wtimeout", (int) safeMode.Timeout.TotalMilliseconds }
+                        { "w", safeMode.Replications, safeMode.Replications > 1 },
+                        { "wtimeout", (int) safeMode.Timeout.TotalMilliseconds, safeMode.Replications > 1 && safeMode.Timeout != TimeSpan.Zero }
                     };
                     using (
                         var getLastErrorMessage = new MongoQueryMessage<BsonDocument>(