Add prepared_statements and advisory_locks to database.yml

Author: sue445

README.md

@@ -931,6 +931,8 @@ Below is the complete list of available options that can be used to customize yo
 | `DB_USER` | The database database user. Defaults to `root` |
 | `DB_PASS` | The database database password. Defaults to no password |
 | `DB_POOL` | The database database connection pool count. Defaults to `10`. |
+| `DB_PREPARED_STATEMENTS` | Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) |
+| `DB_ADVISORY_LOCKS` | Whether use database advisory locks. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) |
 | `SMTP_ENABLED` | Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`. |
 | `SMTP_DOMAIN` | SMTP domain. Defaults to` www.gmail.com` |
 | `SMTP_HOST` | SMTP server host. Defaults to `smtp.gmail.com`. |

assets/runtime/config/gitlabhq/database.yml

@@ -10,4 +10,6 @@ production:
   username: {{DB_USER}}
   password: "{{DB_PASS}}"
   pool: {{DB_POOL}}
+  prepared_statements: {{DB_PREPARED_STATEMENTS}}
+  advisory_locks: {{DB_ADVISORY_LOCKS}}
 

assets/runtime/env-defaults

@@ -44,6 +44,8 @@ DB_NAME=${DB_NAME:-}
 DB_USER=${DB_USER:-}
 DB_PASS=${DB_PASS:-}
 DB_POOL=${DB_POOL:-10}
+DB_PREPARED_STATEMENTS=${DB_PREPARED_STATEMENTS:-}
+DB_ADVISORY_LOCKS=${DB_ADVISORY_LOCKS:-}
 
 # backward compatibility
 case ${DB_TYPE} in

assets/runtime/functions

@@ -182,7 +182,9 @@ gitlab_configure_database() {
     DB_NAME \
     DB_USER \
     DB_PASS \
-    DB_POOL
+    DB_POOL \
+    DB_PREPARED_STATEMENTS \
+    DB_ADVISORY_LOCKS
 }
 
 gitlab_finalize_redis_parameters() {