diff options
| author | Brian Cully <bjc@kublai.com> | 2008-03-01 15:22:12 -0500 |
|---|---|---|
| committer | Brian Cully <bjc@kublai.com> | 2008-03-01 15:22:12 -0500 |
| commit | dd72c7682b9f0ca5defa345a570c291f7693cd40 (patch) | |
| tree | 4b3f50a81a878272e9611b0036b9f0776405865f | |
| parent | 2b72e23a8ed765cfe62715168f75a199dfd9421c (diff) | |
| download | mysqlerl-dd72c7682b9f0ca5defa345a570c291f7693cd40.tar.gz mysqlerl-dd72c7682b9f0ca5defa345a570c291f7693cd40.zip | |
Tag messages with type.
| -rw-r--r-- | src/mysqlerl_connection.erl | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/mysqlerl_connection.erl b/src/mysqlerl_connection.erl index bc515a2..52a6300 100644 --- a/src/mysqlerl_connection.erl +++ b/src/mysqlerl_connection.erl @@ -3,11 +3,14 @@ -behavior(gen_server). --export([start_link/6, stop/1, sql_query/3, testmsg/1]). +-export([start_link/6, stop/1, sql_query/3]). -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]). +-define(QUERY_MSG, 0). +-define(EXTENDED_MSG, 255). + -record(state, {ref}). -record(port_closed, {reason}). -record(sql_query, {q}). @@ -22,9 +25,6 @@ stop(Pid) -> sql_query(Pid, Query, Timeout) -> gen_server:call(Pid, #sql_query{q = Query}, Timeout). -testmsg(Pid) -> - gen_server:call(Pid, {test, "SELECT COUNT(*) FROM user;"}). - init([Host, Port, Database, User, Password, Options]) -> process_flag(trap_exit, true), Cmd = lists:flatten(io_lib:format("~s ~s ~w ~s ~s ~s ~s", @@ -47,8 +47,6 @@ code_change(_OldVsn, State, _Extra) -> handle_call(#sql_query{q = Query}, _From, State) -> {reply, handle_query(State#state.ref, Query), State}; -handle_call({test, Str}, _From, State) -> - {reply, handle_test(State#state.ref, Str), State}; handle_call(Request, From, State) -> io:format("DEBUG: got unknown call from ~p: ~p~n", [From, Request]), {noreply, State}. @@ -71,7 +69,7 @@ helper() -> handle_query(Ref, Query) -> io:format("DEBUG: got query: ~p~n", [Query]), - port_command(Ref, Query), + port_command(Ref, [?QUERY_MSG | Query]), receive {Ref, {data, Res}} -> {ok, Res}; Other -> @@ -79,14 +77,3 @@ handle_query(Ref, Query) -> [Other]), exit({badreply, Other}) end. - -handle_test(Ref, Str) -> - io:format("DEBUG: got test message: ~p~n", [Str]), - port_command(Ref, Str), - receive - {Ref, {data, Res}} -> {ok, Res}; - Other -> - error_logger:warning_msg("Got unknown test response: ~p~n", - [Other]), - exit({badreply, Other}) - end. |