From 1f4a118cc7ec3e06f9f822e5e3f577aaee0db5f6 Mon Sep 17 00:00:00 2001 From: ioBridge Date: Tue, 29 Mar 2011 01:52:06 -0400 Subject: [PATCH] switching to mysql2 gem to fix utf8 issues in to_json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/database.yml.example | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 40103bc..d3da094 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'rails', '3.0.4' -gem 'mysql', '2.8.1' +gem 'mysql2' gem 'authlogic' # Bundle gems for the local environment. Make sure to diff --git a/Gemfile.lock b/Gemfile.lock index 9bfd9f1..fc51b62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.16) - mysql (2.8.1) + mysql2 (0.2.7) nokogiri (1.4.4) polyglot (0.3.1) rack (1.2.2) @@ -97,7 +97,7 @@ DEPENDENCIES annotate authlogic autotest - mysql (= 2.8.1) + mysql2 rails (= 3.0.4) rspec (>= 2.0.0.beta.20) rspec-rails (>= 2.0.0.beta.20) diff --git a/config/database.yml.example b/config/database.yml.example index 6955f32..154cd15 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -15,7 +15,7 @@ # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: - adapter: mysql + adapter: mysql2 encoding: utf8 reconnect: false database: thingspeak_development @@ -29,7 +29,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - adapter: mysql + adapter: mysql2 encoding: utf8 reconnect: false database: thingspeak_test @@ -40,7 +40,7 @@ test: socket: /var/run/mysqld/mysqld.sock production: - adapter: mysql + adapter: mysql2 encoding: utf8 reconnect: true database: thingspeak_production