Merge remote-tracking branch 'origin/develop' into fix/signup-without-email

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d058370161f09c0e2dc2039815342835588def43..462c7c2a3e5ae38ed58512c62afd69c3a2a55599 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Logger: default log level changed from `warn` to `info`.
 - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
 - Allow account registration without an email
+- Default to `prepare: :unnamed` in the database configuration.
 <details>
   <summary>API Changes</summary>
 

diff --git a/config/config.exs b/config/config.exs
index 9c4eb70a337911846465157a9cbebfb3d55fc3f7..2cd741213da5394e8ba320c33649801c11cfc73d 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -624,7 +624,9 @@ config :pleroma, :modules, runtime_dir: "instance/modules"
 
 config :pleroma, configurable_from_database: false
 
-config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"]
+config :pleroma, Pleroma.Repo,
+  parameters: [gin_fuzzy_search_limit: "500"],
+  prepare: :unnamed
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.

diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md
index aab5197a238fd07fd88e4ebce3cc8725bf3c74cf..32551f7b69e02c9a259cda8f0e6379233820be01 100644 (file)
--- a/docs/installation/otp_en.md
+++ b/docs/installation/otp_en.md
@@ -73,6 +73,15 @@ rc-service postgresql restart
 systemctl restart postgresql
 ```
 
+If you are using PostgreSQL 12 or higher, add this to your Ecto database configuration
+
+```elixir
+prepare: :named,
+parameters: [
+  plan_cache_mode: "force_custom_plan"
+]
+```
+
 ### Installing Pleroma
 ```sh
 # Create a Pleroma user