Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Mysql bump to 0.3.5 #1726

Merged
merged 1 commit into from

2 participants

Arun Agrawal José Valim
Arun Agrawal
Collaborator

Fixes the failures.

Arun Agrawal
Collaborator

This update will fix the Time/DateTime failures

e445a79#commitcomment-432821

Arun Agrawal
Collaborator

It's required in 3-1-stable also.

/cc @josevalim

José Valim josevalim merged commit c5930b4 into from
Jake Varghese jake3030 referenced this pull request from a commit in jake3030/rails
Mike Gunderloy ffmike Make ActioMailer quoting test play nice with Ruby 1.9 [#1726 state:re…
…solved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
1e02d95
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 16, 2011
  1. Arun Agrawal

    Mysql bump

    arunagw authored
This page is out of date. Refresh to see the latest.
19 Gemfile
View
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
gemspec
@@ -35,19 +35,20 @@ end
platforms :mri_19 do
# TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
- gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
+ gem "ruby-debug19", :require => "ruby-debug" if RUBY_VERSION < "1.9.3"
end
platforms :ruby do
if ENV["RB_FSEVENT"]
- gem 'rb-fsevent'
+ gem "rb-fsevent"
end
- gem 'json'
- gem 'yajl-ruby'
+ gem "json"
+ gem "yajl-ruby"
gem "nokogiri", ">= 1.4.4"
group :test do
- gem 'ruby-prof'
+ gem "ruby-prof" if RUBY_VERSION < "1.9.3"
+
end
# AR
gem "sqlite3", "~> 1.3.3"
@@ -55,7 +56,7 @@ platforms :ruby do
group :db do
gem "pg", ">= 0.11.0"
gem "mysql", ">= 2.8.1"
- gem "mysql2", ">= 0.3.4"
+ gem "mysql2", ">= 0.3.5"
end
end
@@ -78,10 +79,10 @@ end
# gems that are necessary for ActiveRecord tests with Oracle database
if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
platforms :ruby do
- gem 'ruby-oci8', ">= 2.0.4"
+ gem "ruby-oci8", ">= 2.0.4"
end
if ENV['ORACLE_ENHANCED_PATH']
- gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
+ gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
else
gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
end
2  activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
View
@@ -1,6 +1,6 @@
# encoding: utf-8
-gem 'mysql2', '~> 0.3.4'
+gem 'mysql2', '~> 0.3.5'
require 'mysql2'
module ActiveRecord
Something went wrong with that request. Please try again.