diff --git a/reference/mongo/mongo/construct.xml b/reference/mongo/mongo/construct.xml index 9b1dc26057..9848960da2 100644 --- a/reference/mongo/mongo/construct.xml +++ b/reference/mongo/mongo/construct.xml @@ -144,6 +144,24 @@ $mongo->selectDB("foo")->command(array("distinct" => "bar", "key" => "age")); for details. + + + "username" + + + The username can be specified here, instead of including it in the + host list. This is especially useful if a username has a ":" in it. + + + + + "password" + + + The password can be specified here, instead of including it in the + host list. This is especially useful if a password has a "@" in it. + + @@ -238,6 +256,13 @@ $mongo->selectDB("foo")->command(array("distinct" => "bar", "key" => "age")); Added the replicaSet option. + + 1.1.4 + + Added the username and password + options. + + diff --git a/reference/mongo/mongocollection/ensureindex.xml b/reference/mongo/mongocollection/ensureindex.xml index c3e737f079..a72e33a813 100644 --- a/reference/mongo/mongocollection/ensureindex.xml +++ b/reference/mongo/mongocollection/ensureindex.xml @@ -108,6 +108,18 @@ Mongo complains about the index name being too long. + + + "timeout" + + + Integer, defaults to MongoCursor::$timeout. If + "safe" is set, this sets how long (in milliseconds) for the client to + wait for a database response. If the database does not respond within + the timeout period, a MongoCursorTimeoutException + will be thrown. + + @@ -151,6 +163,12 @@ (either generated or set) is longer than 128 bytes. + + 1.2.0 + + Added timeout option. + + diff --git a/reference/mongo/mongocollection/insert.xml b/reference/mongo/mongocollection/insert.xml index efdb40fac0..cbd4321050 100644 --- a/reference/mongo/mongocollection/insert.xml +++ b/reference/mongo/mongocollection/insert.xml @@ -83,6 +83,18 @@ and will override setting safe to &false;. + + + "timeout" + + + Integer, defaults to MongoCursor::$timeout. If + "safe" is set, this sets how long (in milliseconds) for the client to + wait for a database response. If the database does not respond within + the timeout period, a MongoCursorTimeoutException + will be thrown. + + @@ -146,6 +158,12 @@ Disconnects on "not master" errors if "safe" is set. + + 1.2.0 + + Added timeout option. + + diff --git a/reference/mongo/mongocollection/remove.xml b/reference/mongo/mongocollection/remove.xml index d5a8a1429f..2265f621b7 100644 --- a/reference/mongo/mongocollection/remove.xml +++ b/reference/mongo/mongocollection/remove.xml @@ -86,6 +86,18 @@ and will override setting safe to &false;. + + + "timeout" + + + Integer, defaults to MongoCursor::$timeout. If + "safe" is set, this sets how long (in milliseconds) for the client to + wait for a database response. If the database does not respond within + the timeout period, a MongoCursorTimeoutException + will be thrown. + + @@ -151,6 +163,12 @@ Disconnects on "not master" errors if "safe" is set. + + 1.2.0 + + Added timeout option. + + diff --git a/reference/mongo/mongocollection/save.xml b/reference/mongo/mongocollection/save.xml index da46bc73bb..842e718471 100644 --- a/reference/mongo/mongocollection/save.xml +++ b/reference/mongo/mongocollection/save.xml @@ -82,6 +82,18 @@ and will override setting safe to &false;. + + + "timeout" + + + Integer, defaults to MongoCursor::$timeout. If + "safe" is set, this sets how long (in milliseconds) for the client to + wait for a database response. If the database does not respond within + the timeout period, a MongoCursorTimeoutException + will be thrown. + + @@ -144,6 +156,12 @@ Disconnects on "not master" errors if "safe" is set. + + 1.2.0 + + Added timeout option. + + diff --git a/reference/mongo/mongocollection/update.xml b/reference/mongo/mongocollection/update.xml index bbd90af92e..d1bdd58753 100644 --- a/reference/mongo/mongocollection/update.xml +++ b/reference/mongo/mongocollection/update.xml @@ -114,6 +114,18 @@ and will override setting safe to &false;. + + + "timeout" + + + Integer, defaults to MongoCursor::$timeout. If + "safe" is set, this sets how long (in milliseconds) for the client to + wait for a database response. If the database does not respond within + the timeout period, a MongoCursorTimeoutException + will be thrown. + + @@ -181,6 +193,12 @@ Disconnects on "not master" errors if "safe" is set. + + 1.2.0 + + Added timeout option. + + diff --git a/reference/mongo/mongodb/command.xml b/reference/mongo/mongodb/command.xml index 573e7c84c8..f3676430d3 100644 --- a/reference/mongo/mongodb/command.xml +++ b/reference/mongo/mongodb/command.xml @@ -11,6 +11,7 @@ public arrayMongoDB::command arraydata + arrayoptions Almost everything that is not a CRUD operation can be done with a database command. @@ -18,7 +19,7 @@ There's a command for that. Need to turn up logging? You get the idea. - This method is identical to the function: + This method is identical to: + + + options + + + + Options for this command. Right now the only option is + timeout, which is the number of milliseconds for the + client to wait for a database response. Set to -1 to wait forever. + This defaults to MongoCursor::$timeout. + + + + + + &reftitle.changelog; + + + + + + &Version; + &Description; + + + + + 1.2.0 + + Added options parameter with a single option: + timeout. + + + + + + + + &reftitle.returnvalues; diff --git a/reference/mongo/mongodb/execute.xml b/reference/mongo/mongodb/execute.xml index 08695151b3..be4b45788a 100644 --- a/reference/mongo/mongodb/execute.xml +++ b/reference/mongo/mongodb/execute.xml @@ -20,6 +20,24 @@ touch a number of collections lightly, or process some results on the database side to reduce the amount that has to be sent to the client. + + Running JavaScript in the database takes a write lock, meaning it blocks + other operations. Make sure you consider this before running a long script. + + + This is a wrapper for a database command. This method is basically: + +command(array('$eval' => $code, args => $args)); +} + +?> +]]> + +