changing to use postgresql database

Ábner Silva de Oliveira
1 parent 7776791d
Showing 7 changed files with 27 additions and 4 deletions Show diff stats
Gemfile
config/database.yml
thin.yml
vendor/cache/eventmachine-1.0.3.gem
vendor/cache/pg-0.17.1.gem
vendor/cache/postgres-0.8.1.gem
vendor/cache/thin-1.6.1.gem
@@ -2,7 +2,11 @@
 source 'https://www.rubygems.org'
 source "http://gems.github.com"
  
-gem 'postgres'
+gem 'thin'
+#gem 'postgres', '~> 0.8.1'
+#gem 'activerecord-pg-adapter'
+gem 'pg', '~> 0.17.1'
+gem 'activerecord-postgresql-adapter'
 gem "rake", "~> 0.9.2.2"
 gem "rdoc", "~> 3.12"
 gem "rails", "2.3.18"
@@ -2,15 +2,20 @@
 #   gem install sqlite3-ruby (not necessary on OS X Leopard)
  
 development: &default
-  adapter: mysql2
-  database: rebirth_development
+  adapter: postgresql
+  database: pairwise_dev
   pool: 5
   timeout: 5000
-
+  username: pairwise
+  password: pairwise
+  port: 5434
+  host: 127.0.0.1
 test: &test
   adapter: sqlite3
   database: db/test.sqlite3
  
+production:
+  <<: *default
 cucumber:
   <<: *test
  
@@ -0,0 +1,14 @@
+---
+pid: tmp/pids/thin.pid
+address: 0.0.0.0
+timeout: 30
+wait: 30
+port: 5030
+log: log/thin.log
+max_conns: 1024
+require: []
+
+environment: production 
+max_persistent_conns: 512
+servers: 4
+daemonize: true
...	...	@@ -2,7 +2,11 @@
2	2	source 'https://www.rubygems.org'
3	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	10	gem "rake", "~> 0.9.2.2"
7	11	gem "rdoc", "~> 3.12"
8	12	gem "rails", "2.3.18"
...	...
...	...	@@ -2,15 +2,20 @@
2	2	# gem install sqlite3-ruby (not necessary on OS X Leopard)
3	3
4	4	development: &default
5		- adapter: mysql2
6		- database: rebirth_development
	5	+ adapter: postgresql
	6	+ database: pairwise_dev
7	7	pool: 5
8	8	timeout: 5000
9		-
	9	+ username: pairwise
	10	+ password: pairwise
	11	+ port: 5434
	12	+ host: 127.0.0.1
10	13	test: &test
11	14	adapter: sqlite3
12	15	database: db/test.sqlite3
13	16
	17	+production:
	18	+ <<: *default
14	19	cucumber:
15	20	<<: *test
16	21
...	...
...	...	@@ -0,0 +1,14 @@
	1	+---
	2	+pid: tmp/pids/thin.pid
	3	+address: 0.0.0.0
	4	+timeout: 30
	5	+wait: 30
	6	+port: 5030
	7	+log: log/thin.log
	8	+max_conns: 1024
	9	+require: []
	10	+
	11	+environment: production
	12	+max_persistent_conns: 512
	13	+servers: 4
	14	+daemonize: true
...	...