Test comma in db name

JAVA-4196
mongodb · Feb 10, 2023 · 5a31cda · 5a31cda
1 parent e1d4351
commit 5a31cda
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/...test/resources/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json b/...test/resources/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json
@@ -0,0 +1,19 @@
+{
+  "uri": "mongodb+srv://test1.test.build.10gen.cc/some%2Cdb?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017",
+    "localhost.test.build.10gen.cc:27018"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  },
+  "parsed_options": {
+    "defaultDatabase": "some,db"
+  }
+}
diff --git a/...ore/src/test/resources/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json b/...ore/src/test/resources/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json
@@ -0,0 +1,19 @@
+{
+  "uri": "mongodb+srv://test1.test.build.10gen.cc/some,db?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017",
+    "localhost.test.build.10gen.cc:27018"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  },
+  "parsed_options": {
+    "defaultDatabase": "some,db"
+  }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
@@ -64,6 +64,8 @@ class ConnectionStringSpecification extends Specification {
         new ConnectionString('mongodb://localhost/' +
                                    'test.my.coll')       | 1   | ['localhost']      | 'test'   | 'my.coll'  | null     | null
         new ConnectionString('mongodb://foo/bar.goo')    | 1   | ['foo']            | 'bar'    | 'goo'      | null     | null
+        new ConnectionString('mongodb://foo/s,db')       | 1   | ['foo']            | 's,db'| null      | null     | null
+        new ConnectionString('mongodb://foo/s%2Cdb')     | 1   | ['foo']            | 's,db'| null      | null     | null
         new ConnectionString('mongodb://user:pass@' +
                                    'host/bar')           | 1   | ['host']           | 'bar'    | null       | 'user'   | 'pass' as char[]
         new ConnectionString('mongodb://user:pass@' +

diff --git a/driver-sync/src/test/functional/com/mongodb/client/InitialDnsSeedlistDiscoveryTest.java b/driver-sync/src/test/functional/com/mongodb/client/InitialDnsSeedlistDiscoveryTest.java
@@ -281,6 +281,7 @@ private void assertParsedOptions(final ConnectionString connectionString) {
         for (Map.Entry<String, BsonValue> entry : parsedOptions.entrySet()) {
             switch (entry.getKey()) {
                 case "db":
+                case "defaultDatabase":
                     assertEquals(entry.getValue().asString().getValue(), connectionString.getDatabase());
                     break;
                 case "user":