Skip to content

Commit 11d8854

Browse files
author
Tair Assimov
committed
Switch to postgres to make Heroku happy
1 parent 4e7b7dd commit 11d8854

File tree

3 files changed

+15
-25
lines changed

3 files changed

+15
-25
lines changed

Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ source 'https://rubygems.org'
33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
55
gem 'rails', '4.2.4'
6-
# Use sqlite3 as the database for Active Record
7-
gem 'sqlite3'
6+
gem 'pg'
87
# Use SCSS for stylesheets
98
gem 'sass-rails', '~> 5.0'
109
# Use Uglifier as compressor for JavaScript assets

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ GEM
9090
net-ssh (2.9.2)
9191
nokogiri (1.6.6.2)
9292
mini_portile (~> 0.6.0)
93+
pg (0.18.3)
9394
rack (1.6.4)
9495
rack-test (0.6.3)
9596
rack (>= 1.0)
@@ -137,7 +138,6 @@ GEM
137138
actionpack (>= 3.0)
138139
activesupport (>= 3.0)
139140
sprockets (>= 2.8, < 4.0)
140-
sqlite3 (1.3.10)
141141
sshkit (1.7.1)
142142
colorize (>= 0.7.0)
143143
net-scp (>= 1.1.2)
@@ -175,15 +175,15 @@ DEPENDENCIES
175175
jbuilder (~> 2.0)
176176
jquery-rails
177177
net-ssh (~> 2.9.2)
178+
pg
178179
rails (= 4.2.4)
179180
sass-rails (~> 5.0)
180181
sdoc (~> 0.4.0)
181182
spring
182-
sqlite3
183183
turbolinks
184184
uglifier (>= 1.3.0)
185185
unicorn
186186
web-console (~> 2.0)
187187

188188
BUNDLED WITH
189-
1.10.5
189+
1.10.6

config/database.yml

+11-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
# SQLite version 3.x
2-
# gem install sqlite3
3-
#
4-
# Ensure the SQLite 3 gem is defined in your Gemfile
5-
# gem 'sqlite3'
6-
#
7-
default: &default
8-
adapter: sqlite3
1+
development:
2+
adapter: postgresql
3+
database: dockbit_demo_rails_development
94
pool: 5
105
timeout: 5000
11-
12-
development:
13-
<<: *default
14-
database: db/development.sqlite3
15-
16-
# Warning: The database defined as "test" will be erased and
17-
# re-generated from your development database when you run "rake".
18-
# Do not set this db to the same as development or production.
196
test:
20-
<<: *default
21-
database: db/test.sqlite3
7+
adapter: postgresql
8+
database: dockbit_demo_rails_test
9+
pool: 5
10+
timeout: 5000
2211

2312
production:
24-
<<: *default
25-
database: db/production.sqlite3
13+
adapter: postgresql
14+
database: dockbit_demo_rails_production
15+
pool: 5
16+
timeout: 5000

0 commit comments

Comments
 (0)