mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Support mysql2 0.4.0, first release with prepared statements support
Known failure on Ruby 2.3/trunk: brianmario/mysql2#671
This commit is contained in:
parent
cad75ecf67
commit
5da5e3772c
3 changed files with 9 additions and 4 deletions
2
Gemfile
2
Gemfile
|
@ -90,7 +90,7 @@ platforms :ruby do
|
|||
group :db do
|
||||
gem 'pg', '>= 0.18.0'
|
||||
gem 'mysql', '>= 2.9.0'
|
||||
gem 'mysql2', '>= 0.3.18'
|
||||
gem 'mysql2', '>= 0.4.0', github: 'brianmario/mysql2'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -19,6 +19,12 @@ GIT
|
|||
qu (= 0.2.0)
|
||||
redis-namespace
|
||||
|
||||
GIT
|
||||
remote: git://github.com/brianmario/mysql2.git
|
||||
revision: 4d76557499b762d5a62aebb7f6a56510ad221eab
|
||||
specs:
|
||||
mysql2 (0.4.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/mikel/mail.git
|
||||
revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce
|
||||
|
@ -203,7 +209,6 @@ GEM
|
|||
multi_json (1.11.2)
|
||||
mustache (1.0.2)
|
||||
mysql (2.9.1)
|
||||
mysql2 (0.3.19)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
nokogiri (1.6.6.2-x64-mingw32)
|
||||
|
@ -313,7 +318,7 @@ DEPENDENCIES
|
|||
minitest (< 5.3.4)
|
||||
mocha (~> 0.14)
|
||||
mysql (>= 2.9.0)
|
||||
mysql2 (>= 0.3.18)
|
||||
mysql2 (>= 0.4.0)!
|
||||
nokogiri (>= 1.4.5)
|
||||
pg (>= 0.18.0)
|
||||
psych (~> 2.0)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'active_record/connection_adapters/abstract_mysql_adapter'
|
||||
|
||||
gem 'mysql2', '~> 0.3.18'
|
||||
gem 'mysql2', '>= 0.3.18', '< 0.5'
|
||||
require 'mysql2'
|
||||
|
||||
module ActiveRecord
|
||||
|
|
Loading…
Reference in a new issue