yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-05 10:39:29 +02:00
Code Issues Releases Wiki Activity

Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true (#2239)

Browse source
This commit is contained in:
Alexey Shchepin 2018-03-15 17:55:05 +03:00
parent 99b41146b1
commit e15595df64
6 changed files with 132 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mod_mam_sql.erl
View file

@ -38,12 +38,6 @@
-include("logger.hrl").
-include("ejabberd_sql_pt.hrl").
-ifdef(NEW_SQL_SCHEMA).
-define(USE_NEW_SCHEMA, true).
-else.
-define(USE_NEW_SCHEMA, false).
-endif.
%%%===================================================================
%%% API
%%%===================================================================
@ -332,7 +326,7 @@ make_sql_query(User, LServer, MAMQuery, RSM) ->
SServer = Escape(LServer),
Query =
case ?USE_NEW_SCHEMA of
case ejabberd_sql:use_new_schema() of
true ->
[<<"SELECT ">>, TopClause,
<<" timestamp, xml, peer, kind, nick"
@ -361,7 +355,7 @@ make_sql_query(User, LServer, MAMQuery, RSM) ->
[Query, <<" ORDER BY timestamp ASC ">>,
LimitClause, <<";">>]
end,
case ?USE_NEW_SCHEMA of
case ejabberd_sql:use_new_schema() of
true ->
{QueryPage,
[<<"SELECT COUNT(*) FROM archive WHERE username='">>,