CDRIVER-1551 err code for collation and old server

ajdavis · ajdavis · commit f306c1b11c6c · 2016-10-19T13:46:27.000-04:00
diff --git a/src/mongoc/mongoc-client.c b/src/mongoc/mongoc-client.c
@@ -1340,7 +1340,7 @@ _mongoc_client_command_with_opts (mongoc_client_t           *client,
                if (server_stream->sd->max_wire_version < WIRE_VERSION_COLLATION) {
                   bson_set_error (error,
                                   MONGOC_ERROR_COMMAND,
-                                  MONGOC_ERROR_COMMAND_INVALID_ARG,
+                                  MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
                                   "The selected server does not support collation");
                   GOTO (err);
                }
diff --git a/tests/test-mongoc-collection.c b/tests/test-mongoc-collection.c
@@ -2303,7 +2303,7 @@ test_count_with_collation (int wire)
       ASSERT (-1 == future_get_int64_t (future));
       ASSERT_ERROR_CONTAINS (error,
                              MONGOC_ERROR_COMMAND,
-                             MONGOC_ERROR_COMMAND_INVALID_ARG,
+                             MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
                              "The selected server does not support collation");
    }
 

Original file line number	Diff line number	Diff line change
`@@ -1340,7 +1340,7 @@ _mongoc_client_command_with_opts (mongoc_client_t *client,`
`1340`	`1340`	`if (server_stream->sd->max_wire_version < WIRE_VERSION_COLLATION) {`
`1341`	`1341`	`bson_set_error (error,`
`1342`	`1342`	`MONGOC_ERROR_COMMAND,`
`1343`		`- MONGOC_ERROR_COMMAND_INVALID_ARG,`
	`1343`	`+ MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,`
`1344`	`1344`	`"The selected server does not support collation");`
`1345`	`1345`	`GOTO (err);`
`1346`	`1346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2303,7 +2303,7 @@ test_count_with_collation (int wire)`
`2303`	`2303`	`ASSERT (-1 == future_get_int64_t (future));`
`2304`	`2304`	`ASSERT_ERROR_CONTAINS (error,`
`2305`	`2305`	`MONGOC_ERROR_COMMAND,`
`2306`		`- MONGOC_ERROR_COMMAND_INVALID_ARG,`
	`2306`	`+ MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,`
`2307`	`2307`	`"The selected server does not support collation");`
`2308`	`2308`	`}`
`2309`	`2309`