Skip to content

Commit

Permalink
blarf
Browse files Browse the repository at this point in the history
  • Loading branch information
buermann committed Mar 31, 2012
1 parent aa2e7ff commit 82fe800
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -32,7 +32,6 @@ group :production do
gem 'thin'
end


group :development do
gem 'mysql'
end
Expand Down
12 changes: 6 additions & 6 deletions config/database.yml
Expand Up @@ -4,22 +4,22 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
adapter: sqlite3
database: db/development.sqlite3
adapter: mysql
database: zij
pool: 5
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: sqlite3
database: db/test.sqlite3
adapter: mysql
database: zij
pool: 5
timeout: 5000

production:
adapter: sqlite3
database: db/production.sqlite3
adapter: pg
database: zij
pool: 5
timeout: 5000
16 changes: 16 additions & 0 deletions db/schema.rb
@@ -0,0 +1,16 @@
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
# It's strongly recommended to check this file into your version control system.

ActiveRecord::Schema.define(:version => 0) do

end

0 comments on commit 82fe800

Please sign in to comment.