From acb24e9161909e58ca29dec3912a952389dde6aa Mon Sep 17 00:00:00 2001 From: Sam Popowich Date: Fri, 27 Mar 2015 11:58:08 -0600 Subject: [PATCH] Replace sqlite with mysql for dev, test, prod. --- Gemfile | 4 +++- Gemfile.lock | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8d565919d..e3295bcc7 100755 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,9 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +#gem 'sqlite3' +# User mysql as database adapter for dev, test, and prod +gem 'mysql2' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0.1' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 357afa8a9..5c8e93fa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,6 +174,7 @@ GEM mini_portile (0.6.2) minitest (5.5.1) multi_json (1.11.0) + mysql2 (0.3.18) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) om (3.1.0) @@ -272,7 +273,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) stomp (1.3.4) therubyracer (0.12.1) libv8 (~> 3.16.14.0) @@ -315,6 +315,7 @@ DEPENDENCIES jbuilder (~> 2.0) jettywrapper (~> 2.0.3) jquery-rails + mysql2 nokogiri om rails (= 4.2) @@ -322,7 +323,6 @@ DEPENDENCIES sass-rails (~> 5.0.1) sdoc (~> 0.4.0) spring - sqlite3 therubyracer turbolinks uglifier (>= 1.3.0)