Moved db connection settings from start_link to protocol fixing multi…

…ple connection issues. paired: Jae

lib/mssqlex.ex

@@ -34,13 +34,6 @@ defmodule Mssqlex do
   """
   @spec start_link(Keyword.t) :: {:ok, pid}
   def start_link(opts) do
-    opts = opts
-    |> Keyword.put_new(:odbc_driver, "{ODBC Driver 13 for SQL Server}")
-    |> Keyword.put_new(:hostname, System.get_env("MSSQL_HST") || "localhost")
-    |> Keyword.put_new(:database, System.get_env("MSSQL_DB"))
-    |> Keyword.put_new(:username, System.get_env("MSSQL_UID"))
-    |> Keyword.put_new(:password, System.get_env("MSSQL_PWD"))
-
     DBConnection.start_link(Mssqlex.Protocol, opts)
   end
 

lib/mssqlex/protocol.ex

@@ -41,11 +41,11 @@ defmodule Mssqlex.Protocol do
                                     | {:error, Exception.t}
   def connect(opts) do
     conn_opts = [
-      {"DRIVER", opts[:odbc_driver]},
-      {"SERVER", opts[:hostname]},
-      {"DATABASE", opts[:database]},
-      {"UID", opts[:username]},
-      {"PWD", opts[:password]}
+      {"DRIVER", opts[:odbc_driver] || "{ODBC Driver 13 for SQL Server}"},
+      {"SERVER", opts[:hostname] || System.get_env("MSSQL_HST") || "localhost"},
+      {"DATABASE", opts[:database] || System.get_env("MSSQL_DB")},
+      {"UID", opts[:username] || System.get_env("MSSQL_UID")},
+      {"PWD", opts[:password] || System.get_env("MSSQL_PWD")}
     ]
     conn_str = Enum.reduce(conn_opts, "", fn {key, value}, acc ->
       acc <> "#{key}=#{value};" end)
@@ -185,7 +185,7 @@ defmodule Mssqlex.Protocol do
     {status, message, new_state} = do_query(query, params, opts, state)
 
     case new_state.mssql do
-      :idle -> 
+      :idle ->
         with {:ok, _, post_commit_state} <- handle_commit(opts, new_state)
         do
           {status, message, post_commit_state}

mix.exs

@@ -3,7 +3,7 @@ defmodule Mssqlex.Mixfile do
 
   def project do
     [app: :mssqlex,
-     version: "0.4.0",
+     version: "0.4.1",
      description: "Adapter to Microsoft SQL Server. Using DBConnection and ODBC.",
      elixir: "~> 1.4",
      build_embedded: Mix.env == :prod,