Update p1_pgsql to support Unix Domain Socket,update sql_server docum…

…entation
badlop · May 13, 2024 · b90e7fa · b90e7fa
1 parent 239d419
commit b90e7fa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/mix.exs b/mix.exs
@@ -177,7 +177,7 @@ defmodule Ejabberd.MixProject do
                          {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
                          {config(:lua), {:luerl, "~> 1.2.0"}},
                          {config(:mysql), {:p1_mysql, ">= 1.0.23" }},
-                         {config(:pgsql), {:p1_pgsql, "~> 1.1"}},
+                         {config(:pgsql), {:p1_pgsql, git: "https://github.com/badlop/p1_pgsql"}},
                          {config(:sqlite), {:sqlite3, "~> 1.1"}},
                          {config(:stun), {:stun, "~> 1.0"}}], do:
       dep

diff --git a/mix.lock b/mix.lock
@@ -27,7 +27,7 @@
   "p1_acme": {:git, "https://github.com/processone/p1_acme", "167397c07cd3d64d5245d6a7e513baa8ff6bd95d", [branch: "master"]},
   "p1_mysql": {:hex, :p1_mysql, "1.0.23", "9b4e98f1f01e2cc4a759f611f0f015365e65c5f61ea453aa4bdfe950d20a5f11", [:rebar3], [], "hexpm", "9cef98265fb287374e7b64bf4022c4df5ec66196ca31cf4bed73c67c45bf824e"},
   "p1_oauth2": {:hex, :p1_oauth2, "0.6.14", "1c5f82535574de87e2059695ac4b91f8f9aebacbc1c80287dae6f02552d47aea", [:rebar3], [], "hexpm", "1fd3ac474e43722d9d5a87c6df8d36f698ed87af7bb81cbbb66361451d99ae8f"},
-  "p1_pgsql": {:hex, :p1_pgsql, "1.1.25", "f59b7faa457fadf0c2713ac335202f41ca1b06b7c4926925b3cb0bc6f0578601", [:rebar3], [{:xmpp, "1.8.1", [hex: :xmpp, repo: "hexpm", optional: false]}], "hexpm", "b654c1e07d3e775b626b407e7696cacfd88d17be83e7168b9d89c3832d913de7"},
+  "p1_pgsql": {:git, "https://github.com/badlop/p1_pgsql", "52100686f1737e5788ece510f2fb2f96b518071f", []},
   "p1_utils": {:hex, :p1_utils, "1.0.25", "2d39b5015a567bbd2cc7033eeb93a7c60d8c84efe1ef69a3473faa07fa268187", [:rebar3], [], "hexpm", "9219214428f2c6e5d3187ff8eb9a8783695c2427420be9a259840e07ada32847"},
   "pkix": {:git, "https://github.com/processone/pkix", "15d9ea9b2d5b2b92743cbd32be85327dd87ec868", []},
   "sqlite3": {:hex, :sqlite3, "1.1.14", "f9ea0cff8540865fdfdb7e24eef34dc46677364b1c070896e99b5bf08c8a7fd7", [:rebar3], [], "hexpm", "85054b6ca297343c159ed6794a473ff2c8eeabd854b6fe02f711c0bfd373ce86"},

diff --git a/rebar.config b/rebar.config
@@ -61,7 +61,7 @@
          {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.23"}}}},
         {p1_oauth2, "~> 0.6.14", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.14"}}},
         {if_var_true, pgsql,
-         {p1_pgsql, "~> 1.1.15", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.25"}}}},
+         {p1_pgsql, ".*", {git, "https://github.com/badlop/p1_pgsql", {branch, "master"}}}},
         {p1_utils, "~> 1.0.25", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}},
         {pkix, ".*", {git, "https://github.com/processone/pkix", {branch, "master"}}},
         {if_var_true, sqlite,

diff --git a/rebar.lock b/rebar.lock
@@ -20,7 +20,10 @@
   0},
  {<<"p1_mysql">>,{pkg,<<"p1_mysql">>,<<"1.0.23">>},0},
  {<<"p1_oauth2">>,{pkg,<<"p1_oauth2">>,<<"0.6.14">>},0},
- {<<"p1_pgsql">>,{pkg,<<"p1_pgsql">>,<<"1.1.25">>},0},
+ {<<"p1_pgsql">>,
+  {git,"https://github.com/badlop/p1_pgsql",
+       {ref,"52100686f1737e5788ece510f2fb2f96b518071f"}},
+  0},
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},0},
  {<<"pkix">>,
   {git,"https://github.com/processone/pkix",
@@ -54,7 +57,6 @@
  {<<"mqtree">>, <<"F8F8B4971E4CA94313BA9BCAAA1AA1077DAABA5E3FD3468FFB491420A4CC3593">>},
  {<<"p1_mysql">>, <<"9B4E98F1F01E2CC4A759F611F0F015365E65C5F61EA453AA4BDFE950D20A5F11">>},
  {<<"p1_oauth2">>, <<"1C5F82535574DE87E2059695AC4B91F8F9AEBACBC1C80287DAE6F02552D47AEA">>},
- {<<"p1_pgsql">>, <<"F59B7FAA457FADF0C2713AC335202F41CA1B06B7C4926925B3CB0BC6F0578601">>},
  {<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
  {<<"sqlite3">>, <<"F9EA0CFF8540865FDFDB7E24EEF34DC46677364B1C070896E99B5BF08C8A7FD7">>},
  {<<"stringprep">>, <<"02F23E8C3A219A3DFE40A22E908BECE3A2F68AF0FF599EA8A7B714ECB21E62EE">>},
@@ -79,7 +81,6 @@
  {<<"mqtree">>, <<"C87D1C95575DB65AF29B795C9DAA3BED43F5C1BF84072A74469659BCF53594EB">>},
  {<<"p1_mysql">>, <<"9CEF98265FB287374E7B64BF4022C4DF5EC66196CA31CF4BED73C67C45BF824E">>},
  {<<"p1_oauth2">>, <<"1FD3AC474E43722D9D5A87C6DF8D36F698ED87AF7BB81CBBB66361451D99AE8F">>},
- {<<"p1_pgsql">>, <<"B654C1E07D3E775B626B407E7696CACFD88D17BE83E7168B9D89C3832D913DE7">>},
  {<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
  {<<"sqlite3">>, <<"85054B6CA297343C159ED6794A473FF2C8EEABD854B6FE02F711C0BFD373CE86">>},
  {<<"stringprep">>, <<"928EBA304C3006EB1512110EBD7B87DB163B00859A09375A1E4466152C6C462A">>},

diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
@@ -1378,11 +1378,13 @@ doc() ->
                "The default value is the value defined in _`queue_type`_ "
                "or 'ram' if the latter is not set.")}},
      {sql_server,
-      #{value => ?T("Host"),
+      #{value => "Host | IP Address | ODBC Connection String | Unix Socket Path",
         note => "improved in 23.04",
         desc =>
             ?T("The hostname or IP address of the SQL server. For _`sql_type`_ "
                "'mssql' or 'odbc' this can also be an ODBC connection string. "
+               "For _`sql_type`_ 'pgsql' this can be the path to an existing "
+               "unix domain socket expressed like this: \"unix:/path/to/socket\"."
                "The default value is 'localhost'.")}},
      {sql_ssl,
       #{value => "true | false",