Skip to content

Commit bf588c6

Browse files
committed
Mysql bump
1 parent 014008d commit bf588c6

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Gemfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source 'http://rubygems.org'
1+
source "http://rubygems.org"
22

33
gemspec
44

@@ -35,27 +35,28 @@ end
3535

3636
platforms :mri_19 do
3737
# TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
38-
gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
38+
gem "ruby-debug19", :require => "ruby-debug" if RUBY_VERSION < "1.9.3"
3939
end
4040

4141
platforms :ruby do
4242
if ENV["RB_FSEVENT"]
43-
gem 'rb-fsevent'
43+
gem "rb-fsevent"
4444
end
45-
gem 'json'
46-
gem 'yajl-ruby'
45+
gem "json"
46+
gem "yajl-ruby"
4747
gem "nokogiri", ">= 1.4.4"
4848

4949
group :test do
50-
gem 'ruby-prof'
50+
gem "ruby-prof" if RUBY_VERSION < "1.9.3"
51+
5152
end
5253
# AR
5354
gem "sqlite3", "~> 1.3.3"
5455

5556
group :db do
5657
gem "pg", ">= 0.11.0"
5758
gem "mysql", ">= 2.8.1"
58-
gem "mysql2", ">= 0.3.4"
59+
gem "mysql2", ">= 0.3.5"
5960
end
6061
end
6162

@@ -78,10 +79,10 @@ end
7879
# gems that are necessary for ActiveRecord tests with Oracle database
7980
if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
8081
platforms :ruby do
81-
gem 'ruby-oci8', ">= 2.0.4"
82+
gem "ruby-oci8", ">= 2.0.4"
8283
end
8384
if ENV['ORACLE_ENHANCED_PATH']
84-
gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
85+
gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
8586
else
8687
gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
8788
end

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# encoding: utf-8
22

3-
gem 'mysql2', '~> 0.3.4'
3+
gem 'mysql2', '~> 0.3.5'
44
require 'mysql2'
55

66
module ActiveRecord

0 commit comments

Comments
 (0)