aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_odbc.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_odbc.erl')
-rw-r--r--src/ejabberd_odbc.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl
index 09f17a635..dbae9f49b 100644
--- a/src/ejabberd_odbc.erl
+++ b/src/ejabberd_odbc.erl
@@ -193,7 +193,8 @@ to_bool(_) -> false.
encode_term(Term) ->
escape(list_to_binary(
- erl_prettypr:format(erl_syntax:abstract(Term)))).
+ erl_prettypr:format(erl_syntax:abstract(Term),
+ [{paper, 65535}, {ribbon, 65535}]))).
decode_term(Bin) ->
Str = binary_to_list(<<Bin/binary, ".">>),
@@ -509,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
@@ -634,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.