Skip to content

Commit

Permalink
sqlite3 > pg
Browse files Browse the repository at this point in the history
  • Loading branch information
Yury Dymov committed Aug 7, 2016
1 parent 5804a0b commit 7ad231f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 28 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 3.0'

Expand Down Expand Up @@ -38,6 +38,5 @@ group :development do
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actioncable (5.0.0)
actionpack (= 5.0.0)
Expand Down Expand Up @@ -97,6 +97,7 @@ GEM
oauth2 (~> 1.0)
omniauth (~> 1.2)
orm_adapter (0.5.0)
pg (0.18.4)
pkg-config (1.1.7)
puma (3.6.0)
rack (2.0.1)
Expand Down Expand Up @@ -143,7 +144,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
Expand All @@ -164,12 +164,12 @@ DEPENDENCIES
listen (~> 3.0.5)
omniauth
omniauth-github
pg
puma (~> 3.0)
rack-cors
rails (~> 5.0.0)
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
tzinfo-data

BUNDLED WITH
Expand Down
26 changes: 3 additions & 23 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
# SQLite version 3.x
# gem install sqlite3
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
#
default: &default
adapter: sqlite3
adapter: postgresql
encoding: unicode
pool: 5
timeout: 5000

development:
<<: *default
database: db/development.sqlite3

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
database: db/test.sqlite3

production:
<<: *default
database: db/production.sqlite3

1 change: 1 addition & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
end


# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
Expand Down

0 comments on commit 7ad231f

Please sign in to comment.