Permalink
Browse files

Travis: Let's try with mysql instead of mysql2

  • Loading branch information...
1 parent 4360568 commit c046fea16e2f1b9a15d8fc693a2e34fecca0ffac @assaf assaf committed Aug 1, 2011
Showing with 5 additions and 5 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +1 −1 lib/vanity/adapters/active_record_adapter.rb
  4. +1 −1 test/test_helper.rb
View
@@ -14,7 +14,7 @@ group :test do
gem "mocha"
gem "mongo"
gem "bson_ext"
- gem "mysql2"
+ gem "mysql"
gem "passenger", "~>2.0"
gem "rails", "~>2.3.8"
gem "rack"
View
@@ -47,7 +47,7 @@ GEM
mocha (0.9.12)
mongo (1.3.1)
bson (>= 1.3.1)
- mysql2 (0.3.6)
+ mysql (2.8.1)
passenger (2.2.15)
fastthread (>= 1.0.1)
rack
@@ -83,7 +83,7 @@ DEPENDENCIES
jekyll
mocha
mongo
- mysql2
+ mysql
passenger (~> 2.0)
rack
rails (~> 2.3.8)
@@ -3,7 +3,7 @@ module Adapters
class << self
# Creates new ActiveRecord connection and returns ActiveRecordAdapter.
def active_record_connection(spec)
- require 'active_record'
+ require "active_record"
ActiveRecordAdapter.new(spec)
end
end
View
@@ -47,7 +47,7 @@ def new_playground
spec = {
"redis"=>"redis://localhost/15",
"mongodb"=>"mongodb://localhost/vanity",
- "mysql"=> { "active_record"=> { "adapter"=>"mysql2", "database"=>"vanity" } },
+ "mysql"=> { "adapter"=>"active_record", "active_record_adapter"=>"mysql", "database"=>"vanity_test" },
"mock"=>"mock:/"
}[adapter]
raise "No support yet for #{adapter}" unless spec

0 comments on commit c046fea

Please sign in to comment.