From d3e74291755c8ddf17dd2d7d95d133466f476822 Mon Sep 17 00:00:00 2001 From: Kaustubh Nair Date: Wed, 19 Jun 2019 15:10:28 +0530 Subject: [PATCH 1/5] Fix database.yml for test environment for unstable --- config/database.yml.example | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/database.yml.example b/config/database.yml.example index 5202700ff..6ccb32ec2 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -16,5 +16,7 @@ production: test: <<: *default - username: root - database: mapknitter-test + username: mapknitter + password: mapknitter + host: db + database: mapknitter From 36162fe0efad52d1fc3d6e67bab6bafc72280fb1 Mon Sep 17 00:00:00 2001 From: Kaustubh Nair Date: Wed, 19 Jun 2019 21:59:05 +0530 Subject: [PATCH 2/5] Update database.yml.example --- config/database.yml.example | 1 - 1 file changed, 1 deletion(-) diff --git a/config/database.yml.example b/config/database.yml.example index 6ccb32ec2..5f1e6e6f6 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -18,5 +18,4 @@ test: <<: *default username: mapknitter password: mapknitter - host: db database: mapknitter From c39168a76b5123e774fa9a37e3c0d005040572af Mon Sep 17 00:00:00 2001 From: Kaustubh Nair Date: Sat, 22 Jun 2019 10:26:24 +0530 Subject: [PATCH 3/5] Revert database.yml --- config/database.yml.cloud9.example | 10 +++------- config/database.yml.example | 14 ++++++-------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/config/database.yml.cloud9.example b/config/database.yml.cloud9.example index f1a36e434..c46bb4759 100644 --- a/config/database.yml.cloud9.example +++ b/config/database.yml.cloud9.example @@ -1,22 +1,18 @@ -default: &default - encoding: utf8 - adapter: mysql2 - development: - <<: *default + adapter: mysql2 username: root password: database: mapknitter production: - <<: *default + adapter: mysql2 host: db username: mapknitter password: mapknitter database: mapknitter test: - <<: *default + adapter: mysql2 username: root password: database: mapknittertest diff --git a/config/database.yml.example b/config/database.yml.example index 5f1e6e6f6..277488812 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,21 +1,19 @@ -default: &default - encoding: utf8 - adapter: mysql2 - development: - <<: *default + adapter: mysql2 username: password: - database: mapknitter-dev + database: mapknitter production: - <<: *default + adapter: mysql2 + host: db username: mapknitter password: mapknitter database: mapknitter test: - <<: *default + adapter: mysql2 username: mapknitter password: mapknitter + host: db database: mapknitter From a32bd02613d752ac6cd197b4ef5053b7f90903ef Mon Sep 17 00:00:00 2001 From: Kaustubh Nair Date: Tue, 25 Jun 2019 10:25:25 +0530 Subject: [PATCH 4/5] Update database.yml.example --- config/database.yml.example | 1 - 1 file changed, 1 deletion(-) diff --git a/config/database.yml.example b/config/database.yml.example index 277488812..188949b86 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -15,5 +15,4 @@ test: adapter: mysql2 username: mapknitter password: mapknitter - host: db database: mapknitter From df95f1567146d3db5f031a7f1cacfe9ed784306a Mon Sep 17 00:00:00 2001 From: Alax Alves Date: Tue, 25 Jun 2019 16:51:47 -0300 Subject: [PATCH 5/5] Using correct config for database.yml --- config/database.yml.cloud9.example | 16 ++++++++-------- config/database.yml.example | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/config/database.yml.cloud9.example b/config/database.yml.cloud9.example index f1a36e434..62d1aa74c 100644 --- a/config/database.yml.cloud9.example +++ b/config/database.yml.cloud9.example @@ -1,22 +1,22 @@ default: &default encoding: utf8 adapter: mysql2 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> development: <<: *default - username: root + username: password: - database: mapknitter + database: mapknitter_dev production: <<: *default - host: db - username: mapknitter - password: mapknitter + username: root + password: database: mapknitter test: <<: *default - username: root - password: - database: mapknittertest + username: + password: + database: mapknitter_test \ No newline at end of file diff --git a/config/database.yml.example b/config/database.yml.example index 5f1e6e6f6..3466a327d 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,21 +1,23 @@ default: &default encoding: utf8 adapter: mysql2 + host: 127.0.0.1 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> development: <<: *default - username: - password: - database: mapknitter-dev + username: + password: + database: mapknitter_dev production: <<: *default - username: mapknitter - password: mapknitter + username: root + password: database: mapknitter test: <<: *default - username: mapknitter - password: mapknitter - database: mapknitter + username: + password: + database: mapknitter_test \ No newline at end of file