mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Fix gen_storage:matchrules_transform_conditions/2 for =/=, and, andalso, or and orelse.
This commit is contained in:
parent
7f1759ab0a
commit
b2d96d0753
@ -287,7 +287,7 @@ matchrules_to_mnesia_matchspec(Tab, MatchRules) ->
|
|||||||
%% TODO: special handling for '=='?
|
%% TODO: special handling for '=='?
|
||||||
matchrules_transform_conditions(Attributes, {Op, Attribute, Value})
|
matchrules_transform_conditions(Attributes, {Op, Attribute, Value})
|
||||||
when Op =:= '='; Op =:= '=='; Op =:= '=:='; Op =:= like;
|
when Op =:= '='; Op =:= '=='; Op =:= '=:='; Op =:= like;
|
||||||
Op =:= '<'; Op =:= '>'; Op =:= '>='; Op =:= '=<' ->
|
Op =:= '=/='; Op =:= '<'; Op =:= '>'; Op =:= '>='; Op =:= '=<' ->
|
||||||
Var = case list_find(Attribute, Attributes) of
|
Var = case list_find(Attribute, Attributes) of
|
||||||
false -> exit(unknown_attribute);
|
false -> exit(unknown_attribute);
|
||||||
N -> list_to_atom([$$ | integer_to_list(N)])
|
N -> list_to_atom([$$ | integer_to_list(N)])
|
||||||
@ -311,9 +311,9 @@ matchrules_transform_conditions(Attributes, {Op, Attribute, Value})
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
matchrules_transform_conditions(Attributes, T) when is_tuple(T) ->
|
matchrules_transform_conditions(Attributes, T) when is_tuple(T) ->
|
||||||
L = tuple_to_list(T),
|
L = tl(tuple_to_list(T)),
|
||||||
L2 = [matchrules_transform_conditions(Attributes, E) || E <- L],
|
L2 = [matchrules_transform_conditions(Attributes, E) || E <- L],
|
||||||
list_to_tuple(L2).
|
list_to_tuple([element(1, T) | L2]).
|
||||||
|
|
||||||
|
|
||||||
matchrules_transform_column_op(like, Expression, Pattern) ->
|
matchrules_transform_column_op(like, Expression, Pattern) ->
|
||||||
|
Loading…
Reference in New Issue
Block a user