Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Reflect modules name changes in p1_mysql

This commit is contained in:
Evgeniy Khramtsov 2013-09-18 21:09:10 +10:00
parent 150a5392e5
commit a0396620f2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ejabberd_odbc.erl
View File

@ -325,7 +325,7 @@ handle_info(Info, StateName, State) ->
terminate(_Reason, _StateName, State) -> terminate(_Reason, _StateName, State) ->
ejabberd_odbc_sup:remove_pid(State#state.host, self()), ejabberd_odbc_sup:remove_pid(State#state.host, self()),
case State#state.db_type of case State#state.db_type of
mysql -> catch mysql_conn:stop(State#state.db_ref); mysql -> catch p1_mysql_conn:stop(State#state.db_ref);
_ -> ok _ -> ok
end, end,
ok. ok.
@ -447,9 +447,9 @@ sql_query_internal(Query) ->
mysql -> mysql ->
?DEBUG("MySQL, Send query~n~p~n", [Query]), ?DEBUG("MySQL, Send query~n~p~n", [Query]),
%%squery to be able to specify result_type = binary %%squery to be able to specify result_type = binary
%%[Query] because mysql_conn expect query to be a list (elements can be binaries, or iolist) %%[Query] because p1_mysql_conn expect query to be a list (elements can be binaries, or iolist)
%% but doesn't accept just a binary %% but doesn't accept just a binary
R = mysql_to_odbc(mysql_conn:squery(State#state.db_ref, R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref,
[Query], self(), [Query], self(),
[{timeout, (?TRANSACTION_TIMEOUT) - 1000}, [{timeout, (?TRANSACTION_TIMEOUT) - 1000},
{result_type, binary}])), {result_type, binary}])),
@ -533,12 +533,12 @@ pgsql_item_to_odbc(_) -> {updated, undefined}.
%% part of init/1 %% part of init/1
%% Open a database connection to MySQL %% Open a database connection to MySQL
mysql_connect(Server, Port, DB, Username, Password) -> mysql_connect(Server, Port, DB, Username, Password) ->
case mysql_conn:start(binary_to_list(Server), Port, case p1_mysql_conn:start(binary_to_list(Server), Port,
binary_to_list(Username), binary_to_list(Password), binary_to_list(Username), binary_to_list(Password),
binary_to_list(DB), fun log/3) binary_to_list(DB), fun log/3)
of of
{ok, Ref} -> {ok, Ref} ->
mysql_conn:fetch(Ref, [<<"set names 'utf8';">>], p1_mysql_conn:fetch(Ref, [<<"set names 'utf8';">>],
self()), self()),
{ok, Ref}; {ok, Ref};
Err -> Err Err -> Err
@ -546,15 +546,15 @@ mysql_connect(Server, Port, DB, Username, Password) ->
%% Convert MySQL query result to Erlang ODBC result formalism %% Convert MySQL query result to Erlang ODBC result formalism
mysql_to_odbc({updated, MySQLRes}) -> mysql_to_odbc({updated, MySQLRes}) ->
{updated, mysql:get_result_affected_rows(MySQLRes)}; {updated, p1_mysql:get_result_affected_rows(MySQLRes)};
mysql_to_odbc({data, MySQLRes}) -> mysql_to_odbc({data, MySQLRes}) ->
mysql_item_to_odbc(mysql:get_result_field_info(MySQLRes), mysql_item_to_odbc(p1_mysql:get_result_field_info(MySQLRes),
mysql:get_result_rows(MySQLRes)); p1_mysql:get_result_rows(MySQLRes));
mysql_to_odbc({error, MySQLRes}) mysql_to_odbc({error, MySQLRes})
when is_binary(MySQLRes) -> when is_binary(MySQLRes) ->
{error, MySQLRes}; {error, MySQLRes};
mysql_to_odbc({error, MySQLRes}) -> mysql_to_odbc({error, MySQLRes}) ->
{error, mysql:get_result_reason(MySQLRes)}. {error, p1_mysql:get_result_reason(MySQLRes)}.
%% When tabular data is returned, convert it to the ODBC formalism %% When tabular data is returned, convert it to the ODBC formalism
mysql_item_to_odbc(Columns, Recs) -> mysql_item_to_odbc(Columns, Recs) ->