CDRIVER-1031 mongoc_database_get_collection inherits config

Copy write concern, read concern, and read preference from database, not from the client.

Author: ajdavis

NEWS

@@ -1,3 +1,9 @@
+mongo-c-driver 1.3.2
+====================
+
+  * mongoc_database_get_collection now copies the database's read preferences,
+    read concern, and write concern, instead of copying the client's.
+
 mongo-c-driver 1.3.1
 ====================
 

src/mongoc/mongoc-database.c

@@ -1123,8 +1123,9 @@ mongoc_database_get_collection (mongoc_database_t *database,
    BSON_ASSERT (database);
    BSON_ASSERT (collection);
 
-   return mongoc_client_get_collection (database->client, database->name,
-                                        collection);
+   return _mongoc_collection_new (database->client, database->name, collection,
+                                  database->read_prefs, database->read_concern,
+                                  database->write_concern);
 }
 
 

tests/TestSuite.h

@@ -69,6 +69,7 @@ extern "C" {
 #define ASSERT_CMPUINT(a, eq, b)   ASSERT_CMPINT_HELPER(a, eq, b, "u")
 #define ASSERT_CMPLONG(a, eq, b)   ASSERT_CMPINT_HELPER(a, eq, b, "ld")
 #define ASSERT_CMPULONG(a, eq, b)  ASSERT_CMPINT_HELPER(a, eq, b, "lu")
+#define ASSERT_CMPINT32(a, eq, b)  ASSERT_CMPINT_HELPER(a, eq, b, PRId32)
 #define ASSERT_CMPINT64(a, eq, b)  ASSERT_CMPINT_HELPER(a, eq, b, PRId64)
 #define ASSERT_CMPUINT64(a, eq, b) ASSERT_CMPINT_HELPER(a, eq, b, PRIu64)
 #define ASSERT_CMPSIZE_T(a, eq, b) ASSERT_CMPINT_HELPER(a, eq, b, "zd")

tests/test-mongoc-database.c

@@ -1,4 +1,7 @@
 #include <mongoc.h>
+#include <mongoc-collection-private.h>
+#include <mongoc-write-concern-private.h>
+#include <mongoc-read-concern-private.h>
 
 #include "TestSuite.h"
 #include "test-libmongoc.h"
@@ -303,6 +306,46 @@ test_get_collection_info (void)
    mongoc_client_destroy (client);
 }
 
+static void
+test_get_collection (void)
+{
+   mongoc_client_t *client;
+   mongoc_database_t *database;
+   mongoc_write_concern_t *wc;
+   mongoc_read_concern_t *rc;
+   mongoc_read_prefs_t *read_prefs;
+   mongoc_collection_t *collection;
+
+   client = test_framework_client_new ();
+   assert (client);
+
+   database = mongoc_client_get_database (client, "test");
+
+   wc = mongoc_write_concern_new ();
+   mongoc_write_concern_set_w (wc, 2);
+   mongoc_database_set_write_concern (database, wc);
+
+   rc = mongoc_read_concern_new ();
+   mongoc_read_concern_set_level (rc, "majority");
+   mongoc_database_set_read_concern (database, rc);
+
+   read_prefs = mongoc_read_prefs_new (MONGOC_READ_SECONDARY);
+   mongoc_database_set_read_prefs (database, read_prefs);
+
+   collection = mongoc_database_get_collection (database, "test");
+
+   ASSERT_CMPINT32 (collection->write_concern->w, ==, 2);
+   ASSERT_CMPSTR (collection->read_concern->level, "majority");
+   ASSERT_CMPINT (collection->read_prefs->mode, ==, MONGOC_READ_SECONDARY);
+
+   mongoc_collection_destroy (collection);
+   mongoc_read_prefs_destroy (read_prefs);
+   mongoc_read_concern_destroy (rc);
+   mongoc_write_concern_destroy (wc);
+   mongoc_database_destroy (database);
+   mongoc_client_destroy (client);
+}
+
 static void
 test_get_collection_names (void)
 {
@@ -481,6 +524,8 @@ test_database_install (TestSuite *suite)
    TestSuite_Add (suite, "/Database/create_collection", test_create_collection);
    TestSuite_Add (suite, "/Database/get_collection_info",
                   test_get_collection_info);
+   TestSuite_Add (suite, "/Database/get_collection",
+                  test_get_collection);
    TestSuite_Add (suite, "/Database/get_collection_names",
                   test_get_collection_names);
    TestSuite_Add (suite, "/Database/get_collection_names_error",