database: wrap mongoc_client_command() from mongoc_database_t.

Author: Christian Hergert

mongoc/mongoc-database.c

@@ -132,26 +132,23 @@ mongoc_database_destroy (mongoc_database_t *database)
  */
 
 mongoc_cursor_t *
-mongoc_database_command (mongoc_database_t    *database,
-                         mongoc_query_flags_t  flags,
-                         bson_uint32_t         skip,
-                         bson_uint32_t         n_return,
-                         const bson_t         *command,
-                         const bson_t         *fields,
-                         mongoc_read_prefs_t  *read_prefs)
+mongoc_database_command (mongoc_database_t         *database,
+                         mongoc_query_flags_t       flags,
+                         bson_uint32_t              skip,
+                         bson_uint32_t              n_return,
+                         const bson_t              *command,
+                         const bson_t              *fields,
+                         const mongoc_read_prefs_t *read_prefs)
 {
-   char ns[140];
-
-   bson_return_val_if_fail(database, NULL);
-   bson_return_val_if_fail(command, NULL);
+   BSON_ASSERT (database);
+   BSON_ASSERT (command);
 
    if (!read_prefs) {
       read_prefs = database->read_prefs;
    }
 
-   snprintf(ns, sizeof ns, "%s.$cmd", database->name);
-   return _mongoc_cursor_new(database->client, ns, flags, skip, n_return, 0,
-                             TRUE, command, fields, read_prefs);
+   return mongoc_client_command (database->client, database->name, flags, skip,
+                                 n_return, command, fields, read_prefs);
 }
 
 

mongoc/mongoc-database.h

@@ -45,7 +45,7 @@ mongoc_cursor_t              *mongoc_database_command           (mongoc_database
                                                                  bson_uint32_t                 n_return,
                                                                  const bson_t                 *command,
                                                                  const bson_t                 *fields,
-                                                                 mongoc_read_prefs_t          *read_prefs);
+                                                                 const mongoc_read_prefs_t    *read_prefs);
 bson_bool_t                   mongoc_database_command_simple    (mongoc_database_t            *database,
                                                                  const bson_t                 *command,
                                                                  bson_error_t                 *error);

tests/test-mongoc-database.c

@@ -52,6 +52,41 @@ test_has_collection (void)
 }
 
 
+static void
+test_command (void)
+{
+   mongoc_database_t *database;
+   mongoc_client_t *client;
+   mongoc_cursor_t *cursor;
+   const bson_t *doc;
+   bson_bool_t r;
+   bson_t cmd = BSON_INITIALIZER;
+
+   client = mongoc_client_new (gTestUri);
+   assert (client);
+
+   database = mongoc_client_get_database (client, "admin");
+
+   bson_append_int32 (&cmd, "ping", 4, 1);
+
+   cursor = mongoc_database_command (database, MONGOC_QUERY_NONE, 0, 1, &cmd, NULL, NULL);
+   assert (cursor);
+
+   r = mongoc_cursor_next (cursor, &doc);
+   assert (r);
+   assert (doc);
+
+   r = mongoc_cursor_next (cursor, &doc);
+   assert (!r);
+   assert (!doc);
+
+   mongoc_cursor_destroy (cursor);
+   mongoc_database_destroy (database);
+   mongoc_client_destroy (client);
+   bson_destroy (&cmd);
+}
+
+
 static void
 log_handler (mongoc_log_level_t  log_level,
              const char         *domain,
@@ -73,6 +108,7 @@ main (int   argc,
    gTestUri = bson_strdup_printf("mongodb://%s/", HOST);
 
    run_test("/mongoc/database/has_collection", test_has_collection);
+   run_test("/mongoc/database/command", test_command);
 
    bson_free(gTestUri);