diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2018-03-15 17:55:05 +0300 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2018-03-15 17:55:05 +0300 |
| commit | e15595df64f96b6dd0dc6e9b38f9cdbdc0adf802 (patch) | |
| tree | 4cfe63fd2b27f2c300aa1be52cb0145e0d259e70 /src/mod_roster.erl | |
| parent | Get rid of catch-all in mod_pubsub (diff) | |
Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true (#2239)
Diffstat (limited to 'src/mod_roster.erl')
| -rw-r--r-- | src/mod_roster.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 3b893d21d..f1c4453db 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -1174,18 +1174,18 @@ import_stop(_LServer, _DBType) -> ets:delete(rostergroups_tmp), ok. --ifdef(NEW_SQL_SCHEMA). --define(ROW_LENGTH, 10). --else. --define(ROW_LENGTH, 9). --endif. +row_length() -> + case ejabberd_sql:use_new_schema() of + true -> 10; + false -> 9 + end. 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, ?ROW_LENGTH)), + 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), |