Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add prepared_statements to database.yml #1994

Merged
merged 2 commits into from
Sep 24, 2019
Merged

Add prepared_statements to database.yml #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbdb3e
Add prepared_statements and advisory_locks to database.yml
sue445 Sep 1, 2019
dbe3d23
Update assets/runtime/env-defaults
sue445 Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,7 @@ 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/) |
| `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`. |
Expand Down
1 change: 1 addition & 0 deletions assets/runtime/config/gitlabhq/database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ production:
username: {{DB_USER}}
password: "{{DB_PASS}}"
pool: {{DB_POOL}}
prepared_statements: {{DB_PREPARED_STATEMENTS}}

1 change: 1 addition & 0 deletions assets/runtime/env-defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ DB_NAME=${DB_NAME:-}
DB_USER=${DB_USER:-}
DB_PASS=${DB_PASS:-}
DB_POOL=${DB_POOL:-10}
DB_PREPARED_STATEMENTS=${DB_PREPARED_STATEMENTS:-true}

# backward compatibility
case ${DB_TYPE} in
Expand Down
3 changes: 2 additions & 1 deletion assets/runtime/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ gitlab_configure_database() {
DB_NAME \
DB_USER \
DB_PASS \
DB_POOL
DB_POOL \
DB_PREPARED_STATEMENTS
}

gitlab_finalize_redis_parameters() {
Expand Down