Browse Source

Fix call to parse with no statement name, fiddled with dialyzer specs.

David N. Welton 11 years ago
parent
commit
e964823a83
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/pgsql.erl

+ 3 - 3
src/pgsql.erl

@@ -98,8 +98,6 @@ equery(C, Sql) ->
     equery(C, Sql, []).
     equery(C, Sql, []).
 
 
 %% TODO add fast_equery command that doesn't need parsed statement
 %% TODO add fast_equery command that doesn't need parsed statement
--spec equery(connection(), string(), [bind_param()]) ->
-                    ok_reply(equery_row()) | {error, query_error()}.
 equery(C, Sql, Parameters) ->
 equery(C, Sql, Parameters) ->
     case parse(C, "", Sql, []) of
     case parse(C, "", Sql, []) of
         {ok, #statement{types = Types} = S} ->
         {ok, #statement{types = Types} = S} ->
@@ -109,6 +107,8 @@ equery(C, Sql, Parameters) ->
             Error
             Error
     end.
     end.
 
 
+-spec equery(connection(), string(), string(), [bind_param()]) ->
+                    ok_reply(equery_row()) | {error, query_error()}.
 equery(C, Name, Sql, Parameters) ->
 equery(C, Name, Sql, Parameters) ->
     case parse(C, Name, Sql, []) of
     case parse(C, Name, Sql, []) of
         {ok, #statement{types = Types} = S} ->
         {ok, #statement{types = Types} = S} ->
@@ -124,7 +124,7 @@ parse(C, Sql) ->
     parse(C, Sql, []).
     parse(C, Sql, []).
 
 
 parse(C, Sql, Types) ->
 parse(C, Sql, Types) ->
-    sync_on_error(C, gen_server:call(C, {parse, Sql, Types}, infinity)).
+    parse(C, "", Sql, Types).
 
 
 -spec parse(connection(), iolist(), string(), [epgsql_type()]) ->
 -spec parse(connection(), iolist(), string(), [epgsql_type()]) ->
                    {ok, #statement{}} | {error, query_error()}.
                    {ok, #statement{}} | {error, query_error()}.