From 8cee75139dc2d15c5007deb137c67233696a3b10 Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 7 Jul 2023 18:06:28 +0800 Subject: [PATCH 1/2] fix(bridge): ensure the username of pgsql must exists --- .../src/emqx_connector_pgsql.erl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/emqx_connector/src/emqx_connector_pgsql.erl b/apps/emqx_connector/src/emqx_connector_pgsql.erl index 71d18f4a8..c468aa8bd 100644 --- a/apps/emqx_connector/src/emqx_connector_pgsql.erl +++ b/apps/emqx_connector/src/emqx_connector_pgsql.erl @@ -69,7 +69,7 @@ roots() -> fields(config) -> [{server, server()}] ++ - emqx_connector_schema_lib:relational_db_fields() ++ + adjust_fields(emqx_connector_schema_lib:relational_db_fields()) ++ emqx_connector_schema_lib:ssl_fields() ++ emqx_connector_schema_lib:prepare_statement_fields(). @@ -77,6 +77,22 @@ server() -> Meta = #{desc => ?DESC("server")}, emqx_schema:servers_sc(Meta, ?PGSQL_HOST_OPTIONS). +adjust_fields(Fields) -> + lists:map( + fun + ({username, OrigUsernameFn}) -> + {username, fun + (required) -> + true; + (Any) -> + OrigUsernameFn(Any) + end}; + (Field) -> + Field + end, + Fields + ). + %% =================================================================== callback_mode() -> always_sync. From d01eee7fe4ee358af4c301bfd17b5fd3a53214f1 Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 7 Jul 2023 18:11:52 +0800 Subject: [PATCH 2/2] chore: update changes && app version --- apps/emqx_connector/src/emqx_connector.app.src | 2 +- changes/ee/fix-11225.en.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/ee/fix-11225.en.md diff --git a/apps/emqx_connector/src/emqx_connector.app.src b/apps/emqx_connector/src/emqx_connector.app.src index d268a244a..9dcec9187 100644 --- a/apps/emqx_connector/src/emqx_connector.app.src +++ b/apps/emqx_connector/src/emqx_connector.app.src @@ -1,7 +1,7 @@ %% -*- mode: erlang -*- {application, emqx_connector, [ {description, "EMQX Data Integration Connectors"}, - {vsn, "0.1.26"}, + {vsn, "0.1.27"}, {registered, []}, {mod, {emqx_connector_app, []}}, {applications, [ diff --git a/changes/ee/fix-11225.en.md b/changes/ee/fix-11225.en.md new file mode 100644 index 000000000..8d7ad554f --- /dev/null +++ b/changes/ee/fix-11225.en.md @@ -0,0 +1 @@ +Fix the `username` of PostgreSQL/Timescale/MatrixDB bridges could be empty