Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

* odbc_queries: fix list_users queries with limit/offset.

Browse Source 
SVN Revision: 1193
This commit is contained in:
Jérôme Sautret 2008-02-15 15:39:30 +00:00
parent 746c6b7d24
commit 86445aff3e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/odbc/odbc_queries.erl
View File

@ -16,7 +16,7 @@
%%% but WITHOUT ANY WARRANTY; without even the implied warranty of %%% but WITHOUT ANY WARRANTY; without even the implied warranty of
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%%% General Public License for more details. %%% General Public License for more details.
%%% %%%
%%% You should have received a copy of the GNU General Public License %%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software %%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA %%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@ -143,11 +143,11 @@ list_users(LServer) ->
list_users(LServer, [{from, Start}, {to, End}]) when is_integer(Start) and list_users(LServer, [{from, Start}, {to, End}]) when is_integer(Start) and
is_integer(End) -> is_integer(End) ->
list_users(LServer, [{limit, End-Start}, {offset, Start-1}]); list_users(LServer, [{limit, End-Start+1}, {offset, Start-1}]);
list_users(LServer, [{prefix, Prefix}, {from, Start}, {to, End}]) when is_list(Prefix) and list_users(LServer, [{prefix, Prefix}, {from, Start}, {to, End}]) when is_list(Prefix) and
is_integer(Start) and is_integer(Start) and
is_integer(End) -> is_integer(End) ->
list_users(LServer, [{prefix, Prefix}, {limit, End-Start}, {offset, Start}]); list_users(LServer, [{prefix, Prefix}, {limit, End-Start+1}, {offset, Start-1}]);
list_users(LServer, [{limit, Limit}, {offset, Offset}]) when is_integer(Limit) and list_users(LServer, [{limit, Limit}, {offset, Offset}]) when is_integer(Limit) and
is_integer(Offset) -> is_integer(Offset) ->
@ -197,7 +197,7 @@ users_number(LServer, [{prefix, Prefix}]) when is_list(Prefix) ->
LServer, LServer,
io_lib:fwrite("select count(*) from users " ++ io_lib:fwrite("select count(*) from users " ++
%% Warning: Escape prefix at higher level to prevent SQL %% Warning: Escape prefix at higher level to prevent SQL
%% injection. %% injection.
"where username like '~s%'", [Prefix])); "where username like '~s%'", [Prefix]));
users_number(LServer, []) -> users_number(LServer, []) ->
users_number(LServer). users_number(LServer).
@ -356,15 +356,15 @@ set_private_data(_LServer, Username, LXMLNS, SData) ->
ejabberd_odbc:sql_query_t(Query) ejabberd_odbc:sql_query_t(Query)
end, end,
set_private_data_sql(Username, LXMLNS, SData)). set_private_data_sql(Username, LXMLNS, SData)).
set_private_data_sql(Username, LXMLNS, SData) -> set_private_data_sql(Username, LXMLNS, SData) ->
[["delete from private_storage " [["delete from private_storage "
"where username='", Username, "' and " "where username='", Username, "' and "
"namespace='", LXMLNS, "';"], "namespace='", LXMLNS, "';"],
["insert into private_storage(username, namespace, data) " ["insert into private_storage(username, namespace, data) "
"values ('", Username, "', '", LXMLNS, "', " "values ('", Username, "', '", LXMLNS, "', "
"'", SData, "');"]]. "'", SData, "');"]].
get_private_data(LServer, Username, LXMLNS) -> get_private_data(LServer, Username, LXMLNS) ->
ejabberd_odbc:sql_query( ejabberd_odbc:sql_query(
LServer, LServer,
@ -405,7 +405,7 @@ get_db_type() ->
%% Queries can be either a fun or a list of queries %% Queries can be either a fun or a list of queries
sql_transaction(LServer, Queries) when is_list(Queries) -> sql_transaction(LServer, Queries) when is_list(Queries) ->
%% SQL transaction based on a list of queries %% SQL transaction based on a list of queries
%% This function automatically %% This function automatically
F = fun() -> F = fun() ->
lists:foreach(fun(Query) -> lists:foreach(fun(Query) ->
ejabberd_odbc:sql_query(LServer, Query) ejabberd_odbc:sql_query(LServer, Query)
@ -429,7 +429,7 @@ set_last_t(LServer, Username, Seconds, State) ->
del_last(LServer, Username) -> del_last(LServer, Username) ->
ejabberd_odbc:sql_query( ejabberd_odbc:sql_query(
LServer, LServer,
["EXECUTE dbo.del_last '", Username, "'"]). ["EXECUTE dbo.del_last '", Username, "'"]).
get_password(LServer, Username) -> get_password(LServer, Username) ->
@ -467,7 +467,7 @@ list_users(LServer) ->
list_users(LServer, _) -> list_users(LServer, _) ->
% scope listing not supported % scope listing not supported
list_users(LServer). list_users(LServer).
users_number(LServer) -> users_number(LServer) ->
ejabberd_odbc:sql_query( ejabberd_odbc:sql_query(
LServer, LServer,
@ -520,7 +520,7 @@ get_roster_groups(LServer, Username, SJID) ->
ejabberd_odbc:sql_query( ejabberd_odbc:sql_query(
LServer, LServer,
["EXECUTE dbo.get_roster_groups '", Username, "' , '", SJID, "'"]). ["EXECUTE dbo.get_roster_groups '", Username, "' , '", SJID, "'"]).
del_user_roster_t(LServer, Username) -> del_user_roster_t(LServer, Username) ->
Result = ejabberd_odbc:sql_query( Result = ejabberd_odbc:sql_query(
LServer, LServer,
@ -585,7 +585,7 @@ set_private_data(LServer, Username, LXMLNS, SData) ->
set_private_data_sql(Username, LXMLNS, SData) -> set_private_data_sql(Username, LXMLNS, SData) ->
["EXECUTE dbo.set_private_data '", Username, "' , '", LXMLNS, "' , '", SData, "'"]. ["EXECUTE dbo.set_private_data '", Username, "' , '", LXMLNS, "' , '", SData, "'"].
get_private_data(LServer, Username, LXMLNS) -> get_private_data(LServer, Username, LXMLNS) ->
ejabberd_odbc:sql_query( ejabberd_odbc:sql_query(
LServer, LServer,