-
Notifications
You must be signed in to change notification settings - Fork 0
/
node_pep_odbc.erl.patch
191 lines (191 loc) · 10.6 KB
/
node_pep_odbc.erl.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
*** sources/ejabberd_2.1.x/src/mod_pubsub/node_pep_odbc.erl 2011-11-23 01:37:21.000000000 +0100
--- sources/ejabberd_mongo/src/mod_pubsub/node_pep_odbc.erl 2011-11-23 01:37:38.000000000 +0100
***************
*** 11,22 ****
%%% under the License.
%%%
%%% The Initial Developer of the Original Code is ProcessOne.
! %%% Portions created by ProcessOne are Copyright 2006-2011, ProcessOne
%%% All Rights Reserved.''
! %%% This software is copyright 2006-2011, ProcessOne.
%%%
%%%
! %%% @copyright 2006-2011 ProcessOne
%%% @author Christophe Romain <christophe.romain@process-one.net>
%%% [http://www.process-one.net/]
%%% @version {@vsn}, {@date} {@time}
--- 11,22 ----
%%% under the License.
%%%
%%% The Initial Developer of the Original Code is ProcessOne.
! %%% Portions created by ProcessOne are Copyright 2006-2010, ProcessOne
%%% All Rights Reserved.''
! %%% This software is copyright 2006-2010, ProcessOne.
%%%
%%%
! %%% @copyright 2006-2010 ProcessOne
%%% @author Christophe Romain <christophe.romain@process-one.net>
%%% [http://www.process-one.net/]
%%% @version {@vsn}, {@date} {@time}
***************
*** 198,222 ****
Host = ?PUBSUB:escape(element(2, SubKey)),
SJ = node_hometree_odbc:encode_jid(SubKey),
GJ = node_hometree_odbc:encode_jid(GenKey),
! Query = case SubKey of
! GenKey ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n "
! "where i.nodeid = n.nodeid "
! "and jid like '", GJ, "%' "
! "and host like '%@", Host, "';"];
! _ ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n "
! "where i.nodeid = n.nodeid "
! "and jid in ('", SJ, "', '", GJ, "') "
! "and host like '%@", Host, "';"]
! end,
! Reply = case catch ejabberd_odbc:sql_query_t(Query) of
{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
lists:map(fun({H, N, T, I, J, S}) ->
O = node_hometree_odbc:decode_jid(H),
! Node = nodetree_tree_odbc:raw_to_node(O, {N, "", T, I}),
{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
end, RItems);
_ ->
--- 198,241 ----
Host = ?PUBSUB:escape(element(2, SubKey)),
SJ = node_hometree_odbc:encode_jid(SubKey),
GJ = node_hometree_odbc:encode_jid(GenKey),
! Result = case ejabberd_odbc:get_db_type() of
! mongo ->
! {Query1, Query2} = case SubKey of
! GenKey ->
! {["select host, node, type, nodeid "
! "from pubsub_node where host like '%@", Host, "';"],
! ["select nodeid, jid, subscriptions "
! "from pubsub_state where jid like '", GJ, "%';"]};
! _ ->
! {["select host, node, type, nodeid from "
! "pubsub_node where host like '%@", Host, "';"],
! ["select nodeid, jid, subscriptions from "
! "pubsub_state where jid in ('", SJ, "', '", GJ, "');"]}
! end,
! catch mongosql_join:natural(ejabberd_odbc:sql_query_t(Query1),
! ejabberd_odbc:sql_query_t(Query2));
! _Else ->
! Query = case SubKey of
! GenKey ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n "
! "where i.nodeid = n.nodeid "
! "and jid like '", GJ, "%' "
! "and host like '%@", Host, "';"];
! _ ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n "
! "where i.nodeid = n.nodeid "
! "and jid in ('", SJ, "', '", GJ, "') "
! "and host like '%@", Host, "';"]
! end,
! catch ejabberd_odbc:sql_query_t(Query)
! end,
! Reply = case Result of
{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
lists:map(fun({H, N, T, I, J, S}) ->
O = node_hometree_odbc:decode_jid(H),
! Node = nodetree_odbc:raw_to_node(O, {N, "", T, I}),
{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
end, RItems);
_ ->
***************
*** 230,256 ****
Host = ?PUBSUB:escape(element(2, SubKey)),
SJ = node_hometree_odbc:encode_jid(SubKey),
GJ = node_hometree_odbc:encode_jid(GenKey),
! Query = case SubKey of
! GenKey ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n, pubsub_node_option o "
! "where i.nodeid = n.nodeid and n.nodeid = o.nodeid "
! "and name='send_last_published_item' and val='on_sub_and_presence' "
! "and jid like '", GJ, "%' "
! "and host like '%@", Host, "';"];
! _ ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n, pubsub_node_option o "
! "where i.nodeid = n.nodeid and n.nodeid = o.nodeid "
! "and name='send_last_published_item' and val='on_sub_and_presence' "
! "and jid in ('", SJ, "', '", GJ, "') "
! "and host like '%@", Host, "';"]
! end,
! Reply = case catch ejabberd_odbc:sql_query_t(Query) of
{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
lists:map(fun({H, N, T, I, J, S}) ->
O = node_hometree_odbc:decode_jid(H),
! Node = nodetree_tree_odbc:raw_to_node(O, {N, "", T, I}),
{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
end, RItems);
_ ->
--- 249,308 ----
Host = ?PUBSUB:escape(element(2, SubKey)),
SJ = node_hometree_odbc:encode_jid(SubKey),
GJ = node_hometree_odbc:encode_jid(GenKey),
! Result = case ejabberd_odbc:get_db_type() of
! mongo ->
! {Query1, Query2, Query3} = case SubKey of
! GenKey ->
! {["select host, node, type, nodeid "
! "from pubsub_node "
! "where host like '%@", Host, "';"],
! ["select nodeid, jid, subscriptions "
! "from pubsub_state "
! "where jid like '", GJ, "%';"],
! ["select nodeid "
! "from pubsub_node_option "
! "where name='send_last_published_item' "
! "and val='on_sub_and_presence';"]};
! _ ->
! {["select host, node, type, nodeid "
! "from pubsub_node "
! "where host like '%@", Host, "';"],
! ["select nodeid, jid, subscriptions "
! "from pubsub_state "
! "where jid in ('", SJ, "', '", GJ, "');"],
! ["select nodeid "
! "from pubsub_node_option "
! "where name='send_last_published_item' "
! "and val='on_sub_and_presence';"]}
! end,
! catch mongosql_join:natural(mongosql_join:natural(
! ejabberd_odbc:sql_query_t(Query1),
! ejabberd_odbc:sql_query_t(Query2)),
! ejabberd_odbc:sql_query_t(Query3));
! _Else ->
! Query = case SubKey of
! GenKey ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n, pubsub_node_option o "
! "where i.nodeid = n.nodeid and n.nodeid = o.nodeid "
! "and name='send_last_published_item' and val='on_sub_and_presence' "
! "and jid like '", GJ, "%' "
! "and host like '%@", Host, "';"];
! _ ->
! ["select host, node, type, i.nodeid, jid, subscriptions "
! "from pubsub_state i, pubsub_node n, pubsub_node_option o "
! "where i.nodeid = n.nodeid and n.nodeid = o.nodeid "
! "and name='send_last_published_item' and val='on_sub_and_presence' "
! "and jid in ('", SJ, "', '", GJ, "') "
! "and host like '%@", Host, "';"]
! end,
! catch ejabberd_odbc:sql_query_t(Query)
! end,
! Reply = case Result of
{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
lists:map(fun({H, N, T, I, J, S}) ->
O = node_hometree_odbc:decode_jid(H),
! Node = nodetree_odbc:raw_to_node(O, {N, "", T, I}),
{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
end, RItems);
_ ->