yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(sql_rule): test rule add User-Property information

This commit is contained in:
Turtle 2021-11-22 11:04:21 +08:00
parent ca1ece3db0
commit 62dc72c859
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_rule_engine/src/emqx_rule_events.erl
View File

@ -454,7 +454,8 @@ columns_with_exam('message.publish') ->
, {<<"topic">>, <<"t/a">>} , {<<"topic">>, <<"t/a">>}
, {<<"qos">>, 1} , {<<"qos">>, 1}
, {<<"flags">>, #{}} , {<<"flags">>, #{}}
, {<<"headers">>, undefined} , {<<"headers">>, #{<<"properties">> => #{<<"User-Property">> =>
#{'prop_key' => <<"prop_val">>}}}}
, {<<"publish_received_at">>, erlang:system_time(millisecond)} , {<<"publish_received_at">>, erlang:system_time(millisecond)}
, {<<"timestamp">>, erlang:system_time(millisecond)} , {<<"timestamp">>, erlang:system_time(millisecond)}
, {<<"node">>, node()} , {<<"node">>, node()}

17
apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
View File

@ -98,21 +98,8 @@ sql_test_action() ->
fill_default_values(Event, Context) -> fill_default_values(Event, Context) ->
maps:merge(envs_examp(Event), Context). maps:merge(envs_examp(Event), Context).
envs_examp(<<"$events/", _/binary>> = EVENT_TOPIC) -> envs_examp(EVENT_TOPIC) ->
EventName = emqx_rule_events:event_name(EVENT_TOPIC), EventName = emqx_rule_events:event_name(EVENT_TOPIC),
emqx_rule_maps:atom_key_map( emqx_rule_maps:atom_key_map(
maps:from_list( maps:from_list(
emqx_rule_events:columns_with_exam(EventName))); emqx_rule_events:columns_with_exam(EventName))).
envs_examp(_) ->
#{id => emqx_guid:to_hexstr(emqx_guid:gen()),
clientid => <<"c_emqx">>,
username => <<"u_emqx">>,
payload => <<"{\"id\": 1, \"name\": \"ha\"}">>,
peerhost => <<"127.0.0.1">>,
topic => <<"t/a">>,
qos => 1,
flags => #{sys => true, event => true},
publish_received_at => emqx_rule_utils:now_ms(),
timestamp => emqx_rule_utils:now_ms(),
node => node()
}.