Merge pull request #113 from MillionIntegrals/master

Add back original query options for srv links. Thank you!

Author: zookzook

lib/mongo/url_parser.ex

@@ -128,7 +128,7 @@ defmodule Mongo.UrlParser do
 
   defp parse_seeds(opts, _frags), do: opts
 
-  defp resolve_srv_url(%{"seeds" => url, "srv" => srv} = frags)
+  defp resolve_srv_url(%{"seeds" => url, "srv" => srv, "options" => orig_options} = frags)
        when is_bitstring(url) and srv == "+srv" do
     # Fix for windows only
     with {:win32, _} <- :os.type() do
@@ -140,7 +140,7 @@ defmodule Mongo.UrlParser do
            :inet_res.getbyname('_mongodb._tcp.' ++ url_char, :srv),
          {:ok, host} <- get_host_srv(srv_record),
          {:ok, {_, _, _, _, _, txt_record}} <- :inet_res.getbyname(url_char, :txt),
-         txt <- "#{txt_record}&ssl=true" do
+         txt <- "#{orig_options}&#{txt_record}&ssl=true" do
       frags
       |> Map.put("seeds", host)
       |> Map.put("options", txt)

test/mongo/url_parser_test.exs

@@ -66,6 +66,20 @@ defmodule Mongo.UrlParserTest do
                ]
     end
 
+    test "url srv with auth source" do
+      assert UrlParser.parse_url(url: "mongodb+srv://test10.test.build.10gen.cc/db?replicaSet=r1&authSource=admin") ==
+               [
+                 database: "db",
+                 ssl: true,
+                 socket_timeout_ms: 500,
+                 auth_source: "admin",
+                 set_name: "r1",
+                 seeds: [
+                   "localhost.test.build.10gen.cc:27017"
+                 ]
+               ]
+    end
+
     test "url srv with user" do
       assert UrlParser.parse_url(url: "mongodb+srv://user:[email protected]") |> Keyword.drop([:pw_safe]) ==
                [