From: Eugen <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2017 03:46:32 +0000 (+0200)
Subject: Add env variable to disable prepared statements (#1293)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d5a675099a0ccf0c35ce1756f5015108cda1489a;p=mastodon.git

Add env variable to disable prepared statements (#1293)
---

diff --git a/.env.production.sample b/.env.production.sample
index d7c04e235..fbb284707 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -63,3 +63,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
 
 # Streaming API integration
 # STREAMING_API_BASE_URL=
+
+# Advanced settings
+# If you need to use pgBouncer, you need to disable prepared statements:
+# PREPARED_STATEMENTS=false
diff --git a/config/database.yml b/config/database.yml
index 5ec342f93..810b83278 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -22,3 +22,4 @@ production:
   password: <%= ENV['DB_PASS'] || '' %>
   host: <%= ENV['DB_HOST'] || 'localhost' %>
   port: <%= ENV['DB_PORT'] || 5432 %>
+  prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>