Browse Source

pg

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
d896d4ea58
  1. 9
      Gemfile
  2. 2
      Gemfile.lock
  3. 13
      config/database.yml

9
Gemfile

@ -5,7 +5,14 @@ gem 'rails', '3.1.0'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3' group :development do
gem 'sqlite3'
end
group :production do
gem 'pg'
end
gem 'devise', '~> 1.4.5' gem 'devise', '~> 1.4.5'
#gem 'cancan', '~> 1.6.5' #gem 'cancan', '~> 1.6.5'
#gem "meta_where", "~> 1.0" # squeel ? #gem "meta_where", "~> 1.0" # squeel ?

2
Gemfile.lock

@ -98,6 +98,7 @@ GEM
multi_json (1.0.3) multi_json (1.0.3)
nokogiri (1.5.0) nokogiri (1.5.0)
orm_adapter (0.0.5) orm_adapter (0.0.5)
pg (0.11.0)
pjax-rails (0.1.4) pjax-rails (0.1.4)
jquery-rails jquery-rails
polyglot (0.3.2) polyglot (0.3.2)
@ -187,6 +188,7 @@ DEPENDENCIES
devise (~> 1.4.5) devise (~> 1.4.5)
factory_girl_rails (~> 1.2) factory_girl_rails (~> 1.2)
jquery-rails jquery-rails
pg
pjax-rails (~> 0.1.4) pjax-rails (~> 0.1.4)
rails (= 3.1.0) rails (= 3.1.0)
rspec-rails (~> 2.6.1) rspec-rails (~> 2.6.1)

13
config/database.yml

@ -18,8 +18,11 @@ test:
pool: 5 pool: 5
timeout: 5000 timeout: 5000
production: production:
adapter: sqlite3 encoding: unicode
database: db/production.sqlite3 adapter: postgresql
pool: 5 username: username
timeout: 5000 port: 5432
host: hostname
database: database
password: password

Loading…
Cancel
Save