diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2017-11-02 17:03:30 +0300 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2017-11-02 18:21:40 +0300 |
| commit | 78dfb832b8e5b711cfbbe3131493057325c0008d (patch) | |
| tree | 8b3148730887908a2c6e676e6ce159b24b6d05d8 /src/mod_roster.erl | |
| parent | Fix pkix:validate() return value (diff) | |
Add SQL_INSERT macro and update SQL queries to use server_host field
Diffstat (limited to 'src/mod_roster.erl')
| -rw-r--r-- | src/mod_roster.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl index c03ea1154..a86b50d98 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -1180,12 +1180,18 @@ import_stop(_LServer, _DBType) -> ets:delete(rostergroups_tmp), ok. +-ifdef(NEW_SQL_SCHEMA). +-define(ROW_LENGTH, 10). +-else. +-define(ROW_LENGTH, 9). +-endif. + import(LServer, {sql, _}, _DBType, <<"rostergroups">>, [LUser, SJID, Group]) -> LJID = jid:tolower(jid:decode(SJID)), ets:insert(rostergroups_tmp, {{LUser, LServer, LJID}, Group}), ok; import(LServer, {sql, _}, DBType, <<"rosterusers">>, Row) -> - I = mod_roster_sql:raw_to_record(LServer, lists:sublist(Row, 9)), + I = mod_roster_sql:raw_to_record(LServer, lists:sublist(Row, ?ROW_LENGTH)), Groups = [G || {_, G} <- ets:lookup(rostergroups_tmp, I#roster.usj)], RosterItem = I#roster{groups = Groups}, Mod = gen_mod:db_mod(DBType, ?MODULE), |