From 2d707cc0d2bcf6da1b97cc2351ba5f9a661fba9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Wed, 18 Mar 2020 14:04:40 +0100 Subject: [PATCH] Fix type of computed field in node_flat sql query --- src/node_flat_sql.erl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl index 38feed821..05cfa12b3 100644 --- a/src/node_flat_sql.erl +++ b/src/node_flat_sql.erl @@ -896,14 +896,13 @@ select_affiliation_subscriptions(Nidx, JID, JID) -> select_affiliation_subscriptions(Nidx, GenKey, SubKey) -> GJ = encode_jid(GenKey), SJ = encode_jid(SubKey), - case catch - ejabberd_sql:sql_query_t( - ?SQL("select jid = %(GJ)s as @(G)d, @(affiliation)s, @(subscriptions)s from " - " pubsub_state where nodeid=%(Nidx)d and jid in (%(GJ)s, %(SJ)s)")) + case catch ejabberd_sql:sql_query_t( + ?SQL("select jid = %(GJ)s as @(G)b, @(affiliation)s, @(subscriptions)s from " + " pubsub_state where nodeid=%(Nidx)d and jid in (%(GJ)s, %(SJ)s)")) of {selected, Res} -> lists:foldr( - fun({1, A, S}, {_, Subs}) -> + fun({true, A, S}, {_, Subs}) -> {decode_affiliation(A), Subs ++ decode_subscriptions(S)}; ({_, _, S}, {Aff, Subs}) -> {Aff, Subs ++ decode_subscriptions(S)}