Merge pull request #154 from zmstone/fix-epgsqla-spec

Fix epgsqla and epgsqli API specs

src/epgsql.app.src

@@ -1,6 +1,6 @@
 {application, epgsql,
  [{description, "PostgreSQL Client"},
-  {vsn, "3.4.0"},
+  {vsn, "3.4.1"},
   {modules, []},
   {registered, []},
   {applications, [kernel,

src/epgsql.erl

@@ -36,7 +36,7 @@
 
 -include("epgsql.hrl").
 
--type sql_query() :: string() | iodata().
+-type sql_query() :: iodata().
 -type host() :: inet:ip_address() | inet:hostname().
 -type connection() :: pid().
 -type connect_option() ::

src/epgsqla.erl

@@ -69,7 +69,7 @@ set_notice_receiver(C, PidOrName) ->
 get_cmd_status(C) ->
     epgsql_sock:get_cmd_status(C).
 
--spec squery(epgsql:connection(), string()) -> reference().
+-spec squery(epgsql:connection(), epgsql:sql_query()) -> reference().
 squery(C, Sql) ->
     cast(C, {squery, Sql}).
 
@@ -90,7 +90,7 @@ parse(C, Sql) ->
 parse(C, Sql, Types) ->
     parse(C, "", Sql, Types).
 
--spec parse(epgsql:connection(), iolist(), string(), [epgsql_type()]) -> reference().
+-spec parse(epgsql:connection(), iolist(), epgsql:sql_query(), [epgsql_type()]) -> reference().
 parse(C, Name, Sql, Types) ->
     cast(C, {parse, Name, Sql, Types}).
 

src/epgsqli.erl

@@ -62,18 +62,18 @@ get_parameter(C, Name) ->
 set_notice_receiver(C, PidOrName) ->
     epgsql_sock:set_notice_receiver(C, PidOrName).
 
--spec get_cmd_status(epgsql:connection()) -> {ok, Status}
-                                          when
-      Status :: undefined | atom() | {atom(), integer()}.
+-spec get_cmd_status(epgsql:connection()) -> {ok, Status} when
+          Status :: undefined | atom() | {atom(), integer()}.
 get_cmd_status(C) ->
     epgsql_sock:get_cmd_status(C).
 
--spec squery(epgsql:connection(), string()) -> reference().
+-spec squery(epgsql:connection(), epgsql:sql_query()) -> reference().
 squery(C, Sql) ->
     incremental(C, {squery, Sql}).
 
-equery(C, Sql) ->
-    equery(C, Sql, []).
+-spec equery(epgsql:connection(), #statement{}) -> reference().
+equery(C, Statement) ->
+    equery(C, Statement, []).
 
 -spec equery(epgsql:connection(), #statement{}, [epgsql:typed_param()]) -> reference().
 equery(C, Statement, TypedParameters) ->
@@ -83,13 +83,15 @@ equery(C, Statement, TypedParameters) ->
 prepared_query(C, Statement, TypedParameters) ->
     incremental(C, {prepared_query, Statement, TypedParameters}).
 
+-spec parse(epgsql:connection(), epgsql:sql_query()) -> reference().
 parse(C, Sql) ->
     parse(C, "", Sql, []).
 
+-spec parse(epgsql:connection(), epgsql:sql_query(), [epgsql_type()]) -> reference().
 parse(C, Sql, Types) ->
     parse(C, "", Sql, Types).
 
--spec parse(epgsql:connection(), iolist(), string(), [epgsql_type()]) -> reference().
+-spec parse(epgsql:connection(), iolist(), epgsql:sql_query(), [epgsql_type()]) -> reference().
 parse(C, Name, Sql, Types) ->
     incremental(C, {parse, Name, Sql, Types}).