From 9fbe6045949b995468f482c165e0ed3787a369d1 Mon Sep 17 00:00:00 2001 From: Felipe Ripoll Date: Fri, 4 Nov 2016 05:21:03 -0600 Subject: [PATCH 1/2] [2] accepting query as iodata() on p1_mysql_conn:squery/4 function --- src/p1_mysql_conn.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p1_mysql_conn.erl b/src/p1_mysql_conn.erl index 365d80b..a2fbb08 100644 --- a/src/p1_mysql_conn.erl +++ b/src/p1_mysql_conn.erl @@ -192,7 +192,8 @@ fetch(Pid, Query, From) -> fetch(Pid, Query, From, Timeout) -> squery(Pid, Query, From, [{timeout, Timeout}]). -squery(Pid, Query, From, Options) when is_pid(Pid), is_list(Query) -> +squery(Pid, Query, From, Options) when is_pid(Pid), + (is_list(Query) or is_binary(Query)) -> Self = self(), Timeout = get_option(timeout, Options, ?DEFAULT_STANDALONE_TIMEOUT), TRef = erlang:start_timer(Timeout, self(), timeout), @@ -666,7 +667,7 @@ do_query(State, Query, Options) when is_record(State, state) -> ). do_query(Sock, RecvPid, LogFun, Query, Version, Options) when is_pid(RecvPid), - is_list(Query) -> + (is_list(Query) or is_binary(Query)) -> Packet = list_to_binary([?MYSQL_QUERY_OP, Query]), case do_send(Sock, Packet, 0, LogFun) of ok -> From e6d3033542650009af2c1b71ed1f405475460b48 Mon Sep 17 00:00:00 2001 From: Felipe Ripoll Date: Fri, 4 Nov 2016 05:22:48 -0600 Subject: [PATCH 2/2] [2] accepting query as iodata() on p1_mysql_conn:squery/4 function --- src/p1_mysql_conn.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p1_mysql_conn.erl b/src/p1_mysql_conn.erl index a2fbb08..5443f34 100644 --- a/src/p1_mysql_conn.erl +++ b/src/p1_mysql_conn.erl @@ -193,7 +193,7 @@ fetch(Pid, Query, From, Timeout) -> squery(Pid, Query, From, [{timeout, Timeout}]). squery(Pid, Query, From, Options) when is_pid(Pid), - (is_list(Query) or is_binary(Query)) -> + (is_list(Query) or is_binary(Query)) -> Self = self(), Timeout = get_option(timeout, Options, ?DEFAULT_STANDALONE_TIMEOUT), TRef = erlang:start_timer(Timeout, self(), timeout),