Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Handle NULL<->undefined correctly in gen_storage_odbc

Browse Source
This commit is contained in:
Brendon Hogger 2012-02-21 06:30:30 +08:00
parent b4c2a3b85f
commit 118b006cac
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gen_storage_odbc.erl
View File

@ -423,6 +423,9 @@ rows_to_result(#tabdef{record_name = RecordName,
row_to_result(Row, [], Result) -> row_to_result(Row, [], Result) ->
{Row, lists:reverse(Result)}; {Row, lists:reverse(Result)};
row_to_result([null | Row], [_ | Types], Result) ->
row_to_result(Row, Types, [undefined | Result]);
row_to_result([Field | Row], [Type | Types], Result) -> row_to_result([Field | Row], [Type | Types], Result) ->
case Type of case Type of
int -> int ->
@ -649,6 +652,10 @@ format(I) when is_integer(I) ->
%% escaping not needed %% escaping not needed
integer_to_list(I); integer_to_list(I);
format(undefined) ->
"NULL";
format(A) when is_atom(A) -> format(A) when is_atom(A) ->
%% escaping usually not needed, watch atom() usage %% escaping usually not needed, watch atom() usage
"'" ++ atom_to_list(A) ++ "'"; "'" ++ atom_to_list(A) ++ "'";