Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging

  • Loading branch information...
commit 0ed75aaef7efdbef5105b8083e45354cab9fa8ac 2 parents d9b8f20 + ac33356
@kirs authored
Showing with 20 additions and 45 deletions.
  1. +2 −1  Gemfile
  2. +2 −2 Gemfile.lock
  3. +16 −42 config/database.yml
View
3  Gemfile
@@ -5,7 +5,7 @@ gem 'rails', '3.1.1'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'mysql2'
+gem 'sqlite3'
gem 'devise'
@@ -15,6 +15,7 @@ gem 'json'
# gem 'inboxes', :path => "/Users/kir/Sites/rails/inboxes-app/gems/inboxes"
gem 'inboxes', :git => "git://github.com/kirs/inboxes.git"
+gem "nifty-generators", :group => :development
# Gems used only for assets and not required
# in production environments by default.
View
4 Gemfile.lock
@@ -74,7 +74,6 @@ GEM
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.0.3)
- mysql2 (0.3.7)
orm_adapter (0.0.5)
polyglot (0.3.2)
rack (1.3.5)
@@ -121,6 +120,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.4)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -143,8 +143,8 @@ DEPENDENCIES
inboxes!
jquery-rails
json
- mysql2
rails (= 3.1.1)
ruby-debug
sass-rails (~> 3.1.4)
+ sqlite3
uglifier (>= 1.0.3)
View
58 config/database.yml
@@ -1,51 +1,25 @@
-# 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.
-#
-# Configure Using Gemfile
-# gem 'pg'
+# SQLite version 3.x
+# gem install sqlite3
#
+# Ensure the SQLite 3 gem is defined in your Gemfile
+# gem 'sqlite3'
development:
- adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
- database: inboxes_app_development
+ adapter: sqlite3
+ database: db/development.sqlite3
pool: 5
- username: root
- password:
- host: localhost
-
- # 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: mysql2
- encoding: utf8
- collation: utf8_general_ci
- database: inboxes_app_test
+ adapter: sqlite3
+ database: db/test.sqlite3
+ pool: 5
+ timeout: 5000
+
+production:
+ adapter: sqlite3
+ database: db/production.sqlite3
pool: 5
- username: root
- password:
- host: localhost
+ timeout: 5000
Please sign in to comment.
Something went wrong with that request. Please try again.