Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Cast as boolean when exporting privacy_list_data to PostgreSQL (#1773)

This commit is contained in:
Badlop 2021-05-10 11:37:59 +02:00
parent 6db228fcb3
commit 916653e234
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod_privacy_sql.erl
View File

@ -185,6 +185,7 @@ remove_lists(LUser, LServer) ->
end.
export(Server) ->
SqlType = ejabberd_option:sql_type(Server),
case catch ejabberd_sql:sql_query(jid:nameprep(Server),
[<<"select id from privacy_list order by "
"id desc limit 1;">>]) of
@ -223,6 +224,21 @@ export(Server) ->
"id=%(ID)d"]),
?SQL("delete from privacy_list_data where"
" id=%(ID)d;")] ++
case SqlType of
pgsql ->
[?SQL("insert into privacy_list_data(id, t, "
"value, action, ord, match_all, match_iq, "
"match_message, match_presence_in, "
"match_presence_out) "
"values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
" %(Order)d, CAST(%(MatchAll)b as boolean), CAST(%(MatchIQ)b as boolean),"
" CAST(%(MatchMessage)b as boolean), CAST(%(MatchPresenceIn)b as boolean),"
" CAST(%(MatchPresenceOut)b as boolean));")
|| {SType, SValue, SAction, Order,
MatchAll, MatchIQ,
MatchMessage, MatchPresenceIn,
MatchPresenceOut} <- RItems];
_ ->
[?SQL("insert into privacy_list_data(id, t, "
"value, action, ord, match_all, match_iq, "
"match_message, match_presence_in, "
@ -235,6 +251,7 @@ export(Server) ->
MatchAll, MatchIQ,
MatchMessage, MatchPresenceIn,
MatchPresenceOut} <- RItems]
end
end,
Lists);
(_Host, _R) ->