Просмотр исходного кода

Fixed `epgsql:connect(list())`. Fixes #175

Сергей Прохоров 6 лет назад
Родитель
Сommit
f7a355abe2
3 измененных файлов с 7 добавлено и 5 удалено
  1. 4 2
      src/epgsql.erl
  2. 2 2
      src/epgsqla.erl
  3. 1 1
      src/epgsqli.erl

+ 4 - 2
src/epgsql.erl

@@ -150,14 +150,16 @@ connect(Host, Username, Password, Opts) ->
 -spec connect(connection(), host(), string(), string(), connect_opts())
         -> {ok, Connection :: connection()} | {error, Reason :: connect_error()}.
 connect(C, Host, Username, Password, Opts) ->
-    Opts1 = maps:merge(epgsql:to_map(Opts),
+    Opts1 = maps:merge(to_map(Opts),
                        #{host => Host,
                          username => Username,
                          password => Password}),
     call_connect(C, Opts1).
 
+-spec call_connect(connection(), connect_opts())
+       -> {ok, Connection :: connection()} | {error, Reason :: connect_error()}.
 call_connect(C, Opts) ->
-    Opts1 = epgsql_cmd_connect:opts_hide_password(Opts),
+    Opts1 = epgsql_cmd_connect:opts_hide_password(to_map(Opts)),
     case epgsql_sock:sync_command(
            C, epgsql_cmd_connect, Opts1) of
         connected ->

+ 2 - 2
src/epgsqla.erl

@@ -52,8 +52,8 @@ connect(C, Host, Username, Password, Opts) ->
     call_connect(C, Opts1).
 
 -spec call_connect(epgsql:connection(), epgsql:connect_opts()) -> reference().
-call_connect(C, Opts) when is_map(Opts) ->
-    Opts1 = epgsql_cmd_connect:opts_hide_password(Opts),
+call_connect(C, Opts) ->
+    Opts1 = epgsql_cmd_connect:opts_hide_password(epgsql:to_map(Opts)),
     complete_connect(
       C, cast(C, epgsql_cmd_connect, Opts1), Opts1).
 

+ 1 - 1
src/epgsqli.erl

@@ -51,7 +51,7 @@ connect(C, Host, Username, Password, Opts) ->
     call_connect(C, Opts1).
 
 call_connect(C, Opts) ->
-    Opts1 = epgsql_cmd_connect:opts_hide_password(Opts),
+    Opts1 = epgsql_cmd_connect:opts_hide_password(epgsql:to_map(Opts)),
     epgsqla:complete_connect(
       C, incremental(C, epgsql_cmd_connect, Opts1), Opts1).