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

fix(emqx_oracle): make username a required field in emqx_oracle_schema

This commit is contained in:
Serge Tupchii 2023-08-31 16:57:44 +03:00
parent c54527857a
commit c3b3460173
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_oracle/src/emqx_oracle.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_oracle, [ {application, emqx_oracle, [
{description, "EMQX Enterprise Oracle Database Connector"}, {description, "EMQX Enterprise Oracle Database Connector"},
{vsn, "0.1.5"}, {vsn, "0.1.6"},
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,

15
apps/emqx_oracle/src/emqx_oracle_schema.erl
View File

@ -21,7 +21,7 @@ roots() ->
fields(config) -> fields(config) ->
Fields = Fields =
[{server, server()}, {sid, fun sid/1}, {service_name, fun service_name/1}] ++ [{server, server()}, {sid, fun sid/1}, {service_name, fun service_name/1}] ++
emqx_connector_schema_lib:relational_db_fields() ++ adjust_fields(emqx_connector_schema_lib:relational_db_fields()) ++
emqx_connector_schema_lib:prepare_statement_fields(), emqx_connector_schema_lib:prepare_statement_fields(),
proplists:delete(database, Fields). proplists:delete(database, Fields).
@ -38,3 +38,16 @@ service_name(type) -> binary();
service_name(desc) -> ?DESC(?REF_MODULE, "service_name"); service_name(desc) -> ?DESC(?REF_MODULE, "service_name");
service_name(required) -> false; service_name(required) -> false;
service_name(_) -> undefined. service_name(_) -> undefined.
adjust_fields(Fields) ->
lists:map(
fun
({username, Sc}) ->
%% to please dialyzer...
Override = #{type => hocon_schema:field_schema(Sc, type), required => true},
{username, hocon_schema:override(Sc, Override)};
(Field) ->
Field
end,
Fields
).