Skip to content

Commit

Permalink
Merge branch 'master' of github.com:findmypast-oss/mssqlex
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Blowers committed Jan 31, 2018
2 parents 642f7dd + 0188ec9 commit fd03001
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/mssqlex.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Mssqlex do
* `:odbc_driver` - The driver the adapter will use.
* environment variable: `MSSQL_DVR`
* default value: {ODBC Driver 13 for SQL Server}
* default value: {ODBC Driver 17 for SQL Server}
* `:hostname` - The server hostname.
* environment variable: `MSSQL_HST`
* default value: localhost
Expand Down
2 changes: 1 addition & 1 deletion lib/mssqlex/protocol.ex
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ defmodule Mssqlex.Protocol do
port = opts[:port] || System.get_env("MSSQL_PRT")

conn_opts = [
{"Driver", opts[:odbc_driver] || System.get_env("MSSQL_DVR") || "{ODBC Driver 13 for SQL Server}"},
{"Driver", opts[:odbc_driver] || System.get_env("MSSQL_DVR") || "{ODBC Driver 17 for SQL Server}"},
{"Server", build_server_address(server_address, instance_name, port)},
{"Database", opts[:database] || System.get_env("MSSQL_DB")},
{"UID", opts[:username] || System.get_env("MSSQL_UID")},
Expand Down

0 comments on commit fd03001

Please sign in to comment.