Commit 6a7f9ce8130cb43706288e46b68d9b0f7a806adf
1 parent
7776791d
Exists in
master
and in
1 other branch
changing to use postgresql database
Showing
7 changed files
with
27 additions
and
4 deletions
Show diff stats
Gemfile
@@ -2,7 +2,11 @@ | @@ -2,7 +2,11 @@ | ||
2 | source 'https://www.rubygems.org' | 2 | source 'https://www.rubygems.org' |
3 | source "http://gems.github.com" | 3 | source "http://gems.github.com" |
4 | 4 | ||
5 | -gem 'postgres' | 5 | +gem 'thin' |
6 | +#gem 'postgres', '~> 0.8.1' | ||
7 | +#gem 'activerecord-pg-adapter' | ||
8 | +gem 'pg', '~> 0.17.1' | ||
9 | +gem 'activerecord-postgresql-adapter' | ||
6 | gem "rake", "~> 0.9.2.2" | 10 | gem "rake", "~> 0.9.2.2" |
7 | gem "rdoc", "~> 3.12" | 11 | gem "rdoc", "~> 3.12" |
8 | gem "rails", "2.3.18" | 12 | gem "rails", "2.3.18" |
config/database.yml
@@ -2,15 +2,20 @@ | @@ -2,15 +2,20 @@ | ||
2 | # gem install sqlite3-ruby (not necessary on OS X Leopard) | 2 | # gem install sqlite3-ruby (not necessary on OS X Leopard) |
3 | 3 | ||
4 | development: &default | 4 | development: &default |
5 | - adapter: mysql2 | ||
6 | - database: rebirth_development | 5 | + adapter: postgresql |
6 | + database: pairwise_dev | ||
7 | pool: 5 | 7 | pool: 5 |
8 | timeout: 5000 | 8 | timeout: 5000 |
9 | - | 9 | + username: pairwise |
10 | + password: pairwise | ||
11 | + port: 5434 | ||
12 | + host: 127.0.0.1 | ||
10 | test: &test | 13 | test: &test |
11 | adapter: sqlite3 | 14 | adapter: sqlite3 |
12 | database: db/test.sqlite3 | 15 | database: db/test.sqlite3 |
13 | 16 | ||
17 | +production: | ||
18 | + <<: *default | ||
14 | cucumber: | 19 | cucumber: |
15 | <<: *test | 20 | <<: *test |
16 | 21 |
No preview for this file type
vendor/cache/pg-0.17.1.gem
No preview for this file type
vendor/cache/postgres-0.8.1.gem
No preview for this file type
No preview for this file type