Commit d2bda8ed authored by Thong Kuah's avatar Thong Kuah

Switch to using main database terminology

"primary" should be reserved for replication contexts. So we can talk
about main primary, main replica, ci primary, ci replica databases.
parent 42b582f4
...@@ -19,7 +19,7 @@ feature is still under development, and is not ready for production use. ...@@ -19,7 +19,7 @@ feature is still under development, and is not ready for production use.
By default, GitLab is configured to use only one main database. To By default, GitLab is configured to use only one main database. To
opt-in to use a main database, and CI database, modify the opt-in to use a main database, and CI database, modify the
`config/database.yml` file to have a `primary` and a `ci` database `config/database.yml` file to have a `main` and a `ci` database
configurations. For example, given a `config/database.yml` like below: configurations. For example, given a `config/database.yml` like below:
```yaml ```yaml
...@@ -48,7 +48,7 @@ Edit the `config/database.yml` to look like this: ...@@ -48,7 +48,7 @@ Edit the `config/database.yml` to look like this:
```yaml ```yaml
development: development:
primary: main:
adapter: postgresql adapter: postgresql
encoding: unicode encoding: unicode
database: gitlabhq_development database: gitlabhq_development
...@@ -69,7 +69,7 @@ development: ...@@ -69,7 +69,7 @@ development:
statement_timeout: 120s statement_timeout: 120s
test: &test test: &test
primary: main:
adapter: postgresql adapter: postgresql
encoding: unicode encoding: unicode
database: gitlabhq_test database: gitlabhq_test
...@@ -90,9 +90,6 @@ test: &test ...@@ -90,9 +90,6 @@ test: &test
statement_timeout: 120s statement_timeout: 120s
``` ```
Note that we use `primary` in the `config/database.yml` to refer to the main
database. This is to match the default name Rails has.
### Migrations ### Migrations
Any migrations that affect `Ci::BaseModel` models Any migrations that affect `Ci::BaseModel` models
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment