database: change API for command_simple to match client.

Author: Christian Hergert

mongoc/mongoc-database.c

@@ -171,48 +171,21 @@ mongoc_database_command (mongoc_database_t         *database,
  */
 
 bson_bool_t
-mongoc_database_command_simple (mongoc_database_t *database,
-                                const bson_t      *cmd,
-                                bson_error_t      *error)
+mongoc_database_command_simple (mongoc_database_t         *database,
+                                const bson_t              *command,
+                                const mongoc_read_prefs_t *read_prefs,
+                                bson_t                    *reply,
+                                bson_error_t              *error)
 {
-   mongoc_cursor_t *cursor;
-   const bson_t *b;
-   bson_iter_t iter;
-   bson_bool_t ret = FALSE;
-   const char *errmsg = "unknown error";
-   char ns[140];
-
-   bson_return_val_if_fail(database, FALSE);
-   bson_return_val_if_fail(cmd, FALSE);
-
-   snprintf(ns, sizeof ns, "%s.$cmd", database->name);
-   ns[sizeof ns-1] = '\0';
-
-   cursor = _mongoc_cursor_new(database->client, ns, MONGOC_QUERY_NONE, 0, 1,
-                               0, TRUE, cmd, NULL, database->read_prefs);
-
-   if (mongoc_cursor_next(cursor, &b) &&
-       bson_iter_init_find(&iter, b, "ok") &&
-       BSON_ITER_HOLDS_DOUBLE(&iter)) {
-      if (bson_iter_double(&iter) == 1.0) {
-         ret = TRUE;
-      } else {
-         if (bson_iter_init_find(&iter, b, "errmsg")) {
-            errmsg = bson_iter_utf8(&iter, NULL);
-         }
-      }
-   }
+   BSON_ASSERT (database);
+   BSON_ASSERT (command);
 
-   if (!ret) {
-      bson_set_error(error,
-                     MONGOC_ERROR_QUERY,
-                     MONGOC_ERROR_QUERY_FAILURE,
-                     "%s", errmsg);
+   if (!read_prefs) {
+      read_prefs = database->read_prefs;
    }
 
-   mongoc_cursor_destroy(cursor);
-
-   return ret;
+   return mongoc_client_command_simple (database->client, database->name,
+                                        command, read_prefs, reply, error);
 }
 
 
@@ -246,7 +219,7 @@ mongoc_database_drop (mongoc_database_t *database,
 
    bson_init(&cmd);
    bson_append_int32(&cmd, "dropDatabase", 12, 1);
-   ret = mongoc_database_command_simple(database, &cmd, error);
+   ret = mongoc_database_command_simple(database, &cmd, NULL, NULL, error);
    bson_destroy(&cmd);
 
    return ret;

mongoc/mongoc-database.h

@@ -48,6 +48,8 @@ mongoc_cursor_t              *mongoc_database_command           (mongoc_database
                                                                  const mongoc_read_prefs_t    *read_prefs);
 bson_bool_t                   mongoc_database_command_simple    (mongoc_database_t            *database,
                                                                  const bson_t                 *command,
+                                                                 const mongoc_read_prefs_t    *read_prefs,
+                                                                 bson_t                       *reply,
                                                                  bson_error_t                 *error);
 bson_bool_t                   mongoc_database_drop              (mongoc_database_t            *database,
                                                                  bson_error_t                 *error);

tests/test-mongoc-database.c

@@ -87,6 +87,29 @@ test_command (void)
 }
 
 
+static void
+test_drop (void)
+{
+   mongoc_database_t *database;
+   mongoc_client_t *client;
+   bson_error_t error = { 0 };
+   bson_bool_t r;
+
+   client = mongoc_client_new (gTestUri);
+   assert (client);
+
+   database = mongoc_client_get_database (client, "some_random_database");
+
+   r = mongoc_database_drop (database, &error);
+   assert (r);
+   assert (!error.domain);
+   assert (!error.code);
+
+   mongoc_database_destroy (database);
+   mongoc_client_destroy (client);
+}
+
+
 static void
 log_handler (mongoc_log_level_t  log_level,
              const char         *domain,
@@ -109,6 +132,7 @@ main (int   argc,
 
    run_test("/mongoc/database/has_collection", test_has_collection);
    run_test("/mongoc/database/command", test_command);
+   run_test("/mongoc/database/drop", test_drop);
 
    bson_free(gTestUri);