Skip to content

Commit

Permalink
Switch to SQLite for development
Browse files Browse the repository at this point in the history
  • Loading branch information
laserlemon committed Aug 3, 2011
1 parent f635486 commit 6d500e9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 41 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -2,12 +2,13 @@ source "http://rubygems.org"

gem "rails", "3.0.9"

gem "pg"
gem "pg", :group => :production

gem "jquery-rails", "~> 1.0.12"
gem "pusher", "~> 0.8.2"

group :development, :test do
gem "sqlite3"
gem "cucumber-rails", "~> 1.0.2"
gem "database_cleaner", "~> 0.6.7"
gem "factory_girl_rails", "~> 1.1.0"
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Expand Up @@ -125,6 +125,7 @@ GEM
rubyzip
signature (0.1.2)
ruby-hmac
sqlite3 (1.3.4)
term-ansicolor (1.0.6)
thor (0.14.6)
treetop (1.4.10)
Expand All @@ -146,3 +147,4 @@ DEPENDENCIES
pusher (~> 0.8.2)
rails (= 3.0.9)
rspec-rails (~> 2.6.1)
sqlite3
51 changes: 11 additions & 40 deletions config/database.example.yml
@@ -1,51 +1,22 @@
# PostgreSQL. Versions 7.4 and 8.x 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.
# SQLite version 3.x
# gem install sqlite3
development:
adapter: postgresql
encoding: unicode
database: chat_development
adapter: sqlite3
database: db/development.sqlite3
pool: 5
username: chat
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
timeout: 5000

# 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: postgresql
encoding: unicode
database: chat_test
adapter: sqlite3
database: db/test.sqlite3
pool: 5
username: chat
password:
timeout: 5000

production:
adapter: postgresql
encoding: unicode
database: chat_production
adapter: sqlite3
database: db/production.sqlite3
pool: 5
username: chat
password:
timeout: 5000

0 comments on commit 6d500e9

Please sign in to comment.