]> granicus.if.org Git - ejabberd/commitdiff
Fix tests related to MAM
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 9 Jul 2015 09:00:08 +0000 (12:00 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 10 Jul 2015 10:57:27 +0000 (13:57 +0300)
src/mod_mam.erl

index bd1a5a7a9d3592f3a6cb06aff2c2b9a67ce1395f..cd869c9d875a01d930581855710bec926095d4ed 100644 (file)
@@ -788,8 +788,9 @@ make_sql_query(LUser, _LServer, Start, End, With, RSM) ->
                % ID can be empty because of
                % XEP-0059: Result Set Management
                % 2.5 Requesting the Last Page in a Result Set
-               [<<"(">>, Query, <<" ORDER BY timestamp DESC ">>,
-                LimitClause, <<") ORDER BY timestamp ASC;">>];
+               [<<"SELECT timestamp, xml, peer FROM (">>, Query,
+                <<" ORDER BY timestamp DESC ">>,
+                LimitClause, <<") AS t ORDER BY timestamp ASC;">>];
            _ ->
                [Query, <<" ORDER BY timestamp ASC ">>,
                 LimitClause, <<";">>]