Skip to content
This repository was archived by the owner on Mar 19, 2020. It is now read-only.

Commit aaee2bc

Browse files
Yuma SogaYuma Soga
Yuma Soga
authored and
Yuma Soga
committed
Update datebase.yml for PostgreSQL
1 parent 815d362 commit aaee2bc

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

Gemfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ gem 'omniauth-slack'
3737

3838
gem 'bootsnap'
3939

40+
gem "pg"
4041

4142
group :development, :test do
4243
# Use sqlite3 as the database for Active Record
@@ -47,7 +48,6 @@ group :development, :test do
4748
gem 'rspec-rails'
4849
gem 'factory_bot_rails'
4950
gem 'rails-controller-testing'
50-
5151
gem 'erb2haml'
5252
end
5353

@@ -65,7 +65,3 @@ group :development do
6565
gem 'spring'
6666
gem 'listen'
6767
end
68-
69-
group :production do
70-
gem "pg", '0.21.0'
71-
end

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ DEPENDENCIES
319319
kramdown (~> 1.1.0)
320320
listen
321321
omniauth-slack
322-
pg (= 0.21.0)
322+
pg
323323
rails (= 5.2.0)
324324
rails-controller-testing
325325
rest-client
@@ -336,4 +336,4 @@ DEPENDENCIES
336336
web-console (~> 2.0)
337337

338338
BUNDLED WITH
339-
1.16.1
339+
1.16.2

config/database.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ default: &default
99
pool: 5
1010
timeout: 5000
1111

12-
development:
13-
<<: *default
14-
database: db/development.sqlite3
15-
1612
# Warning: The database defined as "test" will be erased and
1713
# re-generated from your development database when you run "rake".
1814
# Do not set this db to the same as development or production.
@@ -24,4 +20,13 @@ production:
2420
<<: *default
2521
adapter: postgresql
2622
encoding: unicode
27-
pool: 5
23+
pool: 5
24+
25+
development:
26+
<<: *default
27+
adapter: postgresql
28+
encoding: unicode
29+
database: rails_db
30+
pool: 5
31+
username: rails
32+
host: localhost

db/schema.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 20180422104154) do
13+
ActiveRecord::Schema.define(version: 2018_04_22_104154) do
14+
15+
# These are extensions that must be enabled in order to support this database
16+
enable_extension "plpgsql"
1417

1518
create_table "posts", force: :cascade do |t|
1619
t.text "body"

0 commit comments

Comments
 (0)