Browse files

ActiveRecord + sqlite3 removed

  • Loading branch information...
1 parent b01a9d6 commit cdda059ccd599141cac213fbd5a0ec9c2386f158 Hugues Huygens committed Jan 3, 2014
Showing with 4 additions and 41 deletions.
  1. +0 −3 Gemfile
  2. +0 −2 Gemfile.lock
  3. +4 −1 config/application.rb
  4. +0 −25 config/database.yml
  5. +0 −3 config/environments/development.rb
  6. +0 −7 db/seeds.rb
View
3 Gemfile
@@ -3,9 +3,6 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.2'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0'
View
2 Gemfile.lock
@@ -93,7 +93,6 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- sqlite3 (1.3.8)
thor (0.18.1)
thread_safe (0.1.3)
atomic
@@ -121,6 +120,5 @@ DEPENDENCIES
responsive-nav-rails
sass-rails (~> 4.0.0)
sdoc
- sqlite3
turbolinks
uglifier (>= 1.3.0)
View
5 config/application.rb
@@ -1,6 +1,9 @@
require File.expand_path('../boot', __FILE__)
-require 'rails/all'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
View
25 config/database.yml
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3
-#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- 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
- pool: 5
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
View
3 config/environments/development.rb
@@ -19,9 +19,6 @@
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
- # Raise an error on page load if there are pending migrations
- config.active_record.migration_error = :page_load
-
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
View
7 db/seeds.rb
@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-# Mayor.create(name: 'Emanuel', city: cities.first)

0 comments on commit cdda059

Please sign in to comment.