diff options
| author | Matthias Rieber <matthias@zu-con.org> | 2015-05-18 12:14:56 +0200 |
|---|---|---|
| committer | Matthias Rieber <matthias@zu-con.org> | 2015-05-18 12:14:56 +0200 |
| commit | 16532dd643708924b6ebfcfb26866d9cbd11d89c (patch) | |
| tree | f4c62a2ec7a8e199343588af7233459cb8434fdb /src | |
| parent | Revert "Fix EJABBERD_OPTS quoting for Elixir" (diff) | |
Fixed some string()/binary() issues in ejabberd_odbc
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_odbc.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl index c2db21307..dbae9f49b 100644 --- a/src/ejabberd_odbc.erl +++ b/src/ejabberd_odbc.erl @@ -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. |