CDRIVER-1551 use BAD_WIRE_VERSION for collation errs

ajdavis · ajdavis · commit 9bbc314eeebb · 2016-10-19T19:25:48.000-04:00
diff --git a/src/mongoc/mongoc-client.c b/src/mongoc/mongoc-client.c
@@ -1292,7 +1292,7 @@ _mongoc_client_command_append_iterator_opts_to_command (bson_iter_t *iter,
          if (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");
             RETURN (false);
          }
diff --git a/src/mongoc/mongoc-collection.c b/src/mongoc/mongoc-collection.c
@@ -1294,7 +1294,7 @@ mongoc_collection_create_index_with_opts (
    if (has_collation && 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 (done);
    }
@@ -1317,7 +1317,7 @@ mongoc_collection_create_index_with_opts (
          if (has_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");
          }
          ret = _mongoc_collection_create_index_legacy (collection, keys, opt,
diff --git a/src/mongoc/mongoc-write-command.c b/src/mongoc/mongoc-write-command.c
@@ -1275,7 +1275,7 @@ _mongoc_write_command(mongoc_write_command_t       *command,
        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,
                       "Collation is not supported by the selected server");
       EXIT;
    }
diff --git a/tests/test-bulk.c b/tests/test-bulk.c
@@ -3160,7 +3160,7 @@ _test_bulk_collation (int w, int wire_version, bulkop op)
       if (w) {
          ASSERT_ERROR_CONTAINS(error,
                                MONGOC_ERROR_COMMAND,
-                               MONGOC_ERROR_COMMAND_INVALID_ARG,
+                               MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
                                "Collation is not supported by the selected server");
       } else {
          ASSERT_ERROR_CONTAINS(error,
@@ -3236,7 +3236,7 @@ _test_bulk_collation_multi (int w, int wire_version)
       if (w) {
          ASSERT_ERROR_CONTAINS(error,
                                MONGOC_ERROR_COMMAND,
-                               MONGOC_ERROR_COMMAND_INVALID_ARG,
+                               MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
                                "Collation is not supported by the selected server");
       } else {
          ASSERT_ERROR_CONTAINS(error,
diff --git a/tests/test-mongoc-collection.c b/tests/test-mongoc-collection.c
@@ -4246,7 +4246,7 @@ test_aggregate_with_collation (int wire)
       ASSERT (mongoc_cursor_error (cursor, &error));
       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");
    }
 
@@ -4327,7 +4327,7 @@ test_index_with_collation (int wire)
       ASSERT (!future_get_bool (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");
    }
 
diff --git a/tests/test-mongoc-find-and-modify.c b/tests/test-mongoc-find-and-modify.c
@@ -424,7 +424,7 @@ test_find_and_modify_collation (int wire)
 
       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");
       ASSERT (!ok);
    }

Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,7 @@ _mongoc_client_command_append_iterator_opts_to_command (bson_iter_t *iter,`
`1292`	`1292`	`if (max_wire_version < WIRE_VERSION_COLLATION) {`
`1293`	`1293`	`bson_set_error (error,`
`1294`	`1294`	`MONGOC_ERROR_COMMAND,`
`1295`		`- MONGOC_ERROR_COMMAND_INVALID_ARG,`
	`1295`	`+ MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,`
`1296`	`1296`	`"The selected server does not support collation");`
`1297`	`1297`	`RETURN (false);`
`1298`	`1298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1275,7 +1275,7 @@ _mongoc_write_command(mongoc_write_command_t *command,`
`1275`	`1275`	`server_stream->sd->max_wire_version < WIRE_VERSION_COLLATION) {`
`1276`	`1276`	`bson_set_error (error,`
`1277`	`1277`	`MONGOC_ERROR_COMMAND,`
`1278`		`- MONGOC_ERROR_COMMAND_INVALID_ARG,`
	`1278`	`+ MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,`
`1279`	`1279`	`"Collation is not supported by the selected server");`
`1280`	`1280`	`EXIT;`
`1281`	`1281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ test_find_and_modify_collation (int wire)`
`424`	`424`
`425`	`425`	`ASSERT_ERROR_CONTAINS (error,`
`426`	`426`	`MONGOC_ERROR_COMMAND,`
`427`		`- MONGOC_ERROR_COMMAND_INVALID_ARG,`
	`427`	`+ MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,`
`428`	`428`	`"The selected server does not support collation");`
`429`	`429`	`ASSERT (!ok);`
`430`	`430`	`}`