Permalink
Browse files

Merge pull request #2 from nberveiler/master

database.yml should be configured for postgresql, not sqlite
  • Loading branch information...
2 parents 6bc1c7b + b4c9fa2 commit b3025013365cf6afc13f9b77586b91aa99c2d6ac @bitfyre bitfyre committed Apr 2, 2012
Showing with 43 additions and 13 deletions.
  1. +43 −13 config/database.yml
View
@@ -1,25 +1,55 @@
-# SQLite version 3.x
-# gem install sqlite3
+# PostgreSQL. Versions 8.2 and up are supported.
+#
+# Install the pg driver:
+# gem install pg
+# On Mac OS X with macports:
+# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+# gem install pg
+# Choose the win32 build.
+# Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
development:
- adapter: sqlite3
- database: db/development.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: slurryhub_development
pool: 5
- timeout: 5000
+ username: slurryhub
+ password:
+
+ # Connect on a TCP socket. Omitted by default since the client uses a
+ # domain socket that doesn't need configuration. Windows does not have
+ # domain sockets, so uncomment these lines.
+ #host: localhost
+ #port: 5432
+
+ # Schema search path. The server defaults to $user,public
+ #schema_search_path: myapp,sharedapp,public
+
+ # Minimum log levels, in increasing order:
+ # debug5, debug4, debug3, debug2, debug1,
+ # log, notice, warning, error, fatal, and panic
+ # The server defaults to notice.
+ #min_messages: warning
# 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:
- adapter: sqlite3
- database: db/test.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: slurryhub_test
pool: 5
- timeout: 5000
+ username: slurryhub
+ password:
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: slurryhub_production
pool: 5
- timeout: 5000
+ username: slurryhub
+ password:

0 comments on commit b302501

Please sign in to comment.