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

Merge pull request #573 from sezuan/fix_odbc 

Fix some string/binary issues with non-native ODBC drivers
This commit is contained in:
badlop 2015-05-21 11:31:47 +02:00
parent 3188941af2 16532dd643
commit b04f3a4c93
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ejabberd_odbc.erl
View File

@ -510,7 +510,8 @@ abort_on_driver_error(Reply, From) ->
%% Open an ODBC database connection
odbc_connect(SQLServer) ->
ejabberd:start_app(odbc),
odbc:connect(binary_to_list(SQLServer), [{scrollable_cursors, off}]).
odbc:connect(binary_to_list(SQLServer), [{scrollable_cursors, off},
{binary_strings, on}]).
%% == Native SQLite code
@ -635,7 +636,7 @@ mysql_item_to_odbc(Columns, Recs) ->
{selected, [element(2, Column) || Column <- Columns], Recs}.
to_odbc({selected, Columns, Recs}) ->
{selected, Columns, [tuple_to_list(Rec) || Rec <- Recs]};
{selected, [list_to_binary(Column) || Column <- Columns], [tuple_to_list(Rec) || Rec <- Recs]};
to_odbc(Res) ->
Res.