diff options
| author | badlop <badlop@ono.com> | 2015-05-21 11:31:47 +0200 |
|---|---|---|
| committer | badlop <badlop@ono.com> | 2015-05-21 11:31:47 +0200 |
| commit | b04f3a4c93af58258638ea36e8e38051808d180f (patch) | |
| tree | 2367fb86b833ffab8a6bf4ee463754ff330bce88 /src | |
| parent | Add minor robustness on cluster scripts (diff) | |
| parent | Fixed some string()/binary() issues in ejabberd_odbc (diff) | |
Merge pull request #573 from sezuan/fix_odbc
Fix some string/binary issues with non-native ODBC drivers
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. |