diff options
| author | Jeremy Daer (Kemper) <jeremydaer@gmail.com> | 2015-09-07 17:51:55 -0700 |
|---|---|---|
| committer | Jeremy Daer (Kemper) <jeremydaer@gmail.com> | 2015-09-07 17:51:55 -0700 |
| commit | 81dd3872587159ad3514fe70593b208cb5f892ec (patch) | |
| tree | d0e83b319a1474645438d503629c68668818b6d1 | |
| parent | cad75ecf6735e8a6cf53e7731f10c4da5ab934bc (diff) | |
| parent | 5da5e3772c32593ecf2f27b8865e81dcbe3af692 (diff) | |
| download | rails-81dd3872587159ad3514fe70593b208cb5f892ec.tar.gz rails-81dd3872587159ad3514fe70593b208cb5f892ec.tar.bz2 rails-81dd3872587159ad3514fe70593b208cb5f892ec.zip | |
Merge pull request #21536 from jeremy/support-mysql2-0.4.0
Support mysql2 0.4.0, first release with prepared statements support
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 46c347c98a..0700980bca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,6 +20,12 @@ GIT 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 branch: master @@ -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) diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index ff43c7ec42..734b384e80 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -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 |